The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Delete the unread collections entity slice (#79870)
Romeo Van Snick0b0e6c0f4bf7
diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.unit.spec.tsxindex d3a66c012ee..c0aabd6240c 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.unit.spec.tsx@@ -84,9 +84,9 @@ describe("SavedEntityPicker", () => {it("shows the current user personal collection on the top after the root", async () => {await setup();- expect(- screen.getAllByTestId("tree-item-name").map((node) => node.textContent),- ).toEqual([+ const treeItems = await screen.findAllByTestId("tree-item-name");++ expect(treeItems.map((node) => node.textContent)).toEqual(["Our analytics","Your personal collection","Regular collection",diff --git a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsxindex 5026ad4a894..5050b10e4ff 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx@@ -63,9 +63,7 @@ const setup = ({setupCollectionByIdEndpoint({ collections: allCollections });setupAuditInfoEndpoint();- const entitiesState = createMockEntitiesState({- collections: allCollections,- });+ const entitiesState = createMockEntitiesState({});const state = createMockState({ currentUser: user, entities: entitiesState });renderWithProviders(<TestComponent collectionId={collectionId} />, {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsxindex e9da163fd80..5a8f3d36af4 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.unit.spec.tsx@@ -6,7 +6,6 @@ import {setupUpdateCollectionEndpoint,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";-import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import {@@ -55,7 +54,6 @@ function setup({remote_sync: true,}),}),- entities: createMockEntitiesState({ collections: [parentCollection] }),}),},);diff --git a/frontend/src/metabase/api/collection.ts b/frontend/src/metabase/api/collection.tsindex 09e2f52b57e..4d4bdede484 100644--- a/frontend/src/metabase/api/collection.ts+++ b/frontend/src/metabase/api/collection.ts@@ -1,8 +1,4 @@-import {- CollectionSchema,- ObjectUnionSchema,- SnippetCollectionSchema,-} from "metabase/schema";+import { ObjectUnionSchema } from "metabase/schema";import type {Collection,CollectionItemModel,@@ -33,22 +29,6 @@ import {} from "./tags";import { hydrateMetadataStore } from "./utils/hydrate-metadata-store";-const flattenCollectionTree = (tree: Collection[]): Collection[] =>- tree.flatMap((collection) => [- collection,- ...flattenCollectionTree(collection.children ?? []),- ]);--// Snippet collections live in their own entity slice (`snippetCollections`),-// so hydrating them through `CollectionSchema` would clobber regular-// collections. Hydrate through the matching schema instead.-const collectionSchemaForRequest = (- request: { namespace?: string | null } | void,-) =>- request?.namespace === "snippets"- ? SnippetCollectionSchema- : CollectionSchema;-const getCollectionItemTagModels = (models: ListCollectionItemsRequest["models"],): CollectionItemModel[] | undefined =>@@ -71,11 +51,6 @@ export const collectionApi = Api.injectEndpoints({}),providesTags: (collections = []) =>provideCollectionListTags(collections),- onQueryStarted: (request, lifecycle) =>- hydrateMetadataStore([collectionSchemaForRequest(request)])(- request,- lifecycle,- ),},),listCollectionsTree: builder.query<@@ -91,11 +66,6 @@ export const collectionApi = Api.injectEndpoints({...provideCollectionListTags(collections),"collection-tree",],- onQueryStarted: (request, lifecycle) =>- hydrateMetadataStore<Collection[]>(- [collectionSchemaForRequest(request)],- flattenCollectionTree,- )(request, lifecycle),}),listCollectionItems: builder.query<ListCollectionItemsResponse,@@ -129,11 +99,6 @@ export const collectionApi = Api.injectEndpoints({},providesTags: (collection) =>collection ? provideCollectionTags(collection) : [],- onQueryStarted: (request, lifecycle) =>- hydrateMetadataStore(collectionSchemaForRequest(request))(- request,- lifecycle,- ),}),getCollectionPermissionsGraph: builder.query<CollectionPermissionsGraph,diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsxindex eb97551b9be..c416cd6d07a 100644--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx@@ -10,7 +10,6 @@ import {setupRecentViewsAndSelectionsEndpoints,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";-import { createMockEntitiesState } from "__support__/store";import {mockGetBoundingClientRect,renderWithProviders,@@ -93,7 +92,6 @@ function setup({ mockCreateDashboardResponse = true } = {}) {renderWithProviders(<CreateDashboardModal opened onClose={onClose} />, {storeInitialState: {- entities: createMockEntitiesState({ collections }),settings,},});diff --git a/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsxindex 261fc684fb7..522449a01e5 100644--- a/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx@@ -5,7 +5,6 @@ import {setupCollectionByIdEndpoint,setupUpdateCollectionEndpoint,} from "__support__/server-mocks";-import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import type { Collection, CollectionItem } from "metabase-types/api";@@ -45,11 +44,7 @@ function setup(collection: Collection | CollectionItem) {onSave={onSave}/>,{- storeInitialState: createMockState({- entities: createMockEntitiesState({- collections: [parentCollection, itemParentCollection],- }),- }),+ storeInitialState: createMockState({}),},);diff --git a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsxindex 954eb97b296..a1cd64c1077 100644--- a/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsx@@ -5,7 +5,6 @@ import {setupCollectionsEndpoints,} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";-import { createMockEntitiesState } from "__support__/store";import { renderWithProviders } from "__support__/ui";import { createMockState } from "metabase/redux/store/mocks";import { Route } from "metabase/router";@@ -113,9 +112,6 @@ export const setup = ({storeInitialState: createMockState({currentUser: user,settings,- entities: createMockEntitiesState({- collections,- }),}),},);diff --git a/frontend/src/metabase/common/collections/hooks.unit.spec.tsx b/frontend/src/metabase/common/collections/hooks.unit.spec.tsxindex 9daa980cb3c..ac98ff381c7 100644--- a/frontend/src/metabase/common/collections/hooks.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/hooks.unit.spec.tsx@@ -67,9 +67,7 @@ const setup = ({];setupCollectionByIdEndpoint({ collections: allCollections });- const entitiesState = createMockEntitiesState({- collections: allCollections,- });+ const entitiesState = createMockEntitiesState({});const state = createMockState({ currentUser: user, entities: entitiesState });renderWithProviders(diff --git a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.tsindex 9b7bf07c0c1..eded4a8e1a5 100644--- a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts@@ -253,7 +253,6 @@ describe("setParameterMapping", () => {},}),entities: {- collections: {},dashboards: {},databases: {},schemas: {},@@ -369,7 +368,6 @@ describe("setParameterMapping", () => {},}),entities: {- collections: {},dashboards: {},databases: {},schemas: {},diff --git a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsxindex b67db2c2f69..e33a98e7081 100644--- a/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/data-model/components/TableSection/components/TableCollection.unit.spec.tsx@@ -1,5 +1,5 @@import { setupCollectionByIdEndpoint } from "__support__/server-mocks";-import { renderWithProviders, screen } from "__support__/ui";+import { renderWithProviders, screen, waitFor } from "__support__/ui";import { Route } from "metabase/router";import type { Collection, Table } from "metabase-types/api";import {@@ -61,9 +61,11 @@ describe("TableCollection", () => {// Must expand the Data root (6) AND the collection itself (8) so the// referenced collection is actually revealed — not just the library root.- expect(link).toHaveAttribute(- "href",- "/data-studio/library?expandedId=6&expandedId=8",+ await waitFor(() =>+ expect(link).toHaveAttribute(+ "href",+ "/data-studio/library?expandedId=6&expandedId=8",+ ),);});diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsxindex e7c898f2b39..ac07ee04039 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx@@ -124,7 +124,6 @@ export const setup = ({currentUser: createMockUser(user),entities: createMockEntitiesState({databases,- collections,}),settings: mockSettings(settingValues),});diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.tsindex 5841cb40e07..a25be32bee0 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/use-add-data-state.unit.spec.ts@@ -25,7 +25,6 @@ function setup({currentUser: createMockUser({ is_superuser: false }),entities: createMockEntitiesState({databases: [database],- collections: [],}),settings: mockSettings({// Deliberately out of sync: the hook must ignore this stale setting.diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.tsindex 953f89f068e..ce24a9b56a7 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/use-can-add-data.unit.spec.ts@@ -46,7 +46,6 @@ function setup({currentUser,entities: createMockEntitiesState({databases: [database],- collections: [],}),settings: mockSettings({"token-features": createMockTokenFeatures({ advanced_permissions: true }),diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsxindex d3a66c012ee..c0aabd6240c 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.unit.spec.tsx@@ -84,9 +84,9 @@ describe("SavedEntityPicker", () => {it("shows the current user personal collection on the top after the root", async () => {await setup();- expect(- screen.getAllByTestId("tree-item-name").map((node) => node.textContent),- ).toEqual([+ const treeItems = await screen.findAllByTestId("tree-item-name");++ expect(treeItems.map((node) => node.textContent)).toEqual(["Our analytics","Your personal collection","Regular collection",diff --git a/frontend/src/metabase/redux/entities/index.ts b/frontend/src/metabase/redux/entities/index.tsindex 35c0fe141d4..fef184cef92 100644--- a/frontend/src/metabase/redux/entities/index.ts+++ b/frontend/src/metabase/redux/entities/index.ts@@ -15,7 +15,6 @@ type SliceReducer = Reducer<SliceState>;* `metabase/entities/UPDATE` (see `hydrateMetadataStore`).*/const ENTITY_SLICE_NAMES = [- "collections","dashboards","databases","fields",diff --git a/frontend/src/metabase/redux/entities/index.unit.spec.ts b/frontend/src/metabase/redux/entities/index.unit.spec.tsindex 27a6c3339ed..ea4700bf11a 100644--- a/frontend/src/metabase/redux/entities/index.unit.spec.ts+++ b/frontend/src/metabase/redux/entities/index.unit.spec.ts@@ -7,7 +7,6 @@ describe("entities reducer", () => {const state = reducer(undefined, { type: "@@INIT" });expect(state).toEqual({- collections: {},dashboards: {},databases: {},fields: {},diff --git a/frontend/src/metabase/redux/store/entities.ts b/frontend/src/metabase/redux/store/entities.tsindex 3a7417f4572..80cc1dbe8e7 100644--- a/frontend/src/metabase/redux/store/entities.ts+++ b/frontend/src/metabase/redux/store/entities.ts@@ -1,6 +1,5 @@import type {NormalizedCard,- NormalizedCollection,NormalizedDashboard,NormalizedDatabase,NormalizedField,@@ -26,7 +25,6 @@ export const entityTypeForObject = (object ? entityTypeForModel(object.model) : undefined;export interface EntitiesState {- collections: Record<string, NormalizedCollection>;dashboards: Record<string, NormalizedDashboard>;databases: Record<string, NormalizedDatabase>;schemas: Record<string, NormalizedSchema>;diff --git a/frontend/src/metabase/redux/store/mocks/entities.ts b/frontend/src/metabase/redux/store/mocks/entities.tsindex 2460db29dde..ec82b126e17 100644--- a/frontend/src/metabase/redux/store/mocks/entities.ts+++ b/frontend/src/metabase/redux/store/mocks/entities.ts@@ -3,7 +3,6 @@ import type { EntitiesState } from "metabase/redux/store";// This is a helper for cases when entities state doesn't matter// Most likely, createMockEntitiesState from __support__/store would be a better choiceexport const createMockNormalizedEntitiesState = (): EntitiesState => ({- collections: {},dashboards: {},databases: {},schemas: {},diff --git a/frontend/test/__support__/store.ts b/frontend/test/__support__/store.tsindex 7f58de759df..5575e4244dd 100644--- a/frontend/test/__support__/store.ts+++ b/frontend/test/__support__/store.ts@@ -4,7 +4,6 @@ import { normalize } from "normalizr";import type { EntitiesState } from "metabase/redux/store";import { createMockNormalizedEntitiesState } from "metabase/redux/store/mocks";import {- CollectionSchema,DashboardSchema,DatabaseSchema,FieldSchema,@@ -18,7 +17,6 @@ import {} from "metabase/schema";import type {Card,- Collection,Dashboard,Database,Field,@@ -32,7 +30,6 @@ import type {} from "metabase-types/api";export interface EntitiesStateOpts {- collections?: Collection[];dashboards?: Dashboard[];databases?: (Database | SavedQuestionDatabase)[];schemas?: Schema[];@@ -46,7 +43,6 @@ export interface EntitiesStateOpts {}const EntitiesSchema: Record<keyof EntitiesState, NormalizrSchema<any>> = {- collections: [CollectionSchema],dashboards: [DashboardSchema],databases: [DatabaseSchema],schemas: [SchemaSchema],