Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apps/dashboard/src/lib/github.query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
searchCommandPaletteGitHub,
} from "./github.functions";
import { githubCachePolicy } from "./github-cache-policy";
import { ensureDefinedQueryData } from "./query-data";

type RepoState = "all" | "closed" | "open";
type PullSort = "created" | "long-running" | "popularity" | "updated";
Expand Down Expand Up @@ -302,7 +303,11 @@ export function githubPullPageQueryOptions(
) {
return queryOptions({
queryKey: githubQueryKeys.pulls.page(scope, input),
queryFn: () => getPullPageData({ data: input }),
queryFn: () =>
ensureDefinedQueryData(
() => getPullPageData({ data: input }),
"getPullPageData",
),
staleTime: githubCachePolicy.detail.staleTimeMs,
gcTime: githubCachePolicy.detail.gcTimeMs,
meta: tabPersistedMeta,
Expand Down
19 changes: 19 additions & 0 deletions apps/dashboard/src/lib/query-data.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { describe, expect, it, vi } from "vitest";
import { ensureDefinedQueryData } from "./query-data";

describe("ensureDefinedQueryData", () => {
it("passes through null because null is intentional query data", async () => {
await expect(
ensureDefinedQueryData(async () => null, "getNullableData"),
).resolves.toBeNull();
});

it("throws when a query loader resolves undefined", async () => {
const load = vi.fn(async () => undefined);

await expect(
ensureDefinedQueryData(load, "getPullPageData"),
).rejects.toThrow("getPullPageData returned undefined");
expect(load).toHaveBeenCalledTimes(1);
});
});
11 changes: 11 additions & 0 deletions apps/dashboard/src/lib/query-data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export async function ensureDefinedQueryData<TData>(
load: () => Promise<TData>,
source: string,
): Promise<Exclude<TData, undefined>> {
const data = await load();
if (typeof data === "undefined") {
throw new Error(`${source} returned undefined`);
}

return data as Exclude<TData, undefined>;
}
Loading