Internal change

OmniLab Team · copybara-github · commit b7f57015263d · 2026-06-29T02:38:13.000-07:00
PiperOrigin-RevId: 938557744
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/models/host_action.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/models/host_action.ts
@@ -110,7 +110,7 @@ export declare interface ActionUnavailable {
 export type VersionIssueType =
   | 'TYPE_UNSPECIFIED'
   | 'NO_VERSION_RECORD'
-  | 'VERSION_TOO_OLD';
+  | 'CURRENT_VERSION_UNAVAILABLE';
 
 /**
  * Version is unavailable; user needs to select a version before proceeding.
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/host/fake_host_service.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/host/fake_host_service.ts
@@ -328,12 +328,11 @@ TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0`,
   override preflightLabServerLifecycle(
     hostName: string,
     action: LifecycleActionType,
-    expectedActivity: string,
   ): Observable<PreflightLabServerLifecycleResponse> {
-    // Default fake: always return ready with the expected activity.
+    // Default fake: always return ready with a mock running activity.
     return of({
       ready: {
-        actualActivity: expectedActivity,
+        actualActivity: 'RUNNING',
       },
     }).pipe(delay(1000));
   }
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/host/host_service.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/host/host_service.ts
@@ -89,7 +89,6 @@ export abstract class HostService {
   abstract preflightLabServerLifecycle(
     hostName: string,
     action: LifecycleActionType,
-    expectedActivity: string,
   ): Observable<PreflightLabServerLifecycleResponse>;
 
   /**
diff --git a/src/devtools/mobileharness/fe/v6/angular/app/core/services/host/http_host_service.ts b/src/devtools/mobileharness/fe/v6/angular/app/core/services/host/http_host_service.ts
@@ -103,13 +103,11 @@ export class HttpHostService extends HostService {
   override preflightLabServerLifecycle(
     hostName: string,
     action: LifecycleActionType,
-    expectedActivity: string,
   ): Observable<PreflightLabServerLifecycleResponse> {
     return this.http.post<PreflightLabServerLifecycleResponse>(
       `${this.apiUrl}/${hostName}:preflightLifecycle`,
       {
         action,
-        expectedActivity,
       },
     );
   }
diff --git a/src/devtools/mobileharness/fe/v6/service/proto/host/host_service.proto b/src/devtools/mobileharness/fe/v6/service/proto/host/host_service.proto
@@ -312,9 +312,11 @@ message PreflightLabServerLifecycleRequest {
   }
   ActionType action = 2;
 
-  // The Activity currently displayed on the Lab Server card in the frontend.
-  // Used to detect stale page state (e.g. "RUNNING", "STOPPED").
-  string expected_activity = 3;
+  // Field 3 was a previously-planned `expected_activity` for stale-page
+  // detection. The backend determines availability from the freshly-fetched
+  // actual_activity instead, so the field was removed.
+  reserved 3;
+  reserved "expected_activity";
 
   // The universe of the host.
   string universe = 4;
@@ -335,10 +337,11 @@ message PreflightLabServerLifecycleResponse {
     enum Type {
       TYPE_UNSPECIFIED = 0;
       NO_VERSION_RECORD = 1;  // Never deployed, no version history
-      VERSION_TOO_OLD = 2;    // Previous version is deprecated
+      CURRENT_VERSION_UNAVAILABLE =
+          2;  // Current version is no longer supported
     }
     Type type = 1;
-    string current_version = 2;                         // Reserved
+    string current_version = 2;  // The current running version, if any
     repeated DeployableVersion available_versions = 3;  // Versions to choose
   }
 
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/BUILD b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/BUILD
@@ -44,6 +44,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:host_types",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:host_version_util",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:lab_activities",
+        "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:lab_server_action_availabilities",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/shared",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/shared/providers:lab_info_provider",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/shared/remotecontrol",
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/LabServerRestartButtonBuilder.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/LabServerRestartButtonBuilder.java
@@ -18,6 +18,7 @@
 
 import com.google.devtools.mobileharness.api.query.proto.LabQueryProto.LabInfo;
 import com.google.devtools.mobileharness.fe.v6.service.host.util.HostTypes;
+import com.google.devtools.mobileharness.fe.v6.service.host.util.LabServerActionAvailabilities;
 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.HostConnectivityStatus;
@@ -51,8 +52,6 @@ public ActionButtonState build(
       HostConnectivityStatus connectivityStatus,
       DaemonServerInfo.Status daemonStatus) {
 
-    // TODO: Refactor this logic into a shared util class when it is needed by 2 consumers (e.g.,
-    // for the preflight request).
     if (!featureManagerFactory.create(universe).isLabServerRestartFeatureEnabled()) {
       return ActionButtonState.newBuilder().setVisible(false).build();
     }
@@ -63,14 +62,9 @@ public ActionButtonState build(
       return ActionButtonState.newBuilder().setVisible(false).build();
     }
 
-    boolean daemonRunning = daemonStatus.getState() == DaemonServerInfo.State.RUNNING;
-
-    boolean isTargetActivityState =
-        activity.getState() == LabServerInfo.ActivityState.STARTED
-            || activity.getState() == LabServerInfo.ActivityState.STARTED_BUT_DISCONNECTED
-            || activity.getState() == LabServerInfo.ActivityState.ERROR;
-
-    boolean visibleCondition = daemonRunning && isTargetActivityState;
+    boolean visibleCondition =
+        LabServerActionAvailabilities.isRestartAvailable(
+            activity.getState(), daemonStatus.getState());
 
     if (!visibleCondition) {
       return ActionButtonState.newBuilder().setVisible(false).build();
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/LabServerStartButtonBuilder.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/LabServerStartButtonBuilder.java
@@ -18,6 +18,7 @@
 
 import com.google.devtools.mobileharness.api.query.proto.LabQueryProto.LabInfo;
 import com.google.devtools.mobileharness.fe.v6.service.host.util.HostTypes;
+import com.google.devtools.mobileharness.fe.v6.service.host.util.LabServerActionAvailabilities;
 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.HostConnectivityStatus;
@@ -51,8 +52,6 @@ public ActionButtonState build(
       HostConnectivityStatus connectivityStatus,
       DaemonServerInfo.Status daemonStatus) {
 
-    // TODO: Refactor this logic into a shared util class when it is needed by 2 consumers (e.g.,
-    // for the preflight request).
     if (!featureManagerFactory.create(universe).isLabServerStartFeatureEnabled()) {
       return ActionButtonState.newBuilder().setVisible(false).build();
     }
@@ -63,15 +62,11 @@ public ActionButtonState build(
       return ActionButtonState.newBuilder().setVisible(false).build();
     }
 
-    boolean isTargetActivityState =
-        activity.getState() == LabServerInfo.ActivityState.DRAINED
-            || activity.getState() == LabServerInfo.ActivityState.STOPPED
-            || activity.getState() == LabServerInfo.ActivityState.UNKNOWN;
-
     boolean daemonRunning = daemonStatus.getState() == DaemonServerInfo.State.RUNNING;
-    boolean daemonMissing = daemonStatus.getState() == DaemonServerInfo.State.MISSING;
 
-    boolean visibleCondition = daemonMissing || (daemonRunning && isTargetActivityState);
+    boolean visibleCondition =
+        LabServerActionAvailabilities.isStartAvailable(
+            activity.getState(), daemonStatus.getState());
 
     if (!visibleCondition) {
       return ActionButtonState.newBuilder().setVisible(false).build();
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/LabServerStopButtonBuilder.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/handlers/LabServerStopButtonBuilder.java
@@ -18,6 +18,7 @@
 
 import com.google.devtools.mobileharness.api.query.proto.LabQueryProto.LabInfo;
 import com.google.devtools.mobileharness.fe.v6.service.host.util.HostTypes;
+import com.google.devtools.mobileharness.fe.v6.service.host.util.LabServerActionAvailabilities;
 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.HostConnectivityStatus;
@@ -51,8 +52,6 @@ public ActionButtonState build(
       HostConnectivityStatus connectivityStatus,
       DaemonServerInfo.Status daemonStatus) {
 
-    // TODO: Refactor this logic into a shared util class when it is needed by 2 consumers (e.g.,
-    // for the preflight request).
     if (!featureManagerFactory.create(universe).isLabServerStopFeatureEnabled()) {
       return ActionButtonState.newBuilder().setVisible(false).build();
     }
@@ -63,14 +62,8 @@ public ActionButtonState build(
       return ActionButtonState.newBuilder().setVisible(false).build();
     }
 
-    boolean daemonRunning = daemonStatus.getState() == DaemonServerInfo.State.RUNNING;
-
-    boolean isTargetActivityState =
-        activity.getState() == LabServerInfo.ActivityState.STARTED
-            || activity.getState() == LabServerInfo.ActivityState.STARTED_BUT_DISCONNECTED
-            || activity.getState() == LabServerInfo.ActivityState.ERROR;
-
-    boolean visibleCondition = daemonRunning && isTargetActivityState;
+    boolean visibleCondition =
+        LabServerActionAvailabilities.isStopAvailable(activity.getState(), daemonStatus.getState());
 
     if (!visibleCondition) {
       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
@@ -59,6 +59,14 @@ java_library(
     ],
 )
 
+java_library(
+    name = "lab_server_action_availabilities",
+    srcs = ["LabServerActionAvailabilities.java"],
+    deps = [
+        "//src/devtools/mobileharness/fe/v6/service/proto/host:host_resources_java_proto",
+    ],
+)
+
 java_library(
     name = "host_version_util",
     srcs = ["HostVersionUtil.java"],
diff --git a/src/java/com/google/devtools/mobileharness/fe/v6/service/host/util/LabServerActionAvailabilities.java b/src/java/com/google/devtools/mobileharness/fe/v6/service/host/util/LabServerActionAvailabilities.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.fe.v6.service.host.util;
+
+import com.google.devtools.mobileharness.fe.v6.service.proto.host.DaemonServerInfo;
+import com.google.devtools.mobileharness.fe.v6.service.proto.host.LabServerInfo.ActivityState;
+
+/**
+ * Shared availability rules for lab server lifecycle actions (Start/Restart/Stop).
+ *
+ * <p>Each predicate encodes the same target-activity + daemon condition used to decide button
+ * visibility in {@code LabServerStart/Restart/StopButtonBuilder}, so that the {@code
+ * PreflightLabServerLifecycle} handler stays aligned with the button visibility logic.
+ */
+public final class LabServerActionAvailabilities {
+
+  private LabServerActionAvailabilities() {}
+
+  /** Whether Start is doable given the current lab activity and daemon state. */
+  public static boolean isStartAvailable(ActivityState activity, DaemonServerInfo.State daemon) {
+    boolean targetActivity =
+        activity == ActivityState.DRAINED
+            || activity == ActivityState.STOPPED
+            || activity == ActivityState.UNKNOWN;
+    boolean daemonRunning = daemon == DaemonServerInfo.State.RUNNING;
+    boolean daemonMissing = daemon == DaemonServerInfo.State.MISSING;
+    return daemonMissing || (daemonRunning && targetActivity);
+  }
+
+  /** Whether Restart is doable given the current lab activity and daemon state. */
+  public static boolean isRestartAvailable(ActivityState activity, DaemonServerInfo.State daemon) {
+    return daemon == DaemonServerInfo.State.RUNNING && isRunningLikeActivity(activity);
+  }
+
+  /** Whether Stop is doable given the current lab activity and daemon state. */
+  public static boolean isStopAvailable(ActivityState activity, DaemonServerInfo.State daemon) {
+    return daemon == DaemonServerInfo.State.RUNNING && isRunningLikeActivity(activity);
+  }
+
+  private static boolean isRunningLikeActivity(ActivityState activity) {
+    return activity == ActivityState.STARTED
+        || activity == ActivityState.STARTED_BUT_DISCONNECTED
+        || activity == ActivityState.ERROR;
+  }
+}
diff --git a/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/util/BUILD b/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/util/BUILD
@@ -34,6 +34,7 @@ java_library(
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:host_types",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:host_version_util",
         "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:lab_activities",
+        "//src/java/com/google/devtools/mobileharness/fe/v6/service/host/util:lab_server_action_availabilities",
         "//src/javatests/com/google/devtools/mobileharness/builddefs:truth",
         "@maven//:junit_junit",
     ],
diff --git a/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/util/LabServerActionAvailabilitiesTest.java b/src/javatests/com/google/devtools/mobileharness/fe/v6/service/host/util/LabServerActionAvailabilitiesTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.devtools.mobileharness.fe.v6.service.host.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.devtools.mobileharness.fe.v6.service.proto.host.DaemonServerInfo;
+import com.google.devtools.mobileharness.fe.v6.service.proto.host.LabServerInfo.ActivityState;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class LabServerActionAvailabilitiesTest {
+
+  // ---- Start: available when (DRAINED|STOPPED|UNKNOWN) and daemon running, or daemon missing ----
+
+  @Test
+  public void start_daemonRunning_targetActivities_available() {
+    for (ActivityState s :
+        new ActivityState[] {ActivityState.DRAINED, ActivityState.STOPPED, ActivityState.UNKNOWN}) {
+      assertThat(LabServerActionAvailabilities.isStartAvailable(s, DaemonServerInfo.State.RUNNING))
+          .isTrue();
+    }
+  }
+
+  @Test
+  public void start_daemonRunning_nonTargetActivities_unavailable() {
+    for (ActivityState s :
+        new ActivityState[] {
+          ActivityState.STARTED, ActivityState.STARTED_BUT_DISCONNECTED, ActivityState.ERROR
+        }) {
+      assertThat(LabServerActionAvailabilities.isStartAvailable(s, DaemonServerInfo.State.RUNNING))
+          .isFalse();
+    }
+  }
+
+  @Test
+  public void start_daemonMissing_alwaysAvailable() {
+    assertThat(
+            LabServerActionAvailabilities.isStartAvailable(
+                ActivityState.STARTED, DaemonServerInfo.State.MISSING))
+        .isTrue();
+  }
+
+  // ---- Restart/Stop: available when (STARTED|STARTED_BUT_DISCONNECTED|ERROR) and daemon running
+
+  @Test
+  public void restartAndStop_daemonRunning_runningLikeActivities_available() {
+    for (ActivityState s :
+        new ActivityState[] {
+          ActivityState.STARTED, ActivityState.STARTED_BUT_DISCONNECTED, ActivityState.ERROR
+        }) {
+      assertThat(
+              LabServerActionAvailabilities.isRestartAvailable(s, DaemonServerInfo.State.RUNNING))
+          .isTrue();
+      assertThat(LabServerActionAvailabilities.isStopAvailable(s, DaemonServerInfo.State.RUNNING))
+          .isTrue();
+    }
+  }
+
+  @Test
+  public void restartAndStop_stopped_unavailable() {
+    assertThat(
+            LabServerActionAvailabilities.isRestartAvailable(
+                ActivityState.STOPPED, DaemonServerInfo.State.RUNNING))
+        .isFalse();
+    assertThat(
+            LabServerActionAvailabilities.isStopAvailable(
+                ActivityState.STOPPED, DaemonServerInfo.State.RUNNING))
+        .isFalse();
+  }
+
+  @Test
+  public void restartAndStop_daemonMissing_unavailable() {
+    assertThat(
+            LabServerActionAvailabilities.isRestartAvailable(
+                ActivityState.STARTED, DaemonServerInfo.State.MISSING))
+        .isFalse();
+    assertThat(
+            LabServerActionAvailabilities.isStopAvailable(
+                ActivityState.STARTED, DaemonServerInfo.State.MISSING))
+        .isFalse();
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -103,13 +103,11 @@ export class HttpHostService extends HostService {`
`103`	`103`	`override preflightLabServerLifecycle(`
`104`	`104`	`hostName: string,`
`105`	`105`	`action: LifecycleActionType,`
`106`		`- expectedActivity: string,`
`107`	`106`	`): Observable<PreflightLabServerLifecycleResponse> {`
`108`	`107`	`return this.http.post<PreflightLabServerLifecycleResponse>(`
`109`	`108`	`${this.apiUrl}/${hostName}:preflightLifecycle`,
`110`	`109`	`{`
`111`	`110`	`action,`
`112`		`- expectedActivity,`
`113`	`111`	`},`
`114`	`112`	`);`
`115`	`113`	`}`