Merge pull request #2951 from devtron-labs/chore/sync-main

chore: sync main

Author: arunjaindev

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.20.3-pre-0",
+        "@devtron-labs/devtron-fe-common-lib": "1.20.5-pre-8",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/components/AppSelector/AppSelector.tsx

@@ -89,6 +89,7 @@ const AppSelector = ({ onChange, appId, appName, isJobView }: AppSelectorType) =
             placeholder={appName}
             optionListError={error}
             reloadOptionList={reload}
+            resource={isJobView ? 'Job' : 'Application'}
         />
     )
 }

src/components/AppSelector/ChartSelector.tsx

@@ -88,6 +88,7 @@ export default function ChartSelector({
             {...(filterOption ? { filterOption } : {})}
             optionListError={error}
             reloadOptionList={reload}
+            resource="Chart Store"
         />
     )
 }

src/components/ApplicationGroup/EnvSelector.tsx

@@ -79,6 +79,7 @@ export const EnvSelector = ({ onChange, envId, envName }: EnvSelectorType) => {
             onInputChange={onInputChange}
             optionListError={error}
             reloadOptionList={reload}
+            resource="Application Group"
         />
     )
 }

src/components/CIPipelineN/CIPipeline.tsx

@@ -913,7 +913,6 @@ export default function CIPipeline({
 
     return (
         <>
-            {renderFloatingVariablesWidget()}
             {(ciPipelineId || isAdvanced) && (
                 <Drawer position="right" width="75%" minWidth="1024px" maxWidth="1200px" onEscape={handleClose}>
                     <div className="modal__body modal__body__ci_new_ui br-0 modal__body--p-0 advanced-option-container">
@@ -939,6 +938,7 @@ export default function CIPipeline({
                             </div>
                         )}
                     </div>
+                    {renderFloatingVariablesWidget()}
                 </Drawer>
             )}
             <GenericModal

src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx

@@ -152,6 +152,7 @@ const ClusterSelector: React.FC<ClusterSelectorType> = ({
                 )}
                 inputValue={inputValue}
                 onInputChange={onInputChange}
+                resource="Cluster"
             />
 
             {defaultOption?.isProd && <Badge label="Production" size={ComponentSizeType.xxs} />}

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

@@ -40,7 +40,7 @@ const DeployedCommitCard = ({ cardLoading, showCommitInfoDrawer, envId, ciArtifa
         return <LoadingCard />
     }
 
-    if (materials.length === 0 || !materials[0].history[0]?.commit?.slice(0, 7)) {
+    if (!materials?.length || !materials[0].history[0]?.commit?.slice(0, 7)) {
         return null
     }
 

src/components/cdPipeline/CDPipeline.tsx

@@ -730,7 +730,10 @@ export default function CDPipeline({
             environmentId: formData.environmentId,
             namespace: formData.namespace,
             id: +cdPipelineId,
-            strategies: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart ? [] : formData.savedStrategies,
+            strategies:
+                formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart
+                    ? []
+                    : formData.savedStrategies,
             parentPipelineType,
             parentPipelineId: +parentPipelineId,
             isClusterCdActive: formData.isClusterCdActive,
@@ -1504,6 +1507,7 @@ export default function CDPipeline({
                         envId={formData.environmentId}
                     />
                 )}
+                {(cdPipelineId || isAdvanced) && renderFloatingVariablesWidget()}
             </div>
         )
     }
@@ -1533,13 +1537,9 @@ export default function CDPipeline({
     }
 
     return cdPipelineId || isAdvanced ? (
-        <>
-            {renderFloatingVariablesWidget()}
-
-            <Drawer onEscape={closePipelineModal} position="right" width="75%" minWidth="1024px" maxWidth="1200px">
-                {renderCDPipelineModal()}
-            </Drawer>
-        </>
+        <Drawer onEscape={closePipelineModal} position="right" width="75%" minWidth="1024px" maxWidth="1200px">
+            {renderCDPipelineModal()}
+        </Drawer>
     ) : (
         <VisibleModal className="">{renderCDPipelineModal()}</VisibleModal>
     )

src/components/v2/appDetails/k8Resource/nodeType/Node.component.tsx

@@ -159,7 +159,7 @@ const NodeComponent = ({
             let _healthyNodeCount = 0
 
             _selectedNodes.forEach((node: Node) => {
-                if (node.health?.status.toLowerCase() === 'healthy') {
+                if (node.health?.status?.toLowerCase() === 'healthy') {
                     _healthyNodeCount += 1
                 }
             })

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-0":
-  version: 1.20.3-pre-0
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.3-pre-0"
+"@devtron-labs/devtron-fe-common-lib@npm:1.20.5-pre-8":
+  version: 1.20.5-pre-8
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.5-pre-8"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1774,7 +1774,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/c029c62898e896ca682067eb4d423c42ea5546ed9e7901461f1068c36b683e78a2c2ca59cc209375f5a8f06d1553a70bfcc38252f53905ec577f7f4b33404142
+  checksum: 10c0/dae65dae4a7b0d0068c1ee45516af9840b4614f92fd6195bb1a831663c3bb6867d179ef1fe32907b2fbcfecac13bec324506b3a3923f1057ddd4cb2cb17bdab5
   languageName: node
   linkType: hard
 
@@ -5721,7 +5721,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.3-pre-0"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.5-pre-8"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"