Skip to content

OCPBUGS-62638L Update PatternFly to v6.3.0+ so .co-horizontal-nav ove… #15555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+75 −48
Open

OCPBUGS-62638L Update PatternFly to v6.3.0+ so .co-horizontal-nav ove… #15555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,21 @@
},
"dependencies": {
"@patternfly-5/patternfly": "npm:@patternfly/[email protected]",
"@patternfly/patternfly": "^6.2.3",
"@patternfly/patternfly": "^6.3.1",
"@patternfly/quickstarts": "^6.3.1",
"@patternfly/react-catalog-view-extension": "^6.1.0",
"@patternfly/react-charts": "^8.2.2",
"@patternfly/react-code-editor": "^6.2.2",
"@patternfly/react-charts": "^8.3.1",
"@patternfly/react-code-editor": "^6.3.1",
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
"@patternfly/react-console": "^6.0.0",
"@patternfly/react-core": "^6.2.2",
"@patternfly/react-core": "^6.3.1",
"@patternfly/react-data-view": "^6.2.0",
"@patternfly/react-icons": "^6.2.2",
"@patternfly/react-icons": "^6.3.1",
"@patternfly/react-log-viewer": "6.3.0-prerelease.2",
"@patternfly/react-styles": "^6.2.2",
"@patternfly/react-table": "^6.2.2",
"@patternfly/react-templates": "^6.2.2",
"@patternfly/react-tokens": "^6.2.2",
"@patternfly/react-styles": "^6.3.1",
"@patternfly/react-table": "^6.3.1",
"@patternfly/react-templates": "^6.3.1",
"@patternfly/react-tokens": "^6.3.1",
"@patternfly/react-topology": "^6.2.0",
"@patternfly/react-user-feedback": "^6.1.0",
"@patternfly/react-virtualized-extension": "^6.0.0",
Expand Down
6 changes: 1 addition & 5 deletions frontend/public/components/utils/horizontal-nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,7 @@ export const NavBar: React.FC<NavBarProps> = ({ pages }) => {
// the div wrapper prevents the tabs from collapsing in a flexbox
const tabs = (
<div>
<Tabs
activeKey={defaultPage ? '' : lastElement}
component="nav"
className="co-horizontal-nav"
>
<Tabs activeKey={defaultPage ? '' : lastElement} component="nav" usePageInsets>
{pages.map(({ name, nameKey, href }) => {
const to = `${baseURL.replace(/\/$/, '')}/${encodeURIComponent(href)}`;

Expand Down
8 changes: 0 additions & 8 deletions frontend/public/style/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,6 @@ $masthead-logo-max-height: 60px;
}
}

// Workaround for https://github.com/patternfly/patternfly/issues/7376
// to align pf-v6-c-tabs--inset with PageSection
.co-horizontal-nav {
--pf-v6-c-tabs--inset: #{$pf-v6-global-gutter-x};
--pf-v6-c-tabs--m-vertical--inset: #{$pf-v6-global-gutter-x};
--pf-v6-c-tabs--m-vertical--m-box--inset: #{$pf-v6-global-gutter-x};
}

.odc-catalog-tile {
// Get rid of weird stretching of catalog grid items
.pf-v6-c-card__header-main {
Expand Down
91 changes: 65 additions & 26 deletions frontend/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,10 +1763,10 @@
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.4.2.tgz#4a87d6a5fb2ffd526b4b9597b651f13ecf8ddd4f"
integrity sha512-+BaokNR8/AmTYMESxby9UtQXPGACg449BXQd0KejAvW/uGxlgO6mY1X1205DeBEHoK3e/vXkYXjvZPpv/tcxSA==

"@patternfly/patternfly@^6.2.3":
version "6.2.3"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.2.3.tgz#cf7678e442aa31101befe389651bca4256fd1c7f"
integrity sha512-FR027W7JygcQpvlRU/Iom936Vm0apzfi2o5lvtlcWW6IaeZCCTtTaDxehoYuELHlemzkLziQAgu6LuCJEVayjw==
"@patternfly/patternfly@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-6.3.1.tgz#9df1a211f840c6ab8aec4d8ccee3e67af1e63bb1"
integrity sha512-O/lTo5EHKzer/HNzqMQOQEAMG7izDDkEHpAeJ5+sGaeQ/maB3RK7sQsOPS4DjrnMxt4/cC6LogK2mowlbf1j5Q==

"@patternfly/quickstarts@^6.3.1":
version "6.3.1"
Expand All @@ -1784,26 +1784,26 @@
"@patternfly/react-core" "^6.1.0"
"@patternfly/react-styles" "^6.1.0"

"@patternfly/react-charts@^8.2.2":
version "8.2.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-8.2.2.tgz#5aa320ed889ebd005b160e32c5450f0ae27676f5"
integrity sha512-p9mCCfW2WbuyZkMR1hcpRpv6U76IQ09CXiZfI8Pegpxw5yLnyjBeVZTwawdfXGYHAl4imvBzh8UuFbRaCR6pHA==
"@patternfly/react-charts@^8.3.1":
version "8.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-8.3.1.tgz#78ea756c86687c64c542490a150be3510bac53b8"
integrity sha512-5EPc4Bl7ZhZiDnFZzgyRhCkFcC0Km3fbC8PLjAxAf/prcWNCKXNHc6dtP38rYfrwP8R8Y831gF2bYg1uTbpKHQ==
dependencies:
"@patternfly/react-styles" "^6.2.2"
"@patternfly/react-tokens" "^6.2.2"
"@patternfly/react-styles" "^6.3.1"
"@patternfly/react-tokens" "^6.3.1"
hoist-non-react-statics "^3.3.2"
lodash "^4.17.21"
tslib "^2.8.1"

"@patternfly/react-code-editor@^6.2.2":
version "6.2.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.2.2.tgz#a2b76931fcb06e748d0ed70fa870c854538ed82d"
integrity sha512-KPnkNP769afD2rvoNQtgCx+SYscamM5QSRmw2FJ9QPHVMksarwTsMvrdMxvu+n6Dhs/T40vQLU5UR7X2yPrURg==
"@patternfly/react-code-editor@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.3.1.tgz#c45824026bb67673251b469e1bd51c3c0f2b8866"
integrity sha512-lzrION96CR2G3ASjE++dX/dExH08HVcCLXbHdmiiTL4eHfbqXt4edDc+UX619XrbaccJBE+BxNNGKyO8bgpKRg==
dependencies:
"@monaco-editor/react" "^4.6.0"
"@patternfly/react-core" "^6.2.2"
"@patternfly/react-icons" "^6.2.2"
"@patternfly/react-styles" "^6.2.2"
"@patternfly/react-core" "^6.3.1"
"@patternfly/react-icons" "^6.3.1"
"@patternfly/react-styles" "^6.3.1"
react-dropzone "14.3.5"
tslib "^2.8.1"

Expand Down Expand Up @@ -1844,6 +1844,18 @@
react-dropzone "^14.3.5"
tslib "^2.8.1"

"@patternfly/react-core@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.3.1.tgz#d73bae71edf2ef705bd52be48e6c8a83b4b5de84"
integrity sha512-1qV20nU4M6PA28qnikH9fPLQlkteaZZToFlATjBNBw7aUI6zIvj7U0akkHz8raWcfHAI+tAzGV7dfKjiv035/g==
dependencies:
"@patternfly/react-icons" "^6.3.1"
"@patternfly/react-styles" "^6.3.1"
"@patternfly/react-tokens" "^6.3.1"
focus-trap "7.6.4"
react-dropzone "^14.3.5"
tslib "^2.8.1"

"@patternfly/react-data-view@^6.2.0":
version "6.2.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-data-view/-/react-data-view-6.2.0.tgz#4205638ea6604fcd9aa5627243b88156d8e1f647"
Expand All @@ -1861,6 +1873,11 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.2.2.tgz#6b19359df7618ea4ec6aa6da3af2a9a287666f23"
integrity sha512-XkBwzuV/uiolX+T6QgB3RIqphM1m+vAZjAe3McYtyY22j1rsOdlWDE4RtRrJ1q7EoIZwyZHj0h8T9vMfUsLn4Q==

"@patternfly/react-icons@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.3.1.tgz#e28ee532a94746d588e38d1133e2705935a1844c"
integrity sha512-uiMounSIww1iZLM4pq+X8c3upzwl9iowXRPjR5CA8entb70lwgAXg3PqvypnuTAcilTq1Y3k5sFTqkhz7rgKcQ==

"@patternfly/[email protected]":
version "6.3.0-prerelease.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-log-viewer/-/react-log-viewer-6.3.0-prerelease.2.tgz#e36b6837d9cfb7da22aacc51120ad379f0605f75"
Expand All @@ -1876,7 +1893,12 @@
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.2.2.tgz#ff6d31266ba03df9be8095f189d1399a8cc3b66d"
integrity sha512-rncRDq66H8VnLyb9DrHHlZtPddlpNL9+W0XuQC0L7F6p78hOwSZmoGTW2Vq8/wJplDj8h/61qRpfRF9VEYPW0g==

"@patternfly/react-table@^6.0.0", "@patternfly/react-table@^6.2.2":
"@patternfly/react-styles@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.3.1.tgz#a6f0bea672d537df5debdc7e7ade341a044dd8f9"
integrity sha512-hyb+PlO8YITjKh2wBvjdeZhX6FyB3hlf4r6yG4rPOHk4SgneXHjNSdGwQ3szAxgGqtbENCYtOqwD/8ai72GrxQ==

"@patternfly/react-table@^6.0.0":
version "6.2.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.2.2.tgz#9ca4f1b4e5558cafd712c66a599b097a475acb30"
integrity sha512-7CxVKhnpA+f8dLJ0hVvzZOe4Djx/nE+w70ipeAHf4Yi5JwfDWmbK97YvjYPfamp/bsXTLtPcK2n4AoY5DQX6Pg==
Expand All @@ -1888,22 +1910,39 @@
lodash "^4.17.21"
tslib "^2.8.1"

"@patternfly/react-templates@^6.2.2":
version "6.2.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-templates/-/react-templates-6.2.2.tgz#a284e7086f15b8c683843833ec3e94b9fbcd616e"
integrity sha512-Onmv6zhgEOjtmgZ0D89PNlBeoxBSYo6yzTDcALSTStNVYuXMLPaClZhXd8UYEg4Jr8I/HsNHBU2pGTJuSct6TQ==
"@patternfly/react-table@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.3.1.tgz#1912606b3ddb69b7de6bde01f0015d601d50c006"
integrity sha512-ZndBbPcMr/vInP5eELRe9m7MWzRoejRAhWx+25xOdjVAd31/CmMK1nBgZk4QAXaWjH1P+uZaZYsTgr/FMTte2g==
dependencies:
"@patternfly/react-core" "^6.2.2"
"@patternfly/react-icons" "^6.2.2"
"@patternfly/react-styles" "^6.2.2"
"@patternfly/react-tokens" "^6.2.2"
"@patternfly/react-core" "^6.3.1"
"@patternfly/react-icons" "^6.3.1"
"@patternfly/react-styles" "^6.3.1"
"@patternfly/react-tokens" "^6.3.1"
lodash "^4.17.21"
tslib "^2.8.1"

"@patternfly/react-templates@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-templates/-/react-templates-6.3.1.tgz#64e18450ed6db9aa67d874560a4a71f1e0326f4d"
integrity sha512-Rf23iWVq7cME/OE/T2F7Tbjhsjol6IdSW9CNEV2fDJQxcjfPG8UzJbLXii45ox0aLcjxTIWWXSr8vpaiDPzHrw==
dependencies:
"@patternfly/react-core" "^6.3.1"
"@patternfly/react-icons" "^6.3.1"
"@patternfly/react-styles" "^6.3.1"
"@patternfly/react-tokens" "^6.3.1"
tslib "^2.8.1"

"@patternfly/react-tokens@^6.2.2":
version "6.2.2"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.2.2.tgz#4ab12cf77fab60a730f52aed2433dbf892d47509"
integrity sha512-2GRWDPBTrcTlGNFc5NPJjrjEVU90RpgcGX/CIe2MplLgM32tpVIkeUtqIoJPLRk5GrbhyFuHJYRU+O93gU4o3Q==

"@patternfly/react-tokens@^6.3.1":
version "6.3.1"
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.3.1.tgz#a54f0b668f8f75a7daaf89c7a1a55fcd78870296"
integrity sha512-wt/xKU1tGCDXUueFb+8/Cwxlm4vUD/Xl26O8MxbSLm6NZAHOUPwytJ7gugloGSPvc/zcsXxEgKANL8UZNO6DTw==

"@patternfly/react-topology@^6.2.0":
version "6.2.0"
resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-6.2.0.tgz#3a853731c6a3aa5b014596ec368cfc34fb0927b3"
Expand Down