feat: Refactor GitOps conflict handling and improve type definitions in CICD pipeline components

Author: RohitRaj011

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CDStepperContent.tsx

@@ -85,22 +85,22 @@ export const CDStepperContent = ({
         setCiCdPipeline({ ci, cd })
     }
 
-    const checkGitOpsRepoConflict = () => {
+    const checkGitOpsRepoConflict = async () => {
         setGitopsConflictLoading(true)
-        getGitOpsRepoConfig(+appId)
-            .then(() => {
-                push(`/app/${appId}/edit/${URLS.APP_GITOPS_CONFIG}`)
-            })
-            .catch((err) => {
-                if (err.code === API_STATUS_CODES.CONFLICT) {
-                    setReloadNoGitOpsRepoConfiguredModal(true)
-                } else {
-                    showError(err)
-                }
-            })
-            .finally(() => {
-                setGitopsConflictLoading(false)
-            })
+
+        try {
+            await getGitOpsRepoConfig(+appId)
+
+            setGitopsConflictLoading(false)
+            push(`/app/${appId}/edit/${URLS.APP_GITOPS_CONFIG}`)
+        } catch (err) {
+            setGitopsConflictLoading(false)
+            if (err.code === API_STATUS_CODES.CONFLICT) {
+                setReloadNoGitOpsRepoConfiguredModal(true)
+            } else {
+                showError(err)
+            }
+        }
     }
 
     // RENDERERS

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CreateCICDPipeline.tsx

@@ -1,6 +1,7 @@
 import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react'
 
 import {
+    API_STATUS_CODES,
     APIResponseHandler,
     ButtonStyleType,
     ComponentSizeType,
@@ -133,15 +134,11 @@ export const CreateCICDPipeline = ({
             })
         }
 
-        if (
+        return (
             gitOpsRepoNotConfiguredAndOptionsHidden ||
             isGitOpsRepoNotConfiguredAndGitopsEnforced ||
             isGitOpsRepoNotConfiguredAndOptionsVisible
-        ) {
-            return true
-        }
-
-        return false
+        )
     }
 
     const createWorkflow = async ({ shouldCreateCINode }: { shouldCreateCINode: boolean }) => {
@@ -239,7 +236,7 @@ export const CreateCICDPipeline = ({
                 setCdNodeCreateError(cdNodeRes.reason)
 
                 if (!shouldCreateCINode) {
-                    if (cdNodeRes.reason.code === 409) {
+                    if (cdNodeRes.reason.code === API_STATUS_CODES.CONFLICT) {
                         setReloadNoGitOpsRepoConfiguredModal(true)
                     } else {
                         showError(cdNodeRes.reason)

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/service.ts

@@ -1,10 +1,12 @@
 import {
     DeploymentAppTypes,
+    DeploymentStrategy,
     getEnvironmentListMinPublic,
     getIsRequestAborted,
     ModuleNameMap,
     ModuleStatus,
     ReleaseMode,
+    SavedDeploymentStrategy,
     showError,
     TriggerType,
     YAMLStringify,
@@ -18,7 +20,7 @@ import { getModuleInfo } from '@Components/v2/devtronStackManager/DevtronStackMa
 
 import { CreateCICDPipelineData } from './types'
 
-const getSavedStrategies = (strategies: any[]) => {
+const getSavedStrategies = (strategies: DeploymentStrategy[]): SavedDeploymentStrategy[] => {
     if (strategies.length > 0) {
         const allStrategies = strategies.reduce((acc, strategy) => {
             acc[strategy.deploymentTemplate] = strategy.config