Use new workers field on ListWorkersResponse if it exists

Author: laurakwhit

src/lib/components/workers/workers-table/workers-table-row.svelte

@@ -2,7 +2,7 @@
   import SdkLogo from '$lib/components/lines-and-dots/sdk-logo.svelte';
   import { timestamp } from '$lib/components/timestamp.svelte';
   import WorkerStatus from '$lib/components/workers/worker-status.svelte';
-  import type { WorkerInfo } from '$lib/types';
+  import type { WorkerHeartbeat, WorkerListInfo } from '$lib/types';
   import { formatSDKName } from '$lib/utilities/get-sdk-version';
   import { createFilter } from '$lib/utilities/query/to-list-workflow-filters';
   import {
@@ -14,15 +14,13 @@
   import WorkersTableCell from './workers-table-cell.svelte';
 
   interface Props {
-    worker: WorkerInfo;
+    worker: WorkerListInfo | WorkerHeartbeat;
     namespace: string;
     filterable?: boolean;
   }
 
   let { worker, namespace, filterable = false }: Props = $props();
-  const status = $derived(
-    toWorkerStatusReadable(worker.workerHeartbeat?.status),
-  );
+  const status = $derived(toWorkerStatusReadable(worker?.status));
 </script>
 
 <tr>
@@ -31,77 +29,81 @@
   </td>
   <WorkersTableCell
     attribute="WorkerInstanceKey"
-    value={worker.workerHeartbeat?.workerInstanceKey}
-    href={worker.workerHeartbeat?.workerInstanceKey
+    value={worker?.workerInstanceKey}
+    href={worker?.workerInstanceKey
       ? routeForWorkerInstance({
           namespace,
-          workerInstanceKey: worker.workerHeartbeat.workerInstanceKey,
+          workerInstanceKey: worker.workerInstanceKey,
         })
       : undefined}
     {filterable}
   />
   <WorkersTableCell
     attribute="DeploymentName"
-    value={worker.workerHeartbeat?.deploymentVersion?.deploymentName}
-    href={worker.workerHeartbeat?.deploymentVersion?.deploymentName
+    value={worker?.deploymentVersion?.deploymentName}
+    href={worker?.deploymentVersion?.deploymentName
       ? routeForWorkerDeployment({
           namespace,
-          deployment: worker.workerHeartbeat.deploymentVersion.deploymentName,
+          deployment: worker.deploymentVersion.deploymentName,
         })
       : undefined}
     {filterable}
   />
   <!-- TODO: Make Build ID filterable with DT-3745 -->
   <WorkersTableCell
     attribute="BuildId"
-    value={worker.workerHeartbeat?.deploymentVersion?.buildId}
+    value={worker?.deploymentVersion?.buildId}
   />
   <WorkersTableCell
     attribute="TaskQueue"
-    value={worker.workerHeartbeat?.taskQueue}
+    value={worker?.taskQueue}
     {filterable}
   />
   <WorkersTableCell
     attribute="WorkerIdentity"
-    value={worker.workerHeartbeat?.workerIdentity}
+    value={worker?.workerIdentity}
     {filterable}
   />
   <WorkersTableCell
     attribute="HostName"
-    value={worker.workerHeartbeat?.hostInfo?.hostName}
+    value={'hostName' in worker
+      ? worker?.hostName
+      : 'hostInfo' in worker
+        ? worker?.hostInfo?.hostName
+        : ''}
     {filterable}
   />
   <WorkersTableCell
     attribute="StartTime"
-    value={$timestamp(worker.workerHeartbeat?.startTime)}
+    value={$timestamp(worker?.startTime)}
   />
   <WorkersTableCell
     copyable={false}
     {filterable}
     filters={[
-      ...(worker.workerHeartbeat?.sdkName
+      ...(worker?.sdkName
         ? [
             createFilter({
               attribute: 'SdkName',
-              value: worker.workerHeartbeat.sdkName,
+              value: worker.sdkName,
               conditional: '=',
             }),
           ]
         : []),
-      ...(worker.workerHeartbeat?.sdkVersion
+      ...(worker?.sdkVersion
         ? [
             createFilter({
               attribute: 'SdkVersion',
-              value: worker.workerHeartbeat.sdkVersion,
+              value: worker.sdkVersion,
               conditional: '=',
             }),
           ]
         : []),
     ]}
   >
     <SdkLogo
-      sdk={formatSDKName(worker.workerHeartbeat?.sdkName)}
-      version={worker.workerHeartbeat?.sdkVersion ?? ''}
+      sdk={formatSDKName(worker?.sdkName)}
+      version={worker?.sdkVersion ?? ''}
     />
   </WorkersTableCell>
 </tr>

src/lib/components/workers/workers-table/workers-table.svelte

@@ -7,7 +7,7 @@
   } from '$lib/holocene/table/paginated-table/api-paginated.svelte';
   import { translate } from '$lib/i18n/translate';
   import { workflowRun } from '$lib/stores/workflow-run';
-  import type { WorkerInfo } from '$lib/types';
+  import type { WorkerHeartbeat, WorkerListInfo } from '$lib/types';
   import { isRunningWithNoWorkers } from '$lib/utilities/is-running-with-no-workers';
 
   import WorkerHeartbeatsSDKAlert from './worker-heartbeats-sdk-warning.svelte';
@@ -17,7 +17,7 @@
   interface Props {
     filterable?: boolean;
     namespace: string;
-    onFetch: () => Promise<PaginatedRequest<WorkerInfo>>;
+    onFetch: () => Promise<PaginatedRequest<WorkerListInfo | WorkerHeartbeat>>;
     onError?: (err: unknown) => void;
   }
 
@@ -59,7 +59,7 @@
       <th>{label}</th>
     {/each}
   </tr>
-  {#each visibleItems as worker, i (worker.workerHeartbeat?.workerInstanceKey ?? i)}
+  {#each visibleItems as worker, i (worker?.workerInstanceKey ?? i)}
     <WorkersTableRow {worker} {namespace} {filterable} />
   {/each}
 

src/lib/services/worker-service.ts

@@ -3,15 +3,19 @@ import type {
   DescribeWorkerResponse,
   ListWorkersRequest,
   ListWorkersResponse,
-  WorkerInfo,
+  WorkerHeartbeat,
+  WorkerListInfo,
 } from '$lib/types';
 import { requestFromAPI } from '$lib/utilities/request-from-api';
 import { routeForApi } from '$lib/utilities/route-for-api';
 
 type PaginatedWorkerListPromise = (
   pageSize: number,
   token: string,
-) => Promise<{ items: WorkerInfo[]; nextPageToken: string }>;
+) => Promise<{
+  items: WorkerHeartbeat[] | WorkerListInfo[];
+  nextPageToken: string;
+}>;
 
 export const fetchPaginatedWorkers = async (
   parameters: ListWorkersRequest,
@@ -26,9 +30,14 @@ export const fetchPaginatedWorkers = async (
         nextPageToken: token,
         ...(parameters.query && { query: parameters.query }),
       },
-    }).then(({ workersInfo, nextPageToken }) => {
+    }).then(({ workersInfo, workers, nextPageToken }) => {
       return {
-        items: workersInfo ?? [],
+        items:
+          workers ??
+          workersInfo
+            ?.map(({ workerHeartbeat }) => workerHeartbeat)
+            .filter((h): h is WorkerHeartbeat => !!h) ??
+          [],
         nextPageToken: nextPageToken ? String(nextPageToken) : '',
       };
     });

src/lib/types/index.ts

@@ -52,7 +52,9 @@ export type UnpauseWorkflowRequest =
 export type ListWorkersRequest =
   temporal.api.workflowservice.v1.IListWorkersRequest;
 export type ListWorkersResponse =
-  temporal.api.workflowservice.v1.IListWorkersResponse;
+  temporal.api.workflowservice.v1.IListWorkersResponse & {
+    workers?: WorkerListInfo[];
+  };
 export type DescribeWorkerRequest =
   temporal.api.workflowservice.v1.IDescribeWorkerRequest;
 export type DescribeWorkerResponse =
@@ -284,12 +286,24 @@ export type Failure = temporal.api.failure.v1.IFailure;
 export type WorkerHostInfo = temporal.api.worker.v1.IWorkerHostInfo & {
   workerGroupingKey?: string;
 };
-export type WorkerHeartbeat = temporal.api.worker.v1.IWorkerHeartbeat & {
-  hostInfo?: WorkerHostInfo;
-};
+export type WorkerHeartbeat = temporal.api.worker.v1.IWorkerHeartbeat;
 export type WorkerPollerInfo = temporal.api.worker.v1.IWorkerPollerInfo;
 export type WorkerSlotsInfo = temporal.api.worker.v1.IWorkerSlotsInfo;
 export type WorkerInfo = temporal.api.worker.v1.IWorkerInfo;
+export type WorkerListInfo = {
+  workerInstanceKey?: string | null;
+  workerIdentity?: string | null;
+  taskQueue?: string | null;
+  deploymentVersion?: temporal.api.deployment.v1.IWorkerDeploymentVersion | null;
+  sdkName?: string | null;
+  sdkVersion?: string | null;
+  status?: temporal.api.enums.v1.WorkerStatus | null;
+  startTime?: google.protobuf.ITimestamp | null;
+  hostName?: string | null;
+  workerGroupingKey?: string | null;
+  processId?: string | null;
+  plugins?: temporal.api.worker.v1.IPluginInfo[] | null;
+};
 export type PluginInfo = temporal.api.worker.v1.PluginInfo;
 
 // google