review(HMS-2721): update according review

Signed-off-by: Alejandro Visiedo <[email protected]>
avisiedo · Jun 4, 2024 · d736bcb · d736bcb
1 parent 283770c
commit d736bcb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/Components/CenteredSpinner/CenteredSpinner.tsx b/src/Components/CenteredSpinner/CenteredSpinner.tsx
@@ -1,5 +1,4 @@
 import { Bullseye, Spinner } from '@patternfly/react-core';
-import './CenteredSpinner.scss';
 import React from 'react';
 
 /**

diff --git a/src/Routes/DetailPage/DetailPage.tsx b/src/Routes/DetailPage/DetailPage.tsx
@@ -56,10 +56,6 @@ const DetailPage = () => {
 
   console.log('INFO:DetailPage render:domain_id=' + domain_id);
 
-  if (appContext.rbac.isLoading) {
-    return <CenteredSpinner />;
-  }
-
   // Load Domain to display
   useEffect(() => {
     if (!appContext.rbac.permissions.hasDomainsRead) {
@@ -123,6 +119,10 @@ const DetailPage = () => {
     setActiveTabKey(tabIndex);
   };
 
+  if (appContext.rbac.isLoading) {
+    return <CenteredSpinner />;
+  }
+
   // Return render
   return (
     <>

diff --git a/src/Routes/WizardPage/WizardPage.tsx b/src/Routes/WizardPage/WizardPage.tsx
@@ -44,10 +44,6 @@ const WizardPage = () => {
   const linkLearnMoreAbout = 'https://access.redhat.com/articles/1586893';
   const linkLearnMoreAboutRemovingDirectoryAndDomainServices = 'https://access.redhat.com/articles/1586893';
 
-  if (appContext.rbac.isLoading) {
-    return <CenteredSpinner />;
-  }
-
   useEffect(() => {
     if (!appContext.rbac.permissions.hasTokenCreate || !appContext.rbac.permissions.hasDomainsUpdate) {
       navigate('/no-permissions', { replace: true });
@@ -240,6 +236,10 @@ const WizardPage = () => {
 
   const title = 'Register identity domain';
 
+  if (appContext.rbac.isLoading) {
+    return <CenteredSpinner />;
+  }
+
   return (
     <>
       <PageGroup>