Pidp 1047/1048 window scroll console error&open multiple dialogs (#602)

* windows scroll console error fix * multiple dialog box fix * added back scroll top * Lint fix * revert * missing dependency --------- Co-authored-by: Panos Hatzinikolaou <[email protected]>
bcgov · Oct 22, 2024 · 8e377f3 · 8e377f3
1 parent b57a5df
commit 8e377f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...p/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.spec.ts b/...p/src/app/features/profile/pages/user-access-agreement/user-access-agreement.page.spec.ts
@@ -11,6 +11,7 @@ import { provideAutoSpy } from 'jest-auto-spies';
 import { ApiHttpClient } from '@app/core/resources/api-http-client.service';
 import { FormUtilsService } from '@app/core/services/form-utils.service';
 import { LoggerService } from '@app/core/services/logger.service';
+import { UtilsService } from '@app/core/services/utils.service';
 
 import { UserAccessAgreementResource } from './user-access-agreement-resource.service';
 import { UserAccessAgreementPage } from './user-access-agreement.page';
@@ -46,6 +47,7 @@ describe('UserAccessAgreementPage', () => {
         provideAutoSpy(LoggerService),
         provideAutoSpy(Router),
         provideAutoSpy(UserAccessAgreementResource),
+        provideAutoSpy(UtilsService),
       ],
     });
 
@@ -61,7 +63,6 @@ describe('UserAccessAgreementPage', () => {
     given('user wants to go back to the previous page', () => {
       when('onBack is invoked', () => {
         component.onBack();
-
         then('router should navigate to root route', () => {
           const rootRoute = mockActivatedRoute.snapshot.data.routes.root;
           expect(router.navigate).toHaveBeenCalledWith([rootRoute]);

diff --git a/...ce/libs/shared/ui/src/lib/components/dialogs/confirm-dialog/confirm-dialog.component.html b/...ce/libs/shared/ui/src/lib/components/dialogs/confirm-dialog/confirm-dialog.component.html
@@ -39,6 +39,7 @@
     {{ options.cancelText }}
   </button>
   <button
+    id="submit"
     *ngIf="!options.actionHide"
     mat-flat-button
     [color]="options.actionType"

diff --git a/...pace/libs/shared/ui/src/lib/components/dialogs/confirm-dialog/confirm-dialog.component.ts b/...pace/libs/shared/ui/src/lib/components/dialogs/confirm-dialog/confirm-dialog.component.ts
@@ -1,5 +1,6 @@
 import { NgIf } from '@angular/common';
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   Component,
   Inject,
@@ -44,7 +45,7 @@ import { DIALOG_DEFAULT_OPTION } from '../dialogs-properties.provider';
     AnchorDirective,
   ],
 })
-export class ConfirmDialogComponent implements OnInit {
+export class ConfirmDialogComponent implements OnInit, AfterViewInit {
   public options: DialogOptions;
   public dialogContentOutput: DialogContentOutput<unknown> | null;
 
@@ -84,6 +85,13 @@ export class ConfirmDialogComponent implements OnInit {
     this.options.class && this.dialogRef.addPanelClass(this.options.class);
   }
 
+  public ngAfterViewInit(): void {
+    const adjustSubmitFocus = document.querySelector(
+      '#submit',
+    ) as HTMLButtonElement;
+    if (adjustSubmitFocus) adjustSubmitFocus.focus();
+  }
+
   private getOptions(dialogOptions: DialogOptions): DialogOptions {
     const options: DialogOptions = {
       actionType: 'primary',