Move node management into the Command Center experience while removing the separate Nodes overlay entry points. - Add a gated Nodes tab to Command Center and pass toast wiring through from App. - Remove top-level header and mobile-nav Nodes overlay controls and overlay-only styling. - Let NodesView render without a close button when embedded as a tab. - Update navigation, lazy-load docs, mobile access, and Command Center tests for the new surface. Files changed: AGENTS.md | 3 +- packages/dashboard/app/App.tsx | 57 ++------------- .../app/__tests__/lazy-loaded-views-docs.test.ts | 11 +-- .../mobile-feature-access-regression.test.tsx | 12 ++-- packages/dashboard/app/components/Header.tsx | 33 +-------- packages/dashboard/app/components/MobileNavBar.tsx | 16 ----- packages/dashboard/app/components/NodesView.css | 37 ---------- packages/dashboard/app/components/NodesView.tsx | 22 +++--- .../app/components/__tests__/Header.test.tsx | 22 ++---- .../app/components/__tests__/MobileNavBar.test.tsx | 22 +----- .../app/components/__tests__/NodesView.test.tsx | 81 +++------------------- ...-merge-toggle-blank.mobile-integration.test.tsx | 1 - .../components/command-center/CommandCenter.tsx | 17 ++++- .../__tests__/CommandCenter.mobile-scroll.test.tsx | 2 +- .../__tests__/CommandCenter.tablet-layout.test.tsx | 2 +- .../__tests__/CommandCenter.test.tsx | 40 ++++++++++- packages/dashboard/app/styles.css | 2 +- packages/i18n/locales/en/app.json | 1 + 18 files changed, 106 insertions(+), 275 deletions(-) Fusion-Task-Id: FN-6717 Fusion-Task-Lineage: 89306335-c247-4c66-8937-adfdf8c3cbb8
297 lines
12 KiB
TypeScript
297 lines
12 KiB
TypeScript
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
import { useTranslation } from "react-i18next";
|
|
import { Box, Plus, Server, Wifi, WifiOff, Globe, RefreshCw, X } from "lucide-react";
|
|
import "./NodesView.css";
|
|
import { useNodes } from "../hooks/useNodes";
|
|
import { useProjects } from "../hooks/useProjects";
|
|
import { useNodeSettingsSync, computeSyncState } from "../hooks/useNodeSettingsSync";
|
|
import { useMeshState } from "../hooks/useMeshState";
|
|
import type { ManagedDockerNodeInfo, NodeInfo, NodeUpdateInput } from "../api";
|
|
import { NodeCard } from "./NodeCard";
|
|
import { MeshTopology } from "./MeshTopology";
|
|
import { AddNodeModal, type AddNodeInput } from "./AddNodeModal";
|
|
import { DockerNodeOnboardingModal } from "./DockerNodeOnboardingModal";
|
|
import { NodeDetailModal } from "./NodeDetailModal";
|
|
import { useManagedDockerNodes } from "../hooks/useManagedDockerNodes";
|
|
import type { ManagedDockerNodeInput } from "@fusion/core";
|
|
import type { ToastType } from "../hooks/useToast";
|
|
|
|
interface NodesViewProps {
|
|
addToast: (message: string, type?: ToastType) => void;
|
|
onClose?: () => void;
|
|
}
|
|
|
|
/*
|
|
FNXC:Nodes 2026-06-19-00:00:
|
|
FN-6717 mounts Nodes inside Command Center while preserving the legacy overlay caller during migration/testing. The close affordance is overlay-only, so tab mode omits it when no onClose handler is provided.
|
|
*/
|
|
export function NodesView({ addToast, onClose }: NodesViewProps) {
|
|
const { t } = useTranslation("app");
|
|
const {
|
|
nodes,
|
|
loading,
|
|
error,
|
|
refresh,
|
|
register,
|
|
update,
|
|
unregister,
|
|
healthCheck,
|
|
patchDockerConfig,
|
|
fetchDockerDiff,
|
|
discoverRemoteProjects,
|
|
} = useNodes();
|
|
const { projects, refresh: refreshProjects } = useProjects();
|
|
const { meshState, loading: meshLoading, error: meshError } = useMeshState();
|
|
const { syncStatusMap, pushSettings, pullSettings, syncAuth, trackNode, getAuthSyncState, getAuthProviders } = useNodeSettingsSync();
|
|
const {
|
|
dockerNodes,
|
|
loading: dockerLoading,
|
|
refresh: refreshDocker,
|
|
getContainerStatus,
|
|
getLogs,
|
|
create: createDockerNode,
|
|
} = useManagedDockerNodes();
|
|
const [addModalOpen, setAddModalOpen] = useState(false);
|
|
const [dockerOnboardingOpen, setDockerOnboardingOpen] = useState(false);
|
|
const [selectedNode, setSelectedNode] = useState<NodeInfo | null>(null);
|
|
|
|
// Track remote nodes for sync status polling
|
|
useEffect(() => {
|
|
const remoteNodes = nodes.filter((node) => node.type === "remote");
|
|
for (const node of remoteNodes) {
|
|
trackNode(node.id);
|
|
}
|
|
}, [nodes, trackNode]);
|
|
|
|
useEffect(() => {
|
|
if (!selectedNode) return;
|
|
const latest = nodes.find((node) => node.id === selectedNode.id) ?? null;
|
|
setSelectedNode(latest);
|
|
}, [nodes, selectedNode]);
|
|
|
|
const stats = useMemo(() => {
|
|
const total = nodes.length;
|
|
const online = nodes.filter((node) => node.status === "online").length;
|
|
const offline = nodes.filter((node) => node.status === "offline" || node.status === "error").length;
|
|
const remote = nodes.filter((node) => node.type === "remote").length;
|
|
const synced = nodes.filter(
|
|
(node) => node.type === "remote" && syncStatusMap[node.id] && computeSyncState(syncStatusMap[node.id]).syncState === "synced"
|
|
).length;
|
|
const docker = dockerNodes.length;
|
|
return { total, online, offline, remote, synced, docker };
|
|
}, [dockerNodes.length, nodes, syncStatusMap]);
|
|
|
|
const handleRegister = useCallback(async (input: AddNodeInput) => {
|
|
await register(input);
|
|
await refreshProjects();
|
|
}, [refreshProjects, register]);
|
|
|
|
const handleCreateDockerNode = useCallback(async (input: ManagedDockerNodeInput) => {
|
|
try {
|
|
await createDockerNode(input);
|
|
addToast(t("nodes.dockerNodeCreated", `Docker node "{{name}}" created`, { name: input.name }), "success");
|
|
setDockerOnboardingOpen(false);
|
|
} catch (err) {
|
|
const message = err instanceof Error ? err.message : t("nodes.failedCreateDocker", "Failed to create Docker node");
|
|
addToast(message, "error");
|
|
throw err;
|
|
}
|
|
}, [addToast, createDockerNode, t]);
|
|
|
|
const dockerNodeMap = useMemo(() => {
|
|
const map = new Map<string, ManagedDockerNodeInfo>();
|
|
for (const dockerNode of dockerNodes) {
|
|
if (dockerNode.nodeId) {
|
|
map.set(dockerNode.nodeId, dockerNode);
|
|
}
|
|
}
|
|
return map;
|
|
}, [dockerNodes]);
|
|
|
|
const handleRefresh = useCallback(async () => {
|
|
try {
|
|
await Promise.all([refresh(), refreshDocker()]);
|
|
} catch {
|
|
addToast(t("nodes.failedRefresh", "Failed to refresh nodes"), "error");
|
|
}
|
|
}, [addToast, refresh, refreshDocker, t]);
|
|
|
|
const handleHealthCheck = useCallback(async (id: string) => {
|
|
try {
|
|
await healthCheck(id);
|
|
addToast(t("nodes.healthCheckComplete", "Node health check complete"), "success");
|
|
} catch (err) {
|
|
const message = err instanceof Error ? err.message : t("nodes.healthCheckFailed", "Health check failed");
|
|
addToast(message, "error");
|
|
}
|
|
}, [addToast, healthCheck, t]);
|
|
|
|
const handleUnregister = useCallback(async (id: string) => {
|
|
try {
|
|
await unregister(id);
|
|
addToast(t("nodes.removed", "Node removed"), "success");
|
|
if (selectedNode?.id === id) {
|
|
setSelectedNode(null);
|
|
}
|
|
} catch (err) {
|
|
const message = err instanceof Error ? err.message : t("nodes.failedRemove", "Failed to remove node");
|
|
addToast(message, "error");
|
|
}
|
|
}, [addToast, selectedNode?.id, unregister, t]);
|
|
|
|
const handleUpdate = useCallback(async (id: string, updates: NodeUpdateInput) => {
|
|
await update(id, updates);
|
|
}, [update]);
|
|
|
|
return (
|
|
<div className="nodes-view" data-testid="nodes-view">
|
|
<div className="nodes-view-header">
|
|
<div className="nodes-view-title">
|
|
<h2>
|
|
<Server size={20} />
|
|
{t("nodes.heading", "Nodes")}
|
|
</h2>
|
|
<span className="nodes-view-count">{t("nodes.registeredCount", "{{count}} registered", { count: nodes.length })}</span>
|
|
</div>
|
|
|
|
<div className="nodes-view-actions">
|
|
{onClose ? (
|
|
<button
|
|
className="btn-icon nodes-view-close"
|
|
onClick={onClose}
|
|
aria-label={t("nodes.closeAriaLabel", "Close nodes view")}
|
|
>
|
|
<X size={16} />
|
|
</button>
|
|
) : null}
|
|
<button className="btn btn-sm" onClick={() => void handleRefresh()} disabled={loading || dockerLoading}>
|
|
<RefreshCw size={14} className={loading ? "spin" : ""} />
|
|
{t("nodes.refresh", "Refresh")}
|
|
</button>
|
|
<button className="btn btn-sm" onClick={() => setAddModalOpen(true)}>
|
|
<Plus size={14} />
|
|
{t("nodes.addNode", "Add Node")}
|
|
</button>
|
|
<button className="btn btn-sm" onClick={() => setDockerOnboardingOpen(true)} title={t("nodes.addDockerNodeTitle", "Add a managed Docker node")}>
|
|
<Box size={14} />
|
|
{t("nodes.addDockerNode", "Add Docker Node")}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="nodes-view-stats">
|
|
<div className="nodes-view-stat" data-testid="nodes-stat-total">
|
|
<span>{t("nodes.total", "Total")}</span>
|
|
<strong>{stats.total}</strong>
|
|
</div>
|
|
<div className="nodes-view-stat nodes-view-stat--online" data-testid="nodes-stat-online">
|
|
<span><Wifi size={14} /> {t("nodes.online", "Online")}</span>
|
|
<strong>{stats.online}</strong>
|
|
</div>
|
|
<div className="nodes-view-stat nodes-view-stat--offline" data-testid="nodes-stat-offline">
|
|
<span><WifiOff size={14} /> {t("nodes.offline", "Offline")}</span>
|
|
<strong>{stats.offline}</strong>
|
|
</div>
|
|
<div className="nodes-view-stat" data-testid="nodes-stat-remote">
|
|
<span><Globe size={14} /> {t("nodes.remote", "Remote")}</span>
|
|
<strong>{stats.remote}</strong>
|
|
</div>
|
|
<div className="nodes-view-stat nodes-view-stat--synced" data-testid="nodes-stat-synced">
|
|
<span><RefreshCw size={14} /> {t("nodes.synced", "Synced")}</span>
|
|
<strong>{stats.synced}</strong>
|
|
</div>
|
|
<div className="nodes-view-stat" data-testid="nodes-stat-docker">
|
|
<span><Box size={14} /> {t("nodes.docker", "Docker")}</span>
|
|
<strong>{stats.docker}</strong>
|
|
</div>
|
|
</div>
|
|
|
|
{(error || meshError) && <div className="nodes-view-error">{error ?? meshError}</div>}
|
|
|
|
{/* Mesh Topology Visualization */}
|
|
{!meshLoading && meshState.length > 0 && (
|
|
<section className="nodes-view-topology" aria-label={t("nodes.meshTopologyAriaLabel", "Mesh Topology")}>
|
|
<h3 className="nodes-view-section-title">{t("nodes.meshTopology", "Mesh Topology")}</h3>
|
|
<MeshTopology nodes={meshState} />
|
|
</section>
|
|
)}
|
|
|
|
{loading ? (
|
|
<div className="nodes-view-grid">
|
|
{Array.from({ length: 4 }).map((_, index) => (
|
|
<div key={index} className="node-card node-card--loading" aria-hidden />
|
|
))}
|
|
</div>
|
|
) : nodes.length === 0 ? (
|
|
<div className="nodes-view-empty">
|
|
<p>{t("nodes.noRegistered", "No nodes are registered yet.")}</p>
|
|
<button className="btn btn-primary" onClick={() => setAddModalOpen(true)}>
|
|
<Plus size={14} />
|
|
{t("nodes.addFirstNode", "Add First Node")}
|
|
</button>
|
|
</div>
|
|
) : (
|
|
<div className="nodes-view-grid">
|
|
{nodes.map((node) => {
|
|
const nodeSyncStatus = node.type === "remote" && syncStatusMap[node.id]
|
|
? computeSyncState(syncStatusMap[node.id])
|
|
: undefined;
|
|
return (
|
|
<NodeCard
|
|
key={node.id}
|
|
node={node}
|
|
projects={projects}
|
|
onHealthCheck={(id) => { void handleHealthCheck(id); }}
|
|
onEdit={(selected) => setSelectedNode(selected)}
|
|
onRemove={(id) => { void handleUnregister(id); }}
|
|
isLoading={loading}
|
|
syncStatus={nodeSyncStatus}
|
|
authSyncState={node.type === "remote" ? getAuthSyncState(node.id) : undefined}
|
|
authSyncProviders={node.type === "remote" ? getAuthProviders(node.id) : undefined}
|
|
managedDockerNode={dockerNodeMap.get(node.id)}
|
|
/>
|
|
);
|
|
})}
|
|
</div>
|
|
)}
|
|
|
|
<AddNodeModal
|
|
isOpen={addModalOpen}
|
|
onClose={() => setAddModalOpen(false)}
|
|
onSubmit={handleRegister}
|
|
onDiscoverRemoteProjects={discoverRemoteProjects}
|
|
addToast={addToast}
|
|
projects={projects}
|
|
/>
|
|
|
|
<DockerNodeOnboardingModal
|
|
isOpen={dockerOnboardingOpen}
|
|
onClose={() => setDockerOnboardingOpen(false)}
|
|
onSubmit={handleCreateDockerNode}
|
|
addToast={addToast}
|
|
/>
|
|
|
|
<NodeDetailModal
|
|
isOpen={selectedNode !== null}
|
|
onClose={() => setSelectedNode(null)}
|
|
node={selectedNode}
|
|
projects={projects}
|
|
onUpdate={handleUpdate}
|
|
onHealthCheck={handleHealthCheck}
|
|
addToast={addToast}
|
|
syncStatus={selectedNode?.type === "remote" && selectedNode && syncStatusMap[selectedNode.id]
|
|
? computeSyncState(syncStatusMap[selectedNode.id])
|
|
: undefined}
|
|
onPushSettings={pushSettings}
|
|
onPullSettings={pullSettings}
|
|
onSyncAuth={syncAuth}
|
|
managedDockerNode={selectedNode ? dockerNodeMap.get(selectedNode.id) : undefined}
|
|
onFetchContainerStatus={getContainerStatus}
|
|
onFetchLogs={getLogs}
|
|
onUpdateDockerConfig={patchDockerConfig}
|
|
onFetchDockerConfigDiff={fetchDockerDiff}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|