From bb55a5aba32613fd6df8d7535aba9f0bbcfc7065 Mon Sep 17 00:00:00 2001 From: kurilova Date: Thu, 10 Apr 2025 10:53:41 +0000 Subject: [PATCH 1/2] Add new device as the first element; fix focus after adding the new RA profile --- modules/ui/src/app/pages/devices/devices.store.ts | 4 ++-- .../app/pages/risk-assessment/risk-assessment.component.ts | 1 + .../app/pages/risk-assessment/risk-assessment.store.spec.ts | 6 +----- .../src/app/pages/risk-assessment/risk-assessment.store.ts | 4 +--- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/ui/src/app/pages/devices/devices.store.ts b/modules/ui/src/app/pages/devices/devices.store.ts index 7b0f27cbd..64e994f1c 100644 --- a/modules/ui/src/app/pages/devices/devices.store.ts +++ b/modules/ui/src/app/pages/devices/devices.store.ts @@ -110,7 +110,7 @@ export class DevicesStore extends ComponentStore { tap(([added, devices]) => { if (added) { this.addDevice(device, devices); - onSuccess(devices.length); + onSuccess(0); } }) ); @@ -174,7 +174,7 @@ export class DevicesStore extends ComponentStore { }); private addDevice(device: Device, devices: Device[]): void { - this.updateDevices(devices.concat([device])); + this.updateDevices([device, ...devices]); } private updateDevice( diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts index 6dc2297c0..4c242b0d1 100644 --- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts +++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts @@ -442,6 +442,7 @@ export class RiskAssessmentComponent ?.afterClosed() .pipe(takeUntil(this.destroy$)) .subscribe(() => { + console.log('111111'); focusElement(); }); } diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts index 0225df778..601bdb39f 100644 --- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts +++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts @@ -185,17 +185,13 @@ describe('RiskAssessmentStore', () => { }); describe('setFocusOnCreateButton', () => { - const container = document.createElement('div') as HTMLElement; - container.classList.add('content-empty'); - document.querySelector('body')?.appendChild(container); - it('should call focusFirstElementInContainer', fakeAsync(() => { riskAssessmentStore.setFocusOnCreateButton(); tick(11); expect( mockFocusManagerService.focusFirstElementInContainer - ).toHaveBeenCalledWith(container); + ).toHaveBeenCalled(); })); }); diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts index 46d9a0f43..07240a104 100644 --- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts +++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts @@ -110,9 +110,7 @@ export class RiskAssessmentStore extends ComponentStore { return trigger$.pipe( delay(10), tap(() => { - this.focusManagerService.focusFirstElementInContainer( - window.document.querySelector('.content-empty') - ); + this.focusManagerService.focusFirstElementInContainer(); }) ); }); From 77d5cf269245fc68e30348a6d477e1249384a230 Mon Sep 17 00:00:00 2001 From: kurilova Date: Thu, 10 Apr 2025 11:50:41 +0000 Subject: [PATCH 2/2] Remove console.log; change the container for proper focus --- .../app/pages/risk-assessment/risk-assessment.component.ts | 1 - .../app/pages/risk-assessment/risk-assessment.store.spec.ts | 4 +++- .../ui/src/app/pages/risk-assessment/risk-assessment.store.ts | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts index 4c242b0d1..6dc2297c0 100644 --- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts +++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts @@ -442,7 +442,6 @@ export class RiskAssessmentComponent ?.afterClosed() .pipe(takeUntil(this.destroy$)) .subscribe(() => { - console.log('111111'); focusElement(); }); } diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts index 601bdb39f..25c8e841c 100644 --- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts +++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.spec.ts @@ -185,13 +185,15 @@ describe('RiskAssessmentStore', () => { }); describe('setFocusOnCreateButton', () => { + const container = window.document.querySelector('app-risk-assessment'); + it('should call focusFirstElementInContainer', fakeAsync(() => { riskAssessmentStore.setFocusOnCreateButton(); tick(11); expect( mockFocusManagerService.focusFirstElementInContainer - ).toHaveBeenCalled(); + ).toHaveBeenCalledWith(container); })); }); diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts index 07240a104..3498e5f4b 100644 --- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts +++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts @@ -110,7 +110,9 @@ export class RiskAssessmentStore extends ComponentStore { return trigger$.pipe( delay(10), tap(() => { - this.focusManagerService.focusFirstElementInContainer(); + this.focusManagerService.focusFirstElementInContainer( + window.document.querySelector('app-risk-assessment') + ); }) ); });