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 94b6e424b3 NIFI-13290: (#8871)
94b6e424b3 is described below
commit 94b6e424b3b46f0151c93795b245bef1df3ddc6a
Author: Matt Gilman <[email protected]>
AuthorDate: Tue May 28 12:39:08 2024 -0400
NIFI-13290: (#8871)
- Manually closing dialogs with proper result in Navigation lifecycle to
ensure back/forward browser button works correctly. This change also handles
any scenario when a user routes away from a dialog via a link or go to action
so we were able to remove the dialog close action form those places.
---
.../nifi-web-frontend/src/main/nifi/src/app/app.component.ts | 9 +++++++--
.../nifi-web-frontend/src/main/nifi/src/app/index.ts | 12 ++++++++----
.../state/controller-services/controller-services.effects.ts | 8 --------
.../src/app/pages/flow-designer/state/flow/flow.effects.ts | 4 ----
.../state/manage-remote-ports/manage-remote-ports.effects.ts | 2 +-
.../edit-parameter-context.component.html | 4 +---
.../parameter-table/parameter-table.component.html | 5 +----
.../process-group-references.component.html | 4 +---
.../state/flow-analysis-rules/flow-analysis-rules.effects.ts | 3 ---
.../management-controller-services.effects.ts | 8 --------
.../state/parameter-providers/parameter-providers.effects.ts | 4 ----
.../state/registry-clients/registry-clients.effects.ts | 3 ---
.../state/reporting-tasks/reporting-tasks.effects.ts | 3 ---
.../user-access-policies/user-access-policies.component.html | 5 +----
.../src/main/nifi/src/app/state/error/error.effects.ts | 6 +-----
.../parameter-references/parameter-references.component.html | 10 ++++------
16 files changed, 25 insertions(+), 65 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts
index afc26c0e1a..671f251744 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts
@@ -16,10 +16,11 @@
*/
import { Component } from '@angular/core';
-import { GuardsCheckEnd, GuardsCheckStart, NavigationCancel, Router } from
'@angular/router';
+import { GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationStart,
Router } from '@angular/router';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Storage } from './service/storage.service';
import { ThemingService } from './service/theming.service';
+import { MatDialog } from '@angular/material/dialog';
@Component({
selector: 'nifi',
@@ -33,9 +34,13 @@ export class AppComponent {
constructor(
private router: Router,
private storage: Storage,
- private themingService: ThemingService
+ private themingService: ThemingService,
+ private dialog: MatDialog
) {
this.router.events.pipe(takeUntilDestroyed()).subscribe((event) => {
+ if (event instanceof NavigationStart) {
+ this.dialog.openDialogs.forEach((dialog) =>
dialog.close('ROUTED'));
+ }
if (event instanceof GuardsCheckStart) {
this.guardLoading = true;
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts
index 4353b46d52..fd90399fb7 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts
@@ -20,20 +20,24 @@ import { MatDialogConfig } from '@angular/material/dialog';
export const SMALL_DIALOG: MatDialogConfig = {
maxWidth: '24rem',
minWidth: 320,
- disableClose: true
+ disableClose: true,
+ closeOnNavigation: false
};
export const MEDIUM_DIALOG: MatDialogConfig = {
maxWidth: 470,
minWidth: 470,
- disableClose: true
+ disableClose: true,
+ closeOnNavigation: false
};
export const LARGE_DIALOG: MatDialogConfig = {
maxWidth: 760,
minWidth: 760,
- disableClose: true
+ disableClose: true,
+ closeOnNavigation: false
};
export const XL_DIALOG: MatDialogConfig = {
maxWidth: 1024,
minWidth: 1024,
- disableClose: true
+ disableClose: true,
+ closeOnNavigation: false
};
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
index bea2a726c7..aa0c00ca62 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
@@ -321,11 +321,9 @@ export class ControllerServicesEffects {
});
saveChangesDialogReference.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -443,7 +441,6 @@ export class ControllerServicesEffects {
})
);
} else {
-
this.dialog.getDialogById(request.id)?.close('ROUTED');
return
of(this.errorHelper.fullScreenError(errorResponse));
}
})
@@ -468,7 +465,6 @@ export class ControllerServicesEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
@@ -495,8 +491,6 @@ export class ControllerServicesEffects {
enableDialogReference.componentInstance.goToReferencingComponent = (
component: ControllerServiceReferencingComponent
) => {
- enableDialogReference.close('ROUTED');
-
const route: string[] =
this.getRouteForReference(component);
this.router.navigate(route);
};
@@ -535,8 +529,6 @@ export class ControllerServicesEffects {
enableDialogReference.componentInstance.goToReferencingComponent = (
component: ControllerServiceReferencingComponent
) => {
- enableDialogReference.close('ROUTED');
-
const route: string[] =
this.getRouteForReference(component);
this.router.navigate(route);
};
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
index 2f59fb9540..750807930e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
@@ -1342,11 +1342,9 @@ export class FlowEffects {
});
saveChangesDialogReference.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -1666,7 +1664,6 @@ export class FlowEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
@@ -1727,7 +1724,6 @@ export class FlowEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
- this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
index 656fd0dbf3..bab376bee2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
@@ -221,6 +221,7 @@ export class ManageRemotePortsEffects {
editDialogReference.afterClosed().subscribe((response) => {
this.store.dispatch(ErrorActions.clearBannerErrors());
+
if (response != 'ROUTED') {
this.store.dispatch(
ManageRemotePortsActions.selectRemotePort({
@@ -259,7 +260,6 @@ export class ManageRemotePortsEffects {
})
);
} else {
-
this.dialog.getDialogById(request.id)?.close('ROUTED');
return
of(this.errorHelper.fullScreenError(errorResponse));
}
})
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
index d66bf7b5fa..7be391492e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html
@@ -98,9 +98,7 @@
@if (parameterProvider) {
<div class="flex flex-col mb-5">
<div>Parameter Provider</div>
- <a
-
[routerLink]="getParameterProviderLink(parameterProvider)"
- mat-dialog-close="ROUTED">
+ <a
[routerLink]="getParameterProviderLink(parameterProvider)">
{{
parameterProvider.parameterGroupName }}
from
{{
parameterProvider.parameterProviderName }}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html
index 7b3536c41d..cae89b809d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html
@@ -116,10 +116,7 @@
}
<mat-menu #actionMenu="matMenu"
xPosition="before">
@if (canGoToParameter(item)) {
- <button
- mat-menu-item
-
[routerLink]="getParameterLink(item)"
- mat-dialog-close="ROUTED">
+ <button mat-menu-item
[routerLink]="getParameterLink(item)">
<i class="fa fa-long-arrow-right
primary-color mr-2"></i>
Go to
</button>
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.html
index e62e3e0fb4..a1cf66920e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.html
@@ -53,9 +53,7 @@
@if (references.length > 0) {
@for (reference of references; track reference) {
<li>
- <a [routerLink]="getRouteForReference(reference)"
mat-dialog-close="ROUTED">{{
- reference.component.name
- }}</a>
+ <a [routerLink]="getRouteForReference(reference)">{{
reference.component.name }}</a>
</li>
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
index 0f4fc9c793..65211d1ad0 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
@@ -305,11 +305,9 @@ export class FlowAnalysisRulesEffects {
});
saveChangesDialogReference.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -395,7 +393,6 @@ export class FlowAnalysisRulesEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
diff --git
a/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-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 51d60852e4..a41bd4f7ba 100644
---
a/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-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
@@ -278,11 +278,9 @@ export class ManagementControllerServicesEffects {
});
saveChangesDialogReference.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -372,7 +370,6 @@ export class ManagementControllerServicesEffects {
})
);
} else {
-
this.dialog.getDialogById(request.id)?.close('ROUTED');
return
of(this.errorHelper.fullScreenError(errorResponse));
}
})
@@ -405,7 +402,6 @@ export class ManagementControllerServicesEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
@@ -431,8 +427,6 @@ export class ManagementControllerServicesEffects {
enableDialogReference.componentInstance.goToReferencingComponent = (
component: ControllerServiceReferencingComponent
) => {
- enableDialogReference.close('ROUTED');
-
const route: string[] =
this.getRouteForReference(component);
this.router.navigate(route);
};
@@ -464,8 +458,6 @@ 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-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
index bf8e45d244..c87b5bae21 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
@@ -349,11 +349,9 @@ export class ParameterProvidersEffects {
});
promptSaveDialogRef.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -435,7 +433,6 @@ export class ParameterProvidersEffects {
})
);
} else {
-
this.dialog.getDialogById(request.id)?.close('ROUTED');
return
of(this.errorHelper.fullScreenError(errorResponse));
}
})
@@ -452,7 +449,6 @@ export class ParameterProvidersEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
index b5228490fe..caa9f448b3 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
@@ -209,11 +209,9 @@ export class RegistryClientsEffects {
});
saveChangesDialogReference.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -288,7 +286,6 @@ export class RegistryClientsEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
index 6f78c90ea2..2568798665 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
@@ -317,11 +317,9 @@ export class ReportingTasksEffects {
});
saveChangesDialogReference.componentInstance.no.pipe(take(1)).subscribe(() => {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
});
} else {
- editDialogReference.close('ROUTED');
this.router.navigate(commands);
}
};
@@ -407,7 +405,6 @@ export class ReportingTasksEffects {
tap((response) => {
if (response.postUpdateNavigation) {
this.router.navigate(response.postUpdateNavigation);
-
this.dialog.getDialogById(response.id)?.close('ROUTED');
} else {
this.dialog.closeAll();
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.html
index 155eeb4648..72cd8274f3 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.html
@@ -71,10 +71,7 @@
}
<mat-menu #actionMenu="matMenu"
xPosition="before">
@if (canGoToPolicyTarget(item)) {
- <button
- mat-menu-item
-
[routerLink]="getPolicyTargetLink(item)"
- mat-dialog-close="ROUTED">
+ <button mat-menu-item
[routerLink]="getPolicyTargetLink(item)">
<i class="fa
fa-long-arrow-right primary-color mr-2"></i>
Go to
</button>
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
index 96ed053135..db38a37635 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.effects.ts
@@ -21,15 +21,13 @@ import * as ErrorActions from './error.actions';
import { map, tap } from 'rxjs';
import { Router } from '@angular/router';
import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatDialog } from '@angular/material/dialog';
@Injectable()
export class ErrorEffects {
constructor(
private actions$: Actions,
private router: Router,
- private snackBar: MatSnackBar,
- private dialog: MatDialog
+ private snackBar: MatSnackBar
) {}
fullScreenError$ = createEffect(
@@ -38,8 +36,6 @@ export class ErrorEffects {
ofType(ErrorActions.fullScreenError),
map((action) => action.skipReplaceUrl),
tap((skipReplaceUrl) => {
- this.dialog.openDialogs.forEach((dialog) =>
dialog.close('ROUTED'));
-
if (skipReplaceUrl) {
this.router.navigate(['/error']);
} else {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
index 14cbff1003..f9b1e69619 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
@@ -66,7 +66,7 @@
} @else {
<div
[ngClass]="getNonServiceStateIcon(reference.component)"></div>
}
- <a
[routerLink]="getRouteForReference(reference.component)"
mat-dialog-close="ROUTED">{{
+ <a
[routerLink]="getRouteForReference(reference.component)">{{
reference.component.name
}}</a>
@if (hasBulletins(reference)) {
@@ -102,11 +102,9 @@
} @else {
<div
[ngClass]="getServiceStateIcon(service.component)"></div>
}
- <a
-
[routerLink]="getRouteForReference(service.component)"
- mat-dialog-close="ROUTED"
- >{{ service.component.name }}</a
- >
+ <a
[routerLink]="getRouteForReference(service.component)">
+ {{ service.component.name }}
+ </a>
@if (hasBulletins(service)) {
<div
class="pointer fa fa-sticky-note-o
primary-color"
