Add check for decodedPayload strings to set metadata, add abort signa…

…l on workflow metadata query, use italics in details
temporalio · Nov 20, 2024 · 4d08dec · 4d08dec
1 parent 77f4828
commit 4d08dec
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 31 deletions.
diff --git a/src/lib/components/lines-and-dots/workflow-detail.svelte b/src/lib/components/lines-and-dots/workflow-detail.svelte
@@ -29,44 +29,44 @@
         <Icon name={icon} />
       {/if}
       {#if title}
-        {title}
+        <i>{title}</i>
       {/if}
       {#if href}
         <Link
           {href}
           class="flex w-fit flex-row items-center gap-1 truncate rounded-sm p-1 leading-4 {badge &&
             'surface-subtle'}"
-          ><span class="truncate font-bold">{content}</span>
+          ><span class="truncate">{content}</span>
           {#if filterable}
             <Icon name="filter" class="shrink-0" />
           {/if}
         </Link>
       {:else}
         <Tooltip text={tooltip} hide={!tooltip} top>
           <span
-            class="w-fit select-all truncate rounded-sm p-1 font-bold leading-4"
+            class="w-fit select-all truncate rounded-sm p-1 leading-4"
             class:surface-subtle={badge}>{content}</span
           >
         </Tooltip>
       {/if}
     </Copyable>
   {:else}
     {#if title}
-      {title}
+      <i>{title}</i>
     {/if}
     {#if icon}
       <Icon name={icon} />
     {/if}
     {#if href}
       <Link
         {href}
-        class="value truncate rounded-sm p-1 font-bold leading-4 {badge &&
+        class="value truncate rounded-sm p-1 leading-4 {badge &&
           'surface-subtle'}">{content}</Link
       >
     {:else}
       <Tooltip text={tooltip} hide={!tooltip} top>
         <span
-          class="w-fit select-all truncate rounded-sm p-1 font-bold leading-4"
+          class="w-fit select-all truncate rounded-sm p-1 leading-4"
           class:surface-subtle={badge}>{content}</span
         >
       </Tooltip>

diff --git a/src/lib/layouts/workflow-run-layout.svelte b/src/lib/layouts/workflow-run-layout.svelte
@@ -42,7 +42,7 @@
   $: fullJson = { ...$workflowRun, eventHistory: $fullEventHistory };
 
   let workflowError: NetworkError;
-  let eventHistoryController: AbortController;
+  let workflowRunController: AbortController;
   let refreshInterval;
 
   const { copy, copied } = copyToClipboard();
@@ -54,13 +54,20 @@
   const decodeUserMetadata = async (workflow: WorkflowExecution) => {
     try {
       if (workflow?.summary) {
-        $workflowRun.userMetadata.summary =
-          await decodeSingleReadablePayloadWithCodec(workflow.summary);
+        const decodedSummary = await decodeSingleReadablePayloadWithCodec(
+          workflow.summary,
+        );
+        if (typeof decodedSummary === 'string') {
+          $workflowRun.userMetadata.summary = decodedSummary;
+        }
       }
-
       if (workflow?.details) {
-        $workflowRun.userMetadata.details =
-          await decodeSingleReadablePayloadWithCodec(workflow.details);
+        const decodedDetails = await decodeSingleReadablePayloadWithCodec(
+          workflow.details,
+        );
+        if (typeof decodedDetails === 'string') {
+          $workflowRun.userMetadata.details = decodedDetails;
+        }
       }
     } catch (e) {
       console.error('Error decoding user metadata', e);
@@ -98,6 +105,7 @@
       $authUser?.accessToken,
     );
 
+    workflowRunController = new AbortController();
     getWorkflowMetadata(
       {
         namespace,
@@ -108,17 +116,17 @@
       },
       settings,
       $authUser?.accessToken,
+      workflowRunController.signal,
     ).then((metadata) => {
       $workflowRun.metadata = metadata;
     });
 
-    eventHistoryController = new AbortController();
     $fullEventHistory = await fetchAllEvents({
       namespace,
       workflowId,
       runId,
       sort: 'ascending',
-      signal: eventHistoryController.signal,
+      signal: workflowRunController.signal,
       historySize: workflow.historyEvents,
     });
   };
@@ -149,8 +157,8 @@
 
   const abortPolling = () => {
     $fullEventHistory = [];
-    if (eventHistoryController) {
-      eventHistoryController.abort();
+    if (workflowRunController) {
+      workflowRunController.abort();
     }
   };
 

diff --git a/src/lib/services/query-service.ts b/src/lib/services/query-service.ts
@@ -54,12 +54,7 @@ const formatParameters = async (
 
 async function fetchQuery(
   { workflow, namespace, queryType, queryArgs }: QueryRequestParameters,
-  request = fetch,
-  onError?: (error: {
-    status: number;
-    statusText: string;
-    body: unknown;
-  }) => void,
+  signal?: AbortSignal,
 ): Promise<QueryResponse> {
   workflow = await workflow;
   const parameters = await formatParameters(namespace, workflow, queryType);
@@ -78,9 +73,9 @@ async function fetchQuery(
           queryArgs,
         },
       }),
+      signal,
     },
-    request,
-    onError,
+    request: fetch,
     notifyOnError: false,
   });
 }
@@ -89,12 +84,14 @@ export async function getWorkflowMetadata(
   options: WorkflowParameters,
   settings: Settings,
   accessToken: string,
+  signal?: AbortSignal,
 ): Promise<WorkflowMetadata> {
   try {
     const metadata = await getQuery(
       { ...options, queryType: '__temporal_workflow_metadata' },
       settings,
       accessToken,
+      signal,
     );
     return metadata;
   } catch (e) {
@@ -117,9 +114,9 @@ export async function getQuery(
   options: QueryRequestParameters,
   settings: Settings,
   accessToken: string,
-  request = fetch,
+  signal?: AbortSignal,
 ): Promise<ParsedQuery> {
-  return fetchQuery(options, request).then(async (execution) => {
+  return fetchQuery(options, signal).then(async (execution) => {
     const { queryResult } = execution ?? { queryResult: { payloads: [] } };
 
     let data: ParsedQuery = queryResult.payloads;

diff --git a/src/lib/services/workflow-service.ts b/src/lib/services/workflow-service.ts
@@ -633,12 +633,22 @@ export const fetchInitialValuesForStartWorkflow = async ({
 
     let summary = '';
     if (workflow.summary) {
-      summary = await decodeSingleReadablePayloadWithCodec(workflow.summary);
+      const decodedSummary = await decodeSingleReadablePayloadWithCodec(
+        workflow.summary,
+      );
+      if (typeof decodedSummary === 'string') {
+        summary = decodedSummary;
+      }
     }
 
     let details = '';
     if (workflow.details) {
-      details = await decodeSingleReadablePayloadWithCodec(workflow.details);
+      const decodedDetails = await decodeSingleReadablePayloadWithCodec(
+        workflow.summary,
+      );
+      if (typeof decodedDetails === 'string') {
+        details = decodedDetails;
+      }
     }
 
     const input = stringifyWithBigInt(convertedAttributes?.payloads[0]);

diff --git a/src/lib/utilities/decode-payload.ts b/src/lib/utilities/decode-payload.ts
@@ -179,11 +179,11 @@ const keyIs = (key: string, ...validKeys: string[]) => {
 export const decodeSingleReadablePayloadWithCodec = async (
   payload: RawPayload | Payload,
   settings: Settings = get(page).data.settings,
-): Promise<string> => {
+): Promise<string | Payload> => {
   try {
     const decode = decodeReadablePayloads(settings);
     const data = await decode([payload]);
-    const result = data[0] as string;
+    const result = data[0];
     return result || '';
   } catch {
     return '';

diff --git a/src/routes/(app)/nexus/[id]/+layout.ts b/src/routes/(app)/nexus/[id]/+layout.ts
@@ -15,7 +15,10 @@ export const load = async ({ params, fetch, parent }) => {
           endpoint.spec.description,
           data.settings,
         );
-        description = decodedDescription;
+
+        if (typeof decodedDescription === 'string') {
+          description = decodedDescription;
+        }
       }
     } catch (e) {
       console.error('Error decoding Nexus Endpoint description:', e);