Merge branch 'main' into cluster-terminal-enhancement

Author: milindk8

nginx-default.conf

@@ -1,5 +1,5 @@
 server {
-  listen 80;
+  listen 8080;
   root /usr/share/nginx/html;
   index index.html index.htm;
 

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

@@ -63,14 +63,14 @@ import {
     AppGroupDetailDefaultType,
     BulkCDDetailType,
     BulkCIDetailType,
+    ProcessWorkFlowStatusType,
     ResponseRowType,
     WorkflowAppSelectionType,
     WorkflowNodeSelectionType,
 } from '../../AppGroup.types'
 import { handleSourceNotConfigured, processWorkflowStatuses } from '../../AppGroup.utils'
 import Tippy from '@tippyjs/react'
 
-let timerRef
 let inprogressStatusTimer
 export default function EnvTriggerView({ filteredApps }: AppGroupDetailDefaultType) {
     const { envId } = useParams<{ envId: string }>()
@@ -131,17 +131,23 @@ export default function EnvTriggerView({ filteredApps }: AppGroupDetailDefaultTy
             setErrorCode(0)
             setPageViewType(ViewType.FORM)
             getWorkflowStatusData(_workflows)
-            timerRef && clearInterval(timerRef)
-            timerRef = setInterval(() => {
-                getWorkflowStatusData(_workflows)
-            }, 30000)
         } catch (error) {
             showError(error)
             setErrorCode(error['code'])
             setPageViewType(ViewType.ERROR)
         }
     }
 
+    const pollWorkflowStatus = (_processedWorkflowsData: ProcessWorkFlowStatusType) => {
+        inprogressStatusTimer && clearTimeout(inprogressStatusTimer)
+        inprogressStatusTimer = setTimeout(
+            () => {
+                getWorkflowStatusData(_processedWorkflowsData.workflows)
+            },
+            _processedWorkflowsData.cicdInProgress ? 10000 : 30000,
+        )
+    }
+
     const getWorkflowStatusData = (workflowsList: WorkflowType[]) => {
         getWorkflowStatus(envId)
             .then((response) => {
@@ -150,16 +156,13 @@ export default function EnvTriggerView({ filteredApps }: AppGroupDetailDefaultTy
                     response?.result?.cdWorkflowStatus ?? [],
                     workflowsList,
                 )
-                inprogressStatusTimer && clearTimeout(inprogressStatusTimer)
-                if (_processedWorkflowsData.cicdInProgress) {
-                    inprogressStatusTimer = setTimeout(() => {
-                        getWorkflowStatusData(_processedWorkflowsData.workflows)
-                    }, 10000)
-                }
+                pollWorkflowStatus(_processedWorkflowsData)
                 setWorkflows(_processedWorkflowsData.workflows)
             })
             .catch((errors: ServerErrors) => {
                 showError(errors)
+                // If ci cd is in progress then call the api after every 10sec
+                pollWorkflowStatus({cicdInProgress: true, workflows: workflowsList})
             })
     }
 
@@ -170,7 +173,6 @@ export default function EnvTriggerView({ filteredApps }: AppGroupDetailDefaultTy
             getWorkflowsData()
         }
         return () => {
-            timerRef && clearInterval(timerRef)
             inprogressStatusTimer && clearTimeout(inprogressStatusTimer)
         }
     }, [envId])

src/components/ApplicationGroup/List/EnvironmentsList.tsx

