From 43fed9363aaa0bdd935b7fb117ef0f6924cae195 Mon Sep 17 00:00:00 2001 From: Rohit Raj Date: Thu, 22 May 2025 13:23:55 +0530 Subject: [PATCH 1/3] feat: integrate QueryClientProvider --- package.json | 2 +- src/index.tsx | 29 ++++++++++++++++------------- yarn.lock | 43 ++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 6491a2e98b..049e2faf79 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.14.0-pre-0", + "@devtron-labs/devtron-fe-common-lib": "1.14.0-beta-0", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/src/index.tsx b/src/index.tsx index c778b6b7e6..6523f9bc9a 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -29,6 +29,7 @@ import { ThemeProvider, ConfirmationModalProvider, BaseConfirmationModal, + QueryClientProvider, } from '@devtron-labs/devtron-fe-common-lib' import App from './App' @@ -179,19 +180,21 @@ if (!window || !window._env_) { ReactDOM.render( {window.top === window.self ? ( - - - - - - - - - - - - - + + + + + + + + + + + + + + + ) : null} , root, diff --git a/yarn.lock b/yarn.lock index 2865b470ca..40528d7b29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1124,10 +1124,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@devtron-labs/devtron-fe-common-lib@1.14.0-pre-0": - version "1.14.0-pre-0" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.0-pre-0.tgz#772fc8ce19b63df0a18eff7275f7a8d9dfe2abc5" - integrity sha512-GCfgKQFjRNBQKxn3CyJFqOszuHs9E5VtQLzWBRDXgb9MVb4tlX8I8Hu53Lf1LVrJsPHABLFlQ6nCwLi3LbxqKg== +"@devtron-labs/devtron-fe-common-lib@1.14.0-beta-0": + version "1.14.0-beta-0" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.0-beta-0.tgz#ee8ab6f64a6984ba276a8867e43ef60efa06a370" + integrity sha512-ttJ5poY5MmQ1Qot6isXyj4asSNEs5zlvu2R7lipHRFyD6tVkSNSJaqeCO2HBRMWRmoII7UCLZdAj1nMEMENfwQ== dependencies: "@codemirror/lang-json" "6.0.1" "@codemirror/lang-yaml" "6.1.2" @@ -1139,7 +1139,7 @@ "@lezer/highlight" "1.2.1" "@replit/codemirror-indentation-markers" "6.5.3" "@replit/codemirror-vscode-keymap" "6.0.2" - "@types/react-dates" "^21.8.6" + "@tanstack/react-query" "<5" "@uiw/codemirror-extensions-hyper-link" "4.23.10" "@uiw/codemirror-theme-github" "4.23.7" "@uiw/react-codemirror" "4.23.7" @@ -2666,6 +2666,19 @@ "@svgr/hast-util-to-babel-ast" "^6.5.1" svg-parser "^2.0.4" +"@tanstack/query-core@4.36.1": + version "4.36.1" + resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.36.1.tgz#79f8c1a539d47c83104210be2388813a7af2e524" + integrity sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA== + +"@tanstack/react-query@<5": + version "4.36.1" + resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.36.1.tgz#acb589fab4085060e2e78013164868c9c785e5d2" + integrity sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw== + dependencies: + "@tanstack/query-core" "4.36.1" + use-sync-external-store "^1.2.0" + "@testing-library/dom@10.4.0": version "10.4.0" resolved "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz" @@ -3027,15 +3040,6 @@ dependencies: "@types/react" "*" -"@types/react-dates@^21.8.6": - version "21.8.6" - resolved "https://registry.yarnpkg.com/@types/react-dates/-/react-dates-21.8.6.tgz#ec9314b59e9d8e1ad71ccf021a7634e8afd26135" - integrity sha512-fDF322SOXAxstapv0/oruiPx9kY4DiiaEHYAVvXdPfQhi/hdaONsA9dFw5JBNPAWz7Niuwk+UUhxPU98h70TjA== - dependencies: - "@types/react" "*" - "@types/react-outside-click-handler" "*" - moment "^2.26.0" - "@types/react-dom@17.0.13", "@types/react-dom@<18.0.0": version "17.0.13" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.13.tgz" @@ -3043,13 +3047,6 @@ dependencies: "@types/react" "*" -"@types/react-outside-click-handler@*": - version "1.3.4" - resolved "https://registry.yarnpkg.com/@types/react-outside-click-handler/-/react-outside-click-handler-1.3.4.tgz#999e61057a3a23c6dfc9159b28f96378749d6c42" - integrity sha512-kLuYIa9nWk1n0ywJPbVWqOEIRg0mh3vumriCHbz6LUObJw4rXYx9inDm8G579BtnH8vC0wKfrTq5c2y/K/Xzww== - dependencies: - "@types/react" "*" - "@types/react-router-dom@^5.3.3": version "5.3.3" resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz" @@ -6734,7 +6731,7 @@ mock-socket@^9.2.1: resolved "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.1.tgz" integrity sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw== -moment@>=1.6.0, moment@^2.26.0, moment@^2.29.4: +moment@>=1.6.0, moment@^2.29.4: version "2.30.1" resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz" integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== @@ -8770,7 +8767,7 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -use-sync-external-store@^1.2.2: +use-sync-external-store@^1.2.0, use-sync-external-store@^1.2.2: version "1.5.0" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz#55122e2a3edd2a6c106174c27485e0fd59bcfca0" integrity sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A== From 107c08a3f587e2d9287b5e0423766e0dfd515d94 Mon Sep 17 00:00:00 2001 From: Rohit Raj Date: Thu, 22 May 2025 15:48:37 +0530 Subject: [PATCH 2/3] chore: common-lib version bump --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 049e2faf79..8cb5321d2b 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.14.0-beta-0", + "@devtron-labs/devtron-fe-common-lib": "1.14.0-beta-1", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index 40528d7b29..528f854b38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1124,10 +1124,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@devtron-labs/devtron-fe-common-lib@1.14.0-beta-0": - version "1.14.0-beta-0" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.0-beta-0.tgz#ee8ab6f64a6984ba276a8867e43ef60efa06a370" - integrity sha512-ttJ5poY5MmQ1Qot6isXyj4asSNEs5zlvu2R7lipHRFyD6tVkSNSJaqeCO2HBRMWRmoII7UCLZdAj1nMEMENfwQ== +"@devtron-labs/devtron-fe-common-lib@1.14.0-beta-1": + version "1.14.0-beta-1" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.0-beta-1.tgz#38dc6eae6d06f9f44b25452a80608fe8f092b178" + integrity sha512-D0+N43vmBSklyr1Nr+n4EoPQqkvLUbkx7LJRmWO88oGTEgcEst6++OsLfxtAhglkEZJVIr5DVKtdgkjZw4dAgQ== dependencies: "@codemirror/lang-json" "6.0.1" "@codemirror/lang-yaml" "6.1.2" From 00a0852d1e651ea431f6c80851b1606f4568e565 Mon Sep 17 00:00:00 2001 From: Rohit Raj Date: Mon, 2 Jun 2025 15:08:38 +0530 Subject: [PATCH 3/3] chore: update devtron-fe-common-lib version to 1.14.2-beta-0 --- package.json | 3 ++- yarn.lock | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 5eb041b26c..b3485ad89c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.14.2-pre-3", + "@devtron-labs/devtron-fe-common-lib": "1.14.2-beta-0", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", @@ -91,6 +91,7 @@ "@types/node": "20.11.0", "@types/react": "17.0.39", "@types/react-csv": "^1.1.3", + "@types/react-dates": "^21.8.6", "@types/react-dom": "17.0.13", "@types/react-router-dom": "^5.3.3", "@types/react-transition-group": "^4.4.4", diff --git a/yarn.lock b/yarn.lock index 5bf9fe6000..ca5f6b74a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1124,10 +1124,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@devtron-labs/devtron-fe-common-lib@1.14.2-pre-3": - version "1.14.2-pre-3" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.2-pre-3.tgz#b60864f9df69fe2459990e13f3251cea7d7bb6d0" - integrity sha512-GooRFGblceF0/2kfrOvR6neB0EWN61UEkMVE/YMzOzT9Z2pWnxL3vsaNXqGIEmp8nwVyCffdpC6UBiEzDGc04Q== +"@devtron-labs/devtron-fe-common-lib@1.14.2-beta-0": + version "1.14.2-beta-0" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.14.2-beta-0.tgz#42a482c9c6717f936dec54bd15e9033d986d5b20" + integrity sha512-3ZRdpqFz9ge3e+g7KHcQiS8DwtPjJOyC0A0zWRSp25Hc+xUzbuSd0td9c1Mu3LrTHQPg15Fc7WsPTgPaiHhVyg== dependencies: "@codemirror/lang-json" "6.0.1" "@codemirror/lang-yaml" "6.1.2" @@ -2643,17 +2643,17 @@ "@svgr/hast-util-to-babel-ast" "^6.5.1" svg-parser "^2.0.4" -"@tanstack/query-core@4.36.1": - version "4.36.1" - resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.36.1.tgz#79f8c1a539d47c83104210be2388813a7af2e524" - integrity sha512-DJSilV5+ytBP1FbFcEJovv4rnnm/CokuVvrBEtW/Va9DvuJ3HksbXUJEpI0aV1KtuL4ZoO9AVE6PyNLzF7tLeA== +"@tanstack/query-core@4.39.1": + version "4.39.1" + resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-4.39.1.tgz#61d706275f2e4ea3ed3ed3b95a0117a99bc94317" + integrity sha512-E1g5oEiBq8l1xU1ELXieEBD55oZQscn4kaHidsxdCH1egAk9Tx4sTi8rgQiayoaEWESOurRdDEf2wJHp9/BRDg== "@tanstack/react-query@<5": - version "4.36.1" - resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.36.1.tgz#acb589fab4085060e2e78013164868c9c785e5d2" - integrity sha512-y7ySVHFyyQblPl3J3eQBWpXZkliroki3ARnBKsdJchlgt7yJLRDUcf4B8soufgiYt3pEQIkBWBx1N9/ZPIeUWw== + version "4.39.1" + resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-4.39.1.tgz#9d63e432f5c877f0e39d1d18a8ee0b29be12f762" + integrity sha512-eV8PchGpgqE5OMQ5LEfYmgwdKI3uZLSXekfkCpqvLNExE1bDFsPL1zFlFid5CSe7gf2zGju00PnsBoJcEBUJMw== dependencies: - "@tanstack/query-core" "4.36.1" + "@tanstack/query-core" "4.39.1" use-sync-external-store "^1.2.0" "@testing-library/dom@10.4.0": @@ -3017,6 +3017,15 @@ dependencies: "@types/react" "*" +"@types/react-dates@^21.8.6": + version "21.8.6" + resolved "https://registry.yarnpkg.com/@types/react-dates/-/react-dates-21.8.6.tgz#ec9314b59e9d8e1ad71ccf021a7634e8afd26135" + integrity sha512-fDF322SOXAxstapv0/oruiPx9kY4DiiaEHYAVvXdPfQhi/hdaONsA9dFw5JBNPAWz7Niuwk+UUhxPU98h70TjA== + dependencies: + "@types/react" "*" + "@types/react-outside-click-handler" "*" + moment "^2.26.0" + "@types/react-dom@17.0.13", "@types/react-dom@<18.0.0": version "17.0.13" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.13.tgz" @@ -3024,6 +3033,13 @@ dependencies: "@types/react" "*" +"@types/react-outside-click-handler@*": + version "1.3.4" + resolved "https://registry.yarnpkg.com/@types/react-outside-click-handler/-/react-outside-click-handler-1.3.4.tgz#999e61057a3a23c6dfc9159b28f96378749d6c42" + integrity sha512-kLuYIa9nWk1n0ywJPbVWqOEIRg0mh3vumriCHbz6LUObJw4rXYx9inDm8G579BtnH8vC0wKfrTq5c2y/K/Xzww== + dependencies: + "@types/react" "*" + "@types/react-router-dom@^5.3.3": version "5.3.3" resolved "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz" @@ -6698,7 +6714,7 @@ mock-socket@^9.2.1: resolved "https://registry.npmjs.org/mock-socket/-/mock-socket-9.3.1.tgz" integrity sha512-qxBgB7Qa2sEQgHFjj0dSigq7fX4k6Saisd5Nelwp2q8mlbAFh5dHV9JTTlF8viYJLSSWgMCZFUom8PJcMNBoJw== -moment@>=1.6.0, moment@^2.29.4: +moment@>=1.6.0, moment@^2.26.0, moment@^2.29.4: version "2.30.1" resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz" integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==