From a9f64a789b29a0f844ec387a2166eba4b1661b57 Mon Sep 17 00:00:00 2001 From: Dallas Date: Tue, 15 Aug 2023 08:05:59 -0500 Subject: [PATCH] :seedling: chore(Header): use new pf masthead (#1282) closes #1243 --------- Signed-off-by: gitdallas Co-authored-by: Ian Bolton --- client/src/app/layout/HeaderApp/HeaderApp.tsx | 153 ++++--- client/src/app/layout/HeaderApp/SSOMenu.tsx | 14 +- .../__snapshots__/HeaderApp.test.tsx.snap | 378 ++++++++++-------- 3 files changed, 320 insertions(+), 225 deletions(-) diff --git a/client/src/app/layout/HeaderApp/HeaderApp.tsx b/client/src/app/layout/HeaderApp/HeaderApp.tsx index f526f479fb..5e5b701fa7 100644 --- a/client/src/app/layout/HeaderApp/HeaderApp.tsx +++ b/client/src/app/layout/HeaderApp/HeaderApp.tsx @@ -1,80 +1,109 @@ import React from "react"; -import { Brand, Button, ButtonVariant, Title } from "@patternfly/react-core"; import { - PageHeader, - PageHeaderTools, - PageHeaderToolsGroup, - PageHeaderToolsItem, -} from "@patternfly/react-core/deprecated"; + Brand, + Button, + ButtonVariant, + Masthead, + MastheadBrand, + MastheadContent, + MastheadMain, + MastheadToggle, + PageToggleButton, + Title, + Toolbar, + ToolbarContent, + ToolbarGroup, + ToolbarItem, +} from "@patternfly/react-core"; import HelpIcon from "@patternfly/react-icons/dist/esm/icons/help-icon"; - +import BarsIcon from "@patternfly/react-icons/dist/js/icons/bars-icon"; import { AppAboutModalState } from "../AppAboutModalState"; import { SSOMenu } from "./SSOMenu"; import { MobileDropdown } from "./MobileDropdown"; import konveyorBrandImage from "@app/images/Konveyor-white-logo.svg"; -import { APP_BRAND, BrandType, isAuthRequired } from "@app/Constants"; +import { APP_BRAND, BrandType } from "@app/Constants"; import logoRedHat from "@app/images/logoRedHat.svg"; import "./header.css"; export const HeaderApp: React.FC = () => { const toolbar = ( - - - - - {({ toggleModal }) => { - return ( - - ); - }} - - - - - + + - - - {APP_BRAND === BrandType.MTA && ( - - - Logo - - + + + {({ toggleModal }) => { + return ( + + ); + }} + + + + + + + + {APP_BRAND === BrandType.MTA && ( + + + Logo + + + )} + + + ); + return ( + + + + + + + {APP_BRAND === BrandType.Konveyor ? ( + + + + + + ) : ( + + + Migration Toolkit for Applications + + )} - + {toolbar} + ); - - const headerLogo = - APP_BRAND === BrandType.Konveyor ? ( - - ) : ( - - Migration Toolkit for Applications - - ); - - return ; }; diff --git a/client/src/app/layout/HeaderApp/SSOMenu.tsx b/client/src/app/layout/HeaderApp/SSOMenu.tsx index 9f1e5ff6e1..d43b08d970 100644 --- a/client/src/app/layout/HeaderApp/SSOMenu.tsx +++ b/client/src/app/layout/HeaderApp/SSOMenu.tsx @@ -1,12 +1,12 @@ import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { useKeycloak } from "@react-keycloak/web"; -import { DropdownGroup, DropdownItem } from "@patternfly/react-core"; import { - Dropdown, - DropdownToggle, - PageHeaderToolsItem, -} from "@patternfly/react-core/deprecated"; + DropdownGroup, + DropdownItem, + ToolbarItem, +} from "@patternfly/react-core"; +import { Dropdown, DropdownToggle } from "@patternfly/react-core/deprecated"; import { isAuthRequired, LocalStorageKey } from "@app/Constants"; import { useHistory } from "react-router-dom"; @@ -27,7 +27,7 @@ export const SSOMenu: React.FC = () => { return ( <> {keycloak && ( - { , ]} /> - + )} ); diff --git a/client/src/app/layout/HeaderApp/tests/__snapshots__/HeaderApp.test.tsx.snap b/client/src/app/layout/HeaderApp/tests/__snapshots__/HeaderApp.test.tsx.snap index 752b5af08d..77df778eaf 100644 --- a/client/src/app/layout/HeaderApp/tests/__snapshots__/HeaderApp.test.tsx.snap +++ b/client/src/app/layout/HeaderApp/tests/__snapshots__/HeaderApp.test.tsx.snap @@ -6,109 +6,142 @@ exports[`Test snapshot 1`] = ` "baseElement":
-
- + + + + +
brand
-
- -
-
-
- + +
+
+
+
+
+ +
+
+
+
+
+
+
@@ -116,108 +149,141 @@ exports[`Test snapshot 1`] = ` , "container":
-
- + + + + +
brand
- -
-
-
-
- +
+
+
- - +
+ +
+
+
+
+
+
+
+