Internal change

PiperOrigin-RevId: 945870741

Author: OmniLab Team

src/devtools/mobileharness/fe/v6/angular/app/features/device_detail/components/device_config/device_wizard/device_wizard.scss

@@ -43,6 +43,7 @@
   justify-content: center;
 
   overflow-y: auto;
+  @include common.shared-scrollbar-style();
 }
 
 .stepper-section ::ng-deep .mat-horizontal-content-container {

src/devtools/mobileharness/fe/v6/angular/app/features/device_detail/components/device_config/device_wizard/device_wizard.spec.ts

@@ -269,6 +269,7 @@ describe('Device Wizard Component', () => {
           deviceId: 'test-id',
           source: 'copy',
           config: {
+            permissions: {owners: ['owner1']},
             wifi: {type: 'none', ssid: 'dummy'},
           },
         },
@@ -377,6 +378,7 @@ describe('Device Wizard Component', () => {
     );
 
     component.currentStep.set('review-and-submit');
+    component.config.permissions = {owners: ['user1'], executors: []};
     component.submit();
 
     expect(dialogSpy).toHaveBeenCalled();
@@ -421,6 +423,7 @@ describe('Device Wizard Component', () => {
     confirmDialogRefSpy.afterClosed.and.returnValue(of('primary')); // Proceed anyway
     spyOn(dialog, 'open').and.returnValue(confirmDialogRefSpy);
 
+    component.config.permissions = {owners: ['user1'], executors: []};
     component.submit();
 
     expect(updateSpy).toHaveBeenCalledTimes(2);
@@ -429,4 +432,70 @@ describe('Device Wizard Component', () => {
     expect(firstCallArgs.options?.overrideSelfLockout).toBeFalse();
     expect(secondCallArgs.options?.overrideSelfLockout).toBeTrue();
   });
+
+  it('should return to permissions step when canceling empty owner warning', async () => {
+    const fixture = TestBed.createComponent(
+      MatTestDialogOpener.withComponent(DeviceWizard, {
+        data: {
+          deviceId: 'test-id',
+          source: 'new',
+        },
+      }),
+    );
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    const component = fixture.componentInstance.dialogRef.componentInstance;
+    const confirmDialogRefSpy = jasmine.createSpyObj('MatDialogRef', [
+      'afterClosed',
+    ]);
+    confirmDialogRefSpy.afterClosed.and.returnValue(of('secondary')); // clicks "Go Back"
+    const dialogSpy = spyOn(MatDialog.prototype, 'open').and.returnValue(
+      confirmDialogRefSpy,
+    );
+
+    component.currentStep.set('review-and-submit');
+    component.config.permissions = {owners: [], executors: []};
+    component.submit();
+
+    expect(dialogSpy).toHaveBeenCalled();
+    expect(component.currentStep()).toBe('permissions');
+  });
+
+  it('should retry submit with override self lockout set when empty owner warning is confirmed', async () => {
+    const fixture = TestBed.createComponent(
+      MatTestDialogOpener.withComponent(DeviceWizard, {
+        data: {
+          deviceId: 'test-id',
+          source: 'new',
+        },
+      }),
+    );
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    const component = fixture.componentInstance.dialogRef.componentInstance;
+    const configService = TestBed.inject(CONFIG_SERVICE);
+    const updateSpy = spyOn(
+      configService,
+      'updateDeviceConfig',
+    ).and.returnValue(of({success: true, deviceConfig: {}, uiStatus: {}}));
+
+    const dialog = TestBed.inject(MatDialog);
+    const confirmDialogRefSpy = jasmine.createSpyObj('MatDialogRef', [
+      'afterClosed',
+    ]);
+    confirmDialogRefSpy.afterClosed.and.returnValue(of('primary')); // Proceed anyway
+    const dialogSpy = spyOn(dialog, 'open').and.returnValue(
+      confirmDialogRefSpy,
+    );
+
+    component.config.permissions = {owners: [], executors: []};
+    component.submit();
+
+    expect(dialogSpy).toHaveBeenCalledTimes(2);
+    expect(updateSpy).toHaveBeenCalledTimes(1);
+    const callArgs = updateSpy.calls.first().args[0];
+    expect(callArgs.options?.overrideSelfLockout).toBeTrue();
+  });
 });

src/devtools/mobileharness/fe/v6/angular/app/features/device_detail/components/device_config/device_wizard/device_wizard.ts

@@ -87,7 +87,7 @@ export class DeviceWizard implements OnInit {
     },
     onSubmitOverride: () => {
       // If user proceeds anyway, force-save with selfLockout override enabled.
-      this.submit(true);
+      this.submit(true, true);
     },
   });
   readonly isGoogleInternal = this.environment.isGoogleInternal();
@@ -241,8 +241,18 @@ export class DeviceWizard implements OnInit {
     }
   }
 
