From f7ebd8477abb8b964e741cbbb70d1611e8fa03ed Mon Sep 17 00:00:00 2001 From: vivek-devtron Date: Thu, 7 Nov 2024 11:30:25 +0530 Subject: [PATCH 1/3] fix: ea app redirection + docker registry all cluster inject --- src/components/dockerRegistry/Docker.tsx | 57 ++++------------- .../EnvironmentSelector.component.tsx | 4 +- vite.config.mts | 2 +- yarn.lock | 62 +++++++++---------- 4 files changed, 45 insertions(+), 80 deletions(-) diff --git a/src/components/dockerRegistry/Docker.tsx b/src/components/dockerRegistry/Docker.tsx index 4fb61d29ee..caf39f3db5 100644 --- a/src/components/dockerRegistry/Docker.tsx +++ b/src/components/dockerRegistry/Docker.tsx @@ -514,11 +514,13 @@ const DockerForm = ({ _ignoredClusterIdsCsv = _ignoredClusterIdsCsv.filter((clusterIds) => !!clusterIds) let _appliedClusterIdsCsv = ipsConfig?.appliedClusterIdsCsv - ? ipsConfig.appliedClusterIdsCsv.split(',').map((clusterId) => { - if (clusterId || clusterlistMap.get(clusterId)) { - return clusterlistMap.get(clusterId) - } - }) + ? ipsConfig.appliedClusterIdsCsv.indexOf('-1') >= 0 + ? clusterOption + : ipsConfig.appliedClusterIdsCsv.split(',').map((clusterId) => { + if (clusterId || clusterlistMap.get(clusterId)) { + return clusterlistMap.get(clusterId) + } + }) : [] _appliedClusterIdsCsv = _appliedClusterIdsCsv.filter((clusterIds) => !!clusterIds) @@ -830,7 +832,10 @@ const DockerForm = ({ credentialsType === CredentialType.CUSTOM_CREDENTIAL ? JSON.stringify(customCredential) : credentialValue, - appliedClusterIdsCsv, + appliedClusterIdsCsv: + whiteList.length && whiteList.findIndex((cluster) => cluster.value === '-1') >= 0 + ? '-1' + : appliedClusterIdsCsv, ignoredClusterIdsCsv: whiteList.length === 0 && (blackList.length === 0 || blackList.findIndex((cluster) => cluster.value === '-1') >= 0) @@ -1193,46 +1198,6 @@ const DockerForm = ({ } } - const registryOptions = (props) => { - props.selectProps.styles.option = getCustomOptionSelectionStyle() - return ( - -
-
- {props.label} -
- - ) - } - const registryControls = (props) => { - let value = '' - if (props.hasValue) { - value = props.getValue()[0].value - } - return ( - -
- {props.children} - - ) - } - - const _multiSelectStyles = { - ...multiSelectStyles, - menu: (base, state) => ({ - ...base, - marginTop: 'auto', - }), - menuList: (base) => { - return { - ...base, - position: 'relative', - maxHeight: '250px', - paddingBottom: '4px', - } - }, - } - const appliedClusterList = whiteList?.map((_ac) => { return _ac?.label }) diff --git a/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx b/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx index 3d371e160a..5c6b707d7b 100644 --- a/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx +++ b/src/components/v2/appDetails/sourceInfo/EnvironmentSelector.component.tsx @@ -108,7 +108,7 @@ const EnvironmentSelectorComponent = ({ } useEffect(() => { - if (!params.envId && appDetails.environmentId) { + if (!params.envId && appDetails.environmentId && !isExternalApp) { handleEnvironmentChange(appDetails.environmentId) } }, [appDetails.environmentId]) @@ -182,7 +182,7 @@ const EnvironmentSelectorComponent = ({ } } else if ( deleteAction !== DELETE_ACTION.NONCASCADE_DELETE && - !response.result.deleteResponse?.clusterReachable && + !response.result.deleteResponse?.clusterReachable && appDetails?.deploymentAppType === DeploymentAppTypes.GITOPS ) { setClusterName(response.result.deleteResponse?.clusterName) diff --git a/vite.config.mts b/vite.config.mts index 6b08970ec8..cbce61a4e2 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -29,7 +29,7 @@ import { VitePWA } from 'vite-plugin-pwa' import tsconfigPaths from 'vite-tsconfig-paths' const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";` -const TARGET_URL = 'https://preview.devtron.ai/' +const TARGET_URL = 'http://20.204.157.47:31278/';//'https://preview.devtron.ai/' function reactVirtualized(): PluginOption { return { diff --git a/yarn.lock b/yarn.lock index b6456ca2ec..f2dbf3d489 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1063,7 +1063,7 @@ "@devtron-labs/devtron-fe-common-lib@0.6.0-patch-1": version "0.6.0-patch-1" - resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.6.0-patch-1.tgz#f8f87d7f5f080e9199d70869be46e51bf9b03457" + resolved "https://registry.npmjs.org/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.6.0-patch-1.tgz" integrity sha512-12tcyovuN1tr4ZwR2LEDLcednMUaqa3fHVUmNqKPkv3434+e2OIEAw5yezRU24XVsPVkWZcIFl3+MsnK2lIO0A== dependencies: "@types/react-dates" "^21.8.6" @@ -2481,7 +2481,7 @@ "@types/d3-path@*": version "3.1.0" - resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.1.0.tgz#2b907adce762a78e98828f0b438eaca339ae410a" + resolved "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz" integrity sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ== "@types/d3-path@^1": @@ -3032,7 +3032,7 @@ "@vitest/pretty-format@^2.0.5": version "2.1.3" - resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-2.1.3.tgz#48b9b03de75507d1d493df7beb48dc39a1946a3e" + resolved "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.3.tgz" integrity sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ== dependencies: tinyrainbow "^1.2.0" @@ -3135,9 +3135,9 @@ acorn@^7.4.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.11.0, acorn@^8.11.3, acorn@^8.12.1, acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0: - version "8.13.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz" - integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w== + version "8.14.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz" + integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== agent-base@6: version "6.0.2" @@ -3644,14 +3644,14 @@ browser-assert@^1.2.1: integrity sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ== browserslist@^4.23.1, browserslist@^4.23.3: - version "4.23.3" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== + version "4.24.2" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" node-releases "^2.0.18" - update-browserslist-db "^1.1.0" + update-browserslist-db "^1.1.1" bs-logger@^0.2.6: version "0.2.6" @@ -3734,10 +3734,10 @@ camelcase@^6.2.0: resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001646: - version "1.0.30001660" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz" - integrity sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg== +caniuse-lite@^1.0.30001669: + version "1.0.30001677" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz" + integrity sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog== chai@^4.3.10: version "4.5.0" @@ -4537,10 +4537,10 @@ ejs@^3.1.10, ejs@^3.1.6: dependencies: jake "^10.8.5" -electron-to-chromium@^1.5.4: - version "1.5.25" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz" - integrity sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g== +electron-to-chromium@^1.5.41: + version "1.5.52" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz" + integrity sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ== emoji-regex@^8.0.0: version "8.0.0" @@ -4780,10 +4780,10 @@ esbuild-register@^3.5.0: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" -escalade@^3.1.2: - version "3.1.2" - resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz" - integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== +escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== escape-html@~1.0.3: version "1.0.3" @@ -7573,7 +7573,7 @@ performance-now@^2.1.0: resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0: +picocolors@^1.0.0, picocolors@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz" integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== @@ -9720,13 +9720,13 @@ upath@^1.2.0: resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== +update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.0" uri-js@^4.2.2, uri-js@^4.4.1: version "4.4.1" From ce1ebcfec6f232e99645019ed83b851c4aba7408 Mon Sep 17 00:00:00 2001 From: vivek-devtron Date: Thu, 7 Nov 2024 12:12:12 +0530 Subject: [PATCH 2/3] Removed unwanted code --- vite.config.mts | 2 +- yarn.lock | 62 ++++++++++++++++++++++++------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/vite.config.mts b/vite.config.mts index cbce61a4e2..6b08970ec8 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -29,7 +29,7 @@ import { VitePWA } from 'vite-plugin-pwa' import tsconfigPaths from 'vite-tsconfig-paths' const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";` -const TARGET_URL = 'http://20.204.157.47:31278/';//'https://preview.devtron.ai/' +const TARGET_URL = 'https://preview.devtron.ai/' function reactVirtualized(): PluginOption { return { diff --git a/yarn.lock b/yarn.lock index f2dbf3d489..b6456ca2ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1063,7 +1063,7 @@ "@devtron-labs/devtron-fe-common-lib@0.6.0-patch-1": version "0.6.0-patch-1" - resolved "https://registry.npmjs.org/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.6.0-patch-1.tgz" + resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.6.0-patch-1.tgz#f8f87d7f5f080e9199d70869be46e51bf9b03457" integrity sha512-12tcyovuN1tr4ZwR2LEDLcednMUaqa3fHVUmNqKPkv3434+e2OIEAw5yezRU24XVsPVkWZcIFl3+MsnK2lIO0A== dependencies: "@types/react-dates" "^21.8.6" @@ -2481,7 +2481,7 @@ "@types/d3-path@*": version "3.1.0" - resolved "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz" + resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.1.0.tgz#2b907adce762a78e98828f0b438eaca339ae410a" integrity sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ== "@types/d3-path@^1": @@ -3032,7 +3032,7 @@ "@vitest/pretty-format@^2.0.5": version "2.1.3" - resolved "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.3.tgz" + resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-2.1.3.tgz#48b9b03de75507d1d493df7beb48dc39a1946a3e" integrity sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ== dependencies: tinyrainbow "^1.2.0" @@ -3135,9 +3135,9 @@ acorn@^7.4.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.11.0, acorn@^8.11.3, acorn@^8.12.1, acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0: - version "8.14.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz" - integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA== + version "8.13.0" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz" + integrity sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w== agent-base@6: version "6.0.2" @@ -3644,14 +3644,14 @@ browser-assert@^1.2.1: integrity sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ== browserslist@^4.23.1, browserslist@^4.23.3: - version "4.24.2" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz" - integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + version "4.23.3" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz" + integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== dependencies: - caniuse-lite "^1.0.30001669" - electron-to-chromium "^1.5.41" + caniuse-lite "^1.0.30001646" + electron-to-chromium "^1.5.4" node-releases "^2.0.18" - update-browserslist-db "^1.1.1" + update-browserslist-db "^1.1.0" bs-logger@^0.2.6: version "0.2.6" @@ -3734,10 +3734,10 @@ camelcase@^6.2.0: resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001669: - version "1.0.30001677" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz" - integrity sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog== +caniuse-lite@^1.0.30001646: + version "1.0.30001660" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz" + integrity sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg== chai@^4.3.10: version "4.5.0" @@ -4537,10 +4537,10 @@ ejs@^3.1.10, ejs@^3.1.6: dependencies: jake "^10.8.5" -electron-to-chromium@^1.5.41: - version "1.5.52" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.52.tgz" - integrity sha512-xtoijJTZ+qeucLBDNztDOuQBE1ksqjvNjvqFoST3nGC7fSpqJ+X6BdTBaY5BHG+IhWWmpc6b/KfpeuEDupEPOQ== +electron-to-chromium@^1.5.4: + version "1.5.25" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz" + integrity sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g== emoji-regex@^8.0.0: version "8.0.0" @@ -4780,10 +4780,10 @@ esbuild-register@^3.5.0: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" -escalade@^3.2.0: - version "3.2.0" - resolved "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz" - integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== +escalade@^3.1.2: + version "3.1.2" + resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== escape-html@~1.0.3: version "1.0.3" @@ -7573,7 +7573,7 @@ performance-now@^2.1.0: resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== -picocolors@^1.0.0, picocolors@^1.1.0: +picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz" integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== @@ -9720,13 +9720,13 @@ upath@^1.2.0: resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -update-browserslist-db@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz" - integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== +update-browserslist-db@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz" + integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== dependencies: - escalade "^3.2.0" - picocolors "^1.1.0" + escalade "^3.1.2" + picocolors "^1.0.1" uri-js@^4.2.2, uri-js@^4.4.1: version "4.4.1" From ab7f818c7ea40563cabd4f08baa61ca4acbc325f Mon Sep 17 00:00:00 2001 From: vivek-devtron Date: Thu, 7 Nov 2024 13:13:37 +0530 Subject: [PATCH 3/3] fix: docker registry page break --- src/components/dockerRegistry/Docker.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/components/dockerRegistry/Docker.tsx b/src/components/dockerRegistry/Docker.tsx index caf39f3db5..5cf73a0a09 100644 --- a/src/components/dockerRegistry/Docker.tsx +++ b/src/components/dockerRegistry/Docker.tsx @@ -22,7 +22,6 @@ import { TippyTheme, sortCallback, ErrorScreenNotAuthorized, - multiSelectStyles, Reload, RadioGroup, RadioGroupItem, @@ -49,11 +48,9 @@ import { ToastManager, } from '@devtron-labs/devtron-fe-common-lib' import Tippy from '@tippyjs/react' -import { components } from 'react-select' import CreatableSelect from 'react-select/creatable' import { useHistory, useParams, useRouteMatch } from 'react-router-dom' import { useForm, handleOnBlur, handleOnFocus, parsePassword, importComponentFromFELibrary } from '../common' -import { getCustomOptionSelectionStyle } from '../v2/common/ReactSelect.utils' import { getClusterListMinWithoutAuth, getDockerRegistryList, @@ -1796,8 +1793,7 @@ const DockerForm = ({ } // For EA Mode GCR is not available as it is not OCI compliant - const EA_MODE_REGISTRY_TYPE_MAP: EAModeRegistryType = JSON.parse(JSON.stringify(REGISTRY_TYPE_MAP)) - delete EA_MODE_REGISTRY_TYPE_MAP['gcr'] + const EA_MODE_REGISTRY_TYPE_MAP = Object.fromEntries(Object.entries(REGISTRY_TYPE_MAP).filter(([key,_]) => key !== 'gcr')) return (
@@ -1818,8 +1814,6 @@ const DockerForm = ({ ? Object.values(EA_MODE_REGISTRY_TYPE_MAP) : Object.values(REGISTRY_TYPE_MAP) } - getOptionLabel={(option) => `${option.label}`} - getOptionValue={(option) => `${option.value}`} value={selectedDockerRegistryType} onChange={handleRegistryTypeChange} isDisabled={!!id}