Break out getting agent name

code-asher · code-asher · commit 144d34e4f930 · 2023-10-19T10:02:17.000-08:00
To make it easier to move away from this service.
diff --git a/site/src/utils/workspace.tsx b/site/src/utils/workspace.tsx
@@ -286,3 +286,20 @@ export const hasJobError = (workspace: TypesGen.Workspace) => {
 export const paramsUsedToCreateWorkspace = (
   param: TypesGen.TemplateVersionParameter,
 ) => !param.ephemeral;
+
+export const getMatchingAgentOrFirst = (
+  workspace: TypesGen.Workspace,
+  agentName: string | undefined,
+): TypesGen.WorkspaceAgent | undefined => {
+  return workspace.latest_build.resources
+    .map((resource) => {
+      if (!resource.agents || resource.agents.length === 0) {
+        return;
+      }
+      if (!agentName) {
+        return resource.agents[0];
+      }
+      return resource.agents.find((agent) => agent.name === agentName);
+    })
+    .filter((a) => a)[0];
+};
diff --git a/site/src/xServices/terminal/terminalXService.ts b/site/src/xServices/terminal/terminalXService.ts
@@ -1,6 +1,7 @@
 import { assign, createMachine } from "xstate";
 import * as API from "api/api";
 import * as TypesGen from "api/typesGenerated";
+import { getMatchingAgentOrFirst } from "utils/workspace";
 
 interface ReconnectingPTYRequest {
   readonly data?: string;
@@ -196,20 +197,10 @@ export const terminalMachine =
           if (!context.workspace || !context.workspaceName) {
             throw new Error("workspace or workspace name is not set");
           }
-
-          const agent = context.workspace.latest_build.resources
-            .map((resource) => {
-              if (!resource.agents || resource.agents.length === 0) {
-                return;
-              }
-              if (!context.agentName) {
-                return resource.agents[0];
-              }
-              return resource.agents.find(
-                (agent) => agent.name === context.agentName,
-              );
-            })
-            .filter((a) => a)[0];
+          const agent = getMatchingAgentOrFirst(
+            context.workspace,
+            context.agentName,
+          );
           if (!agent) {
             throw new Error("no agent found with id");
           }
