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
4 changes: 3 additions & 1 deletion packages/ui/src/features/updates/UpdateAvailableModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ReleaseNotesSections } from "@posthog/ui/features/updates/ReleaseNotesS
import { parseReleaseNotes } from "@posthog/ui/features/updates/releaseNotes";
import { useUpdateModalStore } from "@posthog/ui/features/updates/updateModalStore";
import {
useHasActiveUpdate,
useInstallUpdate,
useUpdateView,
} from "@posthog/ui/features/updates/updateStore";
Expand Down Expand Up @@ -62,12 +63,13 @@ export function UpdateAvailableModal() {
const downloadMutation = useMutation(
hostTRPC.updates.download.mutationOptions(),
);
const prefetchForActiveUpdate = useHasActiveUpdate();
const targetVersion = version ?? availableVersion;
const { data: releasesData, isPending: isPendingReleases } = useQuery({
...hostTRPC.githubReleases.list.queryOptions(
targetVersion ? { expectVersion: targetVersion } : undefined,
),
enabled: isOpen,
enabled: isOpen || prefetchForActiveUpdate,
});

const percent = Math.round(downloadPercent ?? 0);
Expand Down
4 changes: 3 additions & 1 deletion packages/ui/src/features/updates/WhatsNewModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
groupReleases,
mergeReleaseNotes,
} from "@posthog/ui/features/updates/releaseNotes";
import { useHasActiveUpdate } from "@posthog/ui/features/updates/updateStore";
import { useWhatsNewStore } from "@posthog/ui/features/updates/whatsNewStore";
import {
Badge,
Expand Down Expand Up @@ -41,6 +42,7 @@ function ChangelogSkeleton() {
export function WhatsNewModal() {
const isOpen = useWhatsNewStore((state) => state.isOpen);
const close = useWhatsNewStore((state) => state.close);
const prefetchForActiveUpdate = useHasActiveUpdate();
const hostTRPC = useHostTRPC();
const { data: currentVersion, isError: isVersionError } = useQuery(
hostTRPC.os.getAppVersion.queryOptions(),
Expand All @@ -53,7 +55,7 @@ export function WhatsNewModal() {
...hostTRPC.githubReleases.list.queryOptions(
currentVersion ? { expectVersion: currentVersion } : undefined,
),
enabled: isOpen && !!currentVersion,
enabled: (isOpen || prefetchForActiveUpdate) && !!currentVersion,
});
const isError = isVersionError || isReleasesError;

Expand Down
11 changes: 11 additions & 0 deletions packages/ui/src/features/updates/updateStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ export function useUpdateView(): UpdateView {
}));
}

export function useHasActiveUpdate(): boolean {
return useStore(
updateStore,
(state) =>
state.status === "available" ||
state.status === "downloading" ||
state.status === "ready" ||
state.status === "installing",
);
}

export function useInstallUpdate(): () => Promise<void> {
const client = useService<UpdatesClient>(UPDATES_CLIENT);

Expand Down
Loading