Repository navigation
feat(gui): Integrations shows the clients on this machine first #3391
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { useCallback, useEffect, useRef, useState } from "react"; | ||
| import { useDataSurface, type DataSurfaceResource } from "../../data-surface"; | ||
| import { DataSurfaceSkeleton } from "../../components/data-surface"; | ||
| import { navigateHash } from "../../hash-routing"; | ||
| import { useT } from "../../i18n/shared"; | ||
|
|
@@ -169,9 +169,16 @@ function OverviewCard({ | |
| export default function IntegrationsOverview({ | ||
| apiBase, | ||
| active = true, | ||
| statesResource, | ||
| }: { | ||
| apiBase: string; | ||
| active?: boolean; | ||
| /** | ||
| * The file-client state list, owned by the Integrations page (it also drives which | ||
| * tabs are primary). Lifted rather than subscribed twice so there is exactly one | ||
| * owner of the fetch regardless of tab timing. | ||
| */ | ||
| statesResource: DataSurfaceResource<IntegrationStatus[]>; | ||
| }) { | ||
| const t = useT(); | ||
| const [bulkPending, setBulkPending] = useState(false); | ||
|
|
@@ -191,10 +198,6 @@ export default function IntegrationsOverview({ | |
| if (trigger.isConnected) trigger.focus(); | ||
| }, [pendingToggle]); | ||
|
|
||
| const fetchHistory = useCallback( | ||
| async (signal: AbortSignal) => (await loadIntegrationJournal(apiBase, undefined, signal)).operations, | ||
| [apiBase], | ||
|
|
@@ -235,12 +238,6 @@ export default function IntegrationsOverview({ | |
| [apiBase], | ||
| ); | ||
|
|
||
| const historyResource = useDataSurface<IntegrationJournalRow[]>( | ||
| `integration-journal-all:${apiBase}`, | ||
| [apiBase], | ||
|
|
@@ -334,6 +331,23 @@ export default function IntegrationsOverview({ | |
| nativeSettled, | ||
| }); | ||
| const counts = countOverviewRows(rows); | ||
| // Installed (or applied, or not a file client at all) rows are the grid; the rest fold. | ||
| const presentRows = rows.filter(row => row.installed || row.applied || row.status === null); | ||
| const presentIds = new Set(presentRows.map(row => row.id)); | ||
| const absentRows = rows.filter(row => !presentIds.has(row.id)); | ||
|
Comment on lines
+334
to
+337
There was a problem hiding this comment.
If a client is uninstalled after opencodex has written its configuration, the management API can report AGENTS.md reference: gui/AGENTS.md:L9-L10 Useful? React with 👍 / 👎. |
||
| const renderCard = (row: (typeof rows)[number]) => ( | ||
| <OverviewCard | ||
| key={row.id} | ||
| row={row} | ||
| pending={cardPending !== null} | ||
| result={cardResults[row.id] ?? null} | ||
| onOpen={() => navigateHash(row.hash)} | ||
| onToggle={row.toggle ? () => requestToggle(row, !(row.toggleOn ?? row.applied)) : null} | ||
| onOverwrite={row.status !== null && row.status.state === "conflict" && row.installed | ||
| ? () => setPendingOverwrite(row) | ||
| : null} | ||
| /> | ||
| ); | ||
|
|
||
| /* | ||
| * `refresh()` on the resource layer is deliberately fire-and-forget: it | ||
|
|
@@ -416,7 +430,6 @@ export default function IntegrationsOverview({ | |
| : { tone: "err", text: t("integrations.bulk.partial", { clients: failed.join("; ") }) }); | ||
| }; | ||
|
|
||
|
|
||
| /* | ||
| * The card carries its own switch. Sending the user to a sub-page to flip | ||
|
|
@@ -538,10 +551,6 @@ export default function IntegrationsOverview({ | |
| <strong>{counts.unknown}</strong> | ||
| </div> | ||
| )} | ||
| <button | ||
| type="button" | ||
| className="btn btn-ghost" | ||
|
|
@@ -593,21 +602,23 @@ export default function IntegrationsOverview({ | |
| <p className="page-sub">{t("common.loading")}</p> | ||
| ) | ||
| ) : ( | ||
| <> | ||
| <ul className="integration-cards"> | ||
| {presentRows.map(row => renderCard(row))} | ||
| </ul> | ||
| {/* | ||
| Clients that are not on this machine are inventory, not decisions. They stay | ||
| discoverable behind one disclosure instead of doubling the grid. | ||
| */} | ||
| {absentRows.length > 0 && ( | ||
| <details className="integration-cards-more"> | ||
| <summary className="muted text-label">{t("integrations.notInstalled", { count: absentRows.length })}</summary> | ||
| <ul className="integration-cards"> | ||
| {absentRows.map(row => renderCard(row))} | ||
| </ul> | ||
| </details> | ||
| )} | ||
| </> | ||
| )} | ||
| {clientsSettled && installedFileClients.length === 0 && ( | ||
| <div className="integration-empty"> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Keep file-client tabs visible when the install-state request fails.
failed-coldcurrently counts as settled. The empty fallback at line 79 then makes every file client secondary. If/api/client-integrationsfails before its first successful response, the page hides all file-client tabs without showing a load error.Exclude
failed-coldfromstatesSettled. Keepfailed-with-stalesettled because it has prior data. Add a regression test for an initial failed response.As per coding guidelines, “Keep dashboard behavior aligned with the management API and provider configuration model.” As per path instructions, “Check that GUI state changes stay consistent with the management API responses.”
🤖 Prompt for AI Agents
Sources: Coding guidelines, Path instructions