Merge branch 'main' of github.com:devtron-labs/dashboard into chore/sync-develop-with-main

Author: RohitRaj011

package.json

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

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplateForm.tsx

@@ -164,15 +164,20 @@ const DeploymentTemplateForm = ({
                 displayValue:
                     expressEditComparisonViewLHS &&
                     (expressEditComparisonViewLHS.isAppMetricsEnabled ? 'Enabled' : 'Disabled'),
-                value: expressEditComparisonViewLHS?.isAppMetricsEnabled,
-            },
-            rhs: {
-                value: isAppMetricsEnabled,
-                dropdownConfig: {
-                    options: APPLICATION_METRICS_DROPDOWN_OPTIONS,
-                    onChange: toggleApplicationMetrics,
-                },
+                value: expressEditComparisonViewLHS?.isAppMetricsEnabled ?? false,
             },
+            rhs: selectedChart.isAppMetricsSupported
+                ? {
+                      value: isAppMetricsEnabled,
+                      dropdownConfig: {
+                          options: APPLICATION_METRICS_DROPDOWN_OPTIONS,
+                          onChange: toggleApplicationMetrics,
+                      },
+                  }
+                : {
+                      displayValue: isAppMetricsEnabled ? 'Enabled' : 'Disabled',
+                      value: isAppMetricsEnabled,
+                  },
         },
     ]
 

src/Pages/Shared/ConfigMapSecret/ConfigMapSecretContainer.tsx

@@ -99,6 +99,7 @@ import {
     getConfigMapSecretResolvedDataPayload,
     getConfigMapSecretStateLabel,
     parseConfigMapSecretSearchParams,
+    shouldHidePatchOption,
 } from './utils'
 
 import './styles.scss'
@@ -1187,7 +1188,7 @@ export const ConfigMapSecretContainer = ({
                         handleMergeStrategyChange={handleMergeStrategyChange}
                         userApprovalMetadata={draftData?.userApprovalMetadata}
                         isApprovalPolicyConfigured={isApprovalPolicyConfigured}
-                        hidePatchOption={isJob || formData.external}
+                        hidePatchOption={shouldHidePatchOption(inheritedConfigMapSecretData, isJob)}
                         isMergeStrategySelectorDisabled={resolveScopedVariables}
                         areCommentsPresent={areCommentsPresent}
                         disableAllActions={isLoading || isSubmitting || !!parsingError}

src/Pages/Shared/ConfigMapSecret/ConfigMapSecretData.tsx

@@ -75,6 +75,7 @@ export const ConfigMapSecretData = ({
     isExpressEditComparisonView,
     draftData,
     publishedConfigMapSecretData,
+    hidePatchOption,
     handleMergeStrategyChange,
 }: ConfigMapSecretDataProps) => {
     // USE FORM PROPS
@@ -375,6 +376,7 @@ export const ConfigMapSecretData = ({
                     lhs: expressEditComparisonViewLHS,
                     rhs: data,
                     onMergeStrategySelect,
+                    hidePatchOption,
                 })}
                 readOnly={readOnly}
                 lhsEditor={{
@@ -386,6 +388,10 @@ export const ConfigMapSecretData = ({
                 }}
                 showDraftOption={!!draftData}
                 handleCompareWithChange={handleExpressEditCompareWithChange}
+                hideEditor={{
+                    lhs: expressEditComparisonViewLHS?.external,
+                    rhs: data.external,
+                }}
             />
         ) : (
             <CodeEditor.Container overflowHidden>
@@ -506,6 +512,14 @@ export const ConfigMapSecretData = ({
         return null
     }
 
+    const externalExpressEditEditor = () => {
+        if (data.external && isExpressEditComparisonView) {
+            return renderCodeEditor({ sheBangText: '' })
+        }
+
+        return null
+    }
+
     return (
         <div className="flex-grow-1 flexbox-col dc__gap-12">
             {renderDataEditorSelector()}
@@ -516,6 +530,7 @@ export const ConfigMapSecretData = ({
                       })
                     : renderGUIEditor())}
             {externalSecretEditor()}
+            {externalExpressEditEditor()}
         </div>
     )
 }

src/Pages/Shared/ConfigMapSecret/ConfigMapSecretForm.tsx

@@ -56,6 +56,7 @@ import { ConfigMapSecretData } from './ConfigMapSecretData'
 import { CM_SECRET_COMPONENT_NAME } from './constants'
 import { renderChartVersionBelow3090NotSupportedText, renderESOInfo, renderExternalInfo } from './helpers'
 import { ConfigMapSecretFormProps } from './types'
+import { shouldHidePatchOption } from './utils'
 
 const DISABLE_DATA_TYPE_CHANGE_HELPER_MESSAGE = importComponentFromFELibrary(
     'DISABLE_DATA_TYPE_CHANGE_HELPER_MESSAGE',
@@ -422,6 +423,7 @@ export const ConfigMapSecretForm = ({
                                 publishedConfigMapSecretData={publishedConfigMapSecretData}
                                 isExpressEditView={isExpressEditView}
                                 isExpressEditComparisonView={isExpressEditComparisonView}
+                                hidePatchOption={shouldHidePatchOption(inheritedConfigMapSecretData, isJob)}
                                 handleMergeStrategyChange={handleMergeStrategyChange}
                             />
                         </div>

src/Pages/Shared/ConfigMapSecret/types.ts

@@ -150,6 +150,7 @@ export interface ConfigMapSecretDataProps
     readOnly: boolean
     isPatchMode: boolean
     hasPublishedConfig: boolean
+    hidePatchOption: boolean
 }
 
 export type CMSecretDeleteModalType = 'deleteModal' | 'protectedDeleteModal' | 'expressDeleteDraft'

src/Pages/Shared/ConfigMapSecret/utils.ts

@@ -398,6 +398,9 @@ export const getConfigMapSecretDataType = (
         : (getSelectPickerOptionByValue(getSecretDataTypeOptions(false, true), externalType).label as string)
 }
 
+export const shouldHidePatchOption = (configMapSecretData: CMSecretConfigData, isJob: boolean) =>
+    isJob || configMapSecretData?.external || false
+
 export const getExpressEditComparisonViewLHS = ({
     isDraft,
     draftData,
@@ -436,10 +439,12 @@ export const getCMCSExpressEditComparisonDataDiffConfig = ({
     lhs,
     rhs,
     onMergeStrategySelect,
+    hidePatchOption,
 }: {
     lhs: ConfigMapSecretUseFormProps
     rhs: ConfigMapSecretUseFormProps
     onMergeStrategySelect: (newValue: SelectPickerOptionType) => void
+    hidePatchOption: boolean
 }) => [
     ...(rhs.mergeStrategy
         ? [
@@ -448,13 +453,17 @@ export const getCMCSExpressEditComparisonDataDiffConfig = ({
                   lhs: {
                       displayValue: lhs?.mergeStrategy,
                   },
-                  rhs: {
-                      value: rhs.mergeStrategy,
-                      dropdownConfig: {
-                          options: MERGE_STRATEGY_OPTIONS,
-                          onChange: onMergeStrategySelect,
-                      },
-                  },
+                  rhs: hidePatchOption
+                      ? {
+                            displayValue: rhs.mergeStrategy,
+                        }
+                      : {
+                            value: rhs.mergeStrategy,
+                            dropdownConfig: {
+                                options: MERGE_STRATEGY_OPTIONS,
+                                onChange: onMergeStrategySelect,
+                            },
+                        },
               },
           ]
         : []),