Merge branch 'refactor/compare-manifest' of github.com:devtron-labs/d…

…ashboard into feat/rjsf-field-selector
devtron-labs · Oct 3, 2024 · d781a76 · d781a76
2 parents eafdada + 56c2141
commit d781a76
Show file tree

Hide file tree

Showing 12 changed files with 1,525 additions and 707 deletions.
diff --git a/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx b/src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx
@@ -31,6 +31,7 @@ const ConfigDryRun = ({
     handleChangeDryRunEditorMode,
     isDraftPresent,
     isPublishedConfigPresent,
+    isApprovalPending,
 }: ConfigDryRunProps) => {
     const { envId, appId } = useParams<BaseURLParams>()
 
@@ -72,7 +73,7 @@ const ConfigDryRun = ({
                 <div className="py-6 px-12 flexbox dc__content-space dc__border-bottom">
                     <div className="flexbox dc__gap-8">
                         <ICFileCode className="dc__no-shrink scn-9 icon-dim-16" />
-                        {DryRunEditorModeSelect && isDraftPresent ? (
+                        {DryRunEditorModeSelect && isApprovalPending ? (
                             <DryRunEditorModeSelect
                                 selectedOptionValue={dryRunEditorMode}
                                 handleChangeDryRunEditorMode={handleChangeDryRunEditorMode}

diff --git a/.../DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DTChartSelector.tsx b/.../DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DTChartSelector.tsx
@@ -112,7 +112,7 @@ const ChartSelectorDropdown = ({
                     />
                 </span>
             </PopupMenu.Button>
-            <PopupMenu.Body rootClassName="chart-selector-container dc__border br-4">
+            <PopupMenu.Body rootClassName="dc__overflow-scroll mh-350 w-400 dc__border br-4">
                 <>
                     {customCharts.length > 0 && (
                         <div
@@ -150,8 +150,8 @@ const ChartSelectorDropdown = ({
                             <div
                                 // eslint-disable-next-line react/no-array-index-key
                                 key={`${selectedChartTypeTab}-${index}`}
-                                className={`p-12 pointer chart-row ${
-                                    chart.name === selectedChart?.name ? ' bcb-1' : ''
+                                className={`p-12 pointer chart-row  ${
+                                    chart.name === selectedChart?.name ? ' bcb-1' : 'dc__hover-n50'
                                 }`}
                                 data-testid={`select-chart-type-menu-${index}`}
                                 onClick={() => onSelectChartType(chart.name)}

diff --git a/...ronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeleteOverrideDialog.tsx b/...ronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeleteOverrideDialog.tsx
@@ -18,7 +18,7 @@ const DeleteOverrideDialog = ({
     environmentConfigId,
     handleReload,
     handleClose,
-    handleShowDeleteDraftOverrideDialog,
+    handleProtectionError,
     reloadEnvironments,
 }: DeleteOverrideDialogProps) => {
     const { appId, envId } = useParams<BaseURLParams>()
@@ -35,12 +35,9 @@ const DeleteOverrideDialog = ({
             handleClose()
             handleReload()
         } catch (error) {
-            // TODO: Remove this later
             showError(error)
-            // handleConfigProtectionError(2, error, dispatch, reloadEnvironments)
-            // TODO: Use util from above
             if (error.code === 423) {
-                handleShowDeleteDraftOverrideDialog()
+                handleProtectionError()
                 reloadEnvironments()
             }
         } finally {