fix: skip deployment if strategy not selected

Author: arunjaindev

.eslintignore

@@ -10,10 +10,8 @@ src/App.tsx
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
 src/components/AppSelector/ChartSelector.tsx
 src/components/ApplicationGroup/AppGroup.service.ts
-src/components/ApplicationGroup/AppGroup.types.ts
 src/components/ApplicationGroup/AppGroup.utils.ts
 src/components/ApplicationGroup/AppGroupAppFilter.components.tsx
-src/components/ApplicationGroup/AppGroupAppFilter.tsx
 src/components/ApplicationGroup/AppGroupDetailsRoute.tsx
 src/components/ApplicationGroup/AppGroupRoute.tsx
 src/components/ApplicationGroup/Constants.ts

src/components/ApplicationGroup/AppGroup.types.ts

@@ -14,35 +14,39 @@
  * limitations under the License.
  */
 
+import { Dispatch, SetStateAction } from 'react'
+import { MultiValue } from 'react-select'
+
 import {
     ACTION_STATE,
+    AppInfoListType,
+    ApprovalConfigDataType,
     CDModalTabType,
+    CommonNodeAttr,
     DeploymentNodeType,
+    DeploymentStrategyTypeWithDefault,
     FilterConditionsListType,
+    GVKType,
     MODAL_TYPE,
+    PipelineIdsVsDeploymentStrategyMap,
     ResponseType,
+    RuntimePluginVariables,
+    UseUrlFiltersReturnType,
     WorkflowNodeType,
     WorkflowType,
-    AppInfoListType,
-    GVKType,
-    UseUrlFiltersReturnType,
-    CommonNodeAttr,
-    ApprovalConfigDataType,
-    RuntimePluginVariables,
-    PipelineIdsVsDeploymentStrategyMap,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { CDMaterialProps, RuntimeParamsErrorState } from '../app/details/triggerView/types'
-import { EditDescRequest, NodeType, Nodes, OptionType } from '../app/types'
-import { MultiValue } from 'react-select'
-import { AppFilterTabs, BulkResponseStatus } from './Constants'
-import { WorkloadCheckType } from '../v2/appDetails/sourceInfo/scaleWorkloads/scaleWorkloadsModal.type'
+
+import { TIME_STAMP_ORDER } from '@Components/app/details/triggerView/Constants'
+import { CDMaterialProps, RuntimeParamsErrorState, WebhookPayloadType } from '@Components/app/details/triggerView/types'
 import {
     AppConfigState,
     EnvConfigurationsNavProps,
     EnvConfigurationState,
 } from '@Pages/Applications/DevtronApps/Details/AppConfigurations/AppConfig.types'
-import { WebhookPayloadType } from '@Components/app/details/triggerView/types'
-import { TIME_STAMP_ORDER } from '@Components/app/details/triggerView/Constants'
+
+import { EditDescRequest, Nodes, NodeType, OptionType } from '../app/types'
+import { WorkloadCheckType } from '../v2/appDetails/sourceInfo/scaleWorkloads/scaleWorkloadsModal.type'
+import { AppFilterTabs, BulkResponseStatus } from './Constants'
 
 interface BulkTriggerAppDetailType {
     workFlowId: string
@@ -158,6 +162,8 @@ export interface BulkCDTriggerType extends BulkRuntimeParamsType {
     isVirtualEnv?: boolean
     uniqueReleaseTags: string[]
     feasiblePipelineIds: Set<number>
+    bulkDeploymentStrategy: DeploymentStrategyTypeWithDefault
+    setBulkDeploymentStrategy: Dispatch<SetStateAction<DeploymentStrategyTypeWithDefault>>
 }
 
 export interface ProcessWorkFlowStatusType {

src/components/ApplicationGroup/AppGroupAppFilter.tsx

@@ -15,17 +15,20 @@
  */
 
 import { useEffect, useRef, useState } from 'react'
-import ReactSelect, { SelectInstance } from 'react-select'
 import ReactGA from 'react-ga4'
-import { useAppGroupAppFilterContext } from './AppGroupDetailsRoute'
-import { appGroupAppSelectorStyle } from './AppGroup.utils'
-import { AppGroupAppFilterContextType, FilterParentType } from './AppGroup.types'
-import { AppFilterTabs } from './Constants'
-import { MenuList, Option, ValueContainer } from './AppGroupAppFilter.components'
+import ReactSelect, { SelectInstance } from 'react-select'
+
 import { OptionType, ReactSelectInputAction, useRegisterShortcut } from '@devtron-labs/devtron-fe-common-lib'
+
 import { setAppGroupFilterInLocalStorage } from '@Components/common'
 
-export default function AppGroupAppFilter() {
+import { AppGroupAppFilterContextType, FilterParentType } from './AppGroup.types'
+import { appGroupAppSelectorStyle } from './AppGroup.utils'
+import { MenuList, Option, ValueContainer } from './AppGroupAppFilter.components'
+import { useAppGroupAppFilterContext } from './AppGroupDetailsRoute'
+import { AppFilterTabs } from './Constants'
+
+const AppGroupAppFilter = () => {
     const {
         resourceId,
         appListOptions,
@@ -171,3 +174,5 @@ export default function AppGroupAppFilter() {
         />
     )
 }
+
+export default AppGroupAppFilter

src/components/ApplicationGroup/Details/TriggerView/BulkCDTrigger.tsx

@@ -123,6 +123,8 @@ const BulkCDTrigger = ({
     uniqueReleaseTags,
     runtimeParams,
     setRuntimeParams,
+    bulkDeploymentStrategy,
+    setBulkDeploymentStrategy,
     runtimeParamsErrorState,
     setRuntimeParamsErrorState,
 }: BulkCDTriggerType) => {
@@ -144,7 +146,6 @@ const BulkCDTrigger = ({
     const [showResistanceBox, setShowResistanceBox] = useState(false)
     const [currentSidebarTab, setCurrentSidebarTab] = useState<CDMaterialSidebarType>(CDMaterialSidebarType.IMAGE)
     const [skipHibernatedApps, setSkipHibernatedApps] = useState<boolean>(false)
-    const [bulkDeploymentStrategy, setBulkDeploymentStrategy] = useState<DeploymentStrategyTypeWithDefault>('DEFAULT')
     const [showStrategyFeasibilityPage, setShowStrategyFeasibilityPage] = useState<boolean>(false)
     const [pipelineIdVsStrategyMap, setPipelineIdVsStrategyMap] = useState<PipelineIdsVsDeploymentStrategyMap>({})
 

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

@@ -57,6 +57,7 @@ import {
     ComponentSizeType,
     API_STATUS_CODES,
     PipelineIdsVsDeploymentStrategyMap,
+    DeploymentStrategyTypeWithDefault,
 } from '@devtron-labs/devtron-fe-common-lib'
 import Tippy from '@tippyjs/react'
 import { BUILD_STATUS, DEFAULT_GIT_BRANCH_VALUE, NO_COMMIT_SELECTED, URLS, ViewType } from '../../../../config'
@@ -198,6 +199,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
     const [runtimeParamsErrorState, setRuntimeParamsErrorState] = useState<Record<string, RuntimeParamsErrorState>>({})
     const [isBulkTriggerLoading, setIsBulkTriggerLoading] = useState<boolean>(false)
     const [selectedWebhookNode, setSelectedWebhookNode] = useState<{ appId: number; id: number }>(null)
+    const [bulkDeploymentStrategy, setBulkDeploymentStrategy] = useState<DeploymentStrategyTypeWithDefault>('DEFAULT')
 
     const enableRoutePrompt = isBranchChangeLoading || isBulkTriggerLoading
     usePrompt({ shouldPrompt: enableRoutePrompt })
@@ -1498,9 +1500,11 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                     ciArtifact = artifact
                 }
             })
-            if (ciArtifact) {
-                const pipelineId = Number(node.id)
-                const strategy = pipelineIdVsStrategyMap[pipelineId]
+            const pipelineId = Number(node.id)
+            const strategy = pipelineIdVsStrategyMap[pipelineId]
+
+            // skip app if bulkDeploymentStrategy is not default and strategy is not configured for app
+            if (ciArtifact && (bulkDeploymentStrategy === 'DEFAULT' || !!strategy)) {   
                 _CDTriggerPromiseFunctionList.push(() =>
                     triggerCDNode({
                         pipelineId,
@@ -2102,7 +2106,9 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                 setRuntimeParams={setRuntimeParams}
                 runtimeParamsErrorState={runtimeParamsErrorState}
                 setRuntimeParamsErrorState={setRuntimeParamsErrorState}
-            />
+                bulkDeploymentStrategy={bulkDeploymentStrategy}
+                setBulkDeploymentStrategy={setBulkDeploymentStrategy}
+                />
         )
     }