Skip to content

Commit cb49fa9

Browse files
rhamiltorhamilto
committed
OCPBUGS-62638L Update PatternFly to v6.3.0+ so .co-horizontal-nav override can be removed
1 parent 0a2f026 commit cb49fa9

File tree

4 files changed

+75
-48
lines changed

4 files changed

+75
-48
lines changed

‎frontend/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,21 @@
135135
},
136136
"dependencies": {
137137
"@patternfly-5/patternfly": "npm:@patternfly/[email protected]",
138-
"@patternfly/patternfly": "^6.2.3",
138+
"@patternfly/patternfly": "^6.3.1",
139139
"@patternfly/quickstarts": "^6.3.1",
140140
"@patternfly/react-catalog-view-extension": "^6.1.0",
141-
"@patternfly/react-charts": "^8.2.2",
142-
"@patternfly/react-code-editor": "^6.2.2",
141+
"@patternfly/react-charts": "^8.3.1",
142+
"@patternfly/react-code-editor": "^6.3.1",
143143
"@patternfly/react-component-groups": "6.2.0-prerelease.10",
144144
"@patternfly/react-console": "^6.0.0",
145-
"@patternfly/react-core": "^6.2.2",
145+
"@patternfly/react-core": "^6.3.1",
146146
"@patternfly/react-data-view": "^6.2.0",
147-
"@patternfly/react-icons": "^6.2.2",
147+
"@patternfly/react-icons": "^6.3.1",
148148
"@patternfly/react-log-viewer": "6.3.0-prerelease.2",
149-
"@patternfly/react-styles": "^6.2.2",
150-
"@patternfly/react-table": "^6.2.2",
151-
"@patternfly/react-templates": "^6.2.2",
152-
"@patternfly/react-tokens": "^6.2.2",
149+
"@patternfly/react-styles": "^6.3.1",
150+
"@patternfly/react-table": "^6.3.1",
151+
"@patternfly/react-templates": "^6.3.1",
152+
"@patternfly/react-tokens": "^6.3.1",
153153
"@patternfly/react-topology": "^6.2.0",
154154
"@patternfly/react-user-feedback": "^6.1.0",
155155
"@patternfly/react-virtualized-extension": "^6.0.0",

‎frontend/public/components/utils/horizontal-nav.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,7 @@ export const NavBar: React.FC<NavBarProps> = ({ pages }) => {
193193
// the div wrapper prevents the tabs from collapsing in a flexbox
194194
const tabs = (
195195
<div>
196-
<Tabs
197-
activeKey={defaultPage ? '' : lastElement}
198-
component="nav"
199-
className="co-horizontal-nav"
200-
>
196+
<Tabs activeKey={defaultPage ? '' : lastElement} component="nav" usePageInsets>
201197
{pages.map(({ name, nameKey, href }) => {
202198
const to = `${baseURL.replace(/\/$/, '')}/${encodeURIComponent(href)}`;
203199

‎frontend/public/style/_overrides.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@ $masthead-logo-max-height: 60px;
4949
}
5050
}
5151

52-
// Workaround for https://github.com/patternfly/patternfly/issues/7376
53-
// to align pf-v6-c-tabs--inset with PageSection
54-
.co-horizontal-nav {
55-
--pf-v6-c-tabs--inset: #{$pf-v6-global-gutter-x};
56-
--pf-v6-c-tabs--m-vertical--inset: #{$pf-v6-global-gutter-x};
57-
--pf-v6-c-tabs--m-vertical--m-box--inset: #{$pf-v6-global-gutter-x};
58-
}
59-
6052
.odc-catalog-tile {
6153
// Get rid of weird stretching of catalog grid items
6254
.pf-v6-c-card__header-main {

‎frontend/yarn.lock‎

Lines changed: 65 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,10 +1763,10 @@
17631763
resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-5.4.2.tgz#4a87d6a5fb2ffd526b4b9597b651f13ecf8ddd4f"
17641764
integrity sha512-+BaokNR8/AmTYMESxby9UtQXPGACg449BXQd0KejAvW/uGxlgO6mY1X1205DeBEHoK3e/vXkYXjvZPpv/tcxSA==
17651765

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

17711771
"@patternfly/quickstarts@^6.3.1":
17721772
version "6.3.1"
@@ -1784,26 +1784,26 @@
17841784
"@patternfly/react-core" "^6.1.0"
17851785
"@patternfly/react-styles" "^6.1.0"
17861786

1787-
"@patternfly/react-charts@^8.2.2":
1788-
version "8.2.2"
1789-
resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-8.2.2.tgz#5aa320ed889ebd005b160e32c5450f0ae27676f5"
1790-
integrity sha512-p9mCCfW2WbuyZkMR1hcpRpv6U76IQ09CXiZfI8Pegpxw5yLnyjBeVZTwawdfXGYHAl4imvBzh8UuFbRaCR6pHA==
1787+
"@patternfly/react-charts@^8.3.1":
1788+
version "8.3.1"
1789+
resolved "https://registry.yarnpkg.com/@patternfly/react-charts/-/react-charts-8.3.1.tgz#78ea756c86687c64c542490a150be3510bac53b8"
1790+
integrity sha512-5EPc4Bl7ZhZiDnFZzgyRhCkFcC0Km3fbC8PLjAxAf/prcWNCKXNHc6dtP38rYfrwP8R8Y831gF2bYg1uTbpKHQ==
17911791
dependencies:
1792-
"@patternfly/react-styles" "^6.2.2"
1793-
"@patternfly/react-tokens" "^6.2.2"
1792+
"@patternfly/react-styles" "^6.3.1"
1793+
"@patternfly/react-tokens" "^6.3.1"
17941794
hoist-non-react-statics "^3.3.2"
17951795
lodash "^4.17.21"
17961796
tslib "^2.8.1"
17971797

1798-
"@patternfly/react-code-editor@^6.2.2":
1799-
version "6.2.2"
1800-
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.2.2.tgz#a2b76931fcb06e748d0ed70fa870c854538ed82d"
1801-
integrity sha512-KPnkNP769afD2rvoNQtgCx+SYscamM5QSRmw2FJ9QPHVMksarwTsMvrdMxvu+n6Dhs/T40vQLU5UR7X2yPrURg==
1798+
"@patternfly/react-code-editor@^6.3.1":
1799+
version "6.3.1"
1800+
resolved "https://registry.yarnpkg.com/@patternfly/react-code-editor/-/react-code-editor-6.3.1.tgz#c45824026bb67673251b469e1bd51c3c0f2b8866"
1801+
integrity sha512-lzrION96CR2G3ASjE++dX/dExH08HVcCLXbHdmiiTL4eHfbqXt4edDc+UX619XrbaccJBE+BxNNGKyO8bgpKRg==
18021802
dependencies:
18031803
"@monaco-editor/react" "^4.6.0"
1804-
"@patternfly/react-core" "^6.2.2"
1805-
"@patternfly/react-icons" "^6.2.2"
1806-
"@patternfly/react-styles" "^6.2.2"
1804+
"@patternfly/react-core" "^6.3.1"
1805+
"@patternfly/react-icons" "^6.3.1"
1806+
"@patternfly/react-styles" "^6.3.1"
18071807
react-dropzone "14.3.5"
18081808
tslib "^2.8.1"
18091809

@@ -1844,6 +1844,18 @@
18441844
react-dropzone "^14.3.5"
18451845
tslib "^2.8.1"
18461846

1847+
"@patternfly/react-core@^6.3.1":
1848+
version "6.3.1"
1849+
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.3.1.tgz#d73bae71edf2ef705bd52be48e6c8a83b4b5de84"
1850+
integrity sha512-1qV20nU4M6PA28qnikH9fPLQlkteaZZToFlATjBNBw7aUI6zIvj7U0akkHz8raWcfHAI+tAzGV7dfKjiv035/g==
1851+
dependencies:
1852+
"@patternfly/react-icons" "^6.3.1"
1853+
"@patternfly/react-styles" "^6.3.1"
1854+
"@patternfly/react-tokens" "^6.3.1"
1855+
focus-trap "7.6.4"
1856+
react-dropzone "^14.3.5"
1857+
tslib "^2.8.1"
1858+
18471859
"@patternfly/react-data-view@^6.2.0":
18481860
version "6.2.0"
18491861
resolved "https://registry.yarnpkg.com/@patternfly/react-data-view/-/react-data-view-6.2.0.tgz#4205638ea6604fcd9aa5627243b88156d8e1f647"
@@ -1861,6 +1873,11 @@
18611873
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.2.2.tgz#6b19359df7618ea4ec6aa6da3af2a9a287666f23"
18621874
integrity sha512-XkBwzuV/uiolX+T6QgB3RIqphM1m+vAZjAe3McYtyY22j1rsOdlWDE4RtRrJ1q7EoIZwyZHj0h8T9vMfUsLn4Q==
18631875

1876+
"@patternfly/react-icons@^6.3.1":
1877+
version "6.3.1"
1878+
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.3.1.tgz#e28ee532a94746d588e38d1133e2705935a1844c"
1879+
integrity sha512-uiMounSIww1iZLM4pq+X8c3upzwl9iowXRPjR5CA8entb70lwgAXg3PqvypnuTAcilTq1Y3k5sFTqkhz7rgKcQ==
1880+
18641881
"@patternfly/[email protected]":
18651882
version "6.3.0-prerelease.2"
18661883
resolved "https://registry.yarnpkg.com/@patternfly/react-log-viewer/-/react-log-viewer-6.3.0-prerelease.2.tgz#e36b6837d9cfb7da22aacc51120ad379f0605f75"
@@ -1876,7 +1893,12 @@
18761893
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.2.2.tgz#ff6d31266ba03df9be8095f189d1399a8cc3b66d"
18771894
integrity sha512-rncRDq66H8VnLyb9DrHHlZtPddlpNL9+W0XuQC0L7F6p78hOwSZmoGTW2Vq8/wJplDj8h/61qRpfRF9VEYPW0g==
18781895

1879-
"@patternfly/react-table@^6.0.0", "@patternfly/react-table@^6.2.2":
1896+
"@patternfly/react-styles@^6.3.1":
1897+
version "6.3.1"
1898+
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.3.1.tgz#a6f0bea672d537df5debdc7e7ade341a044dd8f9"
1899+
integrity sha512-hyb+PlO8YITjKh2wBvjdeZhX6FyB3hlf4r6yG4rPOHk4SgneXHjNSdGwQ3szAxgGqtbENCYtOqwD/8ai72GrxQ==
1900+
1901+
"@patternfly/react-table@^6.0.0":
18801902
version "6.2.2"
18811903
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.2.2.tgz#9ca4f1b4e5558cafd712c66a599b097a475acb30"
18821904
integrity sha512-7CxVKhnpA+f8dLJ0hVvzZOe4Djx/nE+w70ipeAHf4Yi5JwfDWmbK97YvjYPfamp/bsXTLtPcK2n4AoY5DQX6Pg==
@@ -1888,22 +1910,39 @@
18881910
lodash "^4.17.21"
18891911
tslib "^2.8.1"
18901912

1891-
"@patternfly/react-templates@^6.2.2":
1892-
version "6.2.2"
1893-
resolved "https://registry.yarnpkg.com/@patternfly/react-templates/-/react-templates-6.2.2.tgz#a284e7086f15b8c683843833ec3e94b9fbcd616e"
1894-
integrity sha512-Onmv6zhgEOjtmgZ0D89PNlBeoxBSYo6yzTDcALSTStNVYuXMLPaClZhXd8UYEg4Jr8I/HsNHBU2pGTJuSct6TQ==
1913+
"@patternfly/react-table@^6.3.1":
1914+
version "6.3.1"
1915+
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.3.1.tgz#1912606b3ddb69b7de6bde01f0015d601d50c006"
1916+
integrity sha512-ZndBbPcMr/vInP5eELRe9m7MWzRoejRAhWx+25xOdjVAd31/CmMK1nBgZk4QAXaWjH1P+uZaZYsTgr/FMTte2g==
18951917
dependencies:
1896-
"@patternfly/react-core" "^6.2.2"
1897-
"@patternfly/react-icons" "^6.2.2"
1898-
"@patternfly/react-styles" "^6.2.2"
1899-
"@patternfly/react-tokens" "^6.2.2"
1918+
"@patternfly/react-core" "^6.3.1"
1919+
"@patternfly/react-icons" "^6.3.1"
1920+
"@patternfly/react-styles" "^6.3.1"
1921+
"@patternfly/react-tokens" "^6.3.1"
1922+
lodash "^4.17.21"
1923+
tslib "^2.8.1"
1924+
1925+
"@patternfly/react-templates@^6.3.1":
1926+
version "6.3.1"
1927+
resolved "https://registry.yarnpkg.com/@patternfly/react-templates/-/react-templates-6.3.1.tgz#64e18450ed6db9aa67d874560a4a71f1e0326f4d"
1928+
integrity sha512-Rf23iWVq7cME/OE/T2F7Tbjhsjol6IdSW9CNEV2fDJQxcjfPG8UzJbLXii45ox0aLcjxTIWWXSr8vpaiDPzHrw==
1929+
dependencies:
1930+
"@patternfly/react-core" "^6.3.1"
1931+
"@patternfly/react-icons" "^6.3.1"
1932+
"@patternfly/react-styles" "^6.3.1"
1933+
"@patternfly/react-tokens" "^6.3.1"
19001934
tslib "^2.8.1"
19011935

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

1941+
"@patternfly/react-tokens@^6.3.1":
1942+
version "6.3.1"
1943+
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.3.1.tgz#a54f0b668f8f75a7daaf89c7a1a55fcd78870296"
1944+
integrity sha512-wt/xKU1tGCDXUueFb+8/Cwxlm4vUD/Xl26O8MxbSLm6NZAHOUPwytJ7gugloGSPvc/zcsXxEgKANL8UZNO6DTw==
1945+
19071946
"@patternfly/react-topology@^6.2.0":
19081947
version "6.2.0"
19091948
resolved "https://registry.yarnpkg.com/@patternfly/react-topology/-/react-topology-6.2.0.tgz#3a853731c6a3aa5b014596ec368cfc34fb0927b3"

0 commit comments

Comments
 (0)