@@ -194,7 +194,7 @@ export default function EnvironmentsList({ isSuperAdmin }: AppGroupAdminType) {
 
     return (
         <div>
-            <PageHeader headerName="Application Groups" />
+            <PageHeader headerName="Application Groups" markAsBeta={true}/>
             <div className="env-list bcn-0">
                 <div className="flex dc__content-space pl-20 pr-20 pt-16 pb-16">
                     {renderSearch()}

src/components/CIPipelineN/Build.tsx

@@ -29,11 +29,13 @@ export function Build({
         setFormData,
         formDataErrorObj,
         setLoadingData,
+        setFormDataErrorObj
     }: {
         formData: FormType
         setFormData: React.Dispatch<React.SetStateAction<FormType>>
         formDataErrorObj: FormErrorObjectType
         setLoadingData: React.Dispatch<React.SetStateAction<boolean>>
+        setFormDataErrorObj:React.Dispatch<React.SetStateAction<FormErrorObjectType>>        
     } = useContext(ciPipelineContext)
     const validationRules = new ValidationRules()
 
@@ -188,6 +190,9 @@ export function Build({
         const _form = { ...formData }
         _form.name = event.target.value
         setFormData(_form)
+        const _formDataErrorObj = { ...formDataErrorObj }
+        _formDataErrorObj.name = validationRules.name(_form.name)
+        setFormDataErrorObj(_formDataErrorObj)
     }
 
     const renderPipelineName = () => {

src/components/CIPipelineN/CIPipeline.tsx

@@ -37,6 +37,7 @@ import { Build } from './Build'
 import { ReactComponent as AlertTriangle } from '../../assets/icons/ic-alert-triangle.svg'
 import { getModuleInfo } from '../v2/devtronStackManager/DevtronStackManager.service'
 import { ModuleStatus } from '../v2/devtronStackManager/DevtronStackManager.type'
+import { MULTI_REQUIRED_FIELDS_MSG } from '../../config/constantMessaging'
 
 export const ciPipelineContext = createContext(null)
 
@@ -317,7 +318,6 @@ export default function CIPipeline({
             )
         }
     }
-
     const checkUniqueness = (): boolean => {
         const list = formData.preBuildStage.steps.concat(formData.postBuildStage.steps)
         const stageNameList = list.map((taskData) => {
@@ -355,7 +355,6 @@ export default function CIPipeline({
         // Below code is to check if all the task name from pre-stage and post-stage is unique
         return stageNameList.length === new Set(stageNameList).size
     }
-
     const savePipeline = () => {
         const isUnique = checkUniqueness()
         if (!isUnique) {
@@ -379,12 +378,17 @@ export default function CIPipeline({
             !formDataErrorObj.postBuildStage.isValid
         ) {
             setLoadingData(false)
-            toast.error('Some Required Fields are missing')
+            const branchNameNotPresent = formData.materials.some((_mat) => !_mat.value)
+            if (formData.name === '' || branchNameNotPresent) {
+                toast.error(MULTI_REQUIRED_FIELDS_MSG)
+            }
             return
         }
+              
         const msg = ciPipeline.id ? 'Pipeline Updated' : 'Pipeline Created'
 
         // Reset allow override flag to false if config matches with global
+        
         if (!ciPipeline.isDockerConfigOverridden && !isDockerConfigOverridden) {
             formData.isDockerConfigOverridden = false
             formData.dockerConfigOverride = {} as DockerConfigOverrideType

src/components/CIPipelineN/TaskDetailComponent.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useContext } from 'react'
-import { ConfigurationType, ViewType } from '../../config'
+import { ConfigurationType, ViewType, BuildStageVariable } from '../../config'
 import { Progressing, RadioGroup, showError } from '../common'
 import {
     ConditionContainerType,
@@ -106,12 +106,19 @@ export function TaskDetailComponent() {
         setFormDataErrorObj(_formErrorObject)
         setFormData(_formData)
     }
+
     const handleDescriptionChange = (e: any): void => {
         const _formData = { ...formData }
         _formData[activeStageName].steps[selectedTaskIndex].description = e.target.value
         setFormData(_formData)
     }
 
+    const handleTriggerIfParentStageFailChange = (): void => {
+        const _formData = { ...formData }
+        _formData[activeStageName].steps[selectedTaskIndex].triggerIfParentStageFail = !_formData[activeStageName].steps[selectedTaskIndex].triggerIfParentStageFail
+        setFormData(_formData)
+    }
+
     const handleEditorValueChange = (editorValue: string): void => {
         try {
             setEditorValue(editorValue)
@@ -190,6 +197,19 @@ export function TaskDetailComponent() {
                     />
                 </div>
 
+                {
+                    activeStageName === BuildStageVariable.PostBuild &&
+                    <div className="row-container mb-12">
+                        <div className="fw-6 fs-13 lh-32 cn-7 ">Trigger even if build fails</div>
+                        <input
+                            type="checkbox"
+                            className="cursor icon-dim-16"
+                            checked={formData[activeStageName].steps[selectedTaskIndex].triggerIfParentStageFail}
+                            onChange={handleTriggerIfParentStageFailChange}
+                        />
+                    </div>
+                }
+
                 {formData[activeStageName].steps[selectedTaskIndex].stepType === PluginType.INLINE && (
                     <div className="row-container mb-12">
                         <div className="fw-6 fs-13 lh-32 cn-7 ">Task type</div>