From 7ad1182017b620e344fdd953982a208c43502f11 Mon Sep 17 00:00:00 2001 From: Jon Koops Date: Fri, 24 Jun 2022 13:45:43 +0200 Subject: [PATCH] Upgrade to latest version of PatternFly (#2866) Co-authored-by: Jon Koops Co-authored-by: Eric Olkowski --- .../pages/admin_console/ListingPage.ts | 4 +- .../components/TableToolbarPage.ts | 6 +- package-lock.json | 165 +++++++++--------- package.json | 10 +- .../keycloak-text-area/KeycloakTextArea.tsx | 4 +- 5 files changed, 94 insertions(+), 95 deletions(-) diff --git a/cypress/support/pages/admin_console/ListingPage.ts b/cypress/support/pages/admin_console/ListingPage.ts index d62c41f5fb..c9e78488ed 100644 --- a/cypress/support/pages/admin_console/ListingPage.ts +++ b/cypress/support/pages/admin_console/ListingPage.ts @@ -29,7 +29,7 @@ export enum FilterSession { export default class ListingPage extends CommonElements { private searchInput = - ".pf-c-toolbar__item .pf-c-search-input__text-input:visible"; + ".pf-c-toolbar__item .pf-c-text-input-group__text-input:visible"; private tableToolbar = ".pf-c-toolbar"; private itemsRows = "table:visible"; private deleteUserButton = "delete-user-btn"; @@ -96,7 +96,7 @@ export default class ListingPage extends CommonElements { if (searchValue) { cy.get(this.searchInput).type(searchValue); } - cy.get(this.searchBtn).click(); + cy.get(this.searchBtn).click({ force: true }); if (wait) { cy.wait(["@search"]); diff --git a/cypress/support/pages/admin_console/components/TableToolbarPage.ts b/cypress/support/pages/admin_console/components/TableToolbarPage.ts index 2c7429f785..212726623a 100644 --- a/cypress/support/pages/admin_console/components/TableToolbarPage.ts +++ b/cypress/support/pages/admin_console/components/TableToolbarPage.ts @@ -16,7 +16,7 @@ export default class TableToolbar extends CommonElements { this.searchBtn = this.parentSelector + "button[aria-label='Search']:visible"; this.searchInput = - this.parentSelector + ".pf-c-search-input__text-input:visible"; + this.parentSelector + ".pf-c-text-input-group__text-input:visible"; this.changeTypeBtn = this.parentSelector + "#change-type-dropdown"; this.nextPageBtn = this.parentSelector + "button[data-action=next]"; this.previousPageBtn = this.parentSelector + "button[data-action=previous]"; @@ -52,7 +52,7 @@ export default class TableToolbar extends CommonElements { } clickSearchButton() { - cy.get(this.searchBtn).click(); + cy.get(this.searchBtn).click({ force: true }); return this; } @@ -79,7 +79,7 @@ export default class TableToolbar extends CommonElements { if (searchValue) { cy.get(this.searchInput).type(searchValue); } - cy.get(this.searchBtn).click(); + this.clickSearchButton(); if (wait) { cy.wait(["@search"]); } diff --git a/package-lock.json b/package-lock.json index 1a2d1ce2dc..59410167cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,11 +8,11 @@ "license": "Apache", "dependencies": { "@keycloak/keycloak-admin-client": "^19.0.0-dev.13", - "@patternfly/patternfly": "^4.194.4", - "@patternfly/react-code-editor": "^4.55.1", - "@patternfly/react-core": "^4.214.1", - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-table": "^4.83.1", + "@patternfly/patternfly": "^4.196.7", + "@patternfly/react-code-editor": "^4.62.3", + "@patternfly/react-core": "^4.221.3", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-table": "^4.90.3", "dagre": "^0.8.5", "file-saver": "^2.0.5", "flat": "^5.0.2", @@ -3775,19 +3775,18 @@ } }, "node_modules/@patternfly/patternfly": { - "version": "4.194.4", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.194.4.tgz", - "integrity": "sha512-SJxr502v0xXk1N5OiPLunD9pdKvHp5XXJLXcD5lIPrimjjUcy46m48X8YONjDvnC/Y5xV92UI2KxoCVucE34eA==", - "license": "MIT" + "version": "4.196.7", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.196.7.tgz", + "integrity": "sha512-hA7Oww411e1p0/IXjC1I+4/1NNis9V+NVBxfUIpRwyuLbCIDHBdtMu2qAPLdKxXjuibV9EE6ZdlT7ra/kcFuJQ==" }, "node_modules/@patternfly/react-code-editor": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.55.1.tgz", - "integrity": "sha512-B/lMbxH0u8Kq6sMKovu8kqUNuf5GIPrCBZMWbkxf2BoPcDLyCgHksmTXhUavhqkO1y5TMCaq+EjJMD0pAvHkrw==", + "version": "4.62.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.62.3.tgz", + "integrity": "sha512-zNXTJ+DvKvVFRoURQC3nai6PuDegt71X3ONqkazVpZ7ODt6hDeeOHj+eW85sDa2ATSeRghITtEQsZPPNG6Uykw==", "dependencies": { - "@patternfly/react-core": "^4.214.1", - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-styles": "^4.64.1", + "@patternfly/react-core": "^4.221.3", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-styles": "^4.71.3", "react-dropzone": "9.0.0", "tslib": "^2.0.0" }, @@ -3799,15 +3798,14 @@ } }, "node_modules/@patternfly/react-core": { - "version": "4.214.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.214.1.tgz", - "integrity": "sha512-XHEqXpnBEDyLVdAEDOYlGqFHnN43eNLSD5HABB99xO6541JV9MRnbxs0+v9iYnfhcKh/8bhA9ITXnUi3f2PEvg==", - "license": "MIT", + "version": "4.221.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.221.3.tgz", + "integrity": "sha512-I33TnX5Xn8ypXYjHc7G5kIVsYjB4PnDxxmJG6rBLqFslrnGUBzvb0sflnP43QlI0camamVIoaBRjedj8WXqaRg==", "dependencies": { - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-styles": "^4.64.1", - "@patternfly/react-tokens": "^4.66.1", - "focus-trap": "6.2.2", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-styles": "^4.71.3", + "@patternfly/react-tokens": "^4.73.3", + "focus-trap": "6.9.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", "tslib": "^2.0.0" @@ -3818,30 +3816,28 @@ } }, "node_modules/@patternfly/react-icons": { - "version": "4.65.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.65.1.tgz", - "integrity": "sha512-CUYFRPztFkR7qrXq/0UAhLjeHd8FdjLe4jBjj8tfKc7OXwxDeZczqNFyRMATZpPaduTH7BU2r3OUjQrgAbquWg==", - "license": "MIT", + "version": "4.72.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.72.3.tgz", + "integrity": "sha512-bZCPsOsxtFXTmZQqDKNebkBywud3E0ID3446AWI1RO5Ypufdc0FTkehSzBPANfJPYjjK9/EYaIy8rF0yiJdFPQ==", "peerDependencies": { "react": "^16.8.0 || ^17.0.0", "react-dom": "^16.8.0 || ^17.0.0" } }, "node_modules/@patternfly/react-styles": { - "version": "4.64.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.64.1.tgz", - "integrity": "sha512-+GxULkP2o5Vpr9w+J4NiGOGzhTfNniYzdPGEF/yC+oDoAXB6Q1HJyQnEj+kJH31xNvwmw3G3VFtwRLX4ZWr0oA==", - "license": "MIT" + "version": "4.71.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.71.3.tgz", + "integrity": "sha512-JpMBIrJfco3JwK9KbJvjr+tKZidVhbkGrQT7GyWbYAwZ2bOmCmeCPJYc0xhAWcvNumn9a7AhYzAWPJVlQQue3g==" }, "node_modules/@patternfly/react-table": { - "version": "4.83.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.83.1.tgz", - "integrity": "sha512-mkq13x9funh+Nh2Uzj2ZQBOacNYc+a60yUAHZMXgNcljCJ3LTQUoYy6EonvYrqwSrpC7vj8nLt8+/XbDNc0Aig==", + "version": "4.90.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.90.3.tgz", + "integrity": "sha512-RsSvs1IdvzOFcWgNc42COHfPJ/Dhl8gCHgwnC0ER/yD+IXOOdP+0u7+ZHGfF9+anAHZhQRJ2lGlQnp2HZM8b3A==", "dependencies": { - "@patternfly/react-core": "^4.214.1", - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-styles": "^4.64.1", - "@patternfly/react-tokens": "^4.66.1", + "@patternfly/react-core": "^4.221.3", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-styles": "^4.71.3", + "@patternfly/react-tokens": "^4.73.3", "lodash": "^4.17.19", "tslib": "^2.0.0" }, @@ -3851,10 +3847,9 @@ } }, "node_modules/@patternfly/react-tokens": { - "version": "4.66.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.66.1.tgz", - "integrity": "sha512-k0IWqpufM6ezT+3gWlEamqQ7LW9yi8e8cBBlude5IU8eIEqIG6AccwR1WNBEK1wCVWGwVxakLMdf0XBLl4k52Q==", - "license": "MIT" + "version": "4.73.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.73.3.tgz", + "integrity": "sha512-WyEcV9jiMZzscQMBhlDkypHw9qg0wbX7r/fe8HcWws+jnYWGVjwUdnr18ktI9aw/h/oQS46sirf8xbNTlIiQFg==" }, "node_modules/@rollup/plugin-commonjs": { "version": "16.0.0", @@ -10066,10 +10061,11 @@ } }, "node_modules/focus-trap": { - "version": "6.2.2", - "license": "MIT", + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz", + "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==", "dependencies": { - "tabbable": "^5.1.4" + "tabbable": "^5.3.2" } }, "node_modules/follow-redirects": { @@ -19385,8 +19381,9 @@ "license": "MIT" }, "node_modules/tabbable": { - "version": "5.2.1", - "license": "MIT" + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz", + "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==" }, "node_modules/tapable": { "version": "1.1.3", @@ -23906,64 +23903,64 @@ } }, "@patternfly/patternfly": { - "version": "4.194.4", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.194.4.tgz", - "integrity": "sha512-SJxr502v0xXk1N5OiPLunD9pdKvHp5XXJLXcD5lIPrimjjUcy46m48X8YONjDvnC/Y5xV92UI2KxoCVucE34eA==" + "version": "4.196.7", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.196.7.tgz", + "integrity": "sha512-hA7Oww411e1p0/IXjC1I+4/1NNis9V+NVBxfUIpRwyuLbCIDHBdtMu2qAPLdKxXjuibV9EE6ZdlT7ra/kcFuJQ==" }, "@patternfly/react-code-editor": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.55.1.tgz", - "integrity": "sha512-B/lMbxH0u8Kq6sMKovu8kqUNuf5GIPrCBZMWbkxf2BoPcDLyCgHksmTXhUavhqkO1y5TMCaq+EjJMD0pAvHkrw==", + "version": "4.62.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.62.3.tgz", + "integrity": "sha512-zNXTJ+DvKvVFRoURQC3nai6PuDegt71X3ONqkazVpZ7ODt6hDeeOHj+eW85sDa2ATSeRghITtEQsZPPNG6Uykw==", "requires": { - "@patternfly/react-core": "^4.214.1", - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-styles": "^4.64.1", + "@patternfly/react-core": "^4.221.3", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-styles": "^4.71.3", "react-dropzone": "9.0.0", "tslib": "^2.0.0" } }, "@patternfly/react-core": { - "version": "4.214.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.214.1.tgz", - "integrity": "sha512-XHEqXpnBEDyLVdAEDOYlGqFHnN43eNLSD5HABB99xO6541JV9MRnbxs0+v9iYnfhcKh/8bhA9ITXnUi3f2PEvg==", + "version": "4.221.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.221.3.tgz", + "integrity": "sha512-I33TnX5Xn8ypXYjHc7G5kIVsYjB4PnDxxmJG6rBLqFslrnGUBzvb0sflnP43QlI0camamVIoaBRjedj8WXqaRg==", "requires": { - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-styles": "^4.64.1", - "@patternfly/react-tokens": "^4.66.1", - "focus-trap": "6.2.2", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-styles": "^4.71.3", + "@patternfly/react-tokens": "^4.73.3", + "focus-trap": "6.9.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", "tslib": "^2.0.0" } }, "@patternfly/react-icons": { - "version": "4.65.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.65.1.tgz", - "integrity": "sha512-CUYFRPztFkR7qrXq/0UAhLjeHd8FdjLe4jBjj8tfKc7OXwxDeZczqNFyRMATZpPaduTH7BU2r3OUjQrgAbquWg==", + "version": "4.72.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.72.3.tgz", + "integrity": "sha512-bZCPsOsxtFXTmZQqDKNebkBywud3E0ID3446AWI1RO5Ypufdc0FTkehSzBPANfJPYjjK9/EYaIy8rF0yiJdFPQ==", "requires": {} }, "@patternfly/react-styles": { - "version": "4.64.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.64.1.tgz", - "integrity": "sha512-+GxULkP2o5Vpr9w+J4NiGOGzhTfNniYzdPGEF/yC+oDoAXB6Q1HJyQnEj+kJH31xNvwmw3G3VFtwRLX4ZWr0oA==" + "version": "4.71.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.71.3.tgz", + "integrity": "sha512-JpMBIrJfco3JwK9KbJvjr+tKZidVhbkGrQT7GyWbYAwZ2bOmCmeCPJYc0xhAWcvNumn9a7AhYzAWPJVlQQue3g==" }, "@patternfly/react-table": { - "version": "4.83.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.83.1.tgz", - "integrity": "sha512-mkq13x9funh+Nh2Uzj2ZQBOacNYc+a60yUAHZMXgNcljCJ3LTQUoYy6EonvYrqwSrpC7vj8nLt8+/XbDNc0Aig==", + "version": "4.90.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.90.3.tgz", + "integrity": "sha512-RsSvs1IdvzOFcWgNc42COHfPJ/Dhl8gCHgwnC0ER/yD+IXOOdP+0u7+ZHGfF9+anAHZhQRJ2lGlQnp2HZM8b3A==", "requires": { - "@patternfly/react-core": "^4.214.1", - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-styles": "^4.64.1", - "@patternfly/react-tokens": "^4.66.1", + "@patternfly/react-core": "^4.221.3", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-styles": "^4.71.3", + "@patternfly/react-tokens": "^4.73.3", "lodash": "^4.17.19", "tslib": "^2.0.0" } }, "@patternfly/react-tokens": { - "version": "4.66.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.66.1.tgz", - "integrity": "sha512-k0IWqpufM6ezT+3gWlEamqQ7LW9yi8e8cBBlude5IU8eIEqIG6AccwR1WNBEK1wCVWGwVxakLMdf0XBLl4k52Q==" + "version": "4.73.3", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.73.3.tgz", + "integrity": "sha512-WyEcV9jiMZzscQMBhlDkypHw9qg0wbX7r/fe8HcWws+jnYWGVjwUdnr18ktI9aw/h/oQS46sirf8xbNTlIiQFg==" }, "@rollup/plugin-commonjs": { "version": "16.0.0", @@ -28260,9 +28257,11 @@ } }, "focus-trap": { - "version": "6.2.2", + "version": "6.9.2", + "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz", + "integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==", "requires": { - "tabbable": "^5.1.4" + "tabbable": "^5.3.2" } }, "follow-redirects": { @@ -34562,7 +34561,9 @@ "dev": true }, "tabbable": { - "version": "5.2.1" + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz", + "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==" }, "tapable": { "version": "1.1.3", diff --git a/package.json b/package.json index 01452deb1a..5008078351 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,11 @@ }, "dependencies": { "@keycloak/keycloak-admin-client": "^19.0.0-dev.13", - "@patternfly/patternfly": "^4.194.4", - "@patternfly/react-code-editor": "^4.55.1", - "@patternfly/react-core": "^4.214.1", - "@patternfly/react-icons": "^4.65.1", - "@patternfly/react-table": "^4.83.1", + "@patternfly/patternfly": "^4.196.7", + "@patternfly/react-code-editor": "^4.62.3", + "@patternfly/react-core": "^4.221.3", + "@patternfly/react-icons": "^4.72.3", + "@patternfly/react-table": "^4.90.3", "dagre": "^0.8.5", "file-saver": "^2.0.5", "flat": "^5.0.2", diff --git a/src/components/keycloak-text-area/KeycloakTextArea.tsx b/src/components/keycloak-text-area/KeycloakTextArea.tsx index 5d08aa7bde..62a5833bfb 100644 --- a/src/components/keycloak-text-area/KeycloakTextArea.tsx +++ b/src/components/keycloak-text-area/KeycloakTextArea.tsx @@ -12,9 +12,7 @@ export type KeycloakTextAreaProps = Omit< Pick, "onChange">; export const KeycloakTextArea = forwardRef< - // TODO: This is typed incorrectly and will have to be replaced with 'HTMLTextAreaElement'. - // More information: https://github.com/patternfly/patternfly-react/pull/7397 - HTMLInputElement, + HTMLTextAreaElement, KeycloakTextAreaProps >(({ onChange, ...props }, ref) => { const onChangeForward: TextAreaProps["onChange"] = (_, event) =>