refactor - common out code and optimization

RohitRaj011 · RohitRaj011 · commit 8ff038cfd70a · 2025-06-19T13:00:34.000+05:30
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/CDPipelineDeploymentAppType.tsx b/src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/CDPipelineDeploymentAppType.tsx
@@ -0,0 +1,39 @@
+import { DeploymentAppTypes } from '@devtron-labs/devtron-fe-common-lib'
+
+import { DeploymentAppRadioGroup } from '@Components/v2/values/chartValuesDiff/ChartValuesView.component'
+
+import { CDPipelineDeploymentAppTypeProps } from './types'
+
+export const CDPipelineDeploymentAppType = ({
+    isVirtualEnvironment,
+    allowedDeploymentTypes,
+    noGitOpsModuleInstalledAndConfigured,
+    isGitOpsInstalledButNotConfigured,
+    deploymentAppType,
+    rootClassName,
+    isDisabled,
+    handleChange,
+    isGitOpsRepoNotConfigured,
+    gitOpsRepoConfigInfoBar,
+}: CDPipelineDeploymentAppTypeProps) =>
+    !window._env_.HIDE_GITOPS_OR_HELM_OPTION &&
+    !isVirtualEnvironment &&
+    allowedDeploymentTypes?.length > 0 &&
+    // Want to show this when gitops module is installed, does not matter if it is configured or not
+    (!noGitOpsModuleInstalledAndConfigured || isGitOpsInstalledButNotConfigured) && (
+        <div className="mt-16">
+            {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+            <label className="form__label form__label--sentence">How do you want to deploy?</label>
+            <DeploymentAppRadioGroup
+                deploymentAppType={deploymentAppType ?? DeploymentAppTypes.HELM}
+                handleOnChange={handleChange}
+                allowedDeploymentTypes={allowedDeploymentTypes}
+                rootClassName={rootClassName}
+                isDisabled={isDisabled}
+                isFromCDPipeline
+                isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
+                gitOpsRepoConfigInfoBar={gitOpsRepoConfigInfoBar}
+                areGitopsCredentialsConfigured={!isGitOpsInstalledButNotConfigured}
+            />
+        </div>
+    )
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/index.ts b/src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/index.ts
@@ -0,0 +1 @@
+export * from './CDPipelineDeploymentAppType'
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/types.ts b/src/Pages/App/Configurations/WorkflowEditor/CDPipelineDeploymentAppType/types.ts
@@ -0,0 +1,9 @@
+import { DeploymentAppRadioGroupType } from '@Components/v2/values/chartValuesDiff/ChartValuesView.type'
+
+export interface CDPipelineDeploymentAppTypeProps
+    extends Omit<DeploymentAppRadioGroupType, 'isFromCDPipeline' | 'handleOnChange'> {
+    isVirtualEnvironment: boolean
+    noGitOpsModuleInstalledAndConfigured: boolean
+    isGitOpsInstalledButNotConfigured: boolean
+    handleChange: DeploymentAppRadioGroupType['handleOnChange']
+}
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CDStepperContent.tsx b/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CDStepperContent.tsx
@@ -15,12 +15,12 @@ import {
 import { GeneratedHelmPush } from '@Components/cdPipeline/cdPipeline.types'
 import { ValidationRules } from '@Components/ciPipeline/validationRules'
 import { EnvironmentWithSelectPickerType } from '@Components/CIPipelineN/types'
-import { DeploymentAppRadioGroup } from '@Components/v2/values/chartValuesDiff/ChartValuesView.component'
 import { GITOPS_REPO_REQUIRED } from '@Components/v2/values/chartValuesDiff/constant'
 import { ENV_ALREADY_EXIST_ERROR } from '@Config/constants'
 import { URLS } from '@Config/routes'
 import { getGitOpsRepoConfig } from '@Services/service'
 
+import { CDPipelineDeploymentAppType } from '../CDPipelineDeploymentAppType'
 import { SourceMaterialsSelector } from '../SourceMaterialsSelector'
 import { CDStepperContentProps } from './types'
 import { getEnvironmentOptions } from './utils'
@@ -167,27 +167,19 @@ export const CDStepperContent = ({
                 <div className="mt-16">
                     {gitOpsRepoNotConfiguredAndOptionsHidden && gitOpsRepoConfigInfoBar(GITOPS_REPO_REQUIRED)}
                 </div>
-                {!window._env_.HIDE_GITOPS_OR_HELM_OPTION &&
-                    !selectedEnvironment?.isVirtualEnvironment &&
-                    selectedEnvironment?.allowedDeploymentTypes?.length > 0 &&
-                    // Want to show this when gitops module is installed, does not matter if it is configured or not
-                    (!noGitOpsModuleInstalledAndConfigured || isGitOpsInstalledButNotConfigured) && (
-                        <div className="mt-16">
-                            {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
-                            <label className="form__label form__label--sentence">How do you want to deploy?</label>
-                            <DeploymentAppRadioGroup
-                                deploymentAppType={deploymentAppType ?? DeploymentAppTypes.HELM}
-                                handleOnChange={handleDeploymentAppTypeChange}
-                                allowedDeploymentTypes={selectedEnvironment?.allowedDeploymentTypes}
-                                rootClassName="chartrepo-type__radio-group"
-                                isDisabled={isFormDisabled}
-                                isFromCDPipeline
-                                isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
-                                gitOpsRepoConfigInfoBar={gitOpsRepoConfigInfoBar}
-                                areGitopsCredentialsConfigured={!isGitOpsInstalledButNotConfigured}
-                            />
-                        </div>
-                    )}
+                <CDPipelineDeploymentAppType
+                    isVirtualEnvironment={selectedEnvironment?.isVirtualEnvironment}
+                    isGitOpsInstalledButNotConfigured={isGitOpsInstalledButNotConfigured}
+                    noGitOpsModuleInstalledAndConfigured={noGitOpsModuleInstalledAndConfigured}
+                    deploymentAppType={deploymentAppType ?? DeploymentAppTypes.HELM}
+                    handleChange={handleDeploymentAppTypeChange}
+                    allowedDeploymentTypes={selectedEnvironment?.allowedDeploymentTypes}
+                    rootClassName="chartrepo-type__radio-group"
+                    isDisabled={isFormDisabled}
+                    isGitOpsRepoNotConfigured={isGitOpsRepoNotConfigured}
+                    gitOpsRepoConfigInfoBar={gitOpsRepoConfigInfoBar}
+                    areGitopsCredentialsConfigured={!isGitOpsInstalledButNotConfigured}
+                />
             </div>
         </div>
     )
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CIStepperContent.tsx b/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CIStepperContent.tsx
@@ -12,9 +12,10 @@ import { createWebhookConditionList } from '@Components/ciPipeline/ciPipeline.se
 import { ValidationRules } from '@Components/ciPipeline/validationRules'
 
 import { SourceMaterialsSelector } from '../SourceMaterialsSelector'
+import { getSelectedWebhookEvent } from '../utils'
 import { ConfigureWebhookWrapper } from './ConfigureWebhookWrapper'
 import { CIStepperContentProps } from './types'
-import { getBranchValue, getMenuListFooterConfig, getSelectedMaterial, getSelectedWebhookEvent } from './utils'
+import { getBranchValue, getMenuListFooterConfig, getSelectedMaterial } from './utils'
 
 const validationRules = new ValidationRules()
 
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CreateCICDPipeline.tsx b/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CreateCICDPipeline.tsx
@@ -18,16 +18,12 @@ import {
 
 import { saveCIPipeline } from '@Components/ciPipeline/ciPipeline.service'
 import { CIPipelineBuildType } from '@Components/ciPipeline/types'
-import {
-    gitOpsRepoNotConfigured,
-    gitOpsRepoNotConfiguredWithEnforcedEnv,
-    gitOpsRepoNotConfiguredWithOptionsHidden,
-} from '@Components/gitOps/constants'
 import { getConfigureGitOpsCredentialsButtonProps } from '@Components/workflowEditor/ConfigureGitopsInfoBlock'
 import NoGitOpsRepoConfiguredWarning, {
     ReloadNoGitOpsRepoConfiguredModal,
 } from '@Components/workflowEditor/NoGitOpsRepoConfiguredWarning'
 
+import { checkForGitOpsRepoNotConfigured } from '../utils'
 import { CDStepperContent } from './CDStepperContent'
 import { CICDStepper } from './CICDStepper'
 import { CIStepperContent } from './CIStepperContent'
@@ -105,47 +101,6 @@ export const CreateCICDPipeline = ({
         setGitOpsRepoConfiguredWarning({ show: false, text: '' })
     }
 
-    const checkForGitOpsRepoNotConfigured = () => {
-        const isHelmEnforced =
-            selectedEnvironment?.allowedDeploymentTypes?.length === 1 &&
-            selectedEnvironment.allowedDeploymentTypes[0] === DeploymentAppTypes.HELM
-
-        const gitOpsRepoNotConfiguredAndOptionsHidden =
-            window._env_.HIDE_GITOPS_OR_HELM_OPTION &&
-            !noGitOpsModuleInstalledAndConfigured &&
-            !isHelmEnforced &&
-            isGitOpsRepoNotConfigured
-
-        if (gitOpsRepoNotConfiguredAndOptionsHidden) {
-            setGitOpsRepoConfiguredWarning({ show: true, text: gitOpsRepoNotConfiguredWithOptionsHidden })
-        }
-
-        const isGitOpsRepoNotConfiguredAndOptionsVisible =
-            deploymentAppType === DeploymentAppTypes.GITOPS &&
-            isGitOpsRepoNotConfigured &&
-            !window._env_.HIDE_GITOPS_OR_HELM_OPTION
-
-        const isGitOpsRepoNotConfiguredAndGitopsEnforced =
-            isGitOpsRepoNotConfiguredAndOptionsVisible && selectedEnvironment?.allowedDeploymentTypes?.length === 1
-
-        if (isGitOpsRepoNotConfiguredAndOptionsVisible) {
-            setGitOpsRepoConfiguredWarning({ show: true, text: gitOpsRepoNotConfigured })
-        }
-
-        if (isGitOpsRepoNotConfiguredAndGitopsEnforced) {
-            setGitOpsRepoConfiguredWarning({
-                show: true,
-                text: gitOpsRepoNotConfiguredWithEnforcedEnv(selectedEnvironment.name),
-            })
-        }
-
-        return (
-            gitOpsRepoNotConfiguredAndOptionsHidden ||
-            isGitOpsRepoNotConfiguredAndGitopsEnforced ||
-            isGitOpsRepoNotConfiguredAndOptionsVisible
-        )
-    }
-
     const createWorkflow = async ({ shouldCreateCINode }: { shouldCreateCINode: boolean }) => {
         if (shouldCreateCINode) {
             const scanValidation = !window._env_.FORCE_SECURITY_SCANNING || !isSecurityModuleInstalled || scanEnabled
@@ -171,7 +126,17 @@ export const CreateCICDPipeline = ({
             return
         }
 
-        if (checkForGitOpsRepoNotConfigured()) {
+        if (
+            checkForGitOpsRepoNotConfigured({
+                allowedDeploymentTypes: selectedEnvironment?.allowedDeploymentTypes,
+                deploymentAppType: deploymentAppType as DeploymentAppTypes,
+                environmentName: selectedEnvironment?.name,
+                isGitOpsRepoNotConfigured,
+                isTemplateView,
+                noGitOpsModuleInstalledAndConfigured,
+                setGitOpsRepoConfiguredWarning,
+            })
+        ) {
             return
         }
 
diff --git a/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/utils.tsx b/src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/utils.tsx
@@ -70,14 +70,6 @@ export const getCiCdPipelineDefaultState = (): CreateCICDPipelineData => ({
 
 export const getCiCdPipelineFormErrorDefaultState = (): CreateCICDPipelineFormError => ({ ci: {}, cd: {} })
 
-export const getSelectedWebhookEvent = (
-    material: MaterialType,
-    webhookEvents: CreateCICDPipelineData['ci']['webhookEvents'],
-) => {
-    const selectedEventId = JSON.parse(material.value)?.eventId
-    return selectedEventId ? webhookEvents.find(({ id }) => id === selectedEventId) : null
-}
-
 export const getSelectedMaterial = ({
     type,
     selectedWebhookEvent,
diff --git a/src/Pages/App/Configurations/WorkflowEditor/index.ts b/src/Pages/App/Configurations/WorkflowEditor/index.ts
@@ -1,2 +1,4 @@
+export * from './CDPipelineDeploymentAppType'
 export * from './CreateCICDPipeline'
 export * from './SourceMaterialsSelector'
+export * from './utils'
diff --git a/src/Pages/App/Configurations/WorkflowEditor/utils.ts b/src/Pages/App/Configurations/WorkflowEditor/utils.ts
@@ -0,0 +1,79 @@
+import { Dispatch, SetStateAction } from 'react'
+
+import { DeploymentAppTypes, MaterialType, PipelineFormType } from '@devtron-labs/devtron-fe-common-lib'
+
+const gitOpsRepoNotConfiguredWithOptionsHidden =
+    'Deployment via GitOps requires a repository to save deployment manifests. Please configure and try again.'
+
+const gitOpsRepoNotConfigured =
+    'GitOps repository is required to deploy using GitOps. You can deploy using helm or configure GitOps repository and try again.'
+
+export const gitOpsRepoNotConfiguredWithEnforcedEnv = (env: string): string =>
+    `Deployment to ‘${env}’ requires a GitOps repository. Please configure and try again.`
+
+export const checkForGitOpsRepoNotConfigured = ({
+    allowedDeploymentTypes,
+    noGitOpsModuleInstalledAndConfigured,
+    isGitOpsRepoNotConfigured,
+    deploymentAppType,
+    environmentName,
+    isTemplateView,
+    setGitOpsRepoConfiguredWarning,
+}: {
+    deploymentAppType: DeploymentAppTypes
+    allowedDeploymentTypes: DeploymentAppTypes[]
+    noGitOpsModuleInstalledAndConfigured: boolean
+    isGitOpsRepoNotConfigured: boolean
+    environmentName: string
+    isTemplateView: boolean
+    setGitOpsRepoConfiguredWarning: Dispatch<SetStateAction<{ show: boolean; text: string }>>
+}) => {
+    const isHelmEnforced = allowedDeploymentTypes?.length === 1 && allowedDeploymentTypes[0] === DeploymentAppTypes.HELM
+
+    const gitOpsRepoNotConfiguredAndOptionsHidden =
+        window._env_.HIDE_GITOPS_OR_HELM_OPTION &&
+        !noGitOpsModuleInstalledAndConfigured &&
+        !isHelmEnforced &&
+        isGitOpsRepoNotConfigured
+
+    if (gitOpsRepoNotConfiguredAndOptionsHidden) {
+        setGitOpsRepoConfiguredWarning({ show: true, text: gitOpsRepoNotConfiguredWithOptionsHidden })
+    }
+
+    const isGitOpsRepoNotConfiguredAndOptionsVisible =
+        deploymentAppType === DeploymentAppTypes.GITOPS &&
+        isGitOpsRepoNotConfigured &&
+        !window._env_.HIDE_GITOPS_OR_HELM_OPTION
+
+    const isGitOpsRepoNotConfiguredAndGitopsEnforced =
+        isGitOpsRepoNotConfiguredAndOptionsVisible && allowedDeploymentTypes?.length === 1
+
+    if (!isTemplateView) {
+        if (isGitOpsRepoNotConfiguredAndOptionsVisible) {
+            setGitOpsRepoConfiguredWarning({ show: true, text: gitOpsRepoNotConfigured })
+        }
+        if (isGitOpsRepoNotConfiguredAndGitopsEnforced) {
+            setGitOpsRepoConfiguredWarning({
+                show: true,
+                text: gitOpsRepoNotConfiguredWithEnforcedEnv(environmentName),
+            })
+        }
+
+        return (
+            gitOpsRepoNotConfiguredAndOptionsHidden ||
+            isGitOpsRepoNotConfiguredAndGitopsEnforced ||
+            isGitOpsRepoNotConfiguredAndOptionsVisible
+        )
+    }
+
+    return false
+}
+
+export const getSelectedWebhookEvent = (material: MaterialType, webhookEvents: PipelineFormType['webhookEvents']) => {
+    try {
+        const selectedEventId = JSON.parse(material.value)?.eventId
+        return selectedEventId ? webhookEvents.find(({ id }) => id === selectedEventId) : null
+    } catch {
+        return null
+    }
+}
diff --git a/src/components/CIPipelineN/Build.tsx b/src/components/CIPipelineN/Build.tsx
@@ -30,6 +30,7 @@ import { BuildType, WebhookCIProps } from '../ciPipeline/types'
 import { ReactComponent as BugScanner } from '../../assets/icons/scanner.svg'
 import AdvancedConfigOptions from './AdvancedConfigOptions'
 import { pipelineContext } from '../workflowEditor/workflowEditor'
+import { getSelectedWebhookEvent } from '@Pages/App/Configurations'
 
 export const Build = ({
     isAdvanced,
@@ -129,11 +130,6 @@ export const Build = ({
         setFormData(_formData)
         getPluginData(_formData)
     }
-    const getSelectedWebhookEvent = (material) => {
-        const _materialValue = JSON.parse(material.value)
-        const _selectedEventId = _materialValue?.eventId
-        return _selectedEventId && formData.webhookEvents.find((we) => we.id === _selectedEventId)
-    }
 
     const addWebhookCondition = (): void => {
         const _form = { ...formData }
@@ -172,7 +168,7 @@ export const Build = ({
         const _webhookData: WebhookCIProps = {
             webhookConditionList: formData.webhookConditionList,
             gitHost: formData.gitHost,
-            getSelectedWebhookEvent,
+            getSelectedWebhookEvent: (material) => getSelectedWebhookEvent(material, formData.webhookEvents),
             addWebhookCondition,
             deleteWebhookCondition,
             onWebhookConditionSelectorChange,
diff --git a/src/components/app/details/triggerView/workflow/nodes/triggerCDNode.tsx b/src/components/app/details/triggerView/workflow/nodes/triggerCDNode.tsx
@@ -34,8 +34,8 @@ import { envDescriptionTippy, getNodeSideHeadingAndClass } from './workflow.util
 import NoGitOpsRepoConfiguredWarning, {
     ReloadNoGitOpsRepoConfiguredModal,
 } from '../../../../../workflowEditor/NoGitOpsRepoConfiguredWarning'
-import { gitOpsRepoNotConfiguredWithEnforcedEnv } from '../../../../../gitOps/constants'
 import { getAppGroupDeploymentHistoryLink } from '@Components/ApplicationGroup/AppGroup.utils'
+import { gitOpsRepoNotConfiguredWithEnforcedEnv } from '@Pages/App/Configurations'
 
 export class TriggerCDNode extends Component<TriggerCDNodeProps, TriggerCDNodeState> {
     constructor(props) {
diff --git a/src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx b/src/components/app/details/triggerView/workflow/nodes/triggerPrePostCDNode.tsx
@@ -27,9 +27,9 @@ import { TriggerStatus } from '../../../../config'
 import { BUILD_STATUS, URLS, DEFAULT_STATUS } from '../../../../../../config'
 import { TriggerViewContext } from '../../config'
 import NoGitOpsRepoConfiguredWarning from '../../../../../workflowEditor/NoGitOpsRepoConfiguredWarning'
-import { gitOpsRepoNotConfiguredWithEnforcedEnv } from '../../../../../gitOps/constants'
 import { getNodeSideHeadingAndClass } from './workflow.utils'
 import { getAppGroupDeploymentHistoryLink } from '../../../../../ApplicationGroup/AppGroup.utils'
+import { gitOpsRepoNotConfiguredWithEnforcedEnv } from '@Pages/App/Configurations'
 
 export class TriggerPrePostCDNode extends Component<TriggerPrePostCDNodeProps, TriggerPrePostCDNodeState> {
     gitOpsRepoWarningCondition =
diff --git a/src/components/cdPipeline/BuildCD.tsx b/src/components/cdPipeline/BuildCD.tsx
diff --git a/src/components/cdPipeline/CDPipeline.tsx b/src/components/cdPipeline/CDPipeline.tsx
diff --git a/src/components/gitOps/constants.ts b/src/components/gitOps/constants.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from './CDPipelineDeploymentAppType'`