(nifi) branch main updated: [NIFI-13243] - support cancel response in CloseOnEscapeDialog (#8838)

[scottyaslan]

This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new c794943c5b [NIFI-13243] - support cancel response in 
CloseOnEscapeDialog (#8838)
c794943c5b is described below

commit c794943c5bfff5213ce72635a91c9b7f32afa378
Author: Rob Fellows <rob.fell...@gmail.com>
AuthorDate: Wed May 15 14:37:41 2024 -0400

    [NIFI-13243] - support cancel response in CloseOnEscapeDialog (#8838)
    
    This closes #8838
---
 .../connection/edit-connection/edit-connection.component.ts    |  4 ++++
 .../close-on-escape-dialog/close-on-escape-dialog.component.ts | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
index d29c96e9f8..158fce1c81 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/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/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/close-on-escape-dialog/close-on-escape-dialog.component.ts
 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/close-on-escape-dialog/close-on-escape-dialog.component.ts
index 4715f9a096..db50bf9570 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/close-on-escape-dialog/close-on-escape-dialog.component.ts
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/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;
     }