w

infinispan · Nov 1, 2023 · fb70ba3 · fb70ba3
1 parent 000c610
commit fb70ba3
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 53 deletions.
diff --git a/cypress/e2e/3_cache-crud-wizard.cy.js b/cypress/e2e/3_cache-crud-wizard.cy.js
@@ -14,8 +14,10 @@ describe('Cache Creation Wizard', () => {
     cy.get('[data-cy=wizardNextButton]').click();
 
     //Filling bounded  cache properties
-    cy.get('#featuresSelect-select-multi-typeahead-typeahead').click().type('boun');
-    cy.get('#BOUNDED > button').click();
+    cy.get('[data-cy=featuresSelect]').click();
+    cy.get('#select-multi-typeahead-Bounded').click();
+    cy.get('[data-cy=featuresSelect]').click();
+
     cy.get('#size').click();
     cy.get('[data-cy=memorySizeInput]').clear().type('1');
     cy.get('#memorySizeUnit').click();
@@ -24,8 +26,9 @@ describe('Cache Creation Wizard', () => {
     cy.get('#REMOVE').click();
 
     //Filling indexed cache properties
-    cy.get('#featuresSelect-select-multi-typeahead-typeahead').click().type('ind');
-    cy.get('#INDEXED > button').click();
+    cy.get('[data-cy=featuresSelect]').click();
+    cy.get('#select-multi-typeahead-Indexed').click();
+    cy.get('[data-cy=featuresSelect]').click();
     cy.get('#persistent').click();
     cy.get('#auto').click();
     cy.get('#volatile').click();
@@ -37,8 +40,9 @@ describe('Cache Creation Wizard', () => {
     cy.get('[id$="org.infinispan.Car"]').click();
 
     //Filling auth cache properties
-    cy.get('#featuresSelect-select-multi-typeahead-typeahead').click().type('auth');
-    cy.get('#SECURED > button').click();
+    cy.get('[data-cy=featuresSelect]').click();
+    cy.get('#select-multi-typeahead-Authorization').click();
+    cy.get('[data-cy=featuresSelect]').click();
     cy.get('#roleSelector-select-multi-typeahead-typeahead').click().type('admin');
     cy.get('#admin > button').click();
     cy.get('#roleSelector-select-multi-typeahead-typeahead').click().type('application');
@@ -47,8 +51,9 @@ describe('Cache Creation Wizard', () => {
     cy.get('#deployer > button').click();
 
     //Filling persistant cache properties
-    cy.get('#featuresSelect-select-multi-typeahead-typeahead').click().type('pers');
-    cy.get('#PERSISTENCE > button').click();
+    cy.get('[data-cy=featuresSelect]').click();
+    cy.get('#select-multi-typeahead-Persistence').click();
+    cy.get('[data-cy=featuresSelect]').click();
     cy.get('[data-cy=passivationSwitch]').next().click();
     cy.get('[data-cy=connectionAttempts]').type(5);
     cy.get('[data-cy=connectionInterval]').type(60);
@@ -57,8 +62,9 @@ describe('Cache Creation Wizard', () => {
     cy.get('#FileStore').click();
 
     //Filling transactional cache properties
-    cy.get('#featuresSelect-select-multi-typeahead-typeahead').click().type('trans');
-    cy.get('#TRANSACTIONAL > button').click();
+    cy.get('[data-cy=featuresSelect]').click().type('trans');
+    cy.get('#select-multi-typeahead-Transactional').click();
+    cy.get('[data-cy=featuresSelect]').click().clear();
     cy.get('#non_xa').click();
     cy.get('#pessimistic').click();
     cy.get('[data-cy=wizardNextButton]').click();

diff --git a/run-server-for-e2e-container.sh b/run-server-for-e2e-container.sh
@@ -5,15 +5,15 @@ ABSOLUTE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 echo ${ABSOLUTE_PATH}
 SERVER_IMAGE_URL="${SERVER_IMAGE_URL:-quay.io/infinispan-test/server:main}"
 
-docker pull ${SERVER_IMAGE_URL}
+#docker pull ${SERVER_IMAGE_URL}
 docker run -d -p 11222:11222 -v ${ABSOLUTE_PATH}/scripts/identities.batch:/user-config/identities.batch -v  ${ABSOLUTE_PATH}/dist:/opt/infinispan/static/console -v  ${ABSOLUTE_PATH}/scripts/infinispan-basic-auth.xml:/opt/infinispan/server/conf/infinispan.xml -e JAVA_OPTIONS="-Xms1024m -Xmx3072m -XX:MetaspaceSize=1024m -XX:MaxMetaspaceSize=2048m" -e IDENTITIES_BATCH="/user-config/identities.batch" ${SERVER_IMAGE_URL} --node-name=infinispan-4-e2e
-docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4
-docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm:9.4
-docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-commons:9.4
-docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-tree:9.4
-docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-util:9.4
+#docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4
+#docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm:9.4
+#docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-commons:9.4
+#docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-tree:9.4
+#docker exec $(docker ps -q -l) /opt/infinispan/bin/cli.sh install org.ow2.asm:asm-util:9.4
 
-docker restart $(docker ps -q -l)
+#docker restart $(docker ps -q -l)
 
 sleep 20
 cd data; bash ./create-data.sh admin password
diff --git a/src/app/CacheManagers/CacheTableDisplay.tsx b/src/app/CacheManagers/CacheTableDisplay.tsx
@@ -61,7 +61,6 @@ import { onSearch } from '@app/utils/searchFilter';
 import { DeleteCache } from '@app/Caches/DeleteCache';
 import { IgnoreCache } from '@app/Caches/IgnoreCache';
 import { SetAvailableCache } from '@app/Caches/SetAvailableCache';
-import { nil } from 'ajv';
 interface CacheAction {
   cacheName: string;
   action: '' | 'ignore' | 'undo' | 'delete' | 'available';
@@ -91,6 +90,7 @@ const CacheTableDisplay = (props: { cmName: string; setCachesCount: (count: numb
   const isAdmin = ConsoleServices.security().hasConsoleACL(ConsoleACL.ADMIN, connectedUser);
   const isCreator = ConsoleServices.security().hasConsoleACL(ConsoleACL.CREATE, connectedUser);
   const canCreateCache = ConsoleServices.security().hasConsoleACL(ConsoleACL.CREATE, connectedUser);
+  const [rowsLoading, setRowsLoading] = useState<boolean>(true);
 
   const [cachesPagination, setCachesPagination] = useState({
     page: 1,
@@ -120,7 +120,7 @@ const CacheTableDisplay = (props: { cmName: string; setCachesCount: (count: numb
   };
 
   useEffect(() => {
-    if (caches) {
+    if (!loadingCaches) {
       const failedCaches = caches.reduce((failedCaches: string, cacheInfo: CacheInfo) => {
         if (
           (cacheInfo.health as ComponentHealth) == ComponentHealth.FAILED ||
@@ -152,10 +152,10 @@ const CacheTableDisplay = (props: { cmName: string; setCachesCount: (count: numb
   }, [cachesPagination, filteredCaches]);
 
   useEffect(() => {
-    if (loadingCaches) {
-      setRows(null);
+    if (rows !=null) {
+      setRowsLoading(false);
     }
-  }, [loadingCaches]);
+  }, [rows]);
 
   useEffect(() => {
     setFilteredCaches(caches.filter((cache) => onSearch(searchValue, cache.name)).filter(onFilter));
@@ -732,7 +732,7 @@ const CacheTableDisplay = (props: { cmName: string; setCachesCount: (count: numb
   }
 
   const displayEmptyState = () => {
-    if (loadingCaches) {
+    if (rowsLoading) {
       return (
         <Bullseye>
           <EmptyState variant={EmptyStateVariant.sm}>
@@ -759,9 +759,10 @@ const CacheTableDisplay = (props: { cmName: string; setCachesCount: (count: numb
       </Bullseye>
     );
   };
+
   return (
     <React.Fragment>
-      {caches.length == 0 ? (
+      {!loadingCaches && !rowsLoading && caches.length == 0 ? (
         emptyPage
       ) : (
         <Card>
@@ -778,7 +779,7 @@ const CacheTableDisplay = (props: { cmName: string; setCachesCount: (count: numb
                 </Tr>
               </Thead>
               <Tbody>
-                {filteredCaches.length == 0 || rows == null || loadingCaches ? (
+                {rowsLoading || rows == null  ? (
                   <Tr>
                     <Td colSpan={6}>{displayEmptyState()}</Td>
                   </Tr>

diff --git a/src/app/Caches/Create/Features/SecuredCacheConfigurator.tsx b/src/app/Caches/Create/Features/SecuredCacheConfigurator.tsx
@@ -1,38 +1,29 @@
 import React, { useEffect, useState } from 'react';
-import { FormGroup, FormHelperText, HelperText, HelperTextItem, SelectOptionProps } from '@patternfly/react-core';
+import {
+  Bullseye,
+  FormGroup,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
+  SelectOptionProps, Spinner,
+  Text,
+  TextContent
+} from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { ConsoleServices } from '@services/ConsoleServices';
 import { useCreateCache } from '@app/services/createCacheHook';
 import { FeatureCard } from '@app/Caches/Create/Features/FeatureCard';
 import { CacheFeature } from '@services/infinispanRefData';
 import { FeatureAlert } from '@app/Caches/Create/Features/FeatureAlert';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import { SelectMultiWithChips } from '@app/Common/SelectMultiWithChips';
+import { useFetchAvailableRolesNames } from '@app/services/rolesHook';
 
 const SecuredCacheConfigurator = (props: { isEnabled: boolean }) => {
   const { configuration, setConfiguration } = useCreateCache();
   const { t } = useTranslation();
   const brandname = t('brandname.brandname');
   const [roles, setRoles] = useState<string[]>(configuration.feature.securedCache.roles);
-  const [loading, setLoading] = useState(true);
-  const [availableRoles, setAvailableRoles] = useState<string[]>([]);
-  const [error, setError] = useState<'success' | 'error' | 'default'>('default');
-
-  useEffect(() => {
-    if (loading) {
-      ConsoleServices.security()
-        .getSecurityRolesNames()
-        .then((r) => {
-          if (r.isRight()) {
-            setAvailableRoles(r.value);
-            setError('success');
-          } else {
-            setError('error');
-          }
-        })
-        .then(() => setLoading(false));
-    }
-  }, [loading]);
+  const { availableRoleNames, loading, error } = useFetchAvailableRolesNames();
 
   useEffect(() => {
     setConfiguration((prevState) => {
@@ -62,7 +53,7 @@ const SecuredCacheConfigurator = (props: { isEnabled: boolean }) => {
 
   const rolesOptions = () : SelectOptionProps[] => {
     const selectOptions: SelectOptionProps[] = [];
-    availableRoles.forEach((role) => selectOptions.push({value: role, children: role}));
+    availableRoleNames.forEach((role) => selectOptions.push({value: role, children: role}));
     return selectOptions;
   };
 
@@ -71,15 +62,25 @@ const SecuredCacheConfigurator = (props: { isEnabled: boolean }) => {
     else setRoles([...roles, selection]);
   };
 
-  if (!props.isEnabled) {
+  if (!props.isEnabled || error != '') {
     return <FeatureAlert feature={CacheFeature.SECURED} />;
   }
 
-  return (
-    <FeatureCard
-      title="caches.create.configurations.feature.secured"
-      description="caches.create.configurations.feature.secured-description"
-    >
+  const buildContent = () => {
+    if (loading) {
+      return (
+          <Bullseye>
+            <Spinner size={'md'} isInline />
+            <TextContent>
+              <Text>
+                {t('caches.create.configurations.feature.roles-loading')}
+              </Text>
+            </TextContent>
+          </Bullseye>
+      )
+    }
+
+    return (
       <FormGroup fieldId="select-roles" isRequired label={'Roles'}>
         <SelectMultiWithChips id="roleSelector"
                               placeholder={t('caches.create.configurations.feature.select-roles')}
@@ -98,6 +99,14 @@ const SecuredCacheConfigurator = (props: { isEnabled: boolean }) => {
           </FormHelperText>
         )}
       </FormGroup>
+    );
+  }
+  return (
+    <FeatureCard
+      title="caches.create.configurations.feature.secured"
+      description="caches.create.configurations.feature.secured-description"
+    >
+      {buildContent()}
     </FeatureCard>
   );
 };

diff --git a/src/app/assets/languages/en.json b/src/app/assets/languages/en.json
@@ -336,6 +336,7 @@
           "index-sharding-tooltip": "Divide the index data into multiple smaller indexes called shards. Enabling sharding distributes data across multiple shards, optimizing system resources and enhancing search capabilities.",
           "secured": "Security authorization",
           "secured-description": "To protect data, restrict user access to the cache. When a user does not have one of the roles selected from the menu below, {{brandname}} denies cache operations.",
+          "roles-loading": "Loading available roles...",
           "select-roles": "Select roles",
           "select-roles-helper": "You must select at least one role.",
           "backups": "Backups for {{local_site_name}}",

diff --git a/src/app/services/rolesHook.ts b/src/app/services/rolesHook.ts
@@ -3,6 +3,32 @@ import { ConsoleServices } from '@services/ConsoleServices';
 import { useApiAlert } from '@utils/useApiAlert';
 import { useTranslation } from 'react-i18next';
 
+export function useFetchAvailableRolesNames() {
+  const [availableRoleNames, setAvailableRoleNames] = useState<string[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState('');
+  useEffect(() => {
+    if (loading) {
+      ConsoleServices.security()
+        .getSecurityRolesNames()
+        .then((either) => {
+          if (either.isRight()) {
+            setAvailableRoleNames(either.value);
+          } else {
+            setError(either.value.message);
+          }
+        })
+        .then(() => setLoading(false));
+    }
+  }, [loading]);
+
+  return {
+    availableRoleNames,
+    loading,
+    error
+  };
+}
+
 export function useFetchAvailableRoles() {
   const [roles, setRoles] = useState<Role[]>([]);
   const [loading, setLoading] = useState(true);