Fix web app TypeScript errors in approvals views and auth provider

- database.ts: Use TaskStatus type instead of string for task.status in listPendingApprovals return type so it matches PendingApprovalRecord - convex-provider.tsx: Coerce undefined to null in getAccessToken return to match Convex UseAuth interface

Rhys Sullivan committed 9 months ago

Commit bfdfd721 parent fc207af2 files · +3 −2Browse files

Unified · Split

2 files

executor/apps/web/src/lib/convex-provider.tsx +1 −1
executor/convex/database.ts +2 −1

executor/apps/web/src/lib/convex-provider.tsx+1−1

@@ -21,7 +21,7 @@ function useConvexWorkosAuth() { · 20 unmodified lines
21	return {	21	return {
22	isLoading: loading,	22	isLoading: loading,
23	user,	23	user,
24	getAccessToken,	24	getAccessToken: async () => (await getAccessToken()) ?? null,
25	};	25	};
26	}	26	}
27		27

executor/convex/database.ts+2−1

 import type { MutationCtx, QueryCtx } from "./_generated/server";
 import { mutation, query } from "./_generated/server";
 import { ensureUniqueSlug } from "./lib/slug";
+import type { TaskStatus } from "@executor/contracts";
 const DEFAULT_TIMEOUT_MS = 300_000;
 type OrganizationRole = "owner" | "admin" | "member" | "billing_admin";
     const results: Array<
       ReturnType<typeof mapApproval> & {
-        task: { id: string; status: string; runtimeId: string; timeoutMs: number; createdAt: number };
+        task: { id: string; status: TaskStatus; runtimeId: string; timeoutMs: number; createdAt: number };
       }
     > = [];
     for (let i = 0; i < docs.length; i++) {