Internal change

OmniLab Team · copybara-github · commit 088512ea563d · 2026-05-14T21:44:53.000-07:00
PiperOrigin-RevId: 914779319
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/models/host_overview.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/models/host_overview.ts
@@ -212,6 +212,18 @@ export interface DeviceTarget {
   subDeviceId?: string;
 }
 
+/**
+ * Semantic state of the lab type.
+ * Frontend uses this to determine display name and logic.
+ */
+export type UiLabType =
+  | 'CORE'
+  | 'FUSION'
+  | 'SATELLITE'
+  | 'SLAAS'
+  | 'ATE'
+  | 'RIEMANN_FIELD';
+
 /**
  * Represents the comprehensive data required to render the Host Detail Page's
  * overview section. This is the top-level interface for host overview data.
@@ -225,8 +237,9 @@ export declare interface HostOverview {
   /**
    * The user-friendly lab type name, derived by the backend,
    * e.g., "Core Lab", "Satellite Lab (SLaaS)".
+   * @deprecated Use uiLabTypes instead.
    */
-  readonly labTypeDisplayNames: string[];
+  readonly labTypeDisplayNames?: string[];
   /** Lab server information. */
   readonly labServer: LabServerInfo;
   /** Daemon server information. */
@@ -241,6 +254,10 @@ export declare interface HostOverview {
   readonly canUpgrade?: boolean;
   /** Whether to show the pass-through flags in the host overview. */
   readonly showPassThroughFlags: boolean;
+  /**
+   * The semantic types of the lab.
+   */
+  readonly uiLabTypes?: UiLabType[];
 }
 
 /**
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/multi_remote_control.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/multi_remote_control.ts
@@ -22,7 +22,8 @@ function createHostOverview(
     ip: '192.168.1.1',
     os: 'gLinux',
     canUpgrade: false,
-    labTypeDisplayNames: ['Satellite Lab'],
+
+    uiLabTypes: ['SATELLITE'],
     showPassThroughFlags: true,
     labServer: {
       connectivity: {
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_01.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_01.ts
@@ -44,13 +44,8 @@ const overview: HostOverview = {
   ip: '192.168.1.101',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: [
-    'Satellite Lab',
-    'SLaaS',
-    'Core Lab',
-    'Mobly',
-    'Android',
-  ],
+
+  uiLabTypes: ['SATELLITE', 'SLAAS', 'CORE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_02.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_02.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.2.102',
   os: 'gLinux',
   canUpgrade: true,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_03.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_03.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '10.0.1.50',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Core Lab'],
+
+  uiLabTypes: ['CORE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_04.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_04.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.3.103',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'MISSING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_05.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_05.ts
@@ -13,7 +13,7 @@ const overview: HostOverview = {
   ip: '192.168.4.104',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_06.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_06.ts
@@ -13,7 +13,7 @@ const overview: HostOverview = {
   ip: '192.168.5.105',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab', 'M&M', 'Shared Lab'],
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_07.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_07.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.6.106',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'MISSING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_08.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_08.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.7.107',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_09.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_09.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.8.108',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_10.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_10.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.10.110',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_11.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_11.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.11.111',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_12.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_12.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   ip: '192.168.12.112',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_13.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_13.ts
@@ -14,7 +14,8 @@ const overview: HostOverview = {
   ip: '192.168.13.113',
   os: 'gLinux',
   canUpgrade: false,
-  labTypeDisplayNames: ['Satellite Lab'],
+
+  uiLabTypes: ['SATELLITE'],
   labServer: {
     connectivity: {
       state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_14.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/overview_14.ts
@@ -13,7 +13,8 @@ const overview: HostOverview = {
   hostName: 'at1-ab7.atc.google.com',
   ip: '2001:4860:1016:3:8aae:ddff:fe0b:a998',
   os: 'Linux',
-  labTypeDisplayNames: ['Satellite Lab', 'ATE Lab'],
+
+  uiLabTypes: ['SATELLITE', 'ATE'],
   canUpgrade: false,
   labServer: {
     connectivity: {
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/remote_control_permissions.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/remote_control_permissions.ts
@@ -22,7 +22,8 @@ function createHostOverview(
     ip: '192.168.1.1',
     os: 'gLinux',
     canUpgrade: false,
-    labTypeDisplayNames: ['Satellite Lab'],
+
+    uiLabTypes: ['SATELLITE'],
     showPassThroughFlags: true,
     labServer: {
       connectivity: {
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/ui_status_utils.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/mock_data/hosts/ui_status_utils.ts
@@ -308,7 +308,8 @@ export function createDefaultHostOverview(hostName: string): HostOverview {
     ip: '192.168.1.1',
     os: 'gLinux',
     canUpgrade: true,
-    labTypeDisplayNames: ['Satellite Lab'],
+
+    uiLabTypes: ['SATELLITE'],
     labServer: {
       connectivity: {
         state: 'RUNNING',
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/features/host_detail/components/host_overview/host_overview.ng.html b/src/devtools/mobileharness/fe/v6/angular/app/features/host_detail/components/host_overview/host_overview.ng.html
@@ -24,10 +24,10 @@
           @if (isGoogle1p()) {
             <dt title="LabType">Lab Type</dt>
             <dd class="lab-type-wrapper">
-              @if (host.labTypeDisplayNames.length > 0) {
-                @for (labType of host.labTypeDisplayNames; track labType) {
+              @if (displayLabTypes().length > 0) {
+                @for (labType of displayLabTypes(); track labType) {
                   <div class="lab-type-chip overflow-ellipsis"
-                       [class.lab-type-chip-fusion]="labType === 'Fusion Lab'"
+                       [class.lab-type-chip-fusion]="labType === 'Fusion' || labType === 'Fusion Lab'"
                        title="{{ labType }}">
                     {{ labType }}
                   </div>
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/features/host_detail/components/host_overview/host_overview.ts b/src/devtools/mobileharness/fe/v6/angular/app/features/host_detail/components/host_overview/host_overview.ts
@@ -48,6 +48,7 @@ import {
   DiagnosticLink,
   HostConnectivityStatus,
   LabServerActivity,
+  UiLabType,
   type HostOverview,
 } from '../../../../core/models/host_overview';
 import {Environment} from '../../../../core/services/environment';
@@ -196,11 +197,54 @@ export class HostOverviewPage implements OnChanges {
   @Input() actions?: HostActions;
 
   readonly isAteHost = computed(() => {
-    return this.host.labTypeDisplayNames.some((name) =>
-      name.includes('ATE Lab'),
+    if (this.host.uiLabTypes && this.host.uiLabTypes.length > 0) {
+      return this.host.uiLabTypes.includes('ATE');
+    }
+    return (
+      this.host.labTypeDisplayNames?.some((name) => name.includes('ATE Lab')) ??
+      false
+    );
+  });
+
+  readonly displayLabTypes = computed(() => {
+    if (this.host.uiLabTypes && this.host.uiLabTypes.length > 0) {
+      return this.host.uiLabTypes.map((type) =>
+        this.mapUiLabTypeToString(type),
+      );
+    }
+    return this.host.labTypeDisplayNames ?? [];
+  });
+
+  readonly isSatelliteLab = computed(() => {
+    if (this.host.uiLabTypes && this.host.uiLabTypes.length > 0) {
+      return this.host.uiLabTypes.includes('SATELLITE');
+    }
+    return (
+      this.host.labTypeDisplayNames?.includes('Satellite') ||
+      this.host.labTypeDisplayNames?.includes('Satellite Lab') ||
+      false
     );
   });
 
+  private mapUiLabTypeToString(type: UiLabType): string {
+    switch (type) {
+      case 'CORE':
+        return 'Core';
+      case 'FUSION':
+        return 'Fusion';
+      case 'SATELLITE':
+        return 'Satellite';
+      case 'SLAAS':
+        return 'Satellite (SLaaS)';
+      case 'ATE':
+        return 'ATE';
+      case 'RIEMANN_FIELD':
+        return 'Riemann Field';
+      default:
+        return 'Unknown';
+    }
+  }
+
   readonly passThroughFlags = signal<string>('');
 
   deviceDataSource = new MatTableDataSource<DeviceSummary>();
diff --git a/src/devtools/mobileharness/fe/v6/service/proto/host/host_resources.proto b/src/devtools/mobileharness/fe/v6/service/proto/host/host_resources.proto
@@ -26,13 +26,24 @@ option java_package = "com.google.devtools.mobileharness.fe.v6.service.proto.hos
 option java_multiple_files = true;
 option java_outer_classname = "HostResourcesProto";
 
+enum UiLabType {
+  UI_LAB_TYPE_UNSPECIFIED = 0;
+  CORE = 1;
+  FUSION = 2;
+  SATELLITE = 3;
+  SLAAS = 4;
+  ATE = 5;
+  RIEMANN_FIELD = 6;
+  UNKNOWN = 7;
+}
+
 // Represents the comprehensive data required to render the Host Detail Page's
 // overview section.
 message HostOverview {
   string host_name = 1;
   string ip = 2;
   // The display names for the lab type, e.g., ["Satellite Lab", "ATE Lab"].
-  repeated string lab_type_display_names = 3;
+  repeated string lab_type_display_names = 3 [deprecated = true];
   // Lab server process information.
   LabServerInfo lab_server = 4;
   // Daemon server process information.
@@ -47,6 +58,8 @@ message HostOverview {
   bool can_upgrade = 9;
   // Whether to show the pass-through flags in the host overview.
   bool show_pass_through_flags = 10;
+  // The semantic types of the lab.
+  repeated UiLabType ui_lab_types = 11;
 }
 
 // Represents a link to a diagnostic tool or log.
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/GetHostOverviewHandler.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/GetHostOverviewHandler.java
@@ -47,6 +47,7 @@
 import com.google.devtools.mobileharness.fe.v6.service.proto.host.HostOverview;
 import com.google.devtools.mobileharness.fe.v6.service.proto.host.HostOverviewPageData;
 import com.google.devtools.mobileharness.fe.v6.service.proto.host.LabServerInfo;
+import com.google.devtools.mobileharness.fe.v6.service.proto.host.UiLabType;
 import com.google.devtools.mobileharness.fe.v6.service.shared.providers.LabInfoProvider;
 import com.google.devtools.mobileharness.fe.v6.service.util.UniverseScope;
 import com.google.devtools.mobileharness.shared.labinfo.proto.LabInfoServiceProto.GetLabInfoRequest;
@@ -194,11 +195,13 @@ private HostOverview buildHostOverview(
     builder.setCanUpgrade(true);
 
     Optional<String> labTypeOpt = hostReleaseInfoOpt.flatMap(HostReleaseInfo::labType);
+    ImmutableList<UiLabType> uiLabTypes = HostTypes.determineUiLabTypes(labInfoOpt, labTypeOpt);
     ImmutableList<String> labTypes = HostTypes.determineLabTypeDisplayNames(labInfoOpt, labTypeOpt);
-    boolean isCoreOrFusion = HostTypes.isCoreOrFusion(labTypes);
+    boolean isCoreOrFusion = HostTypes.isCoreOrFusionUiLabTypes(uiLabTypes);
 
     return builder
-        .addAllLabTypeDisplayNames(labTypes)
+        .addAllLabTypeDisplayNames(labTypes) // Legacy field for backward compatibility
+        .addAllUiLabTypes(uiLabTypes)
         .setShowPassThroughFlags(!isCoreOrFusion)
         .setLabServer(
             buildLabServerInfo(labInfoOpt, hostReleaseInfoOpt, passThroughFlagsOpt, universe))
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/HostDebugButtonBuilder.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/HostDebugButtonBuilder.java
@@ -20,6 +20,7 @@
 import com.google.devtools.mobileharness.fe.v6.service.host.util.HostTypes;
 import com.google.devtools.mobileharness.fe.v6.service.proto.common.ActionButtonState;
 import com.google.devtools.mobileharness.fe.v6.service.proto.host.DaemonServerInfo;
+import com.google.devtools.mobileharness.fe.v6.service.proto.host.UiLabType;
 import com.google.devtools.mobileharness.fe.v6.service.util.FeatureManagerFactory;
 import com.google.devtools.mobileharness.fe.v6.service.util.FeatureReadiness;
 import com.google.devtools.mobileharness.fe.v6.service.util.UniverseScope;
@@ -52,8 +53,7 @@ public ActionButtonState build(
     }
 
     boolean isCoreLab =
-        HostTypes.determineLabTypeDisplayNames(labInfoOpt, labTypeOpt)
-            .contains(HostTypes.LAB_TYPE_CORE);
+        HostTypes.determineUiLabTypes(labInfoOpt, labTypeOpt).contains(UiLabType.CORE);
 
     if (isCoreLab) {
       return ActionButtonState.newBuilder().setVisible(false).build();
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/util/BUILD b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/util/BUILD
@@ -26,6 +26,7 @@ java_library(
     deps = [
         "//src/devtools/mobileharness/api/model/proto:lab_java_proto",
         "//src/devtools/mobileharness/api/query/proto:lab_query_java_proto",
+        "//src/devtools/mobileharness/fe/v6/service/proto/host:host_resources_java_proto",
         "@maven//:com_google_guava_guava",
     ],
 )
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/util/HostTypes.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/util/HostTypes.java
diff --git a/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/handlers/GetHostOverviewHandlerTest.java b/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/handlers/GetHostOverviewHandlerTest.java
diff --git a/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/util/HostTypesTest.java b/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/util/HostTypesTest.java
