diff --git a/package-lock.json b/package-lock.json index 08ec33435..4bf915337 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@babel/types": "^7.14.4", "@data-driven-forms/pf4-component-mapper": "^3.7.0", "@data-driven-forms/react-form-renderer": "^3.7.0", - "@patternfly/react-core": "^4.128.2", + "@patternfly/react-core": "^4.276.6", "@patternfly/react-icons": "^4.11.0", "@patternfly/react-table": "^4.27.24", "@patternfly/react-tokens": "^4.12.0", @@ -2512,36 +2512,41 @@ } }, "node_modules/@patternfly/react-core": { - "version": "4.128.2", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.128.2.tgz", - "integrity": "sha512-EhrxE3+V7AYVhbERrcRVH7oY6TeVRqqzaRx8HXWnyn/hxE2rTzhhaLHyjotxk9mGYmIYtMuMebBHFbX0g+6Ymg==", - "dependencies": { - "@patternfly/react-icons": "^4.10.11", - "@patternfly/react-styles": "^4.10.11", - "@patternfly/react-tokens": "^4.11.12", - "focus-trap": "6.2.2", + "version": "4.276.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.6.tgz", + "integrity": "sha512-G0K+378jf9jw9g+hCAoKnsAe/UGTRspqPeuAYypF2FgNr+dC7dUpc7/VkNhZBVqSJzUWVEK8NyXcqkfi0IemIg==", + "dependencies": { + "@patternfly/react-icons": "^4.93.6", + "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-tokens": "^4.94.6", + "focus-trap": "6.9.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", - "tslib": "1.13.0" + "tslib": "^2.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" + "react": "^16.8 || ^17 || ^18", + "react-dom": "^16.8 || ^17 || ^18" } }, + "node_modules/@patternfly/react-core/node_modules/tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + }, "node_modules/@patternfly/react-icons": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.11.0.tgz", - "integrity": "sha512-WsIX34bO9rhVRmPG0jlV3GoFGfYgPC64TscNV0lxQosiVRnYIA6Z3nBSArtJsxo5Yn6c63glIefC/YTy6D/ZYg==", + "version": "4.93.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz", + "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" + "react": "^16.8 || ^17 || ^18", + "react-dom": "^16.8 || ^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "4.10.11", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.10.11.tgz", - "integrity": "sha512-M+NhTtAXreJzMAV2Z1P2pbnKpRYnWbB5iZ6mxB0tkxxG+KyZ0/se8M5rUepLOE/n7BMq8IiOjPJ9zu/vpWj0gA==" + "version": "4.92.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.6.tgz", + "integrity": "sha512-b8uQdEReMyeoMzjpMri845QxqtupY/tIFFYfVeKoB2neno8gkcW1RvDdDe62LF88q45OktCwAe/8A99ker10Iw==" }, "node_modules/@patternfly/react-table": { "version": "4.27.24", @@ -2561,9 +2566,9 @@ } }, "node_modules/@patternfly/react-tokens": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.12.0.tgz", - "integrity": "sha512-Oj+GxqTtx0Yu9IDCTibZLQnpcKp58JneNKEFQkJ29WJydhPG4j6oFFElkK+ub+Ft/f9B1Ky1SsfR9eabo6IykQ==" + "version": "4.94.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz", + "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q==" }, "node_modules/@polka/url": { "version": "1.0.0-next.15", @@ -7509,11 +7514,11 @@ "dev": true }, "node_modules/focus-trap": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.2.2.tgz", - "integrity": "sha512-qWovH9+LGoKqREvJaTCzJyO0hphQYGz+ap5Hc4NqXHNhZBdxCi5uBPPcaOUw66fHmzXLVwvETLvFgpwPILqKpg==", + "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": { @@ -16070,9 +16075,9 @@ "dev": true }, "node_modules/tabbable": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.2.0.tgz", - "integrity": "sha512-0uyt8wbP0P3T4rrsfYg/5Rg3cIJ8Shl1RJ54QMqYxm1TLdWqJD1u6+RQjr2Lor3wmfT7JRHkirIwy99ydBsyPg==" + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz", + "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==" }, "node_modules/table": { "version": "6.7.1", @@ -20474,29 +20479,36 @@ } }, "@patternfly/react-core": { - "version": "4.128.2", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.128.2.tgz", - "integrity": "sha512-EhrxE3+V7AYVhbERrcRVH7oY6TeVRqqzaRx8HXWnyn/hxE2rTzhhaLHyjotxk9mGYmIYtMuMebBHFbX0g+6Ymg==", - "requires": { - "@patternfly/react-icons": "^4.10.11", - "@patternfly/react-styles": "^4.10.11", - "@patternfly/react-tokens": "^4.11.12", - "focus-trap": "6.2.2", + "version": "4.276.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.6.tgz", + "integrity": "sha512-G0K+378jf9jw9g+hCAoKnsAe/UGTRspqPeuAYypF2FgNr+dC7dUpc7/VkNhZBVqSJzUWVEK8NyXcqkfi0IemIg==", + "requires": { + "@patternfly/react-icons": "^4.93.6", + "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-tokens": "^4.94.6", + "focus-trap": "6.9.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", - "tslib": "1.13.0" + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" + } } }, "@patternfly/react-icons": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.11.0.tgz", - "integrity": "sha512-WsIX34bO9rhVRmPG0jlV3GoFGfYgPC64TscNV0lxQosiVRnYIA6Z3nBSArtJsxo5Yn6c63glIefC/YTy6D/ZYg==", + "version": "4.93.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz", + "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==", "requires": {} }, "@patternfly/react-styles": { - "version": "4.10.11", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.10.11.tgz", - "integrity": "sha512-M+NhTtAXreJzMAV2Z1P2pbnKpRYnWbB5iZ6mxB0tkxxG+KyZ0/se8M5rUepLOE/n7BMq8IiOjPJ9zu/vpWj0gA==" + "version": "4.92.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.6.tgz", + "integrity": "sha512-b8uQdEReMyeoMzjpMri845QxqtupY/tIFFYfVeKoB2neno8gkcW1RvDdDe62LF88q45OktCwAe/8A99ker10Iw==" }, "@patternfly/react-table": { "version": "4.27.24", @@ -20512,9 +20524,9 @@ } }, "@patternfly/react-tokens": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.12.0.tgz", - "integrity": "sha512-Oj+GxqTtx0Yu9IDCTibZLQnpcKp58JneNKEFQkJ29WJydhPG4j6oFFElkK+ub+Ft/f9B1Ky1SsfR9eabo6IykQ==" + "version": "4.94.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz", + "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q==" }, "@polka/url": { "version": "1.0.0-next.15", @@ -24479,11 +24491,11 @@ "dev": true }, "focus-trap": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-6.2.2.tgz", - "integrity": "sha512-qWovH9+LGoKqREvJaTCzJyO0hphQYGz+ap5Hc4NqXHNhZBdxCi5uBPPcaOUw66fHmzXLVwvETLvFgpwPILqKpg==", + "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": { @@ -31101,9 +31113,9 @@ "dev": true }, "tabbable": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.2.0.tgz", - "integrity": "sha512-0uyt8wbP0P3T4rrsfYg/5Rg3cIJ8Shl1RJ54QMqYxm1TLdWqJD1u6+RQjr2Lor3wmfT7JRHkirIwy99ydBsyPg==" + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-5.3.3.tgz", + "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==" }, "table": { "version": "6.7.1", diff --git a/package.json b/package.json index acfccbb77..e26a1aafc 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@babel/types": "^7.14.4", "@data-driven-forms/pf4-component-mapper": "^3.7.0", "@data-driven-forms/react-form-renderer": "^3.7.0", - "@patternfly/react-core": "^4.128.2", + "@patternfly/react-core": "^4.276.6", "@patternfly/react-icons": "^4.11.0", "@patternfly/react-table": "^4.27.24", "@patternfly/react-tokens": "^4.12.0", diff --git a/src/smart-components/group/groups.js b/src/smart-components/group/groups.js index a2136257f..ad587f815 100644 --- a/src/smart-components/group/groups.js +++ b/src/smart-components/group/groups.js @@ -51,6 +51,7 @@ const Groups = () => { const [pagination, setPagination] = useState(meta); const [filterValue, setFilterValue] = useState(filters.name || ''); const [selectedRows, setSelectedRows] = useState([]); + const [forceLoading, setForceLoading] = useState(false); const [removeGroupsList, setRemoveGroupsList] = useState([]); useEffect(() => { @@ -205,11 +206,15 @@ const Groups = () => { const { name, count, limit, offset, orderBy } = config; applyPaginationToUrl(history, limit, offset); applyFiltersToUrl(history, { name }); - return fetchData({ count, limit, offset, orderBy, filters: { name } }); + fetchData({ count, limit, offset, orderBy, filters: { name } }); + setForceLoading(false); + }} + setFilterValue={({ name }) => { + setFilterValue(name); + setForceLoading(true); }} - setFilterValue={({ name }) => setFilterValue(name)} toolbarButtons={toolbarButtons} - isLoading={isLoading} + isLoading={forceLoading || isLoading} filterPlaceholder="name" rowWrapper={GroupRowWrapper} tableId="groups"