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
Move collections frontend module to the feature tier (#75986)
Romeo Van Snick4b32e29e2977
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsxindex 57af03cc660..90c7c5c1784 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/tests/DataSourceSelector.unit.spec.tsx@@ -8,7 +8,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { getNextId } from "__support__/utils";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type { EmbeddingEntityType } from "metabase/redux/store/embedding-data-picker";import {createMockSettingsState,diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsxindex 340db9b2651..a28279c2e52 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx@@ -2,7 +2,7 @@ import { Fragment } from "react";import { t } from "ttag";import { skipToken, useListCollectionItemsQuery } from "metabase/api";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { SelectList } from "metabase/common/components/SelectList";diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsxindex 2d459d8db47..6fa9560871c 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.tsx@@ -4,14 +4,14 @@ import {useGetCollectionQuery,useListCollectionsTreeQuery,} from "metabase/api";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";-import type { CollectionTreeItem } from "metabase/collections/utils";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import {buildCollectionTree,currentUserPersonalCollections,isRootPersonalCollection,nonPersonalOrArchivedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { Tree } from "metabase/common/components/tree";import type { ITreeNodeItem } from "metabase/common/components/tree/types";import CS from "metabase/css/core/index.css";diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.tsxindex 8e0cc213cf9..3139b9d15b9 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import _ from "underscore";import { getShortStrategyLabel } from "metabase/admin/performance/utils";-import { getCollectionPathAsString } from "metabase/collections/utils";+import { getCollectionPathAsString } from "metabase/common/collections/utils";import type { CacheableItem } from "../types";diff --git a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.unit.spec.tsxindex 0060e2f8c42..9d6fb992e89 100644--- a/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/caching/components/StrategyEditorForQuestionsAndDashboards/utils.unit.spec.tsx@@ -1,5 +1,5 @@import { getShortStrategyLabel } from "metabase/admin/performance/utils";-import { getCollectionPathAsString } from "metabase/collections/utils";+import { getCollectionPathAsString } from "metabase/common/collections/utils";import { PLUGIN_CACHING, strategies } from "metabase/plugins";import { enterpriseOnlyCachingStrategies } from "metabase-enterprise/caching/constants";import {diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsxindex 27f3659dfad..72626c3c206 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionTable.tsx@@ -1,6 +1,6 @@import { c, t } from "ttag";-import { getCollectionName } from "metabase/collections/utils";+import { getCollectionName } from "metabase/common/collections/utils";import { DateTime } from "metabase/common/components/DateTime";import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";import {diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/utils.ts b/enterprise/frontend/src/metabase-enterprise/clean_up/utils.tsindex 27b08aa5d1d..004be451baa 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/utils.ts@@ -1,7 +1,7 @@import {isInstanceAnalyticsCustomCollection,isTrashedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import type { Collection } from "metabase-types/api";export function canCleanUp(collection: Collection): boolean {diff --git a/enterprise/frontend/src/metabase-enterprise/collections/constants.ts b/enterprise/frontend/src/metabase-enterprise/collections/constants.tsindex 76d9d321e0c..ff3838bb6aa 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/constants.ts+++ b/enterprise/frontend/src/metabase-enterprise/collections/constants.ts@@ -3,7 +3,7 @@ import { t } from "ttag";import type {CollectionAuthorityLevelConfig,CollectionInstanceAnaltyicsConfig,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import type { BaseEntityId } from "metabase-types/api";export const REGULAR_COLLECTION: CollectionAuthorityLevelConfig = {diff --git a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.ts b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.tsindex 54d66e771fb..d2a2d9d8419 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.ts+++ b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.ts@@ -1,5 +1,5 @@import { skipToken, useGetCollectionQuery } from "metabase/api";-import { useOSSGetDefaultCollectionId } from "metabase/collections/hooks";+import { useOSSGetDefaultCollectionId } from "metabase/common/collections/hooks";import { useGetAuditInfoQuery } from "metabase-enterprise/api";import { isInstanceAnalyticsCollection } from "metabase-enterprise/collections/utils";import type { CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts b/enterprise/frontend/src/metabase-enterprise/collections/utils.tsindex eb26f3b4206..2582ad6e006 100644--- a/enterprise/frontend/src/metabase-enterprise/collections/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/collections/utils.ts@@ -3,7 +3,7 @@ import { useCallback } from "react";import type {CollectionAuthorityLevelConfig,CollectionInstanceAnaltyicsConfig,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import type { IconData, ObjectWithModel } from "metabase/common/utils/icon";import { useGetIconBase } from "metabase/hooks/use-icon";import { type ItemWithCollection, PLUGIN_LIBRARY } from "metabase/plugins";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsxindex 5d0fb46ad01..dbc0feaef02 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/ActionCell.tsx@@ -1,4 +1,4 @@-import { CollectionRowMenu } from "metabase/collections/components/CollectionRowMenu";+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";import type { TreeItem } from "metabase/data-studio/common/types";import {isCollectionData,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.tsxindex 8391e80bdae..3be4aa23eec 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/components/LibraryCollectionRowMenu.tsx@@ -2,7 +2,7 @@ import { useCallback } from "react";import { t } from "ttag";import _ from "underscore";-import { CollectionRowMenu } from "metabase/collections/components/CollectionRowMenu";+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";import type { Collection, CollectionId } from "metabase-types/api";type LibraryCollectionRowMenuProps = {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.tsindex 2c41082a5b7..e87032da922 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/LibraryPage/hooks/useLibraryCollections.ts@@ -1,6 +1,6 @@import { useMemo } from "react";-import { isLibraryCollection } from "metabase/collections/utils";+import { isLibraryCollection } from "metabase/common/collections/utils";import type { Collection } from "metabase-types/api";import { getAccessibleCollection } from "../utils";diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsxindex 072358be4b0..d53906150f2 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/PublishTablesModal/PublishTablesModal.tsx@@ -2,7 +2,7 @@ import { push } from "react-router-redux";import { jt, t } from "ttag";import { useGetTableSelectionInfoQuery } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { trackDataStudioTablePublished } from "metabase/data-studio/analytics";import {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsxindex 70d14c1c4d2..463e65882f9 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/components/SnippetHeader/SnippetHeader.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import { useUpdateSnippetMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import { useToast } from "metabase/common/hooks";import { DataStudioBreadcrumbs } from "metabase/data-studio/common/components/DataStudioBreadcrumbs";import {diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsxindex 4da492a47c0..99d5c400c0f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/snippets/pages/ArchivedSnippetsPage/hooks/useColumnDef.tsx@@ -1,7 +1,7 @@import { useMemo } from "react";import { t } from "ttag";-import { CollectionRowMenu } from "metabase/collections/components/CollectionRowMenu";+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";import type { TreeItem } from "metabase/data-studio/common/types";import {isCollectionData,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.tsxindex 09da863ead7..c900fd2b1fd 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/CollectionsNavTree/CollectionsNavTree.tsx@@ -1,7 +1,7 @@import { useCallback, useMemo } from "react";import { useListCollectionsQuery } from "metabase/api";-import type { CollectionTreeItem } from "metabase/collections/utils";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import { Tree } from "metabase/common/components/tree";import type { ITreeNodeItem } from "metabase/common/components/tree/types";import { SidebarCollectionLink } from "metabase/nav/containers/MainNavbar/SidebarItems";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.tsindex 74d928b7803..6fd23c171e7 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/displayGroups.ts@@ -1,7 +1,7 @@import { t } from "ttag";import _ from "underscore";-import { isLibraryCollection } from "metabase/collections/utils";+import { isLibraryCollection } from "metabase/common/collections/utils";import type {Collection,CollectionId,diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.tsindex 919d73c67eb..9303b536d88 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-library-dirty-changes.ts@@ -4,7 +4,7 @@ import { useListCollectionsTreeQuery } from "metabase/api";import {buildCollectionTree,isLibraryCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { getAllDescendantIds } from "metabase/common/components/tree/utils";import type { CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.tsindex a337e5612cc..5fb6e3e9b67 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/hooks/use-has-transform-dirty-changes.ts@@ -1,7 +1,7 @@import { useMemo } from "react";import { useListCollectionsTreeQuery } from "metabase/api";-import { buildCollectionTree } from "metabase/collections/utils";+import { buildCollectionTree } from "metabase/common/collections/utils";import { getAllDescendantIds } from "metabase/common/components/tree/utils";import { useSetting } from "metabase/common/hooks";import { TRANSFORMS_ROOT_ID } from "metabase-enterprise/remote_sync/utils";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelTable/utils.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelTable/utils.tsxindex 6f25edf5d2b..71220631132 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelTable/utils.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ModelTable/utils.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type { TreeTableColumnDef } from "metabase/ui";import { Ellipsified, EntityNameCell } from "metabase/ui";import type { SearchResult } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsxindex 14c57b9962b..33ee7f7d584 100644--- a/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/replacement/pages/MigrateModelsPage/ReplaceWithTransformModal/ReplaceWithTransformModal.tsx@@ -7,7 +7,7 @@ import {useGetDatabaseQuery,useListSyncableDatabaseSchemasQuery,} from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper/DelayedLoadingAndErrorWrapper";import { hasFeature } from "metabase/common/utils/database";import {diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.unit.spec.tsxindex 8294b8305fb..92c7bff3fc8 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.unit.spec.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.unit.spec.tsx@@ -16,7 +16,7 @@ import {waitFor,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type {DatabaseFeature,GroupTableAccessPolicy,diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.tsxindex 5ce1a470255..d7adf6afeff 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.tsx@@ -1,6 +1,6 @@import cx from "classnames";-import { CollectionRowMenu } from "metabase/collections/components/CollectionRowMenu";+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";import CS from "metabase/css/core/index.css";import { Ellipsified, Icon } from "metabase/ui";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/index.js b/enterprise/frontend/src/metabase-enterprise/snippets/index.jsindex 61dbef5cf94..8e8e5ee3a17 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/index.js+++ b/enterprise/frontend/src/metabase-enterprise/snippets/index.js@@ -1,7 +1,7 @@import { t } from "ttag";-import { CollectionRowMenu } from "metabase/collections/components/CollectionRowMenu";-import { canonicalCollectionId } from "metabase/collections/utils";+import { CollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";+import { canonicalCollectionId } from "metabase/common/collections/utils";import {PLUGIN_SNIPPET_FOLDERS,PLUGIN_SNIPPET_SIDEBAR_HEADER_BUTTONS,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsxindex b39cc851a25..2734cfc4e12 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/MainNavSharedCollections/MainNavSharedCollections.tsx@@ -5,9 +5,9 @@ import {useCreateCollectionMutation,useListCollectionsQuery,} from "metabase/api";-import { CreateCollectionForm } from "metabase/collections/components/CreateCollectionForm";-import type { CreateCollectionProperties } from "metabase/collections/components/CreateCollectionForm/CreateCollectionForm";-import { buildCollectionTree } from "metabase/collections/utils";+import { CreateCollectionForm } from "metabase/common/collections/components/CreateCollectionForm";+import type { CreateCollectionProperties } from "metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm";+import { buildCollectionTree } from "metabase/common/collections/utils";import { Tree } from "metabase/common/components/tree";import { useSetting } from "metabase/common/hooks";import {diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsxindex b2cda09a324..8ce8bf21d46 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionList/TenantCollectionList.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { CollectionListView } from "metabase/common/components/CollectionListView";import * as Urls from "metabase/urls";import { useListTenantsQuery } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsxindex a42542a2323..7c54faad847 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx@@ -23,8 +23,8 @@ import {isDefaultGroup,} from "metabase/admin/utils/groups";import { collectionApi } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import { getCollectionIcon } from "metabase/collections/utils";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { getCollectionIcon } from "metabase/common/collections/utils";import { PLUGIN_TENANTS } from "metabase/plugins";import type { ExpandedCollection, State } from "metabase/redux/store";import { isNotNull } from "metabase/utils/types";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsxindex be30b90d19b..9c24583c313 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx@@ -22,8 +22,8 @@ import {isDefaultGroup,} from "metabase/admin/utils/groups";import { collectionApi } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import { getCollectionIcon } from "metabase/collections/utils";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { getCollectionIcon } from "metabase/common/collections/utils";import { findCollectionById } from "metabase/common/utils/collections";import { PLUGIN_TENANTS } from "metabase/plugins";import type { ExpandedCollection, State } from "metabase/redux/store";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsxindex e914663f5cf..0926836387a 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersList/TenantUsersList.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { CollectionListView } from "metabase/common/components/CollectionListView";import * as Urls from "metabase/urls";import { useListTenantsQuery } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsxindex 8e4eab224a3..a7e8f0d9f36 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantUsersPersonalCollectionList/TenantUsersPersonalCollectionList.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { useListUsersQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { CollectionListView } from "metabase/common/components/CollectionListView";import * as Urls from "metabase/urls";import { useGetTenantQuery } from "metabase-enterprise/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsxindex fd6996fd7b7..0244d4af611 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx@@ -16,7 +16,7 @@ import {type CollectionTreeItem,buildCollectionTree,getCollectionIcon,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { useSetting } from "metabase/common/hooks/use-setting";import { ModalRoute } from "metabase/hoc/ModalRoute";import {diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex c83ee5bcec0..71a24f4adb6 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -53,7 +53,7 @@ const elements = [createElement({ type: "shared", name: "archive" }),createElement({ type: "feature", name: "auth" }),createElement({ type: "feature", name: "browse" }),- createElement({ type: "shared", name: "collections" }),+ createElement({ type: "feature", name: "collections" }),createElement({ type: "shared", name: "comments" }),createElement({ type: "shared", name: "common" }),createElement({diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/setup.spec.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/setup.spec.tsxindex 1941e6f5d97..1851e2e8232 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/setup.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/setup.spec.tsx@@ -25,7 +25,7 @@ import { createMockSdkConfig } from "embedding-sdk-bundle/test/mocks/config";import { setupSdkState } from "embedding-sdk-bundle/test/server-mocks/sdk-init";import type { SdkCollectionId } from "embedding-sdk-bundle/types";import type { SdkBreadcrumbItemType } from "embedding-sdk-bundle/types/breadcrumb";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { useLocale } from "metabase/common/hooks/use-locale";import { Stack } from "metabase/ui";import {diff --git a/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.unit.spec.tsxindex 59e47f09d7d..9ee7c3ff503 100644--- a/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.unit.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/CollectionBrowser/CollectionBrowser.unit.spec.tsx@@ -13,7 +13,7 @@ import {import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/ui";import { createMockSdkConfig } from "embedding-sdk-bundle/test/mocks/config";import { setupSdkState } from "embedding-sdk-bundle/test/server-mocks/sdk-init";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { useLocale } from "metabase/common/hooks/use-locale";import type { Collection, CollectionItem, User } from "metabase-types/api";import {diff --git a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.unit.spec.tsxindex 2db5b17be30..ad1c336a859 100644--- a/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.unit.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/CreateDashboardModal/CreateDashboardModal.unit.spec.tsx@@ -9,7 +9,7 @@ import { screen, waitFor } from "__support__/ui";import { getNextId } from "__support__/utils";import { renderWithSDKProviders } from "embedding-sdk-bundle/test/__support__/ui";import { createMockSdkConfig } from "embedding-sdk-bundle/test/mocks/config";-import { ROOT_COLLECTION as ROOT } from "metabase/collections/constants";+import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";import { useLocale } from "metabase/common/hooks/use-locale";import type { Collection, Dashboard } from "metabase-types/api";import {diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/enterprise.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/enterprise.unit.spec.tsxindex 5238cec0136..7536b11c69c 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/enterprise.unit.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/enterprise.unit.spec.tsx@@ -7,7 +7,7 @@ import {setupSearchEndpoints,} from "__support__/server-mocks";import { screen, waitFor, within } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockCollection } from "metabase-types/api/mocks";import { addEnterpriseAutoRefreshTests } from "../shared-tests/auto-refresh.spec";diff --git a/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/premium.unit.spec.tsx b/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/premium.unit.spec.tsxindex 1fbfea54cc0..8f157b4f85c 100644--- a/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/premium.unit.spec.tsx+++ b/frontend/src/embedding-sdk-bundle/components/public/dashboard/EditableDashboard/premium.unit.spec.tsx@@ -7,7 +7,7 @@ import {setupSearchEndpoints,} from "__support__/server-mocks";import { screen, within } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockCollection } from "metabase-types/api/mocks";import { addPremiumAutoRefreshTests } from "../shared-tests/auto-refresh.spec";diff --git a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsxindex 811e8da36db..70dc7155a6e 100755--- a/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx+++ b/frontend/src/metabase/admin/ai/MetabotSettingsPanel.tsx@@ -10,7 +10,7 @@ import {useUpdateMetabotMutation,} from "metabase/api";import { useAdminSetting } from "metabase/api/utils/settings";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";import { useToast } from "metabase/common/hooks";diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxindex edb383bd134..4aa877d360f 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import _ from "underscore";import { useListCollectionsTreeQuery } from "metabase/api";-import { isPersonalCollectionChild } from "metabase/collections/utils";+import { isPersonalCollectionChild } from "metabase/common/collections/utils";import { Link } from "metabase/common/components/Link";import { ModalContent } from "metabase/common/components/ModalContent";import CS from "metabase/css/core/index.css";diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsxindex 78a2d09fa23..9af97d82df2 100644--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx@@ -10,13 +10,13 @@ import {isDefaultGroup,} from "metabase/admin/utils/groups";import { collectionApi } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import {getCollectionIcon,isInstanceAnalyticsCollection,isLibraryCollection,nonPersonalOrArchivedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";import type {CollectionTreeItem,diff --git a/frontend/src/metabase/app/nav/AppBar.tsx b/frontend/src/metabase/app/nav/AppBar.tsxindex 699ac416118..7e6071e43bf 100644--- a/frontend/src/metabase/app/nav/AppBar.tsx+++ b/frontend/src/metabase/app/nav/AppBar.tsx@@ -13,7 +13,7 @@ import {getIsQuestionLineageVisible,getIsSearchVisible,} from "metabase/app/selectors";-import { useInitialCollectionId } from "metabase/collections/hooks";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import {getCommentSidebarOpen,getSidebarOpen,diff --git a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsxindex 9fe8f4a66ad..53a9eb77829 100644--- a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx+++ b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx@@ -16,7 +16,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import {CLOSE_NAVBAR,OPEN_NAVBAR,diff --git a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx b/frontend/src/metabase/browse/components/BrowseDataHeader.tsxindex c84be6067d0..67a072b008f 100644--- a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx+++ b/frontend/src/metabase/browse/components/BrowseDataHeader.tsx@@ -1,7 +1,7 @@import { Link } from "react-router";import { t } from "ttag";-import { trackDataReferenceClicked } from "metabase/collections/analytics";+import { trackDataReferenceClicked } from "metabase/common/collections/analytics";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";import { Flex, Group, Icon, Text, Title } from "metabase/ui";diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex b5991f5ac10..ce72e4a368f 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -8,7 +8,7 @@ import {useDeleteBookmarkMutation,} from "metabase/api";import { useSetArchive } from "metabase/archive/hooks";-import { getCollectionName } from "metabase/collections/utils";+import { getCollectionName } from "metabase/common/collections/utils";import { EllipsifiedCollectionPath } from "metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath";import { EntityItem } from "metabase/common/components/EntityItem";import { SortableColumnHeader } from "metabase/common/components/ItemsTable/BaseItemsTable";diff --git a/frontend/src/metabase/browse/metrics/utils.ts b/frontend/src/metabase/browse/metrics/utils.tsindex 85e3af4ff79..cee77003055 100644--- a/frontend/src/metabase/browse/metrics/utils.ts+++ b/frontend/src/metabase/browse/metrics/utils.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { getCollectionPathAsString } from "metabase/collections/utils";+import { getCollectionPathAsString } from "metabase/common/collections/utils";import { formatValue } from "metabase/visualizations/lib/formatting";import { isDate } from "metabase-lib/v1/types/utils/isa";import type { Dataset, SortingOptions } from "metabase-types/api";diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex 6d5af42b7f0..23ec9725661 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -3,7 +3,7 @@ import { type MouseEvent, useCallback, useState } from "react";import { push } from "react-router-redux";import { t } from "ttag";-import { getCollectionName } from "metabase/collections/utils";+import { getCollectionName } from "metabase/common/collections/utils";import { EllipsifiedCollectionPath } from "metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath";import { EntityIcon } from "metabase/common/components/EntityIcon";import { EntityItem } from "metabase/common/components/EntityItem";diff --git a/frontend/src/metabase/browse/models/RecentModels.tsx b/frontend/src/metabase/browse/models/RecentModels.tsxindex 910be0be93f..e2c844a0000 100644--- a/frontend/src/metabase/browse/models/RecentModels.tsx+++ b/frontend/src/metabase/browse/models/RecentModels.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import PinnedItemCard from "metabase/collections/components/PinnedItemCard";+import PinnedItemCard from "metabase/common/collections/components/PinnedItemCard";import { Box, Repeat, Text } from "metabase/ui";import type { RecentCollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/browse/models/utils.ts b/frontend/src/metabase/browse/models/utils.tsindex 1c9b95168b0..5e62d5f7a75 100644--- a/frontend/src/metabase/browse/models/utils.ts+++ b/frontend/src/metabase/browse/models/utils.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { getCollectionPathAsString } from "metabase/collections/utils";+import { getCollectionPathAsString } from "metabase/common/collections/utils";import type {RecentItem,SearchResult,diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsxindex 1d685726063..ffbe705a751 100644--- a/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/ArchivedBulkActions.tsx@@ -7,7 +7,7 @@ import {useDeleteItem,useSetArchive,} from "metabase/archive/hooks";-import { isRootTrashCollection } from "metabase/collections/utils";+import { isRootTrashCollection } from "metabase/common/collections/utils";import {BulkActionButton,BulkActionDangerButton,diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsxindex 4a6b5522abc..ac146a56ef0 100644--- a/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/CollectionBulkActions.tsx@@ -3,7 +3,11 @@ import { msgid, ngettext } from "ttag";import _ from "underscore";import CollectionCopyEntityModal from "metabase/collections/components/CollectionCopyEntityModal";-import { isTrashedCollection } from "metabase/collections/utils";+import {+ type Destination,+ QuestionMoveConfirmModal,+} from "metabase/common/collections/components/QuestionMoveConfirmModal";+import { isTrashedCollection } from "metabase/common/collections/utils";import { BulkActionBar } from "metabase/common/components/BulkActionBar";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { BulkMoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";@@ -15,10 +19,6 @@ import {import type { Collection, CollectionItem } from "metabase-types/api";import { ArchivedBulkActions } from "./ArchivedBulkActions";-import {- type Destination,- QuestionMoveConfirmModal,-} from "./QuestionMoveConfirmModal";import { UnarchivedBulkActions } from "./UnarchivedBulkActions";type CollectionBulkActionsProps = {diff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx b/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsxindex b232ca501d9..0083474d4ee 100644--- a/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx+++ b/frontend/src/metabase/collections/components/CollectionBulkActions/UnarchivedBulkActions.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { archiveAndTrack } from "metabase/archive/analytics";import { useSetArchive } from "metabase/archive/hooks";-import { canArchiveItem } from "metabase/collections/utils";+import { canArchiveItem } from "metabase/common/collections/utils";import { BulkActionButton } from "metabase/common/components/BulkActionBar";import { canMoveItem } from "metabase/common/hooks";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsxnew file mode 100644index 00000000000..6e97dafaeb8--- /dev/null+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentUpload.unit.spec.tsx@@ -0,0 +1,434 @@+import userEvent from "@testing-library/user-event";+import fetchMock from "fetch-mock";+import { Route } from "react-router";++import {+ setupBookmarksEndpoints,+ setupCollectionByIdEndpoint,+ setupCollectionItemsEndpoint,+ setupCollectionsEndpoints,+ setupDashboardQuestionCandidatesEndpoint,+ setupDatabasesEndpoints,+ setupNullGetUserKeyValueEndpoints,+ setupSearchEndpoints,+ setupUserMetabotPermissionsEndpoint,+} from "__support__/server-mocks";+import {+ act,+ renderWithProviders,+ screen,+ waitFor,+ within,+} from "__support__/ui";+import {+ createMockSettingsState,+ createMockState,+} from "metabase/redux/store/mocks";+import { FileUploadStatus } from "metabase/status/components/FileUploadStatus/FileUploadStatus";+import {+ createMockCollection,+ createMockCollectionItem,+ createMockDatabase,+} from "metabase-types/api/mocks";++import { CollectionContent } from "./CollectionContent";++const firstCollectionId = 1;+const firstCollection = createMockCollection({+ id: firstCollectionId,+ can_write: true,+});++const secondCollectionId = 2;+const secondCollection = createMockCollection({+ id: secondCollectionId,+ name: "Second Collection",+});++const thirdCollection = createMockCollection({+ id: 3,+ name: "Second Collection",+});++const uploadedModel = createMockCollectionItem({+ id: 3,+ name: "my uploaded model",+ collection: secondCollection,+ model: "dataset",+ based_on_upload: 123,+});++const uploadedModel2 = createMockCollectionItem({+ id: 4,+ name: "my second uploaded model",+ collection: secondCollection,+ model: "dataset",+ based_on_upload: 124,+});++async function setupCollectionContent(overrides = {}) {+ setupUserMetabotPermissionsEndpoint();+ setupDatabasesEndpoints([createMockDatabase({ can_upload: true })]);+ setupSearchEndpoints([]);+ setupBookmarksEndpoints([]);+ setupNullGetUserKeyValueEndpoints();+ setupDashboardQuestionCandidatesEndpoint([]);++ const settings = createMockSettingsState({+ "uploads-settings": {+ db_id: 1,+ schema_name: null,+ table_prefix: null,+ },+ });++ renderWithProviders(+ <Route+ path="/"+ component={() => {+ return (+ <>+ <CollectionContent+ collectionId={firstCollectionId}+ {...overrides}+ />+ <FileUploadStatus />+ </>+ );+ }}+ />,+ {+ withRouter: true,+ withDND: true,+ storeInitialState: createMockState({+ settings,+ }),+ },+ );++ // wait for loading to complete+ await screen.findByTestId("upload-input");+}++describe("CollectionContent file uploads", () => {+ beforeEach(() => {+ setupCollectionByIdEndpoint({+ collections: [firstCollection, secondCollection, thirdCollection],+ });+ setupCollectionsEndpoints({+ collections: [firstCollection, secondCollection, thirdCollection],+ });+ setupCollectionItemsEndpoint({+ collection: firstCollection,+ collectionItems: [],+ });+ setupCollectionItemsEndpoint({+ collection: secondCollection,+ collectionItems: [uploadedModel],+ });+ setupCollectionItemsEndpoint({+ collection: thirdCollection,+ collectionItems: [uploadedModel, uploadedModel2],+ });+ fetchMock.get(+ "path:/api/table/123",+ createMockCollection({+ id: 123,+ name: "Fancy Table",+ }),+ );+ });++ afterEach(() => {+ jest.useRealTimers();+ });++ it("Should show a start exploring link on completion", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post("path:/api/upload/csv", "3", { delay: 1000 });++ await setupCollectionContent();++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText("Uploading data to Collection …"),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(1000);+ });++ expect(+ await screen.findByRole("link", { name: /Start exploring/ }),+ ).toHaveAttribute("href", "/model/3");+ });++ it("Should allow new model creation when an appendable model exists", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post("path:/api/upload/csv", "3", { delay: 1000 });++ await setupCollectionContent({ collectionId: secondCollectionId });++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ expect(+ await screen.findByText("Select upload destination"),+ ).toBeInTheDocument();++ await userEvent.click(screen.getByRole("button", { name: "Create model" }));++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText("Uploading data to Second Collection …"),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(1000);+ });++ expect(+ await screen.findByRole("link", { name: /Start exploring/ }),+ ).toHaveAttribute("href", "/model/3");+ });++ it("Should default to appending to a single selectable model", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post("path:/api/table/123/append-csv", "3", { delay: 1000 });++ await setupCollectionContent({ collectionId: secondCollectionId });++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ expect(+ await screen.findByText("Select upload destination"),+ ).toBeInTheDocument();++ await userEvent.click(screen.getByText("Append to a model"));+ const submitButton = await screen.findByRole("button", {+ name: "Append to model",+ });++ // only appendable model should be pre-selected+ expect(+ await screen.findByRole("textbox", { name: "Select a model" }),+ ).toHaveValue("my uploaded model");++ await waitFor(() => expect(submitButton).toBeEnabled());+ await userEvent.click(submitButton);++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText(/Uploading data to Fancy Table/i),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(1000);+ });++ expect(+ await screen.findByRole("link", { name: /Start exploring/ }),+ ).toHaveAttribute("href", "/model/3");+ });++ it("Should allow selecting from appendable models", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post("path:/api/table/123/append-csv", "3", { delay: 1000 });++ await setupCollectionContent({ collectionId: thirdCollection.id });++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ expect(+ await screen.findByText("Select upload destination"),+ ).toBeInTheDocument();++ await userEvent.click(screen.getByText("Append to a model"));+ const submitButton = await screen.findByRole("button", {+ name: "Append to model",+ });++ await userEvent.click(await screen.findByPlaceholderText("Select a model"));+ await userEvent.click(+ await within(await screen.findByRole("listbox")).findByText(+ "my uploaded model",+ ),+ );++ await waitFor(() => expect(submitButton).toBeEnabled());+ await userEvent.click(submitButton);++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText(/Uploading data to Fancy Table/i),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(1000);+ });++ expect(+ await screen.findByRole("link", { name: /Start exploring/ }),+ ).toHaveAttribute("href", "/model/3");+ await screen.findByText("Data added to Fancy Table");+ });++ it("Should allow replacing data in a model", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post("path:/api/table/123/replace-csv", "3", { delay: 1000 });++ await setupCollectionContent({ collectionId: thirdCollection.id });++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ expect(+ await screen.findByText("Select upload destination"),+ ).toBeInTheDocument();+ await userEvent.click(screen.getByText("Replace data in a model"));+ const submitButton = await screen.findByRole("button", {+ name: "Replace model data",+ });++ await userEvent.click(await screen.findByPlaceholderText("Select a model"));+ await userEvent.click(+ await within(await screen.findByRole("listbox")).findByText(+ "my uploaded model",+ ),+ );++ await waitFor(() => expect(submitButton).toBeEnabled());+ await userEvent.click(submitButton);++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText(/Uploading data to Fancy Table/i),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(1000);+ });++ expect(+ await screen.findByRole("link", { name: /Start exploring/ }),+ ).toHaveAttribute("href", "/model/3");+ await screen.findByText("Data replaced in Fancy Table");+ });++ it("Should show an error message on error", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post(+ "path:/api/upload/csv",+ {+ throws: {+ data: { message: "Something went wrong", cause: "It's dead Jim" },+ },+ status: 400,+ },+ { delay: 1000 },+ );++ await setupCollectionContent();++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText("Uploading data to Collection …"),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(500);+ });++ expect(+ await screen.findByText("Error uploading your file"),+ ).toBeInTheDocument();++ await userEvent.click(await screen.findByText("Show error details"));++ expect(await screen.findByRole("dialog")).toBeInTheDocument();++ expect(await screen.findByText("Something went wrong")).toBeInTheDocument();+ });++ describe("loading state", () => {+ it("should rotate loading messages after 30 seconds", async () => {+ jest.useFakeTimers({ advanceTimers: true });+ fetchMock.post("path:/api/upload/csv", "3", { delay: 90 * 1000 });++ await setupCollectionContent();++ await userEvent.upload(+ screen.getByTestId("upload-input"),+ new File(["foo, bar"], "test.csv", { type: "text/csv" }),+ );++ act(() => {+ jest.advanceTimersByTime(1 * 1000);+ });++ expect(+ await screen.findByText("Uploading data to Collection …"),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(30 * 1000);+ });++ expect(await screen.findByText("Still working …")).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(30 * 1000);+ });++ expect(+ await screen.findByText("Arranging bits and bytes …"),+ ).toBeInTheDocument();++ act(() => {+ jest.advanceTimersByTime(30 * 1000);+ });++ expect(+ await screen.findByRole("link", { name: /Start exploring/ }),+ ).toHaveAttribute("href", "/model/3");+ });+ });+});diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsxindex cab9c0a6843..6398475efe3 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx@@ -15,7 +15,6 @@ import {import { listTag } from "metabase/api/tags";import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner";import { useSetArchive } from "metabase/archive/hooks";-import { trackCollectionBookmarked } from "metabase/collections/analytics";import { CollectionBulkActions } from "metabase/collections/components/CollectionBulkActions";import {type CollectionContentTableColumn,@@ -23,17 +22,19 @@ import {} from "metabase/collections/components/CollectionContent/constants";import PinnedItemOverview from "metabase/collections/components/PinnedItemOverview";import Header from "metabase/collections/containers/CollectionHeader";+import { trackCollectionBookmarked } from "metabase/common/collections/analytics";+import { getComposedDragProps } from "metabase/common/collections/dropzone";import type {CollectionOrTableIdProps,CreateBookmark,DeleteBookmark,OnFileUpload,UploadFile,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import {isRootTrashCollection,isTrashedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utils";import { ItemsDragLayer } from "metabase/common/components/dnd/ItemsDragLayer";import { useSetCollection, useToast } from "metabase/common/hooks";@@ -54,7 +55,6 @@ import UploadOverlay from "../UploadOverlay";import { CollectionMain, CollectionRoot } from "./CollectionContent.styled";import { CollectionItemsTable } from "./CollectionItemsTable";-import { getComposedDragProps } from "./utils";const itemKeyFn = (item: CollectionItem) => `${item.id}:${item.model}`;diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsxindex f62f3f90e7b..0bb5bf65b4e 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx@@ -18,8 +18,8 @@ import CollectionEmptyState from "metabase/collections/components/CollectionEmptimport type {CreateBookmark,DeleteBookmark,-} from "metabase/collections/types";-import { isRootTrashCollection } from "metabase/collections/utils";+} from "metabase/common/collections/types";+import { isRootTrashCollection } from "metabase/common/collections/utils";import { ItemsTable } from "metabase/common/components/ItemsTable";import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utils";import { PaginationControls } from "metabase/common/components/PaginationControls";diff --git a/frontend/src/metabase/collections/components/CollectionContent/constants.ts b/frontend/src/metabase/collections/components/CollectionContent/constants.tsindex 38c4cc9adfa..90dfbc9c44e 100644--- a/frontend/src/metabase/collections/components/CollectionContent/constants.ts+++ b/frontend/src/metabase/collections/components/CollectionContent/constants.ts@@ -1,32 +1,12 @@import type { CollectionItemModel } from "metabase-types/api";-export const COLLECTION_PAGE_SIZE = 25;--// eslint-disable-next-line @typescript-eslint/no-unused-vars -- used for types-const COLLECTION_CONTENT_COLUMNS = [- "type",- "name",- "description",- "lastEditedBy",- "lastEditedAt",- "actionMenu",- "archive",-] as const;--export type CollectionContentTableColumn =- (typeof COLLECTION_CONTENT_COLUMNS)[number];+export type {+ CollectionContentTableColumn,+ CollectionContentTableColumnsMap,+} from "metabase/common/collections/columns";+export { DEFAULT_VISIBLE_COLUMNS_LIST } from "metabase/common/collections/columns";-export type CollectionContentTableColumnsMap = {- [key in CollectionContentTableColumn]: true;-};--export const DEFAULT_VISIBLE_COLUMNS_LIST: CollectionContentTableColumn[] = [- "type",- "name",- "lastEditedBy",- "lastEditedAt",- "actionMenu",-];+export const COLLECTION_PAGE_SIZE = 25;export const ALL_MODELS: CollectionItemModel[] = ["dashboard",diff --git a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsxindex 1e445a41613..ef7ea18f9cf 100644--- a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx+++ b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx@@ -6,7 +6,7 @@ import {useCopyDashboardMutation,useCopyDocumentMutation,} from "metabase/api";-import { useInitialCollectionId } from "metabase/collections/hooks";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import { CopyModal } from "metabase/common/components/CopyModal";import { entityTypeForObject } from "metabase/redux/store/entities";diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsxindex 4186661f3df..3e839082c28 100644--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx@@ -5,7 +5,7 @@ import EmptyStateIcon from "assets/img/empty-states/collection.svg";import {isLibraryCollection,isRootTrashCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { NewItemMenu } from "metabase/common/components/NewItemMenu";import { canAccessDataStudio } from "metabase/data-studio/selectors";import { PLUGIN_LIBRARY } from "metabase/plugins";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionBookmark.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionBookmark.tsxindex c7e40aaa2a7..cb52f66677f 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionBookmark.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionBookmark.tsx@@ -1,6 +1,6 @@import { useCallback } from "react";-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsxindex d0d2de9396d..c5f0658ade8 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx@@ -5,7 +5,7 @@ import {isEditableCollection,isInstanceAnalyticsCollection,isRootTrashCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import {PLUGIN_COLLECTIONS,PLUGIN_COLLECTION_COMPONENTS,diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsxindex a45451f962f..a22bee2082c 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionHeader.tsx@@ -4,7 +4,7 @@ import {isInstanceAnalyticsCollection,isLibraryCollection,isTrashedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import type { Collection } from "metabase-types/api";import { CollectionMenu } from "../CollectionMenu";diff --git a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsxindex c75b9d7e240..97bcc80b35a 100644--- a/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx+++ b/frontend/src/metabase/collections/components/CollectionMenu/CollectionMenu.tsx@@ -7,7 +7,7 @@ import {isPersonalCollection,isRootCollection,isRootPersonalCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { ForwardRefLink } from "metabase/common/components/Link";import { useHasDashboardQuestionCandidates } from "metabase/common/components/MoveQuestionsIntoDashboardsModal/hooks";import { UserHasSeenAll } from "metabase/common/components/UserHasSeen/UserHasSeenAll";diff --git a/frontend/src/metabase/collections/components/ModelUploadModal.tsx b/frontend/src/metabase/collections/components/ModelUploadModal.tsxindex 6be0b072151..b2b9d9de398 100644--- a/frontend/src/metabase/collections/components/ModelUploadModal.tsx+++ b/frontend/src/metabase/collections/components/ModelUploadModal.tsx@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState } from "react";import { t } from "ttag";import { useListCollectionItemsQuery } from "metabase/api";+import type { OnFileUpload } from "metabase/common/collections/types";import { UploadMode } from "metabase/redux/store/upload";import {Button,@@ -15,8 +16,6 @@ import {} from "metabase/ui";import type { CollectionId, TableId } from "metabase-types/api";-import type { OnFileUpload } from "../types";-import { findLastEditedCollectionItem } from "./utils";export function ModelUploadModal({diff --git a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsxindex 414edebbf35..6b5aec7cb61 100644--- a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx+++ b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx@@ -5,7 +5,7 @@ import { skipToken, useGetCollectionQuery } from "metabase/api";import type {MoveDestination,OnMoveWithSourceAndDestination,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";import { useSetCollection } from "metabase/common/hooks";diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsxindex 39d6c03db34..268d9d063aa 100644--- a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.tsx@@ -1,15 +1,18 @@import { t } from "ttag";import _ from "underscore";-import PinDropZone from "metabase/collections/components/PinDropZone";-import PinnedItemCard from "metabase/collections/components/PinnedItemCard";import PinnedItemSortDropTarget from "metabase/collections/components/PinnedItemSortDropTarget";import PinnedQuestionCard from "metabase/collections/components/PinnedQuestionCard";+import PinDropZone from "metabase/common/collections/components/PinDropZone";+import PinnedItemCard from "metabase/common/collections/components/PinnedItemCard";import type {CreateBookmark,DeleteBookmark,-} from "metabase/collections/types";-import { isPreviewShown, isRootCollection } from "metabase/collections/utils";+} from "metabase/common/collections/types";+import {+ isPreviewShown,+ isRootCollection,+} from "metabase/common/collections/utils";import { ItemDragSource } from "metabase/common/components/dnd/ItemDragSource";import CS from "metabase/css/core/index.css";import { Box, Group, Icon, Stack } from "metabase/ui";diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsxindex 873ff4c8ae3..b973683a72d 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/PinnedQuestionCard.tsx@@ -1,15 +1,15 @@import cx from "classnames";import { t } from "ttag";-import ActionMenu from "metabase/collections/components/ActionMenu";+import ActionMenu from "metabase/common/collections/components/ActionMenu";import type {CreateBookmark,DeleteBookmark,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import {isFullyParameterized,isPreviewShown,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { EventSandbox } from "metabase/common/components/EventSandbox";import CS from "metabase/css/core/index.css";import { useGetIcon } from "metabase/hooks/use-icon";diff --git a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsxindex d758dd6584f..64c0618245c 100644--- a/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx+++ b/frontend/src/metabase/collections/components/PinnedQuestionCard/test/setup.tsx@@ -6,7 +6,7 @@ import {import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import registerVisualizations from "metabase/visualizations/register";import type { CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsxindex cacef948feb..f492edafd5c 100644--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardForm.tsx@@ -4,8 +4,8 @@ import * as Yup from "yup";import type { SdkCollectionId } from "embedding-sdk-bundle/types";import { useCreateDashboardMutation } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker/FormCollectionPicker";-import { useInitialCollectionId } from "metabase/collections/hooks";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import { FormFooter } from "metabase/common/components/FormFooter";import {DASHBOARD_DESCRIPTION_MAX_LENGTH,diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsxindex 7edc38e9cec..eb97551b9be 100644--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx@@ -18,7 +18,7 @@ import {waitFor,within,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import {createMockCollection,createMockCollectionItemFromCollection,diff --git a/frontend/src/metabase/collections/analytics.ts b/frontend/src/metabase/common/collections/analytics.tssimilarity index 100%rename from frontend/src/metabase/collections/analytics.tsrename to frontend/src/metabase/common/collections/analytics.tsdiff --git a/frontend/src/metabase/common/collections/columns.ts b/frontend/src/metabase/common/collections/columns.tsnew file mode 100644index 00000000000..8f7882c3ff2--- /dev/null+++ b/frontend/src/metabase/common/collections/columns.ts@@ -0,0 +1,24 @@+export const COLLECTION_CONTENT_COLUMNS = [+ "type",+ "name",+ "description",+ "lastEditedBy",+ "lastEditedAt",+ "actionMenu",+ "archive",+] as const;++export type CollectionContentTableColumn =+ (typeof COLLECTION_CONTENT_COLUMNS)[number];++export type CollectionContentTableColumnsMap = {+ [key in CollectionContentTableColumn]: true;+};++export const DEFAULT_VISIBLE_COLUMNS_LIST: CollectionContentTableColumn[] = [+ "type",+ "name",+ "lastEditedBy",+ "lastEditedAt",+ "actionMenu",+];diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.module.css b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.module.csssimilarity index 100%rename from frontend/src/metabase/collections/components/ActionMenu/ActionMenu.module.cssrename to frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.module.cssdiff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsxsimilarity index 96%rename from frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsxrename to frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsxindex a9d27e18ca9..677e503cc2f 100644--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx+++ b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.tsx@@ -10,13 +10,13 @@ import {useRestore,useSetArchive,} from "metabase/archive/hooks";-import { trackCollectionItemBookmarked } from "metabase/collections/analytics";+import { trackCollectionItemBookmarked } from "metabase/common/collections/analytics";import type {CreateBookmark,DeleteBookmark,OnCopy,OnMove,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import {canArchiveItem,canBookmarkItem,@@ -24,7 +24,7 @@ import {canPreviewItem,isItemPinned,isPreviewEnabled,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { EntityItem } from "metabase/common/components/EntityItem";import {diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx b/frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/ActionMenu/ActionMenu.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/ActionMenu/index.ts b/frontend/src/metabase/common/collections/components/ActionMenu/index.tssimilarity index 100%rename from frontend/src/metabase/collections/components/ActionMenu/index.tsrename to frontend/src/metabase/common/collections/components/ActionMenu/index.tsdiff --git a/frontend/src/metabase/collections/components/CollectionRowMenu/CollectionRowMenu.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsxsimilarity index 98%rename from frontend/src/metabase/collections/components/CollectionRowMenu/CollectionRowMenu.tsxrename to frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsxindex b984b61d64c..f26747a9e49 100644--- a/frontend/src/metabase/collections/components/CollectionRowMenu/CollectionRowMenu.tsx+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.tsx@@ -8,7 +8,7 @@ import {useUpdateCollectionMutation,} from "metabase/api";import { listTag } from "metabase/api/tags";-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import { useConfirmation } from "metabase/common/hooks";import { useMetadataToasts } from "metabase/metadata/hooks";import {diff --git a/frontend/src/metabase/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/CollectionRowMenu/CollectionRowMenu.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.tsxsimilarity index 95%rename from frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.tsxrename to frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.tsxindex a7843016e30..bca15d4841a 100644--- a/frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.tsx+++ b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.tsx@@ -2,12 +2,12 @@ import { type KeyboardEvent, useCallback, useMemo } from "react";import { t } from "ttag";import { useUpdateCollectionMutation } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import {COLLECTION_FORM_SCHEMA,type CollectionFormValues,-} from "metabase/collections/schemas";-import type { EntityType } from "metabase/collections/utils";+} from "metabase/common/collections/schemas";+import type { EntityType } from "metabase/common/collections/utils";import type {EntityPickerOptions,OmniPickerItem,diff --git a/frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/EditCollectionModal.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/index.ts b/frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/index.tssimilarity index 100%rename from frontend/src/metabase/collections/components/CollectionRowMenu/EditCollectionModal/index.tsrename to frontend/src/metabase/common/collections/components/CollectionRowMenu/EditCollectionModal/index.tsdiff --git a/frontend/src/metabase/collections/components/CollectionRowMenu/index.ts b/frontend/src/metabase/common/collections/components/CollectionRowMenu/index.tssimilarity index 100%rename from frontend/src/metabase/collections/components/CollectionRowMenu/index.tsrename to frontend/src/metabase/common/collections/components/CollectionRowMenu/index.tsdiff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsxsimilarity index 97%rename from frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsxrename to frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsxindex b525f83c7bc..e9d7579deea 100644--- a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx+++ b/frontend/src/metabase/common/collections/components/CreateCollectionForm/CreateCollectionForm.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import * as Yup from "yup";import { skipToken, useGetCollectionQuery } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";-import { useInitialCollectionId } from "metabase/collections/hooks";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { FormFooter } from "metabase/common/components/FormFooter";import { FormInput } from "metabase/common/components/FormInput";diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/index.ts b/frontend/src/metabase/common/collections/components/CreateCollectionForm/index.tssimilarity index 100%rename from frontend/src/metabase/collections/components/CreateCollectionForm/index.tsrename to frontend/src/metabase/common/collections/components/CreateCollectionForm/index.tsdiff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/common.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CreateCollectionForm/tests/common.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/common.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/tests/enterprise.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/enterprise.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CreateCollectionForm/tests/enterprise.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/enterprise.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/tests/premium.unit.spec.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/premium.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CreateCollectionForm/tests/premium.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/premium.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/tests/setup.tsx b/frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CreateCollectionForm/tests/setup.tsxrename to frontend/src/metabase/common/collections/components/CreateCollectionForm/tests/setup.tsxdiff --git a/frontend/src/metabase/collections/components/PinDropZone/PinDropZone.styled.tsx b/frontend/src/metabase/common/collections/components/PinDropZone/PinDropZone.styled.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/PinDropZone/PinDropZone.styled.tsxrename to frontend/src/metabase/common/collections/components/PinDropZone/PinDropZone.styled.tsxdiff --git a/frontend/src/metabase/collections/components/PinDropZone/PinDropZone.tsx b/frontend/src/metabase/common/collections/components/PinDropZone/PinDropZone.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/PinDropZone/PinDropZone.tsxrename to frontend/src/metabase/common/collections/components/PinDropZone/PinDropZone.tsxdiff --git a/frontend/src/metabase/collections/components/PinDropZone/index.ts b/frontend/src/metabase/common/collections/components/PinDropZone/index.tssimilarity index 100%rename from frontend/src/metabase/collections/components/PinDropZone/index.tsrename to frontend/src/metabase/common/collections/components/PinDropZone/index.tsdiff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard-ee.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.stories.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsxrename to frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.stories.tsxdiff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.styled.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.styled.tsxrename to frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.styled.tsxdiff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.tsxsimilarity index 97%rename from frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsxrename to frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.tsxindex 904cfaa5fd0..5f86f66c866 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.tsx+++ b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.tsx@@ -2,11 +2,11 @@ import type { Dispatch, MouseEvent, SetStateAction } from "react";import { useState } from "react";import { t } from "ttag";-import ActionMenu from "metabase/collections/components/ActionMenu";+import ActionMenu from "metabase/common/collections/components/ActionMenu";import type {CreateBookmark,DeleteBookmark,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import { EntityIcon } from "metabase/common/components/EntityIcon";import { EventSandbox } from "metabase/common/components/EventSandbox";import { useGetIcon } from "metabase/hooks/use-icon";diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxrename to frontend/src/metabase/common/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/components/PinnedItemCard/index.ts b/frontend/src/metabase/common/collections/components/PinnedItemCard/index.tssimilarity index 100%rename from frontend/src/metabase/collections/components/PinnedItemCard/index.tsrename to frontend/src/metabase/common/collections/components/PinnedItemCard/index.tsdiff --git a/frontend/src/metabase/collections/components/CollectionBulkActions/QuestionMoveConfirmModal.tsx b/frontend/src/metabase/common/collections/components/QuestionMoveConfirmModal.tsxsimilarity index 100%rename from frontend/src/metabase/collections/components/CollectionBulkActions/QuestionMoveConfirmModal.tsxrename to frontend/src/metabase/common/collections/components/QuestionMoveConfirmModal.tsxdiff --git a/frontend/src/metabase/collections/constants.ts b/frontend/src/metabase/common/collections/constants.tssimilarity index 100%rename from frontend/src/metabase/collections/constants.tsrename to frontend/src/metabase/common/collections/constants.tsdiff --git a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsxsimilarity index 96%rename from frontend/src/metabase/collections/containers/CreateCollectionModal.tsxrename to frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsxindex f8c9dd3dbf5..f9e2ab82495 100644--- a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx+++ b/frontend/src/metabase/common/collections/containers/CreateCollectionModal.tsx@@ -3,6 +3,7 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useCreateCollectionMutation } from "metabase/api";+import { getCollectionPathAsArray } from "metabase/common/collections/utils";import { PLUGIN_LIBRARY } from "metabase/plugins";import { useDispatch } from "metabase/redux";import { Modal } from "metabase/ui";@@ -12,7 +13,6 @@ import type { Collection } from "metabase-types/api";import type { CreateCollectionFormOwnProps } from "../components/CreateCollectionForm";import { CreateCollectionForm } from "../components/CreateCollectionForm";import type { CreateCollectionProperties } from "../components/CreateCollectionForm/CreateCollectionForm";-import { getCollectionPathAsArray } from "../utils";export interface CreateCollectionModalOwnProps extends Omit<CreateCollectionFormOwnProps,diff --git a/frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsx b/frontend/src/metabase/common/collections/containers/FormAuthorityLevelFieldContainer.tsxsimilarity index 100%rename from frontend/src/metabase/collections/containers/FormAuthorityLevelFieldContainer.tsxrename to frontend/src/metabase/common/collections/containers/FormAuthorityLevelFieldContainer.tsxdiff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsxsimilarity index 99%rename from frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsxrename to frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsxindex 9644d7e1bb9..2f9c75bfdb0 100644--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx+++ b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx@@ -15,7 +15,7 @@ import {getCollectionIcon,isTrashedCollection,isValidCollectionId,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { CollectionName } from "metabase/common/components/CollectionName";import { DashboardName } from "metabase/common/components/DashboardName";import { FormField } from "metabase/common/components/FormField";diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsx b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsxsimilarity index 97%rename from frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsxrename to frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsxindex c26540073cf..91afda5ef2d 100644--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsx+++ b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.unit.spec.tsx@@ -15,7 +15,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { FormProvider } from "metabase/forms";import {diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/index.ts b/frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/index.tssimilarity index 100%rename from frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/index.tsrename to frontend/src/metabase/common/collections/containers/FormCollectionAndDashboardPicker/index.tsdiff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsxsimilarity index 99%rename from frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsxrename to frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsxindex 273645c0a45..3771ea10bea 100644--- a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx+++ b/frontend/src/metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx@@ -9,7 +9,7 @@ import {canonicalCollectionId,isTrashedCollection,isValidCollectionId,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { CollectionName } from "metabase/common/components/CollectionName";import {CollectionPickerModal,diff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/index.ts b/frontend/src/metabase/common/collections/containers/FormCollectionPicker/index.tssimilarity index 100%rename from frontend/src/metabase/collections/containers/FormCollectionPicker/index.tsrename to frontend/src/metabase/common/collections/containers/FormCollectionPicker/index.tsdiff --git a/frontend/src/metabase/collections/components/CollectionContent/utils.ts b/frontend/src/metabase/common/collections/dropzone.tssimilarity index 100%rename from frontend/src/metabase/collections/components/CollectionContent/utils.tsrename to frontend/src/metabase/common/collections/dropzone.tsdiff --git a/frontend/src/metabase/collections/components/CollectionContent/utils.unit.spec.ts b/frontend/src/metabase/common/collections/dropzone.unit.spec.tssimilarity index 99%rename from frontend/src/metabase/collections/components/CollectionContent/utils.unit.spec.tsrename to frontend/src/metabase/common/collections/dropzone.unit.spec.tsindex 3c4dd8c2835..0cf7127ccf9 100644--- a/frontend/src/metabase/collections/components/CollectionContent/utils.unit.spec.ts+++ b/frontend/src/metabase/common/collections/dropzone.unit.spec.ts@@ -1,7 +1,7 @@import type { DragEvent } from "react";import type { DropzoneRootProps } from "react-dropzone";-import { composeFileEventHandler, getComposedDragProps } from "./utils";+import { composeFileEventHandler, getComposedDragProps } from "./dropzone";describe("Collections > containers > utils", () => {const testNonFileEvent = {diff --git a/frontend/src/metabase/collections/getExpandedCollectionsById.js b/frontend/src/metabase/common/collections/getExpandedCollectionsById.jssimilarity index 100%rename from frontend/src/metabase/collections/getExpandedCollectionsById.jsrename to frontend/src/metabase/common/collections/getExpandedCollectionsById.jsdiff --git a/frontend/src/metabase/collections/hooks.ts b/frontend/src/metabase/common/collections/hooks.tssimilarity index 97%rename from frontend/src/metabase/collections/hooks.tsrename to frontend/src/metabase/common/collections/hooks.tsindex f44c2151402..3854fce017c 100644--- a/frontend/src/metabase/collections/hooks.ts+++ b/frontend/src/metabase/common/collections/hooks.ts@@ -2,7 +2,7 @@ import type { Location } from "history";import { useMemo } from "react";import { skipToken, useGetCollectionQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { PLUGIN_COLLECTIONS } from "metabase/plugins";import { useSelector } from "metabase/redux";import { getUser, getUserPersonalCollectionId } from "metabase/selectors/user";diff --git a/frontend/src/metabase/collections/hooks.unit.spec.tsx b/frontend/src/metabase/common/collections/hooks.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/collections/hooks.unit.spec.tsxrename to frontend/src/metabase/common/collections/hooks.unit.spec.tsxdiff --git a/frontend/src/metabase/collections/schemas.ts b/frontend/src/metabase/common/collections/schemas.tssimilarity index 100%rename from frontend/src/metabase/collections/schemas.tsrename to frontend/src/metabase/common/collections/schemas.tsdiff --git a/frontend/src/metabase/collections/types.ts b/frontend/src/metabase/common/collections/types.tssimilarity index 100%rename from frontend/src/metabase/collections/types.tsrename to frontend/src/metabase/common/collections/types.tsdiff --git a/frontend/src/metabase/collections/utils.ts b/frontend/src/metabase/common/collections/utils.tssimilarity index 100%rename from frontend/src/metabase/collections/utils.tsrename to frontend/src/metabase/common/collections/utils.tsdiff --git a/frontend/src/metabase/collections/utils.unit.spec.ts b/frontend/src/metabase/common/collections/utils.unit.spec.tssimilarity index 99%rename from frontend/src/metabase/collections/utils.unit.spec.tsrename to frontend/src/metabase/common/collections/utils.unit.spec.tsindex 333e8898da1..673f9258490 100644--- a/frontend/src/metabase/collections/utils.unit.spec.ts+++ b/frontend/src/metabase/common/collections/utils.unit.spec.ts@@ -3,7 +3,7 @@ import { mockSettings } from "__support__/settings";import {PERSONAL_COLLECTIONS,ROOT_COLLECTION,-} from "metabase/collections/constants";+} from "metabase/common/collections/constants";import {buildCollectionTree,canonicalCollectionId,@@ -17,7 +17,7 @@ import {isRootPersonalCollection,isRootTrashCollection,normalizedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { type Collection, SEARCH_MODELS } from "metabase-types/api";import {createMockCollection,diff --git a/frontend/src/metabase/common/components/CollectionName.tsx b/frontend/src/metabase/common/components/CollectionName.tsxindex 8630c1e61ee..4ddce80a1ca 100644--- a/frontend/src/metabase/common/components/CollectionName.tsx+++ b/frontend/src/metabase/common/components/CollectionName.tsx@@ -1,5 +1,5 @@import { useGetCollectionQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { useTranslateContent } from "metabase/i18n/hooks";import { getName } from "metabase/utils/name";import type { CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsx b/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsxindex 1c1e8fccb1c..c24c2d89218 100644--- a/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsx+++ b/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsx@@ -4,7 +4,7 @@ import { c, t } from "ttag";import * as Yup from "yup";import { useGetDashboardQuery } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker/FormCollectionPicker";import { FormFooter } from "metabase/common/components/FormFooter";import type { FilterItemsInPersonalCollection } from "metabase/common/components/Pickers";import {diff --git a/frontend/src/metabase/common/components/CopyModal/CopyModal.tsx b/frontend/src/metabase/common/components/CopyModal/CopyModal.tsxindex 469a448f454..9287cb43fdc 100644--- a/frontend/src/metabase/common/components/CopyModal/CopyModal.tsx+++ b/frontend/src/metabase/common/components/CopyModal/CopyModal.tsx@@ -1,7 +1,7 @@import { dissoc } from "icepick";import { t } from "ttag";-import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";import { CopyDashboardFormConnected } from "metabase/common/components/CopyDashboardForm";import { DocumentCopyForm } from "metabase/documents/components/DocumentCopyForm/DocumentCopyForm";import { CopyCardForm } from "metabase/questions/components/CopyCardForm/CopyCardForm";diff --git a/frontend/src/metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath.tsx b/frontend/src/metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath.tsxindex dfef2c72fe4..82705b194aa 100644--- a/frontend/src/metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath.tsx+++ b/frontend/src/metabase/common/components/EllipsifiedPath/EllipsifiedCollectionPath.tsx@@ -2,7 +2,7 @@ import {getCollectionName,getCollectionPath,getCollectionPathAsString,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import type { CollectionEssentials } from "metabase-types/api";import { EllipsifiedPath } from "./EllipsifiedPath";diff --git a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsxindex 771a7d5e637..df0ce773791 100644--- a/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx+++ b/frontend/src/metabase/common/components/EntityItem/EntityItem.tsx@@ -15,13 +15,13 @@ import type {OnToggleBookmark,OnTogglePreview,OnToggleSelected,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import {isFullyParameterized,isItemModel,isItemPinned,isPreviewShown,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { EntityIcon } from "metabase/common/components/EntityIcon";import { Swapper } from "metabase/common/components/Swapper";import type { IconData } from "metabase/common/utils/icon";diff --git a/frontend/src/metabase/common/components/InfoText/get-info-text.tsx b/frontend/src/metabase/common/components/InfoText/get-info-text.tsxindex b39d4a69559..68d55bce328 100644--- a/frontend/src/metabase/common/components/InfoText/get-info-text.tsx+++ b/frontend/src/metabase/common/components/InfoText/get-info-text.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import { getCollection } from "metabase/collections/utils";+import { getCollection } from "metabase/common/collections/utils";import {PLUGIN_COLLECTIONS,PLUGIN_COLLECTION_COMPONENTS,diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsxindex b6aa7c7155f..59a8343784e 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.tsx@@ -1,15 +1,15 @@import type { HTMLAttributes, PropsWithChildren } from "react";import { useMemo } from "react";-import type { CollectionContentTableColumnsMap } from "metabase/collections/components/CollectionContent";+import type { CollectionContentTableColumnsMap } from "metabase/common/collections/columns";import type {CreateBookmark,DeleteBookmark,OnCopy,OnMove,OnToggleSelectedWithItem,-} from "metabase/collections/types";-import { isTrashedCollection } from "metabase/collections/utils";+} from "metabase/common/collections/types";+import { isTrashedCollection } from "metabase/common/collections/utils";import { BaseItemsTableBody } from "metabase/common/components/ItemsTable/BaseItemsTableBody/BaseItemsTableBody";import type { ItemRendererProps } from "metabase/common/components/ItemsTable/DefaultItemRenderer";import { DefaultItemRenderer } from "metabase/common/components/ItemsTable/DefaultItemRenderer";diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsxindex 7787a96f80b..1d630ec3a68 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx@@ -5,7 +5,7 @@ import { Route } from "react-router";import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";import { mockSettings } from "__support__/settings";import { getIcon, renderWithProviders, screen } from "__support__/ui";-import { DEFAULT_VISIBLE_COLUMNS_LIST } from "metabase/collections/components/CollectionContent";+import { DEFAULT_VISIBLE_COLUMNS_LIST } from "metabase/common/collections/columns";import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utils";import type { ItemWithLastEditInfo } from "metabase/common/components/LastEditInfoLabel/LastEditInfoLabel";import {diff --git a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx b/frontend/src/metabase/common/components/ItemsTable/Columns.tsxindex 40ee3cd6bb2..f4f3a734304 100644--- a/frontend/src/metabase/common/components/ItemsTable/Columns.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/Columns.tsx@@ -1,8 +1,8 @@import type { PropsWithChildren } from "react";import { c, t } from "ttag";-import type { ActionMenuProps } from "metabase/collections/components/ActionMenu";-import ActionMenu from "metabase/collections/components/ActionMenu";+import type { ActionMenuProps } from "metabase/common/collections/components/ActionMenu";+import ActionMenu from "metabase/common/collections/components/ActionMenu";import { DateTime } from "metabase/common/components/DateTime";import { EntityItem } from "metabase/common/components/EntityItem";import { Markdown } from "metabase/common/components/Markdown";@@ -20,8 +20,8 @@ import type {SearchResult,} from "metabase-types/api";-import type { SortableColumnHeaderProps } from "./BaseItemsTable";-import { SortableColumnHeader } from "./BaseItemsTable";+import type { SortableColumnHeaderProps } from "./BaseItemsTable/BaseItemsTable";+import { SortableColumnHeader } from "./BaseItemsTable/BaseItemsTable";import {BulkSelectWrapper,ColumnHeader,diff --git a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsxindex b32f1847f6c..f1d1f1ebdc4 100644--- a/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/DefaultItemRenderer.tsx@@ -1,7 +1,7 @@import { useCallback } from "react";-import type { ActionMenuProps } from "metabase/collections/components/ActionMenu";-import type { OnToggleSelectedWithItem } from "metabase/collections/types";+import type { ActionMenuProps } from "metabase/common/collections/components/ActionMenu";+import type { OnToggleSelectedWithItem } from "metabase/common/collections/types";import type { BaseItemsTableProps } from "metabase/common/components/ItemsTable/BaseItemsTable";import { Columns } from "metabase/common/components/ItemsTable/Columns";import { canSelectItems } from "metabase/common/components/ItemsTable/utils";diff --git a/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsx b/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsxindex 60f04dfd090..9d48a1c8b2a 100644--- a/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/ItemsTable.tsx@@ -1,4 +1,4 @@-import PinDropZone from "metabase/collections/components/PinDropZone";+import PinDropZone from "metabase/common/collections/components/PinDropZone";import type { ItemRendererProps } from "metabase/common/components/ItemsTable/DefaultItemRenderer";import CS from "metabase/css/core/index.css";import type { CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/ItemsTable/utils.ts b/frontend/src/metabase/common/components/ItemsTable/utils.tsindex 27311632c35..74d8c3aeb29 100644--- a/frontend/src/metabase/common/components/ItemsTable/utils.ts+++ b/frontend/src/metabase/common/components/ItemsTable/utils.ts@@ -1,9 +1,9 @@import type {CollectionContentTableColumn,CollectionContentTableColumnsMap,-} from "metabase/collections/components/CollectionContent";-import type { OnToggleSelectedWithItem } from "metabase/collections/types";-import { isRootTrashCollection } from "metabase/collections/utils";+} from "metabase/common/collections/columns";+import type { OnToggleSelectedWithItem } from "metabase/common/collections/types";+import { isRootTrashCollection } from "metabase/common/collections/utils";import { PLUGIN_LIBRARY } from "metabase/plugins";import { type BreakpointName, breakpoints } from "metabase/ui/theme";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxindex 2b9f6b26365..9a69dbcdbbd 100644--- a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import { useGetMostRecentlyViewedDashboardQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utils";import { useSelector } from "metabase/redux";import { getUserPersonalCollectionId } from "metabase/selectors/user";diff --git a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsxindex cee2cbb151f..a35aa2bb8d5 100644--- a/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx@@ -19,7 +19,7 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { getNextId } from "__support__/utils";-import { ROOT_COLLECTION as ROOT } from "metabase/collections/constants";+import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";import { checkNotNull, isNotNull } from "metabase/utils/types";import type {BaseEntityId,diff --git a/frontend/src/metabase/common/components/Pickers/CollectionPicker/CollectionPickerModal.tsx b/frontend/src/metabase/common/components/Pickers/CollectionPicker/CollectionPickerModal.tsxindex 1180497e746..561746f2889 100644--- a/frontend/src/metabase/common/components/Pickers/CollectionPicker/CollectionPickerModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/CollectionPicker/CollectionPickerModal.tsx@@ -5,7 +5,7 @@ import {type EntityType,canPlaceEntityInCollection,canPlaceEntityInCollectionOrDescendants,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { PLUGIN_TENANTS } from "metabase/plugins/oss/tenants";import {diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsxindex b61c61cca13..792e36d9e64 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/ItemLists/ItemListRouter.tsx@@ -1,4 +1,4 @@-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import {ItemListLoader,type OmniPickerFolderItem,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsxindex 630f9f91113..695316e3ea0 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/NewCollectionDialog/NewCollectionDialog.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import * as Yup from "yup";import { useCreateCollectionMutation } from "metabase/api";-import { canPlaceEntityInCollection } from "metabase/collections/utils";+import { canPlaceEntityInCollection } from "metabase/common/collections/utils";import { FormFooter } from "metabase/common/components/FormFooter";import {Form,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsxindex 3339e66fc49..97a65e2b956 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/components/test/setup.tsx@@ -15,7 +15,7 @@ import {renderWithProviders,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import type {Collection,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.tsindex 22fdd6ffce7..5965797b750 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/use-get-root-items.ts@@ -7,7 +7,7 @@ import {useListCollectionItemsQuery,useListDatabasesQuery,} from "metabase/api";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import {useGetPersonalCollection,useHasTokenFeature,diff --git a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.tsindex 16b8396f6e6..d3025a6777a 100644--- a/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/EntityPicker/hooks/utils.ts@@ -1,7 +1,7 @@import { t } from "ttag";import { collectionApi } from "metabase/api";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import { PLUGIN_TENANTS } from "metabase/plugins";import type { DispatchFn } from "metabase/redux";import { getRootCollectionItem as getTransformsRootCollectionItem } from "metabase/transforms/utils";diff --git a/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.render.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.render.unit.spec.tsxindex 1f9414a8a3c..ef72c5672cc 100644--- a/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.render.unit.spec.tsx+++ b/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.render.unit.spec.tsx@@ -14,7 +14,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import {createMockCollection,createMockCollectionItem,diff --git a/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.tsx b/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.tsxindex a448d1b6158..339a63cf7be 100644--- a/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/MoveModal/MoveModal.tsx@@ -6,12 +6,12 @@ import type {MoveCollectionDestination,MoveDestination,OnMoveWithOneItem,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import {canPlaceEntityInCollection,canPlaceEntityInCollectionOrDescendants,isItemCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import {EntityPickerModal,isInDbTree,diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsxindex d3c31db722a..f0a57b503bc 100644--- a/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionForm/SaveQuestionForm.tsx@@ -1,8 +1,8 @@import cx from "classnames";import { c, t } from "ttag";-import { FormCollectionAndDashboardPicker } from "metabase/collections/containers/FormCollectionAndDashboardPicker";-import { getEntityTypeFromCardType } from "metabase/collections/utils";+import { FormCollectionAndDashboardPicker } from "metabase/common/collections/containers/FormCollectionAndDashboardPicker";+import { getEntityTypeFromCardType } from "metabase/common/collections/utils";import { FormDashboardTabSelect } from "metabase/common/components/FormDashboardTabSelect";import { FormFooter } from "metabase/common/components/FormFooter";import { getPlaceholder } from "metabase/common/components/SaveQuestionForm/util";diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsxindex 746071243ee..1883cdd3f88 100644--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.tsx@@ -12,12 +12,12 @@ import { usePrevious } from "react-use";import { isEqual } from "underscore";import { useListRecentsQuery } from "metabase/api";-import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";import {canPlaceEntityInCollection,getEntityTypeFromCardType,isInstanceAnalyticsCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { FormProvider } from "metabase/forms";import { useSelector } from "metabase/redux";import { getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/util.ts b/frontend/src/metabase/common/components/SaveQuestionForm/util.tsindex c20c1b88997..0aee65ac6ab 100644--- a/frontend/src/metabase/common/components/SaveQuestionForm/util.ts+++ b/frontend/src/metabase/common/components/SaveQuestionForm/util.ts@@ -4,7 +4,7 @@ import { t } from "ttag";import {canonicalCollectionId,canonicalCollectionIdOrEntityId,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { trackMetricCreated } from "metabase/data-studio/analytics";import { isNullOrUndefined } from "metabase/utils/types";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsxindex 0d9c2c2f521..4becf5856bc 100644--- a/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx+++ b/frontend/src/metabase/common/components/SaveQuestionModal/SaveQuestionModal.unit.spec.tsx@@ -21,7 +21,7 @@ import {waitFor,within,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";import { QUESTION_NAME_MAX_LENGTH } from "metabase/questions/constants";import {diff --git a/frontend/src/metabase/common/components/SnippetCollectionName.tsx b/frontend/src/metabase/common/components/SnippetCollectionName.tsxindex 22de2234271..ff4f4d9f314 100644--- a/frontend/src/metabase/common/components/SnippetCollectionName.tsx+++ b/frontend/src/metabase/common/components/SnippetCollectionName.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { useGetCollectionQuery } from "metabase/api";-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import type { CollectionId } from "metabase-types/api";export function SnippetCollectionName({ id }: { id: CollectionId }) {diff --git a/frontend/src/metabase/common/components/TransformCollectionName.tsx b/frontend/src/metabase/common/components/TransformCollectionName.tsxindex 107be8a68aa..b462082f6e8 100644--- a/frontend/src/metabase/common/components/TransformCollectionName.tsx+++ b/frontend/src/metabase/common/components/TransformCollectionName.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { skipToken, useGetCollectionQuery } from "metabase/api";-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import type { CollectionId } from "metabase-types/api";export function TransformCollectionName({ id }: { id: CollectionId }) {diff --git a/frontend/src/metabase/common/components/UserCollectionList.tsx b/frontend/src/metabase/common/components/UserCollectionList.tsxindex 6bcd92ff222..30d86e4558e 100644--- a/frontend/src/metabase/common/components/UserCollectionList.tsx+++ b/frontend/src/metabase/common/components/UserCollectionList.tsx@@ -2,7 +2,7 @@ import { useListUsersQuery } from "metabase/api";import {PERSONAL_COLLECTIONS,ROOT_COLLECTION,-} from "metabase/collections/constants";+} from "metabase/common/collections/constants";import { CollectionListView } from "metabase/common/components/CollectionListView";import * as Urls from "metabase/urls";import type { IconName } from "metabase-types/api";diff --git a/frontend/src/metabase/common/components/dnd/CollectionDropTarget.tsx b/frontend/src/metabase/common/components/dnd/CollectionDropTarget.tsxindex 6977f838d5b..0da2aa0e01e 100644--- a/frontend/src/metabase/common/components/dnd/CollectionDropTarget.tsx+++ b/frontend/src/metabase/common/components/dnd/CollectionDropTarget.tsx@@ -4,7 +4,7 @@ import { DropTarget } from "react-dnd";import {canonicalCollectionId,isRootTrashCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import type { Collection, CollectionItem } from "metabase-types/api";import { DropArea } from "./DropArea";diff --git a/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx b/frontend/src/metabase/common/components/dnd/ItemDragSource.tsxindex d8be4ecebdb..64d2f3ecf1d 100644--- a/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx+++ b/frontend/src/metabase/common/components/dnd/ItemDragSource.tsx@@ -9,7 +9,7 @@ import { DragSource } from "react-dnd";import { getEmptyImage } from "react-dnd-html5-backend";import { getErrorMessage } from "metabase/api/utils";-import { isRootTrashCollection } from "metabase/collections/utils";+import { isRootTrashCollection } from "metabase/common/collections/utils";import {type MovableItem,type PinnableItem,diff --git a/frontend/src/metabase/common/components/dnd/ItemsDragLayer.tsx b/frontend/src/metabase/common/components/dnd/ItemsDragLayer.tsxindex 730feaa6497..96435e51466 100644--- a/frontend/src/metabase/common/components/dnd/ItemsDragLayer.tsx+++ b/frontend/src/metabase/common/components/dnd/ItemsDragLayer.tsx@@ -2,8 +2,8 @@ import { Component } from "react";import { DragLayer, type XYCoord } from "react-dnd";import _ from "underscore";-import type { CollectionContentTableColumnsMap } from "metabase/collections/components/CollectionContent/constants";-import PinnedItemCard from "metabase/collections/components/PinnedItemCard";+import type { CollectionContentTableColumnsMap } from "metabase/common/collections/columns";+import PinnedItemCard from "metabase/common/collections/components/PinnedItemCard";import { BaseItemsTable } from "metabase/common/components/ItemsTable/BaseItemsTable";import type { ItemRendererProps } from "metabase/common/components/ItemsTable/DefaultItemRenderer";import { Box, Portal } from "metabase/ui";diff --git a/frontend/src/metabase/common/components/dnd/PinDropTarget.tsx b/frontend/src/metabase/common/components/dnd/PinDropTarget.tsxindex 761d548c176..eb3c8668356 100644--- a/frontend/src/metabase/common/components/dnd/PinDropTarget.tsx+++ b/frontend/src/metabase/common/components/dnd/PinDropTarget.tsx@@ -1,7 +1,7 @@import type { DropTargetMonitor } from "react-dnd";import { DropTarget } from "react-dnd";-import { isItemPinned } from "metabase/collections/utils";+import { isItemPinned } from "metabase/common/collections/utils";import type { CollectionItem } from "metabase-types/api";import { DropArea } from "./DropArea";diff --git a/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsx b/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsxindex c996001042e..e68aee206b4 100644--- a/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsx+++ b/frontend/src/metabase/common/components/dnd/PinnedItemSortDropTarget.tsx@@ -1,7 +1,7 @@import type { DropTargetMonitor } from "react-dnd";import { DropTarget } from "react-dnd";-import { isItemPinned } from "metabase/collections/utils";+import { isItemPinned } from "metabase/common/collections/utils";import type { CollectionItem } from "metabase-types/api";import { DropArea } from "./DropArea";diff --git a/frontend/src/metabase/common/hooks/use-set-collection.ts b/frontend/src/metabase/common/hooks/use-set-collection.tsindex f3e80d90135..11efedb3fda 100644--- a/frontend/src/metabase/common/hooks/use-set-collection.ts+++ b/frontend/src/metabase/common/hooks/use-set-collection.ts@@ -22,7 +22,7 @@ import {isReadOnlyCollection,isRootPersonalCollection,isRootTrashCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";import type {diff --git a/frontend/src/metabase/common/utils/timelines.ts b/frontend/src/metabase/common/utils/timelines.tsindex 9fd5b160409..dbd18b0132e 100644--- a/frontend/src/metabase/common/utils/timelines.ts+++ b/frontend/src/metabase/common/utils/timelines.ts@@ -1,7 +1,7 @@import { t } from "ttag";import _ from "underscore";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import type {Collection,IconName,diff --git a/frontend/src/metabase/dashboard/actions/trash.ts b/frontend/src/metabase/dashboard/actions/trash.tsindex 7e641ece2ee..338bfb2d12f 100644--- a/frontend/src/metabase/dashboard/actions/trash.ts+++ b/frontend/src/metabase/dashboard/actions/trash.ts@@ -4,7 +4,7 @@ import _ from "underscore";import { cardApi, dashboardApi } from "metabase/api";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { getTrashUndoMessage } from "metabase/archive/utils";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import { fetchDashboard } from "metabase/dashboard/actions";import { createThunkAction } from "metabase/redux";import { addUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsxindex 0caf20fbde6..a3b0fa45d06 100644--- a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.unit.spec.tsx@@ -7,7 +7,7 @@ import {} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";import { getNextId } from "__support__/utils";-import { ROOT_COLLECTION as ROOT } from "metabase/collections/constants";+import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";import { MockDashboardContext } from "metabase/dashboard/context/mock-context";import {createMockDashboardState,diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsxindex ae8b039f1c8..f1198c59f76 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx@@ -2,8 +2,8 @@ import { useCallback, useEffect, useMemo, useState } from "react";import { t } from "ttag";import { skipToken, useGetCardQuery, useGetDashboardQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import { isPublicCollection } from "metabase/collections/utils";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { isPublicCollection } from "metabase/common/collections/utils";import { DashboardName } from "metabase/common/components/DashboardName";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import {diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsxindex 5c62e1f9a4d..57c8670f5ba 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.unit.spec.tsx@@ -15,7 +15,7 @@ import {screen,} from "__support__/ui";import { getNextId } from "__support__/utils";-import { ROOT_COLLECTION as ROOT } from "metabase/collections/constants";+import { ROOT_COLLECTION as ROOT } from "metabase/common/collections/constants";import type { StoreDashboard } from "metabase/redux/store";import { createMockDashboardState } from "metabase/redux/store/mocks";import { checkNotNull } from "metabase/utils/types";diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsxindex c89b7eb4110..b8587604c8e 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx@@ -6,7 +6,7 @@ import { replace } from "react-router-redux";import { t } from "ttag";import { useCopyDashboardMutation } from "metabase/api";-import { useInitialCollectionId } from "metabase/collections/hooks";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import type { CopyDashboardFormProperties } from "metabase/common/components/CopyDashboardForm";import { CopyModal } from "metabase/common/components/CopyModal";import { useDispatch, useSelector } from "metabase/redux";diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsxindex b5f71a3caa7..f8fe9cd03a2 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderButtonRow/DashboardSharingMenu/DashboardSharingMenu.tsx@@ -1,4 +1,4 @@-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { useSetting } from "metabase/common/hooks";import {getIsDashCardsRunning,diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsxindex ec2f7712608..8a008a3bbc7 100644--- a/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardHeader/DashboardHeaderView.tsx@@ -2,7 +2,7 @@ import cx from "classnames";import type { JSX } from "react";import { useCallback, useEffect, useMemo, useRef, useState } from "react";-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { EditBar } from "metabase/common/components/EditBar";import { LastEditInfoLabel } from "metabase/common/components/LastEditInfoLabel";import { SIDEBAR_WIDTH } from "metabase/common/components/Sidebar";diff --git a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsxindex 32822be376e..dcaf139634e 100644--- a/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardInfoSidebar/DashboardInfoSidebar.tsx@@ -6,7 +6,7 @@ import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";import { skipToken, useListRevisionsQuery } from "metabase/api";-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { RevisionHistoryTimeline } from "metabase/common/components/RevisionHistoryTimeline";import { getTimelineEvents } from "metabase/common/components/RevisionHistoryTimeline/utils";import {diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsxindex 27dca80394f..7292e9043d0 100644--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx@@ -5,7 +5,7 @@ import {useGetCollectionQuery,useGetDashboardQuery,} from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { Link } from "metabase/common/components/Link";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { MoveModal } from "metabase/common/components/Pickers/MoveModal/MoveModal";diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.unit.spec.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.unit.spec.tsxindex b659c942a9f..33d925b94f2 100644--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.unit.spec.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.unit.spec.tsx@@ -15,7 +15,7 @@ import {renderWithProviders,screen,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import {createMockCollection,createMockDashboard,diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsxindex ea71450503b..57c43067fea 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx@@ -2,9 +2,9 @@ import { useMemo, useState } from "react";import { t } from "ttag";import { useListCollectionsQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import getExpandedCollectionsById from "metabase/collections/getExpandedCollectionsById";-import { isPublicCollection } from "metabase/collections/utils";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import getExpandedCollectionsById from "metabase/common/collections/getExpandedCollectionsById";+import { isPublicCollection } from "metabase/common/collections/utils";import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";import { Input } from "metabase/common/components/Input";import { SelectList } from "metabase/common/components/SelectList";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.tsindex 36771b8a830..6716bbcf741 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.ts@@ -2,8 +2,8 @@ import { useMemo } from "react";import { t } from "ttag";import { skipToken, useListCollectionsTreeQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import getExpandedCollectionsById from "metabase/collections/getExpandedCollectionsById";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import getExpandedCollectionsById from "metabase/common/collections/getExpandedCollectionsById";import { useSetting } from "metabase/common/hooks/use-setting";import { PLUGIN_TENANTS } from "metabase/plugins";import { useSelector } from "metabase/redux";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.tsindex e535add16b9..74c4da718a0 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/hooks/use-collections-with-tenants.unit.spec.ts@@ -2,7 +2,7 @@ import { setupEnterprisePlugins } from "__support__/enterprise";import { setupCollectionTreeEndpoint } from "__support__/server-mocks/collection";import { mockSettings } from "__support__/settings";import { renderHookWithProviders, waitFor } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import type { Collection, CollectionId } from "metabase-types/api";import {diff --git a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.tsindex a1f23498bde..2928de270ab 100644--- a/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts+++ b/frontend/src/metabase/data-studio/common/hooks/use-build-snippet-tree/utils.ts@@ -3,7 +3,7 @@ import { t } from "ttag";import {coerceCollectionId,isRootCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import type { TreeItem } from "metabase/data-studio/common/types";import { createEmptyStateItem } from "metabase/data-studio/common/utils";import type { Collection, NativeQuerySnippet } from "metabase-types/api";diff --git a/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts b/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.tsindex aa016fa6374..0f472412bd8 100644--- a/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts+++ b/frontend/src/metabase/data-studio/common/hooks/use-collection-path/useCollectionPath.ts@@ -1,5 +1,5 @@import { useGetCollectionQuery } from "metabase/api/collection";-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import type {CollectionId,CollectionNamespace,diff --git a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsxindex a5d4dea41a9..1e31a91ab9f 100644--- a/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx+++ b/frontend/src/metabase/data-studio/nav/components/NavbarLibrarySection/NavbarLibrarySection.tsx@@ -2,12 +2,12 @@ import { useCallback, useMemo } from "react";import { t } from "ttag";import ErrorBoundary from "metabase/ErrorBoundary";-import type { CollectionTreeItem } from "metabase/collections/utils";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import {buildCollectionTree,getCollectionIcon,isLibraryCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { CollapseSection } from "metabase/common/components/CollapseSection";import { Tree } from "metabase/common/components/tree";import { useUserSetting } from "metabase/common/hooks";diff --git a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsxindex 09c8ab83552..70c459cb6d2 100644--- a/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx+++ b/frontend/src/metabase/data-studio/segments/components/SegmentBreadcrumbs/SegmentBreadcrumbs.unit.spec.tsx@@ -6,7 +6,7 @@ import {setupTablesEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen, waitFor } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { checkNotNull } from "metabase/utils/types";import type { Segment, Table } from "metabase-types/api";import {diff --git a/frontend/src/metabase/detail-view/components/Nav/utils.ts b/frontend/src/metabase/detail-view/components/Nav/utils.tsindex 24badd71791..3383179c25d 100644--- a/frontend/src/metabase/detail-view/components/Nav/utils.ts+++ b/frontend/src/metabase/detail-view/components/Nav/utils.ts@@ -1,4 +1,4 @@-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import type { Collection } from "metabase-types/api";export const getCollectionList = (collection: Collection | undefined) => {diff --git a/frontend/src/metabase/documents/components/DocumentCopyForm/DocumentCopyForm.tsx b/frontend/src/metabase/documents/components/DocumentCopyForm/DocumentCopyForm.tsxindex 6519b204119..9a169497951 100644--- a/frontend/src/metabase/documents/components/DocumentCopyForm/DocumentCopyForm.tsx+++ b/frontend/src/metabase/documents/components/DocumentCopyForm/DocumentCopyForm.tsx@@ -1,7 +1,7 @@import { c, t } from "ttag";import * as Yup from "yup";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { FormFooter } from "metabase/common/components/FormFooter";import {Form,diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex 6ec9755e538..f2fe0b794f5 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -28,7 +28,7 @@ import {useListBookmarksQuery,useUpdateDocumentMutation,} from "metabase/api";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { CopyModal } from "metabase/common/components/CopyModal";import {diff --git a/frontend/src/metabase/embedding/components/ArchiveButton.tsx b/frontend/src/metabase/embedding/components/ArchiveButton.tsxindex 6d7f5dfa8bc..8511992660f 100644--- a/frontend/src/metabase/embedding/components/ArchiveButton.tsx+++ b/frontend/src/metabase/embedding/components/ArchiveButton.tsx@@ -3,7 +3,7 @@ import { c, t } from "ttag";import { useGetCollectionQuery } from "metabase/api";import { type ArchivableItem, useSetArchive } from "metabase/archive/hooks";-import { canArchiveItem } from "metabase/collections/utils";+import { canArchiveItem } from "metabase/common/collections/utils";import { ActionIcon, Icon, Menu } from "metabase/ui";import type { CollectionItem } from "metabase-types/api";diff --git a/frontend/src/metabase/hooks/use-icon.ts b/frontend/src/metabase/hooks/use-icon.tsindex d96e240991f..057f365c5a9 100644--- a/frontend/src/metabase/hooks/use-icon.ts+++ b/frontend/src/metabase/hooks/use-icon.ts@@ -1,6 +1,6 @@import { useCallback } from "react";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import type { IconData, ObjectWithModel } from "metabase/common/utils/icon";import { modelIconMap } from "metabase/common/utils/icon";import { PLUGIN_COLLECTIONS, PLUGIN_CUSTOM_VIZ } from "metabase/plugins";diff --git a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsxindex a4a51380ac0..f7cd4195967 100644--- a/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotChat/MetabotChatEditor/MetabotChatEditor.unit.spec.tsx@@ -11,7 +11,7 @@ import {import { setupSearchEndpoints } from "__support__/server-mocks/search";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import type { SuggestionModel } from "metabase/rich_text_editing/tiptap/extensions/shared/types";import {diff --git a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsxindex 58a8711d0b2..cf78948be6b 100644--- a/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx+++ b/frontend/src/metabase/metabot/components/MetabotPromptInput/MetabotPromptInput.unit.spec.tsx@@ -11,7 +11,7 @@ import {} from "__support__/server-mocks";import { mockSettings } from "__support__/settings";import { renderWithProviders } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type { MetabotPromptInputRef } from "metabase/metabot";import { createMockState } from "metabase/redux/store/mocks";import { MetabotMentionPluginKey } from "metabase/rich_text_editing/tiptap/extensions/MetabotMention/MetabotMentionExtension";diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsxindex 09004a4566b..a53016b2783 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/CreateMetricModal/CreateMetricModal.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import * as Yup from "yup";import { useCreateCardMutation } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { trackMetricCreated } from "metabase/data-studio/analytics";import {Form,diff --git a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsxindex 9d683defe40..250c039addf 100644--- a/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx+++ b/frontend/src/metabase/metrics/pages/NewMetricPage/NewMetricPage.tsx@@ -6,7 +6,7 @@ import type { Route } from "react-router";import { goBack, push } from "react-router-redux";import { t } from "ttag";-import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import type { MetricUrls } from "metabase/common/metrics/types";import { PageContainer } from "metabase/data-studio/common/components/PageContainer";diff --git a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/utils.ts b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/utils.tsindex 4ed802418a8..8bd8328fc73 100644--- a/frontend/src/metabase/nav/components/CollectionBreadcrumbs/utils.ts+++ b/frontend/src/metabase/nav/components/CollectionBreadcrumbs/utils.ts@@ -1,4 +1,4 @@-import { isRootCollection } from "metabase/collections/utils";+import { isRootCollection } from "metabase/common/collections/utils";import type { Collection, CollectionId } from "metabase-types/api";type GetCollectionListProps = {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsxindex 5d95005a8b1..8114d34c871 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/Panels/CSVUpload.tsx@@ -11,8 +11,8 @@ import { type FileRejection, useDropzone } from "react-dropzone";import { match } from "ts-pattern";import { c, t } from "ttag";-import { getComposedDragProps } from "metabase/collections/components/CollectionContent/utils";-import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { getComposedDragProps } from "metabase/common/collections/dropzone";+import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";import { CollectionName } from "metabase/common/components/CollectionName";import {CollectionPickerModal,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 11c4e9d8317..80f6a197d1f 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@@ -10,7 +10,7 @@ import {import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import type { GdrivePayload, TokenFeatures } from "metabase-types/api";import {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsxindex ada221dab25..3b4bf32e318 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx@@ -9,15 +9,15 @@ import {useListDatabasesQuery,useReorderBookmarksMutation,} from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import CreateCollectionModal from "metabase/collections/containers/CreateCollectionModal";-import type { CollectionTreeItem } from "metabase/collections/utils";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import CreateCollectionModal from "metabase/common/collections/containers/CreateCollectionModal";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import {buildCollectionTree,currentUserPersonalCollections,getCollectionIcon,nonPersonalOrArchivedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { PLUGIN_TENANTS } from "metabase/plugins";import { connect, useDispatch, useSelector } from "metabase/redux";import { logout } from "metabase/redux/auth";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsxindex 266a1c41346..0c6cd6c5397 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarView.tsx@@ -5,12 +5,12 @@ import { t } from "ttag";import _ from "underscore";import ErrorBoundary from "metabase/ErrorBoundary";-import type { CollectionTreeItem } from "metabase/collections/utils";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import {isExamplesCollection,isLibraryCollection,isRootTrashCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { CollapseSection } from "metabase/common/components/CollapseSection";import { Tree } from "metabase/common/components/tree";import { useSetting, useUserSetting } from "metabase/common/hooks";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsxindex 7b215ad8cfb..c64d3b699da 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx@@ -2,7 +2,7 @@ import type { KeyboardEvent } from "react";import { forwardRef, useCallback, useEffect, useRef } from "react";import { usePrevious } from "react-use";-import { getCollectionIcon } from "metabase/collections/utils";+import { getCollectionIcon } from "metabase/common/collections/utils";import { CollectionDropTarget } from "metabase/common/components/dnd/CollectionDropTarget";import { TreeNode } from "metabase/common/components/tree/TreeNode";import type {diff --git a/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts b/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.tsindex a4566c1309c..ba234be5b7f 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/getSelectedItems.ts@@ -1,4 +1,4 @@-import { coerceCollectionId } from "metabase/collections/utils";+import { coerceCollectionId } from "metabase/common/collections/utils";import type { StoreDashboard } from "metabase/redux/store";import * as Urls from "metabase/urls";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsxindex c12f3c7d120..e1bbe1332a1 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/common.unit.spec.tsx@@ -2,7 +2,7 @@ import userEvent from "@testing-library/user-event";import dayjs from "dayjs";import { screen, within } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import * as Urls from "metabase/urls";import {createMockCard,diff --git a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsxindex 03099f00c81..2e9228522db 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/tests/setup.tsx@@ -19,7 +19,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type { DashboardState, StoreDashboard } from "metabase/redux/store";import {createMockDashboardState,diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 10b5f23afa9..83788b07c77 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -5,11 +5,11 @@ import { push } from "react-router-redux";import { useLocation } from "react-use";import ActionCreator from "metabase/actions/containers/ActionCreator";+import { CreateDashboardModal } from "metabase/common/CreateDashboard/CreateDashboardModal";import CreateCollectionModal, {type CreateCollectionModalOwnProps,-} from "metabase/collections/containers/CreateCollectionModal";-import { useInitialCollectionId } from "metabase/collections/hooks";-import { CreateDashboardModal } from "metabase/common/CreateDashboard/CreateDashboardModal";+} from "metabase/common/collections/containers/CreateCollectionModal";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import { UpgradeModal } from "metabase/common/components/upsells/components/UpgradeModal";import { STATIC_LEGACY_EMBEDDING_TYPE } from "metabase/embedding/constants";import {diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex ea72114daf1..f05191f1e3e 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -5,8 +5,8 @@ import { useDebounce } from "react-use";import { jt, t } from "ttag";import { useListRecentsQuery, useSearchQuery } from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";-import { getCollection } from "metabase/collections/utils";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";+import { getCollection } from "metabase/common/collections/utils";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { useSetting } from "metabase/common/hooks";import { trackSearchClick } from "metabase/common/search/analytics";diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex 0620a050f55..897e79ebd83 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -6,7 +6,7 @@ import { useLatest } from "react-use";import { t } from "ttag";import { skipToken, useSearchQuery } from "metabase/api";-import { useInitialCollectionId } from "metabase/collections/hooks";+import { useInitialCollectionId } from "metabase/common/collections/hooks";import { useDatabaseListQuery } from "metabase/common/hooks";import { trackMetricCreateStarted } from "metabase/data-studio/analytics";import { canAccessDataStudio } from "metabase/data-studio/selectors";diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsxindex 67be95109e0..58ac8f22461 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceModal.unit.spec.tsx@@ -23,7 +23,7 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import { checkNotNull } from "metabase/utils/types";import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsxindex cfb98a7ee94..7c8fdda2d4d 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/tests/setup.tsx@@ -16,7 +16,7 @@ import {import { mockSettings } from "__support__/settings";import { createMockEntitiesState } from "__support__/store";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { createMockState } from "metabase/redux/store/mocks";import { createMockUiParameter } from "metabase-lib/v1/parameters/mock";import type { UiParameter } from "metabase-lib/v1/parameters/types";diff --git a/frontend/src/metabase/plugins/oss/collections.ts b/frontend/src/metabase/plugins/oss/collections.tsindex 4b0afe8dbec..aaf04ad5ac6 100644--- a/frontend/src/metabase/plugins/oss/collections.ts+++ b/frontend/src/metabase/plugins/oss/collections.ts@@ -5,7 +5,7 @@ import { t } from "ttag";import type {CollectionAuthorityLevelConfig,CollectionInstanceAnaltyicsConfig,-} from "metabase/collections/types";+} from "metabase/common/collections/types";import { useGetIconBase } from "metabase/hooks/use-icon";import { PluginPlaceholder } from "metabase/plugins/components/PluginPlaceholder";import type { IconProps } from "metabase/ui";diff --git a/frontend/src/metabase/plugins/oss/remote-sync.ts b/frontend/src/metabase/plugins/oss/remote-sync.tsindex a9ffd28ecd8..e690a795f69 100644--- a/frontend/src/metabase/plugins/oss/remote-sync.ts+++ b/frontend/src/metabase/plugins/oss/remote-sync.ts@@ -7,7 +7,7 @@ import type { ComponentType, ReactNode } from "react";import type { TagType } from "metabase/api/tags";import type { UseQuery } from "metabase/api/types/rtk";-import type { CollectionTreeItem } from "metabase/collections/utils";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import type { ITreeNodeItem } from "metabase/common/components/tree/types";import type {GitSyncSetupMenuItemProps,diff --git a/frontend/src/metabase/plugins/oss/tenants.ts b/frontend/src/metabase/plugins/oss/tenants.tsindex 44cab9d5468..275b6933044 100644--- a/frontend/src/metabase/plugins/oss/tenants.ts+++ b/frontend/src/metabase/plugins/oss/tenants.ts@@ -1,7 +1,7 @@import type React from "react";import type { SetStateAction } from "react";-import type { CollectionTreeItem } from "metabase/collections/utils";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import type {OmniPickerCollectionItem,OmniPickerItem,diff --git a/frontend/src/metabase/plugins/types.ts b/frontend/src/metabase/plugins/types.tsindex 9561933b72c..46c7bc3599c 100644--- a/frontend/src/metabase/plugins/types.ts+++ b/frontend/src/metabase/plugins/types.ts@@ -1,6 +1,6 @@import type { ComponentType } from "react";-import type { CollectionTreeItem } from "metabase/collections/utils";+import type { CollectionTreeItem } from "metabase/common/collections/utils";import type { ConfirmationState } from "metabase/common/hooks/use-confirmation";import type { Member, Membership, User } from "metabase-types/api";diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex 08c7e29fc89..0abab29169a 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import _ from "underscore";import { getDashboard } from "metabase/api";-import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";import { CopyModal } from "metabase/common/components/CopyModal";import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/AddToDashSelectDashModal";import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx b/frontend/src/metabase/query_builder/components/view/View/View/View.jsxindex b579af731fe..ccc3e9537f5 100644--- a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx@@ -10,7 +10,7 @@ import { Api, cardApi } from "metabase/api";import { listTag } from "metabase/api/tags";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";import { deletePermanently } from "metabase/archive/actions";-import { getEntityTypeFromCardType } from "metabase/collections/utils";+import { getEntityTypeFromCardType } from "metabase/common/collections/utils";import { ExplicitSize } from "metabase/common/components/ExplicitSize";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Toaster } from "metabase/common/components/Toaster";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsxindex 6fffd21b49e..4ebe53d53c3 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QuestionActions/QuestionMoreActionsMenu/QuestionMoreActionsMenu.tsx@@ -2,7 +2,7 @@ import { Fragment, type JSX, useState } from "react";import { c, t } from "ttag";import _ from "underscore";-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { useUserAcknowledgement } from "metabase/common/hooks/use-user-acknowledgement";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsxindex 98e27721113..e97e5fdfc67 100644--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/ViewTitleHeaderRightSide/QuestionSharingMenu/QuestionSharingMenu.tsx@@ -1,7 +1,7 @@import { useMemo } from "react";import { t } from "ttag";-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { useSetting } from "metabase/common/hooks";import { LinkCopiedTooltipLabel } from "metabase/embedding/components/SharingMenu/LinkCopiedTooltipLabel";import {diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsxindex 6cfc6a7ab87..f02fdb228a9 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionDetails.tsx@@ -3,7 +3,7 @@ import { useState } from "react";import { c, t } from "ttag";import { skipToken, useGetDashboardQuery } from "metabase/api";-import { getCollectionName } from "metabase/collections/utils";+import { getCollectionName } from "metabase/common/collections/utils";import { DateTime } from "metabase/common/components/DateTime";import { Link } from "metabase/common/components/Link";import { SidesheetCardSection } from "metabase/common/components/Sidesheet";diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsxindex 8e697caf889..93fef30defc 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionInfoSidebar/QuestionInfoSidebar.tsx@@ -3,7 +3,7 @@ import { useMemo, useState } from "react";import { useMount } from "react-use";import { t } from "ttag";-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { EntityIdCard } from "metabase/common/components/EntityIdCard";import { Link } from "metabase/common/components/Link";import {diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsxindex c90f794f9ff..c42fcb17d91 100644--- a/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx+++ b/frontend/src/metabase/query_builder/components/view/sidebars/QuestionSettingsSidebar/QuestionSettingsSidebar.tsx@@ -2,7 +2,7 @@ import { useMount } from "react-use";import { match } from "ts-pattern";import { t } from "ttag";-import { isInstanceAnalyticsCollection } from "metabase/collections/utils";+import { isInstanceAnalyticsCollection } from "metabase/common/collections/utils";import { Sidesheet, SidesheetCard } from "metabase/common/components/Sidesheet";import { PLUGIN_CACHING, PLUGIN_MODEL_PERSISTENCE } from "metabase/plugins";import { useDispatch } from "metabase/redux";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.tsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.tsxindex 887207cf820..427802f7946 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.tsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityList.tsx@@ -2,7 +2,7 @@ import { Fragment } from "react";import { t } from "ttag";import { skipToken, useListCollectionItemsQuery } from "metabase/api";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { SelectList } from "metabase/common/components/SelectList";diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsxindex 8108d34052c..e38fe26e0ba 100644--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx@@ -5,13 +5,13 @@ import {useGetCollectionQuery,useListCollectionsTreeQuery,} from "metabase/api";-import { PERSONAL_COLLECTIONS } from "metabase/collections/constants";+import { PERSONAL_COLLECTIONS } from "metabase/common/collections/constants";import {buildCollectionTree,currentUserPersonalCollections,isRootPersonalCollection,nonPersonalOrArchivedCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { Tree } from "metabase/common/components/tree";import { findCollectionById } from "metabase/common/utils/collections";import CS from "metabase/css/core/index.css";diff --git a/frontend/src/metabase/querying/components/DataReference/DatabasePane.tsx b/frontend/src/metabase/querying/components/DataReference/DatabasePane.tsxindex da09a417ed8..6de66aa6b2f 100644--- a/frontend/src/metabase/querying/components/DataReference/DatabasePane.tsx+++ b/frontend/src/metabase/querying/components/DataReference/DatabasePane.tsx@@ -8,7 +8,7 @@ import {useListDatabaseSchemasQuery,useSearchQuery,} from "metabase/api";-import { getCollectionName } from "metabase/collections/utils";+import { getCollectionName } from "metabase/common/collections/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { SidebarContent } from "metabase/common/components/SidebarContent";import { Tree } from "metabase/common/components/tree";diff --git a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsxindex e78e6ee02dc..dcd596fd88b 100644--- a/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx+++ b/frontend/src/metabase/querying/components/NativeQueryEditor/SnippetForm/SnippetForm.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import * as Yup from "yup";import { useListCollectionsQuery } from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { FormErrorMessage } from "metabase/common/components/FormErrorMessage";import { FormInput } from "metabase/common/components/FormInput";import { FormTextArea } from "metabase/common/components/FormTextArea";diff --git a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsxindex eca04fac0ca..9f3dfcfd450 100644--- a/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx+++ b/frontend/src/metabase/querying/components/SnippetSidebar/SnippetSidebar.tsx@@ -8,7 +8,7 @@ import {useListCollectionsQuery,useListSnippetsQuery,} from "metabase/api";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { SidebarContent } from "metabase/common/components/SidebarContent";import { SidebarHeader } from "metabase/common/components/SidebarHeader";diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsxindex 5ed65125cdb..979003b292e 100644--- a/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx+++ b/frontend/src/metabase/querying/notebook/components/DataStep/tests/setup.tsx@@ -6,7 +6,7 @@ import {setupSearchEndpoints,} from "__support__/server-mocks";import { renderWithProviders, waitForLoaderToBeRemoved } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import * as Lib from "metabase-lib";import { columnFinder } from "metabase-lib/test-helpers";import {diff --git a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.unit.spec.tsxindex 29f726faf54..fef5e90c055 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookStep/NotebookStep.unit.spec.tsx@@ -7,7 +7,7 @@ import {setupSearchEndpoints,} from "__support__/server-mocks";import { renderWithProviders, screen } from "__support__/ui";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import type Question from "metabase-lib/v1/Question";import { createMockCollection } from "metabase-types/api/mocks";import { createSampleDatabase } from "metabase-types/api/mocks/presets";diff --git a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsxindex 08845ecc168..76acecbf0ae 100644--- a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx+++ b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx@@ -2,7 +2,7 @@ import { useMemo } from "react";import { useLatest } from "react-use";import { useCreateCardMutation } from "metabase/api";-import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { useGetDefaultCollectionId } from "metabase/common/collections/hooks";import { CopyModal } from "metabase/common/components/CopyModal";import type { CopyCardProperties } from "metabase/questions/components/CopyCardForm";import type { Card } from "metabase-types/api";diff --git a/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsxindex c66b93579a6..9c8180c0df7 100644--- a/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx+++ b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.tsx@@ -3,8 +3,8 @@ import { c, t } from "ttag";import _ from "underscore";import * as Yup from "yup";-import { FormCollectionAndDashboardPicker } from "metabase/collections/containers/FormCollectionAndDashboardPicker";-import { getEntityTypeFromCardType } from "metabase/collections/utils";+import { FormCollectionAndDashboardPicker } from "metabase/common/collections/containers/FormCollectionAndDashboardPicker";+import { getEntityTypeFromCardType } from "metabase/common/collections/utils";import { FormDashboardTabSelect } from "metabase/common/components/FormDashboardTabSelect";import { FormFooter } from "metabase/common/components/FormFooter";import type { OmniPickerItem } from "metabase/common/components/Pickers";diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsxindex 5d5838008b0..797515a50c2 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx@@ -5,12 +5,12 @@ import _ from "underscore";import { getDashboard, useUpdateCardMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";-import { QuestionMoveConfirmModal } from "metabase/collections/components/CollectionBulkActions/QuestionMoveConfirmModal";-import type { MoveDestination } from "metabase/collections/types";+import { QuestionMoveConfirmModal } from "metabase/common/collections/components/QuestionMoveConfirmModal";+import type { MoveDestination } from "metabase/common/collections/types";import {canonicalCollectionId,getEntityTypeFromCardType,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { DashboardName } from "metabase/common/components/DashboardName";import type { OmniPickerCollectionItem } from "metabase/common/components/Pickers";diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsxindex 89b5cc80d9c..1a44c9e7c2c 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardToast/MoveCardToast.tsx@@ -6,8 +6,8 @@ import {useGetCollectionQuery,useGetDashboardQuery,} from "metabase/api";-import type { MoveDestination } from "metabase/collections/types";-import { coerceCollectionId } from "metabase/collections/utils";+import type { MoveDestination } from "metabase/common/collections/types";+import { coerceCollectionId } from "metabase/common/collections/utils";import { Link } from "metabase/common/components/Link";import { Flex, Icon } from "metabase/ui";import * as Urls from "metabase/urls";diff --git a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/LinkedEntityPickerModal/utils.ts b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/LinkedEntityPickerModal/utils.tsindex a47f75dd623..e6221f2a78b 100644--- a/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/LinkedEntityPickerModal/utils.ts+++ b/frontend/src/metabase/rich_text_editing/tiptap/extensions/shared/LinkedEntityPickerModal/utils.ts@@ -1,7 +1,7 @@import {PERSONAL_COLLECTIONS,ROOT_COLLECTION,-} from "metabase/collections/constants";+} from "metabase/common/collections/constants";import type { OmniPickerItem } from "metabase/common/components/Pickers";import { DOCUMENT_LINK_MODELS } from "./constants";diff --git a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsxindex d07bedf5093..7437337143d 100644--- a/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx+++ b/frontend/src/metabase/status/components/FileUploadStatus/FileUploadStatus.unit.spec.tsx@@ -1,36 +1,12 @@-import userEvent from "@testing-library/user-event";import fetchMock from "fetch-mock";-import { Route } from "react-router";import {- setupBookmarksEndpoints,setupCollectionByIdEndpoint,- setupCollectionItemsEndpoint,setupCollectionsEndpoints,- setupDashboardQuestionCandidatesEndpoint,- setupDatabasesEndpoints,- setupNullGetUserKeyValueEndpoints,- setupSearchEndpoints,- setupUserMetabotPermissionsEndpoint,} from "__support__/server-mocks";-import {- act,- renderWithProviders,- screen,- waitFor,- within,-} from "__support__/ui";-import { CollectionContent } from "metabase/collections/components/CollectionContent";-import {- createMockSettingsState,- createMockState,- createMockUpload,-} from "metabase/redux/store/mocks";-import {- createMockCollection,- createMockCollectionItem,- createMockDatabase,-} from "metabase-types/api/mocks";+import { renderWithProviders, screen } from "__support__/ui";+import { createMockState, createMockUpload } from "metabase/redux/store/mocks";+import { createMockCollection } from "metabase-types/api/mocks";import { FileUploadStatus } from "./FileUploadStatus";@@ -46,90 +22,13 @@ const secondCollection = createMockCollection({name: "Second Collection",});-const thirdCollection = createMockCollection({- id: 3,- name: "Second Collection",-});--const uploadedModel = createMockCollectionItem({- id: 3,- name: "my uploaded model",- collection: secondCollection,- model: "dataset",- based_on_upload: 123,-});--const uploadedModel2 = createMockCollectionItem({- id: 4,- name: "my second uploaded model",- collection: secondCollection,- model: "dataset",- based_on_upload: 124,-});--async function setupCollectionContent(overrides = {}) {- setupUserMetabotPermissionsEndpoint();- setupDatabasesEndpoints([createMockDatabase({ can_upload: true })]);- setupSearchEndpoints([]);- setupBookmarksEndpoints([]);- setupNullGetUserKeyValueEndpoints();- setupDashboardQuestionCandidatesEndpoint([]);-- const settings = createMockSettingsState({- "uploads-settings": {- db_id: 1,- schema_name: null,- table_prefix: null,- },- });-- renderWithProviders(- <Route- path="/"- component={() => {- return (- <>- <CollectionContent- collectionId={firstCollectionId}- {...overrides}- />- <FileUploadStatus />- </>- );- }}- />,- {- withRouter: true,- withDND: true,- storeInitialState: createMockState({- settings,- }),- },- );-- // wait for loading to complete- await screen.findByTestId("upload-input");-}-describe("FileUploadStatus", () => {beforeEach(() => {setupCollectionByIdEndpoint({- collections: [firstCollection, secondCollection, thirdCollection],+ collections: [firstCollection, secondCollection],});setupCollectionsEndpoints({- collections: [firstCollection, secondCollection, thirdCollection],- });- setupCollectionItemsEndpoint({- collection: firstCollection,- collectionItems: [],- });- setupCollectionItemsEndpoint({- collection: secondCollection,- collectionItems: [uploadedModel],- });- setupCollectionItemsEndpoint({- collection: thirdCollection,- collectionItems: [uploadedModel, uploadedModel2],+ collections: [firstCollection, secondCollection],});fetchMock.get("path:/api/table/123",@@ -140,10 +39,6 @@ describe("FileUploadStatus", () => {);});- afterEach(() => {- jest.useRealTimers();- });-it("Should group uploads by collection", async () => {const uploadOne = createMockUpload({collectionId: firstCollectionId,@@ -208,293 +103,4 @@ describe("FileUploadStatus", () => {expect(await screen.findByText("test.csv")).toBeInTheDocument();});-- it("Should show a start exploring link on completion", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post("path:/api/upload/csv", "3", { delay: 1000 });-- await setupCollectionContent();-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText("Uploading data to Collection …"),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(1000);- });-- expect(- await screen.findByRole("link", { name: /Start exploring/ }),- ).toHaveAttribute("href", "/model/3");- });-- it("Should allow new model creation when an appendable model exists", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post("path:/api/upload/csv", "3", { delay: 1000 });-- await setupCollectionContent({ collectionId: secondCollectionId });-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- expect(- await screen.findByText("Select upload destination"),- ).toBeInTheDocument();-- await userEvent.click(screen.getByRole("button", { name: "Create model" }));-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText("Uploading data to Second Collection …"),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(1000);- });-- expect(- await screen.findByRole("link", { name: /Start exploring/ }),- ).toHaveAttribute("href", "/model/3");- });-- it("Should default to appending to a single selectable model", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post("path:/api/table/123/append-csv", "3", { delay: 1000 });-- await setupCollectionContent({ collectionId: secondCollectionId });-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- expect(- await screen.findByText("Select upload destination"),- ).toBeInTheDocument();-- await userEvent.click(screen.getByText("Append to a model"));- const submitButton = await screen.findByRole("button", {- name: "Append to model",- });-- // only appendable model should be pre-selected- expect(- await screen.findByRole("textbox", { name: "Select a model" }),- ).toHaveValue("my uploaded model");-- await waitFor(() => expect(submitButton).toBeEnabled());- await userEvent.click(submitButton);-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText(/Uploading data to Fancy Table/i),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(1000);- });-- expect(- await screen.findByRole("link", { name: /Start exploring/ }),- ).toHaveAttribute("href", "/model/3");- });-- it("Should allow selecting from appendable models", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post("path:/api/table/123/append-csv", "3", { delay: 1000 });-- await setupCollectionContent({ collectionId: thirdCollection.id });-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- expect(- await screen.findByText("Select upload destination"),- ).toBeInTheDocument();-- await userEvent.click(screen.getByText("Append to a model"));- const submitButton = await screen.findByRole("button", {- name: "Append to model",- });-- await userEvent.click(await screen.findByPlaceholderText("Select a model"));- await userEvent.click(- await within(await screen.findByRole("listbox")).findByText(- "my uploaded model",- ),- );-- await waitFor(() => expect(submitButton).toBeEnabled());- await userEvent.click(submitButton);-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText(/Uploading data to Fancy Table/i),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(1000);- });-- expect(- await screen.findByRole("link", { name: /Start exploring/ }),- ).toHaveAttribute("href", "/model/3");- await screen.findByText("Data added to Fancy Table");- });-- it("Should allow replacing data in a model", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post("path:/api/table/123/replace-csv", "3", { delay: 1000 });-- await setupCollectionContent({ collectionId: thirdCollection.id });-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- expect(- await screen.findByText("Select upload destination"),- ).toBeInTheDocument();- await userEvent.click(screen.getByText("Replace data in a model"));- const submitButton = await screen.findByRole("button", {- name: "Replace model data",- });-- await userEvent.click(await screen.findByPlaceholderText("Select a model"));- await userEvent.click(- await within(await screen.findByRole("listbox")).findByText(- "my uploaded model",- ),- );-- await waitFor(() => expect(submitButton).toBeEnabled());- await userEvent.click(submitButton);-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText(/Uploading data to Fancy Table/i),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(1000);- });-- expect(- await screen.findByRole("link", { name: /Start exploring/ }),- ).toHaveAttribute("href", "/model/3");- await screen.findByText("Data replaced in Fancy Table");- });-- it("Should show an error message on error", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post(- "path:/api/upload/csv",- {- throws: {- data: { message: "Something went wrong", cause: "It's dead Jim" },- },- status: 400,- },- { delay: 1000 },- );-- await setupCollectionContent();-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText("Uploading data to Collection …"),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(500);- });-- expect(- await screen.findByText("Error uploading your file"),- ).toBeInTheDocument();-- await userEvent.click(await screen.findByText("Show error details"));-- expect(await screen.findByRole("dialog")).toBeInTheDocument();-- expect(await screen.findByText("Something went wrong")).toBeInTheDocument();- });-- describe("loading state", () => {- it("should rotate loading messages after 30 seconds", async () => {- jest.useFakeTimers({ advanceTimers: true });- fetchMock.post("path:/api/upload/csv", "3", { delay: 90 * 1000 });-- await setupCollectionContent();-- await userEvent.upload(- screen.getByTestId("upload-input"),- new File(["foo, bar"], "test.csv", { type: "text/csv" }),- );-- act(() => {- jest.advanceTimersByTime(1 * 1000);- });-- expect(- await screen.findByText("Uploading data to Collection …"),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(30 * 1000);- });-- expect(await screen.findByText("Still working …")).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(30 * 1000);- });-- expect(- await screen.findByText("Arranging bits and bytes …"),- ).toBeInTheDocument();-- act(() => {- jest.advanceTimersByTime(30 * 1000);- });-- expect(- await screen.findByRole("link", { name: /Start exploring/ }),- ).toHaveAttribute("href", "/model/3");- });- });});diff --git a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsxindex 5339737d3a2..964b1e5efff 100644--- a/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/common/components/NewTimelineModal/NewTimelineModal.tsx@@ -1,7 +1,7 @@import { useCallback, useMemo } from "react";import { t } from "ttag";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import { ModalContent } from "metabase/common/components/ModalContent";import { getDefaultTimelineIcon } from "metabase/common/utils/timelines";import type { Collection, TimelineData } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsxindex 52f7d56d2c5..cca5a8938cf 100644--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx@@ -3,7 +3,7 @@ import {useGetTimelineEventQuery,useListTimelinesQuery,} from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import MoveEventModal, {type MoveEventModalProps,} from "metabase/timelines/common/components/MoveEventModal";diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsxindex 21a637999b4..29a10de41e5 100644--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx@@ -6,7 +6,7 @@ import {useGetCollectionQuery,useListTimelinesQuery,} from "metabase/api";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { getDefaultTimeline } from "metabase/common/utils/timelines";import { useDispatch } from "metabase/redux";import { addUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsxindex 1dabfac5595..914ecb11bf6 100644--- a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx+++ b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx@@ -2,7 +2,7 @@ import type { ComponentProps } from "react";import { useGetCollectionQuery } from "metabase/api";import { useSetArchive } from "metabase/archive/hooks";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { CollectionId, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsxindex 51396b60c1a..8f19e6aedfe 100644--- a/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx+++ b/frontend/src/metabase/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx@@ -3,11 +3,11 @@ import { t } from "ttag";import { useCreateCollectionMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import {COLLECTION_FORM_SCHEMA,type CollectionFormValues,-} from "metabase/collections/schemas";+} from "metabase/common/collections/schemas";import { useToast } from "metabase/common/hooks";import {Form,diff --git a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsxindex 0c9a17eb34c..01bbc082f79 100644--- a/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx+++ b/frontend/src/metabase/transforms/components/TransformHeader/TransformMoreMenu/MoveTransformModal.tsx@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";import { c } from "ttag";import { useUpdateTransformMutation } from "metabase/api";-import { canonicalCollectionId } from "metabase/collections/utils";+import { canonicalCollectionId } from "metabase/common/collections/utils";import type {EntityPickerOptions,OmniPickerItem,diff --git a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsxindex 64ba53c3cf0..6a6bf83ce94 100644--- a/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx+++ b/frontend/src/metabase/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx@@ -9,7 +9,7 @@ import {useGetDatabaseQuery,useListSyncableDatabaseSchemasQuery,} from "metabase/api";-import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import FormCollectionPicker from "metabase/common/collections/containers/FormCollectionPicker";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { hasFeature } from "metabase/common/utils/database";import {diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsxindex 96d46ed706a..5d5041b90dc 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx+++ b/frontend/src/metabase/transforms/pages/TransformListPage/CollectionRowMenu.tsx@@ -1,6 +1,6 @@import { msgid, ngettext, t } from "ttag";-import { CollectionRowMenu as BaseCollectionRowMenu } from "metabase/collections/components/CollectionRowMenu";+import { CollectionRowMenu as BaseCollectionRowMenu } from "metabase/common/collections/components/CollectionRowMenu";import type { Collection } from "metabase-types/api";type CollectionRowMenuProps = {diff --git a/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts b/frontend/src/metabase/transforms/pages/TransformListPage/utils.tsindex 0e0def87350..5e15b136437 100644--- a/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts+++ b/frontend/src/metabase/transforms/pages/TransformListPage/utils.ts@@ -1,7 +1,7 @@import { useMemo, useRef } from "react";import { t } from "ttag";-import { getCollectionIcon } from "metabase/collections/utils";+import { getCollectionIcon } from "metabase/common/collections/utils";import { useSelector } from "metabase/redux";import { getMetadata } from "metabase/selectors/metadata";import { getLibQuery } from "metabase/transforms/utils";diff --git a/frontend/src/metabase/urls/collections.ts b/frontend/src/metabase/urls/collections.tsindex 7082a62cc03..66471519dfd 100644--- a/frontend/src/metabase/urls/collections.ts+++ b/frontend/src/metabase/urls/collections.ts@@ -3,7 +3,7 @@ import slugg from "slugg";import {isRootPersonalCollection,isRootTrashCollection,-} from "metabase/collections/utils";+} from "metabase/common/collections/utils";import type {Collection as BaseCollection,CollectionId,diff --git a/frontend/test/__support__/server-mocks/collection.ts b/frontend/test/__support__/server-mocks/collection.tsindex b4fb413e244..b2f2423f4cd 100644--- a/frontend/test/__support__/server-mocks/collection.ts+++ b/frontend/test/__support__/server-mocks/collection.ts@@ -1,7 +1,7 @@import fetchMock from "fetch-mock";import _ from "underscore";-import { ROOT_COLLECTION } from "metabase/collections/constants";+import { ROOT_COLLECTION } from "metabase/common/collections/constants";import {SAVED_QUESTIONS_VIRTUAL_DB_ID,convertSavedQuestionToVirtualTable,