The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix page crash when setting up sandboxing with a SQL question via the UI (#74297)
Andersonc86450ee4759
diff --git a/frontend/src/metabase-types/api/group.ts b/frontend/src/metabase-types/api/group.tsindex 1d2a67a653c..9490a00d94a 100644--- a/frontend/src/metabase-types/api/group.ts+++ b/frontend/src/metabase-types/api/group.ts@@ -23,7 +23,7 @@ export type Member = {export type GroupInfo = {id: GroupId;name: string;- member_count: number;+ member_count?: number;magic_group_type:| "all-internal-users"| "admin"diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsxindex 50b7b7e168a..f592711d4e1 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@@ -365,7 +365,7 @@ export const getDatabasesPermissionEditor = createSelector(title,breadcrumbs,description:- group != null+ typeof group?.member_count === "number"? ngettext(msgid`${group.member_count} person`,`${group.member_count} people`,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsxindex 4b6bc08fcf5..05f9a6f9d34 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.unit.spec.tsx@@ -1,10 +1,28 @@+import { QueryStatus } from "@reduxjs/toolkit/query";++import { createMockEntitiesState } from "__support__/store";import {+ createMockAdminState,+ createMockApiState,+ createMockPermissionsState,createMockSettingsState,createMockState,} from "metabase/redux/store/mocks";-import { createMockTokenFeatures } from "metabase-types/api/mocks";+import type { GroupsPermissions } from "metabase-types/api";+import {+ createMockDatabase,+ createMockGroup,+ createMockSchema,+ createMockTable,+ createMockTokenFeatures,+} from "metabase-types/api/mocks";-import { getShouldShowTransformPermissions } from "./permission-editor";+import { DataPermission, DataPermissionValue } from "../../types";++import {+ getDatabasesPermissionEditor,+ getShouldShowTransformPermissions,+} from "./permission-editor";describe("getShouldShowTransformPermissions", () => {describe("OSS version", () => {@@ -94,3 +112,74 @@ describe("getShouldShowTransformPermissions", () => {});});});++describe("getDatabasesPermissionEditor", () => {+ it("does not crash when the selected group has no member count (#74290)", () => {+ const groupWithoutMemberCount = createMockGroup({+ id: 1,+ name: "All Users",+ magic_group_type: "all-internal-users",+ });+ Reflect.deleteProperty(groupWithoutMemberCount, "member_count");++ const permissions: GroupsPermissions = {+ 1: {+ 3: {+ [DataPermission.CREATE_QUERIES]:+ DataPermissionValue.QUERY_BUILDER_AND_NATIVE,+ [DataPermission.VIEW_DATA]: DataPermissionValue.UNRESTRICTED,+ },+ },+ };++ const state = createMockState({+ admin: createMockAdminState({+ permissions: createMockPermissionsState({+ dataPermissions: permissions,+ originalDataPermissions: permissions,+ }),+ }),+ entities: createMockEntitiesState({+ databases: [+ createMockDatabase({+ id: 3,+ name: "Test Database",+ tables: [+ createMockTable({+ id: 10,+ db_id: 3,+ display_name: "People",+ schema: "public",+ }),+ ],+ }),+ ],+ schemas: [createMockSchema({ id: "3:public", name: "public" })],+ }),+ "metabase-api": {+ ...createMockApiState(),+ queries: {+ "listPermissionsGroups({})": {+ status: QueryStatus.fulfilled,+ data: [groupWithoutMemberCount],+ error: undefined,+ originalArgs: {},+ requestId: "test-request-groups",+ endpointName: "listPermissionsGroups",+ startedTimeStamp: Date.now(),+ fulfilledTimeStamp: Date.now(),+ },+ },+ },+ });++ const editor = getDatabasesPermissionEditor(state, {+ params: {+ groupId: "1",+ databaseId: "3",+ },+ });++ expect(editor?.description).toBeNull();+ });+});diff --git a/frontend/src/metabase/admin/types.ts b/frontend/src/metabase/admin/types.tsindex 0cee6ac4101..64bc232490d 100644--- a/frontend/src/metabase/admin/types.ts+++ b/frontend/src/metabase/admin/types.ts@@ -1,5 +1,5 @@export type MappingsType = Record<string, number[]>;export type GroupIds = number[];export type DeleteMappingModalValueType = "nothing" | "clear" | "delete";-export type UserGroupType = { id: number; name: string; member_count: number };+export type UserGroupType = { id: number; name: string; member_count?: number };export type UserGroupsType = UserGroupType[];