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 permissions save action when a database was deleted recently (#74355)
Andersonce331be55f5e
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.ts b/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.tsindex 96b854b4167..6f4e2764855 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.ts+++ b/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.ts@@ -15,20 +15,40 @@ export function getModifiedGroupsPermissionsGraphParts(originalDataPermissions: GroupsPermissions,allGroupIds: string[],externallyModifiedGroupIds: string[],-) {- const dataPermissionsModifiedGroupIds = allGroupIds.filter((groupId) => {- return !_.isEqual(- dataPermissions[groupId],- originalDataPermissions[groupId],- );- });+): GroupsPermissions {+ const externallyModifiedGroupIdsSet = new Set(externallyModifiedGroupIds);+ const dataPermissionsModifiedGroups: GroupsPermissions = {};- const allModifiedGroupIds = _.uniq([- ...dataPermissionsModifiedGroupIds,- ...externallyModifiedGroupIds,- ]);+ for (const groupId of allGroupIds) {+ const groupPermissions = dataPermissions[groupId];++ if (externallyModifiedGroupIdsSet.has(groupId)) {+ if (!_.isEmpty(groupPermissions)) {+ dataPermissionsModifiedGroups[groupId] = groupPermissions;+ }++ continue;+ }++ const originalGroupPermissions = originalDataPermissions[groupId];+ const modifiedDatabasePermissions: GroupsPermissions[string] = {};++ for (const [databaseIdString, value] of Object.entries(+ groupPermissions ?? {},+ )) {+ const databaseId = Number(databaseIdString);++ if (!_.isEqual(value, originalGroupPermissions?.[databaseId])) {+ modifiedDatabasePermissions[databaseId] = value;+ }+ }++ if (!_.isEmpty(modifiedDatabasePermissions)) {+ dataPermissionsModifiedGroups[groupId] = modifiedDatabasePermissions;+ }+ }- return _.pick(dataPermissions, allModifiedGroupIds);+ return dataPermissionsModifiedGroups;}export function mergeGroupsPermissionsUpdates(diff --git a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.ts b/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.tsindex 14b14183f0c..e8925346501 100644--- a/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.ts+++ b/frontend/src/metabase/admin/permissions/utils/graph/partial-updates.unit.spec.ts@@ -36,6 +36,29 @@ describe("getModifiedGroupsPermissionsGraphParts", () => {});});+ it("should only include databases with updated data permissions", async () => {+ const update = getModifiedGroupsPermissionsGraphParts(+ {+ "1": {+ "1": { [DataPermission.VIEW_DATA]: DataPermissionValue.NO },+ "2": { [DataPermission.VIEW_DATA]: DataPermissionValue.UNRESTRICTED },+ },+ },+ {+ "1": {+ "1": { [DataPermission.VIEW_DATA]: DataPermissionValue.UNRESTRICTED },+ "2": { [DataPermission.VIEW_DATA]: DataPermissionValue.UNRESTRICTED },+ },+ },+ ["1"],+ [],+ );++ expect(update).toEqual({+ "1": { "1": { [DataPermission.VIEW_DATA]: DataPermissionValue.NO } },+ });+ });+it("should include groups that have been externally modified", async () => {const externalUpdate = getModifiedGroupsPermissionsGraphParts({