Upgrade to latest version of PatternFly (#2866)

Co-authored-by: Jon Koops <jonkoops@gmail.com>

Co-authored-by: Eric Olkowski <thatblindgeye@gmail.com>
This commit is contained in:
Jon Koops 2022-06-24 13:45:43 +02:00 committed by GitHub
parent fef1609601
commit 7ad1182017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 94 additions and 95 deletions

View file

@ -29,7 +29,7 @@ export enum FilterSession {
export default class ListingPage extends CommonElements { export default class ListingPage extends CommonElements {
private searchInput = 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 tableToolbar = ".pf-c-toolbar";
private itemsRows = "table:visible"; private itemsRows = "table:visible";
private deleteUserButton = "delete-user-btn"; private deleteUserButton = "delete-user-btn";
@ -96,7 +96,7 @@ export default class ListingPage extends CommonElements {
if (searchValue) { if (searchValue) {
cy.get(this.searchInput).type(searchValue); cy.get(this.searchInput).type(searchValue);
} }
cy.get(this.searchBtn).click(); cy.get(this.searchBtn).click({ force: true });
if (wait) { if (wait) {
cy.wait(["@search"]); cy.wait(["@search"]);

View file

@ -16,7 +16,7 @@ export default class TableToolbar extends CommonElements {
this.searchBtn = this.searchBtn =
this.parentSelector + "button[aria-label='Search']:visible"; this.parentSelector + "button[aria-label='Search']:visible";
this.searchInput = 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.changeTypeBtn = this.parentSelector + "#change-type-dropdown";
this.nextPageBtn = this.parentSelector + "button[data-action=next]"; this.nextPageBtn = this.parentSelector + "button[data-action=next]";
this.previousPageBtn = this.parentSelector + "button[data-action=previous]"; this.previousPageBtn = this.parentSelector + "button[data-action=previous]";
@ -52,7 +52,7 @@ export default class TableToolbar extends CommonElements {
} }
clickSearchButton() { clickSearchButton() {
cy.get(this.searchBtn).click(); cy.get(this.searchBtn).click({ force: true });
return this; return this;
} }
@ -79,7 +79,7 @@ export default class TableToolbar extends CommonElements {
if (searchValue) { if (searchValue) {
cy.get(this.searchInput).type(searchValue); cy.get(this.searchInput).type(searchValue);
} }
cy.get(this.searchBtn).click(); this.clickSearchButton();
if (wait) { if (wait) {
cy.wait(["@search"]); cy.wait(["@search"]);
} }

165
package-lock.json generated
View file

@ -8,11 +8,11 @@
"license": "Apache", "license": "Apache",
"dependencies": { "dependencies": {
"@keycloak/keycloak-admin-client": "^19.0.0-dev.13", "@keycloak/keycloak-admin-client": "^19.0.0-dev.13",
"@patternfly/patternfly": "^4.194.4", "@patternfly/patternfly": "^4.196.7",
"@patternfly/react-code-editor": "^4.55.1", "@patternfly/react-code-editor": "^4.62.3",
"@patternfly/react-core": "^4.214.1", "@patternfly/react-core": "^4.221.3",
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-table": "^4.83.1", "@patternfly/react-table": "^4.90.3",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"flat": "^5.0.2", "flat": "^5.0.2",
@ -3775,19 +3775,18 @@
} }
}, },
"node_modules/@patternfly/patternfly": { "node_modules/@patternfly/patternfly": {
"version": "4.194.4", "version": "4.196.7",
"resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.194.4.tgz", "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.196.7.tgz",
"integrity": "sha512-SJxr502v0xXk1N5OiPLunD9pdKvHp5XXJLXcD5lIPrimjjUcy46m48X8YONjDvnC/Y5xV92UI2KxoCVucE34eA==", "integrity": "sha512-hA7Oww411e1p0/IXjC1I+4/1NNis9V+NVBxfUIpRwyuLbCIDHBdtMu2qAPLdKxXjuibV9EE6ZdlT7ra/kcFuJQ=="
"license": "MIT"
}, },
"node_modules/@patternfly/react-code-editor": { "node_modules/@patternfly/react-code-editor": {
"version": "4.55.1", "version": "4.62.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.55.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.62.3.tgz",
"integrity": "sha512-B/lMbxH0u8Kq6sMKovu8kqUNuf5GIPrCBZMWbkxf2BoPcDLyCgHksmTXhUavhqkO1y5TMCaq+EjJMD0pAvHkrw==", "integrity": "sha512-zNXTJ+DvKvVFRoURQC3nai6PuDegt71X3ONqkazVpZ7ODt6hDeeOHj+eW85sDa2ATSeRghITtEQsZPPNG6Uykw==",
"dependencies": { "dependencies": {
"@patternfly/react-core": "^4.214.1", "@patternfly/react-core": "^4.221.3",
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-styles": "^4.64.1", "@patternfly/react-styles": "^4.71.3",
"react-dropzone": "9.0.0", "react-dropzone": "9.0.0",
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
@ -3799,15 +3798,14 @@
} }
}, },
"node_modules/@patternfly/react-core": { "node_modules/@patternfly/react-core": {
"version": "4.214.1", "version": "4.221.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.214.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.221.3.tgz",
"integrity": "sha512-XHEqXpnBEDyLVdAEDOYlGqFHnN43eNLSD5HABB99xO6541JV9MRnbxs0+v9iYnfhcKh/8bhA9ITXnUi3f2PEvg==", "integrity": "sha512-I33TnX5Xn8ypXYjHc7G5kIVsYjB4PnDxxmJG6rBLqFslrnGUBzvb0sflnP43QlI0camamVIoaBRjedj8WXqaRg==",
"license": "MIT",
"dependencies": { "dependencies": {
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-styles": "^4.64.1", "@patternfly/react-styles": "^4.71.3",
"@patternfly/react-tokens": "^4.66.1", "@patternfly/react-tokens": "^4.73.3",
"focus-trap": "6.2.2", "focus-trap": "6.9.2",
"react-dropzone": "9.0.0", "react-dropzone": "9.0.0",
"tippy.js": "5.1.2", "tippy.js": "5.1.2",
"tslib": "^2.0.0" "tslib": "^2.0.0"
@ -3818,30 +3816,28 @@
} }
}, },
"node_modules/@patternfly/react-icons": { "node_modules/@patternfly/react-icons": {
"version": "4.65.1", "version": "4.72.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.65.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.72.3.tgz",
"integrity": "sha512-CUYFRPztFkR7qrXq/0UAhLjeHd8FdjLe4jBjj8tfKc7OXwxDeZczqNFyRMATZpPaduTH7BU2r3OUjQrgAbquWg==", "integrity": "sha512-bZCPsOsxtFXTmZQqDKNebkBywud3E0ID3446AWI1RO5Ypufdc0FTkehSzBPANfJPYjjK9/EYaIy8rF0yiJdFPQ==",
"license": "MIT",
"peerDependencies": { "peerDependencies": {
"react": "^16.8.0 || ^17.0.0", "react": "^16.8.0 || ^17.0.0",
"react-dom": "^16.8.0 || ^17.0.0" "react-dom": "^16.8.0 || ^17.0.0"
} }
}, },
"node_modules/@patternfly/react-styles": { "node_modules/@patternfly/react-styles": {
"version": "4.64.1", "version": "4.71.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.64.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.71.3.tgz",
"integrity": "sha512-+GxULkP2o5Vpr9w+J4NiGOGzhTfNniYzdPGEF/yC+oDoAXB6Q1HJyQnEj+kJH31xNvwmw3G3VFtwRLX4ZWr0oA==", "integrity": "sha512-JpMBIrJfco3JwK9KbJvjr+tKZidVhbkGrQT7GyWbYAwZ2bOmCmeCPJYc0xhAWcvNumn9a7AhYzAWPJVlQQue3g=="
"license": "MIT"
}, },
"node_modules/@patternfly/react-table": { "node_modules/@patternfly/react-table": {
"version": "4.83.1", "version": "4.90.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.83.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.90.3.tgz",
"integrity": "sha512-mkq13x9funh+Nh2Uzj2ZQBOacNYc+a60yUAHZMXgNcljCJ3LTQUoYy6EonvYrqwSrpC7vj8nLt8+/XbDNc0Aig==", "integrity": "sha512-RsSvs1IdvzOFcWgNc42COHfPJ/Dhl8gCHgwnC0ER/yD+IXOOdP+0u7+ZHGfF9+anAHZhQRJ2lGlQnp2HZM8b3A==",
"dependencies": { "dependencies": {
"@patternfly/react-core": "^4.214.1", "@patternfly/react-core": "^4.221.3",
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-styles": "^4.64.1", "@patternfly/react-styles": "^4.71.3",
"@patternfly/react-tokens": "^4.66.1", "@patternfly/react-tokens": "^4.73.3",
"lodash": "^4.17.19", "lodash": "^4.17.19",
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
@ -3851,10 +3847,9 @@
} }
}, },
"node_modules/@patternfly/react-tokens": { "node_modules/@patternfly/react-tokens": {
"version": "4.66.1", "version": "4.73.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.66.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.73.3.tgz",
"integrity": "sha512-k0IWqpufM6ezT+3gWlEamqQ7LW9yi8e8cBBlude5IU8eIEqIG6AccwR1WNBEK1wCVWGwVxakLMdf0XBLl4k52Q==", "integrity": "sha512-WyEcV9jiMZzscQMBhlDkypHw9qg0wbX7r/fe8HcWws+jnYWGVjwUdnr18ktI9aw/h/oQS46sirf8xbNTlIiQFg=="
"license": "MIT"
}, },
"node_modules/@rollup/plugin-commonjs": { "node_modules/@rollup/plugin-commonjs": {
"version": "16.0.0", "version": "16.0.0",
@ -10066,10 +10061,11 @@
} }
}, },
"node_modules/focus-trap": { "node_modules/focus-trap": {
"version": "6.2.2", "version": "6.9.2",
"license": "MIT", "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.9.2.tgz",
"integrity": "sha512-gBEuXOPNOKPrLdZpMFUSTyIo1eT2NSZRrwZ9r/0Jqw5tmT3Yvxfmu8KBHw8xW2XQkw6E/JoG+OlEq7UDtSUNgw==",
"dependencies": { "dependencies": {
"tabbable": "^5.1.4" "tabbable": "^5.3.2"
} }
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
@ -19385,8 +19381,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/tabbable": { "node_modules/tabbable": {
"version": "5.2.1", "version": "5.3.3",
"license": "MIT" "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz",
"integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA=="
}, },
"node_modules/tapable": { "node_modules/tapable": {
"version": "1.1.3", "version": "1.1.3",
@ -23906,64 +23903,64 @@
} }
}, },
"@patternfly/patternfly": { "@patternfly/patternfly": {
"version": "4.194.4", "version": "4.196.7",
"resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.194.4.tgz", "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.196.7.tgz",
"integrity": "sha512-SJxr502v0xXk1N5OiPLunD9pdKvHp5XXJLXcD5lIPrimjjUcy46m48X8YONjDvnC/Y5xV92UI2KxoCVucE34eA==" "integrity": "sha512-hA7Oww411e1p0/IXjC1I+4/1NNis9V+NVBxfUIpRwyuLbCIDHBdtMu2qAPLdKxXjuibV9EE6ZdlT7ra/kcFuJQ=="
}, },
"@patternfly/react-code-editor": { "@patternfly/react-code-editor": {
"version": "4.55.1", "version": "4.62.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.55.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-code-editor/-/react-code-editor-4.62.3.tgz",
"integrity": "sha512-B/lMbxH0u8Kq6sMKovu8kqUNuf5GIPrCBZMWbkxf2BoPcDLyCgHksmTXhUavhqkO1y5TMCaq+EjJMD0pAvHkrw==", "integrity": "sha512-zNXTJ+DvKvVFRoURQC3nai6PuDegt71X3ONqkazVpZ7ODt6hDeeOHj+eW85sDa2ATSeRghITtEQsZPPNG6Uykw==",
"requires": { "requires": {
"@patternfly/react-core": "^4.214.1", "@patternfly/react-core": "^4.221.3",
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-styles": "^4.64.1", "@patternfly/react-styles": "^4.71.3",
"react-dropzone": "9.0.0", "react-dropzone": "9.0.0",
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@patternfly/react-core": { "@patternfly/react-core": {
"version": "4.214.1", "version": "4.221.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.214.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.221.3.tgz",
"integrity": "sha512-XHEqXpnBEDyLVdAEDOYlGqFHnN43eNLSD5HABB99xO6541JV9MRnbxs0+v9iYnfhcKh/8bhA9ITXnUi3f2PEvg==", "integrity": "sha512-I33TnX5Xn8ypXYjHc7G5kIVsYjB4PnDxxmJG6rBLqFslrnGUBzvb0sflnP43QlI0camamVIoaBRjedj8WXqaRg==",
"requires": { "requires": {
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-styles": "^4.64.1", "@patternfly/react-styles": "^4.71.3",
"@patternfly/react-tokens": "^4.66.1", "@patternfly/react-tokens": "^4.73.3",
"focus-trap": "6.2.2", "focus-trap": "6.9.2",
"react-dropzone": "9.0.0", "react-dropzone": "9.0.0",
"tippy.js": "5.1.2", "tippy.js": "5.1.2",
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@patternfly/react-icons": { "@patternfly/react-icons": {
"version": "4.65.1", "version": "4.72.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.65.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.72.3.tgz",
"integrity": "sha512-CUYFRPztFkR7qrXq/0UAhLjeHd8FdjLe4jBjj8tfKc7OXwxDeZczqNFyRMATZpPaduTH7BU2r3OUjQrgAbquWg==", "integrity": "sha512-bZCPsOsxtFXTmZQqDKNebkBywud3E0ID3446AWI1RO5Ypufdc0FTkehSzBPANfJPYjjK9/EYaIy8rF0yiJdFPQ==",
"requires": {} "requires": {}
}, },
"@patternfly/react-styles": { "@patternfly/react-styles": {
"version": "4.64.1", "version": "4.71.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.64.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.71.3.tgz",
"integrity": "sha512-+GxULkP2o5Vpr9w+J4NiGOGzhTfNniYzdPGEF/yC+oDoAXB6Q1HJyQnEj+kJH31xNvwmw3G3VFtwRLX4ZWr0oA==" "integrity": "sha512-JpMBIrJfco3JwK9KbJvjr+tKZidVhbkGrQT7GyWbYAwZ2bOmCmeCPJYc0xhAWcvNumn9a7AhYzAWPJVlQQue3g=="
}, },
"@patternfly/react-table": { "@patternfly/react-table": {
"version": "4.83.1", "version": "4.90.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.83.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.90.3.tgz",
"integrity": "sha512-mkq13x9funh+Nh2Uzj2ZQBOacNYc+a60yUAHZMXgNcljCJ3LTQUoYy6EonvYrqwSrpC7vj8nLt8+/XbDNc0Aig==", "integrity": "sha512-RsSvs1IdvzOFcWgNc42COHfPJ/Dhl8gCHgwnC0ER/yD+IXOOdP+0u7+ZHGfF9+anAHZhQRJ2lGlQnp2HZM8b3A==",
"requires": { "requires": {
"@patternfly/react-core": "^4.214.1", "@patternfly/react-core": "^4.221.3",
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-styles": "^4.64.1", "@patternfly/react-styles": "^4.71.3",
"@patternfly/react-tokens": "^4.66.1", "@patternfly/react-tokens": "^4.73.3",
"lodash": "^4.17.19", "lodash": "^4.17.19",
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"@patternfly/react-tokens": { "@patternfly/react-tokens": {
"version": "4.66.1", "version": "4.73.3",
"resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.66.1.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.73.3.tgz",
"integrity": "sha512-k0IWqpufM6ezT+3gWlEamqQ7LW9yi8e8cBBlude5IU8eIEqIG6AccwR1WNBEK1wCVWGwVxakLMdf0XBLl4k52Q==" "integrity": "sha512-WyEcV9jiMZzscQMBhlDkypHw9qg0wbX7r/fe8HcWws+jnYWGVjwUdnr18ktI9aw/h/oQS46sirf8xbNTlIiQFg=="
}, },
"@rollup/plugin-commonjs": { "@rollup/plugin-commonjs": {
"version": "16.0.0", "version": "16.0.0",
@ -28260,9 +28257,11 @@
} }
}, },
"focus-trap": { "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": { "requires": {
"tabbable": "^5.1.4" "tabbable": "^5.3.2"
} }
}, },
"follow-redirects": { "follow-redirects": {
@ -34562,7 +34561,9 @@
"dev": true "dev": true
}, },
"tabbable": { "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": { "tapable": {
"version": "1.1.3", "version": "1.1.3",

View file

@ -26,11 +26,11 @@
}, },
"dependencies": { "dependencies": {
"@keycloak/keycloak-admin-client": "^19.0.0-dev.13", "@keycloak/keycloak-admin-client": "^19.0.0-dev.13",
"@patternfly/patternfly": "^4.194.4", "@patternfly/patternfly": "^4.196.7",
"@patternfly/react-code-editor": "^4.55.1", "@patternfly/react-code-editor": "^4.62.3",
"@patternfly/react-core": "^4.214.1", "@patternfly/react-core": "^4.221.3",
"@patternfly/react-icons": "^4.65.1", "@patternfly/react-icons": "^4.72.3",
"@patternfly/react-table": "^4.83.1", "@patternfly/react-table": "^4.90.3",
"dagre": "^0.8.5", "dagre": "^0.8.5",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"flat": "^5.0.2", "flat": "^5.0.2",

View file

@ -12,9 +12,7 @@ export type KeycloakTextAreaProps = Omit<
Pick<HTMLProps<HTMLTextAreaElement>, "onChange">; Pick<HTMLProps<HTMLTextAreaElement>, "onChange">;
export const KeycloakTextArea = forwardRef< export const KeycloakTextArea = forwardRef<
// TODO: This is typed incorrectly and will have to be replaced with 'HTMLTextAreaElement'. HTMLTextAreaElement,
// More information: https://github.com/patternfly/patternfly-react/pull/7397
HTMLInputElement,
KeycloakTextAreaProps KeycloakTextAreaProps
>(({ onChange, ...props }, ref) => { >(({ onChange, ...props }, ref) => {
const onChangeForward: TextAreaProps["onChange"] = (_, event) => const onChangeForward: TextAreaProps["onChange"] = (_, event) =>