fix: reboot required and not authorized

Hyperkid123 · Aug 15, 2023 · 1009ccf · 1009ccf
1 parent dcaee14
commit 1009ccf
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 81 deletions.
diff --git a/packages/advisor-components/src/RebootRequired/RebootRequired.tsx b/packages/advisor-components/src/RebootRequired/RebootRequired.tsx
@@ -1,7 +1,7 @@
 import './RebootRequired.scss';
 
 import React from 'react';
-import { Text, TextContent, TextVariants } from '@patternfly/react-core';
+import { Icon, Text, TextContent, TextVariants } from '@patternfly/react-core';
 import { PowerOffIcon } from '@patternfly/react-icons';
 
 import { RuleDetailsMessages } from '../RuleDetails/RuleDetails';
@@ -13,7 +13,9 @@ interface RebootRequiredProps {
 
 const RebootRequired: React.FC<RebootRequiredProps> = ({ messages, rebootRequired }) => (
   <span className="system-reboot-message">
-    <PowerOffIcon className={rebootRequired ? 'reboot-required-icon' : 'no-reboot-required-icon'} />
+    <Icon>
+      <PowerOffIcon className={rebootRequired ? 'reboot-required-icon' : 'no-reboot-required-icon'} />
+    </Icon>
     <TextContent className="system-reboot-message__content">
       <Text component={TextVariants.p}>{messages.systemReboot}</Text>
     </TextContent>

diff --git a/packages/components/src/NotAuthorized/NotAuthorized.scss b/packages/components/src/NotAuthorized/NotAuthorized.scss
diff --git a/packages/components/src/NotAuthorized/NotAuthorized.tsx b/packages/components/src/NotAuthorized/NotAuthorized.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import {
   Button,
   EmptyState,
+  EmptyStateActions,
   EmptyStateBody,
   EmptyStateFooter,
   EmptyStateHeader,
@@ -52,17 +53,19 @@ const NotAuthorized: React.FunctionComponent<NotAuthorizedProps> = ({
       <EmptyStateHeader titleText={heading} icon={<EmptyStateIcon icon={Icon} />} headingLevel="h5" />
       <EmptyStateBody>{description}</EmptyStateBody>
       <EmptyStateFooter>
-        {actions}
-        {showReturnButton &&
-          (document.referrer ? (
-            <Button variant="primary" onClick={() => history.back()}>
-              {prevPageButtonText}
-            </Button>
-          ) : (
-            <Button variant="primary" component="a" href=".">
-              {toLandingPageText}
-            </Button>
-          ))}
+        {actions && <EmptyStateActions>{actions}</EmptyStateActions>}
+        <EmptyStateActions>
+          {showReturnButton &&
+            (document.referrer ? (
+              <Button variant="primary" onClick={() => history.back()}>
+                {prevPageButtonText}
+              </Button>
+            ) : (
+              <Button variant="primary" component="a" href=".">
+                {toLandingPageText}
+              </Button>
+            ))}
+        </EmptyStateActions>
       </EmptyStateFooter>
     </EmptyState>
   );

diff --git a/packages/components/src/NotAuthorized/__snapshots__/NotAuthorized.test.js.snap b/packages/components/src/NotAuthorized/__snapshots__/NotAuthorized.test.js.snap
@@ -18,13 +18,15 @@ exports[`NotAuthorized component should apply custom styles 1`] = `
     <ContactBody />
   </EmptyStateBody>
   <EmptyStateFooter>
-    <Button
-      component="a"
-      href="."
-      variant="primary"
-    >
-      Go to landing page
-    </Button>
+    <EmptyStateActions>
+      <Button
+        component="a"
+        href="."
+        variant="primary"
+      >
+        Go to landing page
+      </Button>
+    </EmptyStateActions>
   </EmptyStateFooter>
 </EmptyState>
 `;
@@ -46,7 +48,9 @@ exports[`NotAuthorized component should not show buttons 1`] = `
   <EmptyStateBody>
     <ContactBody />
   </EmptyStateBody>
-  <EmptyStateFooter />
+  <EmptyStateFooter>
+    <EmptyStateActions />
+  </EmptyStateFooter>
 </EmptyState>
 `;
 
@@ -68,13 +72,15 @@ exports[`NotAuthorized component should render 1`] = `
     <ContactBody />
   </EmptyStateBody>
   <EmptyStateFooter>
-    <Button
-      component="a"
-      href="."
-      variant="primary"
-    >
-      Go to landing page
-    </Button>
+    <EmptyStateActions>
+      <Button
+        component="a"
+        href="."
+        variant="primary"
+      >
+        Go to landing page
+      </Button>
+    </EmptyStateActions>
   </EmptyStateFooter>
 </EmptyState>
 `;
@@ -97,25 +103,29 @@ exports[`NotAuthorized component should show custom actions 1`] = `
     <ContactBody />
   </EmptyStateBody>
   <EmptyStateFooter>
-    <button
-      id="action-one"
-      key="1"
-    >
-      1
-    </button>
-    <button
-      id="action-one"
-      key="2"
-    >
-      2
-    </button>
-    <Button
-      component="a"
-      href="."
-      variant="primary"
-    >
-      Go to landing page
-    </Button>
+    <EmptyStateActions>
+      <button
+        id="action-one"
+        key="1"
+      >
+        1
+      </button>
+      <button
+        id="action-one"
+        key="2"
+      >
+        2
+      </button>
+    </EmptyStateActions>
+    <EmptyStateActions>
+      <Button
+        component="a"
+        href="."
+        variant="primary"
+      >
+        Go to landing page
+      </Button>
+    </EmptyStateActions>
   </EmptyStateFooter>
 </EmptyState>
 `;
@@ -138,13 +148,15 @@ exports[`NotAuthorized component should show custom description 1`] = `
     Some text
   </EmptyStateBody>
   <EmptyStateFooter>
-    <Button
-      component="a"
-      href="."
-      variant="primary"
-    >
-      Go to landing page
-    </Button>
+    <EmptyStateActions>
+      <Button
+        component="a"
+        href="."
+        variant="primary"
+      >
+        Go to landing page
+      </Button>
+    </EmptyStateActions>
   </EmptyStateFooter>
 </EmptyState>
 `;
@@ -167,13 +179,15 @@ exports[`NotAuthorized component should show custom title 1`] = `
     <ContactBody />
   </EmptyStateBody>
   <EmptyStateFooter>
-    <Button
-      component="a"
-      href="."
-      variant="primary"
-    >
-      Go to landing page
-    </Button>
+    <EmptyStateActions>
+      <Button
+        component="a"
+        href="."
+        variant="primary"
+      >
+        Go to landing page
+      </Button>
+    </EmptyStateActions>
   </EmptyStateFooter>
 </EmptyState>
 `;
@@ -219,20 +233,24 @@ exports[`NotAuthorized component should use custom icon 1`] = `
     <div
       className="pf-v5-c-empty-state__footer"
     >
-      <a
-        aria-disabled={false}
-        aria-label={null}
-        className="pf-v5-c-button pf-m-primary"
-        data-ouia-component-id="OUIA-Generated-Button-primary-1"
-        data-ouia-component-type="PF5/Button"
-        data-ouia-safe={true}
-        disabled={null}
-        href="."
-        role={null}
-        type={null}
+      <div
+        className="pf-v5-c-empty-state__actions"
       >
-        Go to landing page
-      </a>
+        <a
+          aria-disabled={false}
+          aria-label={null}
+          className="pf-v5-c-button pf-m-primary"
+          data-ouia-component-id="OUIA-Generated-Button-primary-1"
+          data-ouia-component-type="PF5/Button"
+          data-ouia-safe={true}
+          disabled={null}
+          href="."
+          role={null}
+          type={null}
+        >
+          Go to landing page
+        </a>
+      </div>
     </div>
   </div>
 </div>