From 0d895ac8955a3b68a1137166e8db18c843a955d3 Mon Sep 17 00:00:00 2001 From: achmelo <37397715+achmelo@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:24:09 +0100 Subject: [PATCH] fix: zowe logo and trademark info (#3338) * fix(ui): UI Changes for Share Requested UI Changes for share Signed-off-by: Andrea Tabone Signed-off-by: achmelo * fix(ui): UI Changes for Share Fix mock errors Signed-off-by: Andrea Tabone Signed-off-by: achmelo * fix(ui): UI Changes for Share fix(ui): UI Changes for Share Fixup new homepage image layout, cleanup comments Signed-off-by: Andrea Tabone Signed-off-by: achmelo * fix(ui): UI Changes for Share Fix review comments Signed-off-by: Andrej Chmelo Signed-off-by: achmelo * lint Signed-off-by: achmelo --------- Signed-off-by: Andrea Tabone Signed-off-by: achmelo Signed-off-by: Andrej Chmelo Co-authored-by: Mike Simpson --- .../assets/images/zowe-horizontal-color.png | Bin 0 -> 8186 bytes .../src/components/Dashboard/_dashboard.scss | 30 +--------- .../src/components/DetailPage/DetailPage.jsx | 52 +++++++++++++++++- .../components/DetailPage/_detailPage.scss | 4 ++ .../src/components/Footer/_footer.scss | 7 +++ .../src/components/Header/_header.scss | 39 +++++++++++++ .../ServicesNavigationBar.jsx | 4 +- .../frontend/src/utils/utilFunctions.js | 16 ++++++ .../frontend/src/utils/utilFunctions.test.js | 18 +++++- 9 files changed, 137 insertions(+), 33 deletions(-) create mode 100644 api-catalog-ui/frontend/src/assets/images/zowe-horizontal-color.png diff --git a/api-catalog-ui/frontend/src/assets/images/zowe-horizontal-color.png b/api-catalog-ui/frontend/src/assets/images/zowe-horizontal-color.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f501946e34b6c06bd428ae06ffc851599395e8 GIT binary patch literal 8186 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 literal 0 HcmV?d00001 diff --git a/api-catalog-ui/frontend/src/components/Dashboard/_dashboard.scss b/api-catalog-ui/frontend/src/components/Dashboard/_dashboard.scss index 519fcf9a20..b321b1d936 100644 --- a/api-catalog-ui/frontend/src/components/Dashboard/_dashboard.scss +++ b/api-catalog-ui/frontend/src/components/Dashboard/_dashboard.scss @@ -187,7 +187,7 @@ body { }//end homepage/dashboard .homepage-content { - max-width: 1086px; + max-width: 1250px; padding-bottom: var( --spaceHuge ); max-height: calc(100vh - #{var( --headerHeight )}); scrollbar-width: none; @@ -331,8 +331,7 @@ body { } &.homepage-header-images { width: 100%; - padding-left: 175px; - margin-top: 20px; + padding-left: 80px; .homepage-main-img { width: 501px; @@ -340,31 +339,6 @@ body { .homepage-header-img { position: absolute; } - .homepage-security-img { - height: 45px; - left: 290px; - bottom: 45px; - } - .homepage-payment-img { - height: 67px; - left: 118px; - top: 105px; - } - .homepage-mainframe-img { - height: 89px; - left: var( --spaceSmall ); - top: -10px; - } - .homepage-enterprise-img { - height: 45px; - left: 295px; - top: 55px; - } - .homepage-storage-img { - height: 67px; - left: 264px; - top: -42px; - } } } diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx b/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx index cc43489569..01bf10cd64 100644 --- a/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx +++ b/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.jsx @@ -20,7 +20,14 @@ import PageNotFound from '../PageNotFound/PageNotFound'; import BigShield from '../ErrorBoundary/BigShield/BigShield'; import ServicesNavigationBarContainer from '../ServicesNavigationBar/ServicesNavigationBarContainer'; import Shield from '../ErrorBoundary/Shield/Shield'; -import countAdditionalContents, { customUIStyle, isAPIPortal, closeMobileMenu } from '../../utils/utilFunctions'; +import zoweImage from '../../assets/images/zowe-horizontal-color.png'; + +import countAdditionalContents, { + customUIStyle, + isAPIPortal, + closeMobileMenu, + findAndFormatZowe, +} from '../../utils/utilFunctions'; const loadFeedbackButton = () => { if (isAPIPortal()) { @@ -133,6 +140,7 @@ export default class DetailPage extends Component { ) { customUIStyle(tiles[0].customStyleConfig); } + return (
{apiPortalEnabled && } @@ -186,7 +194,7 @@ export default class DetailPage extends Component {
{tiles !== undefined && tiles.length === 1 && (

- {tiles[0].title} + {findAndFormatZowe(tiles[0].title)}

)}
@@ -200,6 +208,46 @@ export default class DetailPage extends Component {
)} + {/* Extra Zowe information */} + {apiPortalEnabled && tiles[0].title.toLowerCase().indexOf('zowe') >= 0 && ( +
+
+ Zowe +
+ +
+ + Zowe + + ® is a project of the  + + Open Mainframe Project + +  Zowe, the Zowe logo and the Open Mainframe Project are trademarks of  + + The Linux Foundation. + +  Broadcom is a Platinum member of Open Mainframe Project and a leading + contributor of several projects. +
+
+
+ )} {apiPortalEnabled && !onlySwaggerPresent && (
diff --git a/api-catalog-ui/frontend/src/components/DetailPage/_detailPage.scss b/api-catalog-ui/frontend/src/components/DetailPage/_detailPage.scss index 82f9ed7b93..a7429df2a6 100644 --- a/api-catalog-ui/frontend/src/components/DetailPage/_detailPage.scss +++ b/api-catalog-ui/frontend/src/components/DetailPage/_detailPage.scss @@ -199,4 +199,8 @@ body .detail-content { padding-left: 10px; font-size: 13px; } + + .externalLink { + color: var(--control00) !important; + } } diff --git a/api-catalog-ui/frontend/src/components/Footer/_footer.scss b/api-catalog-ui/frontend/src/components/Footer/_footer.scss index ab13d06850..c51ebc4a77 100644 --- a/api-catalog-ui/frontend/src/components/Footer/_footer.scss +++ b/api-catalog-ui/frontend/src/components/Footer/_footer.scss @@ -31,6 +31,13 @@ body { } } } + + .footerZoweLinks { + color: var( --text-secondary) !important; + u { + text-decoration-color: #3B4151; + } + } } h6#footer-message { color: #53565A; diff --git a/api-catalog-ui/frontend/src/components/Header/_header.scss b/api-catalog-ui/frontend/src/components/Header/_header.scss index 3608e6cdb7..bbaba2897c 100644 --- a/api-catalog-ui/frontend/src/components/Header/_header.scss +++ b/api-catalog-ui/frontend/src/components/Header/_header.scss @@ -34,6 +34,39 @@ body { display: flex; flex-direction: row; } + + .app-icon-container { + position: relative; + display: inline-block; + } + + .app-icon-container .tooltiptext { + visibility: hidden; + width: 250px; + background-color: black; + color: #fff; + text-align: center; + border-radius: 6px; + padding: 5px 0; + position: absolute; + z-index: 1; + top: -5px; + left: 110%; + } + + .app-icon-container .tooltiptext::after { + content: ""; + position: absolute; + top: 50%; + right: 100%; + margin-top: -5px; + border-width: 5px; + border-style: solid; + border-color: transparent black transparent transparent; + } + .app-icon-container:hover .tooltiptext { + visibility: visible; + } .app-icon-container img { height: 26px; } @@ -90,6 +123,12 @@ body { margin-left: var( --spaceSmall); } } + .registered { + font-size: 70%; + position: relative; + bottom: 5px; + + } }//end header .dashboard-mobile-menu { diff --git a/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBar.jsx b/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBar.jsx index 9d44d12aba..c2f64a4896 100644 --- a/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBar.jsx +++ b/api-catalog-ui/frontend/src/components/ServicesNavigationBar/ServicesNavigationBar.jsx @@ -14,7 +14,7 @@ import { Link as RouterLink } from 'react-router-dom'; import PropTypes from 'prop-types'; import Shield from '../ErrorBoundary/Shield/Shield'; import SearchCriteria from '../Search/SearchCriteria'; -import { closeMobileMenu, isAPIPortal } from '../../utils/utilFunctions'; +import { closeMobileMenu, isAPIPortal, findAndFormatZowe } from '../../utils/utilFunctions'; import MenuCloseImage from '../../assets/images/xmark.svg'; import { ReactComponent as BackArrowImage } from '../../assets/images/angles-left.svg'; import { sortServices } from '../../selectors/selectors'; @@ -87,7 +87,7 @@ export default class ServicesNavigationBar extends Component { } const TruncatedTabLabel = withStyles(this.styles)(({ classes, label }) => ( -
{label}
+
{findAndFormatZowe(label)}
 )); return ( diff --git a/api-catalog-ui/frontend/src/utils/utilFunctions.js b/api-catalog-ui/frontend/src/utils/utilFunctions.js index 4547c4dd70..9a33b2404f 100644 --- a/api-catalog-ui/frontend/src/utils/utilFunctions.js +++ b/api-catalog-ui/frontend/src/utils/utilFunctions.js @@ -195,3 +195,19 @@ export const customUIStyle = async (uiConfig) => { }; export const isAPIPortal = () => process.env.REACT_APP_API_PORTAL === 'true'; + +export const findAndFormatZowe = (title) => { + if (isAPIPortal()) { + const zoweIndex = title.toLowerCase().indexOf('zowe'); + if (zoweIndex >= 0) { + const before = title.substring(0, zoweIndex); + const after = title.substring(zoweIndex + 5); + return ( + + {before}Zowe® {after} + + ); + } + } + return title; +}; diff --git a/api-catalog-ui/frontend/src/utils/utilFunctions.test.js b/api-catalog-ui/frontend/src/utils/utilFunctions.test.js index 398bfe7a41..53804d0ae5 100644 --- a/api-catalog-ui/frontend/src/utils/utilFunctions.test.js +++ b/api-catalog-ui/frontend/src/utils/utilFunctions.test.js @@ -7,7 +7,14 @@ * * Copyright Contributors to the Zowe Project. */ -import countAdditionalContents, { closeMobileMenu, customUIStyle, isValidUrl, openMobileMenu } from './utilFunctions'; +import * as enzyme from 'enzyme'; +import countAdditionalContents, { + closeMobileMenu, + customUIStyle, + findAndFormatZowe, + isValidUrl, + openMobileMenu, +} from './utilFunctions'; describe('>>> Util Functions tests', () => { function mockFetch() { @@ -246,4 +253,13 @@ describe('>>> Util Functions tests', () => { it('should return true when URL is valid', async () => { expect(isValidUrl('https://localhost.com/hello')).toBe(true); }); + + it('should not format title without zowe in it', async () => { + expect(findAndFormatZowe('String without key')).toEqual('String without key'); + }); + it('should format title with "zowe" in it', async () => { + process.env.REACT_APP_API_PORTAL = true; + const wrapper = enzyme.shallow(findAndFormatZowe('Zowe API Catalog')); + expect(wrapper.text()).toContain('®'); + }); });