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
[1 of 2] Move the shared permissions code into metabase/permissions (#85456)
Alexander Polyankin58e023a42f37
diff --git a/e2e/test/scenarios/actions/table-editing.cy.spec.ts b/e2e/test/scenarios/actions/table-editing.cy.spec.tsindex 2d29cafd59c..51a8d6eb093 100644--- a/e2e/test/scenarios/actions/table-editing.cy.spec.ts+++ b/e2e/test/scenarios/actions/table-editing.cy.spec.ts@@ -11,8 +11,8 @@ import {} from "e2e/support/cypress_data";import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";import { resetSnowplow } from "e2e/support/helpers/e2e-snowplow-helpers";-import { DataPermissionValue } from "metabase/admin/permissions/types";import { dayjs } from "metabase/dayjs";+import { DataPermissionValue } from "metabase-types/api/permissions";const { H } = cy;const { ALL_USERS_GROUP } = USER_GROUPS;diff --git a/e2e/test/scenarios/admin/database-routing/database-routing-usage.cy.spec.ts b/e2e/test/scenarios/admin/database-routing/database-routing-usage.cy.spec.tsindex b6fd6130dfb..78b4e40e572 100644--- a/e2e/test/scenarios/admin/database-routing/database-routing-usage.cy.spec.ts+++ b/e2e/test/scenarios/admin/database-routing/database-routing-usage.cy.spec.ts@@ -2,7 +2,7 @@ const { H } = cy;import _ from "underscore";import { USER_GROUPS } from "e2e/support/cypress_data";-import { DataPermissionValue } from "metabase/admin/permissions/types";+import { DataPermissionValue } from "metabase-types/api/permissions";import {BASE_POSTGRES_DESTINATION_DB_INFO,diff --git a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.tsindex 591782900c6..e0882701f2d 100644--- a/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms/transforms.cy.spec.ts@@ -11,7 +11,6 @@ import {NORMAL_USER_ID,} from "e2e/support/cypress_sample_instance_data";import { createLibraryWithItems } from "e2e/support/test-library-data";-import { DataPermissionValue } from "metabase/admin/permissions/types";import type {CardType,CollectionId,@@ -19,6 +18,7 @@ import type {TransformSourceCheckpointStrategy,TransformTagId,} from "metabase-types/api";+import { DataPermissionValue } from "metabase-types/api/permissions";const { H } = cy;diff --git a/e2e/test/scenarios/documents/document-downloads.cy.spec.ts b/e2e/test/scenarios/documents/document-downloads.cy.spec.tsindex c8a2ccb9ba4..008e3e3c2eb 100644--- a/e2e/test/scenarios/documents/document-downloads.cy.spec.ts+++ b/e2e/test/scenarios/documents/document-downloads.cy.spec.ts@@ -1,6 +1,6 @@import { SAMPLE_DB_ID, USER_GROUPS } from "e2e/support/cypress_data";import { DOCUMENT_WITH_TWO_CARDS } from "e2e/support/document-initial-data";-import { DataPermissionValue } from "metabase/admin/permissions/types";+import { DataPermissionValue } from "metabase-types/api/permissions";const { H } = cy;diff --git a/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts b/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.tsindex df7f100a7dc..c39cafb3238 100644--- a/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts+++ b/e2e/test/scenarios/permissions/transforms-permissions.cy.spec.ts@@ -5,7 +5,7 @@ import {WRITABLE_DB_ID,} from "e2e/support/cypress_data";import { NORMAL_USER_ID } from "e2e/support/cypress_sample_instance_data";-import { DataPermissionValue } from "metabase/admin/permissions/types";+import { DataPermissionValue } from "metabase-types/api/permissions";const { ALL_USERS_GROUP, COLLECTION_GROUP, DATA_GROUP } = USER_GROUPS;diff --git a/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts b/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.tsindex f52aa64f2b3..c71b93c86fb 100644--- a/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts+++ b/e2e/test/scenarios/question/notebook-link-to-data-source.cy.spec.ts@@ -11,8 +11,8 @@ import type {NativeQuestionDetails,QuestionDetails,} from "e2e/support/helpers";-import { DataPermissionValue } from "metabase/admin/permissions/types";import { METAKEY } from "metabase/utils/browser";+import { DataPermissionValue } from "metabase-types/api/permissions";const {ORDERS,diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsxindex 797d21e6412..14ddc290f1f 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/components/ImpersonationModal/ImpersonationModal.tsx@@ -1,11 +1,10 @@import { useCallback } from "react";import { useMount } from "react-use";-import { updateDataPermission } from "metabase/admin/permissions/permissions";-import { DataPermissionType } from "metabase/admin/permissions/types";import { skipToken, useGetDatabaseQuery } from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";+import { updateDataPermission } from "metabase/permissions";import { useDispatch } from "metabase/redux";import { parseIntParam } from "metabase/urls";import { updateImpersonation } from "metabase-enterprise/advanced_permissions/reducer";@@ -21,6 +20,7 @@ import { fetchUserAttributes } from "metabase-enterprise/shared/reducer";import { getUserAttributes } from "metabase-enterprise/shared/selectors";import {DataPermission,+ DataPermissionType,DataPermissionValue,type UserAttributeKey,} from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.tsindex 419e2d587bc..0fce386f604 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.ts+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.ts@@ -1,15 +1,13 @@import _ from "underscore";-import {- isSchemaEntityId,- isTableEntityId,-} from "metabase/admin/permissions/utils/data-entity-id";import {getEntityPermission,getSchemasPermission,hasPermissionValueInSubgraph,+ isSchemaEntityId,+ isTableEntityId,updateEntityPermission,-} from "metabase/admin/permissions/utils/graph";+} from "metabase/permissions";import {DataPermission,DataPermissionValue,diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.tsindex 849131984c8..0c3b77e4d05 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.ts+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/reducer.ts@@ -5,11 +5,9 @@ import {LOAD_DATA_PERMISSIONS,SAVE_DATA_PERMISSIONS,UPDATE_DATA_PERMISSION,-} from "metabase/admin/permissions/permissions";-import {getDatabasesBasePath,getGroupsBasePath,-} from "metabase/admin/permissions/utils/urls";+} from "metabase/permissions";import { navigate } from "metabase/router";import {DataPermission,diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/utils.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/utils.tsindex 7169bf6b48f..14e0211177c 100644--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/utils.ts@@ -1,7 +1,7 @@import {getDatabaseFocusPermissionsUrl,getGroupFocusPermissionsUrl,-} from "metabase/admin/permissions/utils/urls";+} from "metabase/permissions";import type { GroupId, PermissionEntityId } from "metabase-types/api";import type { ImpersonationModalParams } from "./types";diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsxindex 1976f0e497d..936aa1cd7d1 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx@@ -1,8 +1,8 @@import { useCallback, useEffect } from "react";-import { ApplicationPermissionsHelp } from "metabase/admin/permissions/components/ApplicationPermissionsHelp";import { PermissionsEditor } from "metabase/admin/permissions/components/PermissionsEditor";import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";+import { ApplicationPermissionsHelp } from "metabase/permissions";import { connect } from "metabase/redux";import {initializeApplicationPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsxindex 76b737fd3f3..38a85611c91 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/selectors.tsx@@ -3,17 +3,17 @@ import { getIn } from "icepick";import { t } from "ttag";import _ from "underscore";-import { Messages } from "metabase/admin/permissions/constants/messages";-import { getDefaultGroupHasHigherAccessText } from "metabase/admin/permissions/selectors/confirmations";-import {- getDefaultGroup,- getOrderedGroups,-} from "metabase/admin/permissions/selectors/data-permissions/groups";import {getGroupNameLocalized,isAdminGroup,} from "metabase/common/utils/groups";import { getUser } from "metabase/current-user";+import {+ Messages,+ getDefaultGroup,+ getDefaultGroupHasHigherAccessText,+ getOrderedGroups,+} from "metabase/permissions";import { PLUGIN_TENANTS } from "metabase/plugins";import type { State } from "metabase/redux/store";import type { Group } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppPermissionsPage/DataAppGroupSidebar/MissingTablesSection/MissingTablesSection.tsx b/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppPermissionsPage/DataAppGroupSidebar/MissingTablesSection/MissingTablesSection.tsxindex 3e0604288f8..eaeabd51738 100644--- a/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppPermissionsPage/DataAppGroupSidebar/MissingTablesSection/MissingTablesSection.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-apps/data-studio/pages/DataAppPermissionsPage/DataAppGroupSidebar/MissingTablesSection/MissingTablesSection.tsx@@ -2,9 +2,9 @@ import cx from "classnames";import { useState } from "react";import { t } from "ttag";-import { getDatabaseFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";import { ForwardRefLink } from "metabase/common/components/Link";import CS from "metabase/css/core/index.css";+import { getDatabaseFocusPermissionsUrl } from "metabase/permissions";import {Badge,Box,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxindex 0ac112c0a89..1eb72f5d23d 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx@@ -1,5 +1,5 @@-import CollectionPermissionsModalBase from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";import { skipToken, useListCollectionsQuery } from "metabase/api";+import { CollectionPermissionsModal as CollectionPermissionsModalBase } from "metabase/permissions";import type { CollectionPermissionsModalProps } from "metabase/plugins";import { Modal } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.tsindex 2de2aaffbd3..129b032deb0 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/data-model-permission.ts@@ -1,23 +1,19 @@import { t } from "ttag";-import { Messages } from "metabase/admin/permissions/constants/messages";-import { navigateToGranularPermissions } from "metabase/admin/permissions/permissions";import {- getPermissionWarning,- getPermissionWarningModal,-} from "metabase/admin/permissions/selectors/confirmations";-import {- DataPermissionType,+ Messages,type PermissionOption,type PermissionSectionConfig,-} from "metabase/admin/permissions/types";-import {getFieldsPermission,+ getPermissionWarning,+ getPermissionWarningModal,getSchemasPermission,getTablesPermission,-} from "metabase/admin/permissions/utils/graph";+ navigateToGranularPermissions,+} from "metabase/permissions";import {DataPermission,+ DataPermissionType,DataPermissionValue,type Group,type GroupsPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.tsindex 2f205c99ff4..b2da972f744 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/details-permission.ts@@ -1,18 +1,16 @@import { getIn } from "icepick";import { t } from "ttag";-import { Messages } from "metabase/admin/permissions/constants/messages";import {- getPermissionWarning,- getPermissionWarningModal,-} from "metabase/admin/permissions/selectors/confirmations";-import {- DataPermissionType,+ Messages,type PermissionOption,type PermissionSectionConfig,-} from "metabase/admin/permissions/types";+ getPermissionWarning,+ getPermissionWarningModal,+} from "metabase/permissions";import {DataPermission,+ DataPermissionType,DataPermissionValue,type Group,type GroupsPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.tsindex 301d56e0922..013e0145ac9 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/download-permission.ts@@ -1,23 +1,19 @@import { t } from "ttag";-import { Messages } from "metabase/admin/permissions/constants/messages";-import { navigateToGranularPermissions } from "metabase/admin/permissions/permissions";import {- getPermissionWarning,- getPermissionWarningModal,-} from "metabase/admin/permissions/selectors/confirmations";-import {- DataPermissionType,+ Messages,type PermissionOption,type PermissionSectionConfig,-} from "metabase/admin/permissions/types";-import {getFieldsPermission,+ getPermissionWarning,+ getPermissionWarningModal,getSchemasPermission,getTablesPermission,-} from "metabase/admin/permissions/utils/graph";+ navigateToGranularPermissions,+} from "metabase/permissions";import {DataPermission,+ DataPermissionType,DataPermissionValue,type Group,type GroupsPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.tsindex 2ede375094d..f8db659cf0f 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/index.ts@@ -1,4 +1,4 @@-import type { PermissionSectionConfig } from "metabase/admin/permissions/types";+import type { PermissionSectionConfig } from "metabase/permissions";import { isNotNull } from "metabase/utils/types";import type {DataPermissionValue,diff --git a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/transforms-permission.ts b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/transforms-permission.tsindex 52e55951fbc..99f0b62a520 100644--- a/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/transforms-permission.ts+++ b/enterprise/frontend/src/metabase-enterprise/feature_level_permissions/permission-management/transforms-permission.ts@@ -1,19 +1,17 @@import { getIn } from "icepick";import { t } from "ttag";-import { Messages } from "metabase/admin/permissions/constants/messages";import {- getPermissionWarning,- getPermissionWarningModal,-} from "metabase/admin/permissions/selectors/confirmations";-import {- DataPermissionType,+ Messages,type PermissionOption,type PermissionSectionConfig,-} from "metabase/admin/permissions/types";-import { getSchemasPermission } from "metabase/admin/permissions/utils/graph";+ getPermissionWarning,+ getPermissionWarningModal,+ getSchemasPermission,+} from "metabase/permissions";import {DataPermission,+ DataPermissionType,DataPermissionValue,type Group,type GroupsPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.ts b/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.tsindex ac1bcd1572b..88f126c2321 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.ts+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/actions.ts@@ -6,8 +6,7 @@ import {UPDATE_DATA_PERMISSION,type UpdateDataPermissionPayload,updateDataPermission,-} from "metabase/admin/permissions/permissions";-import { DataPermissionType } from "metabase/admin/permissions/types";+} from "metabase/permissions";import {combineReducers,createAction,@@ -15,7 +14,11 @@ import {handleActions,} from "metabase/redux";import type { GroupTableAccessPolicy } from "metabase-types/api";-import { DataPermission, DataPermissionValue } from "metabase-types/api";+import {+ DataPermission,+ DataPermissionType,+ DataPermissionValue,+} from "metabase-types/api";import type { RawGroupTableAccessPolicyParams } from "./types";import { getPolicyKey, getPolicyKeyFromParams } from "./utils";diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/confirmations.ts b/enterprise/frontend/src/metabase-enterprise/sandboxes/confirmations.tsindex 72f9fed8244..105b36a6dc2 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/confirmations.ts+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/confirmations.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import { hasPermissionValueInGraph } from "metabase/admin/permissions/utils/graph";+import { hasPermissionValueInGraph } from "metabase/permissions";import type { PermissionEntityId } from "metabase-types/api";import { DataPermissionValue } from "metabase-types/api";import type { GroupsPermissions } from "metabase-types/api/permissions";diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsxindex 193967768ed..19e6654c3cf 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/containers/EditSandboxingModal.tsx@@ -1,6 +1,5 @@import { t } from "ttag";-import { getGroupsBasePath } from "metabase/admin/permissions/utils/urls";import {skipToken,useGetGroupTableAccessPolicyQuery,@@ -8,6 +7,7 @@ import {} from "metabase/api";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import type { ModalComponentProps } from "metabase/common/components/ModalRoute";+import { getGroupsBasePath } from "metabase/permissions";import { useDispatch, useSelector } from "metabase/redux";import { parseIntParam } from "metabase/urls";import { getGroupTableAccessPolicy } from "metabase-enterprise/sandboxes/selectors";diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsxindex bb2adfa3824..3af489af6e3 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/index.tsx@@ -1,12 +1,12 @@import { t } from "ttag";import _ from "underscore";-import { isTableEntityId } from "metabase/admin/permissions/utils/data-entity-id";+import { modalRoute } from "metabase/common/components/ModalRoute";import {getDatabaseFocusPermissionsUrl,getGroupFocusPermissionsUrl,-} from "metabase/admin/permissions/utils/urls";-import { modalRoute } from "metabase/common/components/ModalRoute";+ isTableEntityId,+} from "metabase/permissions";import {PLUGIN_ADMIN_PERMISSIONS_TABLE_FIELDS_ACTIONS,PLUGIN_ADMIN_PERMISSIONS_TABLE_FIELDS_CONFIRMATIONS,diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/types.ts b/enterprise/frontend/src/metabase-enterprise/sandboxes/types.tsindex fea224dc73b..278e5ee9ae4 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/types.ts@@ -1,4 +1,4 @@-import type { UpdateDataPermissionParams } from "metabase/admin/permissions/permissions";+import type { UpdateDataPermissionParams } from "metabase/permissions";import type { EnterpriseSharedState } from "metabase-enterprise/shared/reducer";import type { EnterpriseState } from "metabase-enterprise/shared/types";import type {diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsxindex db13b3d5395..6c40e351983 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx@@ -1,5 +1,5 @@-import CollectionPermissionsModal from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";import { useListCollectionsQuery } from "metabase/api";+import { CollectionPermissionsModal } from "metabase/permissions";import type { SnippetCollectionPermissionsModalProps } from "metabase/plugins";import { Modal } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsxindex 23294ed7b66..318b2d11916 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx@@ -1,23 +1,23 @@import { useCallback, useEffect } from "react";import { t } from "ttag";-import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";import {PermissionsEditor,PermissionsEditorEmptyState,} from "metabase/admin/permissions/components/PermissionsEditor";import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";-import { PermissionsSidebar } from "metabase/admin/permissions/components/PermissionsSidebar";+import { useListCollectionsTreeQuery } from "metabase/api";+import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";import {+ CollectionPermissionsHelp,+ type PermissionEditorEntity,+ PermissionsSidebar,+ assertNumericId,initializeTenantCollectionPermissions,loadTenantCollectionPermissions,saveTenantCollectionPermissions,updateTenantCollectionPermission,-} from "metabase/admin/permissions/permissions";-import type { PermissionEditorEntity } from "metabase/admin/permissions/types";-import { assertNumericId } from "metabase/admin/permissions/types";-import { useListCollectionsTreeQuery } from "metabase/api";-import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";+} from "metabase/permissions";import { useDispatch, useSelector } from "metabase/redux";import { useNavigate, useParams } from "metabase/router";import type { CollectionId } from "metabase-types/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 815d33bf9bf..a9284bb0b28 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx@@ -3,20 +3,6 @@ import { getIn } from "icepick";import { t } from "ttag";import _ from "underscore";-import { COLLECTION_OPTIONS } from "metabase/admin/permissions/constants/collections-permissions";-import { Messages } from "metabase/admin/permissions/constants/messages";-import type {- CollectionIdProps,- CollectionSidebarType,-} from "metabase/admin/permissions/selectors/collection-permissions";-import { buildCollectionTree } from "metabase/admin/permissions/selectors/collection-permissions";-import { getPermissionWarningModal } from "metabase/admin/permissions/selectors/confirmations";-import { selectGroupList } from "metabase/admin/permissions/selectors/data-permissions/groups";-import {- DataPermission,- DataPermissionType,- type PermissionEditorType,-} from "metabase/admin/permissions/types";import { collectionApi } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { getCollectionIcon } from "metabase/common/collections/utils";@@ -25,6 +11,16 @@ import {isAdminGroup,isDefaultGroup,} from "metabase/common/utils/groups";+import {+ COLLECTION_OPTIONS,+ type CollectionIdProps,+ type CollectionSidebarType,+ Messages,+ type PermissionEditorType,+ buildCollectionTree,+ getPermissionWarningModal,+ selectGroupList,+} from "metabase/permissions";import { PLUGIN_TENANTS } from "metabase/plugins";import type { ExpandedCollection, State } from "metabase/redux/store";import { isNotNull } from "metabase/utils/types";@@ -35,6 +31,7 @@ import type {DataPermissionValue,Group as GroupType,} from "metabase-types/api";+import { DataPermission, DataPermissionType } from "metabase-types/api";export const tenantCollectionsQuery = {"exclude-other-user-collections": true,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsxindex 6edeb66d621..997a01f1977 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx@@ -1,24 +1,24 @@import { useCallback, useEffect, useMemo } from "react";import { t } from "ttag";-import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";import {PermissionsEditor,PermissionsEditorEmptyState,} from "metabase/admin/permissions/components/PermissionsEditor";import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";-import { PermissionsSidebar } from "metabase/admin/permissions/components/PermissionsSidebar";+import { useListCollectionsTreeQuery } from "metabase/api";+import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";import {+ CollectionPermissionsHelp,+ type PermissionEditorEntity,+ PermissionsSidebar,type UpdateTenantCollectionPermissionParams,+ assertNumericId,initializeTenantSpecificCollectionPermissions,loadTenantSpecificCollectionPermissions,saveTenantSpecificCollectionPermissions,updateTenantSpecificCollectionPermission,-} from "metabase/admin/permissions/permissions";-import type { PermissionEditorEntity } from "metabase/admin/permissions/types";-import { assertNumericId } from "metabase/admin/permissions/types";-import { useListCollectionsTreeQuery } from "metabase/api";-import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";+} from "metabase/permissions";import { useDispatch, useSelector } from "metabase/redux";import { useNavigate, useParams } from "metabase/router";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsxindex b1e01ed3d98..c7169cca8bc 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx@@ -3,19 +3,6 @@ import { getIn } from "icepick";import { t } from "ttag";import _ from "underscore";-import { COLLECTION_OPTIONS } from "metabase/admin/permissions/constants/collections-permissions";-import { Messages } from "metabase/admin/permissions/constants/messages";-import type {- CollectionIdProps,- CollectionSidebarType,-} from "metabase/admin/permissions/selectors/collection-permissions";-import { getPermissionWarningModal } from "metabase/admin/permissions/selectors/confirmations";-import { selectGroupList } from "metabase/admin/permissions/selectors/data-permissions/groups";-import {- DataPermission,- DataPermissionType,- type PermissionEditorType,-} from "metabase/admin/permissions/types";import { collectionApi } from "metabase/api";import { ROOT_COLLECTION } from "metabase/common/collections/constants";import { getCollectionIcon } from "metabase/common/collections/utils";@@ -25,6 +12,15 @@ import {isAdminGroup,isDefaultGroup,} from "metabase/common/utils/groups";+import {+ COLLECTION_OPTIONS,+ type CollectionIdProps,+ type CollectionSidebarType,+ Messages,+ type PermissionEditorType,+ getPermissionWarningModal,+ selectGroupList,+} from "metabase/permissions";import { PLUGIN_TENANTS } from "metabase/plugins";import type { ExpandedCollection, State } from "metabase/redux/store";import { isNotNull } from "metabase/utils/types";@@ -34,6 +30,7 @@ import type {DataPermissionValue,Group as GroupType,} from "metabase-types/api";+import { DataPermission, DataPermissionType } from "metabase-types/api";export const tenantSpecificCollectionsQuery = {"exclude-other-user-collections": true,diff --git a/frontend/lint/config.mjs b/frontend/lint/config.mjsindex bdf8ee21159..419512ab356 100644--- a/frontend/lint/config.mjs+++ b/frontend/lint/config.mjs@@ -346,6 +346,7 @@ const configs = [files: ["**/*.unit.spec.*","frontend/src/metabase/admin/**/*",+ "frontend/src/metabase/permissions/**/*","frontend/src/metabase/embedding-hub/**/*","frontend/src/metabase/embedding/settings/**/*","frontend/src/metabase/embedding/themes/**/*",diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 0c3a72c0726..55197cce5d6 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -243,6 +243,11 @@ const elements = [createElement({ type: "shared", name: "notifications" }),createElement({ type: "shared", name: "palette" }),createElement({ type: "shared", name: "parameters" }),+ createElement({+ type: "shared",+ name: "permissions",+ enforcePublicApi: true,+ }),createElement({ type: "shared", name: "plugins" }),createElement({ type: "shared", name: "pulse" }),createElement({ type: "shared", name: "querying" }),diff --git a/frontend/lint/shared-tiers.mjs b/frontend/lint/shared-tiers.mjsindex 5bc0966b8fc..3f587d4c255 100644--- a/frontend/lint/shared-tiers.mjs+++ b/frontend/lint/shared-tiers.mjs@@ -77,6 +77,7 @@ const SHARED_DOMAIN = ["shared/nav","shared/notifications","shared/palette",+ "shared/permissions","shared/segments","shared/static-viz","shared/status",diff --git a/frontend/src/metabase-types/api/permissions.ts b/frontend/src/metabase-types/api/permissions.tsindex 9084e5ccbe2..9e0f947b668 100644--- a/frontend/src/metabase-types/api/permissions.ts+++ b/frontend/src/metabase-types/api/permissions.ts@@ -20,6 +20,16 @@ export enum DataPermission {COLLECTIONS = "collections",}+export enum DataPermissionType {+ ACCESS = "access",+ NATIVE = "native",+ DETAILS = "details",+ DOWNLOAD = "download",+ DATA_MODEL = "data-model",+ TRANSFORMS = "transforms",+ COLLECTIONS = "collections",+}+export enum DataPermissionValue {BLOCKED = "blocked",CONTROLLED = "controlled",diff --git a/frontend/src/metabase/admin/admin.ts b/frontend/src/metabase/admin/admin.tsindex 3c82e66ec7e..183f1e5d517 100644--- a/frontend/src/metabase/admin/admin.ts+++ b/frontend/src/metabase/admin/admin.ts@@ -4,7 +4,7 @@ import { appReducer as app } from "metabase/admin/app/reducers";import { databasesReducer as databases } from "metabase/admin/databases/database";import { datamodel } from "metabase/admin/datamodel/datamodel";import { people } from "metabase/admin/people/people";-import { permissions } from "metabase/admin/permissions/permissions";+import { permissions } from "metabase/permissions";import { combineReducers } from "metabase/redux";export const admin = combineReducers({diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsxindex ab328124fdc..3cd6efa2baf 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx@@ -1,9 +1,8 @@import { Fragment } from "react";+import type { PermissionEditorBreadcrumb } from "metabase/permissions";import { Box, Icon, Text } from "metabase/ui";-import type { PermissionEditorBreadcrumb } from "../../types";-import S from "./PermissionsEditorBreadcrumbs.module.css";export interface PermissionsEditorBreadcrumbsProps {diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsxindex e7b3f0b01d4..ce222cbff1f 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx@@ -5,17 +5,14 @@ import { EmptyState } from "metabase/common/components/EmptyState";import { Subhead } from "metabase/common/components/type/Subhead";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import CS from "metabase/css/core/index.css";-import { Box, Flex, Icon, Input, Text, TextInput } from "metabase/ui";-import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";--import type {- PermissionEditorBreadcrumb,- PermissionEditorType,-} from "../../types";import {+ type PermissionEditorBreadcrumb,+ type PermissionEditorType,PermissionsTable,type PermissionsTableProps,-} from "../PermissionsTable";+} from "metabase/permissions";+import { Box, Flex, Icon, Input, Text, TextInput } from "metabase/ui";+import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";import { PermissionsEditorBreadcrumbs } from "./PermissionsEditorBreadcrumbs";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsxindex 6a9b4de6455..2a052137eba 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx@@ -1,14 +1,15 @@import { useDisclosure } from "@mantine/hooks";import { t } from "ttag";-import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";-import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { EditBar } from "metabase/common/components/EditBar";+import {+ PermissionsConfirm,+ type PermissionsGraphDiff,+ isEmbeddingHubPermissions,+} from "metabase/permissions";import { Button } from "metabase/ui";-import { PermissionsConfirm } from "../PermissionsConfirm";-import S from "./PermissionsEditBar.module.css";interface PermissionsEditBarProps {diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsxindex 91bd107ba84..1514916754a 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx@@ -3,14 +3,21 @@ import type { ReactNode } from "react";import { useCallback, useState } from "react";import { c, t } from "ttag";-import { getIsHelpReferenceOpen } from "metabase/admin/permissions/selectors/help-reference";-import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";-import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";import CS from "metabase/css/core/index.css";import { CONTENT_PADDING_X } from "metabase/nav/components/AreaLayout";+import {+ LegacyPermissionsModal,+ type PermissionsGraphDiff,+ ToolbarButton,+ clearSaveError as clearPermissionsSaveError,+ getIsHelpReferenceOpen,+ isEmbeddingHubPermissions,+ showRevisionChangedModal,+ toggleHelpReference,+} from "metabase/permissions";import { useDispatch, useSelector } from "metabase/redux";import { useNavigate } from "metabase/router";import { useUserSetting } from "metabase/settings";@@ -22,14 +29,6 @@ import {Text,} from "metabase/ui";-import {- clearSaveError as clearPermissionsSaveError,- toggleHelpReference,-} from "../../permissions";-import { showRevisionChangedModal } from "../../selectors/data-permissions/revision";-import { LegacyPermissionsModal } from "../LegacyPermissionsModal/LegacyPermissionsModal";-import { ToolbarButton } from "../ToolbarButton";-import { PermissionsEditBar } from "./PermissionsEditBar";import S from "./PermissionsPageLayout.module.css";import { PermissionsTabs } from "./PermissionsTabs";diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsxindex 433d1207044..ce265481df8 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx@@ -1,9 +1,23 @@import { useCallback, useEffect } from "react";import { t } from "ttag";-import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";import { useListCollectionsTreeQuery } from "metabase/api";import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";+import {+ CollectionPermissionsHelp,+ type PermissionEditorEntity,+ PermissionsSidebar,+ assertNumericId,+ collectionsQuery,+ getCollectionEntity,+ getCollectionsPermissionEditor,+ getCollectionsSidebar,+ getIsCollectionPermissionsDirty,+ initializeCollectionPermissions,+ loadCollectionPermissions,+ saveCollectionPermissions,+ updateCollectionPermission,+} from "metabase/permissions";import { useDispatch, useSelector } from "metabase/redux";import { useNavigate, useParams } from "metabase/router";import type { CollectionId } from "metabase-types/api";@@ -13,22 +27,6 @@ import {PermissionsEditorEmptyState,} from "../../components/PermissionsEditor";import { PermissionsPageLayout } from "../../components/PermissionsPageLayout";-import { PermissionsSidebar } from "../../components/PermissionsSidebar";-import {- initializeCollectionPermissions,- loadCollectionPermissions,- saveCollectionPermissions,- updateCollectionPermission,-} from "../../permissions";-import {- collectionsQuery,- getCollectionEntity,- getCollectionsPermissionEditor,- getCollectionsSidebar,- getIsDirty,-} from "../../selectors/collection-permissions";-import type { PermissionEditorEntity } from "../../types";-import { assertNumericId } from "../../types";export function CollectionPermissionsPage() {const dispatch = useDispatch();@@ -48,7 +46,7 @@ export function CollectionPermissionsPage() {const collection = useSelector((state) =>getCollectionEntity(state, selectorProps),);- const isDirty = useSelector(getIsDirty);+ const isDirty = useSelector(getIsCollectionPermissionsDirty);const originalPermissionsState = useSelector(({ admin }) => admin.permissions.originalCollectionPermissions,diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex ae5ec029e6e..d468a8f4cb5 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -7,20 +7,21 @@ import {useListPermissionsGroupsQuery,} from "metabase/api";import { isAdminGroup, isDefaultGroup } from "metabase/common/utils/groups";+import {+ DATABASE_TABLES_QUERY,+ DataPermissionsHelp,+ getDiff,+ getIsDataPermissionsDirty,+ loadDataPermissionsForGroup,+ restoreLoadedPermissions,+ saveDataPermissions,+} from "metabase/permissions";import { useDispatch, useSelector } from "metabase/redux";import { Outlet, useParams } from "metabase/router";import { Center, Loader } from "metabase/ui";import type { GroupInfo } from "metabase-types/api";-import { DataPermissionsHelp } from "../../components/DataPermissionsHelp";import { PermissionsPageLayout } from "../../components/PermissionsPageLayout/PermissionsPageLayout";-import {- loadDataPermissionsForGroup,- restoreLoadedPermissions,- saveDataPermissions,-} from "../../permissions";-import { DATABASE_TABLES_QUERY } from "../../selectors/data-permissions/databases";-import { getDiff, getIsDirty } from "../../selectors/data-permissions/diff";const EMPTY_GROUP_LIST: GroupInfo[] = [];@@ -31,7 +32,7 @@ export function DataPermissionsPage() {{},);const groups = data ?? EMPTY_GROUP_LIST;- const isDirty = useSelector(getIsDirty);+ const isDirty = useSelector(getIsDataPermissionsDirty);const diff = useSelector((state) => getDiff(state, { groups }));const dispatch = useDispatch();diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsxindex e4117db429b..60b502c47fa 100644--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx@@ -5,42 +5,37 @@ import { t } from "ttag";import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning";import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";import type { ITreeNodeItem } from "metabase/common/components/tree/types";+import {+ type DataTreeNodeItem,+ type PermissionAction,+ type PermissionEditorBreadcrumb,+ type PermissionEditorEntity,+ type PermissionSectionConfig,+ PermissionsSidebar,+ type RawDataRouteParams,+ assertNumericId,+ getDataFocusSidebar,+ getDatabaseFocusPermissionsUrl,+ getDatabasesBasePath,+ getGroupsDataPermissionEditor,+ getIsLoadingDatabaseTables,+ getLoadingDatabaseTablesError,+ loadDataPermissionsForDb,+ parseDataRouteParams,+ updateDataPermission,+} from "metabase/permissions";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { Outlet, useNavigate, useParams } from "metabase/router";import { getSetting } from "metabase/settings";import { Center, Loader } from "metabase/ui";+import type { DataPermissionValue } from "metabase-types/api";import {PermissionsEditor,PermissionsEditorEmptyState,} from "../../components/PermissionsEditor";import { PermissionsEditorSplitPermsMessage } from "../../components/PermissionsEditor/PermissionsEditorSplitPermsMessage";-import { PermissionsSidebar } from "../../components/PermissionsSidebar";-import {- loadDataPermissionsForDb,- updateDataPermission,-} from "../../permissions";-import {- type DataTreeNodeItem,- getDataFocusSidebar,- getGroupsDataPermissionEditor,- getIsLoadingDatabaseTables,- getLoadingDatabaseTablesError,-} from "../../selectors/data-permissions";-import type {- DataPermissionValue,- PermissionAction,- PermissionEditorBreadcrumb,- PermissionEditorEntity,- PermissionSectionConfig,- RawDataRouteParams,-} from "../../types";-import { assertNumericId, parseDataRouteParams } from "../../types";-import {- getDatabaseFocusPermissionsUrl,- getDatabasesBasePath,-} from "../../utils/urls";export function DatabasesPermissionsPage() {const dispatch = useDispatch();diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsxindex b4f17bcf4a5..24b834c010a 100644--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx@@ -5,41 +5,35 @@ import { t } from "ttag";import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning";import { getPermissionsBasePath } from "metabase/common/components/PermissionsBasePath/base-path";import type { ITreeNodeItem } from "metabase/common/components/tree/types";+import {+ type PermissionAction,+ type PermissionEditorBreadcrumb,+ type PermissionEditorEntity,+ type PermissionSectionConfig,+ PermissionsSidebar,+ type RawGroupRouteParams,+ getDatabasesPermissionEditor,+ getGroupFocusPermissionsUrl,+ getGroupsBasePath,+ getGroupsSidebar,+ getIsLoadingDatabaseTables,+ getLoadingDatabaseTablesError,+ loadDataPermissionsForGroup,+ parseGroupRouteParams,+ updateDataPermission,+} from "metabase/permissions";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { useDispatch, useSelector } from "metabase/redux";import { Outlet, useNavigate, useParams } from "metabase/router";import { getSetting } from "metabase/settings";import { Center, Loader } from "metabase/ui";+import type { DataPermissionValue } from "metabase-types/api";import {PermissionsEditor,PermissionsEditorEmptyState,} from "../../components/PermissionsEditor";import { PermissionsEditorSplitPermsMessage } from "../../components/PermissionsEditor/PermissionsEditorSplitPermsMessage";-import { PermissionsSidebar } from "../../components/PermissionsSidebar";-import {- loadDataPermissionsForGroup,- updateDataPermission,-} from "../../permissions";-import {- getDatabasesPermissionEditor,- getGroupsSidebar,- getIsLoadingDatabaseTables,- getLoadingDatabaseTablesError,-} from "../../selectors/data-permissions";-import type {- DataPermissionValue,- PermissionAction,- PermissionEditorBreadcrumb,- PermissionEditorEntity,- PermissionSectionConfig,- RawGroupRouteParams,-} from "../../types";-import { parseGroupRouteParams } from "../../types";-import {- getGroupFocusPermissionsUrl,- getGroupsBasePath,-} from "../../utils/urls";export function GroupsPermissionsPage() {const dispatch = useDispatch();diff --git a/frontend/src/metabase/common/tenants/is-embedding-hub.ts b/frontend/src/metabase/common/tenants/is-embedding-hub.tsindex 6c315ecc750..5a4d5d04f25 100644--- a/frontend/src/metabase/common/tenants/is-embedding-hub.ts+++ b/frontend/src/metabase/common/tenants/is-embedding-hub.ts@@ -5,7 +5,7 @@ import { getTenantsBasePath } from "./base-path";/*** Used to drop the headings the hub's Tenancy tab already supplies, based on where the* tenant routes are mounted. The permissions editor has the same check against its own- * base path in admin/permissions/utils/is-embedding-hub.ts.+ * base path in permissions/utils/is-embedding-hub.ts.*/export function isEmbeddingHubTenancy() {return getTenantsBasePath() === Urls.embeddingHubTenancy();diff --git a/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsx b/frontend/src/metabase/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsxrename to frontend/src/metabase/permissions/components/ApplicationPermissionsHelp/ApplicationPermissionsHelp.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/index.ts b/frontend/src/metabase/permissions/components/ApplicationPermissionsHelp/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/ApplicationPermissionsHelp/index.tsrename to frontend/src/metabase/permissions/components/ApplicationPermissionsHelp/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsHelp/CollectionPermissionsHelp.tsx b/frontend/src/metabase/permissions/components/CollectionPermissionsHelp/CollectionPermissionsHelp.tsxsimilarity index 93%rename from frontend/src/metabase/admin/permissions/components/CollectionPermissionsHelp/CollectionPermissionsHelp.tsxrename to frontend/src/metabase/permissions/components/CollectionPermissionsHelp/CollectionPermissionsHelp.tsxindex b3112f84771..f4fea08d914 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsHelp/CollectionPermissionsHelp.tsx+++ b/frontend/src/metabase/permissions/components/CollectionPermissionsHelp/CollectionPermissionsHelp.tsx@@ -1,10 +1,11 @@import { jt, t } from "ttag";-import { PermissionHelpDescription } from "metabase/admin/permissions/components/PermissionHelpDescription";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";import { Flex, Stack, Text, Title, rem } from "metabase/ui";+import { PermissionHelpDescription } from "../PermissionHelpDescription";+export const CollectionPermissionsHelp = () => {const { url } = useDocsUrl("permissions/collections");diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsHelp/index.ts b/frontend/src/metabase/permissions/components/CollectionPermissionsHelp/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/CollectionPermissionsHelp/index.tsrename to frontend/src/metabase/permissions/components/CollectionPermissionsHelp/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.css b/frontend/src/metabase/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.cssrename to frontend/src/metabase/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxsimilarity index 98%rename from frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxrename to frontend/src/metabase/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxindex fafe2c3ecb1..0926a4bffef 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx+++ b/frontend/src/metabase/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx@@ -23,7 +23,7 @@ import {collectionsQuery,getCollectionEntity,getCollectionsPermissionEditor,- getIsDirty,+ getIsCollectionPermissionsDirty,} from "../../selectors/collection-permissions";import type { PermissionEditorEntity, PermissionEditorType } from "../../types";import { assertNumericId } from "../../types";@@ -59,7 +59,7 @@ const mapStateToProps = (params: { collectionId },namespace: props.namespace,}),- isDirty: getIsDirty(state),+ isDirty: getIsCollectionPermissionsDirty(state),};};diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx b/frontend/src/metabase/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsxsimilarity index 98%rename from frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsxrename to frontend/src/metabase/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsxindex d0972e85ed6..0c87888bda2 100644--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx+++ b/frontend/src/metabase/permissions/components/DataPermissionsHelp/DataPermissionsHelp.tsx@@ -1,6 +1,5 @@import { jt, t } from "ttag";-import { PermissionHelpDescription } from "metabase/admin/permissions/components/PermissionHelpDescription";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";import { PLUGIN_TRANSFORMS } from "metabase/plugins";@@ -19,6 +18,7 @@ import {import { DataPermissionValue } from "metabase-types/api";import { hasPermissionValueInGraph } from "../../utils/graph/data-permissions";+import { PermissionHelpDescription } from "../PermissionHelpDescription";export const DataPermissionsHelp = () => {const isAdvancedPermissionsFeatureEnabled = useSelector(diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.unit.spec.tsx b/frontend/src/metabase/permissions/components/DataPermissionsHelp/DataPermissionsHelp.unit.spec.tsxsimilarity index 92%rename from frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.unit.spec.tsxrename to frontend/src/metabase/permissions/components/DataPermissionsHelp/DataPermissionsHelp.unit.spec.tsxindex 48fb94f6e8b..830e66cbdf3 100644--- a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp.unit.spec.tsx+++ b/frontend/src/metabase/permissions/components/DataPermissionsHelp/DataPermissionsHelp.unit.spec.tsx@@ -4,9 +4,10 @@ import {screen,waitForLoaderToBeRemoved,} from "__support__/ui";-import { DataPermissionsHelp } from "metabase/admin/permissions/components/DataPermissionsHelp/DataPermissionsHelp";import { createMockTokenFeatures } from "metabase-types/api/mocks";+import { DataPermissionsHelp } from "./DataPermissionsHelp";+async function setup({ hasAdvancedPermissions = false } = {}) {const settings = mockSettings({"token-features": createMockTokenFeatures({diff --git a/frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/index.ts b/frontend/src/metabase/permissions/components/DataPermissionsHelp/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/DataPermissionsHelp/index.tsrename to frontend/src/metabase/permissions/components/DataPermissionsHelp/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.module.css b/frontend/src/metabase/permissions/components/EntityViewSwitch/EntityViewSwitch.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.module.cssrename to frontend/src/metabase/permissions/components/EntityViewSwitch/EntityViewSwitch.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx b/frontend/src/metabase/permissions/components/EntityViewSwitch/EntityViewSwitch.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsxrename to frontend/src/metabase/permissions/components/EntityViewSwitch/EntityViewSwitch.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/index.ts b/frontend/src/metabase/permissions/components/EntityViewSwitch/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/EntityViewSwitch/index.tsrename to frontend/src/metabase/permissions/components/EntityViewSwitch/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/AdminTreeNode.module.css b/frontend/src/metabase/permissions/components/FilterableTree/AdminTreeNode.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/AdminTreeNode.module.cssrename to frontend/src/metabase/permissions/components/FilterableTree/AdminTreeNode.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/AdminTreeNode.tsx b/frontend/src/metabase/permissions/components/FilterableTree/AdminTreeNode.tsxsimilarity index 89%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/AdminTreeNode.tsxrename to frontend/src/metabase/permissions/components/FilterableTree/AdminTreeNode.tsxindex ed0708b1b86..d28613df545 100644--- a/frontend/src/metabase/admin/permissions/components/FilterableTree/AdminTreeNode.tsx+++ b/frontend/src/metabase/permissions/components/FilterableTree/AdminTreeNode.tsx@@ -1,9 +1,10 @@import { forwardRef } from "react";-import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";import { Tree } from "metabase/common/components/tree";import type { TreeNodeProps } from "metabase/common/components/tree/types";+import { isEmbeddingHubPermissions } from "../../utils/is-embedding-hub";+import styles from "./AdminTreeNode.module.css";/**diff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsx b/frontend/src/metabase/permissions/components/FilterableTree/FilterableTree.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.tsxrename to frontend/src/metabase/permissions/components/FilterableTree/FilterableTree.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.unit.spec.tsx b/frontend/src/metabase/permissions/components/FilterableTree/FilterableTree.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/FilterableTree.unit.spec.tsxrename to frontend/src/metabase/permissions/components/FilterableTree/FilterableTree.unit.spec.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/index.ts b/frontend/src/metabase/permissions/components/FilterableTree/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/index.tsrename to frontend/src/metabase/permissions/components/FilterableTree/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/utils.ts b/frontend/src/metabase/permissions/components/FilterableTree/utils.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/utils.tsrename to frontend/src/metabase/permissions/components/FilterableTree/utils.tsdiff --git a/frontend/src/metabase/admin/permissions/components/FilterableTree/utils.unit.spec.ts b/frontend/src/metabase/permissions/components/FilterableTree/utils.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/FilterableTree/utils.unit.spec.tsrename to frontend/src/metabase/permissions/components/FilterableTree/utils.unit.spec.tsdiff --git a/frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsx b/frontend/src/metabase/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsxrename to frontend/src/metabase/permissions/components/LegacyPermissionsModal/LegacyPermissionsModal.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsx b/frontend/src/metabase/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsxrename to frontend/src/metabase/permissions/components/PermissionHelpDescription/PermissionHelpDescription.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/index.ts b/frontend/src/metabase/permissions/components/PermissionHelpDescription/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionHelpDescription/index.tsrename to frontend/src/metabase/permissions/components/PermissionHelpDescription/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsConfirm.tsx b/frontend/src/metabase/permissions/components/PermissionsConfirm.tsxsimilarity index 98%rename from frontend/src/metabase/admin/permissions/components/PermissionsConfirm.tsxrename to frontend/src/metabase/permissions/components/PermissionsConfirm.tsxindex 736ecbc7a7d..218b19cc1a2 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsConfirm.tsx+++ b/frontend/src/metabase/permissions/components/PermissionsConfirm.tsx@@ -1,13 +1,14 @@import { jt, msgid, ngettext, t } from "ttag";+import CS from "metabase/css/core/index.css";+import { Tooltip } from "metabase/ui";+import { DataPermissionValue } from "metabase-types/api";+import type {DatabasePermissionsDiff,GroupPermissionsDiff,PermissionsGraphDiff,-} from "metabase/admin/permissions/types";-import CS from "metabase/css/core/index.css";-import { Tooltip } from "metabase/ui";-import { DataPermissionValue } from "metabase-types/api";+} from "../types";const GroupName = ({ group }: { group: GroupPermissionsDiff }) => (<span className={CS.textBrand}>{group.name}</span>diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.module.css b/frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.module.cssrename to frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx b/frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.tsxsimilarity index 96%rename from frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsxrename to frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.tsxindex 2c103541276..d22e4404b2c 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx+++ b/frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.tsx@@ -4,13 +4,9 @@ import { memo, useState } from "react";import CS from "metabase/css/core/index.css";import { Box, Flex, Icon, Popover, Switch, Tooltip } from "metabase/ui";import type { ColorName } from "metabase/ui/colors/types";-import type { IconName } from "metabase-types/api";+import type { DataPermissionValue, IconName } from "metabase-types/api";-import type {- DataPermissionValue,- PermissionAction,- PermissionSectionConfig,-} from "../../types";+import type { PermissionAction, PermissionSectionConfig } from "../../types";import S from "./PermissionsSelect.module.css";import { PermissionsSelectOption } from "./PermissionsSelectOption";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.unit.spec.tsx b/frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.unit.spec.tsxsimilarity index 97%rename from frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.unit.spec.tsxrename to frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.unit.spec.tsxindex ee76c0ec444..aa589b9736f 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.unit.spec.tsx+++ b/frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelect.unit.spec.tsx@@ -1,13 +1,13 @@import userEvent from "@testing-library/user-event";import { getIcon, render, screen } from "__support__/ui";-import {DataPermission,DataPermissionType,DataPermissionValue,- type PermissionOption,-} from "../../types";+} from "metabase-types/api";++import type { PermissionOption } from "../../types";import { PermissionsSelect } from "./PermissionsSelect";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx b/frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelectOption.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsxrename to frontend/src/metabase/permissions/components/PermissionsSelect/PermissionsSelectOption.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/index.ts b/frontend/src/metabase/permissions/components/PermissionsSelect/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSelect/index.tsrename to frontend/src/metabase/permissions/components/PermissionsSelect/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.module.css b/frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebar.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.module.cssrename to frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebar.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.tsx b/frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebar.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebar.tsxrename to frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebar.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css b/frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.cssrename to frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx b/frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsxsimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsxrename to frontend/src/metabase/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsxdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/index.ts b/frontend/src/metabase/permissions/components/PermissionsSidebar/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsSidebar/index.tsrename to frontend/src/metabase/permissions/components/PermissionsSidebar/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.module.css b/frontend/src/metabase/permissions/components/PermissionsTable/PermissionsTable.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.module.cssrename to frontend/src/metabase/permissions/components/PermissionsTable/PermissionsTable.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx b/frontend/src/metabase/permissions/components/PermissionsTable/PermissionsTable.tsxsimilarity index 98%rename from frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsxrename to frontend/src/metabase/permissions/components/PermissionsTable/PermissionsTable.tsxindex 7a48a8666c0..77be451231c 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx+++ b/frontend/src/metabase/permissions/components/PermissionsTable/PermissionsTable.tsx@@ -2,21 +2,21 @@ import { useVirtualizer } from "@tanstack/react-virtual";import cx from "classnames";import { memo, useCallback, useRef, useState } from "react";-import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { Link } from "metabase/common/components/Link";import { Label } from "metabase/common/components/type/Label";import CS from "metabase/css/core/index.css";import { Box, Ellipsified, Flex, Icon, Text, Tooltip } from "metabase/ui";+import type { DataPermissionValue } from "metabase-types/api";import type {- DataPermissionValue,PermissionAction,PermissionConfirmationProps,PermissionEditorEntity,PermissionEditorType,PermissionSectionConfig,} from "../../types";+import { isEmbeddingHubPermissions } from "../../utils/is-embedding-hub";import { PermissionsSelect } from "../PermissionsSelect";import S from "./PermissionsTable.module.css";diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/index.ts b/frontend/src/metabase/permissions/components/PermissionsTable/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/PermissionsTable/index.tsrename to frontend/src/metabase/permissions/components/PermissionsTable/index.tsdiff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.css b/frontend/src/metabase/permissions/components/ToolbarButton/ToolbarButton.module.csssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.module.cssrename to frontend/src/metabase/permissions/components/ToolbarButton/ToolbarButton.module.cssdiff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx b/frontend/src/metabase/permissions/components/ToolbarButton/ToolbarButton.tsxsimilarity index 89%rename from frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsxrename to frontend/src/metabase/permissions/components/ToolbarButton/ToolbarButton.tsxindex e0904bf5dbd..6bcd7532209 100644--- a/frontend/src/metabase/admin/permissions/components/ToolbarButton/ToolbarButton.tsx+++ b/frontend/src/metabase/permissions/components/ToolbarButton/ToolbarButton.tsx@@ -1,10 +1,11 @@import cx from "classnames";-import { isEmbeddingHubPermissions } from "metabase/admin/permissions/utils/is-embedding-hub";import CS from "metabase/css/core/index.css";import { Flex, Icon, Text } from "metabase/ui";import type { IconName } from "metabase-types/api";+import { isEmbeddingHubPermissions } from "../../utils/is-embedding-hub";+import S from "./ToolbarButton.module.css";interface ToolbarButtonProps {diff --git a/frontend/src/metabase/admin/permissions/components/ToolbarButton/index.ts b/frontend/src/metabase/permissions/components/ToolbarButton/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/components/ToolbarButton/index.tsrename to frontend/src/metabase/permissions/components/ToolbarButton/index.tsdiff --git a/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts b/frontend/src/metabase/permissions/constants/collections-permissions.tssimilarity index 83%rename from frontend/src/metabase/admin/permissions/constants/collections-permissions.tsrename to frontend/src/metabase/permissions/constants/collections-permissions.tsindex 05a18346ac6..358fd99d171 100644--- a/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts+++ b/frontend/src/metabase/permissions/constants/collections-permissions.ts@@ -1,6 +1,8 @@import { t } from "ttag";-import { DataPermissionValue, type PermissionOption } from "../types";+import { DataPermissionValue } from "metabase-types/api";++import type { PermissionOption } from "../types";export const COLLECTION_OPTIONS: Record<string, PermissionOption> = {write: {diff --git a/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx b/frontend/src/metabase/permissions/constants/data-permissions.tsxsimilarity index 91%rename from frontend/src/metabase/admin/permissions/constants/data-permissions.tsxrename to frontend/src/metabase/permissions/constants/data-permissions.tsxindex 09ce8a60b14..a6bc7a4ad98 100644--- a/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx+++ b/frontend/src/metabase/permissions/constants/data-permissions.tsx@@ -1,6 +1,8 @@import { t } from "ttag";-import { DataPermissionValue, type PermissionOption } from "../types";+import { DataPermissionValue } from "metabase-types/api";++import type { PermissionOption } from "../types";export const DATA_PERMISSION_OPTIONS: Record<string, PermissionOption> = {unrestricted: {diff --git a/frontend/src/metabase/admin/permissions/constants/messages.ts b/frontend/src/metabase/permissions/constants/messages.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/constants/messages.tsrename to frontend/src/metabase/permissions/constants/messages.tsdiff --git a/frontend/src/metabase/permissions/index.ts b/frontend/src/metabase/permissions/index.tsnew file mode 100644index 00000000000..c41c462dba7--- /dev/null+++ b/frontend/src/metabase/permissions/index.ts@@ -0,0 +1,114 @@+export { ApplicationPermissionsHelp } from "./components/ApplicationPermissionsHelp";+export { CollectionPermissionsHelp } from "./components/CollectionPermissionsHelp";+export { default as CollectionPermissionsModal } from "./components/CollectionPermissionsModal/CollectionPermissionsModal";+export { DataPermissionsHelp } from "./components/DataPermissionsHelp";+export { LegacyPermissionsModal } from "./components/LegacyPermissionsModal/LegacyPermissionsModal";+export { PermissionsConfirm } from "./components/PermissionsConfirm";+export { PermissionsSidebar } from "./components/PermissionsSidebar";+export { PermissionsTable } from "./components/PermissionsTable";+export type { PermissionsTableProps } from "./components/PermissionsTable";+export { ToolbarButton } from "./components/ToolbarButton";+export { COLLECTION_OPTIONS } from "./constants/collections-permissions";+export { Messages } from "./constants/messages";+export {+ LOAD_DATA_PERMISSIONS,+ SAVE_DATA_PERMISSIONS,+ UPDATE_DATA_PERMISSION,+ clearSaveError,+ initializeCollectionPermissions,+ initializeTenantCollectionPermissions,+ initializeTenantSpecificCollectionPermissions,+ loadCollectionPermissions,+ loadDataPermissionsForDb,+ loadDataPermissionsForGroup,+ loadTenantCollectionPermissions,+ loadTenantSpecificCollectionPermissions,+ navigateToGranularPermissions,+ permissions,+ restoreLoadedPermissions,+ saveCollectionPermissions,+ saveDataPermissions,+ saveTenantCollectionPermissions,+ saveTenantSpecificCollectionPermissions,+ toggleHelpReference,+ updateCollectionPermission,+ updateDataPermission,+ updateTenantCollectionPermission,+ updateTenantSpecificCollectionPermission,+} from "./permissions";+export type {+ UpdateDataPermissionParams,+ UpdateDataPermissionPayload,+ UpdateTenantCollectionPermissionParams,+} from "./permissions";+export {+ buildCollectionTree,+ collectionsQuery,+ getCollectionEntity,+ getCollectionsPermissionEditor,+ getCollectionsSidebar,+ getIsCollectionPermissionsDirty,+} from "./selectors/collection-permissions";+export type {+ CollectionIdProps,+ CollectionSidebarType,+} from "./selectors/collection-permissions";+export {+ getDefaultGroupHasHigherAccessText,+ getPermissionWarning,+ getPermissionWarningModal,+} from "./selectors/confirmations";+export {+ getDataFocusSidebar,+ getDatabasesPermissionEditor,+ getGroupsDataPermissionEditor,+ getGroupsSidebar,+ getIsLoadingDatabaseTables,+ getLoadingDatabaseTablesError,+} from "./selectors/data-permissions";+export type { DataTreeNodeItem } from "./selectors/data-permissions";+export { DATABASE_TABLES_QUERY } from "./selectors/data-permissions/databases";+export {+ getDiff,+ getIsDataPermissionsDirty,+} from "./selectors/data-permissions/diff";+export {+ getDefaultGroup,+ getOrderedGroups,+ selectGroupList,+} from "./selectors/data-permissions/groups";+export { showRevisionChangedModal } from "./selectors/data-permissions/revision";+export { getIsHelpReferenceOpen } from "./selectors/help-reference";+export {+ assertNumericId,+ parseDataRouteParams,+ parseGroupRouteParams,+} from "./types";+export type {+ PermissionAction,+ PermissionEditorBreadcrumb,+ PermissionEditorEntity,+ PermissionEditorType,+ PermissionOption,+ PermissionSectionConfig,+ PermissionsGraphDiff,+ RawDataRouteParams,+ RawGroupRouteParams,+} from "./types";+export { isSchemaEntityId, isTableEntityId } from "./utils/data-entity-id";+export {+ getEntityPermission,+ getFieldsPermission,+ getSchemasPermission,+ getTablesPermission,+ hasPermissionValueInGraph,+ hasPermissionValueInSubgraph,+ updateEntityPermission,+} from "./utils/graph";+export { isEmbeddingHubPermissions } from "./utils/is-embedding-hub";+export {+ getDatabaseFocusPermissionsUrl,+ getDatabasesBasePath,+ getGroupFocusPermissionsUrl,+ getGroupsBasePath,+} from "./utils/urls";diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/permissions/permissions.tssimilarity index 98%rename from frontend/src/metabase/admin/permissions/permissions.tsrename to frontend/src/metabase/permissions/permissions.tsindex bb80626da95..8d4c13e08ca 100644--- a/frontend/src/metabase/admin/permissions/permissions.ts+++ b/frontend/src/metabase/permissions/permissions.ts@@ -7,16 +7,6 @@ import {import { assocIn, merge } from "icepick";import { isBoolean } from "underscore";-import {- inferAndUpdateEntityPermissions,- restrictCreateQueriesPermissionsIfNeeded,- revokeTransformsPermissionIfNeeded,- updateFieldsPermission,- updatePermission,- updateSchemasPermission,- updateTablesPermission,-} from "metabase/admin/permissions/utils/graph";-import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";import { collectionApi, databaseApi, permissionApi } from "metabase/api";import { type ErrorPayload, getErrorMessage } from "metabase/api/utils/errors";import { runRtkEndpoint } from "metabase/api/utils/run-rtk-endpoint";@@ -30,16 +20,19 @@ import {createThunkAction,} from "metabase/redux";import { navigate } from "metabase/router";-import type {- Collection,- CollectionPermissions,- CollectionPermissionsGraph,- DatabaseId,- GroupId,- GroupsPermissions,- PermissionEntityId,- PermissionsDatabase,- PermissionsGraph,+import {+ type Collection,+ type CollectionPermissions,+ type CollectionPermissionsGraph,+ DataPermission,+ DataPermissionType,+ type DataPermissionValue,+ type DatabaseId,+ type GroupId,+ type GroupsPermissions,+ type PermissionEntityId,+ type PermissionsDatabase,+ type PermissionsGraph,} from "metabase-types/api";import {@@ -47,18 +40,23 @@ import {getPermissionsDatabase,} from "./selectors/data-permissions/databases";import { selectGroupList } from "./selectors/data-permissions/groups";-import {- DataPermission,- DataPermissionType,- type DataPermissionValue,- type PermissionSectionConfig,-} from "./types";+import type { PermissionSectionConfig } from "./types";import { isSchemaEntityId, isTableEntityId } from "./utils/data-entity-id";+import {+ inferAndUpdateEntityPermissions,+ restrictCreateQueriesPermissionsIfNeeded,+ revokeTransformsPermissionIfNeeded,+ updateFieldsPermission,+ updatePermission,+ updateSchemasPermission,+ updateTablesPermission,+} from "./utils/graph";import {getModifiedCollectionPermissionsGraphParts,getModifiedGroupsPermissionsGraphParts,mergeGroupsPermissionsUpdates,} from "./utils/graph/partial-updates";+import { getGroupFocusPermissionsUrl } from "./utils/urls";function isErrorAction(action: UnknownAction) {return action.error === true;diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/permissions/selectors/collection-permissions.tsxsimilarity index 97%rename from frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsxrename to frontend/src/metabase/permissions/selectors/collection-permissions.tsxindex 5a93db6858f..63e2caaf4ab 100644--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx+++ b/frontend/src/metabase/permissions/selectors/collection-permissions.tsx@@ -24,23 +24,21 @@ import type {State,} from "metabase/redux/store";import { isNotNull } from "metabase/utils/types";-import type {- Collection,- CollectionId,- CollectionNamespace,- CollectionPermissions,- Group as GroupType,- SpecialGroupType,-} from "metabase-types/api";--import { COLLECTION_OPTIONS } from "../constants/collections-permissions";-import { Messages } from "../constants/messages";import {+ type Collection,+ type CollectionId,+ type CollectionNamespace,+ type CollectionPermissions,DataPermission,DataPermissionType,type DataPermissionValue,- type PermissionEditorType,-} from "../types";+ type Group as GroupType,+ type SpecialGroupType,+} from "metabase-types/api";++import { COLLECTION_OPTIONS } from "../constants/collections-permissions";+import { Messages } from "../constants/messages";+import type { PermissionEditorType } from "../types";import { getPermissionWarningModal } from "./confirmations";import { selectGroupList } from "./data-permissions/groups";@@ -51,7 +49,7 @@ export const collectionsQuery = {"include-library": true,} as const;-export const getIsDirty = createSelector(+export const getIsCollectionPermissionsDirty = createSelector((state: State) => state.admin.permissions.collectionPermissions,(state: State) => state.admin.permissions.originalCollectionPermissions,(diff --git a/frontend/src/metabase/admin/permissions/selectors/confirmations.tsx b/frontend/src/metabase/permissions/selectors/confirmations.tsxsimilarity index 97%rename from frontend/src/metabase/admin/permissions/selectors/confirmations.tsxrename to frontend/src/metabase/permissions/selectors/confirmations.tsxindex d24efa753fb..1fc2b523037 100644--- a/frontend/src/metabase/admin/permissions/selectors/confirmations.tsx+++ b/frontend/src/metabase/permissions/selectors/confirmations.tsx@@ -1,15 +1,6 @@import { c, t } from "ttag";import _ from "underscore";-import {- isSchemaEntityId,- isTableEntityId,-} from "metabase/admin/permissions/utils/data-entity-id";-import {- getFieldsPermission,- getSchemasPermission,- hasPermissionValueInSubgraph,-} from "metabase/admin/permissions/utils/graph";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import { Alert, Flex, Icon, Text } from "metabase/ui";import type {@@ -20,8 +11,14 @@ import type {PermissionsDatabase,SchemaEntityId,} from "metabase-types/api";+import { DataPermission, DataPermissionValue } from "metabase-types/api";-import { DataPermission, DataPermissionValue } from "../types";+import { isSchemaEntityId, isTableEntityId } from "../utils/data-entity-id";+import {+ getFieldsPermission,+ getSchemasPermission,+ hasPermissionValueInSubgraph,+} from "../utils/graph";import { tableToTableEntityId } from "../utils/metadata";export const getDefaultGroupHasHigherAccessText = (defaultGroup: Group) =>diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts b/frontend/src/metabase/permissions/selectors/data-permissions/breadcrumbs.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/breadcrumbs.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.unit.spec.ts b/frontend/src/metabase/permissions/selectors/data-permissions/breadcrumbs.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.unit.spec.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/breadcrumbs.unit.spec.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts b/frontend/src/metabase/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.tssimilarity index 98%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.tsindex babea8fc44a..9d0d48c7f84 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts@@ -2,14 +2,13 @@ import { QueryStatus } from "@reduxjs/toolkit/query";import { createMockSettingsState } from "__support__/state";import type { Database, SchemaName, TableId } from "metabase-types/api";+import { DataPermission, DataPermissionValue } from "metabase-types/api";import {createMockDatabase,createMockGroup,createMockTable,} from "metabase-types/api/mocks";-import { DataPermission, DataPermissionValue } from "../../types";-const createTables = (databaseId: number,tablesBySchema: Record<SchemaName, [TableId, string][]>,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts b/frontend/src/metabase/permissions/selectors/data-permissions/data-sidebar.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/data-sidebar.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.unit.spec.ts b/frontend/src/metabase/permissions/selectors/data-permissions/data-sidebar.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.unit.spec.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/data-sidebar.unit.spec.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.ts b/frontend/src/metabase/permissions/selectors/data-permissions/databases.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/databases.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.unit.spec.ts b/frontend/src/metabase/permissions/selectors/data-permissions/databases.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/databases.unit.spec.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/databases.unit.spec.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.ts b/frontend/src/metabase/permissions/selectors/data-permissions/diff.tssimilarity index 92%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/diff.tsindex b01e5a0efd7..cdfe7c9204c 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/diff.ts@@ -1,12 +1,13 @@import { createSelector } from "@reduxjs/toolkit";import _ from "underscore";-import { diffDataPermissions } from "metabase/admin/permissions/utils/graph";import { PLUGIN_DATA_PERMISSIONS } from "metabase/plugins";import type { State } from "metabase/redux/store";import type { GroupInfo } from "metabase-types/api";-export const getIsDirty = createSelector(+import { diffDataPermissions } from "../../utils/graph";++export const getIsDataPermissionsDirty = createSelector((state: State) => state.admin.permissions.dataPermissions,(state: State) => state.admin.permissions.originalDataPermissions,(state: State) => state,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts b/frontend/src/metabase/permissions/selectors/data-permissions/fields.tssimilarity index 97%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/fields.tsindex adfb46cd294..a665d6c1017 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/fields.ts@@ -1,11 +1,5 @@import _ from "underscore";-import { getNativePermissionDisabledTooltip } from "metabase/admin/permissions/selectors/data-permissions/shared";-import {- getFieldsPermission,- getSchemasPermission,- getTablesPermission,-} from "metabase/admin/permissions/utils/graph";import {PLUGIN_ADMIN_PERMISSIONS_TABLE_FIELDS_ACTIONS,PLUGIN_ADMIN_PERMISSIONS_TABLE_FIELDS_CONFIRMATIONS,@@ -21,15 +15,20 @@ import type {SpecialGroupType,TableEntityId,} from "metabase-types/api";+import {+ DataPermission,+ DataPermissionType,+ DataPermissionValue,+} from "metabase-types/api";import { DATA_PERMISSION_OPTIONS } from "../../constants/data-permissions";import { Messages } from "../../constants/messages";import type { PermissionSectionConfig } from "../../types";import {- DataPermission,- DataPermissionType,- DataPermissionValue,-} from "../../types";+ getFieldsPermission,+ getSchemasPermission,+ getTablesPermission,+} from "../../utils/graph";import {getBlockWarning,getPermissionWarning,@@ -38,6 +37,8 @@ import {getWillRevokeNativeAccessWarningModal,} from "../confirmations";+import { getNativePermissionDisabledTooltip } from "./shared";+const buildAccessPermission = (entityId: TableEntityId,groupId: number,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts b/frontend/src/metabase/permissions/selectors/data-permissions/group-sidebar.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/group-sidebar.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.unit.spec.ts b/frontend/src/metabase/permissions/selectors/data-permissions/group-sidebar.unit.spec.tssimilarity index 98%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.unit.spec.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/group-sidebar.unit.spec.tsindex 4b237e376fe..2e84dfcb6f0 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.unit.spec.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/group-sidebar.unit.spec.ts@@ -2,8 +2,7 @@ import { assocIn } from "icepick";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";import type { State } from "metabase/redux/store";--import { DataPermission, DataPermissionValue } from "../../types";+import { DataPermission, DataPermissionValue } from "metabase-types/api";import { state as mockState } from "./data-permissions.unit.spec.fixtures";diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts b/frontend/src/metabase/permissions/selectors/data-permissions/groups.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/groups.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/index.ts b/frontend/src/metabase/permissions/selectors/data-permissions/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/index.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/index.tsdiff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/permissions/selectors/data-permissions/permission-editor.tsxsimilarity index 99%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsxrename to frontend/src/metabase/permissions/selectors/data-permissions/permission-editor.tsxindex a634a70f3aa..ccc3ed941b0 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx+++ b/frontend/src/metabase/permissions/selectors/data-permissions/permission-editor.tsx@@ -23,6 +23,7 @@ import type {PermissionSubject,SpecialGroupType,} from "metabase-types/api";+import { DataPermission, DataPermissionValue } from "metabase-types/api";import type {DataRouteParams,@@ -30,7 +31,6 @@ import type {PermissionSectionConfig,RawGroupRouteParams,} from "../../types";-import { DataPermission, DataPermissionValue } from "../../types";import {getDatabaseEntityId,getSchemaEntityId,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx b/frontend/src/metabase/permissions/selectors/data-permissions/permission-editor.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsxrename to frontend/src/metabase/permissions/selectors/data-permissions/permission-editor.unit.spec.tsxindex 8aa49659e80..38b9457985c 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx+++ b/frontend/src/metabase/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx@@ -8,6 +8,7 @@ import {} from "__support__/state";import { createMockEntitiesState } from "__support__/store";import type { GroupsPermissions } from "metabase-types/api";+import { DataPermission, DataPermissionValue } from "metabase-types/api";import {createMockDatabase,createMockGroup,@@ -16,8 +17,6 @@ import {createMockTokenFeatures,} from "metabase-types/api/mocks";-import { DataPermission, DataPermissionValue } from "../../types";-import {getDatabasesPermissionEditor,getShouldShowTransformPermissions,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/revision.ts b/frontend/src/metabase/permissions/selectors/data-permissions/revision.tssimilarity index 79%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/revision.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/revision.tsindex e778bf20b93..a94f2ad4e85 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/revision.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/revision.ts@@ -2,11 +2,11 @@ import { createSelector } from "@reduxjs/toolkit";import type { State } from "metabase/redux/store";-import { getIsDirty } from "./diff";+import { getIsDataPermissionsDirty } from "./diff";export const showRevisionChangedModal = createSelector([- getIsDirty,+ getIsDataPermissionsDirty,(state: State) => state.admin.permissions.hasRevisionChanged.hasChanged,],diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts b/frontend/src/metabase/permissions/selectors/data-permissions/schemas.tssimilarity index 93%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/schemas.tsindex 2d67e62128b..36eafd92c10 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/schemas.ts@@ -1,19 +1,20 @@import _ from "underscore";-import { getNativePermissionDisabledTooltip } from "metabase/admin/permissions/selectors/data-permissions/shared";-import { getSchemasPermission } from "metabase/admin/permissions/utils/graph";import {PLUGIN_ADMIN_PERMISSIONS_DATABASE_ACTIONS,PLUGIN_ADMIN_PERMISSIONS_DATABASE_POST_ACTIONS,PLUGIN_ADVANCED_PERMISSIONS,PLUGIN_FEATURE_LEVEL_PERMISSIONS,} from "metabase/plugins";-import type {- DatabaseEntityId,- Group,- GroupsPermissions,- PermissionsDatabase,- SpecialGroupType,+import {+ DataPermission,+ DataPermissionType,+ type DataPermissionValue,+ type DatabaseEntityId,+ type Group,+ type GroupsPermissions,+ type PermissionsDatabase,+ type SpecialGroupType,} from "metabase-types/api";import { DATA_PERMISSION_OPTIONS } from "../../constants/data-permissions";@@ -22,14 +23,16 @@ import {limitDatabasePermission,navigateToGranularPermissions,} from "../../permissions";-import type { DataPermissionValue, PermissionSectionConfig } from "../../types";-import { DataPermission, DataPermissionType } from "../../types";+import type { PermissionSectionConfig } from "../../types";+import { getSchemasPermission } from "../../utils/graph";import {getPermissionWarning,getPermissionWarningModal,getViewDataPermissionsTooRestrictiveWarningModal,} from "../confirmations";+import { getNativePermissionDisabledTooltip } from "./shared";+const buildAccessPermission = (entityId: DatabaseEntityId,groupId: number,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/shared.ts b/frontend/src/metabase/permissions/selectors/data-permissions/shared.tssimilarity index 77%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/shared.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/shared.tsindex 01a6b37cee9..2330aa18c44 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/shared.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/shared.ts@@ -1,8 +1,8 @@-import { Messages } from "metabase/admin/permissions/constants/messages";-import { isRestrictivePermission } from "metabase/admin/permissions/utils/graph";import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";+import { DataPermissionValue } from "metabase-types/api";-import { DataPermissionValue } from "../../types";+import { Messages } from "../../constants/messages";+import { isRestrictivePermission } from "../../utils/graph";export const getNativePermissionDisabledTooltip = (isAdmin: boolean,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts b/frontend/src/metabase/permissions/selectors/data-permissions/tables.tssimilarity index 96%rename from frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.tsrename to frontend/src/metabase/permissions/selectors/data-permissions/tables.tsindex e2ba41d1a74..a6eaf61b1bf 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts+++ b/frontend/src/metabase/permissions/selectors/data-permissions/tables.ts@@ -1,10 +1,5 @@import _ from "underscore";-import { getNativePermissionDisabledTooltip } from "metabase/admin/permissions/selectors/data-permissions/shared";-import {- getSchemasPermission,- getTablesPermission,-} from "metabase/admin/permissions/utils/graph";import {PLUGIN_ADMIN_PERMISSIONS_TABLE_OPTIONS,PLUGIN_ADVANCED_PERMISSIONS,@@ -17,16 +12,17 @@ import type {SchemaEntityId,SpecialGroupType,} from "metabase-types/api";+import {+ DataPermission,+ DataPermissionType,+ DataPermissionValue,+} from "metabase-types/api";import { DATA_PERMISSION_OPTIONS } from "../../constants/data-permissions";import { Messages } from "../../constants/messages";import { navigateToGranularPermissions } from "../../permissions";import type { PermissionSectionConfig } from "../../types";-import {- DataPermission,- DataPermissionType,- DataPermissionValue,-} from "../../types";+import { getSchemasPermission, getTablesPermission } from "../../utils/graph";import {getBlockWarning,getPermissionWarning,@@ -35,6 +31,8 @@ import {getWillRevokeNativeAccessWarningModal,} from "../confirmations";+import { getNativePermissionDisabledTooltip } from "./shared";+const buildAccessPermission = (entityId: SchemaEntityId,groupId: number,diff --git a/frontend/src/metabase/admin/permissions/selectors/help-reference.ts b/frontend/src/metabase/permissions/selectors/help-reference.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/selectors/help-reference.tsrename to frontend/src/metabase/permissions/selectors/help-reference.tsdiff --git a/frontend/src/metabase/admin/permissions/types.ts b/frontend/src/metabase/permissions/types.tssimilarity index 91%rename from frontend/src/metabase/admin/permissions/types.tsrename to frontend/src/metabase/permissions/types.tsindex a773b563f28..6d5726887ee 100644--- a/frontend/src/metabase/admin/permissions/types.ts+++ b/frontend/src/metabase/permissions/types.ts@@ -6,13 +6,13 @@ import type {PermissionOption,PostActionFunction,} from "metabase/plugins";-import {+import type {DataPermission,+ DataPermissionType,DataPermissionValue,- type PermissionEntityId,-} from "metabase-types/api/permissions";+ PermissionEntityId,+} from "metabase-types/api";-export { DataPermission, DataPermissionValue };export type {PermissionAction,PermissionConfirmationProps,@@ -62,16 +62,6 @@ export function parseDataRouteParams(raw: RawDataRouteParams): DataRouteParams {};}-export enum DataPermissionType {- ACCESS = "access",- NATIVE = "native",- DETAILS = "details",- DOWNLOAD = "download",- DATA_MODEL = "data-model",- TRANSFORMS = "transforms",- COLLECTIONS = "collections",-}-export type DatabasePermissionsDiff = {name: string;grantedTables?: Record<number | string, { name: string }>;diff --git a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts b/frontend/src/metabase/permissions/utils/data-entity-id.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/data-entity-id.tsrename to frontend/src/metabase/permissions/utils/data-entity-id.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts b/frontend/src/metabase/permissions/utils/graph/data-permissions/get.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.tsrename to frontend/src/metabase/permissions/utils/graph/data-permissions/get.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.ts b/frontend/src/metabase/permissions/utils/graph/data-permissions/has.tssimilarity index 95%rename from frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.tsrename to frontend/src/metabase/permissions/utils/graph/data-permissions/has.tsindex efb2b397041..ac920165b31 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.ts+++ b/frontend/src/metabase/permissions/utils/graph/data-permissions/has.ts@@ -1,10 +1,5 @@import _ from "underscore";-import { isSchemaEntityId } from "metabase/admin/permissions/utils/data-entity-id";-import {- getDatabaseSchema,- getDatabaseSchemas,-} from "metabase/admin/permissions/utils/metadata";import type {ConcreteTableId,DataPermission,@@ -18,6 +13,9 @@ import type {SchemaEntityId,} from "metabase-types/api";+import { isSchemaEntityId } from "../../data-entity-id";+import { getDatabaseSchema, getDatabaseSchemas } from "../../metadata";+import {getEntityPermission,getFieldsPermission,diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.unit.spec.ts b/frontend/src/metabase/permissions/utils/graph/data-permissions/has.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.unit.spec.tsrename to frontend/src/metabase/permissions/utils/graph/data-permissions/has.unit.spec.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/index.ts b/frontend/src/metabase/permissions/utils/graph/data-permissions/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/graph/data-permissions/index.tsrename to frontend/src/metabase/permissions/utils/graph/data-permissions/index.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts b/frontend/src/metabase/permissions/utils/graph/data-permissions/update.tssimilarity index 98%rename from frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.tsrename to frontend/src/metabase/permissions/utils/graph/data-permissions/update.tsindex c7b3bbf401e..fa433f2d3d2 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts+++ b/frontend/src/metabase/permissions/utils/graph/data-permissions/update.ts@@ -1,16 +1,6 @@import { getIn, setIn } from "icepick";import _ from "underscore";-import {- isSchemaEntityId,- isTableEntityId,-} from "metabase/admin/permissions/utils/data-entity-id";-import {- getDatabaseSchema,- getDatabaseSchemaNames,- isTableUnderEntityId,- tableToTableEntityId,-} from "metabase/admin/permissions/utils/metadata";import { PLUGIN_DATA_PERMISSIONS } from "metabase/plugins";import {DataPermission,@@ -23,6 +13,14 @@ import {type TableEntityId,} from "metabase-types/api";+import { isSchemaEntityId, isTableEntityId } from "../../data-entity-id";+import {+ getDatabaseSchema,+ getDatabaseSchemaNames,+ isTableUnderEntityId,+ tableToTableEntityId,+} from "../../metadata";+import {getFieldsPermission,getPermissionPath,diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/utils.ts b/frontend/src/metabase/permissions/utils/graph/data-permissions/utils.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/graph/data-permissions/utils.tsrename to frontend/src/metabase/permissions/utils/graph/data-permissions/utils.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/index.ts b/frontend/src/metabase/permissions/utils/graph/index.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/graph/index.tsrename to frontend/src/metabase/permissions/utils/graph/index.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.ts b/frontend/src/metabase/permissions/utils/graph/partial-updates.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/graph/partial-updates.tsrename to frontend/src/metabase/permissions/utils/graph/partial-updates.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.ts b/frontend/src/metabase/permissions/utils/graph/partial-updates.unit.spec.tssimilarity index 98%rename from frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.tsrename to frontend/src/metabase/permissions/utils/graph/partial-updates.unit.spec.tsindex e8925346501..8ffc9324a29 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.ts+++ b/frontend/src/metabase/permissions/utils/graph/partial-updates.unit.spec.ts@@ -1,6 +1,5 @@import type { GroupsPermissions } from "metabase-types/api";--import { DataPermission, DataPermissionValue } from "../../types";+import { DataPermission, DataPermissionValue } from "metabase-types/api";import {getModifiedCollectionPermissionsGraphParts,diff --git a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts b/frontend/src/metabase/permissions/utils/graph/permissions-diff.tssimilarity index 98%rename from frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.tsrename to frontend/src/metabase/permissions/utils/graph/permissions-diff.tsindex 8954ac129d0..1fbe208ab11 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts+++ b/frontend/src/metabase/permissions/utils/graph/permissions-diff.ts@@ -4,13 +4,13 @@ import type {GroupsPermissions,PermissionsDatabase,} from "metabase-types/api";+import { DataPermission } from "metabase-types/api";import type {DatabasePermissionsDiff,GroupPermissionsDiff,PermissionsGraphDiff,} from "../../types";-import { DataPermission } from "../../types";import {getFieldsPermission,diff --git a/frontend/src/metabase/admin/permissions/utils/is-embedding-hub.ts b/frontend/src/metabase/permissions/utils/is-embedding-hub.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/is-embedding-hub.tsrename to frontend/src/metabase/permissions/utils/is-embedding-hub.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/metadata.ts b/frontend/src/metabase/permissions/utils/metadata.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/metadata.tsrename to frontend/src/metabase/permissions/utils/metadata.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/urls.ts b/frontend/src/metabase/permissions/utils/urls.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/urls.tsrename to frontend/src/metabase/permissions/utils/urls.tsdiff --git a/frontend/src/metabase/admin/permissions/utils/urls.unit.spec.ts b/frontend/src/metabase/permissions/utils/urls.unit.spec.tssimilarity index 100%rename from frontend/src/metabase/admin/permissions/utils/urls.unit.spec.tsrename to frontend/src/metabase/permissions/utils/urls.unit.spec.tsdiff --git a/frontend/src/metabase/plugins/oss/permissions.ts b/frontend/src/metabase/plugins/oss/permissions.tsindex 36a95589947..4bb783d3394 100644--- a/frontend/src/metabase/plugins/oss/permissions.ts+++ b/frontend/src/metabase/plugins/oss/permissions.ts@@ -28,10 +28,9 @@ type DataModelQueryProps = {const DEFAULT_DATA_MODEL_QUERY_PROPS: DataModelQueryProps = {};-// These describe the entries EE plugins contribute to the admin permissions-// editor. They live here (not in metabase/admin) because shared plugin code-// cannot import from feature modules; metabase/admin/permissions/types-// re-exports them.+// These describe the entries EE plugins contribute to the permissions editor.+// They live here (not in metabase/permissions) because the plugin registry sits+// below the permissions module; metabase/permissions re-exports them.export interface PermissionOption {label: string;value: DataPermissionValue;diff --git a/frontend/src/metabase/routes.tsx b/frontend/src/metabase/routes.tsxindex 7ba36ba02f8..711bbf0a53e 100644--- a/frontend/src/metabase/routes.tsx+++ b/frontend/src/metabase/routes.tsx@@ -2,7 +2,6 @@ import type { Store, ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";import { App } from "metabase/AppComponent";import { getAccountRoutes } from "metabase/account/routes";-import CollectionPermissionsModal from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";import { getRoutes as getAdminRoutes } from "metabase/admin/routes";import { ForgotPassword } from "metabase/auth/components/ForgotPassword";import { Login } from "metabase/auth/components/Login";@@ -27,6 +26,7 @@ import { getMetricRoutes } from "metabase/metrics/routes";import NewModelOptions from "metabase/models/containers/NewModelOptions";import { getRoutes as getModelRoutes } from "metabase/models/routes";import { getMonitorRedirects, getMonitorRoutes } from "metabase/monitor/routes";+import { CollectionPermissionsModal } from "metabase/permissions";import {PLUGIN_COLLECTIONS,PLUGIN_DATA_APPS,