[DURACOM-206] fixed bug that processes without required params was sa…

…ving after cancel button click
4Science · Dec 13, 2023 · ae02099 · ae02099
1 parent 8ba14aa
commit ae02099
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
@@ -8,7 +8,7 @@ <h1 class="col-12">
                 <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
                 <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
                 <a [routerLink]="['/processes']" class="btn btn-danger float-left">{{ 'process.new.cancel' | translate }}</a>
-                <button type="submit" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
+                <button type="submit" (click)="cancelAction()" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
             </form>
         </div>
         <div class="col-12 col-md-6">

diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
@@ -53,6 +53,11 @@ export class ProcessFormComponent implements OnInit {
    */
   public missingParameters = [];
 
+  /**
+   * Boolean value to use to cancel the process
+   */
+  private isFormCanceled = false;
+
   constructor(
     private scriptService: ScriptDataService,
     private notificationsService: NotificationsService,
@@ -73,7 +78,7 @@ export class ProcessFormComponent implements OnInit {
     if (isEmpty(this.parameters)) {
       this.parameters = [];
     }
-    if (!this.validateForm(form) || this.isRequiredMissing()) {
+    if (!this.validateForm(form) || this.isRequiredMissing() || this.isFormCanceled) {
       return;
     }
 
@@ -149,6 +154,10 @@ export class ProcessFormComponent implements OnInit {
     will fix this when the removeByHrefSubstring changes are merged */
     this.router.navigateByUrl(getProcessListRoute());
   }
+
+  public cancelAction() {
+    this.isFormCanceled = true;
+  }
 }
 
 export function controlContainerFactory(controlContainer?: ControlContainer) {