fix(api): fix stop workflow purge (#3279)

Author: bnjjj

engine/api/workflow/dao_run.go

@@ -690,6 +690,10 @@ func PurgeWorkflowRun(db gorp.SqlExecutor, wf sdk.Workflow) error {
 		idsToUpdate = idsToUpdate[:100]
 	}
 
+	if len(idsToUpdate) == 0 {
+		return nil
+	}
+
 	queryUpdate := `UPDATE workflow_run SET to_delete = true WHERE workflow_run.id = ANY(string_to_array($1, ',')::bigint[])`
 	if _, err := db.Exec(queryUpdate, strings.Join(idsToUpdate, ",")); err != nil {
 		log.Warning("PurgeWorkflowRun> Unable to update workflow run for purge for workflow id %d and history length %d : %s", wf.ID, wf.HistoryLength, err)
@@ -769,6 +773,10 @@ func stopRunsBlocked(db *gorp.DbMap) error {
 		return sdk.WrapError(err, "stopRunsBlocked>")
 	}
 
+	if len(ids) == 0 {
+		return nil
+	}
+
 	tx, errTx := db.Begin()
 	if errTx != nil {
 		return sdk.WrapError(errTx, "stopRunsBlocked>")
@@ -780,26 +788,34 @@ func stopRunsBlocked(db *gorp.DbMap) error {
 		wfIds[i] = fmt.Sprintf("%d", ids[i].ID)
 	}
 	wfIdsJoined := strings.Join(wfIds, ",")
-	queryUpdateWf := `UPDATE workflow_run SET status = $1 WHERE id = ANY(string_to_array($2, ',')::bigint[])`
-	if _, err := tx.Exec(queryUpdateWf, sdk.StatusStopped.String(), wfIdsJoined); err != nil {
-		return sdk.WrapError(err, "stopRunsBlocked> Unable to stop workflow run history")
-	}
 	args := []interface{}{sdk.StatusStopped.String(), wfIdsJoined, sdk.StatusBuilding.String(), sdk.StatusChecking.String(), sdk.StatusWaiting.String()}
+	queryUpdateNodeJobRun := `DELETE FROM workflow_node_run_job
+	WHERE (workflow_node_run_job.workflow_node_run_id IN (
+			SELECT workflow_node_run.id
+			FROM workflow_node_run
+			WHERE (
+					workflow_node_run.workflow_run_id = ANY(string_to_array($2, ',')::bigint[])
+					AND (status = $3 OR status = $4 OR status = $5)
+				)
+				OR
+				(workflow_node_run.status = $6 OR workflow_node_run.status = $1 OR workflow_node_run.status = $7)
+		)
+	)`
+	argsNodeJobRun := append(args, sdk.StatusFail.String(), sdk.StatusSuccess.String())
+	if _, err := tx.Exec(queryUpdateNodeJobRun, argsNodeJobRun...); err != nil {
+		return sdk.WrapError(err, "stopRunsBlocked> Unable to stop workflow node job run history")
+	}
+
 	queryUpdateNodeRun := `UPDATE workflow_node_run SET status = $1, done = now()
 	WHERE workflow_run_id = ANY(string_to_array($2, ',')::bigint[])
 	AND (status = $3 OR status = $4 OR status = $5)`
 	if _, err := tx.Exec(queryUpdateNodeRun, args...); err != nil {
 		return sdk.WrapError(err, "stopRunsBlocked> Unable to stop workflow node run history")
 	}
-	queryUpdateNodeJobRun := `UPDATE workflow_node_run_job SET status = $1, done = now()
-	WHERE workflow_node_run_job.workflow_node_run_id IN (
-		SELECT workflow_node_run.id
-		FROM workflow_node_run
-		WHERE workflow_node_run.workflow_run_id = ANY(string_to_array($2, ',')::bigint[])
-		AND (status = $3 OR status = $4 OR status = $5)
-	)`
-	if _, err := tx.Exec(queryUpdateNodeJobRun, args...); err != nil {
-		return sdk.WrapError(err, "stopRunsBlocked> Unable to stop workflow node job run history")
+
+	queryUpdateWf := `UPDATE workflow_run SET status = $1 WHERE id = ANY(string_to_array($2, ',')::bigint[])`
+	if _, err := tx.Exec(queryUpdateWf, sdk.StatusStopped.String(), wfIdsJoined); err != nil {
+		return sdk.WrapError(err, "stopRunsBlocked> Unable to stop workflow run history")
 	}
 
 	resp := []struct {

ui/src/app/shared/action/step/form/step.form.component.ts

@@ -31,6 +31,7 @@ export class ActionStepFormComponent implements OnInit {
             this.step.optional = optional;
             this.step.always_executed = always_executed;
             this.step.enabled = true;
+            this.step.step_name = this.step.name;
             this.showAddStep = false;
             this.create.emit(new StepEvent('add', this.step));
         }

ui/src/app/shared/action/step/step.component.ts

@@ -16,9 +16,11 @@ export class ActionStepComponent {
     @Input('step')
     set step(step: Action) {
         this._step = step;
-        if (step && step.parameters) {
+        if (step) {
+          this._step.step_name = this._step.step_name || this._step.name;
+          if (step.parameters) {
             this.withAdvanced = step.parameters.some((parameter) => parameter.advanced);
-            this._step.step_name = this._step.step_name || this._step.name;
+          }
         }
     }
     get step(): Action {

ui/src/app/shared/action/step/step.html

@@ -27,7 +27,7 @@
                 </span>
                 <i class="stepname" *ngIf="!edit || editStepName">({{step.name}})</i>
             </span>
-            <span class="textOrange" *ngIf="action.deprecated">
+            <span class="textOrange" *ngIf="step.deprecated">
                 <i class="warning orange sign icon"></i>{{'common_deprecated' | translate}}
             </span>
         </div>

ui/src/app/views/workflow/run/node/pipeline/step/step.log.html

@@ -5,6 +5,9 @@
         </div>
         <div class="title" [title]="startExec ? ('step_title_duration' | translate:{start: startExec, end: doneExec}) : ''">
             <span *ngIf="!step.step_name">{{step.name}}</span><span *ngIf="step.step_name">{{step.step_name}}</span> {{duration}}
+            <i class="textOrange" *ngIf="step.deprecated">
+                <i class="warning orange sign icon"></i>{{'common_deprecated' | translate}}
+            </i>
         </div>
         <div class="right floated flags" *ngIf="step.optional">
             <i class="warning sign icon orange stepWarn" *ngIf="currentStatus === pipelineBuildStatusEnum.FAIL && step.optional"></i>{{ 'action_optional' | translate }}

ui/src/app/views/workflow/run/node/pipeline/step/step.log.scss

@@ -38,6 +38,11 @@ $squareSize: 32px;
   }
 }
 
+.textOrange {
+  color: $cds_color_orange;
+  font-size: 12px;
+}
+
 .logs {
   background-color: #222;
   color: white;