Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(web): preserve cached integration status on refresh errors

Tin8aab7edfe124
diff --git a/apps/web/src/components/project/integrations/get-integration-status.test.ts b/apps/web/src/components/project/integrations/get-integration-status.test.ts
index e3ac98c93..7980fcbf4 100644
--- a/apps/web/src/components/project/integrations/get-integration-status.test.ts
+++ b/apps/web/src/components/project/integrations/get-integration-status.test.ts
@@ -22,19 +22,40 @@ describe("getIntegrationStatus", () => {
).toEqual({ state: "unavailable" });
});
+ it.each(["pending", "error"] as const)(
+ "keeps cached configuration when the query is %s",
+ (queryStatus) => {
+ expect(
+ getIntegrationStatus({
+ queryStatus,
+ hasData: true,
+ configured: true,
+ isActive: true,
+ detail: "acme/web",
+ }),
+ ).toEqual({ state: "connected", detail: "acme/web" });
+ expect(
+ getIntegrationStatus({ queryStatus, hasData: true, configured: false }),
+ ).toEqual({ state: "disconnected" });
+ },
+ );
+
it("is disconnected until the integration is configured", () => {
expect(
getIntegrationStatus({ configured: false, isActive: true, detail: "x" }),
).toEqual({ state: "disconnected" });
});
- it("is paused when configured but switched off", () => {
- expect(
- getIntegrationStatus({ configured: true, isActive: false }).state,
- ).toBe("paused");
- });
+ it.each([false, null, undefined])(
+ "is paused when configured with inactive value %s",
+ (isActive) => {
+ expect(getIntegrationStatus({ configured: true, isActive }).state).toBe(
+ "paused",
+ );
+ },
+ );
- it("is connected when configured and not switched off", () => {
+ it("is connected when configured and explicitly active", () => {
expect(
getIntegrationStatus({
configured: true,
@@ -42,7 +63,6 @@ describe("getIntegrationStatus", () => {
detail: " acme/web ",
}),
).toEqual({ state: "connected", detail: "acme/web" });
- expect(getIntegrationStatus({ configured: true }).state).toBe("connected");
});
});
diff --git a/apps/web/src/components/project/integrations/get-integration-status.ts b/apps/web/src/components/project/integrations/get-integration-status.ts
index dd8c6959f..b94c87f10 100644
--- a/apps/web/src/components/project/integrations/get-integration-status.ts
+++ b/apps/web/src/components/project/integrations/get-integration-status.ts
@@ -11,6 +11,7 @@ export type IntegrationStatus = {
};
type IntegrationStatusInput = {
+ hasData?: boolean;
queryStatus?: "pending" | "error" | "success";
configured: boolean;
isActive?: boolean | null;
@@ -19,16 +20,17 @@ type IntegrationStatusInput = {
export function getIntegrationStatus({
queryStatus = "success",
+ hasData = queryStatus === "success",
configured,
isActive,
detail,
}: IntegrationStatusInput): IntegrationStatus {
- if (queryStatus === "pending") return { state: "loading" };
- if (queryStatus === "error") return { state: "unavailable" };
+ if (!hasData && queryStatus === "pending") return { state: "loading" };
+ if (!hasData && queryStatus === "error") return { state: "unavailable" };
if (!configured) return { state: "disconnected" };
return {
- state: isActive === false ? "paused" : "connected",
+ state: isActive === true ? "connected" : "paused",
detail: detail?.trim() || undefined,
};
}
diff --git a/apps/web/src/components/project/integrations/use-integration-statuses.test.tsx b/apps/web/src/components/project/integrations/use-integration-statuses.test.tsx
index c771cae3a..e028cc29b 100644
--- a/apps/web/src/components/project/integrations/use-integration-statuses.test.tsx
+++ b/apps/web/src/components/project/integrations/use-integration-statuses.test.tsx
@@ -125,7 +125,11 @@ describe("useIntegrationStatuses", () => {
it("starts with an unknown status when switching projects", async () => {
fetchers.github.mockImplementation((projectId: string) =>
projectId === "p1"
- ? Promise.resolve({ repositoryOwner: "acme", repositoryName: "web" })
+ ? Promise.resolve({
+ repositoryOwner: "acme",
+ repositoryName: "web",
+ isActive: true,
+ })
: new Promise(() => {}),
);
const { result, rerender } = renderHook(
@@ -139,4 +143,64 @@ describe("useIntegrationStatuses", () => {
expect(result.current.statuses.github.state).toBe("loading");
expect(result.current.statuses.github.detail).toBeUndefined();
});
+ it("shows loading during a delayed retry and reuses the in-flight request", async () => {
+ let resolve!: (value: unknown) => void;
+ fetchers.github
+ .mockRejectedValueOnce(new Error("Network unavailable"))
+ .mockReturnValue(
+ new Promise((done) => {
+ resolve = done;
+ }),
+ );
+ const { result } = renderHook(() => useIntegrationStatuses("p1"), {
+ wrapper,
+ });
+ await waitFor(() =>
+ expect(result.current.statuses.github.state).toBe("unavailable"),
+ );
+ act(() => result.current.retry("github"));
+ await waitFor(() =>
+ expect(result.current.statuses.github.state).toBe("loading"),
+ );
+ act(() => result.current.retry("github"));
+ expect(fetchers.github).toHaveBeenCalledTimes(2);
+ await act(async () => {
+ resolve(null);
+ });
+ await waitFor(() =>
+ expect(result.current.statuses.github.state).toBe("disconnected"),
+ );
+ });
+
+ it.each([
+ {
+ data: { repositoryOwner: "acme", repositoryName: "web", isActive: true },
+ expected: { state: "connected", detail: "acme/web" },
+ },
+ {
+ data: { repositoryOwner: "acme", repositoryName: "web", isActive: null },
+ expected: { state: "paused", detail: "acme/web" },
+ },
+ { data: null, expected: { state: "disconnected" } },
+ ])(
+ "keeps the last loaded status after a failed background refresh: $expected.state",
+ async ({ data, expected }) => {
+ fetchers.github
+ .mockResolvedValueOnce(data)
+ .mockRejectedValue(new Error("Network unavailable"));
+ const { result } = renderHook(() => useIntegrationStatuses("p1"), {
+ wrapper,
+ });
+ await waitFor(() =>
+ expect(result.current.statuses.github).toEqual(expected),
+ );
+ await act(async () => {
+ await client.refetchQueries({ queryKey: ["github-integration", "p1"] });
+ });
+ expect(client.getQueryState(["github-integration", "p1"])?.status).toBe(
+ "error",
+ );
+ expect(result.current.statuses.github).toEqual(expected);
+ },
+ );
});
diff --git a/apps/web/src/components/project/integrations/use-integration-statuses.ts b/apps/web/src/components/project/integrations/use-integration-statuses.ts
index d8e1d3ed2..51ec96bea 100644
--- a/apps/web/src/components/project/integrations/use-integration-statuses.ts
+++ b/apps/web/src/components/project/integrations/use-integration-statuses.ts
@@ -28,6 +28,7 @@ export function useIntegrationStatuses(projectId: string) {
const statuses = {
github: getIntegrationStatus({
queryStatus: github.status,
+ hasData: github.data !== undefined,
configured: Boolean(github.data),
isActive: github.data?.isActive,
detail: formatRepository(
@@ -37,6 +38,7 @@ export function useIntegrationStatuses(projectId: string) {
}),
gitea: getIntegrationStatus({
queryStatus: gitea.status,
+ hasData: gitea.data !== undefined,
configured: Boolean(gitea.data),
isActive: gitea.data?.isActive,
detail: formatRepository(
@@ -46,36 +48,42 @@ export function useIntegrationStatuses(projectId: string) {
}),
gitlab: getIntegrationStatus({
queryStatus: gitlab.status,
+ hasData: gitlab.data !== undefined,
configured: Boolean(gitlab.data),
isActive: gitlab.data?.isActive,
detail: gitlab.data?.projectPath,
}),
slack: getIntegrationStatus({
queryStatus: slack.status,
+ hasData: slack.data !== undefined,
configured: Boolean(slack.data?.webhookConfigured),
isActive: slack.data?.isActive,
detail: formatChannel(slack.data?.channelName),
}),
discord: getIntegrationStatus({
queryStatus: discord.status,
+ hasData: discord.data !== undefined,
configured: Boolean(discord.data?.webhookConfigured),
isActive: discord.data?.isActive,
detail: formatChannel(discord.data?.channelName),
}),
mattermost: getIntegrationStatus({
queryStatus: mattermost.status,
+ hasData: mattermost.data !== undefined,
configured: Boolean(mattermost.data?.webhookConfigured),
isActive: mattermost.data?.isActive,
detail: formatChannel(mattermost.data?.channelName),
}),
telegram: getIntegrationStatus({
queryStatus: telegram.status,
+ hasData: telegram.data !== undefined,
configured: Boolean(telegram.data?.botTokenConfigured),
isActive: telegram.data?.isActive,
detail: telegram.data?.chatLabel,
}),
webhook: getIntegrationStatus({
queryStatus: webhook.status,
+ hasData: webhook.data !== undefined,
configured: Boolean(webhook.data?.webhookConfigured),
isActive: webhook.data?.isActive,
}),