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
19 changes: 14 additions & 5 deletions packages/settings-ui/src/connections-status.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,18 @@ describe("connectorStatus", () => {
expect(result.status).toBe("not_connected");
});

test("not_connected when a provider exists but no credential points at it", () => {
test("connected when a provider exists even if the credential list omits inherited credentials", () => {
const result = connectorStatus("linear", [], [provider()]);
expect(result.status).toBe("not_connected");
expect(result.status).toBe("connected");
});

test("connected when local Ollama has an active credential", () => {
const result = connectorStatus(
"ollama",
[credential({ providerId: "ollama-provider", status: "active" })],
[provider({ id: "ollama-provider", name: "ollama", plugin: "ollama" })],
);
expect(result.status).toBe("connected");
});

test("connected when the newest credential is active", () => {
Expand Down Expand Up @@ -91,14 +100,14 @@ describe("connectorStatus", () => {
const result = connectorStatus("linear", [older, newer], [provider()]);
expect(result.status).toBe("connected");
if (result.status === "connected") {
expect(result.credential.id).toBe("cred-new");
expect(result.credential?.id).toBe("cred-new");
}
});

test("ignores credentials belonging to a different provider", () => {
test("keeps the provider connected when only unrelated credentials are listed", () => {
const other = credential({ providerId: "provider-2", status: "active" });
const result = connectorStatus("linear", [other], [provider()]);
expect(result.status).toBe("not_connected");
expect(result.status).toBe("connected");
});

// Regression for the bug where the card grid matched on
Expand Down
4 changes: 2 additions & 2 deletions packages/settings-ui/src/connections-status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export type ConnectorStatus = "not_connected" | "connected" | "needs_attention";

export type ConnectorStatusResult =
| { readonly status: "not_connected" }
| { readonly status: "connected"; readonly credential: Credential }
| { readonly status: "connected"; readonly credential?: Credential }
| { readonly status: "needs_attention"; readonly credential: Credential };

/**
Expand All @@ -35,7 +35,7 @@ export function connectorStatus(
if (provider === undefined) return { status: "not_connected" };

const matches = credentials.filter((c) => c.providerId === provider.id);
if (matches.length === 0) return { status: "not_connected" };
if (matches.length === 0) return { status: "connected" };

const newest = matches.reduce((latest, candidate) => {
const latestKey = latest.createdAt ?? latest.updatedAt;
Expand Down
Loading