NEOS-1605: Fixes job run logs not loading, fixes inability to specify…

… log level (#3172)
nucleuscloud · Jan 21, 2025 · 8f572a8 · 8f572a8
1 parent 0807f85
commit 8f572a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/frontend/apps/web/app/api/accounts/[accountId]/runs/[id]/logs/route.ts b/frontend/apps/web/app/api/accounts/[accountId]/runs/[id]/logs/route.ts
@@ -1,9 +1,9 @@
 import { withNeosyncContext } from '@/api-only/neosync-context';
 import { RequestContext } from '@/shared';
-import { create } from '@bufbuild/protobuf';
+import { create, JsonValue, toJson } from '@bufbuild/protobuf';
 import {
   GetJobRunLogsStreamRequestSchema,
-  GetJobRunLogsStreamResponse,
+  GetJobRunLogsStreamResponseSchema,
   LogLevel,
   LogWindow,
 } from '@neosync/sdk';
@@ -26,9 +26,9 @@ export async function GET(
         logLevels: [loglevel ? parseInt(loglevel, 10) : LogLevel.UNSPECIFIED],
       })
     );
-    const logs: GetJobRunLogsStreamResponse[] = [];
+    const logs: JsonValue[] = [];
     for await (const logRes of response) {
-      logs.push(logRes);
+      logs.push(toJson(GetJobRunLogsStreamResponseSchema, logRes));
     }
     return logs;
   })(req);

diff --git a/frontend/apps/web/libs/hooks/useGetJobRunLogs.ts b/frontend/apps/web/libs/hooks/useGetJobRunLogs.ts
@@ -32,7 +32,13 @@ export function useGetJobRunLogs(
       '?',
       query.toString(),
     ],
-    queryFn: (ctx) => fetcher(ctx.queryKey.join('/')),
+    queryFn: (ctx) => {
+      const queryKey = ctx.queryKey;
+      const questionMarkIndex = queryKey.indexOf('?');
+      const baseUrl = queryKey.slice(0, questionMarkIndex).join('/');
+      const queryParams = queryKey.slice(questionMarkIndex + 1).join('');
+      return fetcher(`${baseUrl}?${queryParams}`);
+    },
     refetchInterval(query) {
       return query.state.data && refreshIntervalFn
         ? refreshIntervalFn(query.state.data)
@@ -46,7 +52,7 @@ export function useGetJobRunLogs(
           : fromJson(GetJobRunLogsStreamResponseSchema, d)
       );
     },
-    enabled: !!runId && !!accountId && !!loglevel,
+    enabled: !!runId && !!accountId,
   });
 }