Skip to content

Commit 9c565ac

Browse files
fix: handle OSS instance resource (#5606)
* fix: ignore instance type when creating all access token * chore: prettier * fix: ignore instance type when creating custom token
1 parent 3c99743 commit 9c565ac

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/authorizations/components/CustomApiTokenOverlay.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ const CustomApiTokenOverlay: FC<Props> = props => {
9292
// filter out Subsriptions resource type if the UI is not enabled
9393
.filter(
9494
p =>
95-
p !== ResourceType.Subscriptions || isFlagEnabled('subscriptionsUI')
95+
(p !== ResourceType.Subscriptions ||
96+
isFlagEnabled('subscriptionsUI')) &&
97+
String(p) !== 'instance'
9698
)
9799
.forEach(resource => {
98100
if (resource === ResourceType.Telegrafs) {

src/authorizations/utils/permissions.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ export const allAccessPermissions = (
4949
userID: string
5050
): Permission[] => {
5151
const withOrgID = ensureT(orgID, userID)
52-
return allPermissionTypes.flatMap(withOrgID)
52+
return allPermissionTypes
53+
.filter(perm => String(perm) !== 'instance')
54+
.flatMap(withOrgID)
5355
}
5456

5557
export const formatResources = resourceNames => {
@@ -58,7 +60,9 @@ export const formatResources = resourceNames => {
5860
item !== ResourceType.Buckets &&
5961
item !== ResourceType.Telegrafs &&
6062
// filter out Subsriptions resource type if the UI is not enabled
61-
(item !== ResourceType.Subscriptions || isFlagEnabled('subscriptionsUI'))
63+
(item !== ResourceType.Subscriptions ||
64+
isFlagEnabled('subscriptionsUI')) &&
65+
String(item) !== 'instance'
6266
)
6367
resources.sort()
6468
resources.unshift(ResourceType.Telegrafs)

0 commit comments

Comments
 (0)