-  // used for apply changes button
-  submit(overrideSelfLockout = false) {
+  submit(overrideSelfLockout = false, bypassOwnerCheck = false) {
+    const owners = this.config.permissions?.owners || [];
+    if (!bypassOwnerCheck && owners.length === 0) {
+      this.dialogActions.emptyOwnerWarning('device', () => {
+        this.submit(
+          /* overrideSelfLockout= */ true,
+          /* bypassOwnerCheck= */ true,
+        );
+      });
+      return;
+    }
+
     if (this.data.source === 'copy') {
       this.verifying.set(true);
     } else {

src/devtools/mobileharness/fe/v6/angular/app/features/host_detail/components/host_config/host_wizard/host_wizard.spec.ts

@@ -552,6 +552,12 @@ describe('HostWizard Component', () => {
     );
 
     comp.currentStep.set('review-and-submit');
+    comp.hostConfig.set({
+      ...comp.hostConfig(),
+      permissions: {
+        hostAdmins: ['admin'],
+      },
+    });
     comp.submit();
 
     expect(dialogSpy).toHaveBeenCalled();
@@ -571,4 +577,75 @@ describe('HostWizard Component', () => {
     comp.onCurrentStepChange('device-config-mode');
     expect(comp.currentStep()).toBe('device-config-mode');
   });
+
+  it('should return to host-permissions step when canceling empty owner warning', async () => {
+    const dialogOpener = TestBed.createComponent(
+      MatTestDialogOpener.withComponent(HostWizard, {
+        data: {hostName: 'test-host', source: 'new'},
+      }),
+    ) as ComponentFixture<MatTestDialogOpener<HostWizard>>;
+    dialogOpener.detectChanges();
+    await dialogOpener.whenStable();
+
+    const comp = dialogOpener.componentInstance.dialogRef.componentInstance;
+    const dialog = TestBed.inject(MatDialog);
+    const confirmDialogRefSpy = jasmine.createSpyObj('MatDialogRef', [
+      'afterClosed',
+    ]);
+    confirmDialogRefSpy.afterClosed.and.returnValue(of('secondary')); // clicks "Go Back"
+    const dialogSpy = spyOn(dialog, 'open').and.returnValue(
+      confirmDialogRefSpy,
+    );
+
+    comp.currentStep.set('review-and-submit');
+    comp.hostConfig.set({
+      ...comp.hostConfig(),
+      permissions: {
+        hostAdmins: [],
+      },
+    });
+    comp.submit();
+
+    expect(dialogSpy).toHaveBeenCalled();
+    expect(comp.currentStep()).toBe('host-permissions');
+  });
+
+  it('should retry submit with override self lockout set when empty owner warning is confirmed', async () => {
+    const dialogOpener = TestBed.createComponent(
+      MatTestDialogOpener.withComponent(HostWizard, {
+        data: {hostName: 'test-host', source: 'new'},
+      }),
+    ) as ComponentFixture<MatTestDialogOpener<HostWizard>>;
+    dialogOpener.detectChanges();
+    await dialogOpener.whenStable();
+
+    const comp = dialogOpener.componentInstance.dialogRef.componentInstance;
+    const configService = TestBed.inject(CONFIG_SERVICE);
+    const updateSpy = spyOn(configService, 'updateHostConfig').and.returnValue(
+      of({success: true, uiStatus: {}}),
+    );
+
+    const dialog = TestBed.inject(MatDialog);
+    const confirmDialogRefSpy = jasmine.createSpyObj('MatDialogRef', [
+      'afterClosed',
+    ]);
+    confirmDialogRefSpy.afterClosed.and.returnValue(of('primary')); // Proceed anyway
+    const dialogSpy = spyOn(dialog, 'open').and.returnValue(
+      confirmDialogRefSpy,
+    );
+
+    comp.currentStep.set('review-and-submit');
+    comp.hostConfig.set({
+      ...comp.hostConfig(),
+      permissions: {
+        hostAdmins: [],
+      },
+    });
+    comp.submit();
+
+    expect(dialogSpy).toHaveBeenCalledTimes(2);
+    expect(updateSpy).toHaveBeenCalledTimes(1);
+    const callArgs = updateSpy.calls.first().args[0];
+    expect(callArgs.options?.overrideSelfLockout).toBeTrue();
+  });
 });

src/devtools/mobileharness/fe/v6/angular/app/features/host_detail/components/host_config/host_wizard/host_wizard.ts

@@ -75,7 +75,7 @@ export class HostWizard implements OnInit {
       this.currentStep.set('host-permissions');
     },
     onSubmitOverride: () => {
-      this.submit(true);
+      this.submit(true, true);
     },
   });
 
