From 0473bc39405e27525b28184d7c21ee5c2a9ecc15 Mon Sep 17 00:00:00 2001
From: Volha Mardvilka <mardvilka@google.com>
Date: Mon, 7 Oct 2024 13:26:35 +0000
Subject: [PATCH] 371177676: (fix) set focus to the initial device if cancel on
 edit device

---
 .../src/app/pages/devices/devices.component.spec.ts   | 11 ++++++++++-
 modules/ui/src/app/pages/devices/devices.component.ts |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/ui/src/app/pages/devices/devices.component.spec.ts b/modules/ui/src/app/pages/devices/devices.component.spec.ts
index 433b312b8..09fd6a437 100644
--- a/modules/ui/src/app/pages/devices/devices.component.spec.ts
+++ b/modules/ui/src/app/pages/devices/devices.component.spec.ts
@@ -241,7 +241,15 @@ describe('DevicesComponent', () => {
         beforeClosed: () => of(null),
       } as MatDialogRef<typeof SimpleDialogComponent>);
 
-      component.openCloseDialog([device], MOCK_TEST_MODULES, device);
+      component.openCloseDialog(
+        [device],
+        MOCK_TEST_MODULES,
+        device,
+        undefined,
+        false,
+        0,
+        0
+      );
 
       expect(openDeviceDialogSpy).toHaveBeenCalledWith(
         [device],
@@ -249,6 +257,7 @@ describe('DevicesComponent', () => {
         device,
         undefined,
         false,
+        0,
         0
       );
     });
diff --git a/modules/ui/src/app/pages/devices/devices.component.ts b/modules/ui/src/app/pages/devices/devices.component.ts
index 01102407b..bc90c1863 100644
--- a/modules/ui/src/app/pages/devices/devices.component.ts
+++ b/modules/ui/src/app/pages/devices/devices.component.ts
@@ -235,7 +235,8 @@ export class DevicesComponent
           initialDevice,
           device,
           isEditDevice,
-          index
+          index,
+          deviceIndex
         );
       } else if (deviceIndex !== undefined) {
         this.focusSelectedButton(deviceIndex);