Skip to content
Merged
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
36 changes: 15 additions & 21 deletions apps/web/src/state/pullRequests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
} from "@t3tools/shared/threadPullRequests";
import * as Option from "effect/Option";
import { AsyncResult, Atom } from "effect/reactivity";
import { useCallback, useLayoutEffect, useMemo } from "react";
import { useLayoutEffect } from "react";

import { connectionAtomRuntime } from "../connection/runtime";
import { appAtomRegistry } from "../rpc/atomRegistry";
Expand Down Expand Up @@ -288,16 +288,13 @@ function createMergedEnvironmentQuery<Input, A>(
return function useMergedQuery(targets: ReadonlyArray<EnvironmentQueryTarget<Input>>) {
const key = JSON.stringify(targets);
const view = useAtomValue(targets.length === 0 ? empty : family(key));
const refresh = useCallback(
(override?: ReadonlyArray<EnvironmentQueryTarget<Input>>) => {
const refreshTargets =
override ?? (JSON.parse(key) as ReadonlyArray<EnvironmentQueryTarget<Input>>);
for (const atom of new Set(refreshTargets.map(atomFor))) {
appAtomRegistry.refresh(atom);
}
},
[key],
);
const refresh = (override?: ReadonlyArray<EnvironmentQueryTarget<Input>>) => {
const refreshTargets =
override ?? (JSON.parse(key) as ReadonlyArray<EnvironmentQueryTarget<Input>>);
for (const atom of new Set(refreshTargets.map(atomFor))) {
appAtomRegistry.refresh(atom);
}
};
return { ...view, refresh };
};
}
Expand Down Expand Up @@ -359,7 +356,7 @@ export function usePullRequestList(
}
}
}, [query.observations]);
const data = useMemo(() => mergePullRequestLists(query.values), [query.values]);
const data = mergePullRequestLists(query.values);
return { data, error: query.error, isPending: query.isPending, refresh: query.refresh };
}

Expand All @@ -373,14 +370,11 @@ export function usePullRequestListStats(
) => void;
} {
const query = usePullRequestStatsQuery(targets);
const stats = useMemo(
() =>
query.values.length === 0
? null
: query.values.flatMap(([environmentId, result]) =>
result.stats.map((stat) => ({ ...stat, environmentId })),
),
[query.values],
);
const stats =
query.values.length === 0
? null
: query.values.flatMap(([environmentId, result]) =>
result.stats.map((stat) => ({ ...stat, environmentId })),
);
return { stats, isPending: query.isPending, refresh: query.refresh };
}
Loading