From 79953580463baf2975009ca9bfd2dbb886ffa4b2 Mon Sep 17 00:00:00 2001
From: Scott Aslan <scottyaslan@users.noreply.github.com>
Date: Wed, 24 Apr 2024 13:48:37 -0400
Subject: [PATCH] [NIFI-12990] close enable/disable CS dialog when go to is
 clicked (#8690)

* [NIFI-12990] close enable/disable CS dialog when go to is clicked

* review feedback addressed

This closes #8690
---
 .../management-controller-services.effects.ts             | 4 ++++
 .../controller-service-references.component.html          | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts
index c2c91aea1b..75db657758 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts
@@ -404,6 +404,8 @@ export class ManagementControllerServicesEffects {
                     enableDialogReference.componentInstance.goToReferencingComponent = (
                         component: ControllerServiceReferencingComponent
                     ) => {
+                        enableDialogReference.close('ROUTED');
+
                         const route: string[] = this.getRouteForReference(component);
                         this.router.navigate(route);
                     };
@@ -435,6 +437,8 @@ export class ManagementControllerServicesEffects {
                     enableDialogReference.componentInstance.goToReferencingComponent = (
                         component: ControllerServiceReferencingComponent
                     ) => {
+                        enableDialogReference.close('ROUTED');
+
                         const route: string[] = this.getRouteForReference(component);
                         this.router.navigate(route);
                     };
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
index d928415010..fac6d18961 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
@@ -135,11 +135,9 @@
                                     } @else {
                                         <div [ngClass]="getServiceStateIcon(service.component)"></div>
                                     }
-                                    <a
-                                        (click)="goToReferencingComponentClicked($event, service.component)"
-                                        mat-dialog-close="ROUTED"
-                                        >{{ service.component.name }}</a
-                                    >
+                                    <a (click)="goToReferencingComponentClicked($event, service.component)">{{
+                                        service.component.name
+                                    }}</a>
                                     @if (hasBulletins(service)) {
                                         <div
                                             class="pointer fa fa-sticky-note-o primary-color"