refactor: code review fixes

Author: RohitRaj011

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

@@ -85,10 +85,6 @@ export const CIStepperContent = ({
         (gitMaterialId: MaterialType['gitMaterialId']) => (selectedOption: CiPipelineSourceTypeOption) => {
             const { ci, cd } = structuredClone(ciCdPipeline)
 
-            // Determine if the previously selected source was a webhook
-            const wasWebhookPreviously =
-                ci.ciPipelineSourceTypeOptions.find((opt) => opt.isSelected)?.value === SourceTypeMap.WEBHOOK
-
             // Find the material index to update
             const materialIndex = ci.materials.findIndex((mat) => mat.gitMaterialId === gitMaterialId)
 
@@ -97,6 +93,10 @@ export const CIStepperContent = ({
                 const newSourceType = selectedOption.value
                 const isRegexType = newSourceType === SourceTypeMap.BranchRegex
 
+                // Determine if the previously selected source was a webhook
+                const wasWebhookPreviously =
+                    ci.ciPipelineSourceTypeOptions.find((opt) => opt.isSelected)?.value === SourceTypeMap.WEBHOOK
+
                 // Update material with new type and adjusted values
                 ci.materials[materialIndex] = {
                     ...currentMaterial,

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

@@ -215,7 +215,6 @@ export const CreateCICDPipeline = ({
             ])
 
             setIsCreatingWorkflow(false)
-            await getWorkflows()
 
             if (cdNodeRes.status === 'rejected') {
                 setCdNodeCreateError(cdNodeRes.reason)
@@ -238,6 +237,7 @@ export const CreateCICDPipeline = ({
                     variant: ToastVariantType.success,
                     description: CREATE_CI_CD_PIPELINE_TOAST_MESSAGES.CREATE_WORKFLOW_SUCCESS,
                 })
+                getWorkflows()
                 onClose()
             }
         } catch {

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

@@ -2,8 +2,6 @@ import {
     DeploymentAppTypes,
     DeploymentStrategy,
     getEnvironmentListMinPublic,
-    ModuleNameMap,
-    ModuleStatus,
     ReleaseMode,
     SavedDeploymentStrategy,
     showError,
@@ -15,7 +13,6 @@ import { getCDPipelineNameSuggestion, getDeploymentStrategyList } from '@Compone
 import { GeneratedHelmPush } from '@Components/cdPipeline/cdPipeline.types'
 import { getInitData } from '@Components/ciPipeline/ciPipeline.service'
 import { sortObjectArrayAlphabetically } from '@Components/common'
-import { getModuleInfo } from '@Components/v2/devtronStackManager/DevtronStackManager.service'
 
 import { CreateCICDPipelineData } from './types'
 
@@ -105,22 +102,14 @@ const getCDInitData = async (appId: string, isTemplateView: boolean): Promise<Cr
 }
 
 const getCIInitData = async (appId: string, isTemplateView: boolean) => {
-    const [
-        {
-            result: { form, isBlobStorageConfigured },
-        },
-        {
-            result: { status },
-        },
-    ] = await Promise.all([
-        getInitData(appId.toString(), true, false, isTemplateView),
-        getModuleInfo(ModuleNameMap.SECURITY),
-    ])
+    const {
+        result: { form, isBlobStorageConfigured, isSecurityModuleInstalled },
+    } = await getInitData(appId.toString(), true, false, isTemplateView)
 
     return {
         ...form,
         isBlobStorageConfigured,
-        isSecurityModuleInstalled: status === ModuleStatus.INSTALLED,
+        isSecurityModuleInstalled,
     }
 }
 

src/components/CIPipelineN/CIPipeline.tsx

@@ -20,11 +20,9 @@ import {
     ServerErrors,
     showError,
     ConditionalWrap,
-    VisibleModal,
     Drawer,
     VariableType,
     MandatoryPluginDataType,
-    ButtonWithLoader,
     PluginDataStoreType,
     ProcessPluginDataReturnType,
     PluginDetailPayloadType,
@@ -34,11 +32,9 @@ import {
     getUpdatedPluginStore,
     TabProps,
     TabGroup,
-    ModuleNameMap,
     SourceTypeMap,
     DEFAULT_ENV,
     getEnvironmentListMinPublic,
-    ModuleStatus,
     PipelineFormType,
     ToastVariantType,
     ToastManager,
@@ -69,7 +65,6 @@ import { PreBuild } from './PreBuild'
 import { Sidebar } from './Sidebar'
 import { Build } from './Build'
 import { ReactComponent as WarningTriangle } from '../../assets/icons/ic-warning.svg'
-import { getModuleInfo } from '../v2/devtronStackManager/DevtronStackManager.service'
 import { LoadingState } from '../ciConfig/types'
 import { pipelineContext } from '../workflowEditor/workflowEditor'
 import { calculateLastStepDetailsLogic, checkUniqueness, validateTask } from '../cdPipeline/cdpipeline.util'
@@ -232,17 +227,6 @@ export default function CIPipeline({
         setAvailableTags(tags)
     }
 
-    const getSecurityModuleStatus = async (): Promise<void> => {
-        try {
-            const { result } = await getModuleInfo(ModuleNameMap.SECURITY)
-            if (result?.status === ModuleStatus.INSTALLED) {
-                setSecurityModuleInstalled(true)
-            }
-        } catch (error) {
-            showError(error)
-        }
-    }
-
     // mandatory plugins are applicable for job ci but not jobs
     const areMandatoryPluginPossible = !isJobView && !isTemplateView && !!processPluginData
 
@@ -454,7 +438,6 @@ export default function CIPipeline({
     const handleOnMountAPICalls = async () => {
         try {
             setPageState(ViewType.LOADING)
-            await getSecurityModuleStatus()
             if (ciPipelineId) {
                 const ciPipelineResponse = await getInitDataWithCIPipeline(appId, ciPipelineId, true, isTemplateView)
                 if (ciPipelineResponse) {
@@ -477,6 +460,7 @@ export default function CIPipeline({
                     validateStage(BuildStageVariable.PostBuild, ciPipelineResponse.form)
                     setFormData(ciPipelineResponse.form)
                     setIsBlobStorageConfigured(ciPipelineResponse.isBlobStorageConfigured)
+                    setSecurityModuleInstalled(ciPipelineResponse.isSecurityModuleInstalled)
                     setCIPipeline(ciPipelineResponse.ciPipeline)
                     await getInitialPlugins(ciPipelineResponse.form)
                     await getEnvironments(ciPipelineResponse.ciPipeline.environmentId)
@@ -486,6 +470,7 @@ export default function CIPipeline({
                 const ciPipelineResponse = await getInitData(appId, true, isJobCard, isTemplateView)
                 if (ciPipelineResponse) {
                     setFormData(ciPipelineResponse.result.form)
+                    setSecurityModuleInstalled(ciPipelineResponse.result.isSecurityModuleInstalled)
                     await getInitialPlugins(ciPipelineResponse.result.form)
                     await getEnvironments(0)
                 }
@@ -541,7 +526,7 @@ export default function CIPipeline({
 
     const handleAdvancedOptions = () => {
         setIsAdvanced(true)
-        handleAnalyticsEvent({category: 'CI Pipeline', action: 'DA_BUILD_ADVANCED'})
+        handleAnalyticsEvent({ category: 'CI Pipeline', action: 'DA_BUILD_ADVANCED' })
     }
 
     const renderSecondaryButton = () => {

src/components/ciPipeline/SourceMaterials.tsx

@@ -52,7 +52,7 @@ export const SourceMaterials = ({
         }
 
         return initialMaterials
-    }, [isMultiGit, initialMaterials])
+    }, [initialMaterials])
 
     // HANDLERS
     const onBlur = async () => {

src/components/ciPipeline/ciPipeline.service.ts

@@ -32,12 +32,14 @@ import {
     GetTemplateAPIRouteType,
     getTemplateAPIRoute,
     SourceTypeMap,
+    ModuleStatus,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Routes, ViewType } from '../../config'
 import { getSourceConfig, getWebhookDataMetaConfig } from '../../services/service'
 import { CiPipelineSourceTypeBaseOptions } from '../CIPipelineN/ciPipeline.utils'
 import { CIPipelineBuildType, CIPipelineInitData, PatchAction } from './types'
 import { safeTrim } from '../../util/Util'
+import { getModuleInfo } from '@Components/v2/devtronStackManager/DevtronStackManager.service'
 
 const emptyStepsData = () => {
     return { id: 0, steps: [] }
@@ -68,13 +70,17 @@ export function getInitData(
         getCIPipelineNameSuggestion(appId, isTemplateView),
         getPipelineMetaConfiguration(appId.toString(), includeWebhookData, true, isJobCard, isTemplateView),
         getModuleConfigured(ModuleNameMap.BLOB_STORAGE),
+        getModuleInfo(ModuleNameMap.SECURITY),
     ]).then(
         ([
             pipelineNameRes,
             pipelineMetaConfig,
             {
                 result: { enabled: isBlobStorageConfigured },
             },
+            {
+                result: { status },
+            },
         ]) => {
             const scanEnabled =
                 window._env_ && (window._env_.RECOMMEND_SECURITY_SCANNING || window._env_.FORCE_SECURITY_SCANNING)
@@ -102,6 +108,7 @@ export function getInitData(
                     loadingData: false,
                     isAdvanced: false,
                     isBlobStorageConfigured,
+                    isSecurityModuleInstalled: status === ModuleStatus.INSTALLED,
                 },
             }
         },
@@ -221,13 +228,17 @@ export function getInitDataWithCIPipeline(
         // by default BE will send global cache config for that pipelineType (JOB or CI_BUILD)
         getPipelineMetaConfiguration(appId, includeWebhookData, false, false, isTemplateView),
         getModuleConfigured(ModuleNameMap.BLOB_STORAGE),
+        getModuleInfo(ModuleNameMap.SECURITY),
     ]).then(
         ([
             ciPipelineRes,
             pipelineMetaConfig,
             {
                 result: { enabled: isBlobStorageConfigured },
             },
+            {
+                result: { status },
+            },
         ]) => {
             const ciPipeline = ciPipelineRes?.result
             const pipelineMetaConfigResult = pipelineMetaConfig?.result
@@ -239,6 +250,7 @@ export function getInitDataWithCIPipeline(
                 pipelineMetaConfigResult.webhookEvents,
                 pipelineMetaConfigResult.ciPipelineSourceTypeOptions,
                 isBlobStorageConfigured,
+                status === ModuleStatus.INSTALLED,
             )
         },
     )
@@ -324,6 +336,7 @@ export function saveCIPipeline(
             undefined,
             ciPipelineSourceTypeOptions,
             false,
+            false,
             response.result.appWorkflowId ?? ciPipelineFromRes.appWorkflowId,
         )
     })
@@ -555,6 +568,7 @@ function parseCIResponse(
     webhookEvents,
     ciPipelineSourceTypeOptions,
     isBlobStorageConfigured?: boolean,
+    isSecurityModuleInstalled?: boolean,
     appWorkflowId?: number,
 ) {
     if (ciPipeline) {
@@ -628,6 +642,7 @@ function parseCIResponse(
             showPreBuild: ciPipeline.beforeDockerBuildScripts?.length > 0,
             showPostBuild: ciPipeline.afterDockerBuildScripts?.length > 0,
             isBlobStorageConfigured: isBlobStorageConfigured ?? false,
+            isSecurityModuleInstalled: isSecurityModuleInstalled ?? false,
         }
     }
 }

src/components/ciPipeline/types.ts

@@ -430,5 +430,6 @@ export interface CIPipelineInitData {
         loadingData: boolean
         isAdvanced: boolean
         isBlobStorageConfigured: boolean
+        isSecurityModuleInstalled: boolean
     }
 }