@@ -302,14 +302,25 @@ export class HostWizard implements OnInit {
     this.dataSource = dataSource;
   }
 
-  submit(overrideSelfLockout = false) {
+  submit(overrideSelfLockout = false, bypassOwnerCheck = false) {
+    const hostAdmins = this.hostConfig().permissions?.hostAdmins || [];
+    if (!bypassOwnerCheck && hostAdmins.length === 0) {
+      this.dialogActions.emptyOwnerWarning('host', () => {
+        this.submit(
+          /* overrideSelfLockout= */ true,
+          /* bypassOwnerCheck= */ true,
+        );
+      });
+      return;
+    }
+
     const wifi = this.hostConfig().deviceConfig?.wifi;
     const finalWifi = !wifi || wifi.type === 'none' ? undefined : wifi;
     const requestConfig: HostConfig = {
       ...this.hostConfig(),
       deviceConfig: {
         permissions: {
-          owners: this.hostConfig().permissions.hostAdmins,
+          owners: hostAdmins,
           executors:
             this.hostConfig().deviceConfig?.permissions?.executors || [],
         },

src/devtools/mobileharness/fe/v6/angular/app/shared/components/config_common/wizard_stepper/wizard_stepper.scss

@@ -47,6 +47,7 @@
   justify-content: center;
 
   overflow-y: auto;
+  @include common.shared-scrollbar-style();
 }
 
 .stepper-section ::ng-deep .mat-horizontal-content-container {
@@ -60,6 +61,7 @@
 .step-content {
   padding: 1.5rem;
   overflow-y: auto;
+  @include common.shared-scrollbar-style();
   flex-grow: 1;
   min-height: 0px;
   max-height: calc(90vh - 99px - 85px - 56px);

src/devtools/mobileharness/fe/v6/angular/app/shared/composables/config_dialog_actions.ts

@@ -97,9 +97,43 @@ export function useConfigDialogActions<T>(
     });
   };
 
+  /** Handles empty owner warning by showing a confirmation dialog. */
+  const emptyOwnerWarning = (
+    configType: 'device' | 'host',
+    onConfirm: () => void,
+    onCancel?: () => void,
+  ) => {
+    const dialogData = {
+      title: 'Security Warning',
+      content:
+        configType === 'device'
+          ? 'No owners are set for this device configuration. This device will be public, allowing anyone to view and edit it. Are you sure you want to proceed?'
+          : 'No host admins are set for this host configuration. This host will be public, allowing anyone to view and edit it. Are you sure you want to proceed?',
+      type: 'warning',
+      primaryButtonLabel: 'Proceed anyway',
+      secondaryButtonLabel: 'Go back',
+    };
+    dialog
+      .open(ConfirmDialog, {
+        data: dialogData,
+        disableClose: true,
+      })
+      .afterClosed()
+      .subscribe((result) => {
+        if (result === 'secondary') {
+          (onCancel || options.onCancelSelfLockout)();
+          return;
+        }
+        if (result === 'primary') {
+          onConfirm();
+        }
+      });
+  };
+
   return {
     success,
     error,
     selfLockout,
+    emptyOwnerWarning,
   };
 }

src/devtools/mobileharness/fe/v6/angular/app/shared/styles/configuration.scss

@@ -1,4 +1,5 @@
 @use '@angular/material' as mat;
+@use 'common';
 
 $labconsole-font: Roboto, sans-serif;
 
@@ -183,6 +184,7 @@ h1, h2, h3, h4, h5, h6, p {
 .config-content {
   padding: 1.5rem;
   overflow-y: auto;
+  @include common.shared-scrollbar-style();
 
   .empty-config-title {
     font-size: 0.875rem;
@@ -343,13 +345,15 @@ h1, h2, h3, h4, h5, h6, p {
   flex-grow: 1;
   min-height: 0;
   overflow-y: auto;
+  @include common.shared-scrollbar-style();
   padding: 1.5rem;
 }
 
 // Wizard Step Content
 .config-wizard-step-content {
   padding: 1.5rem;
   overflow-y: auto;
+  @include common.shared-scrollbar-style();
   flex-grow: 1;
   min-height: 0px;
   max-height: calc(90vh - 99px - 85px - 56px);