Solves infinite loading case

redpanda-data · Jan 2, 2025 · 335be27 · 335be27
1 parent c5dc922
commit 335be27
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/frontend/src/components/pages/acls/Acl.List.tsx b/frontend/src/components/pages/acls/Acl.List.tsx
@@ -450,6 +450,14 @@ const RolesTab = observer(() => {
           data-testid="create-role-button"
           variant="outline"
           onClick={() => appGlobal.history.push('/security/roles/create')}
+          isDisabled={api.userData.canCreateRoles === false || !api.isAdminApiConfigured}
+          tooltip={[
+            api.userData?.canCreateRoles === false &&
+              'You need KafkaAclOperation.KAFKA_ACL_OPERATION_ALTER and RedpandaCapability.MANAGE_RBAC permissions.',
+            !api.isAdminApiConfigured && 'You need to enable Admin API.',
+          ]
+            .filter(Boolean)
+            .join(' ')}
         >
           Create role
         </Button>

diff --git a/frontend/src/components/pages/acls/RoleCreate.tsx b/frontend/src/components/pages/acls/RoleCreate.tsx
@@ -32,17 +32,10 @@ class RoleCreatePage extends PageComponent {
   }
 
   async refreshData(force: boolean) {
-    if (api.userData != null && !api.userData.canListAcls) return;
-
-    await Promise.allSettled([
-      api.refreshAcls(AclRequestDefault, force),
-      api.refreshServiceAccounts(true),
-      rolesApi.refreshRoles(),
-    ]);
+    await Promise.allSettled([api.refreshServiceAccounts(true), rolesApi.refreshRoles()]);
   }
 
   render() {
-    if (api.ACLs?.aclResources === undefined) return DefaultSkeleton;
     if (!api.serviceAccounts || !api.serviceAccounts.users) return DefaultSkeleton;
 
     return (

diff --git a/frontend/src/state/backendApi.ts b/frontend/src/state/backendApi.ts
@@ -339,6 +339,7 @@ export async function handleExpiredLicenseError(r: Response) {
       canListAcls: true,
       canListQuotas: true,
       canPatchConfigs: true,
+      canCreateRoles: true,
       canReassignPartitions: true,
       canCreateSchemas: true,
       canDeleteSchemas: true,
@@ -442,6 +443,9 @@ const apiStore = {
           canReassignPartitions:
             r.permissions?.kafkaClusterOperations.includes(KafkaAclOperation.ALTER_CONFIGS) &&
             r.permissions?.kafkaClusterOperations.includes(KafkaAclOperation.DESCRIBE_CONFIGS),
+          canCreateRoles:
+            r.permissions?.kafkaClusterOperations.includes(KafkaAclOperation.ALTER) &&
+            r.permissions?.redpanda.includes(RedpandaCapability.MANAGE_RBAC),
           canCreateSchemas: r.permissions?.schemaRegistry.includes(SchemaRegistryCapability.WRITE),
           canDeleteSchemas: r.permissions?.schemaRegistry.includes(SchemaRegistryCapability.DELETE),
           canManageSchemaRegistry: r.permissions?.schemaRegistry.includes(SchemaRegistryCapability.WRITE),

diff --git a/frontend/src/state/restInterfaces.ts b/frontend/src/state/restInterfaces.ts
@@ -534,6 +534,7 @@ export interface UserData {
   canListQuotas: boolean;
   canReassignPartitions: boolean;
   canPatchConfigs: boolean;
+  canCreateRoles: boolean;
 
   canViewSchemas: boolean;
   canCreateSchemas: boolean;