Merge branch 'main' into fix/trigger-timeout-string

Author: AbhishekA1509

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

@@ -310,7 +310,7 @@ export default function ResourceList() {
             !isTerminal &&
             !isNodes
         ) {
-            getResourceListData()
+            selectedResource.gvk.Kind !== SIDEBAR_KEYS.nodeGVK.Kind && getResourceListData()
             setSearchText('')
             setSearchApplied(false)
         } else if (isNodes) {
@@ -634,7 +634,6 @@ export default function ResourceList() {
             setResourceListLoader(true)
             setResourceList(null)
             setFilteredResourceList([])
-
             const resourceListPayload: ResourceListPayloadType = {
                 clusterId: Number(clusterId),
                 k8sRequest: {

src/components/app/details/cicdHistory/TriggerDetails.tsx

@@ -176,33 +176,58 @@ const WorkerStatus = React.memo(
 const ProgressingStatus = React.memo(
     ({ status, message, podStatus, stage, type, finishedOn, workerPodName }: ProgressingStatusType): JSX.Element => {
         const [aborting, setAborting] = useState(false)
-        const [abortConfirmation, setAbortConfiguration] = useState(false)
+        const [abortConfirmation, setAbortConfirmation] = useState(false)
+        const [abortError, setAbortError] = useState<{
+            status: boolean
+            message: string
+        }>({
+            status: false,
+            message: '',
+        })
         const { buildId, triggerId, pipelineId } = useParams<{
             buildId: string
             triggerId: string
             pipelineId: string
         }>()
         let abort = null
         if (type === HistoryComponentType.CI) {
-            abort = () => cancelCiTrigger({ pipelineId, workflowId: buildId })
+            abort = (isForceAbort: boolean) => cancelCiTrigger({ pipelineId, workflowId: buildId }, isForceAbort)
         } else if (stage !== 'DEPLOY') {
             abort = () => cancelPrePostCdTrigger(pipelineId, triggerId)
         }
 
         async function abortRunning() {
             setAborting(true)
-            const [error] = await asyncWrap(abort())
-            setAborting(false)
-            if (error) {
-                showError(error)
-            } else {
+            try {
+                await abort(abortError.status)
                 toast.success('Build Aborted')
-                setAbortConfiguration(false)
+                setAbortConfirmation(false)
+                setAbortError({
+                    status: false,
+                    message: '',
+                })
+            } catch (error) {
+                setAborting(false)
+                setAbortConfirmation(false)
+                if (error['code'] === 400) {
+                    // code 400 is for aborting a running build
+                    const errors = error['errors']
+                    setAbortError({
+                        status: true,
+                        message: errors[0].userMessage,
+                    })
+                }
             }
         }
 
         const toggleAbortConfiguration = (): void => {
-            setAbortConfiguration(not)
+            setAbortConfirmation(not)
+        }
+        const closeForceAbortModal = (): void => {
+            setAbortError({
+                status: false,
+                message: '',
+            })
         }
         return (
             <>
@@ -252,6 +277,29 @@ const ProgressingStatus = React.memo(
                         </ConfirmationDialog.ButtonGroup>
                     </ConfirmationDialog>
                 )}
+                {abortError.status && (
+                    <ConfirmationDialog>
+                        <ConfirmationDialog.Icon src={warn} />
+                        <ConfirmationDialog.Body title="Could not abort build!" />
+                        <div className="w-100 bc-n50 h-36 flexbox dc__align-items-center">
+                            <span className="pl-12">Error: {abortError.message}</span>
+                        </div>
+                        <div className="fs-13 fw-6 pt-12 cn-7 lh-1-54">
+                            <span>Please try to force abort</span>
+                        </div>
+                        <div className="pt-4 fw-4 cn-7 lh-1-54">
+                            <span>Some resource might get orphaned which will be cleaned up with Job-lifecycle</span>
+                        </div>
+                        <ConfirmationDialog.ButtonGroup>
+                            <button type="button" className="cta cancel" onClick={closeForceAbortModal}>
+                                Cancel
+                            </button>
+                            <button type="button" className="cta delete" onClick={abortRunning}>
+                                {aborting ? <Progressing /> : 'Force Abort'}
+                            </button>
+                        </ConfirmationDialog.ButtonGroup>
+                    </ConfirmationDialog>
+                )}
             </>
         )
     },

src/components/app/service.ts

@@ -282,8 +282,8 @@ export function extractImage(image: string): string {
     return image ? image.split(':').pop() : ''
 }
 
-export const cancelCiTrigger = (params) => {
-    let URL = `${Routes.CI_CONFIG_GET}/${params.pipelineId}/workflow/${params.workflowId}`
+export const cancelCiTrigger = (params, isForceAbort) => {
+    let URL = `${Routes.CI_CONFIG_GET}/${params.pipelineId}/workflow/${params.workflowId}?forceAbort=${isForceAbort}`
     return trash(URL)
 }
 

src/components/cdPipeline/NewCDPipeline.tsx

@@ -816,6 +816,13 @@ export default function NewCDPipeline({
                         getWorkflows()
                     }
                 }
+                else if(response.errors){
+                    setDeleteDialog(DeleteDialogType.showForceDeleteDialog)
+                    setForceDeleteData({
+                        forceDeleteDialogTitle: 'Something went wrong',
+                        forceDeleteDialogMessage: response.errors[0].userMessage,
+                    })
+                }
             })
             .catch((error: ServerErrors) => {
                 // 412 is for linked pipeline and 403 is for RBAC

src/components/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Manifest.component.tsx

@@ -224,10 +224,10 @@ function ManifestComponent({
                                 className: 'devtron-toast unauthorized',
                             },
                         )
-                    } else if (err.code === 500) {
+                    } else if (err.code === 400 || err.code === 409 || err.code === 422 ) {
                         const error = err['errors'] && err['errors'][0]
                         if (error && error.code && error.userMessage) {
-                            setErrorText(`ERROR ${error.code} > Message: “${error.userMessage}”`)
+                            setErrorText(`ERROR ${err.code} > Message: “${error.userMessage}”`)
                         } else {
                             showError(err)
                         }

src/components/workflowEditor/workflowEditor.tsx

@@ -216,6 +216,14 @@ class WorkflowEdit extends Component<WorkflowEditProps, WorkflowEditState> {
     deleteWorkflow = (appId?: string, workflowId?: number) => {
         deleteWorkflow(appId || this.props.match.params.appId, workflowId || this.state.workflowId)
             .then((response) => {
+
+                if(response.errors){
+                    const {errors} = response
+                    const {userMessage} = errors[0]
+                    toast.error(userMessage)
+                    return
+                }
+
                 if (response.status.toLowerCase() === 'ok') {
                     this.setState({ showDeleteDialog: false })
                     toast.success('Workflow Deleted')