Skip to content

Commit 129c30f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #30 from rhamilto/CONSOLE-4535
CONSOLE-4535: Update PatternFly to latest
2 parents d1c9277 + 93cdbd1 commit 129c30f

4 files changed

Lines changed: 58 additions & 35 deletions

File tree

‎integration-tests/e2e/crud.cy.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { labelsModal } from "../views/labels-modal";
77
import { annotationModal } from "../views/annotations-modal";
88
import { detailsPage } from "../views/details-page";
99
import { nav } from "../views/nav";
10+
import { guidedTour } from "../views/guided-tour";
1011

1112
const cronTabName = "my-new-cron-object";
1213
const testLabel = "key1=value1";
@@ -20,6 +21,7 @@ const annotations = [
2021
describe(`${PLUGIN_NAME}`, () => {
2122
before(() => {
2223
cy.login();
24+
guidedTour.close();
2325
setup();
2426
cy.createProject(testName);
2527
});

‎integration-tests/views/guided-tour.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
export const guidedTour = {
2+
close: () => {
3+
cy.get("body").then(($body) => {
4+
if ($body.find(`[data-test="guided-tour-modal"]`).length > 0) {
5+
cy.byTestID("tour-step-footer-secondary").contains("Skip tour").click();
6+
}
7+
});
8+
},
9+
isOpen: () => {
10+
cy.get("body").then(($body) => {
11+
if ($body.find(`[data-test="guided-tour-modal"]`).length > 0) {
12+
cy.byTestID("guided-tour-modal").should("be.visible");
13+
}
14+
});
15+
},
16+
};

‎package.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"@cypress/webpack-preprocessor": "^6.0.0",
2222
"@openshift-console/dynamic-plugin-sdk": "^1.0.0",
2323
"@openshift-console/dynamic-plugin-sdk-webpack": "^1.0.0",
24-
"@patternfly/react-core": "^6.2.0-prerelease.15",
25-
"@patternfly/react-icons": "^6.2.0-prerelease.2",
26-
"@patternfly/react-table": "^6.2.0-prerelease.16",
24+
"@patternfly/react-core": "6.2.0",
25+
"@patternfly/react-icons": "6.2.0",
26+
"@patternfly/react-table": "6.2.0",
2727
"@types/node": "^16.11.6",
2828
"@types/react": "^17.0.34",
2929
"@types/react-helmet": "^6.1.4",
@@ -84,7 +84,12 @@
8484
},
8585
"resolutions": {
8686
"webpack": "^5.68.0",
87-
"@types/react": "17.0.40"
87+
"@types/react": "17.0.40",
88+
"@patternfly/react-core": "6.2.0",
89+
"@patternfly/react-icons": "6.2.0",
90+
"@patternfly/react-table": "6.2.0",
91+
"@patternfly/react-styles": "6.2.0",
92+
"@patternfly/react-tokens": "6.2.0"
8893
},
8994
"dependencies": {
9095
"react-tagsinput": "^3.20.0"

‎yarn.lock‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -313,44 +313,44 @@
313313
semver "^7.3.7"
314314
yup "^0.32.11"
315315

316-
"@patternfly/react-core@^6.2.0-prerelease.15", "@patternfly/react-core@^6.2.0-prerelease.17":
317-
version "6.2.0-prerelease.17"
318-
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.2.0-prerelease.17.tgz#d01657e2754306f0e76b718941ca757f9d0fbdfe"
319-
integrity sha512-NWiif+SMXOYTDVwcVv1OAOKEN95PFRqeDgEcA580M0KxNqEo1oFaNKQ/xUuhpYxGuvEj0oVjcOjN9lglyOQZZA==
320-
dependencies:
321-
"@patternfly/react-icons" "^6.2.0-prerelease.2"
322-
"@patternfly/react-styles" "^6.2.0-prerelease.2"
323-
"@patternfly/react-tokens" "^6.2.0-prerelease.2"
316+
"@patternfly/react-core@6.2.0", "@patternfly/react-core@^6.2.0":
317+
version "6.2.0"
318+
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-6.2.0.tgz#8cd2e5b3716352ab21859f3aebeeafd42f72035e"
319+
integrity sha512-yh5de7Tv1ft8c4+xHi5wr49yk4E/FgOXsxj3bl2VjdieTxXmZEmeWcqeYFXoUdnMSqCay4Mt5k6gyRYgO0y9oQ==
320+
dependencies:
321+
"@patternfly/react-icons" "^6.2.0"
322+
"@patternfly/react-styles" "^6.2.0"
323+
"@patternfly/react-tokens" "^6.2.0"
324324
focus-trap "7.6.4"
325325
react-dropzone "^14.3.5"
326326
tslib "^2.8.1"
327327

328-
"@patternfly/react-icons@^6.2.0-prerelease.2":
329-
version "6.2.0-prerelease.2"
330-
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.2.0-prerelease.2.tgz#b695a12733d90004d243b37458bfe52947317d8e"
331-
integrity sha512-3ymG24ICMAvMqrDPzU8ycPcsHht4RfHjQil3ox43wwHI+nLrpywAgE9z6GtAzwtdm+DVZHBT1CWLWuAgdofX8w==
332-
333-
"@patternfly/react-styles@^6.2.0-prerelease.2":
334-
version "6.2.0-prerelease.2"
335-
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.2.0-prerelease.2.tgz#32935b2e8d3bfb8aa4287e06a9aa3d4fbd550eea"
336-
integrity sha512-1YJH8Ozu05AHCBNGRZyNA5X1HxNGXuYTQvcR8FbVaNGuuWtvZxzb2EovN9xYVBu2joh+/LCLhiTAXI4eNKw3Ag==
337-
338-
"@patternfly/react-table@^6.2.0-prerelease.16":
339-
version "6.2.0-prerelease.18"
340-
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.2.0-prerelease.18.tgz#1bb01e3a85fbb3ac972f6476c47cf57a47c37791"
341-
integrity sha512-W0NtprppJ8yMH5i+K8lfwdmmTHW5X96Ax4savrsSJ9b8AfI6xcsgUXjUOLqVa+Umv9A5m4S5GJOh/llvevGdhg==
342-
dependencies:
343-
"@patternfly/react-core" "^6.2.0-prerelease.17"
344-
"@patternfly/react-icons" "^6.2.0-prerelease.2"
345-
"@patternfly/react-styles" "^6.2.0-prerelease.2"
346-
"@patternfly/react-tokens" "^6.2.0-prerelease.2"
328+
"@patternfly/react-icons@6.2.0", "@patternfly/react-icons@^6.2.0":
329+
version "6.2.0"
330+
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-6.2.0.tgz#a140b893b8fa945c891fbf4bd797d992be8ec5f6"
331+
integrity sha512-moGLd1qM80+yjVVVEl+aNHQn7K5ANMUgyQZ4ECxnA/vjPlWmNZSJ1imsaCxYrywp9zzO0yZ5uN5wO/Z2hdz3MA==
332+
333+
"@patternfly/react-styles@6.2.0", "@patternfly/react-styles@^6.2.0":
334+
version "6.2.0"
335+
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-6.2.0.tgz#0a1dec5bd81d74158cc33b6d1f0eedeb1a2665a8"
336+
integrity sha512-Cv2flqlc8GEuzshjQrLj1qfYAVx9IDOudi46yfiOIvG7GUPdDCH+Ib4XGC/oZry7qj1Dwr78BJ6QOinM1cSiog==
337+
338+
"@patternfly/react-table@6.2.0":
339+
version "6.2.0"
340+
resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-6.2.0.tgz#23396b0539a35f75870455b709c86ef580443b0f"
341+
integrity sha512-6FwyzvaajgN5x/qrpPWax+GNyRllAd1dHhrgpZqZbeWyoywEifr1K2dxYmYNzMKOyYj9jEK0NnCWWIzFvaVfDg==
342+
dependencies:
343+
"@patternfly/react-core" "^6.2.0"
344+
"@patternfly/react-icons" "^6.2.0"
345+
"@patternfly/react-styles" "^6.2.0"
346+
"@patternfly/react-tokens" "^6.2.0"
347347
lodash "^4.17.21"
348348
tslib "^2.8.1"
349349

350-
"@patternfly/react-tokens@^6.2.0-prerelease.2":
351-
version "6.2.0-prerelease.2"
352-
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.2.0-prerelease.2.tgz#d1db6f455f581daa84d728c0a248802096cd797a"
353-
integrity sha512-3snWPqFBOcv0P0UZk5SfG3ZrhBaMb5P1griaMydA/cXdWe9XRX5oP4QuE3uGtQfBVuAaEqRDokQfo2xhWP2Gyw==
350+
"@patternfly/react-tokens@6.2.0", "@patternfly/react-tokens@^6.2.0":
351+
version "6.2.0"
352+
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-6.2.0.tgz#7535256d934a27ba6ba4a1f80588e244811e953b"
353+
integrity sha512-KyzbsQYXTCxTmwkLlN4GdmTCNlOKnPUpY389loaC4/B0wHNq8Vw4OMIsAPVi4RSSvTaSxitlPAwt3xBTjNIzFA==
354354

355355
"@remix-run/router@1.8.0":
356356
version "1.8.0"

0 commit comments

Comments
 (0)