Skip to content

Commit 208633e

Browse files
committed
fix: Fallback to generic cluster roles when instances not found
This is consistent with how the API enforces these permissions. https://harperdb.atlassian.net/browse/STUDIO-583
1 parent 3f77afb commit 208633e

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/hooks/usePermissions.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ export function useOrganizationClusterPermissions(orgId?: string, clusterId?: st
6060
return { create: true, remove: true, update: true, view: true };
6161
}
6262
const specificRoles = role.organization.clusters.resources?.find(r => r.id === findClusterId);
63-
const roles = role.organization.clusters;
63+
const genericRoles = role.organization.clusters;
6464
return {
65-
create: roles.create,
66-
remove: specificRoles ? specificRoles.delete : roles.delete,
67-
update: specificRoles ? specificRoles.update : roles.update,
68-
view: specificRoles ? specificRoles.view : roles.view,
65+
create: genericRoles.create,
66+
remove: specificRoles ? specificRoles.delete : genericRoles.delete,
67+
update: specificRoles ? specificRoles.update : genericRoles.update,
68+
view: specificRoles ? specificRoles.view : genericRoles.view,
6969
};
7070
}
7171

@@ -91,11 +91,12 @@ export function useOrganizationClusterInstancePermissions(orgId?: string, cluste
9191
const specificRoles = role.organization.clusters
9292
.resources?.find(r => r.id === findClusterId)
9393
?.instances;
94-
return { // TODO: Should these default to true or false when not specified?
95-
create: specificRoles ? specificRoles.create : true,
96-
remove: specificRoles ? specificRoles.delete : true,
97-
update: specificRoles ? specificRoles.update : true,
98-
view: specificRoles ? specificRoles.view : true,
94+
const genericRoles = role.organization.clusters;
95+
return {
96+
create: specificRoles ? specificRoles.create : genericRoles.create,
97+
remove: specificRoles ? specificRoles.delete : genericRoles.delete,
98+
update: specificRoles ? specificRoles.update : genericRoles.update,
99+
view: specificRoles ? specificRoles.view : genericRoles.view,
99100
};
100101
}
101102

0 commit comments

Comments
 (0)