feat: skipped status for change branch

Author: AbhishekA1509

src/components/ApplicationGroup/Constants.ts

@@ -45,6 +45,7 @@ export enum BulkResponseStatus {
     'PASS' = 'pass',
     'FAIL' = 'fail',
     'UNAUTHORIZE' = 'unauthorized',
+    'SKIP' = 'skip',
 }
 
 export const BULK_VIRTUAL_RESPONSE_STATUS = {
@@ -180,6 +181,8 @@ export const CREATE_GROUP_TABS = {
 
 export const GetBranchChangeStatus = (statusText: string): BulkResponseStatus => {
     switch (statusText) {
+        case BulkResponseStatus.SKIP:
+            return BulkResponseStatus.SKIP
         case BULK_VIRTUAL_RESPONSE_STATUS.pass:
             return BulkResponseStatus.PASS
         case BULK_VIRTUAL_RESPONSE_STATUS.fail:
@@ -191,4 +194,6 @@ export const GetBranchChangeStatus = (statusText: string): BulkResponseStatus =>
     }
 }
 
-export const FILTER_NAME_REGEX = /^[a-z][a-z0-9-]{1,}[a-z0-9]$/
+export const FILTER_NAME_REGEX = /^[a-z][a-z0-9-]{1,}[a-z0-9]$/
+export const SKIPPED_RESOURCES_MESSAGE = 'Build action is not applicable'
+export const SKIPPED_RESOURCES_STATUS_TEXT = 'Skipped'

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

@@ -3,8 +3,9 @@ import React, { useEffect, useRef, useState } from 'react'
 import { ReactComponent as Close } from '../../../../assets/icons/ic-cross.svg'
 import { ReactComponent as Warn } from '../../../../assets/icons/ic-warning.svg'
 import SourceUpdateResponseModal from './SourceUpdateResponseModal'
+import { BulkSourceChangeProps } from './types'
 
-export default function BulkSourceChange({ closePopup, responseList, changeBranch, loading, selectedAppCount }) {
+export default function BulkSourceChange({ closePopup, responseList, changeBranch, loading, selectedAppCount, skippedResources=[] }: BulkSourceChangeProps) {
     const sourceChangeDetailRef = useRef<HTMLDivElement>(null)
 
     const [showResponseModal, setShowResponseModal] = useState(false)
@@ -46,7 +47,7 @@ export default function BulkSourceChange({ closePopup, responseList, changeBranc
     }, [outsideClickHandler])
 
     useEffect(() => {
-        setShowResponseModal(responseList.length > 0)
+        setShowResponseModal(responseList.length > 0 || skippedResources.length > 0)
     }, [responseList])
 
     const updateBranch = () => {
@@ -137,7 +138,7 @@ export default function BulkSourceChange({ closePopup, responseList, changeBranc
             <div className="dc__window-bg h-100 bcn-0 bulk-ci-trigger-container" ref={sourceChangeDetailRef}>
                 {renderHeaderSection()}
                 {showResponseModal ? (
-                    <SourceUpdateResponseModal closePopup={closePopup} isLoading={false} responseList={responseList} />
+                    <SourceUpdateResponseModal closePopup={closePopup} isLoading={false} responseList={responseList} skippedResources={skippedResources}/>
                 ) : (
                     <>
                         {renderInfoBar()}

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

@@ -57,6 +57,8 @@ import {
     BULK_CD_RESPONSE_STATUS_TEXT,
     BULK_VIRTUAL_RESPONSE_STATUS,
     GetBranchChangeStatus,
+    SKIPPED_RESOURCES_STATUS_TEXT,
+    SKIPPED_RESOURCES_MESSAGE,
 } from '../../Constants'
 import { ReactComponent as DeployIcon } from '../../../../assets/icons/ic-nav-rocket.svg'
 import { ReactComponent as Close } from '../../../../assets/icons/ic-cross.svg'
@@ -133,6 +135,8 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
     const [selectAllValue, setSelectAllValue] = useState<CHECKBOX_VALUE>(CHECKBOX_VALUE.CHECKED)
     const [isConfigPresent, setConfigPresent] = useState<boolean>(false)
     const [isDefaultConfigPresent, setDefaultConfig] = useState<boolean>(false)
+    // TODO: Add types
+    const [skippedResources, setSkippedResources] = useState([])
 
     // ref to make sure that on initial mount after we fetch workflows we handle modal based on url
     const handledLocation = useRef(false)
@@ -1003,6 +1007,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
 
     const changeBranch = (value): void => {
         const appIds = []
+        const _skippedResources = []
         const appNameMap = new Map()
 
         filteredWorkflows.forEach((wf) => {
@@ -1012,15 +1017,25 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                 )
                 if (_ciNode) {
                     // Need to add check for webhook if its source type is git
-                    if (!_ciNode.isLinkedCI && !_ciNode.isLinkedCD) {
+                    if (!_ciNode.isLinkedCI && !_ciNode.isLinkedCD && _ciNode.type !== WorkflowNodeType.WEBHOOK) {
                         appIds.push(wf.appId)
                         appNameMap.set(wf.appId, wf.name)
                     }
+                    else {
+                        _skippedResources.push({
+                            appId: wf.appId,
+                            appName: wf.name,
+                            statusText: SKIPPED_RESOURCES_STATUS_TEXT,
+                            status: GetBranchChangeStatus(BulkResponseStatus.SKIP),
+                            envId: +envId,
+                            message: SKIPPED_RESOURCES_MESSAGE,
+                        })
+                    }
                 }
             }
         })
 
-        if (!appIds.length) {
+        if (!appIds.length && !_skippedResources.length) {
             toast.error('No valid application present')
             return
         }
@@ -1040,6 +1055,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
                     })
                 })
                 updateResponseListData(_responseList)
+                setSkippedResources(_skippedResources)
                 setCDLoading(false)
                 setCILoading(false)
                 preventBodyScroll(false)
@@ -1168,6 +1184,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
         setCDLoading(false)
         setShowBulkCDModal(false)
         setResponseList([])
+        setSkippedResources([])
 
         history.push({
             search: '',
@@ -1187,6 +1204,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
         setCILoading(false)
         setShowBulkCIModal(false)
         setResponseList([])
+        setSkippedResources([])
     }
 
     const onShowBulkCIModal = () => {
@@ -1206,6 +1224,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
         setIsBranchChangeLoading(false)
         setShowBulkSourceChangeModal(false)
         setResponseList([])
+        setSkippedResources([])
     }
 
     const onShowChangeSourceModal = () => {
@@ -1403,6 +1422,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
             setCILoading(false)
             setShowBulkCIModal(false)
             setResponseList([])
+            setSkippedResources([])
         }
     }
 
@@ -1832,6 +1852,7 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
             <BulkSourceChange
                 closePopup={hideChangeSourceModal}
                 responseList={responseList}
+                skippedResources={skippedResources}
                 changeBranch={changeBranch}
                 loading={isBranchChangeLoading}
                 selectedAppCount={selectedAppList.length}

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

@@ -1,8 +1,9 @@
 import React from 'react'
 import { Progressing } from '@devtron-labs/devtron-fe-common-lib'
 import { TriggerModalRow } from './TriggerModalTableRow'
+import { SourceUpdateResponseModalProps } from './types'
 
-export default function SourceUpdateResponseModal({ closePopup, responseList, isLoading }) {
+export default function SourceUpdateResponseModal({ closePopup, responseList, isLoading, skippedResources=[] }: SourceUpdateResponseModalProps) {
     const renderResponseBodySection = (): JSX.Element => {
         if (isLoading) {
             return <Progressing pageLoader />
@@ -17,7 +18,7 @@ export default function SourceUpdateResponseModal({ closePopup, responseList, is
                     <div className="fs-12 fw-6 cn-7 ">Branch Change status</div>
                     <div className="fs-12 fw-6 cn-7 ">Message</div>
                 </div>
-                {responseList
+                {[...responseList, ...skippedResources]
                     .map((response, index) => (
                         <TriggerModalRow key={response.appId} rowData={response} index={index} />
                     ))}

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

@@ -4,6 +4,7 @@ import { ReactComponent as Error } from '../../../../assets/icons/ic-error-excla
 import { ReactComponent as Success } from '../../../../assets/icons/appstatus/healthy.svg'
 import { ReactComponent as Download } from '../../../../assets/icons/ic-arrow-line-down.svg'
 import { ReactComponent as UnAuthorized } from '../../../../assets/icons/ic-locked.svg'
+import { ReactComponent as ICInfoFilled } from '../../../../assets/icons/ic-info-filled.svg'
 import { Progressing } from '@devtron-labs/devtron-fe-common-lib'
 import { BulkResponseStatus } from '../../Constants'
 import { importComponentFromFELibrary } from '../../../common'
@@ -20,7 +21,9 @@ export function TriggerModalRow({ rowData, index, isVirtualEnv, envName, setDown
     }
 
     const renderStatusIcon = (rowData: ResponseRowType): JSX.Element => {
-        if (rowData.status === BulkResponseStatus.UNAUTHORIZE) {
+        if (rowData.status === BulkResponseStatus.SKIP) {
+            return <ICInfoFilled className="mr-8 icon-dim-18" />
+        } else if (rowData.status === BulkResponseStatus.UNAUTHORIZE) {
             return <UnAuthorized className="mr-8 icon-dim-18 fcy-7" />
         } else if (rowData.status === BulkResponseStatus.PASS) {
             return <Success className="mr-8 icon-dim-18" />

src/components/ApplicationGroup/Details/TriggerView/types.ts

@@ -0,0 +1,16 @@
+// Legacy component with no props so setting to any
+export interface BulkSourceChangeProps {
+    closePopup: any
+    responseList: any
+    changeBranch: any
+    loading: any
+    selectedAppCount: any
+    skippedResources?: any
+}
+
+export interface SourceUpdateResponseModalProps {
+    closePopup: any
+    responseList: any
+    isLoading: any
+    skippedResources?: any
+}