ISPN-14450 Remove actions for users without WRITE permission

infinispan · Jun 27, 2024 · f48e75a · f48e75a
1 parent 3fc7a51
commit f48e75a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/cypress/e2e/1_rbac_func.cy.js b/cypress/e2e/1_rbac_func.cy.js
@@ -23,14 +23,14 @@ describe('RBAC Functionality Tests', () => {
     checkDataContainerView(false, false, false, false);
     checkSecuredCacheDetailsView(false, false, false, 'observer', 'indexed-cache');
     cy.contains('Elaia');
-    cy.get('[data-cy=actions-elaia]').should('exist');
+    cy.get('[data-cy=actions-elaia]').should('not.exist');
     //Running query on secured page
     cy.get('[data-cy=queriesTab]').click();
     cy.get('#textSearchByQuery').click().type('from org.infinispan.Person where age>2');
     cy.get('button[aria-label=searchButton]').click();
     cy.contains('1 - 1 of 1');
     cy.contains('Elaia');
-
+``
     checkNotOwnSecuredCache('a-rbac-test-cache');
     checkNonSecuredCacheDetailView(false, false);
     //Go to tasks (@TODO at the moment for observer no tasks are shown, add after fix)

diff --git a/src/app/Caches/Entries/CacheEntries.tsx b/src/app/Caches/Entries/CacheEntries.tsx
@@ -124,18 +124,32 @@ const CacheEntries = (props: { cacheName: string }) => {
     });
   };
 
-  const displayActions = (row): IAction[] => [
-    {
-      'aria-label': 'editEntryAction',
-      title: t('caches.entries.action-edit'),
-      onClick: () => onClickEditEntryButton(row.key, row.keyContentType as ContentType)
-    },
-    {
-      'aria-label': 'deleteEntryAction',
-      title: t('caches.entries.action-delete'),
-      onClick: () => onClickDeleteEntryButton(row.key, row.keyContentType as ContentType)
+  const displayActions = (row) => {
+    if (!ConsoleServices.security().hasCacheConsoleACL(ConsoleACL.WRITE, cache.name, connectedUser)) {
+      return (
+        <Td></Td>
+      );
     }
-  ];
+
+    const actions = [
+        {
+          'aria-label': 'editEntryAction',
+          title: t('caches.entries.action-edit'),
+          onClick: () => onClickEditEntryButton(row.key, row.keyContentType as ContentType)
+        },
+        {
+          'aria-label': 'deleteEntryAction',
+          title: t('caches.entries.action-delete'),
+          onClick: () => onClickDeleteEntryButton(row.key, row.keyContentType as ContentType)
+        }
+      ]
+
+    return (
+      <Td isActionCell data-cy={`actions-${row.key}`}>
+        <ActionsColumn items={actions} />
+      </Td>
+    );
+  }
 
   const columnNames = {
     key: t('caches.entries.column-key'),
@@ -439,9 +453,7 @@ const CacheEntries = (props: { cacheName: string }) => {
                       <Td dataLabel={columnNames.lifespan}>{displayTimeToLive(row)}</Td>
                       <Td dataLabel={columnNames.maxIdle}>{displayMaxIdle(row)}</Td>
                       <Td dataLabel={columnNames.expires}>{displayExpires(row)}</Td>
-                      <Td isActionCell data-cy={`actions-${row.key}`}>
-                        <ActionsColumn items={displayActions(row)} />
-                      </Td>
+                      {displayActions(row)}
                     </Tr>
                   );
                 })