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
Remove group entity (#73737)
Romeo Van Snick2f9d7ae5e2bc
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 1ec4cb8c8f1..d1d0f599772 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,11 +1,9 @@import { useCallback, useEffect } from "react";import type { Route } from "react-router";-import _ from "underscore";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 { Groups } from "metabase/entities/groups";import { connect } from "metabase/redux";import {initializeApplicationPermissions,@@ -89,7 +87,7 @@ const ApplicationPermissionsPage = ({};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Groups.loadList(),- connect(mapStateToProps, mapDispatchToProps),+export default connect(+ mapStateToProps,+ mapDispatchToProps,)(ApplicationPermissionsPage);diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.jsindex cb0ceedc204..4f482d258cd 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/reducer.js@@ -1,6 +1,7 @@import { assocIn } from "icepick";import { t } from "ttag";+import { permissionApi } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import {combineReducers,@@ -18,6 +19,7 @@ export const initializeApplicationPermissions = createThunkAction(INITIALIZE_APPLICATION_PERMISSIONS,() => async (dispatch) => {dispatch(loadApplicationPermissions());+ dispatch(permissionApi.endpoints.listPermissionsGroups.initiate({}));},);diff --git a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsxindex 579d428dcd1..5bf58e3f638 100644--- a/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/sandboxes/components/EditSandboxingModal/EditSandboxingModal.tsx@@ -4,7 +4,12 @@ import { useAsyncFn } from "react-use";import { c, jt, t } from "ttag";import _ from "underscore";-import { skipToken, useGetCardQuery, useGetTableQuery } from "metabase/api";+import {+ skipToken,+ useGetCardQuery,+ useGetPermissionsGroupQuery,+ useGetTableQuery,+} from "metabase/api";import { ActionButton } from "metabase/common/components/ActionButton";import {QuestionPickerModal,@@ -25,6 +30,7 @@ import type {import { getRawDataQuestionForTable } from "metabase-enterprise/sandboxes/utils";import * as Lib from "metabase-lib";import type {+ GroupId,GroupTableAccessPolicy,Table,UserAttributeKey,@@ -310,6 +316,11 @@ const SummaryRow = ({ icon, content }: SummaryRowProps) => (</div>);+const PermissionsGroupName = ({ groupId }: { groupId: GroupId }) => {+ const { data: group } = useGetPermissionsGroupQuery(groupId);+ return group ? <span>{group.name}</span> : null;+};+interface PolicySummaryProps {policy: GroupTableAccessPolicy;policyTable: Table | undefined;@@ -329,7 +340,7 @@ const PolicySummary = ({ policy, policyTable }: PolicySummaryProps) => {icon="group"content={jt`Users in ${(<strong key="group-name">- <EntityName entityType="groups" entityId={policy.group_id} />+ <PermissionsGroupName groupId={policy.group_id} /></strong>)} can view`}/>diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsxindex 31b6d670c69..9cc4d5aa897 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx@@ -28,7 +28,6 @@ import type {} from "metabase/admin/permissions/types";import { assertNumericId } from "metabase/admin/permissions/types";import { Collections } from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { connect } from "metabase/redux";import type { State } from "metabase/redux/store";import type { Collection, CollectionId } from "metabase-types/api";@@ -145,6 +144,5 @@ export const TenantCollectionPermissionsPage = _.compose(Collections.loadList({entityQuery: tenantCollectionsQuery,}),- Groups.loadList(),connect(mapStateToProps, mapDispatchToProps),)(TenantCollectionPermissionsPageView);diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsxindex 0081e47758b..7a76c944483 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx@@ -11,13 +11,17 @@ import type {} 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 type { PermissionEditorType } from "metabase/admin/permissions/types";+import { selectGroupList } from "metabase/admin/permissions/selectors/data-permissions/groups";+import {+ DataPermission,+ DataPermissionType,+ type PermissionEditorType,+} from "metabase/admin/permissions/types";import {Collections,ROOT_COLLECTION,getCollectionIcon,} from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { PLUGIN_TENANTS } from "metabase/plugins";import type { ExpandedCollection, State } from "metabase/redux/store";import {@@ -25,6 +29,7 @@ import {isAdminGroup,isDefaultGroup,} from "metabase/utils/groups";+import { isNotNull } from "metabase/utils/types";import type {Collection,CollectionId,@@ -160,7 +165,7 @@ const getTenantCollectionPermission = (export const getTenantCollectionsPermissionEditor = createSelector(getTenantCollectionsPermissions,getTenantCollectionEntity,- Groups.selectors.getList,+ selectGroupList,(permissions, collection, groups): PermissionEditorType | null => {if (!permissions || collection == null) {return null;@@ -179,13 +184,15 @@ export const getTenantCollectionsPermissionEditor = createSelector(isTenantGroup ? PLUGIN_TENANTS.isExternalUsersGroup : isDefaultGroup,);- const defaultGroupPermission = defaultGroup- ? getTenantCollectionPermission(- permissions,- defaultGroup.id,- collection.id,- )- : "none";+ if (!defaultGroup) {+ return null;+ }++ const defaultGroupPermission = getTenantCollectionPermission(+ permissions,+ defaultGroup.id,+ collection.id,+ );const confirmations = (newValue: DataPermissionValue) => [getPermissionWarningModal(@@ -219,6 +226,8 @@ export const getTenantCollectionsPermissionEditor = createSelector() : undefined,permissions: [{+ permission: DataPermission.COLLECTIONS,+ type: DataPermissionType.COLLECTIONS,toggleLabel,hasChildren,isDisabled: disabled,@@ -239,7 +248,7 @@ export const getTenantCollectionsPermissionEditor = createSelector(],};})- .filter(Boolean);+ .filter(isNotNull);return {title: t`Permissions for ${collection.name}`,diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsxindex 0cc9dbddd5e..5f989954651 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx@@ -2,7 +2,6 @@ import { useCallback, useEffect, useMemo } from "react";import type { Route } from "react-router";import { push } from "react-router-redux";import { t } from "ttag";-import _ from "underscore";import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";import {@@ -22,7 +21,6 @@ import type { CollectionIdProps } from "metabase/admin/permissions/selectors/colimport type { PermissionEditorEntity } from "metabase/admin/permissions/types";import { assertNumericId } from "metabase/admin/permissions/types";import { Collections } from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { useDispatch, useSelector } from "metabase/redux";import type { Collection, CollectionId } from "metabase-types/api";@@ -150,9 +148,6 @@ function TenantSpecificCollectionPermissionsPageView({);}-export const TenantSpecificCollectionPermissionsPage = _.compose(- Collections.loadList({- entityQuery: tenantSpecificCollectionsQuery,- }),- Groups.loadList(),-)(TenantSpecificCollectionPermissionsPageView);+export const TenantSpecificCollectionPermissionsPage = Collections.loadList({+ entityQuery: tenantSpecificCollectionsQuery,+})(TenantSpecificCollectionPermissionsPageView);diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsxindex 41aeda9b80f..56963a555de 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx@@ -10,14 +10,18 @@ import type {CollectionSidebarType,} from "metabase/admin/permissions/selectors/collection-permissions";import { getPermissionWarningModal } from "metabase/admin/permissions/selectors/confirmations";-import type { PermissionEditorType } from "metabase/admin/permissions/types";+import { selectGroupList } from "metabase/admin/permissions/selectors/data-permissions/groups";+import {+ DataPermission,+ DataPermissionType,+ type PermissionEditorType,+} from "metabase/admin/permissions/types";import { findCollectionById } from "metabase/common/utils/collections";import {Collections,ROOT_COLLECTION,getCollectionIcon,} from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { PLUGIN_TENANTS } from "metabase/plugins";import type { ExpandedCollection, State } from "metabase/redux/store";import {@@ -25,6 +29,7 @@ import {isAdminGroup,isDefaultGroup,} from "metabase/utils/groups";+import { isNotNull } from "metabase/utils/types";import type {CollectionId,CollectionPermissions,@@ -134,7 +139,7 @@ const getTenantSpecificCollectionPermission = (export const getTenantSpecificCollectionsPermissionEditor = createSelector(getTenantSpecificCollectionsPermissions,getTenantSpecificCollectionEntity,- Groups.selectors.getList,+ selectGroupList,(permissions, collection, groups): PermissionEditorType | null => {if (!permissions || collection == null) {return null;@@ -159,6 +164,10 @@ export const getTenantSpecificCollectionsPermissionEditor = createSelector(): "none";+ if (!defaultGroup) {+ return null;+ }+const confirmations = (newValue: DataPermissionValue) => [getPermissionWarningModal(newValue,@@ -182,6 +191,8 @@ export const getTenantSpecificCollectionsPermissionEditor = createSelector(name: getGroupNameLocalized(group),permissions: [{+ permission: DataPermission.COLLECTIONS,+ type: DataPermissionType.COLLECTIONS,// Always show toggle as checked and disabled for tenant-specific collectionstoggleLabel: t`Also change sub-collections`,hasChildren: true,@@ -207,7 +218,7 @@ export const getTenantSpecificCollectionsPermissionEditor = createSelector(],};})- .filter(Boolean);+ .filter(isNotNull);return {title: t`Permissions for ${collection.name}`,diff --git a/frontend/src/metabase/admin/people/events.ts b/frontend/src/metabase/admin/people/events.tsdeleted file mode 100644index 4211c35b579..00000000000--- a/frontend/src/metabase/admin/people/events.ts+++ /dev/null@@ -1 +0,0 @@-export const CLEAR_MEMBERSHIPS = "metabase/admin/people/CLEAR_MEMBERSHIPS";diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsxindex 2d80fd9e6f7..9f378df8805 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx@@ -8,7 +8,6 @@ import { Link } from "metabase/common/components/Link";import { ModalContent } from "metabase/common/components/ModalContent";import CS from "metabase/css/core/index.css";import { Collections } from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import * as Urls from "metabase/urls";@@ -185,6 +184,5 @@ export default _.compose(Collections.loadList({entityQuery: collectionsQuery,}),- Groups.loadList(),connect(mapStateToProps, mapDispatchToProps),)(CollectionPermissionsModal);diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsxindex 5e6239a2454..bdb086b327f 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx@@ -6,7 +6,6 @@ import _ from "underscore";import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";import { Collections } from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { connect, useSelector } from "metabase/redux";import type { State } from "metabase/redux/store";import type { Collection, CollectionId } from "metabase-types/api";@@ -148,6 +147,5 @@ export const CollectionPermissionsPage = _.compose(Collections.loadList({entityQuery: collectionsQuery,}),- Groups.loadList(),connect(mapStateToProps, mapDispatchToProps),)(CollectionsPermissionsPageView);diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex 43a57e7cd83..19e66edc0ba 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -1,17 +1,19 @@import type { ReactNode } from "react";import type { Route } from "react-router";import { useAsync } from "react-use";-import _ from "underscore";-import { skipToken, useGetDatabaseMetadataQuery } from "metabase/api";+import {+ skipToken,+ useGetDatabaseMetadataQuery,+ useListPermissionsGroupsQuery,+} from "metabase/api";import { Databases } from "metabase/entities/databases";-import { Groups } from "metabase/entities/groups";import { useDispatch, useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { Center, Loader } from "metabase/ui";import { isAdminGroup, isDefaultGroup } from "metabase/utils/groups";import type Database from "metabase-lib/v1/metadata/Database";-import type { DatabaseId, Group } from "metabase-types/api";+import type { DatabaseId, GroupInfo } from "metabase-types/api";import { DataPermissionsHelp } from "../../components/DataPermissionsHelp";import { PermissionsPageLayout } from "../../components/PermissionsPageLayout/PermissionsPageLayout";@@ -29,16 +31,20 @@ type DataPermissionsPageProps = {databaseId: DatabaseId;};databases: Database[];- groups: Group[];};+const EMPTY_GROUP_LIST: GroupInfo[] = [];+function DataPermissionsPage({children,route,params,databases,- groups,}: DataPermissionsPageProps) {+ const { data, isLoading: isLoadingGroups } = useListPermissionsGroupsQuery(+ {},+ );+ const groups = data ?? EMPTY_GROUP_LIST;const isDirty = useSelector(getIsDirty);const diff = useSelector((state) => getDiff(state, { databases, groups }));const showSplitPermsModal = useSelector((state) =>@@ -50,14 +56,20 @@ function DataPermissionsPage({const savePermissions = () => dispatch(saveDataPermissions());const { loading: isLoadingAllUsers } = useAsync(async () => {+ if (isLoadingGroups) {+ return;+ }const allUsers = groups.find(isDefaultGroup);await dispatch(loadDataPermissionsForGroup(allUsers?.id));- }, []);+ }, [isLoadingGroups]);const { loading: isLoadingAdminstrators } = useAsync(async () => {+ if (isLoadingGroups) {+ return;+ }const admins = groups.find(isAdminGroup);await dispatch(loadDataPermissionsForGroup(admins?.id));- }, []);+ }, [isLoadingGroups]);const { isLoading: isLoadingTables } = useGetDatabaseMetadataQuery(params.databaseId !== undefined@@ -70,7 +82,12 @@ function DataPermissionsPage({: skipToken,);- if (isLoadingAllUsers || isLoadingAdminstrators || isLoadingTables) {+ if (+ isLoadingGroups ||+ isLoadingAllUsers ||+ isLoadingAdminstrators ||+ isLoadingTables+ ) {return (<Center h="100%"><Loader size="lg" />@@ -95,9 +112,6 @@ function DataPermissionsPage({}// eslint-disable-next-line import/no-default-export -- deprecated usage-export default _.compose(- Groups.loadList(),- Databases.loadList({- selectorName: "getListUnfiltered",- }),-)(DataPermissionsPage);+export default Databases.loadList({+ selectorName: "getListUnfiltered",+})(DataPermissionsPage);diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/admin/permissions/permissions.tsindex 73d22c7394d..1eff2bad6c9 100644--- a/frontend/src/metabase/admin/permissions/permissions.ts+++ b/frontend/src/metabase/admin/permissions/permissions.ts@@ -18,8 +18,8 @@ import {updateTablesPermission,} from "metabase/admin/permissions/utils/graph";import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";+import { permissionApi } from "metabase/api";import { type ErrorPayload, getErrorMessage } from "metabase/api/utils/errors";-import { Groups } from "metabase/entities/groups";import { Tables } from "metabase/entities/tables";import {PLUGIN_ADVANCED_PERMISSIONS,@@ -42,6 +42,7 @@ import type {PermissionsGraph,} from "metabase-types/api";+import { selectGroupList } from "./selectors/data-permissions/groups";import {DataPermission,DataPermissionType,@@ -124,7 +125,7 @@ export const initializeCollectionPermissions = createThunkAction((namespace) => async (dispatch) => {await Promise.all([dispatch(loadCollectionPermissions(namespace)),- dispatch(Groups.actions.fetchList()),+ dispatch(permissionApi.endpoints.listPermissionsGroups.initiate({})),]);},);@@ -256,7 +257,7 @@ export const saveDataPermissions = createThunkAction(SAVE_DATA_PERMISSIONS,() => async (_dispatch, getState) => {const state = getState();- const allGroupIds = Object.keys(state.entities.groups);+ const allGroupIds = selectGroupList(state).map((group) => String(group.id));const {originalDataPermissions,dataPermissions,@@ -368,7 +369,7 @@ export const initializeTenantCollectionPermissions = createThunkAction(() => async (dispatch) => {await Promise.all([dispatch(loadTenantCollectionPermissions()),- dispatch(Groups.actions.fetchList()),+ dispatch(permissionApi.endpoints.listPermissionsGroups.initiate({})),]);},);@@ -454,7 +455,7 @@ export const initializeTenantSpecificCollectionPermissions = createThunkAction(() => async (dispatch) => {await Promise.all([dispatch(loadTenantSpecificCollectionPermissions()),- dispatch(Groups.actions.fetchList()),+ dispatch(permissionApi.endpoints.listPermissionsGroups.initiate({})),]);},);diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsxindex 47193805e03..3a9e0b8703b 100644--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx@@ -13,7 +13,6 @@ import {ROOT_COLLECTION,getCollectionIcon,} from "metabase/entities/collections";-import { Groups } from "metabase/entities/groups";import { SnippetCollections } from "metabase/entities/snippet-collections";import { PLUGIN_COLLECTIONS, PLUGIN_TENANTS } from "metabase/plugins";import type {@@ -47,6 +46,7 @@ import {} from "../types";import { getPermissionWarningModal } from "./confirmations";+import { selectGroupList } from "./data-permissions/groups";export const collectionsQuery = {tree: true,@@ -243,7 +243,7 @@ const getCollectionDisabledTooltip = (export const getCollectionsPermissionEditor = createSelector(getCollectionsPermissions,getCollectionEntity,- Groups.selectors.getList,+ selectGroupList,getNamespace,(permissions, collection, groups, namespace): PermissionEditorType | null => {if (!permissions || collection == null) {@@ -276,6 +276,10 @@ export const getCollectionsPermissionEditor = createSelector(return null;}+ if (!defaultGroup) {+ return null;+ }+const defaultGroupPermission = getCollectionPermission(permissions,defaultGroup.id,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.tsindex ded1cc55b1d..f9966b67b0b 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-permissions.unit.spec.fixtures.ts@@ -1,3 +1,5 @@+import { QueryStatus } from "@reduxjs/toolkit/query";+import { createMockSettingsState } from "metabase/redux/store/mocks";import { createMockGroup } from "metabase-types/api/mocks";@@ -199,4 +201,18 @@ export const state = {},entities: normalizedMetadata,settings: createMockSettingsState(),+ "metabase-api": {+ queries: {+ "listPermissionsGroups({})": {+ status: QueryStatus.fulfilled,+ data: Object.values(normalizedMetadata.groups),+ error: undefined,+ originalArgs: {},+ requestId: "test-request-groups",+ endpointName: "listPermissionsGroups",+ startedTimeStamp: Date.now(),+ fulfilledTimeStamp: Date.now(),+ },+ },+ },};diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.tsindex 5a8315bbbfd..7b2ec6447da 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/diff.ts@@ -5,7 +5,7 @@ import { diffDataPermissions } from "metabase/admin/permissions/utils/graph";import { PLUGIN_DATA_PERMISSIONS } from "metabase/plugins";import type { State } from "metabase/redux/store";import type Database from "metabase-lib/v1/metadata/Database";-import type { Group } from "metabase-types/api";+import type { GroupInfo } from "metabase-types/api";export const getIsDirty = createSelector((state: State) => state.admin.permissions.dataPermissions,@@ -18,7 +18,7 @@ export const getIsDirty = createSelector(interface DiffProps {databases: Database[];- groups: Group[];+ groups: GroupInfo[];}export const getDiff = createSelector(diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.tsindex 0da82466aa5..c283de0429d 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts@@ -1,21 +1,35 @@import { createSelector } from "@reduxjs/toolkit";import _ from "underscore";-import { Groups } from "metabase/entities/groups";+import { permissionApi } from "metabase/api";import { PLUGIN_TENANTS } from "metabase/plugins";+import type { State } from "metabase/redux/store";import {getGroupSortOrder,isAdminGroup,isDataAnalystGroup,isDefaultGroup,} from "metabase/utils/groups";-import type { Group } from "metabase-types/api";+import type { Group, GroupId } from "metabase-types/api";const isPinnedGroup = (group: Group) =>isAdminGroup(group) || isDefaultGroup(group) || isDataAnalystGroup(group);+const EMPTY_GROUP_LIST: Group[] = [];++// The list endpoint returns groups without `members`, but the legacy entity+// typed them as `Group[]`. Downstream code never reads `members` from list+// results, so we cast to preserve the existing call signatures.+export const selectGroupList = (state: State): Group[] =>+ (permissionApi.endpoints.listPermissionsGroups.select({})(state).data ??+ EMPTY_GROUP_LIST) as Group[];++export const selectGroupById = (state: State, id: GroupId): Group | undefined =>+ permissionApi.endpoints.getPermissionsGroup.select(id)(state).data ??+ selectGroupList(state).find((group) => group.id === id);+export const getOrderedGroups = createSelector(- Groups.selectors.getList,+ selectGroupList,(groups: Group[]) => {const [pinnedGroups, unpinnedGroups] = _.partition(groups, isPinnedGroup);const sortedPinnedGroups = _.sortBy(pinnedGroups, getGroupSortOrder);@@ -27,6 +41,6 @@ export const getOrderedGroups = createSelector();export const getDefaultGroup = createSelector(- Groups.selectors.getList,+ selectGroupList,(groups: Group[]) => groups.find(isDefaultGroup),);diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsxindex d4103227966..b15c8eb478f 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx@@ -5,7 +5,6 @@ import _ from "underscore";import { getPlan } from "metabase/common/utils/plan";import { getIsHosted } from "metabase/databases/selectors";-import { Groups } from "metabase/entities/groups";import { Tables } from "metabase/entities/tables";import {PLUGIN_AUDIT,@@ -42,7 +41,7 @@ import {getGroupsDataEditorBreadcrumbs,} from "./breadcrumbs";import { buildFieldsPermissions } from "./fields";-import { getOrderedGroups } from "./groups";+import { getOrderedGroups, selectGroupById, selectGroupList } from "./groups";import { buildSchemasPermissions } from "./schemas";import { buildTablesPermissions } from "./tables";@@ -150,9 +149,7 @@ const getGroup = (state: State, props: { params: RawGroupRouteParams }) => {return null;}- return Groups.selectors.getObject(state, {- entityId: parseInt(groupId),- });+ return selectGroupById(state, parseInt(groupId));};const hasViewDataOptions = (entities: any[]) => {@@ -205,7 +202,7 @@ export const getDatabasesPermissionEditor = createSelector(getDataPermissions,getOriginalDataPermissions,getGroup,- Groups.selectors.getList,+ selectGroupList,getIsLoadingDatabaseTables,getShouldShowTransformPermissions,(@@ -213,7 +210,7 @@ export const getDatabasesPermissionEditor = createSelector(params,permissions: GroupsPermissions,originalPermissions: GroupsPermissions,- group: Group,+ group: Group | null | undefined,groups: Group[],isLoading,showTransformPermissions,diff --git a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts b/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.tsindex ef16d454b60..478f4d6e9b9 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts+++ b/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts@@ -1,7 +1,7 @@import type Database from "metabase-lib/v1/metadata/Database";import type {ConcreteTableId,- Group,+ GroupInfo,GroupsPermissions,} from "metabase-types/api";@@ -119,7 +119,7 @@ function diffGroupPermissions(export function diffDataPermissions(newPerms: GroupsPermissions,oldPerms: GroupsPermissions,- groups: Group[],+ groups: GroupInfo[],databases: Database[],): PermissionsGraphDiff {const permissionsDiff: {diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsxindex 03c80fb4713..d40624cbfd3 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx@@ -1,31 +1,64 @@-import _ from "underscore";+import { useCallback } from "react";-import { Groups } from "metabase/entities/groups";-import { connect } from "metabase/redux";+import {+ useClearGroupMembershipMutation,+ useDeletePermissionsGroupMutation,+ useListPermissionsGroupsQuery,+} from "metabase/api";+import { useDispatch, useSelector } from "metabase/redux";import { updateSetting } from "metabase/redux/settings";-import type { State } from "metabase/redux/store";import { getSetting } from "metabase/selectors/settings";+import type { GroupId, GroupInfo } from "metabase-types/api";import type { Settings } from "metabase-types/api/settings";import { GroupMappingsWidgetView } from "./GroupMappingsWidgetView";-const mapStateToProps = (- state: State,- props: { mappingSetting: keyof Settings },-) => {- return {- allGroups: Groups.selectors.getList(state),- mappings: getSetting(state, props.mappingSetting) || {},- };-};+const EMPTY_GROUP_LIST: GroupInfo[] = [];-const mapDispatchToProps = {- updateSetting,- deleteGroup: Groups.actions.delete,- clearGroupMember: Groups.actions.clearMember,+type GroupMappingsWidgetProps = {+ mappingSetting: string;+ [key: string]: unknown;};-export const GroupMappingsWidget = _.compose(- connect(mapStateToProps, mapDispatchToProps),- Groups.loadList(),-)(GroupMappingsWidgetView);+export function GroupMappingsWidget(props: GroupMappingsWidgetProps) {+ const dispatch = useDispatch();+ const { data } = useListPermissionsGroupsQuery({});+ const allGroups = data ?? EMPTY_GROUP_LIST;+ const mappings = useSelector(+ (state) =>+ (getSetting(state, props.mappingSetting as keyof Settings) as+ | Record<string, GroupId[]>+ | undefined) ?? {},+ );++ const [deletePermissionsGroup] = useDeletePermissionsGroupMutation();+ const [clearGroupMembership] = useClearGroupMembershipMutation();++ const deleteGroup = useCallback(+ ({ id }: { id: GroupId }) => deletePermissionsGroup(id).unwrap(),+ [deletePermissionsGroup],+ );+ const clearGroupMember = useCallback(+ ({ id }: { id: GroupId }) => clearGroupMembership(id).unwrap(),+ [clearGroupMembership],+ );+ const handleUpdateSetting = useCallback(+ async (args: { key: string; value: Record<string, GroupId[]> }) => {+ await dispatch(updateSetting(args));+ },+ [dispatch],+ );++ return (+ <GroupMappingsWidgetView+ {...(props as unknown as React.ComponentProps<+ typeof GroupMappingsWidgetView+ >)}+ allGroups={allGroups}+ mappings={mappings}+ deleteGroup={deleteGroup}+ clearGroupMember={clearGroupMember}+ updateSetting={handleUpdateSetting}+ />+ );+}diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsxindex 2bf397c436d..9364b1da6ee 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx@@ -10,7 +10,7 @@ import CS from "metabase/css/core/index.css";import { FormSwitch } from "metabase/forms";import { Icon, Tooltip } from "metabase/ui";import { isDefaultGroup } from "metabase/utils/groups";-import type { Group, GroupId } from "metabase-types/api";+import type { GroupId, GroupInfo } from "metabase-types/api";import AddMappingRow from "./AddMappingRow";import {@@ -24,7 +24,7 @@ import {} from "./GroupMappingsWidget.styled";import { MappingRow } from "./MappingRow";-const groupIsMappable = (group: Group) => !isDefaultGroup(group);+const groupIsMappable = (group: GroupInfo) => !isDefaultGroup(group);const helpText = (mappingSetting: string) => {if (mappingSetting === "jwt-group-mappings") {@@ -46,7 +46,7 @@ const noMappingText = (mappingSetting: string, syncSwitchValue: boolean) => {interface GroupMappingsWidgetViewProps {groupHeading: string;groupPlaceholder: string;- allGroups: Group[];+ allGroups: GroupInfo[];mappingSetting: string; // seems like this should be SettingKey but we pass in values like "jwt-group-mappings"deleteGroup: ({ id }: { id: number }) => Promise<void>;clearGroupMember: ({ id }: { id: number }) => Promise<void>;diff --git a/frontend/src/metabase/common/hooks/entity-framework/index.ts b/frontend/src/metabase/common/hooks/entity-framework/index.tsindex be36c52c4f8..1b762f6453f 100644--- a/frontend/src/metabase/common/hooks/entity-framework/index.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/index.ts@@ -7,7 +7,6 @@ export * from "./use-bookmark-list-query";export * from "./use-dashboard-query";export * from "./use-database-list-query";export * from "./use-database-query";-export * from "./use-group-list-query";export * from "./use-question-list-query";export * from "./use-question-query";export * from "./use-search-list-query";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/index.ts b/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/index.tsdeleted file mode 100644index a2909b97b73..00000000000--- a/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./use-group-list-query";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.tsdeleted file mode 100644index 3d4e32e7279..00000000000--- a/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.ts+++ /dev/null@@ -1,23 +0,0 @@-import type {- UseEntityListQueryProps,- UseEntityListQueryResult,-} from "metabase/common/hooks/entity-framework/use-entity-list-query";-import { useEntityListQuery } from "metabase/common/hooks/entity-framework/use-entity-list-query";-import { Groups } from "metabase/entities/groups";-import type { GroupInfo, GroupListQuery } from "metabase-types/api";--/**- * @deprecated use "metabase/api" instead- */-export const useGroupListQuery = (- props: UseEntityListQueryProps<GroupListQuery> = {},-): UseEntityListQueryResult<GroupInfo> => {- return useEntityListQuery<GroupInfo, GroupListQuery>(props, {- fetchList: Groups.actions.fetchList,- getList: Groups.selectors.getList,- getLoading: Groups.selectors.getLoading,- getLoaded: Groups.selectors.getLoaded,- getError: Groups.selectors.getError,- getListMetadata: Groups.selectors.getListMetadata,- });-};diff --git a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.tsindex 388f730d8cc..298353b5629 100644--- a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts@@ -275,7 +275,6 @@ describe("setParameterMapping", () => {metrics: {},snippets: {},questions: {},- groups: {},},});const store = setup(state);@@ -390,7 +389,6 @@ describe("setParameterMapping", () => {metrics: {},snippets: {},questions: {},- groups: {},},});const store = setup(state);diff --git a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts b/frontend/src/metabase/entities/containers/rtk-query/types/entities.tsindex 98286b6e471..d756f08abd7 100644--- a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts+++ b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts@@ -43,7 +43,6 @@ export type EntityType =| "databases"| "documents"| "fields"- | "groups"| "pulses"| "questions"| "revisions"diff --git a/frontend/src/metabase/entities/groups.js b/frontend/src/metabase/entities/groups.jsdeleted file mode 100644index 961d08408f9..00000000000--- a/frontend/src/metabase/entities/groups.js+++ /dev/null@@ -1,86 +0,0 @@-import { assocIn } from "icepick";--import { CLEAR_MEMBERSHIPS } from "metabase/admin/people/events";-import {- permissionApi,- useGetPermissionsGroupQuery,- useListPermissionsGroupsQuery,-} from "metabase/api";--import { createEntity, entityCompatibleQuery } from "./utils";--/**- * @deprecated use "metabase/api" instead- */-export const Groups = createEntity({- name: "groups",- path: "/api/permissions/group",-- rtk: () => ({- getUseGetQuery: () => ({- useGetQuery,- }),- useListQuery: useListPermissionsGroupsQuery,- }),-- api: {- list: (entityQuery, dispatch) =>- entityCompatibleQuery(- entityQuery,- dispatch,- permissionApi.endpoints.listPermissionsGroups,- ),- get: (entityQuery, options, dispatch) =>- entityCompatibleQuery(- entityQuery.id,- dispatch,- permissionApi.endpoints.getPermissionsGroup,- ),- create: (entityQuery, dispatch) =>- entityCompatibleQuery(- entityQuery,- dispatch,- permissionApi.endpoints.createPermissionsGroup,- ),- update: (entityQuery, dispatch) =>- entityCompatibleQuery(- entityQuery,- dispatch,- permissionApi.endpoints.updatePermissionsGroup,- ),- delete: ({ id }, dispatch) =>- entityCompatibleQuery(- id,- dispatch,- permissionApi.endpoints.deletePermissionsGroup,- ),- },-- actions: {- clearMember:- ({ id }) =>- async (dispatch) => {- await dispatch(- entityCompatibleQuery(- id,- dispatch,- permissionApi.endpoints.clearGroupMembership,- ),- );- dispatch({ type: CLEAR_MEMBERSHIPS, payload: { groupId: id } });- },- },-- reducer: (state = {}, { type, payload, error }) => {- if (type === CLEAR_MEMBERSHIPS && !error) {- const { groupId } = payload;- return assocIn(state, [groupId, "members"], []);- }-- return state;- },-});--const useGetQuery = ({ id }) => {- return useGetPermissionsGroupQuery(id);-};diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex a5bd908d9cb..3a9bf5577af 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -83,8 +83,6 @@ export { Segments as segments } from "./segments";export { Measures as measures } from "./measures";export { Metrics as metrics } from "./metrics";-export { Groups as groups } from "./groups";-export { Search as search } from "./search";export { Snippets as snippets } from "./snippets";diff --git a/frontend/src/metabase/forms/components/FormGroupWidget/FormGroupWidget.tsx b/frontend/src/metabase/forms/components/FormGroupWidget/FormGroupWidget.tsxindex fc15c615307..ce845ef4ffb 100644--- a/frontend/src/metabase/forms/components/FormGroupWidget/FormGroupWidget.tsx+++ b/frontend/src/metabase/forms/components/FormGroupWidget/FormGroupWidget.tsx@@ -3,7 +3,7 @@ import type { FocusEvent, Ref } from "react";import { forwardRef, useCallback } from "react";import { t } from "ttag";-import { useGroupListQuery } from "metabase/common/hooks";+import { useListPermissionsGroupsQuery } from "metabase/api";import type { SelectProps } from "metabase/ui";import { Loader, Select } from "metabase/ui";import type { GroupId } from "metabase-types/api";@@ -41,7 +41,7 @@ export const FormGroupWidget = forwardRef(function FormGroupWidget([setTouched, onBlur],);- const { data: groups, isLoading } = useGroupListQuery();+ const { data: groups, isLoading } = useListPermissionsGroupsQuery({});if (isLoading || !groups) {return <Loader size={16} />;}diff --git a/frontend/src/metabase/redux/store/entities.ts b/frontend/src/metabase/redux/store/entities.tsindex 3754533edfa..51c4c9796e5 100644--- a/frontend/src/metabase/redux/store/entities.ts+++ b/frontend/src/metabase/redux/store/entities.ts@@ -4,7 +4,6 @@ import type {NormalizedDashboard,NormalizedDatabase,NormalizedField,- NormalizedGroup,NormalizedMeasure,NormalizedMetric,NormalizedNativeQuerySnippet,@@ -27,7 +26,6 @@ export interface EntitiesState {metrics: Record<string, NormalizedMetric>;snippets: Record<string, NormalizedNativeQuerySnippet>;questions: Record<string, NormalizedCard>;- groups: Record<string, NormalizedGroup>;[key: `${string}_list`]: unknown;}diff --git a/frontend/src/metabase/redux/store/mocks/entities.ts b/frontend/src/metabase/redux/store/mocks/entities.tsindex 8debc4e92a2..d71396de82b 100644--- a/frontend/src/metabase/redux/store/mocks/entities.ts+++ b/frontend/src/metabase/redux/store/mocks/entities.ts@@ -15,5 +15,4 @@ export const createMockNormalizedEntitiesState = (): EntitiesState => ({metrics: {},snippets: {},questions: {},- groups: {},});diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.jsindex b852b52eaef..e97ef88a77d 100644--- a/frontend/src/metabase/schema.js+++ b/frontend/src/metabase/schema.js@@ -13,7 +13,6 @@ export const CacheConfigSchema = new schema.Entity("cacheConfigs");export const BookmarkSchema = new schema.Entity("bookmarks");export const DashboardSchema = new schema.Entity("dashboards");export const CollectionSchema = new schema.Entity("collections");-export const GroupSchema = new schema.Entity("groups");export const DatabaseSchema = new schema.Entity("databases");export const SchemaSchema = new schema.Entity("schemas");diff --git a/frontend/test/__support__/store.ts b/frontend/test/__support__/store.tsindex c3c09145e2c..1b9ee1472cd 100644--- a/frontend/test/__support__/store.ts+++ b/frontend/test/__support__/store.ts@@ -9,7 +9,6 @@ import {DashboardSchema,DatabaseSchema,FieldSchema,- GroupSchema,MeasureSchema,MetricSchema,QuestionSchema,@@ -62,7 +61,6 @@ const EntitiesSchema: Record<keyof EntitiesState, NormalizrSchema<any>> = {metrics: [MetricSchema],snippets: [SnippetSchema],questions: [QuestionSchema],- groups: [GroupSchema],};export const createMockEntitiesState = (