Skip to content

Commit 88a68e9

Browse files
authored
Merge pull request #2116 from devtron-labs/fix/select-picker
fix: select picker
2 parents 51b054b + 1e02176 commit 88a68e9

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.4.5",
7+
"@devtron-labs/devtron-fe-common-lib": "0.4.6",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/components/CIPipelineN/EnvironmentList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export const EnvironmentList = ({
9595
className={`${isBuildStage ? 'sidebar-action-container sidebar-action-container-border' : 'flex h-36 dc__align-items-center br-4 dc__border'}`}
9696
>
9797
<div className={`${!isBuildStage ? 'w-250 dc__align-items-center flex left' : ''}`}>
98-
{getEnvironmentSelectLabel()}
98+
<div className="dc__no-shrink">{getEnvironmentSelectLabel()}</div>
9999
<SelectPicker
100100
required
101101
inputId="job-pipeline-environment-dropdown"

src/components/app/details/appDetails/AppDetails.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -914,14 +914,10 @@ export const EnvSelector = ({
914914
if (found) {
915915
found.options.push(Option)
916916
} else {
917-
if (key.length > 0) {
918-
acc.push({
919-
label: key,
920-
options: [Option],
921-
})
922-
} else {
923-
acc.push(Option)
924-
}
917+
acc.push({
918+
label: key,
919+
options: [Option],
920+
})
925921
}
926922

927923
return acc

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,10 +1346,10 @@
13461346
dependencies:
13471347
"@jridgewell/trace-mapping" "0.3.9"
13481348

1349-
"@devtron-labs/[email protected].5":
1350-
version "0.4.5"
1351-
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.4.5.tgz#55d4ff6174a84af9c4a08f6ba73a0178dde56529"
1352-
integrity sha512-6Rtzxk7UavWoXh2MaJDL+FQXcJN9idv9xfrEhL+vdbjmGwFqYsDmikt8DOxFyMVtjVORqkzhG425GAzm7ZoQFg==
1349+
"@devtron-labs/[email protected].6":
1350+
version "0.4.6"
1351+
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.4.6.tgz#f436a8153541d4ba79d916cde2c93a6de77d8b57"
1352+
integrity sha512-yzabX25bY3XaBkgmQ3zTC89/hZf+6qQYFFSkXw0EMnvJVrz0fxPiQx0Au+gJxULJLSciDoLHDauDfyK38FigZQ==
13531353
dependencies:
13541354
"@types/react-dates" "^21.8.6"
13551355
ansi_up "^5.2.1"

0 commit comments

Comments
 (0)