This is an automated email from the ASF dual-hosted git repository. rfellows 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 9ddf8ffdd0 [NIFI-13130] disabled autofocus for dialog with no form fields to prevent dialog from being focused on page refresh (#8742) 9ddf8ffdd0 is described below commit 9ddf8ffdd0644d745447eccb11455d9f0a16194d Author: Scott Aslan <scottyas...@users.noreply.github.com> AuthorDate: Fri May 3 16:27:30 2024 -0400 [NIFI-13130] disabled autofocus for dialog with no form fields to prevent dialog from being focused on page refresh (#8742) This closes #8742 --- .../state/controller-services/controller-services.effects.ts | 3 ++- .../src/app/pages/flow-designer/state/flow/flow.effects.ts | 12 ++++++++---- .../flow/change-version-dialog/change-version-dialog.html | 2 +- .../state/flow-analysis-rules/flow-analysis-rules.effects.ts | 3 ++- .../management-controller-services.effects.ts | 3 ++- .../state/parameter-providers/parameter-providers.effects.ts | 3 ++- .../state/reporting-tasks/reporting-tasks.effects.ts | 3 ++- .../fetch-parameter-provider-parameters.component.html | 2 +- .../component-cluster-status.effects.ts | 3 ++- .../cluster-summary-dialog.component.html | 4 ++-- .../pages/users/state/user-listing/user-listing.effects.ts | 3 ++- .../user-access-policies/user-access-policies.component.html | 2 +- .../src/main/nifi/src/app/state/about/about.effects.ts | 3 ++- .../src/app/state/component-state/component-state.effects.ts | 3 ++- .../app/ui/common/about-dialog/about-dialog.component.html | 2 +- .../ui/common/component-state/component-state.component.html | 2 +- 16 files changed, 33 insertions(+), 20 deletions(-) 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 9d64fbe2a1..abc711fc48 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 @@ -622,7 +622,8 @@ export class ControllerServicesEffects { tap((request) => { const dialogRequest = this.dialog.open(ChangeComponentVersionDialog, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRequest.componentInstance.changeVersion.pipe(take(1)).subscribe((newVersion) => { 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 c50e5c93a2..2d71be11a5 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 @@ -3398,7 +3398,8 @@ export class FlowEffects { tap((request) => { const dialogRef = this.dialog.open(ChangeVersionDialog, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRef.componentInstance.changeVersion.pipe(take(1)).subscribe((selectedVersion) => { @@ -3427,7 +3428,8 @@ export class FlowEffects { const dialogRef = this.dialog.open(ChangeVersionProgressDialog, { ...SMALL_DIALOG, minWidth: 365, - disableClose: true + disableClose: true, + autoFocus: false }); dialogRef.componentInstance.flowUpdateRequest$ = this.store.select(selectChangeVersionRequest); dialogRef.componentInstance.changeVersionComplete.pipe(take(1)).subscribe((entity) => { @@ -3602,7 +3604,8 @@ export class FlowEffects { const dialogRef = this.dialog.open(ChangeVersionProgressDialog, { ...SMALL_DIALOG, minWidth: 365, - disableClose: true + disableClose: true, + autoFocus: false }); dialogRef.componentInstance.flowUpdateRequest$ = this.store.select(selectChangeVersionRequest); dialogRef.componentInstance.changeVersionComplete.pipe(take(1)).subscribe((entity) => { @@ -3771,7 +3774,8 @@ export class FlowEffects { tap((request) => { const dialogRequest = this.dialog.open(ChangeComponentVersionDialog, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRequest.componentInstance.changeVersion.pipe(take(1)).subscribe((newVersion) => { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.html index 60a49f1eac..0521d20183 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.html @@ -16,7 +16,7 @@ --> <h2 mat-dialog-title>Change Version</h2> -<div class="change-version" tabindex="0"> +<div class="change-version"> <mat-dialog-content> <div class="flex flex-col gap-y-4 w-full"> <div class="flex flex-row w-full"> 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 ff95464c17..84c8fc9a00 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 @@ -501,7 +501,8 @@ export class FlowAnalysisRulesEffects { tap((request) => { const dialogRequest = this.dialog.open(ChangeComponentVersionDialog, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRequest.componentInstance.changeVersion.pipe(take(1)).subscribe((newVersion) => { 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 806e84e2f9..03d385f8d9 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 @@ -546,7 +546,8 @@ export class ManagementControllerServicesEffects { tap((request) => { const dialogRequest = this.dialog.open(ChangeComponentVersionDialog, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRequest.componentInstance.changeVersion.pipe(take(1)).subscribe((newVersion) => { 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 54dea01f10..34fd96b2f3 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 @@ -484,7 +484,8 @@ export class ParameterProvidersEffects { tap((request) => { const dialogRef = this.dialog.open(FetchParameterProviderParameters, { ...XL_DIALOG, - data: request + data: request, + autoFocus: false }); const referencingParameterContexts = 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 1e5599776f..e770f6aa6d 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 @@ -479,7 +479,8 @@ export class ReportingTasksEffects { tap((request) => { const dialogRequest = this.dialog.open(ChangeComponentVersionDialog, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRequest.componentInstance.changeVersion.pipe(take(1)).subscribe((newVersion) => { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html index 064d0daae5..989a9c67ff 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.html @@ -15,7 +15,7 @@ ~ limitations under the License. --> -<div tabindex="0"> +<div> <h2 mat-dialog-title>Fetch Parameters</h2> <form class="parameter-provider-fetch-form" [formGroup]="fetchParametersForm"> <error-banner></error-banner> diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts index 56f69441d9..e9cc40fb03 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts @@ -107,7 +107,8 @@ export class ComponentClusterStatusEffects { tap(([response, request]) => { const dialogRef = this.dialog.open(ClusterSummaryDialog, { ...XL_DIALOG, - data: request + data: request, + autoFocus: false }); dialogRef.componentInstance.componentType = response.componentType; dialogRef.afterClosed().subscribe(() => { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html index 83d0af754b..38b6593e5e 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html @@ -15,7 +15,7 @@ ~ limitations under the License. --> -<div class="cluster-summary flex flex-col" tabindex="0"> +<div class="cluster-summary flex flex-col"> <h2 mat-dialog-title>Cluster {{ componentType }} Summary</h2> <mat-dialog-content class="cluster-summary-content flex flex-1 h-full grow"> @@ -79,7 +79,7 @@ <div class="accent-color font-medium">{{ loadedTimestamp$ | async }}</div> </div> - <button mat-button mat-dialog-close tabindex="0">Close</button> + <button mat-button mat-dialog-close>Close</button> </div> </mat-dialog-actions> </div> diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts index 5cfc638a40..7e618c4782 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts @@ -673,7 +673,8 @@ export class UserListingEffects { this.dialog .open(UserAccessPolicies, { ...LARGE_DIALOG, - data: request + data: request, + autoFocus: false }) .afterClosed() .subscribe((response) => { 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 fc832b65d4..b9495f7a23 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> -<div class="user-access-policies" tabindex="0"> +<div class="user-access-policies"> <h3 mat-dialog-title>User Policies</h3> <mat-dialog-content> <div class="flex flex-col justify-between gap-y-3"> diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/about/about.effects.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/about/about.effects.ts index a762820493..9ede28be41 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/about/about.effects.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/about/about.effects.ts @@ -62,7 +62,8 @@ export class AboutEffects { ofType(AboutActions.openAboutDialog), tap(() => { this.dialog.open(AboutDialog, { - ...MEDIUM_DIALOG + ...MEDIUM_DIALOG, + autoFocus: false }); }) ), diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts index 50fdc86426..b50d16a4f4 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts @@ -87,7 +87,8 @@ export class ComponentStateEffects { ofType(ComponentStateActions.openComponentStateDialog), tap(() => { const dialogReference = this.dialog.open(ComponentStateDialog, { - ...LARGE_DIALOG + ...LARGE_DIALOG, + autoFocus: false }); dialogReference.afterClosed().subscribe(() => { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/about-dialog/about-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/about-dialog/about-dialog.component.html index f0a1454440..6a599ffbd6 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/about-dialog/about-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/about-dialog/about-dialog.component.html @@ -15,7 +15,7 @@ ~ limitations under the License. --> -<div class="about-dialog" tabindex="0"> +<div class="about-dialog"> <h2 mat-dialog-title>About</h2> <mat-dialog-content> <div class="flex flex-col justify-between gap-y-5"> diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html index ae93c442d3..e4cdf239ab 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html @@ -15,7 +15,7 @@ ~ limitations under the License. --> -<div class="component-state-dialog" tabindex="0"> +<div class="component-state-dialog"> <h2 mat-dialog-title>Component State</h2> <error-banner></error-banner> <mat-dialog-content>