[NIFI-13243] - support cancel response in CloseOnEscapeDialog (apache…

…#8838) This closes apache#8838
shubhluck · May 15, 2024 · c794943 · c794943
1 parent eaf3f23
commit c794943
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...ges/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts b/...ges/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
@@ -431,4 +431,8 @@ export class EditConnectionComponent extends CloseOnEscapeDialog {
     override isDirty(): boolean {
         return this.editConnectionForm.dirty;
     }
+
+    override getCancelDialogResult(): any {
+        return 'CANCELLED';
+    }
 }
diff --git a/...rc/main/nifi/src/app/ui/common/close-on-escape-dialog/close-on-escape-dialog.component.ts b/...rc/main/nifi/src/app/ui/common/close-on-escape-dialog/close-on-escape-dialog.component.ts
@@ -39,11 +39,19 @@ export abstract class CloseOnEscapeDialog {
                     takeUntilDestroyed()
                 )
                 .subscribe(() => {
-                    this.dialogRef.close();
+                    if (this.getCancelDialogResult()) {
+                        this.dialogRef.close(this.getCancelDialogResult());
+                    } else {
+                        this.dialogRef.close();
+                    }
                 });
         }
     }
 
+    getCancelDialogResult(): any | null | undefined {
+        return null;
+    }
+
     isDirty(): boolean {
         return false;
     }