Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Admin TS conversions (#69825)

Kevin Kelleher04055423f024
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.tsx
index 8d9bfd7f43b..29cd2e003fd 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
@@ -106,6 +106,7 @@ const ImpersonationModalInner = ({
},
value: DataPermissionValue.IMPERSONATED,
entityId: { databaseId },
+ view: "group",
}),
);
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.ts
index 09e213e8f99..b32eab7dc88 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
@@ -11,6 +11,7 @@ import {
DataPermissionType,
DataPermissionValue,
type EntityId,
+ type PermissionOption,
type PermissionSectionConfig,
type PermissionSubject,
type SchemaEntityId,
@@ -25,7 +26,7 @@ import {
import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";
import type { Group, GroupsPermissions } from "metabase-types/api";
-export const DATA_MODEL_PERMISSION_OPTIONS = {
+export const DATA_MODEL_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
none: {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
label: t`No`,
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.ts
index d39badbc2f5..a74e516c741 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
@@ -11,12 +11,13 @@ import {
DataPermissionType,
DataPermissionValue,
type EntityId,
+ type PermissionOption,
type PermissionSectionConfig,
type PermissionSubject,
} from "metabase/admin/permissions/types";
import type { Group, GroupsPermissions } from "metabase-types/api";
-export const DETAILS_PERMISSION_OPTIONS = {
+export const DETAILS_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
no: {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
label: t`No`,
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.ts
index e939908ab75..c80821786fc 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
@@ -11,6 +11,7 @@ import {
DataPermissionType,
DataPermissionValue,
type EntityId,
+ type PermissionOption,
type PermissionSectionConfig,
type PermissionSubject,
type SchemaEntityId,
@@ -36,7 +37,7 @@ const getTooltipMessage = (isAdmin: boolean, isBlockedAccess: boolean) => {
return null;
};
-export const DOWNLOAD_PERMISSION_OPTIONS = {
+export const DOWNLOAD_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
none: {
// eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
label: t`No`,
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.ts
index 550b1d9e30d..438bac94051 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
@@ -11,13 +11,14 @@ import {
DataPermissionType,
DataPermissionValue,
type EntityId,
+ type PermissionOption,
type PermissionSectionConfig,
type PermissionSubject,
} from "metabase/admin/permissions/types";
import { getSchemasPermission } from "metabase/admin/permissions/utils/graph";
import type { Group, GroupsPermissions } from "metabase-types/api";
-export const TRANSFORMS_PERMISSION_OPTIONS = {
+export const TRANSFORMS_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
no: {
get label() {
return t`No`;
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
index 53f7ec9edf9..8f67a6bf40e 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
@@ -12,6 +12,7 @@ import {
import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";
import { PermissionsSidebar } from "metabase/admin/permissions/components/PermissionsSidebar";
import {
+ type UpdateTenantCollectionPermissionParams,
initializeTenantCollectionPermissions,
loadTenantCollectionPermissions,
saveTenantCollectionPermissions,
@@ -19,13 +20,17 @@ import {
} from "metabase/admin/permissions/permissions";
import type {
CollectionIdProps,
- CollectionPermissionEditorType,
CollectionSidebarType,
} from "metabase/admin/permissions/selectors/collection-permissions";
+import type {
+ PermissionEditorEntity,
+ PermissionEditorType,
+} 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/lib/redux";
-import type { Collection, CollectionId, GroupId } from "metabase-types/api";
+import type { Collection, CollectionId } from "metabase-types/api";
import type { State } from "metabase-types/store";
import {
@@ -54,17 +59,10 @@ const mapStateToProps = (state: State, props: CollectionIdProps) => {
};
};
-type UpdateCollectionPermissionParams = {
- groupId: GroupId;
- collection: Collection;
- value: unknown;
- shouldPropagateToChildren: boolean;
-};
-
type TenantCollectionPermissionsPageProps = {
params: CollectionIdProps["params"];
sidebar: CollectionSidebarType;
- permissionEditor: CollectionPermissionEditorType;
+ permissionEditor: PermissionEditorType | null;
collection: Collection;
navigateToItem: (item: { id: CollectionId }) => void;
updateCollectionPermission: ({
@@ -72,7 +70,7 @@ type TenantCollectionPermissionsPageProps = {
collection,
value,
shouldPropagateToChildren,
- }: UpdateCollectionPermissionParams) => void;
+ }: UpdateTenantCollectionPermissionParams) => void;
isDirty: boolean;
savePermissions: () => void;
loadPermissions: () => void;
@@ -98,16 +96,16 @@ function TenantCollectionPermissionsPageView({
const handlePermissionChange = useCallback(
(
- item: { id: GroupId },
+ item: PermissionEditorEntity,
_permission: unknown,
value: unknown,
- toggleState: boolean,
+ toggleState: boolean | null,
) => {
updateCollectionPermission({
- groupId: item.id,
+ groupId: assertNumericId(item.id),
collection,
value,
- shouldPropagateToChildren: toggleState,
+ shouldPropagateToChildren: toggleState ?? false,
});
},
[collection, updateCollectionPermission],
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
index a4281628239..bb556aeecf9 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
@@ -7,12 +7,14 @@ import { COLLECTION_OPTIONS } from "metabase/admin/permissions/constants/collect
import { Messages } from "metabase/admin/permissions/constants/messages";
import type {
CollectionIdProps,
- CollectionPermissionEditorType,
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 type { DataPermissionValue } from "metabase/admin/permissions/types";
+import type {
+ DataPermissionValue,
+ PermissionEditorType,
+} from "metabase/admin/permissions/types";
import {
Collections,
ROOT_COLLECTION,
@@ -161,7 +163,7 @@ export const getTenantCollectionsPermissionEditor = createSelector(
getTenantCollectionsPermissions,
getTenantCollectionEntity,
Groups.selectors.getList,
- (permissions, collection, groups): CollectionPermissionEditorType => {
+ (permissions, collection, groups): PermissionEditorType | null => {
if (!permissions || collection == null) {
return null;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
index f26f04b2b95..de3364def51 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
@@ -12,16 +12,19 @@ import {
import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";
import { PermissionsSidebar } from "metabase/admin/permissions/components/PermissionsSidebar";
import {
+ type UpdateTenantCollectionPermissionParams,
initializeTenantSpecificCollectionPermissions,
loadTenantSpecificCollectionPermissions,
saveTenantSpecificCollectionPermissions,
updateTenantSpecificCollectionPermission,
} from "metabase/admin/permissions/permissions";
import type { CollectionIdProps } from "metabase/admin/permissions/selectors/collection-permissions";
+import 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/lib/redux";
-import type { Collection, CollectionId, GroupId } from "metabase-types/api";
+import type { Collection, CollectionId } from "metabase-types/api";
import {
getIsTenantSpecificDirty,
@@ -31,13 +34,6 @@ import {
tenantSpecificCollectionsQuery,
} from "./selectors";
-type UpdateCollectionPermissionParams = {
- groupId: GroupId;
- collection: Collection;
- value: unknown;
- shouldPropagateToChildren: boolean;
-};
-
type TenantSpecificCollectionPermissionsPageProps = {
params: CollectionIdProps["params"];
route: Route;
@@ -86,7 +82,7 @@ function TenantSpecificCollectionPermissionsPageView({
collection,
value,
shouldPropagateToChildren,
- }: UpdateCollectionPermissionParams) => {
+ }: UpdateTenantCollectionPermissionParams) => {
dispatch(
updateTenantSpecificCollectionPermission({
groupId,
@@ -105,17 +101,17 @@ function TenantSpecificCollectionPermissionsPageView({
const handlePermissionChange = useCallback(
(
- item: { id: GroupId },
+ item: PermissionEditorEntity,
_permission: unknown,
value: unknown,
- _toggleState: boolean,
+ _toggleState: boolean | null,
) => {
if (!collection) {
return;
}
// Always propagate to sub-collections for tenant-specific collections
updateCollectionPermission({
- groupId: item.id,
+ groupId: assertNumericId(item.id),
collection: collection as Collection,
value,
shouldPropagateToChildren: true,
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
index f0bd8238243..2e14d44c5c8 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
@@ -7,11 +7,13 @@ import { COLLECTION_OPTIONS } from "metabase/admin/permissions/constants/collect
import { Messages } from "metabase/admin/permissions/constants/messages";
import type {
CollectionIdProps,
- CollectionPermissionEditorType,
CollectionSidebarType,
} from "metabase/admin/permissions/selectors/collection-permissions";
import { getPermissionWarningModal } from "metabase/admin/permissions/selectors/confirmations";
-import type { DataPermissionValue } from "metabase/admin/permissions/types";
+import type {
+ DataPermissionValue,
+ PermissionEditorType,
+} from "metabase/admin/permissions/types";
import { findCollectionById } from "metabase/common/utils/collections";
import {
Collections,
@@ -135,7 +137,7 @@ export const getTenantSpecificCollectionsPermissionEditor = createSelector(
getTenantSpecificCollectionsPermissions,
getTenantSpecificCollectionEntity,
Groups.selectors.getList,
- (permissions, collection, groups): CollectionPermissionEditorType => {
+ (permissions, collection, groups): PermissionEditorType | null => {
if (!permissions || collection == null) {
return null;
}
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
index 91fc46a98b0..261d94538e1 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/index.tsx
@@ -129,25 +129,12 @@ export function initializePlugin() {
<IndexRedirect to="/admin/people/tenants/people" />
<ModalRoute
path="edit"
- // @ts-expect-error - params prop can't be inferred
modal={(props) => <EditUserModal {...props} external />}
noWrap
/>
- <ModalRoute
- path="deactivate"
- // @ts-expect-error - params prop can't be inferred
- modal={UserActivationModal}
- noWrap
- />
- <ModalRoute
- path="reactivate"
- // @ts-expect-error - params prop can't be inferred
- modal={UserActivationModal}
- noWrap
- />
- {/* @ts-expect-error - params prop can't be inferred */}
+ <ModalRoute path="deactivate" modal={UserActivationModal} noWrap />
+ <ModalRoute path="reactivate" modal={UserActivationModal} noWrap />
<ModalRoute path="success" modal={UserSuccessModal} noWrap />
- {/* @ts-expect-error - params prop can't be inferred */}
<ModalRoute path="reset" modal={UserPasswordResetModal} noWrap />
{PLUGIN_ADMIN_USER_MENU_ROUTES.map((getRoutes, index) => (
<Fragment key={index}>{getRoutes()}</Fragment>
diff --git a/frontend/src/metabase-types/api/schema.ts b/frontend/src/metabase-types/api/schema.ts
index c5fee3de340..a6b12a0ae04 100644
--- a/frontend/src/metabase-types/api/schema.ts
+++ b/frontend/src/metabase-types/api/schema.ts
@@ -5,6 +5,7 @@ import type { Dashboard } from "./dashboard";
import type { Database, DatabaseId } from "./database";
import type { Document } from "./document";
import type { Field, FieldDimension, FieldId } from "./field";
+import type { Group } from "./group";
import type { Measure, MeasureId } from "./measure";
import type { Segment, SegmentId } from "./segment";
import type { NativeQuerySnippet } from "./snippets";
@@ -23,6 +24,7 @@ export type NormalizedDashboard = Dashboard;
export type NormalizedDocument = Document;
export type NormalizedCard = Card;
export type NormalizedNativeQuerySnippet = NativeQuerySnippet;
+export type NormalizedGroup = Group;
export interface NormalizedDatabase
extends Omit<Database, "tables" | "schemas"> {
diff --git a/frontend/src/metabase-types/store/admin.ts b/frontend/src/metabase-types/store/admin.ts
index 99233f6f17b..d674821d599 100644
--- a/frontend/src/metabase-types/store/admin.ts
+++ b/frontend/src/metabase-types/store/admin.ts
@@ -26,6 +26,8 @@ export type AdminPath = {
path: string;
};
+export type TemporaryPasswordsState = Record<number, string | null>;
+
export interface AdminState {
app: AdminAppState;
permissions: {
@@ -55,6 +57,9 @@ export interface AdminState {
datamodel: {
revisions: Revision[] | null;
};
+ people: {
+ temporaryPasswords: TemporaryPasswordsState;
+ };
}
export interface AdminAppState {
diff --git a/frontend/src/metabase-types/store/entities.ts b/frontend/src/metabase-types/store/entities.ts
index 7dd249c94b1..63492ad2aa5 100644
--- a/frontend/src/metabase-types/store/entities.ts
+++ b/frontend/src/metabase-types/store/entities.ts
@@ -5,6 +5,7 @@ import type {
NormalizedDatabase,
NormalizedDocument,
NormalizedField,
+ NormalizedGroup,
NormalizedIndexedEntity,
NormalizedMeasure,
NormalizedNativeQuerySnippet,
@@ -28,4 +29,5 @@ export interface EntitiesState {
indexedEntities: Record<string, NormalizedIndexedEntity>;
snippets: Record<string, NormalizedNativeQuerySnippet>;
questions: Record<string, NormalizedCard>;
+ groups: Record<string, NormalizedGroup>;
}
diff --git a/frontend/src/metabase-types/store/mocks/admin.ts b/frontend/src/metabase-types/store/mocks/admin.ts
index 5e35f74959a..cc8be3d813a 100644
--- a/frontend/src/metabase-types/store/mocks/admin.ts
+++ b/frontend/src/metabase-types/store/mocks/admin.ts
@@ -12,6 +12,9 @@ export const createMockAdminState = (
datamodel: {
revisions: null,
},
+ people: {
+ temporaryPasswords: {},
+ },
...opts,
});
diff --git a/frontend/src/metabase-types/store/mocks/entities.ts b/frontend/src/metabase-types/store/mocks/entities.ts
index f2d2e9cd256..c8bb5472cd1 100644
--- a/frontend/src/metabase-types/store/mocks/entities.ts
+++ b/frontend/src/metabase-types/store/mocks/entities.ts
@@ -16,4 +16,5 @@ export const createMockNormalizedEntitiesState = (): EntitiesState => ({
snippets: {},
questions: {},
indexedEntities: {},
+ groups: {},
});
diff --git a/frontend/src/metabase/admin/people/components/Alert.tsx b/frontend/src/metabase/admin/people/components/Alert.tsx
index 78a38a38169..1903635fbf2 100644
--- a/frontend/src/metabase/admin/people/components/Alert.tsx
+++ b/frontend/src/metabase/admin/people/components/Alert.tsx
@@ -32,5 +32,4 @@ const Alert = ({ message, onClose }: AlertProps) => (
</Modal>
);
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Alert;
+export { Alert };
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.tsx b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
index f5c0e252bb5..336ddf89b5e 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.tsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.tsx
@@ -21,7 +21,7 @@ import { PLUGIN_GROUP_MANAGERS, PLUGIN_TENANTS } from "metabase/plugins";
import { Box, Button, Text } from "metabase/ui";
import type { Group, Member, Membership, User } from "metabase-types/api";
-import Alert from "./Alert";
+import { Alert } from "./Alert";
import { GroupMembersTable } from "./GroupMembersTable";
interface GroupDetailProps {
diff --git a/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx b/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx
index b4450dd328f..8907a958ef1 100644
--- a/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/EditUserModal/EditUserModal.tsx
@@ -1,5 +1,4 @@
import { useMemo } from "react";
-import type { Params } from "react-router/lib/Router";
import { t } from "ttag";
import {
@@ -15,7 +14,7 @@ import { UserForm } from "../../forms/UserForm";
interface EditUserModalProps {
onClose: () => void;
- params: Params;
+ params: { userId?: string };
external?: boolean;
}
diff --git a/frontend/src/metabase/admin/people/containers/UserActivationModal.tsx b/frontend/src/metabase/admin/people/containers/UserActivationModal.tsx
index c2342b1b50e..b1b8cad506b 100644
--- a/frontend/src/metabase/admin/people/containers/UserActivationModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserActivationModal.tsx
@@ -9,7 +9,7 @@ import {
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
interface UserActivationModalInnerProps {
- params: { userId: string };
+ params: { userId?: string };
onClose: () => void;
}
@@ -19,7 +19,7 @@ export const UserActivationModal = ({
params,
onClose,
}: UserActivationModalInnerProps) => {
- const userId = parseInt(params.userId, 10);
+ const userId = parseInt(params.userId ?? "", 10);
const { data } = useListUsersQuery({
include_deactivated: true,
tenancy: "all",
diff --git a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
index d87d028baf1..fe2927bc522 100644
--- a/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserPasswordResetModal.tsx
@@ -19,12 +19,12 @@ import type { User } from "metabase-types/api";
import { clearTemporaryPassword } from "../people";
import { getUserTemporaryPassword } from "../selectors";
-interface UserPasswordResetModalProps {
+interface UserPasswordResetModalInnerProps {
clearTemporaryPassword: () => void;
onClose: () => void;
user: User;
emailConfigured: boolean;
- temporaryPassword: string;
+ temporaryPassword: string | null;
}
const UserPasswordResetModalInner = ({
@@ -33,7 +33,7 @@ const UserPasswordResetModalInner = ({
onClose,
temporaryPassword,
user,
-}: UserPasswordResetModalProps) => {
+}: UserPasswordResetModalInnerProps) => {
useUnmount(() => {
clearTemporaryPassword();
});
@@ -91,12 +91,12 @@ const UserPasswordResetModalInner = ({
};
interface UserPasswordResetModalProps {
- params: { userId: string };
+ params: { userId?: string };
onClose: () => void;
}
export const UserPasswordResetModal = (props: UserPasswordResetModalProps) => {
- const userId = parseInt(props.params.userId);
+ const userId = parseInt(props.params.userId ?? "");
const dispatch = useDispatch();
diff --git a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
index 67ff226e258..22095568104 100644
--- a/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
+++ b/frontend/src/metabase/admin/people/containers/UserSuccessModal.tsx
@@ -1,6 +1,5 @@
import cx from "classnames";
import { useEffect } from "react";
-import type { WithRouterProps } from "react-router";
import { push, replace } from "react-router-redux";
import { jt, t } from "ttag";
@@ -19,12 +18,12 @@ import type { User } from "metabase-types/api";
import { clearTemporaryPassword } from "../people";
import { getUserTemporaryPassword } from "../selectors";
-interface UserSuccessModalProps extends WithRouterProps {
- params: { userId: string };
+interface UserSuccessModalProps {
+ params: { userId?: string };
}
export function UserSuccessModal({ params }: UserSuccessModalProps) {
- const userId = parseInt(params.userId);
+ const userId = parseInt(params.userId ?? "");
const { data: user, isLoading, error } = useGetUserQuery(userId);
const isExternalUser = PLUGIN_TENANTS.isExternalUser(user);
diff --git a/frontend/src/metabase/admin/people/events.ts b/frontend/src/metabase/admin/people/events.ts
index 7d1a9f0d5ba..4211c35b579 100644
--- a/frontend/src/metabase/admin/people/events.ts
+++ b/frontend/src/metabase/admin/people/events.ts
@@ -1,5 +1 @@
export const CLEAR_MEMBERSHIPS = "metabase/admin/people/CLEAR_MEMBERSHIPS";
-export const STORE_TEMPORARY_PASSWORD =
- "metabase/admin/people/STORE_TEMPORARY_PASSWORD";
-export const CLEAR_TEMPORARY_PASSWORD =
- "metabase/admin/people/CLEAR_TEMPORARY_PASSWORD";
diff --git a/frontend/src/metabase/admin/people/people.js b/frontend/src/metabase/admin/people/people.js
deleted file mode 100644
index 6e1336880c2..00000000000
--- a/frontend/src/metabase/admin/people/people.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
- combineReducers,
- createAction,
- handleActions,
-} from "metabase/lib/redux";
-
-import { CLEAR_TEMPORARY_PASSWORD, STORE_TEMPORARY_PASSWORD } from "./events";
-
-// ACTION CREATORS
-
-export const clearTemporaryPassword = createAction(CLEAR_TEMPORARY_PASSWORD);
-
-// REDUCERS
-
-const temporaryPasswords = handleActions(
- {
- [STORE_TEMPORARY_PASSWORD]: {
- next: (state, { payload }) => ({
- ...state,
- [payload.id]: payload.password,
- }),
- },
- [CLEAR_TEMPORARY_PASSWORD]: {
- next: (state, { payload }) => ({
- ...state,
- [payload]: null,
- }),
- },
- },
- {},
-);
-
-export const people = combineReducers({ temporaryPasswords });
diff --git a/frontend/src/metabase/admin/people/people.ts b/frontend/src/metabase/admin/people/people.ts
new file mode 100644
index 00000000000..21ba0031d84
--- /dev/null
+++ b/frontend/src/metabase/admin/people/people.ts
@@ -0,0 +1,29 @@
+import { type PayloadAction, createSlice } from "@reduxjs/toolkit";
+
+import { combineReducers } from "metabase/lib/redux";
+import type { TemporaryPasswordsState } from "metabase-types/store";
+
+const initialState: TemporaryPasswordsState = {};
+
+const temporaryPasswordsSlice = createSlice({
+ name: "metabase/admin/people",
+ initialState,
+ reducers: {
+ storeTemporaryPassword: (
+ state,
+ action: PayloadAction<{ id: number; password: string }>,
+ ) => {
+ state[action.payload.id] = action.payload.password;
+ },
+ clearTemporaryPassword: (state, action: PayloadAction<number>) => {
+ state[action.payload] = null;
+ },
+ },
+});
+
+export const { storeTemporaryPassword, clearTemporaryPassword } =
+ temporaryPasswordsSlice.actions;
+
+export const people = combineReducers({
+ temporaryPasswords: temporaryPasswordsSlice.reducer,
+});
diff --git a/frontend/src/metabase/admin/people/selectors.js b/frontend/src/metabase/admin/people/selectors.ts
similarity index 77%
rename from frontend/src/metabase/admin/people/selectors.js
rename to frontend/src/metabase/admin/people/selectors.ts
index 41b554141d8..ced57f1337f 100644
--- a/frontend/src/metabase/admin/people/selectors.js
+++ b/frontend/src/metabase/admin/people/selectors.ts
@@ -4,11 +4,12 @@ import { ACTIVE_USERS_NUDGE_THRESHOLD } from "metabase/admin/people/constants";
import { hasAnySsoFeature } from "metabase/common/utils/plan";
import { getSetting } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
+import type { State } from "metabase-types/store";
-export const getMemberships = (state) => state.admin.people.memberships;
-
-export const getUserTemporaryPassword = (state, props) =>
- state.admin.people.temporaryPasswords[props.userId];
+export const getUserTemporaryPassword = (
+ state: State,
+ props: { userId: number },
+) => state.admin.people.temporaryPasswords[props.userId];
export const shouldNudgeToPro = createSelector(
(state) => getSetting(state, "token-features"),
diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
similarity index 74%
rename from frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx
rename to frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
index dc3abdb0eb0..b395fb960f1 100644
--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx
+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
@@ -1,4 +1,3 @@
-import PropTypes from "prop-types";
import { useCallback, useEffect } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -12,8 +11,11 @@ import { Collections } from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
import { connect, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
+import type { Collection, CollectionNamespace } from "metabase-types/api";
+import type { State } from "metabase-types/store";
import {
+ type UpdateCollectionPermissionParams,
initializeCollectionPermissions,
saveCollectionPermissions,
updateCollectionPermission,
@@ -24,18 +26,28 @@ import {
getCollectionsPermissionEditor,
getIsDirty,
} from "../../selectors/collection-permissions";
-import { permissionEditorPropTypes } from "../PermissionsEditor";
+import type { PermissionEditorEntity, PermissionEditorType } from "../../types";
+import { assertNumericId } from "../../types";
import { PermissionsTable } from "../PermissionsTable";
import S from "./CollectionPermissionsModal.module.css";
-const getDefaultTitle = (namespace) =>
+const getDefaultTitle = (namespace: CollectionNamespace) =>
namespace === "snippets"
? t`Permissions for this folder`
: t`Permissions for this collection`;
-const mapStateToProps = (state, props) => {
+const mapStateToProps = (
+ state: State,
+ props: { params: { slug?: string }; namespace: CollectionNamespace },
+) => {
const collectionId = Urls.extractCollectionId(props.params.slug);
+ if (!collectionId) {
+ return {
+ permissionEditor: null,
+ isDirty: false,
+ };
+ }
return {
permissionEditor: getCollectionsPermissionEditor(state, {
namespace: props.namespace,
@@ -48,7 +60,7 @@ const mapStateToProps = (state, props) => {
collectionsList: Collections.selectors.getList(state, {
entityQuery: { tree: true },
}),
- isDirty: getIsDirty(state, props),
+ isDirty: getIsDirty(state),
};
};
@@ -58,17 +70,19 @@ const mapDispatchToProps = {
saveCollectionPermissions,
};
-const propTypes = {
- permissionEditor: PropTypes.shape(permissionEditorPropTypes),
- namespace: PropTypes.string,
- isDirty: PropTypes.bool,
- onClose: PropTypes.func.isRequired,
- collection: PropTypes.object,
- collectionsList: PropTypes.arrayOf(PropTypes.object),
- initialize: PropTypes.func.isRequired,
- updateCollectionPermission: PropTypes.func.isRequired,
- saveCollectionPermissions: PropTypes.func.isRequired,
-};
+interface CollectionPermissionsModalProps {
+ permissionEditor: PermissionEditorType | null;
+ isDirty: boolean;
+ onClose: () => void;
+ namespace: CollectionNamespace;
+ collection?: Collection;
+ collectionsList?: Collection[];
+ initialize: (namespace: CollectionNamespace) => void;
+ updateCollectionPermission: (
+ params: UpdateCollectionPermissionParams,
+ ) => void;
+ saveCollectionPermissions: (namespace: CollectionNamespace) => void;
+}
const CollectionPermissionsModal = ({
permissionEditor,
@@ -81,7 +95,7 @@ const CollectionPermissionsModal = ({
initialize,
updateCollectionPermission,
saveCollectionPermissions,
-}) => {
+}: CollectionPermissionsModalProps) => {
const originalPermissionsState = useSelector(
({ admin }) => admin.permissions.originalCollectionPermissions,
);
@@ -96,7 +110,7 @@ const CollectionPermissionsModal = ({
(collection.personal_owner_id ||
isPersonalCollectionChild(collection, collectionsList));
- if (isPersonalCollectionLoaded || collection.archived) {
+ if (isPersonalCollectionLoaded || collection?.archived) {
onClose();
}
}, [collectionsList, collection, onClose]);
@@ -111,9 +125,17 @@ const CollectionPermissionsModal = ({
: getDefaultTitle(namespace);
const handlePermissionChange = useCallback(
- (item, _permission, value, toggleState) => {
+ (
+ item: PermissionEditorEntity,
+ _permission: unknown,
+ value: unknown,
+ toggleState: boolean | null,
+ ) => {
+ if (!collection) {
+ return;
+ }
updateCollectionPermission({
- groupId: item.id,
+ groupId: assertNumericId(item.id),
collection,
value,
shouldPropagateToChildren: toggleState,
@@ -158,8 +180,6 @@ const CollectionPermissionsModal = ({
);
};
-CollectionPermissionsModal.propTypes = propTypes;
-
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default _.compose(
Collections.loadList({
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsConfirm.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsConfirm.tsx
similarity index 86%
rename from frontend/src/metabase/admin/permissions/components/PermissionsConfirm.jsx
rename to frontend/src/metabase/admin/permissions/components/PermissionsConfirm.tsx
index 2ad013e0452..a023087ad75 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsConfirm.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsConfirm.tsx
@@ -1,19 +1,31 @@
-/* eslint-disable react/prop-types */
import { jt, msgid, ngettext, t } from "ttag";
+import type {
+ DatabasePermissionsDiff,
+ GroupPermissionsDiff,
+ PermissionsGraphDiff,
+} from "metabase/admin/permissions/types";
import { DataPermissionValue } from "metabase/admin/permissions/types";
import CS from "metabase/css/core/index.css";
import { Tooltip } from "metabase/ui";
-const GroupName = ({ group }) => (
+const GroupName = ({ group }: { group: GroupPermissionsDiff }) => (
<span className={CS.textBrand}>{group.name}</span>
);
-const DatabaseName = ({ database }) => (
+const DatabaseName = ({ database }: { database: DatabasePermissionsDiff }) => (
<span className={CS.textBrand}>{database.name}</span>
);
-const TableAccessChange = ({ tables, verb, colorClassName }) => {
+const TableAccessChange = ({
+ tables,
+ verb,
+ colorClassName,
+}: {
+ tables: NonNullable<DatabasePermissionsDiff["grantedTables"]>;
+ verb: string;
+ colorClassName: string;
+}) => {
const tableEntries = Object.entries(tables);
return (
<span>
@@ -40,7 +52,11 @@ const TableAccessChange = ({ tables, verb, colorClassName }) => {
);
};
-export const PermissionsConfirm = ({ diff }) => (
+export const PermissionsConfirm = ({
+ diff,
+}: {
+ diff: PermissionsGraphDiff;
+}) => (
<div>
{Object.values(diff.groups).map((group, groupIndex) =>
Object.values(group.databases).map((database, databaseIndex) => (
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.tsx
similarity index 66%
rename from frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsx
rename to frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.tsx
index d173065b912..fdd40b65e3c 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.tsx
@@ -1,5 +1,3 @@
-import PropTypes from "prop-types";
-
import { UpsellPermissions } from "metabase/admin/upsells";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { Box } from "metabase/ui";
@@ -7,16 +5,19 @@ import { Box } from "metabase/ui";
import S from "./PermissionsEditor.module.css";
import {
PermissionsEditorContent,
- permissionEditorContentPropTypes,
+ type PermissionsEditorContentProps,
} from "./PermissionsEditorContent";
-export const permissionEditorPropTypes = {
- isLoading: PropTypes.bool,
- error: PropTypes.string,
- ...permissionEditorContentPropTypes,
-};
+interface PermissionsEditorProps extends PermissionsEditorContentProps {
+ isLoading?: boolean;
+ error?: string;
+}
-export const PermissionsEditor = ({ isLoading, error, ...contentProps }) => {
+export const PermissionsEditor = ({
+ isLoading,
+ error,
+ ...contentProps
+}: PermissionsEditorProps) => {
return (
<div className={S.PermissionsEditorRoot}>
<LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper>
@@ -30,5 +31,3 @@ export const PermissionsEditor = ({ isLoading, error, ...contentProps }) => {
</div>
);
};
-
-PermissionsEditor.propTypes = permissionEditorPropTypes;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx
index 341b5fcbdb2..1b69c2502e3 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorBreadcrumbs.tsx
@@ -2,19 +2,16 @@ import { Fragment } from "react";
import { Icon, Text } from "metabase/ui";
+import type { PermissionEditorBreadcrumb } from "../../types";
+
import {
BreadcrumbsLink,
BreadcrumbsSeparator,
} from "./PermissionsEditorBreadcrumbs.styled";
-interface BreadcrumbItem {
- text: string;
- subtext?: string;
-}
-
-interface PermissionsEditorBreadcrumbsProps {
- items: BreadcrumbItem[];
- onBreadcrumbsItemSelect: (item: BreadcrumbItem) => void;
+export interface PermissionsEditorBreadcrumbsProps {
+ items: PermissionEditorBreadcrumb[];
+ onBreadcrumbsItemSelect: (item: PermissionEditorBreadcrumb) => void;
}
export const PermissionsEditorBreadcrumbs = ({
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
similarity index 77%
rename from frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx
rename to frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
index c0f7598e399..cbebe6e293a 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorContent.tsx
@@ -1,4 +1,3 @@
-import PropTypes from "prop-types";
import { useMemo, useState } from "react";
import { t } from "ttag";
@@ -9,7 +8,14 @@ import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { Text } from "metabase/ui";
-import { PermissionsTable } from "../PermissionsTable";
+import type {
+ PermissionEditorBreadcrumb,
+ PermissionEditorType,
+} from "../../types";
+import {
+ PermissionsTable,
+ type PermissionsTableProps,
+} from "../PermissionsTable";
import { PermissionsEditorBreadcrumbs } from "./PermissionsEditorBreadcrumbs";
import {
@@ -19,20 +25,12 @@ import {
PermissionTableWrapper,
} from "./PermissionsEditorContent.styled";
-export const permissionEditorContentPropTypes = {
- title: PropTypes.string.isRequired,
- description: PropTypes.string,
- columns: PropTypes.array,
- entities: PropTypes.array,
- filterPlaceholder: PropTypes.string.isRequired,
- onChange: PropTypes.func,
- onSelect: PropTypes.func,
- onAction: PropTypes.func,
- onBreadcrumbsItemSelect: PropTypes.func,
- breadcrumbs: PropTypes.array,
- postHeaderContent: PropTypes.func,
- preHeaderContent: PropTypes.func,
-};
+export type PermissionsEditorContentProps = PermissionEditorType &
+ Pick<PermissionsTableProps, "onChange" | "onSelect" | "onAction"> & {
+ onBreadcrumbsItemSelect?: (item: PermissionEditorBreadcrumb) => void;
+ postHeaderContent?: React.FC;
+ preHeaderContent?: React.FC;
+ };
export function PermissionsEditorContent({
title,
@@ -47,7 +45,7 @@ export function PermissionsEditorContent({
onAction,
postHeaderContent: PostHeaderContent = () => null,
preHeaderContent: PreHeaderContent = () => null,
-}) {
+}: PermissionsEditorContentProps) {
const [filter, setFilter] = useState("");
const debouncedFilter = useDebouncedValue(filter, SEARCH_DEBOUNCE_DURATION);
@@ -63,14 +61,15 @@ export function PermissionsEditorContent({
);
}, [entities, debouncedFilter]);
- const handleFilterChange = (e) => setFilter(e.target.value);
+ const handleFilterChange = (e: React.ChangeEvent<HTMLInputElement>) =>
+ setFilter(e.target.value);
return (
<PermissionEditorContentRoot data-testid="permissions-editor">
<PreHeaderContent />
<Subhead data-testid="permissions-editor-breadcrumbs">
{title}{" "}
- {breadcrumbs && (
+ {breadcrumbs && onBreadcrumbsItemSelect && (
<PermissionsEditorBreadcrumbs
items={breadcrumbs}
onBreadcrumbsItemSelect={onBreadcrumbsItemSelect}
@@ -89,7 +88,7 @@ export function PermissionsEditorContent({
onChange={handleFilterChange}
onResetClick={() => setFilter("")}
value={filter}
- leftSection="search"
+ leftIcon="search"
/>
</EditorFilterContainer>
@@ -110,5 +109,3 @@ export function PermissionsEditorContent({
</PermissionEditorContentRoot>
);
}
-
-PermissionsEditorContent.propTypes = permissionEditorContentPropTypes;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx
similarity index 77%
rename from frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.jsx
rename to frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx
index e001d493d95..3ae7c899c2b 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsEditBar.tsx
@@ -1,22 +1,27 @@
import { useDisclosure } from "@mantine/hooks";
import cx from "classnames";
-import PropTypes from "prop-types";
import { t } from "ttag";
+import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";
import { Button } from "metabase/common/components/Button";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { EditBar } from "metabase/common/components/EditBar";
import { PermissionsConfirm } from "../PermissionsConfirm";
-const propTypes = {
- diff: PropTypes.object,
- isDirty: PropTypes.bool.isRequired,
- onCancel: PropTypes.func.isRequired,
- onSave: PropTypes.func.isRequired,
-};
+interface PermissionsEditBarProps {
+ diff?: PermissionsGraphDiff;
+ isDirty: boolean;
+ onCancel: () => void;
+ onSave?: () => void;
+}
-export function PermissionsEditBar({ diff, isDirty, onCancel, onSave }) {
+export function PermissionsEditBar({
+ diff,
+ isDirty,
+ onCancel,
+ onSave,
+}: PermissionsEditBarProps) {
const [modelOpened, { open: openModal, close: closeModal }] = useDisclosure();
const saveButton = (
<Button
@@ -44,7 +49,7 @@ export function PermissionsEditBar({ diff, isDirty, onCancel, onSave }) {
opened={modelOpened}
content={diff ? <PermissionsConfirm diff={diff} /> : null}
onConfirm={() => {
- onSave();
+ onSave?.();
closeModal();
}}
onClose={closeModal}
@@ -52,5 +57,3 @@ export function PermissionsEditBar({ diff, isDirty, onCancel, onSave }) {
</>
);
}
-
-PermissionsEditBar.propTypes = propTypes;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
index 9a022fb213d..46e7b9ffe0f 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.tsx
@@ -14,6 +14,7 @@ import {
ToolbarButtonsContainer,
} from "metabase/admin/permissions/components/PermissionsPageLayout/PermissionsPageLayout.styled";
import { getIsHelpReferenceOpen } from "metabase/admin/permissions/selectors/help-reference";
+import type { PermissionsGraphDiff } from "metabase/admin/permissions/types";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";
import { useToggle } from "metabase/common/hooks/use-toggle";
@@ -27,7 +28,6 @@ import {
Modal as NewModal,
Text,
} from "metabase/ui";
-import type { PermissionsGraph } from "metabase-types/api";
import {
clearSaveError as clearPermissionsSaveError,
@@ -50,7 +50,7 @@ type PermissionsPageLayoutProps = {
children: ReactNode;
tab: PermissionsPageTab;
confirmBar?: ReactNode;
- diff?: PermissionsGraph;
+ diff?: PermissionsGraphDiff;
isDirty?: boolean;
onSave?: () => void;
onLoad?: () => void;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx
index b6aaaa93278..a474d25a9ee 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.styled.tsx
@@ -56,16 +56,18 @@ export const ToggleLabel = styled.label`
`;
export const WarningIcon = styled(
- forwardRef<SVGSVGElement, IconProps>(function WarningIcon(props, ref) {
- return (
- <Icon
- {...props}
- size={props.size ?? 18}
- name={props.name ?? "warning"}
- ref={ref}
- />
- );
- }),
+ forwardRef<SVGSVGElement, Partial<IconProps>>(
+ function WarningIcon(props, ref) {
+ return (
+ <Icon
+ {...props}
+ size={props.size ?? 18}
+ name={props.name ?? "warning"}
+ ref={ref}
+ />
+ );
+ },
+ ),
)`
margin-right: 0.25rem;
color: var(--mb-color-text-tertiary);
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
similarity index 73%
rename from frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx
rename to frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
index e4d573b954d..69a0ea769a9 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.tsx
@@ -1,9 +1,14 @@
-import PropTypes from "prop-types";
import { Fragment, memo, useState } from "react";
import { Toggle } from "metabase/common/components/Toggle";
-import { lighten } from "metabase/lib/colors";
-import { Icon, Popover, Tooltip } from "metabase/ui";
+import type { ColorName } from "metabase/lib/colors/types";
+import { Icon, type IconName, Popover, Tooltip } from "metabase/ui";
+
+import type {
+ DataPermissionValue,
+ PermissionAction,
+ PermissionSectionConfig,
+} from "../../types";
import {
ActionsList,
@@ -18,20 +23,17 @@ import {
} from "./PermissionsSelect.styled";
import { PermissionsSelectOption } from "./PermissionsSelectOption";
-const propTypes = {
- options: PropTypes.arrayOf(PropTypes.object).isRequired,
- actions: PropTypes.object,
- value: PropTypes.string.isRequired,
- toggleLabel: PropTypes.string,
- hasChildren: PropTypes.bool,
- toggleDisabled: PropTypes.bool,
- toggleDefaultValue: PropTypes.bool,
- onChange: PropTypes.func.isRequired,
- onAction: PropTypes.func,
- isDisabled: PropTypes.bool,
- isHighlighted: PropTypes.bool,
- disabledTooltip: PropTypes.string,
- warning: PropTypes.string,
+interface PermissionSelectProps extends PermissionSectionConfig {
+ onChange: (value: DataPermissionValue, toggleState: boolean | null) => void;
+ onAction?: (action: PermissionAction) => void;
+}
+
+// we shouldn't ever show this, but rather than throw an error, let the user pick an option to recover
+const defaultOption = {
+ label: "Missing",
+ value: "missing" as DataPermissionValue,
+ icon: "empty" as IconName,
+ iconColor: "text-tertiary" as ColorName,
};
export const PermissionsSelect = memo(function PermissionsSelect({
@@ -48,19 +50,23 @@ export const PermissionsSelect = memo(function PermissionsSelect({
disabledTooltip,
warning,
isHighlighted,
-}) {
+}: PermissionSelectProps) {
const [toggleState, setToggleState] = useState(toggleDefaultValue ?? null);
const [opened, setOpened] = useState(false);
- const selectedOption = options.find((option) => option.value === value);
+ let selectedOption = options.find((option) => option.value === value);
+ if (!selectedOption) {
+ console.warn(`${value} is not a valid option`);
+ selectedOption = { ...defaultOption };
+ }
const selectableOptions = hasChildren
? options
: options.filter((option) => option !== selectedOption);
- const onToggleChange = (checked) => {
+ const onToggleChange = (checked: boolean) => {
setToggleState(checked);
onChange(selectedOption.value, checked);
};
- const actionsForCurrentValue = actions?.[selectedOption?.value] || [];
+ const actionsForCurrentValue = actions?.[selectedOption.value] || [];
const hasActions = actionsForCurrentValue.length > 0;
return (
@@ -76,7 +82,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({
{isDisabled ? (
<DisabledPermissionOption
{...selectedOption}
- isHighlighted={isHighlighted}
+ isHighlighted={isHighlighted ?? false}
hint={disabledTooltip}
iconColor="text-tertiary"
/>
@@ -94,7 +100,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({
style={{ visibility: isDisabled ? "hidden" : "visible" }}
name="chevrondown"
size={16}
- color={lighten("text-tertiary", 0.15)}
+ c="text-tertiary"
/>
</PermissionsSelectRoot>
</Popover.Target>
@@ -122,7 +128,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({
role="option"
onClick={() => {
setOpened(false);
- onAction(action);
+ onAction?.(action);
}}
>
<PermissionsSelectOption {...action} />
@@ -138,7 +144,7 @@ export const PermissionsSelect = memo(function PermissionsSelect({
small
value={toggleState || false}
onChange={onToggleChange}
- disabled={toggleDisabled}
+ disabled={toggleDisabled ?? false}
/>
</ToggleContainer>
)}
@@ -147,5 +153,3 @@ export const PermissionsSelect = memo(function PermissionsSelect({
</Popover>
);
});
-
-PermissionsSelect.propTypes = propTypes;
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx
index 24eb99bebdb..92cd7213b27 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelectOption.tsx
@@ -1,8 +1,8 @@
-import type { ReactNode } from "react";
import { useState } from "react";
-import type { ColorName } from "metabase/lib/colors/types";
-import { Icon, type IconName, Tooltip } from "metabase/ui";
+import { Icon, Tooltip } from "metabase/ui";
+
+import type { PermissionOption } from "../../types";
import {
IconContainer,
@@ -10,12 +10,9 @@ import {
PermissionsSelectOptionRoot,
} from "./PermissionsSelectOption.styled";
-interface PermissionsSelectOptionProps {
- label: ReactNode;
- icon: IconName;
- iconColor: ColorName;
+interface PermissionsSelectOptionProps extends Omit<PermissionOption, "value"> {
className?: string;
- hint?: string;
+ hint?: string | null;
}
export function PermissionsSelectOption({
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx
index a4cf24d801b..15442addc53 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.styled.tsx
@@ -86,7 +86,7 @@ export const EntityNameLink = styled(Link)`
`;
export const HintIcon = styled(
- forwardRef<SVGSVGElement, IconProps>(function HintIcon(props, ref) {
+ forwardRef<SVGSVGElement, Partial<IconProps>>(function HintIcon(props, ref) {
return (
<Icon
{...props}
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx
similarity index 72%
rename from frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.jsx
rename to frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx
index 3a403f30413..ba713d525b2 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.jsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsTable/PermissionsTable.tsx
@@ -1,5 +1,4 @@
import cx from "classnames";
-import PropTypes from "prop-types";
import { useRef, useState } from "react";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
@@ -7,6 +6,14 @@ import { Ellipsified } from "metabase/common/components/Ellipsified";
import CS from "metabase/css/core/index.css";
import { Flex, Text, Tooltip } from "metabase/ui";
+import type {
+ DataPermissionValue,
+ PermissionAction,
+ PermissionConfirmationProps,
+ PermissionEditorEntity,
+ PermissionEditorType,
+ PermissionSectionConfig,
+} from "../../types";
import { PermissionsSelect } from "../PermissionsSelect";
import {
@@ -19,19 +26,19 @@ import {
PermissionsTableRow,
} from "./PermissionsTable.styled";
-const propTypes = {
- entities: PropTypes.arrayOf(PropTypes.object),
- columns: PropTypes.arrayOf(
- PropTypes.shape({
- name: PropTypes.string.isRequired,
- hint: PropTypes.string,
- }),
- ),
- emptyState: PropTypes.node,
- onSelect: PropTypes.func,
- onChange: PropTypes.func,
- onAction: PropTypes.func,
- colorScheme: PropTypes.oneOf(["default", "admin"]),
+export type PermissionsTableProps = Pick<
+ PermissionEditorType,
+ "entities" | "columns"
+> & {
+ onSelect?: (entity: PermissionEditorEntity) => void;
+ onAction?: (action: PermissionAction, entity: PermissionEditorEntity) => void;
+ onChange: (
+ entity: PermissionEditorEntity,
+ permission: PermissionSectionConfig,
+ value: DataPermissionValue,
+ toggleState: boolean | null,
+ ) => void;
+ emptyState?: React.ReactNode;
};
export function PermissionsTable({
@@ -40,18 +47,24 @@ export function PermissionsTable({
onSelect,
onAction,
onChange,
- colorScheme,
emptyState = null,
-}) {
- const [confirmations, setConfirmations] = useState([]);
- const confirmActionRef = useRef(null);
+}: PermissionsTableProps) {
+ const [confirmations, setConfirmations] = useState<
+ PermissionConfirmationProps[]
+ >([]);
+ const confirmActionRef = useRef<(() => void) | null>(null);
- const handleChange = (value, toggleState, entity, permission) => {
+ const handleChange = (
+ value: DataPermissionValue,
+ toggleState: boolean | null,
+ entity: PermissionEditorEntity,
+ permission: PermissionSectionConfig,
+ ) => {
const confirmAction = () =>
onChange(entity, permission, value, toggleState);
const confirmations =
- permission.confirmations?.(value).filter(Boolean) || [];
+ permission.confirmations?.(value).filter((c) => c !== undefined) || [];
if (confirmations.length > 0) {
setConfirmations(confirmations);
@@ -64,7 +77,7 @@ export function PermissionsTable({
const handleConfirm = () => {
setConfirmations((prev) => prev.slice(1));
if (confirmations.length === 1) {
- confirmActionRef.current();
+ confirmActionRef.current?.();
confirmActionRef.current = null;
}
};
@@ -120,7 +133,10 @@ export function PermissionsTable({
>
<PermissionsTableCell>
{entity.canSelect ? (
- <EntityNameLink onClick={() => onSelect(entity)}>
+ // @ts-expect-error - Link expects a `to` prop, but we don't have one. maybe this should be a button?
+ <EntityNameLink //force line break so we can type check next line
+ onClick={() => onSelect?.(entity)}
+ >
{entityName}
</EntityNameLink>
) : (
@@ -134,7 +150,7 @@ export function PermissionsTable({
)}
</PermissionsTableCell>
- {entity.permissions.map((permission, index) => {
+ {entity.permissions?.map((permission, index) => {
return (
<PermissionsTableCell
key={permission.type ?? String(index)}
@@ -144,10 +160,7 @@ export function PermissionsTable({
onChange={(value, toggleState) =>
handleChange(value, toggleState, entity, permission)
}
- onAction={(actionCreator) =>
- onAction(actionCreator, entity)
- }
- colorScheme={colorScheme}
+ onAction={(action) => onAction?.(action, entity)}
/>
</PermissionsTableCell>
);
@@ -167,5 +180,3 @@ export function PermissionsTable({
</>
);
}
-
-PermissionsTable.propTypes = propTypes;
diff --git a/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts b/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts
index 5a257828269..b24638b51e5 100644
--- a/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts
+++ b/frontend/src/metabase/admin/permissions/constants/collections-permissions.ts
@@ -1,22 +1,24 @@
/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
import { t } from "ttag";
-export const COLLECTION_OPTIONS = {
+import { DataPermissionValue, type PermissionOption } from "../types";
+
+export const COLLECTION_OPTIONS: Record<string, PermissionOption> = {
write: {
label: t`Curate`,
- value: "write",
+ value: DataPermissionValue.WRITE,
icon: "check",
iconColor: "success",
},
read: {
label: t`View`,
- value: "read",
+ value: DataPermissionValue.READ,
icon: "eye",
iconColor: "warning",
},
none: {
label: t`No access`,
- value: "none",
+ value: DataPermissionValue.NONE,
icon: "close",
iconColor: "danger",
},
diff --git a/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx b/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx
index 9d90fc19781..e83b3d30bd2 100644
--- a/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/constants/data-permissions.tsx
@@ -1,9 +1,9 @@
/* eslint-disable ttag/no-module-declaration -- see metabase#55045 */
import { t } from "ttag";
-import { DataPermissionValue } from "../types";
+import { DataPermissionValue, type PermissionOption } from "../types";
-export const DATA_PERMISSION_OPTIONS = {
+export const DATA_PERMISSION_OPTIONS: Record<string, PermissionOption> = {
unrestricted: {
label: t`Can view`,
value: DataPermissionValue.UNRESTRICTED,
diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
index fbecd87d2d7..9746a963345 100644
--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
@@ -8,12 +8,7 @@ import { CollectionPermissionsHelp } from "metabase/admin/permissions/components
import { Collections } from "metabase/entities/collections";
import { Groups } from "metabase/entities/groups";
import { connect, useSelector } from "metabase/lib/redux";
-import type {
- Collection,
- CollectionId,
- CollectionPermissions,
- GroupId,
-} from "metabase-types/api";
+import type { Collection, CollectionId } from "metabase-types/api";
import type { State } from "metabase-types/store";
import {
@@ -23,6 +18,7 @@ import {
import { PermissionsPageLayout } from "../../components/PermissionsPageLayout";
import { PermissionsSidebar } from "../../components/PermissionsSidebar";
import {
+ type UpdateCollectionPermissionParams,
initializeCollectionPermissions,
loadCollectionPermissions,
saveCollectionPermissions,
@@ -30,7 +26,6 @@ import {
} from "../../permissions";
import type {
CollectionIdProps,
- CollectionPermissionEditorType,
CollectionSidebarType,
} from "../../selectors/collection-permissions";
import {
@@ -40,6 +35,8 @@ import {
getCollectionsSidebar,
getIsDirty,
} from "../../selectors/collection-permissions";
+import type { PermissionEditorEntity, PermissionEditorType } from "../../types";
+import { assertNumericId } from "../../types";
const mapDispatchToProps = {
initialize: initializeCollectionPermissions,
@@ -59,18 +56,10 @@ const mapStateToProps = (state: State, props: CollectionIdProps) => {
};
};
-type UpdateCollectionPermissionParams = {
- groupId: GroupId;
- collection: Collection;
- value: unknown;
- shouldPropagateToChildren: boolean | null;
- originalPermissionsState: CollectionPermissions;
-};
-
type CollectionPermissionsPageProps = {
params: CollectionIdProps["params"];
sidebar: CollectionSidebarType;
- permissionEditor: CollectionPermissionEditorType;
+ permissionEditor: PermissionEditorType | null;
collection: Collection;
navigateToItem: (item: any) => void;
updateCollectionPermission: ({
@@ -108,13 +97,13 @@ function CollectionsPermissionsPageView({
const handlePermissionChange = useCallback(
(
- item: { id: GroupId },
+ item: PermissionEditorEntity,
_permission: unknown,
value: unknown,
toggleState: boolean | null,
) => {
updateCollectionPermission({
- groupId: item.id,
+ groupId: assertNumericId(item.id),
collection,
value,
shouldPropagateToChildren: toggleState,
diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
index 722e82fdbf5..4d5316e09ae 100644
--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
@@ -9,15 +9,14 @@ import { Groups } from "metabase/entities/groups";
import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";
import { useDispatch, useSelector } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
-import { PermissionsApi } from "metabase/services";
import { Center, Loader } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
-import type { DatabaseId, Group, PermissionsGraph } from "metabase-types/api";
+import type { DatabaseId, Group } from "metabase-types/api";
import { DataPermissionsHelp } from "../../components/DataPermissionsHelp";
import { PermissionsPageLayout } from "../../components/PermissionsPageLayout/PermissionsPageLayout";
import {
- LOAD_DATA_PERMISSIONS_FOR_GROUP,
+ loadDataPermissionsForGroup,
restoreLoadedPermissions,
saveDataPermissions,
} from "../../permissions";
@@ -52,18 +51,12 @@ function DataPermissionsPage({
const { loading: isLoadingAllUsers } = useAsync(async () => {
const allUsers = groups.find(isDefaultGroup);
- const result = await PermissionsApi.graphForGroup({
- groupId: allUsers?.id,
- });
- await dispatch({ type: LOAD_DATA_PERMISSIONS_FOR_GROUP, payload: result });
+ await dispatch(loadDataPermissionsForGroup(allUsers?.id));
}, []);
const { loading: isLoadingAdminstrators } = useAsync(async () => {
const admins = groups.find(isAdminGroup);
- const result = await PermissionsApi.graphForGroup({
- groupId: admins?.id,
- });
- await dispatch({ type: LOAD_DATA_PERMISSIONS_FOR_GROUP, payload: result });
+ await dispatch(loadDataPermissionsForGroup(admins?.id));
}, []);
const { isLoading: isLoadingTables } = useGetDatabaseMetadataQuery(
@@ -90,7 +83,7 @@ function DataPermissionsPage({
tab="data"
onLoad={resetPermissions}
onSave={savePermissions}
- diff={diff as PermissionsGraph}
+ diff={diff}
isDirty={isDirty}
route={route}
helpContent={<DataPermissionsHelp />}
diff --git a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.jsx b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx
similarity index 60%
rename from frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.jsx
rename to frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx
index b82cf41ceb3..5698dde7e08 100644
--- a/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.jsx
+++ b/frontend/src/metabase/admin/permissions/pages/DatabasePermissionsPage/DatabasesPermissionsPage.tsx
@@ -1,6 +1,4 @@
-import { bindActionCreators } from "@reduxjs/toolkit";
-import PropTypes from "prop-types";
-import { Fragment, useCallback } from "react";
+import { Fragment, type ReactNode, useCallback } from "react";
import { push } from "react-router-redux";
import { useAsync } from "react-use";
import { t } from "ttag";
@@ -10,8 +8,8 @@ import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/perm
import { connect, useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
-import { PermissionsApi } from "metabase/services";
import { Center, Loader } from "metabase/ui";
+import type { State } from "metabase-types/store";
import {
PermissionsEditor,
@@ -20,35 +18,45 @@ import {
import { PermissionsEditorSplitPermsMessage } from "../../components/PermissionsEditor/PermissionsEditorSplitPermsMessage";
import { PermissionsSidebar } from "../../components/PermissionsSidebar";
import {
- LOAD_DATA_PERMISSIONS_FOR_DB,
+ type UpdateDataPermissionParams,
+ loadDataPermissionsForDb,
updateDataPermission,
} from "../../permissions";
import {
+ type DataSidebarProps,
+ 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 {
DATABASES_BASE_PATH,
getDatabaseFocusPermissionsUrl,
} from "../../utils/urls";
-const mapDispatchToProps = (dispatch) => ({
- dispatch,
- ...bindActionCreators(
- {
- updateDataPermission,
- switchView: (entityType) => push(`/admin/permissions/data/${entityType}`),
- navigateToDatabaseList: () => push(DATABASES_BASE_PATH),
- navigateToItem: (item) =>
- push(getDatabaseFocusPermissionsUrl(item.entityId)),
- },
- dispatch,
- ),
-});
+const mapDispatchToProps = {
+ updateDataPermission,
+ switchView: (entityType: string) =>
+ push(`/admin/permissions/data/${entityType}`),
+ navigateToDatabaseList: () => push(DATABASES_BASE_PATH),
+ navigateToItem: (item: DataTreeNodeItem) =>
+ push(getDatabaseFocusPermissionsUrl(item.entityId)),
+};
-const mapStateToProps = (state, props) => {
+const mapStateToProps = (
+ state: State,
+ props: { params: RawDataRouteParams },
+) => {
return {
sidebar: getDataFocusSidebar(state, props),
isSidebarLoading: getIsLoadingDatabaseTables(state, props),
@@ -56,21 +64,17 @@ const mapStateToProps = (state, props) => {
};
};
-const propTypes = {
- params: PropTypes.shape({
- databaseId: PropTypes.string,
- schemaName: PropTypes.string,
- tableId: PropTypes.string,
- }),
- children: PropTypes.node,
- sidebar: PropTypes.object,
- navigateToItem: PropTypes.func.isRequired,
- switchView: PropTypes.func.isRequired,
- updateDataPermission: PropTypes.func.isRequired,
- navigateToDatabaseList: PropTypes.func.isRequired,
- isSidebarLoading: PropTypes.bool,
- sidebarError: PropTypes.string,
-};
+interface DatabasesPermissionsPageInnerProps {
+ sidebar: DataSidebarProps | null;
+ params: RawDataRouteParams;
+ children: ReactNode;
+ navigateToItem: (item: any) => void;
+ navigateToDatabaseList: () => void;
+ switchView: (entityType: string) => void;
+ updateDataPermission: (params: UpdateDataPermissionParams) => void;
+ isSidebarLoading: boolean | undefined;
+ sidebarError: string | undefined;
+}
function DatabasesPermissionsPageInner({
sidebar,
@@ -82,10 +86,11 @@ function DatabasesPermissionsPageInner({
updateDataPermission,
isSidebarLoading,
sidebarError,
-}) {
+}: DatabasesPermissionsPageInnerProps) {
+ const dataRouteParams = parseDataRouteParams(params);
const dispatch = useDispatch();
const permissionEditor = useSelector((state) =>
- getGroupsDataPermissionEditor(state, { params }),
+ getGroupsDataPermissionEditor(state, { params: dataRouteParams }),
);
const showSplitPermsMessage = useSelector((state) =>
@@ -93,28 +98,29 @@ function DatabasesPermissionsPageInner({
);
const { loading: isLoading } = useAsync(async () => {
- if (params.databaseId) {
- const response = await PermissionsApi.graphForDB({
- databaseId: params.databaseId,
- });
- await dispatch({
- type: LOAD_DATA_PERMISSIONS_FOR_DB,
- payload: response,
- });
+ if (dataRouteParams.databaseId) {
+ await dispatch(loadDataPermissionsForDb(dataRouteParams.databaseId));
}
- }, [params.databaseId]);
+ }, [dataRouteParams.databaseId]);
const handleEntityChange = useCallback(
- (entityType) => {
+ (entityType: string) => {
switchView(entityType);
},
[switchView],
);
const handlePermissionChange = useCallback(
- async (item, permission, value) => {
- await updateDataPermission({
- groupId: item.id,
+ (
+ item: PermissionEditorEntity,
+ permission: PermissionSectionConfig,
+ value: DataPermissionValue,
+ ) => {
+ if (!item.entityId) {
+ return;
+ }
+ updateDataPermission({
+ groupId: assertNumericId(item.id),
permission,
value,
entityId: item.entityId,
@@ -124,11 +130,20 @@ function DatabasesPermissionsPageInner({
[updateDataPermission],
);
- const handleAction = (action, item) => {
- dispatch(action.actionCreator(item.entityId, item.id, "database"));
+ const handleAction = (
+ action: PermissionAction,
+ item: PermissionEditorEntity,
+ ) => {
+ dispatch(
+ action.actionCreator(item.entityId, assertNumericId(item.id), "database"),
+ );
};
- const handleBreadcrumbsItemSelect = (item) => dispatch(push(item.url));
+ const handleBreadcrumbsItemSelect = (item: PermissionEditorBreadcrumb) => {
+ if (item.url) {
+ dispatch(push(item.url));
+ }
+ };
const showLegacyNoSelfServiceWarning =
PLUGIN_ADVANCED_PERMISSIONS.shouldShowViewDataColumn &&
@@ -137,11 +152,11 @@ function DatabasesPermissionsPageInner({
return (
<Fragment>
<PermissionsSidebar
- {...sidebar}
+ {...(sidebar ?? { entityGroups: [], filterPlaceholder: "" })}
error={sidebarError}
isLoading={isSidebarLoading}
onSelect={navigateToItem}
- onBack={params.databaseId == null ? null : navigateToDatabaseList}
+ onBack={params.databaseId == null ? undefined : navigateToDatabaseList}
onEntityChange={handleEntityChange}
/>
{isLoading && (
@@ -182,8 +197,6 @@ function DatabasesPermissionsPageInner({
);
}
-DatabasesPermissionsPageInner.propTypes = propTypes;
-
export const DatabasesPermissionsPage = _.compose(
connect(mapStateToProps, mapDispatchToProps),
)(DatabasesPermissionsPageInner);
diff --git a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.jsx b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx
similarity index 55%
rename from frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.jsx
rename to frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx
index ea8ad57e360..e4cd40a9ee4 100644
--- a/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.jsx
+++ b/frontend/src/metabase/admin/permissions/pages/GroupDataPermissionsPage/GroupsPermissionsPage.tsx
@@ -1,6 +1,4 @@
-import { bindActionCreators } from "@reduxjs/toolkit";
-import PropTypes from "prop-types";
-import { Fragment, useCallback } from "react";
+import { Fragment, type ReactNode, useCallback } from "react";
import { push } from "react-router-redux";
import { useAsync } from "react-use";
import { t } from "ttag";
@@ -10,8 +8,9 @@ import { PermissionsEditorLegacyNoSelfServiceWarning } from "metabase/admin/perm
import { connect, useDispatch, useSelector } from "metabase/lib/redux";
import { PLUGIN_ADVANCED_PERMISSIONS } from "metabase/plugins";
import { getSetting } from "metabase/selectors/settings";
-import { PermissionsApi } from "metabase/services";
import { Center, Loader } from "metabase/ui";
+import type { GroupId } from "metabase-types/api";
+import type { State } from "metabase-types/store";
import {
PermissionsEditor,
@@ -20,37 +19,50 @@ import {
import { PermissionsEditorSplitPermsMessage } from "../../components/PermissionsEditor/PermissionsEditorSplitPermsMessage";
import { PermissionsSidebar } from "../../components/PermissionsSidebar";
import {
- LOAD_DATA_PERMISSIONS_FOR_GROUP,
+ type UpdateDataPermissionParams,
+ loadDataPermissionsForGroup,
updateDataPermission,
} from "../../permissions";
import {
+ type DataTreeNodeItem,
+ type GroupSidebarProps,
getDatabasesPermissionEditor,
getGroupsSidebar,
getIsLoadingDatabaseTables,
getLoadingDatabaseTablesError,
} from "../../selectors/data-permissions";
+import type {
+ DataPermissionValue,
+ PermissionAction,
+ PermissionEditorBreadcrumb,
+ PermissionEditorEntity,
+ PermissionSectionConfig,
+ RawGroupRouteParams,
+} from "../../types";
+import { parseGroupRouteParams } from "../../types";
import {
GROUPS_BASE_PATH,
getGroupFocusPermissionsUrl,
} from "../../utils/urls";
-const mapDispatchToProps = (dispatch) => ({
- dispatch,
- ...bindActionCreators(
- {
- updateDataPermission,
- switchView: (entityType) =>
- push(`/admin/permissions/data/${entityType}/`),
- navigateToItem: (item) => push(`${GROUPS_BASE_PATH}/${item.id}`),
- navigateToTableItem: (item, { groupId }) => {
- return push(getGroupFocusPermissionsUrl(groupId, item.entityId));
- },
- },
- dispatch,
- ),
-});
+const mapDispatchToProps = {
+ updateDataPermission,
+ switchView: (entityType: string) =>
+ push(`/admin/permissions/data/${entityType}/`),
+ navigateToItem: (item: DataTreeNodeItem) =>
+ push(`${GROUPS_BASE_PATH}/${item.id}`),
+ navigateToTableItem: (
+ item: PermissionEditorEntity,
+ { groupId }: { groupId: GroupId },
+ ) => {
+ return push(getGroupFocusPermissionsUrl(groupId, item.entityId));
+ },
+};
-const mapStateToProps = (state, props) => {
+const mapStateToProps = (
+ state: State,
+ props: { params: RawGroupRouteParams },
+) => {
return {
sidebar: getGroupsSidebar(state, props),
isEditorLoading: getIsLoadingDatabaseTables(state, props),
@@ -58,22 +70,20 @@ const mapStateToProps = (state, props) => {
};
};
-const propTypes = {
- params: PropTypes.shape({
- groupId: PropTypes.string,
- databaseId: PropTypes.string,
- schemaName: PropTypes.string,
- }),
- children: PropTypes.node,
- sidebar: PropTypes.object,
- navigateToItem: PropTypes.func.isRequired,
- switchView: PropTypes.func.isRequired,
- navigateToTableItem: PropTypes.func.isRequired,
- updateDataPermission: PropTypes.func.isRequired,
- dispatch: PropTypes.func.isRequired,
- isEditorLoading: PropTypes.bool,
- editorError: PropTypes.string,
-};
+interface GroupsPermissionsPageInnerProps {
+ sidebar: GroupSidebarProps;
+ params: RawGroupRouteParams;
+ children: ReactNode;
+ navigateToItem: (item: any) => void;
+ switchView: (entityType: string) => void;
+ navigateToTableItem: (
+ item: PermissionEditorEntity,
+ { groupId }: { groupId: GroupId },
+ ) => void;
+ updateDataPermission: (params: UpdateDataPermissionParams) => void;
+ isEditorLoading: boolean | undefined;
+ editorError: string | undefined;
+}
function GroupsPermissionsPageInner({
sidebar,
@@ -85,20 +95,15 @@ function GroupsPermissionsPageInner({
updateDataPermission,
isEditorLoading,
editorError,
-}) {
+}: GroupsPermissionsPageInnerProps) {
+ const groupRouteParams = parseGroupRouteParams(params);
const dispatch = useDispatch();
const { loading: isLoading } = useAsync(async () => {
- if (params.groupId) {
- const response = await PermissionsApi.graphForGroup({
- groupId: params.groupId,
- });
- await dispatch({
- type: LOAD_DATA_PERMISSIONS_FOR_GROUP,
- payload: response,
- });
+ if (groupRouteParams.groupId) {
+ await dispatch(loadDataPermissionsForGroup(groupRouteParams.groupId));
}
- }, [params.groupId]);
+ }, [groupRouteParams.groupId]);
const permissionEditor = useSelector((state) =>
getDatabasesPermissionEditor(state, { params }),
@@ -108,46 +113,60 @@ function GroupsPermissionsPageInner({
);
const handleEntityChange = useCallback(
- (entityType) => {
+ (entityType: string) => {
switchView(entityType);
},
[switchView],
);
- const handleSidebarItemSelect = useCallback(
- (item) => {
- navigateToItem(item, params);
- },
- [navigateToItem, params],
- );
-
const handleTableItemSelect = useCallback(
- (item) => {
- navigateToTableItem(item, params);
+ (item: PermissionEditorEntity) => {
+ if (groupRouteParams.groupId == null) {
+ return;
+ }
+ navigateToTableItem(item, { groupId: groupRouteParams.groupId });
},
- [navigateToTableItem, params],
+ [navigateToTableItem, groupRouteParams.groupId],
);
const handlePermissionChange = useCallback(
- async (item, permission, value) => {
- await updateDataPermission({
- groupId: parseInt(params.groupId),
+ (
+ item: PermissionEditorEntity,
+ permission: PermissionSectionConfig,
+ value: DataPermissionValue,
+ ) => {
+ if (item.entityId == null || groupRouteParams.groupId == null) {
+ return;
+ }
+ updateDataPermission({
+ groupId: groupRouteParams.groupId,
permission,
value,
entityId: item.entityId,
view: "group",
});
},
- [params, updateDataPermission],
+ [groupRouteParams.groupId, updateDataPermission],
);
- const handleAction = (action, item) => {
- dispatch(action.actionCreator(item.entityId, params.groupId, "group"));
+ const handleAction = (
+ action: PermissionAction,
+ item: PermissionEditorEntity,
+ ) => {
+ if (groupRouteParams.groupId == null) {
+ return;
+ }
+ dispatch(
+ action.actionCreator(item.entityId, groupRouteParams.groupId, "group"),
+ );
};
- const handleBreadcrumbsItemSelect = (item) => dispatch(push(item.url));
+ const handleBreadcrumbsItemSelect = (item: PermissionEditorBreadcrumb) => {
+ if (item.url) {
+ dispatch(push(item.url));
+ }
+ };
- const showEmptyState = !permissionEditor && !isEditorLoading && !editorError;
const showLegacyNoSelfServiceWarning =
PLUGIN_ADVANCED_PERMISSIONS.shouldShowViewDataColumn &&
!!permissionEditor?.hasLegacyNoSelfServiceValueInPermissionGraph;
@@ -156,7 +175,7 @@ function GroupsPermissionsPageInner({
<Fragment>
<PermissionsSidebar
{...sidebar}
- onSelect={handleSidebarItemSelect}
+ onSelect={navigateToItem}
onEntityChange={handleEntityChange}
/>
@@ -166,14 +185,14 @@ function GroupsPermissionsPageInner({
</Center>
)}
- {showEmptyState && !isLoading && (
+ {!permissionEditor && !isLoading && (
<PermissionsEditorEmptyState
icon="group"
message={t`Select a group to see its data permissions`}
/>
)}
- {!showEmptyState && !isLoading && (
+ {permissionEditor && !isLoading && (
<PermissionsEditor
{...permissionEditor}
isLoading={isEditorLoading}
@@ -202,8 +221,6 @@ function GroupsPermissionsPageInner({
);
}
-GroupsPermissionsPageInner.propTypes = propTypes;
-
export const GroupsPermissionsPage = _.compose(
connect(mapStateToProps, mapDispatchToProps),
)(GroupsPermissionsPageInner);
diff --git a/frontend/src/metabase/admin/permissions/permissions.js b/frontend/src/metabase/admin/permissions/permissions.js
deleted file mode 100644
index eca3423389e..00000000000
--- a/frontend/src/metabase/admin/permissions/permissions.js
+++ /dev/null
@@ -1,830 +0,0 @@
-import { assocIn, getIn, merge } from "icepick";
-import { push } from "react-router-redux";
-import { t } from "ttag";
-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 { Groups } from "metabase/entities/groups";
-import { Tables } from "metabase/entities/tables";
-import {
- combineReducers,
- createAction,
- createThunkAction,
- handleActions,
-} from "metabase/lib/redux";
-import {
- PLUGIN_ADVANCED_PERMISSIONS,
- PLUGIN_DATA_PERMISSIONS,
-} from "metabase/plugins";
-import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
-import { CollectionsApi, PermissionsApi } from "metabase/services";
-
-import { DataPermission, DataPermissionType } from "./types";
-import { isDatabaseEntityId } from "./utils/data-entity-id";
-import {
- getModifiedCollectionPermissionsGraphParts,
- getModifiedGroupsPermissionsGraphParts,
- mergeGroupsPermissionsUpdates,
-} from "./utils/graph/partial-updates";
-
-const INITIALIZE_DATA_PERMISSIONS =
- "metabase/admin/permissions/INITIALIZE_DATA_PERMISSIONS";
-export const initializeDataPermissions = createThunkAction(
- INITIALIZE_DATA_PERMISSIONS,
- () => async (dispatch) => {
- await Promise.all([
- dispatch(loadDataPermissions()),
- dispatch(Groups.actions.fetchList()),
- ]);
- },
-);
-
-export const LOAD_DATA_PERMISSIONS =
- "metabase/admin/permissions/LOAD_DATA_PERMISSIONS";
-export const loadDataPermissions = createThunkAction(
- LOAD_DATA_PERMISSIONS,
- () => async () => PermissionsApi.graph(),
-);
-
-export const RESTORE_LOADED_PERMISSIONS =
- "metabase/admin/permissions/RESTORE_LOADED_PERMISSIONS";
-
-export const restoreLoadedPermissions = createThunkAction(
- RESTORE_LOADED_PERMISSIONS,
- () => async (dispatch, getState) => {
- const state = getState();
- const groups = state.admin.permissions.originalDataPermissions;
- const revision = state.admin.permissions.dataPermissionsRevision;
- dispatch({ type: LOAD_DATA_PERMISSIONS, payload: { groups, revision } });
- },
-);
-
-export const LOAD_DATA_PERMISSIONS_FOR_GROUP =
- "metabase/admin/permissions/LOAD_DATA_PERMISSIONS_FOR_GROUP";
-
-export const LOAD_DATA_PERMISSIONS_FOR_DB =
- "metabase/admin/permissions/LOAD_DATA_PERMISSIONS_FOR_GROUP";
-
-const INITIALIZE_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/INITIALIZE_COLLECTION_PERMISSIONS";
-export const initializeCollectionPermissions = createThunkAction(
- INITIALIZE_COLLECTION_PERMISSIONS,
- (namespace) => async (dispatch) => {
- await Promise.all([
- dispatch(loadCollectionPermissions(namespace)),
- dispatch(Groups.actions.fetchList()),
- ]);
- },
-);
-
-const LOAD_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/LOAD_COLLECTION_PERMISSIONS";
-export const loadCollectionPermissions = createThunkAction(
- LOAD_COLLECTION_PERMISSIONS,
- (namespace) => async () => {
- const params = namespace != null ? { namespace } : {};
- return CollectionsApi.graph(params);
- },
-);
-
-export const LIMIT_DATABASE_PERMISSION =
- "metabase/admin/permissions/LIMIT_DATABASE_PERMISSION";
-export const limitDatabasePermission = createThunkAction(
- LIMIT_DATABASE_PERMISSION,
- (groupId, entityId, accessPermissionValue) => (dispatch) => {
- const newValue =
- PLUGIN_ADVANCED_PERMISSIONS.getDatabaseLimitedAccessPermission(
- accessPermissionValue,
- );
-
- if (newValue) {
- dispatch(
- updateDataPermission({
- groupId,
- permission: {
- type: DataPermissionType.ACCESS,
- permission: DataPermission.VIEW_DATA,
- },
- value: newValue,
- entityId,
- }),
- );
- }
-
- dispatch(navigateToGranularPermissions(groupId, entityId));
- },
-);
-
-export const NAVIGATE_TO_GRANULAR_PERMISSIONS =
- "metabase/admin/permissions/NAVIGATE_TO_GRANULAR_PERMISSIONS";
-export const navigateToGranularPermissions = createThunkAction(
- NAVIGATE_TO_GRANULAR_PERMISSIONS,
- (groupId, entityId) => (dispatch) => {
- dispatch(push(getGroupFocusPermissionsUrl(groupId, entityId)));
- },
-);
-
-export const UPDATE_DATA_PERMISSION =
- "metabase/admin/permissions/UPDATE_DATA_PERMISSION";
-export const updateDataPermission = createThunkAction(
- UPDATE_DATA_PERMISSION,
- ({ groupId, permission: permissionInfo, value, entityId, view }) => {
- return (dispatch, getState) => {
- if (isDatabaseEntityId(entityId)) {
- dispatch(
- Tables.actions.fetchList({
- dbId: entityId.databaseId,
- include_hidden: true,
- remove_inactive: true,
- skip_fields: true,
- }),
- );
- }
-
- const metadata = getMetadataWithHiddenTables(getState(), null);
- if (permissionInfo.postActions) {
- const action = permissionInfo.postActions?.[value]?.(
- entityId,
- groupId,
- view,
- value,
- getState,
- );
- if (action) {
- dispatch(action);
- return;
- }
- }
-
- return { groupId, permissionInfo, value, metadata, entityId };
- };
- },
-);
-
-export const SAVE_DATA_PERMISSIONS =
- "metabase/admin/permissions/data/SAVE_DATA_PERMISSIONS";
-export const saveDataPermissions = createThunkAction(
- SAVE_DATA_PERMISSIONS,
- () => async (_dispatch, getState) => {
- const state = getState();
- const allGroupIds = Object.keys(state.entities.groups);
- const {
- originalDataPermissions,
- dataPermissions,
- dataPermissionsRevision,
- } = state.admin.permissions;
-
- const advancedPermissions =
- PLUGIN_DATA_PERMISSIONS.permissionsPayloadExtraSelectors.reduce(
- (data, selector) => {
- const [extraData, modifiedGroupIds] = selector(state);
- return {
- permissions: { ...data.permissions, ...extraData },
- modifiedGroupIds: [...data.modifiedGroupIds, ...modifiedGroupIds],
- };
- },
- { modifiedGroupIds: [], permissions: {} },
- );
-
- const modifiedGroups = getModifiedGroupsPermissionsGraphParts(
- dataPermissions,
- originalDataPermissions,
- allGroupIds,
- advancedPermissions.modifiedGroupIds,
- );
- const modifiedGroupIds = Object.keys(modifiedGroups);
-
- const response = await PermissionsApi.updateGraph({
- groups: modifiedGroups,
- revision: dataPermissionsRevision,
- ...advancedPermissions.permissions,
- });
-
- return {
- ...response,
- modifiedGroupIds,
- };
- },
-);
-
-const UPDATE_COLLECTION_PERMISSION =
- "metabase/admin/permissions/UPDATE_COLLECTION_PERMISSION";
-export const updateCollectionPermission = createAction(
- UPDATE_COLLECTION_PERMISSION,
-);
-
-const SAVE_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/data/SAVE_COLLECTION_PERMISSIONS";
-export const saveCollectionPermissions = createThunkAction(
- SAVE_COLLECTION_PERMISSIONS,
- (namespace) => async (_dispatch, getState) => {
- const {
- originalCollectionPermissions,
- collectionPermissions,
- collectionPermissionsRevision,
- } = getState().admin.permissions;
-
- const modifiedPermissions = getModifiedCollectionPermissionsGraphParts(
- originalCollectionPermissions,
- collectionPermissions,
- );
-
- const result = await CollectionsApi.updateGraph({
- namespace,
- revision: collectionPermissionsRevision,
- groups: modifiedPermissions,
- });
-
- return {
- ...result,
- groups: collectionPermissions,
- };
- },
-);
-
-// Shared Tenant Collection Permissions
-const TENANT_NAMESPACE = "shared-tenant-collection";
-
-// Tenant-Specific Collection Permissions
-const TENANT_SPECIFIC_NAMESPACE = "tenant-specific";
-
-const INITIALIZE_TENANT_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/INITIALIZE_TENANT_COLLECTION_PERMISSIONS";
-export const initializeTenantCollectionPermissions = createThunkAction(
- INITIALIZE_TENANT_COLLECTION_PERMISSIONS,
- () => async (dispatch) => {
- await Promise.all([
- dispatch(loadTenantCollectionPermissions()),
- dispatch(Groups.actions.fetchList()),
- ]);
- },
-);
-
-const LOAD_TENANT_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/LOAD_TENANT_COLLECTION_PERMISSIONS";
-export const loadTenantCollectionPermissions = createThunkAction(
- LOAD_TENANT_COLLECTION_PERMISSIONS,
- () => async () => {
- return CollectionsApi.graph({ namespace: TENANT_NAMESPACE });
- },
-);
-
-const UPDATE_TENANT_COLLECTION_PERMISSION =
- "metabase/admin/permissions/UPDATE_TENANT_COLLECTION_PERMISSION";
-export const updateTenantCollectionPermission = createAction(
- UPDATE_TENANT_COLLECTION_PERMISSION,
-);
-
-const SAVE_TENANT_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/data/SAVE_TENANT_COLLECTION_PERMISSIONS";
-export const saveTenantCollectionPermissions = createThunkAction(
- SAVE_TENANT_COLLECTION_PERMISSIONS,
- () => async (_dispatch, getState) => {
- const {
- originalTenantCollectionPermissions,
- tenantCollectionPermissions,
- tenantCollectionPermissionsRevision,
- } = getState().admin.permissions;
-
- const modifiedPermissions = getModifiedCollectionPermissionsGraphParts(
- originalTenantCollectionPermissions,
- tenantCollectionPermissions,
- );
-
- const result = await CollectionsApi.updateGraph({
- namespace: TENANT_NAMESPACE,
- revision: tenantCollectionPermissionsRevision,
- groups: modifiedPermissions,
- });
-
- return {
- ...result,
- groups: tenantCollectionPermissions,
- };
- },
-);
-
-// Tenant-Specific Collection Permissions Actions
-const INITIALIZE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/INITIALIZE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS";
-export const initializeTenantSpecificCollectionPermissions = createThunkAction(
- INITIALIZE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
- () => async (dispatch) => {
- await Promise.all([
- dispatch(loadTenantSpecificCollectionPermissions()),
- dispatch(Groups.actions.fetchList()),
- ]);
- },
-);
-
-const LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS";
-export const loadTenantSpecificCollectionPermissions = createThunkAction(
- LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
- () => async () => {
- return CollectionsApi.graph({ namespace: TENANT_SPECIFIC_NAMESPACE });
- },
-);
-
-const UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION =
- "metabase/admin/permissions/UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION";
-export const updateTenantSpecificCollectionPermission = createAction(
- UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION,
-);
-
-const SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS =
- "metabase/admin/permissions/data/SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS";
-export const saveTenantSpecificCollectionPermissions = createThunkAction(
- SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
- () => async (_dispatch, getState) => {
- const {
- originalTenantSpecificCollectionPermissions,
- tenantSpecificCollectionPermissions,
- tenantSpecificCollectionPermissionsRevision,
- } = getState().admin.permissions;
-
- const modifiedPermissions = getModifiedCollectionPermissionsGraphParts(
- originalTenantSpecificCollectionPermissions,
- tenantSpecificCollectionPermissions,
- );
-
- const result = await CollectionsApi.updateGraph({
- namespace: TENANT_SPECIFIC_NAMESPACE,
- revision: tenantSpecificCollectionPermissionsRevision,
- groups: modifiedPermissions,
- });
-
- return {
- ...result,
- groups: tenantSpecificCollectionPermissions,
- };
- },
-);
-
-const CLEAR_SAVE_ERROR = "metabase/admin/permissions/CLEAR_SAVE_ERROR";
-export const clearSaveError = createAction(CLEAR_SAVE_ERROR);
-
-const savePermission = {
- next: (_state) => null,
- throw: (_state, { payload }) => {
- return (
- (payload && typeof payload.data === "string"
- ? payload.data
- : payload.data?.message) || t`Sorry, an error occurred.`
- );
- },
-};
-
-const saveError = handleActions(
- {
- [SAVE_DATA_PERMISSIONS]: savePermission,
- [LOAD_DATA_PERMISSIONS]: {
- next: (state) => null,
- },
- [SAVE_COLLECTION_PERMISSIONS]: savePermission,
- [LOAD_COLLECTION_PERMISSIONS]: {
- next: (state) => null,
- },
- [SAVE_TENANT_COLLECTION_PERMISSIONS]: savePermission,
- [LOAD_TENANT_COLLECTION_PERMISSIONS]: {
- next: (state) => null,
- },
- [SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: savePermission,
- [LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (state) => null,
- },
- [CLEAR_SAVE_ERROR]: { next: () => null },
- },
- null,
-);
-
-function getDecendentCollections(collection) {
- const subCollections = collection.children.filter(
- (collection) => !collection.is_personal,
- );
- return subCollections.concat(...subCollections.map(getDecendentCollections));
-}
-
-const dataPermissions = handleActions(
- {
- [LOAD_DATA_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [LOAD_DATA_PERMISSIONS_FOR_GROUP]: {
- next: (state, { payload }) => merge(payload.groups, state),
- },
- [LOAD_DATA_PERMISSIONS_FOR_DB]: {
- next: (state, { payload }) => merge(payload.groups, state),
- },
- [SAVE_DATA_PERMISSIONS]: {
- next: (state, { payload }) =>
- mergeGroupsPermissionsUpdates(
- state,
- payload.groups,
- payload.modifiedGroupIds,
- ),
- },
- [UPDATE_DATA_PERMISSION]: {
- next: (state, { payload }) => {
- if (payload == null) {
- return state;
- }
-
- const { value, groupId, entityId, metadata, permissionInfo } = payload;
-
- const database = metadata.database(entityId.databaseId);
-
- if (permissionInfo.type === DataPermissionType.DETAILS) {
- return updatePermission(
- state,
- groupId,
- entityId.databaseId,
- DataPermission.DETAILS,
- [],
- value,
- );
- }
-
- if (permissionInfo.type === DataPermissionType.TRANSFORMS) {
- return updatePermission(
- state,
- groupId,
- entityId.databaseId,
- DataPermission.TRANSFORMS,
- [],
- value,
- );
- }
-
- if (
- permissionInfo.type === DataPermissionType.NATIVE &&
- PLUGIN_DATA_PERMISSIONS.upgradeViewPermissionsIfNeeded
- ) {
- state = PLUGIN_DATA_PERMISSIONS.upgradeViewPermissionsIfNeeded(
- state,
- groupId,
- entityId,
- value,
- database,
- permissionInfo.permission,
- );
- }
-
- state = restrictCreateQueriesPermissionsIfNeeded(
- state,
- groupId,
- entityId,
- permissionInfo.permission,
- value,
- database,
- );
-
- state = revokeTransformsPermissionIfNeeded(
- state,
- groupId,
- entityId,
- permissionInfo.permission,
- value,
- );
-
- if (entityId.tableId != null) {
- const updatedPermissions = updateFieldsPermission(
- state,
- groupId,
- entityId,
- value,
- database,
- permissionInfo.permission,
- );
- return inferAndUpdateEntityPermissions(
- updatedPermissions,
- groupId,
- entityId,
- database,
- permissionInfo.permission,
- );
- } else if (entityId.schemaName != null) {
- return updateTablesPermission(
- state,
- groupId,
- entityId,
- value,
- database,
- permissionInfo.permission,
- );
- } else {
- return updateSchemasPermission(
- state,
- groupId,
- entityId,
- value,
- database,
- permissionInfo.permission,
- );
- }
- },
- },
- },
- null,
-);
-
-const originalDataPermissions = handleActions(
- {
- [LOAD_DATA_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [LOAD_DATA_PERMISSIONS_FOR_GROUP]: {
- next: (state, { payload }) => merge(payload.groups, state),
- },
- [LOAD_DATA_PERMISSIONS_FOR_DB]: {
- next: (state, { payload }) => merge(payload.groups, state),
- },
- [SAVE_DATA_PERMISSIONS]: {
- next: (state, { payload }) =>
- mergeGroupsPermissionsUpdates(
- state,
- payload.groups,
- payload.modifiedGroupIds,
- ),
- },
- },
- null,
-);
-
-const dataPermissionsRevision = handleActions(
- {
- [LOAD_DATA_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- [LOAD_DATA_PERMISSIONS_FOR_GROUP]: {
- next: (state, { payload }) => payload.revision,
- },
- [LOAD_DATA_PERMISSIONS_FOR_DB]: {
- next: (state, { payload }) => payload.revision,
- },
- [SAVE_DATA_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- },
- null,
-);
-
-const collectionPermissions = handleActions(
- {
- [LOAD_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [UPDATE_COLLECTION_PERMISSION]: {
- next: (state, { payload }) => {
- const {
- collection,
- groupId,
- originalPermissionsState,
- shouldPropagateToChildren,
- value,
- } = payload;
- let newPermissionsState = assocIn(
- state,
- [groupId, collection.id],
- value,
- );
-
- /**
- * Check if shouldPropagateToChildren is explicitly set (true or false) vs unset (null or undefined).
- * If it's a boolean, we either propagate the new value or restore the original. When not a boolean, we do nothing.
- */
- if (isBoolean(shouldPropagateToChildren)) {
- for (const descendent of getDecendentCollections(collection)) {
- newPermissionsState = assocIn(
- newPermissionsState,
- [groupId, descendent.id],
- shouldPropagateToChildren
- ? value
- : getIn(originalPermissionsState, [groupId, descendent.id]),
- );
- }
- }
-
- return newPermissionsState;
- },
- },
- [SAVE_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- },
- null,
-);
-
-const originalCollectionPermissions = handleActions(
- {
- [LOAD_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [SAVE_COLLECTION_PERMISSIONS]: {
- next: (state, { payload }) => payload.groups,
- },
- },
- null,
-);
-
-const collectionPermissionsRevision = handleActions(
- {
- [LOAD_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- [SAVE_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- },
- null,
-);
-
-// Tenant Collection Permissions Reducers
-const tenantCollectionPermissions = handleActions(
- {
- [LOAD_TENANT_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [UPDATE_TENANT_COLLECTION_PERMISSION]: {
- next: (state, { payload }) => {
- const { groupId, collection, value, shouldPropagateToChildren } =
- payload;
- let newPermissions = assocIn(state, [groupId, collection.id], value);
-
- if (shouldPropagateToChildren) {
- for (const descendent of getDecendentCollections(collection)) {
- newPermissions = assocIn(
- newPermissions,
- [groupId, descendent.id],
- value,
- );
- }
- }
- return newPermissions;
- },
- },
- [SAVE_TENANT_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- },
- null,
-);
-
-const originalTenantCollectionPermissions = handleActions(
- {
- [LOAD_TENANT_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [SAVE_TENANT_COLLECTION_PERMISSIONS]: {
- next: (state, { payload }) => payload.groups,
- },
- },
- null,
-);
-
-const tenantCollectionPermissionsRevision = handleActions(
- {
- [LOAD_TENANT_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- [SAVE_TENANT_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- },
- null,
-);
-
-// Tenant-Specific Collection Permissions Reducers
-const tenantSpecificCollectionPermissions = handleActions(
- {
- [LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION]: {
- next: (state, { payload }) => {
- const { groupId, collection, value, shouldPropagateToChildren } =
- payload;
- let newPermissions = assocIn(state, [groupId, collection.id], value);
-
- if (shouldPropagateToChildren) {
- for (const descendent of getDecendentCollections(collection)) {
- newPermissions = assocIn(
- newPermissions,
- [groupId, descendent.id],
- value,
- );
- }
- }
- return newPermissions;
- },
- },
- [SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- },
- null,
-);
-
-const originalTenantSpecificCollectionPermissions = handleActions(
- {
- [LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.groups,
- },
- [SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (state, { payload }) => payload.groups,
- },
- },
- null,
-);
-
-const tenantSpecificCollectionPermissionsRevision = handleActions(
- {
- [LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- [SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS]: {
- next: (_state, { payload }) => payload.revision,
- },
- },
- null,
-);
-
-export const TOGGLE_HELP_REFERENCE =
- "metabase/admin/permissions/TOGGLE_HELP_REFERENCE";
-export const toggleHelpReference = createAction(TOGGLE_HELP_REFERENCE);
-
-export const isHelpReferenceOpen = handleActions(
- {
- [toggleHelpReference]: {
- next: (state) => !state,
- },
- },
- false,
-);
-
-const checkRevisionChanged = (state, { payload }) => {
- if (!state.revision) {
- return {
- revision: payload.revision,
- hasChanged: false,
- };
- } else if (state.revision === payload.revision && !state.hasChanged) {
- return state;
- } else {
- return {
- revision: payload.revision,
- hasChanged: true,
- };
- }
-};
-
-const hasRevisionChanged = handleActions(
- {
- [LOAD_DATA_PERMISSIONS]: {
- next: checkRevisionChanged,
- },
- [LOAD_DATA_PERMISSIONS_FOR_GROUP]: {
- next: checkRevisionChanged,
- },
- [LOAD_DATA_PERMISSIONS_FOR_DB]: {
- next: checkRevisionChanged,
- },
- [SAVE_DATA_PERMISSIONS]: {
- next: (state, { payload }) => ({
- revision: payload.revision,
- hasChanged: false,
- }),
- },
- },
- {
- revision: null,
- hasChanged: false,
- },
-);
-
-export const permissions = combineReducers({
- saveError,
- dataPermissions,
- originalDataPermissions,
- dataPermissionsRevision,
- collectionPermissions,
- originalCollectionPermissions,
- collectionPermissionsRevision,
- tenantCollectionPermissions,
- originalTenantCollectionPermissions,
- tenantCollectionPermissionsRevision,
- tenantSpecificCollectionPermissions,
- originalTenantSpecificCollectionPermissions,
- tenantSpecificCollectionPermissionsRevision,
- isHelpReferenceOpen,
- hasRevisionChanged,
-});
diff --git a/frontend/src/metabase/admin/permissions/permissions.ts b/frontend/src/metabase/admin/permissions/permissions.ts
new file mode 100644
index 00000000000..2c03f97aa9c
--- /dev/null
+++ b/frontend/src/metabase/admin/permissions/permissions.ts
@@ -0,0 +1,1026 @@
+import {
+ type PayloadAction,
+ type UnknownAction,
+ createReducer,
+ current, // immer and icepick don't play nicely together
+} from "@reduxjs/toolkit";
+import { assocIn, merge } from "icepick";
+import { push } from "react-router-redux";
+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 { type ErrorPayload, getErrorMessage } from "metabase/api/utils/errors";
+import { Groups } from "metabase/entities/groups";
+import { Tables } from "metabase/entities/tables";
+import {
+ combineReducers,
+ createAction,
+ createThunkAction,
+} from "metabase/lib/redux";
+import {
+ PLUGIN_ADVANCED_PERMISSIONS,
+ PLUGIN_DATA_PERMISSIONS,
+} from "metabase/plugins";
+import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
+import { CollectionsApi, PermissionsApi } from "metabase/services";
+import type Metadata from "metabase-lib/v1/metadata/Metadata";
+import type {
+ Collection,
+ CollectionPermissions,
+ CollectionPermissionsGraph,
+ GroupId,
+ GroupsPermissions,
+ PermissionsGraph,
+} from "metabase-types/api";
+
+import {
+ DataPermission,
+ DataPermissionType,
+ type DataPermissionValue,
+ type EntityId,
+ type PermissionSectionConfig,
+} from "./types";
+import {
+ isDatabaseEntityId,
+ isSchemaEntityId,
+ isTableEntityId,
+} from "./utils/data-entity-id";
+import {
+ getModifiedCollectionPermissionsGraphParts,
+ getModifiedGroupsPermissionsGraphParts,
+ mergeGroupsPermissionsUpdates,
+} from "./utils/graph/partial-updates";
+
+function isErrorAction(action: UnknownAction) {
+ return action.error === true;
+}
+
+const INITIALIZE_DATA_PERMISSIONS =
+ "metabase/admin/permissions/INITIALIZE_DATA_PERMISSIONS";
+export const initializeDataPermissions = createThunkAction(
+ INITIALIZE_DATA_PERMISSIONS,
+ () => async (dispatch) => {
+ await Promise.all([
+ dispatch(loadDataPermissions()),
+ dispatch(Groups.actions.fetchList()),
+ ]);
+ },
+);
+
+export const LOAD_DATA_PERMISSIONS =
+ "metabase/admin/permissions/LOAD_DATA_PERMISSIONS";
+export const loadDataPermissions = createThunkAction(
+ LOAD_DATA_PERMISSIONS,
+ () => async () => PermissionsApi.graph(),
+);
+function isLoadDataPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<PermissionsGraph> {
+ return !isErrorAction(action) && action.type === LOAD_DATA_PERMISSIONS;
+}
+
+export const RESTORE_LOADED_PERMISSIONS =
+ "metabase/admin/permissions/RESTORE_LOADED_PERMISSIONS";
+
+export const restoreLoadedPermissions = createThunkAction(
+ RESTORE_LOADED_PERMISSIONS,
+ () => async (dispatch, getState) => {
+ const state = getState();
+ const groups = state.admin.permissions.originalDataPermissions;
+ const revision = state.admin.permissions.dataPermissionsRevision;
+ dispatch({ type: LOAD_DATA_PERMISSIONS, payload: { groups, revision } });
+ },
+);
+
+const LOAD_DATA_PERMISSIONS_FOR_GROUP =
+ "metabase/admin/permissions/LOAD_DATA_PERMISSIONS_FOR_GROUP";
+export const loadDataPermissionsForGroup = createThunkAction(
+ LOAD_DATA_PERMISSIONS_FOR_GROUP,
+ (groupId: number | undefined) => async () =>
+ PermissionsApi.graphForGroup({ groupId }),
+);
+function isLoadDataPermissionsForGroupAction(
+ action: UnknownAction,
+): action is PayloadAction<PermissionsGraph> {
+ return (
+ !isErrorAction(action) && action.type === LOAD_DATA_PERMISSIONS_FOR_GROUP
+ );
+}
+
+const LOAD_DATA_PERMISSIONS_FOR_DB =
+ "metabase/admin/permissions/LOAD_DATA_PERMISSIONS_FOR_DB";
+export const loadDataPermissionsForDb = createThunkAction(
+ LOAD_DATA_PERMISSIONS_FOR_DB,
+ (databaseId: number | undefined) => async () =>
+ PermissionsApi.graphForDB({ databaseId }),
+);
+function isLoadDataPermissionsForDbAction(
+ action: UnknownAction,
+): action is PayloadAction<PermissionsGraph> {
+ return !isErrorAction(action) && action.type === LOAD_DATA_PERMISSIONS_FOR_DB;
+}
+
+const INITIALIZE_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/INITIALIZE_COLLECTION_PERMISSIONS";
+export const initializeCollectionPermissions = createThunkAction(
+ INITIALIZE_COLLECTION_PERMISSIONS,
+ (namespace) => async (dispatch) => {
+ await Promise.all([
+ dispatch(loadCollectionPermissions(namespace)),
+ dispatch(Groups.actions.fetchList()),
+ ]);
+ },
+);
+
+const LOAD_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/LOAD_COLLECTION_PERMISSIONS";
+export const loadCollectionPermissions = createThunkAction(
+ LOAD_COLLECTION_PERMISSIONS,
+ (namespace) => async () => {
+ const params = namespace != null ? { namespace } : {};
+ return CollectionsApi.graph(params);
+ },
+);
+function isLoadCollectionPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<CollectionPermissionsGraph> {
+ return !isErrorAction(action) && action.type === LOAD_COLLECTION_PERMISSIONS;
+}
+
+export const LIMIT_DATABASE_PERMISSION =
+ "metabase/admin/permissions/LIMIT_DATABASE_PERMISSION";
+export const limitDatabasePermission = createThunkAction(
+ LIMIT_DATABASE_PERMISSION,
+ (groupId, entityId, accessPermissionValue) => (dispatch) => {
+ const newValue =
+ PLUGIN_ADVANCED_PERMISSIONS.getDatabaseLimitedAccessPermission(
+ accessPermissionValue,
+ );
+
+ if (newValue) {
+ dispatch(
+ updateDataPermission({
+ groupId,
+ permission: {
+ type: DataPermissionType.ACCESS,
+ permission: DataPermission.VIEW_DATA,
+ },
+ value: newValue,
+ entityId,
+ view: "group",
+ }),
+ );
+ }
+
+ dispatch(navigateToGranularPermissions(groupId, entityId));
+ },
+);
+
+export const NAVIGATE_TO_GRANULAR_PERMISSIONS =
+ "metabase/admin/permissions/NAVIGATE_TO_GRANULAR_PERMISSIONS";
+export const navigateToGranularPermissions = createThunkAction(
+ NAVIGATE_TO_GRANULAR_PERMISSIONS,
+ (groupId, entityId) => (dispatch) => {
+ dispatch(push(getGroupFocusPermissionsUrl(groupId, entityId)));
+ },
+);
+
+export interface UpdateDataPermissionParams {
+ groupId: GroupId;
+ permission: Pick<
+ PermissionSectionConfig,
+ "type" | "permission" | "postActions"
+ >;
+ value: DataPermissionValue;
+ entityId: EntityId;
+ view: "database" | "group";
+}
+interface UpdateDataPermissionPayload {
+ groupId: GroupId;
+ permissionInfo: Pick<
+ PermissionSectionConfig,
+ "type" | "permission" | "postActions"
+ >;
+ value: DataPermissionValue;
+ metadata: Metadata;
+ entityId: EntityId;
+}
+export const UPDATE_DATA_PERMISSION =
+ "metabase/admin/permissions/UPDATE_DATA_PERMISSION";
+export const updateDataPermission = createThunkAction(
+ UPDATE_DATA_PERMISSION,
+ ({
+ groupId,
+ permission: permissionInfo,
+ value,
+ entityId,
+ view,
+ }: UpdateDataPermissionParams) => {
+ return (dispatch, getState): UpdateDataPermissionPayload | undefined => {
+ if (isDatabaseEntityId(entityId)) {
+ dispatch(
+ Tables.actions.fetchList({
+ dbId: entityId.databaseId,
+ include_hidden: true,
+ remove_inactive: true,
+ skip_fields: true,
+ }),
+ );
+ }
+
+ const metadata = getMetadataWithHiddenTables(getState());
+ if (permissionInfo.postActions) {
+ const action = permissionInfo.postActions?.[value]?.(
+ entityId,
+ groupId,
+ view,
+ value,
+ getState,
+ );
+ if (action) {
+ dispatch(action);
+ return;
+ }
+ }
+
+ return { groupId, permissionInfo, value, metadata, entityId };
+ };
+ },
+);
+function isUpdateDataPermissionAction(
+ action: UnknownAction,
+): action is PayloadAction<UpdateDataPermissionPayload | undefined> {
+ return !isErrorAction(action) && action.type === UPDATE_DATA_PERMISSION;
+}
+
+export const SAVE_DATA_PERMISSIONS =
+ "metabase/admin/permissions/data/SAVE_DATA_PERMISSIONS";
+export const saveDataPermissions = createThunkAction(
+ SAVE_DATA_PERMISSIONS,
+ () => async (_dispatch, getState) => {
+ const state = getState();
+ const allGroupIds = Object.keys(state.entities.groups);
+ const {
+ originalDataPermissions,
+ dataPermissions,
+ dataPermissionsRevision,
+ } = state.admin.permissions;
+
+ const advancedPermissions =
+ PLUGIN_DATA_PERMISSIONS.permissionsPayloadExtraSelectors.reduce<{
+ modifiedGroupIds: string[];
+ permissions: Record<string, undefined | { group_id: string }[]>;
+ }>(
+ (data, selector) => {
+ const [extraData, modifiedGroupIds] = selector(state);
+ return {
+ permissions: { ...data.permissions, ...extraData },
+ modifiedGroupIds: [...data.modifiedGroupIds, ...modifiedGroupIds],
+ };
+ },
+ { modifiedGroupIds: [], permissions: {} },
+ );
+
+ const modifiedGroups = getModifiedGroupsPermissionsGraphParts(
+ dataPermissions,
+ originalDataPermissions,
+ allGroupIds,
+ advancedPermissions.modifiedGroupIds,
+ );
+ const modifiedGroupIds = Object.keys(modifiedGroups);
+
+ const response = await PermissionsApi.updateGraph({
+ groups: modifiedGroups,
+ revision: dataPermissionsRevision,
+ ...advancedPermissions.permissions,
+ });
+
+ return {
+ ...response,
+ modifiedGroupIds,
+ };
+ },
+);
+function isSaveDataPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<PermissionsGraph & { modifiedGroupIds: string[] }> {
+ return !isErrorAction(action) && action.type === SAVE_DATA_PERMISSIONS;
+}
+
+export type UpdateCollectionPermissionParams = {
+ groupId: GroupId;
+ collection: Collection;
+ value: unknown;
+ shouldPropagateToChildren: boolean | null;
+ originalPermissionsState?: CollectionPermissions;
+};
+const UPDATE_COLLECTION_PERMISSION =
+ "metabase/admin/permissions/UPDATE_COLLECTION_PERMISSION";
+export const updateCollectionPermission =
+ createAction<UpdateCollectionPermissionParams>(UPDATE_COLLECTION_PERMISSION);
+function isUpdateCollectionPermissionAction(
+ action: UnknownAction,
+): action is PayloadAction<UpdateCollectionPermissionParams> {
+ return !isErrorAction(action) && action.type === UPDATE_COLLECTION_PERMISSION;
+}
+
+const SAVE_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/data/SAVE_COLLECTION_PERMISSIONS";
+export const saveCollectionPermissions = createThunkAction(
+ SAVE_COLLECTION_PERMISSIONS,
+ (namespace) => async (_dispatch, getState) => {
+ const {
+ originalCollectionPermissions,
+ collectionPermissions,
+ collectionPermissionsRevision,
+ } = getState().admin.permissions;
+
+ const modifiedPermissions = getModifiedCollectionPermissionsGraphParts(
+ originalCollectionPermissions,
+ collectionPermissions,
+ );
+
+ const result = await CollectionsApi.updateGraph({
+ namespace,
+ revision: collectionPermissionsRevision,
+ groups: modifiedPermissions,
+ });
+
+ return {
+ ...result,
+ groups: collectionPermissions,
+ };
+ },
+);
+function isSaveCollectionPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<CollectionPermissionsGraph> {
+ return !isErrorAction(action) && action.type === SAVE_COLLECTION_PERMISSIONS;
+}
+
+// Shared Tenant Collection Permissions
+const TENANT_NAMESPACE = "shared-tenant-collection";
+
+// Tenant-Specific Collection Permissions
+const TENANT_SPECIFIC_NAMESPACE = "tenant-specific";
+
+const INITIALIZE_TENANT_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/INITIALIZE_TENANT_COLLECTION_PERMISSIONS";
+export const initializeTenantCollectionPermissions = createThunkAction(
+ INITIALIZE_TENANT_COLLECTION_PERMISSIONS,
+ () => async (dispatch) => {
+ await Promise.all([
+ dispatch(loadTenantCollectionPermissions()),
+ dispatch(Groups.actions.fetchList()),
+ ]);
+ },
+);
+
+const LOAD_TENANT_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/LOAD_TENANT_COLLECTION_PERMISSIONS";
+export const loadTenantCollectionPermissions = createThunkAction(
+ LOAD_TENANT_COLLECTION_PERMISSIONS,
+ () => async () => {
+ return CollectionsApi.graph({ namespace: TENANT_NAMESPACE });
+ },
+);
+function isLoadTenantCollectionPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<CollectionPermissionsGraph> {
+ return (
+ !isErrorAction(action) && action.type === LOAD_TENANT_COLLECTION_PERMISSIONS
+ );
+}
+
+export type UpdateTenantCollectionPermissionParams = {
+ groupId: GroupId;
+ collection: Collection;
+ value: unknown;
+ shouldPropagateToChildren: boolean;
+};
+const UPDATE_TENANT_COLLECTION_PERMISSION =
+ "metabase/admin/permissions/UPDATE_TENANT_COLLECTION_PERMISSION";
+export const updateTenantCollectionPermission =
+ createAction<UpdateTenantCollectionPermissionParams>(
+ UPDATE_TENANT_COLLECTION_PERMISSION,
+ );
+function isUpdateTenantCollectionPermissionAction(
+ action: UnknownAction,
+): action is PayloadAction<UpdateTenantCollectionPermissionParams> {
+ return (
+ !isErrorAction(action) &&
+ action.type === UPDATE_TENANT_COLLECTION_PERMISSION
+ );
+}
+
+const SAVE_TENANT_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/data/SAVE_TENANT_COLLECTION_PERMISSIONS";
+export const saveTenantCollectionPermissions = createThunkAction(
+ SAVE_TENANT_COLLECTION_PERMISSIONS,
+ () => async (_dispatch, getState) => {
+ const {
+ originalTenantCollectionPermissions,
+ tenantCollectionPermissions,
+ tenantCollectionPermissionsRevision,
+ } = getState().admin.permissions;
+
+ const modifiedPermissions = getModifiedCollectionPermissionsGraphParts(
+ originalTenantCollectionPermissions,
+ tenantCollectionPermissions,
+ );
+
+ const result = await CollectionsApi.updateGraph({
+ namespace: TENANT_NAMESPACE,
+ revision: tenantCollectionPermissionsRevision,
+ groups: modifiedPermissions,
+ });
+
+ return {
+ ...result,
+ groups: tenantCollectionPermissions,
+ };
+ },
+);
+function isSaveTenantCollectionPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<CollectionPermissionsGraph> {
+ return (
+ !isErrorAction(action) && action.type === SAVE_TENANT_COLLECTION_PERMISSIONS
+ );
+}
+
+// Tenant-Specific Collection Permissions Actions
+const INITIALIZE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/INITIALIZE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS";
+export const initializeTenantSpecificCollectionPermissions = createThunkAction(
+ INITIALIZE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
+ () => async (dispatch) => {
+ await Promise.all([
+ dispatch(loadTenantSpecificCollectionPermissions()),
+ dispatch(Groups.actions.fetchList()),
+ ]);
+ },
+);
+
+const LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS";
+export const loadTenantSpecificCollectionPermissions = createThunkAction(
+ LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
+ () => async () => {
+ return CollectionsApi.graph({ namespace: TENANT_SPECIFIC_NAMESPACE });
+ },
+);
+function isLoadTenantSpecificCollectionPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<CollectionPermissionsGraph> {
+ return (
+ !isErrorAction(action) &&
+ action.type === LOAD_TENANT_SPECIFIC_COLLECTION_PERMISSIONS
+ );
+}
+
+const UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION =
+ "metabase/admin/permissions/UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION";
+export const updateTenantSpecificCollectionPermission =
+ createAction<UpdateTenantCollectionPermissionParams>(
+ UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION,
+ );
+function isUpdateTenantSpecificCollectionPermissionAction(
+ action: UnknownAction,
+): action is PayloadAction<UpdateTenantCollectionPermissionParams> {
+ return (
+ !isErrorAction(action) &&
+ action.type === UPDATE_TENANT_SPECIFIC_COLLECTION_PERMISSION
+ );
+}
+
+const SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS =
+ "metabase/admin/permissions/data/SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS";
+export const saveTenantSpecificCollectionPermissions = createThunkAction(
+ SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
+ () => async (_dispatch, getState) => {
+ const {
+ originalTenantSpecificCollectionPermissions,
+ tenantSpecificCollectionPermissions,
+ tenantSpecificCollectionPermissionsRevision,
+ } = getState().admin.permissions;
+
+ const modifiedPermissions = getModifiedCollectionPermissionsGraphParts(
+ originalTenantSpecificCollectionPermissions,
+ tenantSpecificCollectionPermissions,
+ );
+
+ const result = await CollectionsApi.updateGraph({
+ namespace: TENANT_SPECIFIC_NAMESPACE,
+ revision: tenantSpecificCollectionPermissionsRevision,
+ groups: modifiedPermissions,
+ });
+
+ return {
+ ...result,
+ groups: tenantSpecificCollectionPermissions,
+ };
+ },
+);
+function isSaveTenantSpecificCollectionPermissionsAction(
+ action: UnknownAction,
+): action is PayloadAction<CollectionPermissionsGraph> {
+ return (
+ !isErrorAction(action) &&
+ action.type === SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS
+ );
+}
+
+const CLEAR_SAVE_ERROR = "metabase/admin/permissions/CLEAR_SAVE_ERROR";
+export const clearSaveError = createAction(CLEAR_SAVE_ERROR);
+function isClearSaveErrorAction(
+ action: UnknownAction,
+): action is PayloadAction<void> {
+ return !isErrorAction(action) && action.type === CLEAR_SAVE_ERROR;
+}
+
+function isSaveErrorAction(
+ action: UnknownAction,
+): action is PayloadAction<ErrorPayload> {
+ return (
+ isErrorAction(action) &&
+ [
+ SAVE_DATA_PERMISSIONS,
+ SAVE_COLLECTION_PERMISSIONS,
+ SAVE_TENANT_COLLECTION_PERMISSIONS,
+ SAVE_TENANT_SPECIFIC_COLLECTION_PERMISSIONS,
+ ].includes(action.type)
+ );
+}
+
+const saveError = createReducer<string | null>(null, (builder) => {
+ builder.addMatcher(isSaveDataPermissionsAction, () => null);
+ builder.addMatcher(isLoadDataPermissionsAction, () => null);
+ builder.addMatcher(isSaveCollectionPermissionsAction, () => null);
+ builder.addMatcher(isLoadCollectionPermissionsAction, () => null);
+ builder.addMatcher(isSaveTenantCollectionPermissionsAction, () => null);
+ builder.addMatcher(isLoadTenantCollectionPermissionsAction, () => null);
+ builder.addMatcher(
+ isSaveTenantSpecificCollectionPermissionsAction,
+ () => null,
+ );
+ builder.addMatcher(
+ isLoadTenantSpecificCollectionPermissionsAction,
+ () => null,
+ );
+ builder.addMatcher(isClearSaveErrorAction, () => null);
+ builder.addMatcher(isSaveErrorAction, (state, { payload }) => {
+ return getErrorMessage(payload);
+ });
+});
+
+const dataPermissions = createReducer<GroupsPermissions | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadDataPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isLoadDataPermissionsForGroupAction,
+ (state, { payload }) =>
+ state != null ? merge(payload.groups, current(state)) : payload.groups,
+ );
+ builder.addMatcher(
+ isLoadDataPermissionsForDbAction,
+ (state, { payload }) =>
+ state != null ? merge(payload.groups, current(state)) : payload.groups,
+ );
+ builder.addMatcher(isSaveDataPermissionsAction, (state, { payload }) =>
+ mergeGroupsPermissionsUpdates(
+ state,
+ payload.groups,
+ payload.modifiedGroupIds,
+ ),
+ );
+ builder.addMatcher(isUpdateDataPermissionAction, (state, { payload }) => {
+ if (payload == null || state == null) {
+ return state;
+ }
+
+ state = current(state); // some of the update functions use icepick which is incompatible with immer
+
+ const { value, groupId, entityId, metadata, permissionInfo } = payload;
+
+ const database = metadata.database(entityId.databaseId);
+
+ if (database == null) {
+ return state;
+ }
+
+ if (permissionInfo.type === DataPermissionType.DETAILS) {
+ return updatePermission(
+ state,
+ groupId,
+ entityId.databaseId,
+ DataPermission.DETAILS,
+ [],
+ value,
+ );
+ }
+
+ if (permissionInfo.type === DataPermissionType.TRANSFORMS) {
+ return updatePermission(
+ state,
+ groupId,
+ entityId.databaseId,
+ DataPermission.TRANSFORMS,
+ [],
+ value,
+ );
+ }
+
+ if (
+ permissionInfo.type === DataPermissionType.NATIVE &&
+ PLUGIN_DATA_PERMISSIONS.upgradeViewPermissionsIfNeeded
+ ) {
+ state = PLUGIN_DATA_PERMISSIONS.upgradeViewPermissionsIfNeeded(
+ state,
+ groupId,
+ entityId,
+ value,
+ database,
+ permissionInfo.permission,
+ );
+ }
+
+ state = restrictCreateQueriesPermissionsIfNeeded(
+ state,
+ groupId,
+ entityId,
+ permissionInfo.permission,
+ value,
+ database,
+ );
+
+ state = revokeTransformsPermissionIfNeeded(
+ state,
+ groupId,
+ entityId,
+ permissionInfo.permission,
+ value,
+ );
+
+ if (isTableEntityId(entityId)) {
+ const updatedPermissions = updateFieldsPermission(
+ state,
+ groupId,
+ entityId,
+ value,
+ database,
+ permissionInfo.permission,
+ );
+ return inferAndUpdateEntityPermissions(
+ updatedPermissions,
+ groupId,
+ entityId,
+ database,
+ permissionInfo.permission,
+ );
+ } else if (isSchemaEntityId(entityId)) {
+ return updateTablesPermission(
+ state,
+ groupId,
+ entityId,
+ value,
+ database,
+ permissionInfo.permission,
+ );
+ } else {
+ return updateSchemasPermission(
+ state,
+ groupId,
+ entityId,
+ value,
+ database,
+ permissionInfo.permission,
+ );
+ }
+ });
+ },
+);
+
+const originalDataPermissions = createReducer<GroupsPermissions | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadDataPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isLoadDataPermissionsForGroupAction,
+ (state, { payload }) =>
+ state != null ? merge(payload.groups, current(state)) : payload.groups,
+ );
+ builder.addMatcher(
+ isLoadDataPermissionsForDbAction,
+ (state, { payload }) =>
+ state != null ? merge(payload.groups, current(state)) : payload.groups,
+ );
+ builder.addMatcher(isSaveDataPermissionsAction, (state, { payload }) =>
+ mergeGroupsPermissionsUpdates(
+ state,
+ payload.groups,
+ payload.modifiedGroupIds,
+ ),
+ );
+ },
+);
+
+const dataPermissionsRevision = createReducer<number | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadDataPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ builder.addMatcher(
+ isLoadDataPermissionsForGroupAction,
+ (state, { payload }) => payload.revision,
+ );
+ builder.addMatcher(
+ isLoadDataPermissionsForDbAction,
+ (state, { payload }) => payload.revision,
+ );
+ builder.addMatcher(
+ isSaveDataPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ },
+);
+
+function getDecendentCollections(collection: Collection): Collection[] {
+ if (!collection.children) {
+ return [];
+ }
+ const subCollections = collection.children.filter(
+ (collection) => !collection.is_personal,
+ );
+ return subCollections.concat(...subCollections.map(getDecendentCollections));
+}
+
+const collectionPermissions = createReducer<CollectionPermissions | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isUpdateCollectionPermissionAction,
+ (state, { payload }) => {
+ const {
+ collection,
+ groupId,
+ originalPermissionsState,
+ shouldPropagateToChildren,
+ value,
+ } = payload;
+ let newPermissionsState = assocIn(
+ state != null ? current(state) : state,
+ [groupId, collection.id],
+ value,
+ );
+
+ /**
+ * Check if shouldPropagateToChildren is explicitly set (true or false) vs unset (null or undefined).
+ * If it's a boolean, we either propagate the new value or restore the original. When not a boolean, we do nothing.
+ */
+ if (isBoolean(shouldPropagateToChildren)) {
+ for (const descendent of getDecendentCollections(collection)) {
+ newPermissionsState = assocIn(
+ newPermissionsState,
+ [groupId, descendent.id],
+ shouldPropagateToChildren
+ ? value
+ : originalPermissionsState?.[groupId]?.[descendent.id],
+ );
+ }
+ }
+
+ return newPermissionsState;
+ },
+ );
+ builder.addMatcher(
+ isSaveCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ },
+);
+
+const originalCollectionPermissions =
+ createReducer<CollectionPermissions | null>(null, (builder) => {
+ builder.addMatcher(
+ isLoadCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isSaveCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ });
+
+const collectionPermissionsRevision = createReducer<number | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadCollectionPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ builder.addMatcher(
+ isSaveCollectionPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ },
+);
+
+function handleUpdateTenantCollectionPermission(
+ state: CollectionPermissions | null,
+ { payload }: PayloadAction<UpdateTenantCollectionPermissionParams>,
+) {
+ const { groupId, collection, value, shouldPropagateToChildren } = payload;
+ let newPermissions = assocIn(
+ state != null ? current(state) : state,
+ [groupId, collection.id],
+ value,
+ );
+
+ if (shouldPropagateToChildren) {
+ for (const descendent of getDecendentCollections(collection)) {
+ newPermissions = assocIn(newPermissions, [groupId, descendent.id], value);
+ }
+ }
+ return newPermissions;
+}
+
+const tenantCollectionPermissions = createReducer<CollectionPermissions | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadTenantCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isUpdateTenantCollectionPermissionAction,
+ handleUpdateTenantCollectionPermission,
+ );
+ builder.addMatcher(
+ isSaveTenantCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ },
+);
+
+const originalTenantCollectionPermissions =
+ createReducer<CollectionPermissions | null>(null, (builder) => {
+ builder.addMatcher(
+ isLoadTenantCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isSaveTenantCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ });
+
+const tenantCollectionPermissionsRevision = createReducer<number | null>(
+ null,
+ (builder) => {
+ builder.addMatcher(
+ isLoadTenantCollectionPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ builder.addMatcher(
+ isSaveTenantCollectionPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ },
+);
+
+const tenantSpecificCollectionPermissions =
+ createReducer<CollectionPermissions | null>(null, (builder) => {
+ builder.addMatcher(
+ isLoadTenantSpecificCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isUpdateTenantSpecificCollectionPermissionAction,
+ handleUpdateTenantCollectionPermission, // same handler for tenant and tenant-specific
+ );
+ builder.addMatcher(
+ isSaveTenantSpecificCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ });
+
+const originalTenantSpecificCollectionPermissions =
+ createReducer<CollectionPermissions | null>(null, (builder) => {
+ builder.addMatcher(
+ isLoadTenantSpecificCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ builder.addMatcher(
+ isSaveTenantSpecificCollectionPermissionsAction,
+ (state, { payload }) => payload.groups,
+ );
+ });
+
+const tenantSpecificCollectionPermissionsRevision = createReducer<
+ number | null
+>(null, (builder) => {
+ builder.addMatcher(
+ isLoadTenantSpecificCollectionPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+ builder.addMatcher(
+ isSaveTenantSpecificCollectionPermissionsAction,
+ (state, { payload }) => payload.revision,
+ );
+});
+
+export const TOGGLE_HELP_REFERENCE =
+ "metabase/admin/permissions/TOGGLE_HELP_REFERENCE";
+export const toggleHelpReference = createAction(TOGGLE_HELP_REFERENCE);
+function isToggleHelpReferenceAction(
+ action: UnknownAction,
+): action is PayloadAction<void> {
+ return !isErrorAction(action) && action.type === TOGGLE_HELP_REFERENCE;
+}
+
+export const isHelpReferenceOpen = createReducer<boolean>(false, (builder) => {
+ builder.addMatcher(isToggleHelpReferenceAction, (state) => !state);
+});
+
+interface RevisionChangedState {
+ revision: number | null;
+ hasChanged: boolean;
+}
+
+const checkRevisionChanged = (
+ state: RevisionChangedState,
+ { payload }: PayloadAction<{ revision: number }>,
+) => {
+ if (!state.revision) {
+ return {
+ revision: payload.revision,
+ hasChanged: false,
+ };
+ } else if (state.revision === payload.revision && !state.hasChanged) {
+ return state;
+ } else {
+ return {
+ revision: payload.revision,
+ hasChanged: true,
+ };
+ }
+};
+const hasRevisionChanged = createReducer<RevisionChangedState>(
+ {
+ revision: null,
+ hasChanged: false,
+ },
+ (builder) => {
+ builder.addMatcher(isLoadDataPermissionsAction, checkRevisionChanged);
+ builder.addMatcher(
+ isLoadDataPermissionsForGroupAction,
+ checkRevisionChanged,
+ );
+ builder.addMatcher(isLoadDataPermissionsForDbAction, checkRevisionChanged);
+ builder.addMatcher(isSaveDataPermissionsAction, (state, { payload }) => ({
+ revision: payload.revision,
+ hasChanged: false,
+ }));
+ },
+);
+
+export const permissions = combineReducers({
+ saveError,
+ dataPermissions,
+ originalDataPermissions,
+ dataPermissionsRevision,
+ collectionPermissions,
+ originalCollectionPermissions,
+ collectionPermissionsRevision,
+ tenantCollectionPermissions,
+ originalTenantCollectionPermissions,
+ tenantCollectionPermissionsRevision,
+ tenantSpecificCollectionPermissions,
+ originalTenantSpecificCollectionPermissions,
+ tenantSpecificCollectionPermissionsRevision,
+ isHelpReferenceOpen,
+ hasRevisionChanged,
+});
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
index 975e4a2a3a2..08f45e74e04 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
@@ -1,6 +1,5 @@
import { createSelector } from "@reduxjs/toolkit";
import { getIn } from "icepick";
-import type { ReactElement } from "react";
import { t } from "ttag";
import _ from "underscore";
@@ -39,7 +38,13 @@ import type {
import { COLLECTION_OPTIONS } from "../constants/collections-permissions";
import { Messages } from "../constants/messages";
-import type { DataPermissionValue, SpecialGroupType } from "../types";
+import {
+ DataPermission,
+ DataPermissionType,
+ type DataPermissionValue,
+ type PermissionEditorType,
+ type SpecialGroupType,
+} from "../types";
import { getPermissionWarningModal } from "./confirmations";
@@ -235,54 +240,12 @@ const getCollectionDisabledTooltip = (
}
};
-type PermissionOption = {
- label: string;
- value: string;
- icon: string;
- iconColor: string;
-};
-
-type PermissionConfirmation = {
- title: string;
- message: string;
- confirmButtonText: string;
- cancelButtonText: string;
-};
-
-export type CollectionPermissionEditorType = null | {
- title: string;
- filterPlaceholder: string;
- columns: [{ name: string }, { name: string }];
- entities: {
- id: number;
- name: string;
- icon?: ReactElement;
- permissions: {
- toggleLabel: string | null;
- hasChildren: boolean;
- isDisabled: boolean;
- disabledTooltip: string | null;
- value: string;
- warning: string | null;
- confirmations: (
- newValue: DataPermissionValue,
- ) => (PermissionConfirmation | undefined)[];
- options: PermissionOption[];
- }[];
- }[];
-};
-
export const getCollectionsPermissionEditor = createSelector(
getCollectionsPermissions,
getCollectionEntity,
Groups.selectors.getList,
getNamespace,
- (
- permissions,
- collection,
- groups,
- namespace,
- ): CollectionPermissionEditorType => {
+ (permissions, collection, groups, namespace): PermissionEditorType | null => {
if (!permissions || collection == null) {
return null;
}
@@ -357,6 +320,8 @@ export const getCollectionsPermissionEditor = createSelector(
) : undefined,
permissions: [
{
+ permission: DataPermission.COLLECTIONS,
+ type: DataPermissionType.COLLECTIONS,
toggleLabel,
hasChildren,
isDisabled,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
index 2b17ea445c4..385db5c0881 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
@@ -6,7 +6,11 @@ import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
import type { Group } from "metabase-types/api";
-import type { DataRouteParams, GroupRouteParams } from "../../types";
+import type {
+ DataRouteParams,
+ GroupRouteParams,
+ PermissionEditorBreadcrumb,
+} from "../../types";
import {
getDatabaseEntityId,
getSchemaEntityId,
@@ -17,17 +21,11 @@ import {
getGroupFocusPermissionsUrl,
} from "../../utils/urls";
-export type EditorBreadcrumb = {
- id?: number | string;
- text: string;
- url?: string;
-};
-
export const getDatabasesEditorBreadcrumbs = (
params: GroupRouteParams,
metadata: Metadata,
group: Group,
-): EditorBreadcrumb[] | null => {
+): PermissionEditorBreadcrumb[] | null => {
const { groupId, databaseId, schemaName } = params;
if (groupId == null) {
@@ -70,7 +68,7 @@ export const getDatabasesEditorBreadcrumbs = (
export const getGroupsDataEditorBreadcrumbs = (
params: DataRouteParams,
metadata: Metadata,
-): EditorBreadcrumb[] | null => {
+): PermissionEditorBreadcrumb[] | null => {
const { databaseId, schemaName, tableId } = params;
if (databaseId == null) {
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
index 2085b72b582..321cc248bb9 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
@@ -21,18 +21,18 @@ import { getDatabase } from "../../utils/metadata";
import { getIsLoadingDatabaseTables } from "./permission-editor";
-type DataTreeNodeItem = {
+export type DataTreeNodeItem = {
entityId: EntityId;
children?: DataTreeNodeItem[];
} & ITreeNodeItem;
-type DataSidebarProps = {
+export type DataSidebarProps = {
title?: string;
description?: string;
entityGroups: DataTreeNodeItem[][];
entityViewFocus?: "database";
- selectedId?: string | null;
- filterPlaceholder?: string;
+ selectedId?: string;
+ filterPlaceholder: string;
};
const getRouteParams = (
@@ -73,7 +73,7 @@ const getTablesSidebar = (
schemaName?: string,
tableId?: string,
): DataSidebarProps => {
- let selectedId = null;
+ let selectedId: string | undefined = undefined;
if (tableId != null) {
selectedId = getTableId(tableId);
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
index b260b24b5fb..52b88d7e191 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
@@ -5,6 +5,7 @@ import { getGroupNameLocalized } from "metabase/lib/groups";
import type { Group } from "metabase-types/api";
import type { State } from "metabase-types/store";
+import type { PermissionsSidebarContentProps } from "../../components/PermissionsSidebar/PermissionsSidebarContent";
import type { RawGroupRouteParams } from "../../types";
import { getOrderedGroups } from "./groups";
@@ -21,10 +22,15 @@ const getGroupRouteParams = (
};
};
+export type GroupSidebarProps = Pick<
+ PermissionsSidebarContentProps,
+ "selectedId" | "entityGroups" | "entityViewFocus" | "filterPlaceholder"
+>;
+
export const getGroupsSidebar = createSelector(
getOrderedGroups,
getGroupRouteParams,
- (groups: Group[][], params) => {
+ (groups: Group[][], params): GroupSidebarProps => {
const { groupId } = params;
const [pinnedGroups, externalGroups, internalGroups] = groups;
@@ -32,19 +38,19 @@ export const getGroupsSidebar = createSelector(
const pinnedGroupItems = pinnedGroups.map((group) => ({
...group,
name: getGroupNameLocalized(group),
- icon: "bolt",
+ icon: "bolt" as const,
}));
const internalGroupItems = internalGroups.map((group) => ({
...group,
name: getGroupNameLocalized(group),
- icon: "group",
+ icon: "group" as const,
}));
const externalGroupItems = externalGroups.map((group) => ({
...group,
name: getGroupNameLocalized(group),
- icon: group.magic_group_type ? "bolt" : "globe",
+ icon: group.magic_group_type ? ("bolt" as const) : ("globe" as const),
}));
const entityGroups = [
@@ -54,7 +60,7 @@ export const getGroupsSidebar = createSelector(
].filter((groups) => groups.length > 0);
return {
- selectedId: groupId,
+ selectedId: groupId ?? undefined,
entityGroups,
entityViewFocus: "group",
filterPlaceholder: t`Search for a group`,
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.tsx
index 0e6ad9309e0..ecad4d19f96 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
@@ -17,24 +17,23 @@ import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
import { getSetting } from "metabase/selectors/settings";
import { getTokenFeature } from "metabase/setup";
import type Schema from "metabase-lib/v1/metadata/Schema";
-import type {
- Database,
- DatabaseId,
- Group,
- GroupsPermissions,
- TableId,
-} from "metabase-types/api";
+import type { Database, Group, GroupsPermissions } from "metabase-types/api";
import type { State } from "metabase-types/store";
import type {
DataRouteParams,
EntityId,
+ PermissionEditorType,
PermissionSectionConfig,
PermissionSubject,
RawGroupRouteParams,
SpecialGroupType,
} from "../../types";
-import { DataPermission, DataPermissionValue } from "../../types";
+import {
+ DataPermission,
+ DataPermissionValue,
+ parseGroupRouteParams,
+} from "../../types";
import {
getDatabaseEntityId,
getSchemaEntityId,
@@ -42,7 +41,6 @@ import {
} from "../../utils/data-entity-id";
import { hasPermissionValueInEntityGraphs } from "../../utils/graph";
-import type { EditorBreadcrumb } from "./breadcrumbs";
import {
getDatabasesEditorBreadcrumbs,
getGroupsDataEditorBreadcrumbs,
@@ -112,12 +110,7 @@ const getGroupRouteParams = (
_state: State,
props: { params: RawGroupRouteParams },
) => {
- const { groupId, databaseId, schemaName } = props.params;
- return {
- groupId: groupId != null ? parseInt(groupId) : undefined,
- databaseId: databaseId != null ? parseInt(databaseId) : undefined,
- schemaName,
- };
+ return parseGroupRouteParams(props.params);
};
const getEditorEntityName = (
@@ -220,7 +213,7 @@ export const getDatabasesPermissionEditor = createSelector(
groups: Group[],
isLoading,
showTransformPermissions,
- ) => {
+ ): PermissionEditorType | null => {
const { groupId, databaseId, schemaName } = params;
if (isLoading || !permissions || groupId == null || !group) {
@@ -383,26 +376,6 @@ export const getDatabasesPermissionEditor = createSelector(
},
);
-type DataPermissionEditorEntity = {
- id: Group["id"];
- name: Group["name"];
- hint: React.ReactNode | string | null;
- entityId: {
- databaseId?: DatabaseId;
- schemaName?: Schema["name"];
- tableId?: TableId;
- };
- permissions?: PermissionSectionConfig[];
-};
-
-type DataPermissionEditorProps = {
- title: string;
- filterPlaceholder: string;
- breadcrumbs: EditorBreadcrumb[] | null;
- columns: { name: string }[];
- entities: DataPermissionEditorEntity[];
-};
-
type GetGroupsDataPermissionEditorSelectorParameters =
RouteParamsSelectorParameters & {
includeHiddenTables?: boolean;
@@ -410,7 +383,7 @@ type GetGroupsDataPermissionEditorSelectorParameters =
type GetGroupsDataPermissionEditorSelector = Selector<
State,
- DataPermissionEditorProps | null,
+ PermissionEditorType | null,
GetGroupsDataPermissionEditorSelectorParameters[]
>;
@@ -522,7 +495,11 @@ export const getGroupsDataPermissionEditor: GetGroupsDataPermissionEditorSelecto
<PLUGIN_TENANTS.TenantGroupHintIcon />
) : undefined,
hint: getGroupHint(groupType),
- entityId: params,
+ entityId: {
+ databaseId,
+ schemaName,
+ tableId,
+ },
permissions: groupPermissions,
};
});
diff --git a/frontend/src/metabase/admin/permissions/types.ts b/frontend/src/metabase/admin/permissions/types.ts
index 08eeab0cbdd..52cbdf61691 100644
--- a/frontend/src/metabase/admin/permissions/types.ts
+++ b/frontend/src/metabase/admin/permissions/types.ts
@@ -1,4 +1,10 @@
-import type { ReactNode } from "react";
+import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
+import type { ReactElement, ReactNode } from "react";
+
+import type { ColorName } from "metabase/lib/colors/types";
+import type { IconName } from "metabase/ui";
+import type { GroupId } from "metabase-types/api";
+import type { State } from "metabase-types/store";
export type GroupRouteParams = {
groupId?: number;
@@ -12,6 +18,16 @@ export type RawGroupRouteParams = {
schemaName?: string;
};
+export function parseGroupRouteParams(
+ raw: RawGroupRouteParams,
+): GroupRouteParams {
+ return {
+ groupId: raw.groupId != null ? parseInt(raw.groupId) : undefined,
+ databaseId: raw.databaseId != null ? parseInt(raw.databaseId) : undefined,
+ schemaName: raw.schemaName,
+ };
+}
+
export type DataRouteParams = {
databaseId?: number;
schemaName?: string;
@@ -24,6 +40,14 @@ export type RawDataRouteParams = {
tableId?: string;
};
+export function parseDataRouteParams(raw: RawDataRouteParams): DataRouteParams {
+ return {
+ databaseId: raw.databaseId != null ? parseInt(raw.databaseId) : undefined,
+ schemaName: raw.schemaName,
+ tableId: raw.tableId != null ? parseInt(raw.tableId) : undefined,
+ };
+}
+
export type DatabaseEntityId = {
databaseId: number;
};
@@ -48,6 +72,7 @@ export enum DataPermission {
DATA_MODEL = "data-model",
DETAILS = "details",
TRANSFORMS = "transforms",
+ COLLECTIONS = "collections",
}
export enum DataPermissionType {
@@ -57,6 +82,7 @@ export enum DataPermissionType {
DOWNLOAD = "download",
DATA_MODEL = "data-model",
TRANSFORMS = "transforms",
+ COLLECTIONS = "collections",
}
export enum DataPermissionValue {
@@ -77,51 +103,121 @@ export enum DataPermissionValue {
YES = "yes",
// data model specific values
ALL = "all",
+ //collections
+ WRITE = "write",
+ READ = "read",
+ //NONE = "none", //shared with download above
}
+export type DatabasePermissionsDiff = {
+ name: string;
+ grantedTables?: Record<number | string, { name: string }>;
+ revokedTables?: Record<number | string, { name: string }>;
+ native?: DataPermissionValue;
+};
+
+export type GroupPermissionsDiff = {
+ name: string;
+ databases: Record<number | string, DatabasePermissionsDiff>;
+};
+
+export type PermissionsGraphDiff = {
+ groups: Record<number | string, GroupPermissionsDiff>;
+};
+
export type PermissionSubject = "schemas" | "tables" | "fields";
export type SpecialGroupType = "admin" | "analyst" | "external" | null;
+export interface PermissionOption {
+ label: string;
+ value: DataPermissionValue;
+ icon: IconName;
+ iconColor: ColorName;
+}
+
+export interface PermissionAction {
+ label: string;
+ icon: IconName;
+ iconColor: ColorName;
+ actionCreator: (
+ entityId: EntityId | undefined,
+ id: number,
+ view: "database" | "group",
+ ) => ThunkDispatch<State, unknown, UnknownAction>;
+}
+
+export interface PermissionConfirmationProps {
+ title: string;
+ message: string | ReactNode;
+ confirmButtonText: string;
+ cancelButtonText: string;
+}
+
+type PostActionFunction = (
+ entityId: EntityId,
+ groupId: GroupId,
+ view: "database" | "group",
+ value: DataPermissionValue,
+ getState: () => State,
+) => void;
+
export type PermissionSectionConfig = {
permission: DataPermission;
type: DataPermissionType;
value: DataPermissionValue;
isDisabled: boolean;
disabledTooltip: string | null;
- isHighlighted: boolean;
+ isHighlighted?: boolean;
warning?: string | null;
- options: {
- label: string;
- value: string;
- icon: string;
- iconColor: string;
- }[];
+ toggleLabel?: string | null;
+ toggleDefaultValue?: boolean | null;
+ toggleDisabled?: boolean | null;
+ hasChildren?: boolean;
+ options: PermissionOption[];
actions?: Partial<
- Record<
- DataPermissionValue,
- | {
- label: string;
- icon: string;
- iconColor: string;
- actionCreator: (...args: unknown[]) => void;
- }[]
- | undefined
- >
+ Record<DataPermissionValue, PermissionAction[] | undefined>
>;
postActions?: Partial<
- Record<
- DataPermissionValue,
- ((...args: unknown[]) => void) | null | undefined
- >
+ Record<DataPermissionValue, PostActionFunction | null | undefined>
>;
- confirmations?: (newValue: DataPermissionValue) => (
- | {
- title: string;
- message: string | ReactNode;
- confirmButtonText: string;
- cancelButtonText: string;
- }
- | undefined
- )[];
+ confirmations?: (
+ newValue: DataPermissionValue,
+ ) => (PermissionConfirmationProps | undefined)[];
+};
+
+// most entity ids are numbers, and many call sites expect a number, so here's a helper
+export function assertNumericId(id: string | number): number {
+ if (typeof id !== "number") {
+ throw new Error(`Expected numeric PermissionEditorEntity id, got: ${id}`);
+ }
+ return id;
+}
+
+export interface PermissionEditorEntity {
+ id: number | string; //schemas have string ids
+ name: string;
+ icon?: ReactElement;
+ hint?: ReactNode;
+ entityId?: EntityId;
+ permissions?: PermissionSectionConfig[];
+ canSelect?: boolean;
+ callout?: string;
+}
+
+export type PermissionEditorBreadcrumb = {
+ id?: number | string;
+ text: string;
+ subtext?: string;
+ url?: string;
+};
+
+export type PermissionEditorType = {
+ title: string;
+ description?: string | null;
+ filterPlaceholder: string;
+ columns: { name: string; hint?: string }[];
+ entities: PermissionEditorEntity[];
+ breadcrumbs?: PermissionEditorBreadcrumb[] | null;
+ hasLegacyNoSelfServiceValueInPermissionGraph?: boolean;
};
diff --git a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts b/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
index 5c8897425fd..7c47dcb178d 100644
--- a/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
+++ b/frontend/src/metabase/admin/permissions/utils/data-entity-id.ts
@@ -32,7 +32,7 @@ export const isTableEntityId = (
export const isSchemaEntityId = (
entityId: Partial<EntityId>,
-): entityId is SchemaEntityId & { schemaName: string } =>
+): entityId is SchemaEntityId & { schemaName: string } => // not sure why schemaName can be undefined on SchemaEntityId
entityId.schemaName != null &&
entityId.schemaName !== "" &&
!isTableEntityId(entityId);
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts
index ccd145e72de..a079369bb88 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/get.ts
@@ -44,6 +44,7 @@ const omittedDefaultValues: Record<DataPermission, DataPermissionValue> = {
[DataPermission.DATA_MODEL]: DataPermissionValue.NONE,
[DataPermission.DETAILS]: DataPermissionValue.NO,
[DataPermission.TRANSFORMS]: DataPermissionValue.NO,
+ [DataPermission.COLLECTIONS]: DataPermissionValue.NONE,
};
function getOmittedPermissionValue(
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts b/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts
index ca149b435b6..ef16d454b60 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts
@@ -5,6 +5,11 @@ import type {
GroupsPermissions,
} from "metabase-types/api";
+import type {
+ DatabasePermissionsDiff,
+ GroupPermissionsDiff,
+ PermissionsGraphDiff,
+} from "../../types";
import { DataPermission } from "../../types";
import {
@@ -24,11 +29,11 @@ function diffDatabasePermissions(
oldPerms: GroupsPermissions,
groupId: number,
database: Database,
-) {
+): Partial<DatabasePermissionsDiff> {
const databaseDiff: {
- grantedTables: any;
- revokedTables: any;
- native?: any;
+ grantedTables: NonNullable<DatabasePermissionsDiff["grantedTables"]>;
+ revokedTables: NonNullable<DatabasePermissionsDiff["revokedTables"]>;
+ native?: DatabasePermissionsDiff["native"];
} = {
grantedTables: {},
revokedTables: {},
@@ -91,8 +96,10 @@ function diffGroupPermissions(
oldPerms: GroupsPermissions,
groupId: number,
databases: Database[],
-) {
- const groupDiff: { databases: any } = { databases: {} };
+): Partial<GroupPermissionsDiff> {
+ const groupDiff: {
+ databases: Record<number | string, Partial<DatabasePermissionsDiff>>;
+ } = { databases: {} };
for (const database of databases) {
groupDiff.databases[database.id] = diffDatabasePermissions(
newPerms,
@@ -106,7 +113,7 @@ function diffGroupPermissions(
}
}
deleteIfEmpty(groupDiff, "databases");
- return groupDiff;
+ return groupDiff as Partial<GroupPermissionsDiff>;
}
export function diffDataPermissions(
@@ -114,8 +121,10 @@ export function diffDataPermissions(
oldPerms: GroupsPermissions,
groups: Group[],
databases: Database[],
-) {
- const permissionsDiff: { groups: any } = { groups: {} };
+): PermissionsGraphDiff {
+ const permissionsDiff: {
+ groups: Record<number | string, Partial<GroupPermissionsDiff>>;
+ } = { groups: {} };
if (newPerms && oldPerms && databases) {
for (const group of groups) {
permissionsDiff.groups[group.id] = diffGroupPermissions(
@@ -130,5 +139,5 @@ export function diffDataPermissions(
}
}
}
- return permissionsDiff;
+ return permissionsDiff as PermissionsGraphDiff;
}
diff --git a/frontend/src/metabase/admin/permissions/utils/urls.ts b/frontend/src/metabase/admin/permissions/utils/urls.ts
index c614413dc66..95630481847 100644
--- a/frontend/src/metabase/admin/permissions/utils/urls.ts
+++ b/frontend/src/metabase/admin/permissions/utils/urls.ts
@@ -1,3 +1,5 @@
+import type { GroupId } from "metabase-types/api";
+
import type { EntityId } from "../types";
import {
@@ -9,9 +11,7 @@ import {
export const DATABASES_BASE_PATH = `/admin/permissions/data/database`;
export const GROUPS_BASE_PATH = `/admin/permissions/data/group`;
-export const getDatabaseFocusPermissionsUrl = (
- entityId?: Partial<EntityId> | null,
-) => {
+export const getDatabaseFocusPermissionsUrl = (entityId?: EntityId) => {
if (entityId == null) {
return DATABASES_BASE_PATH;
}
@@ -35,11 +35,13 @@ export const getDatabaseFocusPermissionsUrl = (
if (isDatabaseEntityId(entityId)) {
return `${DATABASES_BASE_PATH}/${entityId.databaseId}`;
}
+
+ return DATABASES_BASE_PATH;
};
export const getGroupFocusPermissionsUrl = (
- groupId?: number | null,
- entityId?: Partial<EntityId> | null,
+ groupId?: GroupId,
+ entityId?: EntityId,
) => {
if (groupId == null) {
return GROUPS_BASE_PATH;
@@ -49,15 +51,15 @@ export const getGroupFocusPermissionsUrl = (
return `${GROUPS_BASE_PATH}/${groupId}`;
}
- if (isDatabaseEntityId(entityId)) {
- return `${GROUPS_BASE_PATH}/${groupId}/database/${entityId.databaseId}`;
- }
-
if (isSchemaEntityId(entityId)) {
return `${GROUPS_BASE_PATH}/${groupId}/database/${
entityId.databaseId
}/schema/${encodeURIComponent(entityId.schemaName)}`;
}
+ if (isDatabaseEntityId(entityId)) {
+ return `${GROUPS_BASE_PATH}/${groupId}/database/${entityId.databaseId}`;
+ }
+
return GROUPS_BASE_PATH;
};
diff --git a/frontend/src/metabase/admin/routes.jsx b/frontend/src/metabase/admin/routes.tsx
similarity index 87%
rename from frontend/src/metabase/admin/routes.jsx
rename to frontend/src/metabase/admin/routes.tsx
index 3aa7e58d1bb..0e4022a3569 100644
--- a/frontend/src/metabase/admin/routes.jsx
+++ b/frontend/src/metabase/admin/routes.tsx
@@ -1,6 +1,11 @@
import { Fragment } from "react";
-import { IndexRedirect, IndexRoute, Redirect, Route } from "react-router";
-import { t } from "ttag";
+import {
+ IndexRedirect,
+ IndexRoute,
+ Redirect,
+ Route,
+ type RouteComponent,
+} from "react-router";
import AdminApp from "metabase/admin/app/components/AdminApp";
import { DatabaseEditApp } from "metabase/admin/databases/containers/DatabaseEditApp";
@@ -50,6 +55,7 @@ import {
PLUGIN_WRITABLE_CONNECTION,
} from "metabase/plugins";
import { getTokenFeature } from "metabase/setup";
+import type { State } from "metabase-types/store";
import { ModelPersistenceConfiguration } from "./performance/components/ModelPersistenceConfiguration";
import { StrategyEditorForDatabases } from "./performance/components/StrategyEditorForDatabases";
@@ -64,7 +70,11 @@ import {
createTenantsRouteGuard,
} from "./utils";
-export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
+export const getRoutes = (
+ store: { getState: () => State },
+ CanAccessSettings: RouteComponent,
+ IsAdmin: RouteComponent,
+) => {
const hasSimpleEmbedding = getTokenFeature(
store.getState(),
"embedding_simple",
@@ -74,11 +84,7 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
<Route path="/admin" component={CanAccessSettings}>
<Route component={AdminApp}>
<IndexRoute component={RedirectToAllowedSettings} />
- <Route
- path="databases"
- title={t`Databases`}
- component={createAdminRouteGuard("databases")}
- >
+ <Route path="databases" component={createAdminRouteGuard("databases")}>
<IndexRoute component={DatabaseListApp} />
<Route component={IsAdmin}>
<Route path="create" component={DatabasePage} />
@@ -90,7 +96,7 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
</Route>
</Route>
<Route path="datamodel" component={createAdminRouteGuard("data-model")}>
- <Route title={t`Table Metadata`}>
+ <Route>
<IndexRedirect to="database" />
<Route path="database" component={DataModelV1} />
<Route path="database/:databaseId" component={DataModelV1} />
@@ -131,11 +137,11 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
</Route>
{/* PEOPLE */}
<Route path="people" component={createAdminRouteGuard("people")}>
- <Route title={t`People`} component={AdminPeopleApp}>
+ <Route component={AdminPeopleApp}>
<IndexRoute component={PeopleListingApp} />
{/*NOTE: this must come before the other routes otherwise it will be masked by them*/}
- <Route path="groups" title={t`Groups`}>
+ <Route path="groups">
<IndexRoute component={GroupsListingApp} />
<Route path=":groupId" component={GroupDetailApp} />
</Route>
@@ -166,7 +172,7 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
noWrap
/>
{PLUGIN_ADMIN_USER_MENU_ROUTES.map((getRoutes, index) => (
- <Fragment key={index}>{getRoutes(store)}</Fragment>
+ <Fragment key={index}>{getRoutes()}</Fragment>
))}
</Route>
</Route>
@@ -174,29 +180,20 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
{/* EMBEDDING */}
<Route path="embedding" component={createAdminRouteGuard("embedding")}>
- <Route title={t`Embedding`} component={AdminEmbeddingApp}>
+ <Route component={AdminEmbeddingApp}>
<IndexRoute component={EmbeddingSettings} />
<Route
path="setup-guide"
- title={t`Setup guide`}
component={EmbeddingHubAdminSettingsPage}
/>
{/* EE with non-starter plan has embedding settings on different pages */}
{hasSimpleEmbedding && (
<>
- <Route
- path="guest"
- title={t`Unauthenticated embeds`}
- component={GuestEmbedsSettings}
- />
+ <Route path="guest" component={GuestEmbedsSettings} />
- <Route
- path="security"
- title={t`Security`}
- component={EmbeddingSecuritySettings}
- />
+ <Route path="security" component={EmbeddingSecuritySettings} />
</>
)}
</Route>
@@ -237,7 +234,7 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
</Route>
{/* PERMISSIONS */}
<Route path="permissions" component={IsAdmin}>
- {getAdminPermissionsRoutes(store)}
+ {getAdminPermissionsRoutes()}
</Route>
{/* PERFORMANCE */}
@@ -245,21 +242,12 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
path="performance"
component={createAdminRouteGuard("performance")}
>
- <Route title={t`Performance`} component={PerformanceApp}>
+ <Route component={PerformanceApp}>
<IndexRedirect to={PerformanceTabId.Databases} />
- <Route
- path="databases"
- title={t`Databases`}
- component={StrategyEditorForDatabases}
- />
- <Route
- path="models"
- title={t`Models`}
- component={ModelPersistenceConfiguration}
- />
+ <Route path="databases" component={StrategyEditorForDatabases} />
+ <Route path="models" component={ModelPersistenceConfiguration} />
<Route
path="dashboards-and-questions"
- title={t`Dashboards and questions`}
component={PLUGIN_CACHING.StrategyEditorForQuestionsAndDashboards}
/>
</Route>
@@ -271,21 +259,16 @@ export const getRoutes = (store, CanAccessSettings, IsAdmin) => {
</Route>
<Route path="tools" component={createAdminRouteGuard("tools")}>
- <Route title={t`Tools`} component={ToolsApp}>
+ <Route component={ToolsApp}>
<IndexRedirect to="help" />
<Route
key="error-overview"
path="errors"
- title={t`Erroring Questions`}
// If the audit_app feature flag is present, our enterprise plugin system kicks in and we render the
// appropriate enterprise component. The upsell component is shown in all other cases.
component={PLUGIN_ADMIN_TOOLS.COMPONENT || ToolsUpsell}
/>
- <Route
- path="model-caching"
- title={t`Model Caching Log`}
- component={ModelCachePage}
- >
+ <Route path="model-caching" component={ModelCachePage}>
<ModalRoute path=":jobId" modal={ModelCacheRefreshJobModal} />
</Route>
<Route path="help" component={Help}>
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.jsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
similarity index 69%
rename from frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.jsx
rename to frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
index 484e2f2ceee..189143d37a0 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidgetView.tsx
@@ -1,15 +1,16 @@
-/* eslint-disable react/prop-types */
import cx from "classnames";
import { useField } from "formik";
import { useState } from "react";
import { t } from "ttag";
import _ from "underscore";
+import { getErrorMessage } from "metabase/api/utils/errors";
import { AdminContentTable } from "metabase/common/components/AdminContentTable";
import CS from "metabase/css/core/index.css";
import { FormSwitch } from "metabase/forms";
import { isDefaultGroup } from "metabase/lib/groups";
import { Icon, Tooltip } from "metabase/ui";
+import type { Group, GroupId } from "metabase-types/api";
import AddMappingRow from "./AddMappingRow";
import {
@@ -23,16 +24,16 @@ import {
} from "./GroupMappingsWidget.styled";
import { MappingRow } from "./MappingRow";
-const groupIsMappable = (group) => !isDefaultGroup(group);
+const groupIsMappable = (group: Group) => !isDefaultGroup(group);
-const helpText = (mappingSetting) => {
+const helpText = (mappingSetting: string) => {
if (mappingSetting === "jwt-group-mappings") {
return t`Mappings allow Metabase to automatically add and remove users from groups based on the membership information provided by the directory server. If no mappings are defined, groups will automatically be assigned based on exactly matching names.`;
}
return t`Mappings allow Metabase to automatically add and remove users from groups based on the membership information provided by the directory server. If a group isn‘t mapped, its membership won‘t be synced.`;
};
-const noMappingText = (mappingSetting, syncSwitchValue) => {
+const noMappingText = (mappingSetting: string, syncSwitchValue: boolean) => {
if (!syncSwitchValue) {
return `No mappings yet, group sync is not on`;
}
@@ -42,6 +43,24 @@ const noMappingText = (mappingSetting, syncSwitchValue) => {
return t`No mappings yet`;
};
+interface GroupMappingsWidgetViewProps {
+ groupHeading: string;
+ groupPlaceholder: string;
+ allGroups: Group[];
+ 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>;
+ updateSetting: ({
+ key,
+ value,
+ }: {
+ key: string;
+ value: Record<string, GroupId[]>;
+ }) => Promise<void>;
+ mappings: Record<string, GroupId[]>;
+ setting: { key: string };
+}
+
export function GroupMappingsWidgetView({
groupHeading,
groupPlaceholder,
@@ -51,10 +70,10 @@ export function GroupMappingsWidgetView({
clearGroupMember,
updateSetting,
mappings,
- ...props
-}) {
+ setting,
+}: GroupMappingsWidgetViewProps) {
const [showAddRow, setShowAddRow] = useState(false);
- const [saveError, setSaveError] = useState({});
+ const [saveError, setSaveError] = useState<string | null>(null);
const groups = allGroups.filter(groupIsMappable);
@@ -66,7 +85,7 @@ export function GroupMappingsWidgetView({
setShowAddRow(false);
};
- const handleAddMapping = async (name) => {
+ const handleAddMapping = async (name: string) => {
const mappingsPlusNewMapping = { ...mappings, [name]: [] };
try {
@@ -77,27 +96,34 @@ export function GroupMappingsWidgetView({
setShowAddRow(false);
setSaveError(null);
} catch (error) {
- setSaveError(error);
- }
- };
-
- const handleChangeMapping = (name) => async (group, selected) => {
- const updatedMappings = selected
- ? { ...mappings, [name]: [...mappings[name], group.id] }
- : {
- ...mappings,
- [name]: mappings[name].filter((id) => id !== group.id),
- };
-
- try {
- await updateSetting({ key: mappingSetting, value: updatedMappings });
- setSaveError(null);
- } catch (error) {
- setSaveError(error);
+ setSaveError(getErrorMessage(error));
}
};
- const handleDeleteMapping = async ({ name, onSuccess }) => {
+ const handleChangeMapping =
+ (name: string) => async (group: { id: GroupId }, selected: boolean) => {
+ const updatedMappings = selected
+ ? { ...mappings, [name]: [...mappings[name], group.id] }
+ : {
+ ...mappings,
+ [name]: mappings[name].filter((id) => id !== group.id),
+ };
+
+ try {
+ await updateSetting({ key: mappingSetting, value: updatedMappings });
+ setSaveError(null);
+ } catch (error) {
+ setSaveError(getErrorMessage(error));
+ }
+ };
+
+ const handleDeleteMapping = async ({
+ name,
+ onSuccess,
+ }: {
+ name: string;
+ onSuccess?: () => void;
+ }) => {
const mappingsMinusDeletedMapping = _.omit(mappings, name);
try {
@@ -106,14 +132,16 @@ export function GroupMappingsWidgetView({
value: mappingsMinusDeletedMapping,
});
- onSuccess && (await onSuccess());
+ if (onSuccess) {
+ await onSuccess();
+ }
setSaveError(null);
} catch (error) {
- setSaveError(error);
+ setSaveError(getErrorMessage(error));
}
};
- const [{ value: groupSyncSwitchValue }] = useField(props.setting.key);
+ const [{ value: groupSyncSwitchValue }] = useField<boolean>(setting.key);
return (
<WidgetAndErrorRoot>
@@ -121,10 +149,7 @@ export function GroupMappingsWidgetView({
<Header>
<ToggleRoot>
<span>{t`Synchronize Group Memberships`}</span>
- <FormSwitch
- data-testid="group-sync-switch"
- name={props.setting.key}
- />
+ <FormSwitch data-testid="group-sync-switch" name={setting.key} />
</ToggleRoot>
<About>
<Tooltip
@@ -184,10 +209,8 @@ export function GroupMappingsWidgetView({
</div>
</div>
</Root>
- {saveError?.data?.message && (
- <div className={cx(CS.textError, CS.textBold, CS.m1)}>
- {saveError.data.message}
- </div>
+ {saveError && (
+ <div className={cx(CS.textError, CS.textBold, CS.m1)}>{saveError}</div>
)}
</WidgetAndErrorRoot>
);
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx
index 0c687c656d9..8dfdea4938e 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/MappingRow/MappingRow.tsx
@@ -13,7 +13,7 @@ import AdminS from "metabase/css/admin.module.css";
import CS from "metabase/css/core/index.css";
import { isAdminGroup } from "metabase/lib/groups";
import { Icon, Tooltip } from "metabase/ui";
-import type { GroupInfo } from "metabase-types/api";
+import type { GroupId, GroupInfo } from "metabase-types/api";
import DeleteGroupMappingModal from "../DeleteGroupMappingModal";
import Selectbox from "../GroupSelect";
@@ -32,7 +32,7 @@ type MappingRowProps = {
selectedGroupIds: GroupIds;
clearGroupMember: ({ id }: { id: number }) => void;
deleteGroup: ({ id }: { id: number }) => void;
- onChange: () => void;
+ onChange: (group: { id: GroupId }, selected: boolean) => void;
onDeleteMapping: OnDeleteMappingType;
};
diff --git a/frontend/src/metabase/admin/settings/settings.js b/frontend/src/metabase/admin/settings/settings.ts
similarity index 84%
rename from frontend/src/metabase/admin/settings/settings.js
rename to frontend/src/metabase/admin/settings/settings.ts
index 3bfd321015e..0c715604b3f 100644
--- a/frontend/src/metabase/admin/settings/settings.js
+++ b/frontend/src/metabase/admin/settings/settings.ts
@@ -1,12 +1,16 @@
+import type { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
+
import { createThunkAction } from "metabase/lib/redux";
import { refreshSiteSettings } from "metabase/redux/settings";
import { SettingsApi } from "metabase/services";
+import type { State } from "metabase-types/store";
// ACTION TYPES AND ACTION CREATORS
-export const reloadSettings = () => async (dispatch) => {
- await dispatch(refreshSiteSettings());
-};
+export const reloadSettings =
+ () => async (dispatch: ThunkDispatch<State, unknown, UnknownAction>) => {
+ await dispatch(refreshSiteSettings());
+ };
export const INITIALIZE_SETTINGS =
"metabase/admin/settings/INITIALIZE_SETTINGS";
diff --git a/frontend/src/metabase/admin/settings/utils.js b/frontend/src/metabase/admin/settings/utils.js
deleted file mode 100644
index 0fd14e58dc7..00000000000
--- a/frontend/src/metabase/admin/settings/utils.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { t } from "ttag";
-
-import { useDocsUrl } from "metabase/common/hooks";
-
-export const settingToFormField = (setting) => ({
- name: setting.key,
- label: setting.display_name,
- description: setting.description,
- placeholder: setting.is_env_setting
- ? t`Using ${setting.env_name}`
- : setting.placeholder || setting.default,
- required: setting.required,
- autoFocus: setting.autoFocus,
-});
-
-export const settingToFormFieldId = (setting) => `setting-${setting.key}`;
-
-export const useGetEnvVarDocsUrl = (envName) => {
- return useDocsUrl("configuring-metabase/environment-variables", {
- anchor: envName?.toLowerCase(),
- });
-};
-
-export const getExtraFormFieldProps = (setting) => {
- if (setting?.is_env_setting) {
- return {
- description: t`Using ${setting.env_name}`,
- readOnly: true,
- };
- }
- return {
- description: setting?.description ?? "",
- };
-};
diff --git a/frontend/src/metabase/admin/settings/utils.ts b/frontend/src/metabase/admin/settings/utils.ts
new file mode 100644
index 00000000000..adf8ed5af36
--- /dev/null
+++ b/frontend/src/metabase/admin/settings/utils.ts
@@ -0,0 +1,22 @@
+import { t } from "ttag";
+
+import { useDocsUrl } from "metabase/common/hooks";
+import type { SettingDefinition } from "metabase-types/api";
+
+export const useGetEnvVarDocsUrl = (envName: string | undefined) => {
+ return useDocsUrl("configuring-metabase/environment-variables", {
+ anchor: envName?.toLowerCase(),
+ });
+};
+
+export const getExtraFormFieldProps = (setting?: SettingDefinition) => {
+ if (setting?.is_env_setting) {
+ return {
+ description: t`Using ${setting.env_name}`,
+ readOnly: true,
+ };
+ }
+ return {
+ description: setting?.description ?? "",
+ };
+};
diff --git a/frontend/src/metabase/admin/tools/components/JobTriggersModal.tsx b/frontend/src/metabase/admin/tools/components/JobTriggersModal.tsx
index 28db88b42fa..82819fde267 100644
--- a/frontend/src/metabase/admin/tools/components/JobTriggersModal.tsx
+++ b/frontend/src/metabase/admin/tools/components/JobTriggersModal.tsx
@@ -51,7 +51,7 @@ const renderTriggersTable = (triggers?: Trigger[]) => {
interface JobTriggersModalProps {
params: {
- jobKey: string;
+ jobKey?: string;
};
onClose: () => void;
}
diff --git a/frontend/src/metabase/admin/utils.js b/frontend/src/metabase/admin/utils.ts
similarity index 71%
rename from frontend/src/metabase/admin/utils.js
rename to frontend/src/metabase/admin/utils.ts
index 0f4d2998d26..25ed62fd401 100644
--- a/frontend/src/metabase/admin/utils.js
+++ b/frontend/src/metabase/admin/utils.ts
@@ -1,4 +1,3 @@
-import PropTypes from "prop-types";
import { useLayoutEffect } from "react";
import { push, replace, routerActions } from "react-router-redux";
import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
@@ -6,9 +5,11 @@ import { connectedReduxRedirect } from "redux-auth-wrapper/history3/redirect";
import { getAdminPaths } from "metabase/admin/app/selectors";
import { MetabaseReduxContext, connect } from "metabase/lib/redux";
import { getSetting } from "metabase/selectors/settings";
+import type { State } from "metabase-types/store";
+import type { AdminPath } from "metabase-types/store/admin";
-export const createAdminRouteGuard = (routeKey, Component) => {
- const Wrapper = connectedReduxRedirect({
+export const createAdminRouteGuard = (routeKey: string) => {
+ const Wrapper = connectedReduxRedirect<any, State>({
wrapperDisplayName: `CanAccess(${routeKey})`,
redirectPath: "/unauthorized",
allowRedirectBack: false,
@@ -18,10 +19,10 @@ export const createAdminRouteGuard = (routeKey, Component) => {
context: MetabaseReduxContext,
});
- return Wrapper(Component ?? (({ children }) => children));
+ return Wrapper(({ children }) => children);
};
-const mapStateToProps = (state, props) => ({
+const mapStateToProps = (state: State, props: { location: Location }) => ({
adminItems: getAdminPaths(state),
path: props.location.pathname,
});
@@ -31,7 +32,15 @@ const mapDispatchToProps = {
replace,
};
-const RedirectToAllowedSettingsInner = ({ adminItems, replace }) => {
+interface RedirectToAllowedSettingsInnerProps {
+ adminItems: AdminPath[];
+ replace: (path: string) => void;
+}
+
+const RedirectToAllowedSettingsInner = ({
+ adminItems,
+ replace,
+}: RedirectToAllowedSettingsInnerProps) => {
useLayoutEffect(() => {
replace(adminItems.length === 0 ? "/unauthorized" : adminItems[0].path);
}, [adminItems, replace]);
@@ -39,18 +48,13 @@ const RedirectToAllowedSettingsInner = ({ adminItems, replace }) => {
return null;
};
-RedirectToAllowedSettingsInner.propTypes = {
- adminItems: PropTypes.arrayOf(PropTypes.shape({ path: PropTypes.string })),
- replace: PropTypes.func.isRequired,
-};
-
export const RedirectToAllowedSettings = connect(
mapStateToProps,
mapDispatchToProps,
)(RedirectToAllowedSettingsInner);
export const createTenantsRouteGuard = () => {
- const Wrapper = connectedReduxRedirect({
+ const Wrapper = connectedReduxRedirect<any, State>({
wrapperDisplayName: "CanAccessTenants",
redirectPath: "/admin/people",
allowRedirectBack: false,
diff --git a/frontend/src/metabase/api/user.ts b/frontend/src/metabase/api/user.ts
index caf512378a5..ea83c7db3ab 100644
--- a/frontend/src/metabase/api/user.ts
+++ b/frontend/src/metabase/api/user.ts
@@ -1,4 +1,4 @@
-import { STORE_TEMPORARY_PASSWORD } from "metabase/admin/people/events";
+import { storeTemporaryPassword } from "metabase/admin/people/people";
import { userUpdated } from "metabase/redux/user";
import type {
CreateUserRequest,
@@ -62,7 +62,7 @@ export const userApi = Api.injectEndpoints({
handleQueryFulfilled(queryFulfilled, (user) => {
if (request.password) {
const payload = { id: user.id, password: request.password };
- dispatch({ type: STORE_TEMPORARY_PASSWORD, payload });
+ dispatch(storeTemporaryPassword(payload));
}
}),
}),
@@ -73,7 +73,7 @@ export const userApi = Api.injectEndpoints({
body: { old_password, password },
}),
onQueryStarted: ({ id, password }, { dispatch }) => {
- dispatch({ type: STORE_TEMPORARY_PASSWORD, payload: { id, password } });
+ dispatch(storeTemporaryPassword({ id, password }));
},
invalidatesTags: (_, error, { id }) =>
invalidateTags(error, [listTag("user"), idTag("user", id)]),
diff --git a/frontend/src/metabase/api/utils/errors.ts b/frontend/src/metabase/api/utils/errors.ts
index 6dad4d8a1c8..c5bd76f7c35 100644
--- a/frontend/src/metabase/api/utils/errors.ts
+++ b/frontend/src/metabase/api/utils/errors.ts
@@ -1,6 +1,6 @@
import { t } from "ttag";
-type ErrorPayload =
+export type ErrorPayload =
| { message: string }
| { error: string }
| { error_message: string }
diff --git a/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx b/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx
index 2c85c814cf9..05f8b82cd00 100644
--- a/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx
+++ b/frontend/src/metabase/common/components/ConfirmModal/ConfirmModal.tsx
@@ -11,9 +11,9 @@ import {
Text,
} from "metabase/ui";
-interface ConfirmModal extends ModalProps {
+interface ConfirmModal extends Omit<ModalProps, "content"> {
title?: string | ReactNode;
- content?: string;
+ content?: string | ReactNode;
message?: string | ReactNode;
onConfirm?: () => void | Promise<void>;
confirmButtonText?: string;
diff --git a/frontend/src/metabase/hoc/ModalRoute.tsx b/frontend/src/metabase/hoc/ModalRoute.tsx
index 3af0598f7f3..ba34ff8ab98 100644
--- a/frontend/src/metabase/hoc/ModalRoute.tsx
+++ b/frontend/src/metabase/hoc/ModalRoute.tsx
@@ -91,7 +91,7 @@ const ModalWithRoute = (
// Base props that any modal rendered by ModalRoute must accept.
// Modal components typically narrow `params` to specific keys (e.g., { alertId?: string }),
// but they must accept the full ComposedModalProps shape.
-type ModalComponentProps = {
+export type ModalComponentProps = {
params: RouteParams;
location: Location;
onClose: () => void;
diff --git a/frontend/src/metabase/plugins/oss/support.ts b/frontend/src/metabase/plugins/oss/support.ts
index f88fed95cb3..02038a977c0 100644
--- a/frontend/src/metabase/plugins/oss/support.ts
+++ b/frontend/src/metabase/plugins/oss/support.ts
@@ -1,5 +1,7 @@
import type { ComponentType } from "react";
+import type { ModalComponentProps } from "metabase/hoc/ModalRoute";
+
import { NotFoundPlaceholder } from "../components/PluginPlaceholder";
const getDefaultPluginSupport = () => ({
@@ -11,7 +13,7 @@ const getDefaultPluginSupport = () => ({
export const PLUGIN_SUPPORT: {
isEnabled: boolean;
SupportSettings: ComponentType;
- GrantAccessModal: ComponentType<{ onClose: VoidFunction }>;
+ GrantAccessModal: ComponentType<ModalComponentProps>;
} = getDefaultPluginSupport();
/**
diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.js
index 3ac6c38a99d..f5d301eb217 100644
--- a/frontend/src/metabase/schema.js
+++ b/frontend/src/metabase/schema.js
@@ -17,6 +17,7 @@ export const TransformSchema = new schema.Entity("transforms");
export const DashboardSchema = new schema.Entity("dashboards");
export const PulseSchema = new schema.Entity("pulses");
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.ts
index 9317b0a3e4f..f10b4ac61fa 100644
--- a/frontend/test/__support__/store.ts
+++ b/frontend/test/__support__/store.ts
@@ -8,6 +8,7 @@ import {
DatabaseSchema,
DocumentSchema,
FieldSchema,
+ GroupSchema,
IndexedEntitySchema,
MeasureSchema,
QuestionSchema,
@@ -63,6 +64,7 @@ const EntitiesSchema: Record<keyof EntitiesState, NormalizrSchema<any>> = {
snippets: [SnippetSchema],
indexedEntities: [IndexedEntitySchema],
questions: [QuestionSchema],
+ groups: [GroupSchema],
};
export const createMockEntitiesState = (