An open source, self-hosted, real-time port monitoring and discovery tool.
Service centric view (#78)
Mostafa Wahied53bb5b7e1eb5
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex fdddebd..dbc2aff 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -12,6 +12,14 @@ All notable changes to portracker will be documented in this file.- **System Port Detection**: Restored system port detection (SSH, SMB, etc.) when running in containerized environments.+### Dashboard++- **Service-Centric View**: View your ports organized by service name with expandable cards showing all ports per service (now the default view)+- **Service Icons**: Visual icons automatically loaded for services and ports from community icon libraries with service name extraction and matching+ - **[sub]** Toggle to show/hide icons with preference saved locally+ - **[sub]** Automatic theme-aware icon variants for dark and light modes+ - **[sub]** Icons available in all view layouts (list, grid, and table)+### UI- **Favicon**: Dark mode support - favicon now adapts to system theme (black on light, white on dark)diff --git a/backend/collectors/base_collector.js b/backend/collectors/base_collector.jsindex 334bf6c..9720711 100644--- a/backend/collectors/base_collector.js+++ b/backend/collectors/base_collector.js@@ -149,6 +149,8 @@ class BaseCollector {container_id: entry.container_id || null,vm_id: entry.vm_id || null,app_id: entry.app_id || null,+ compose_project: entry.compose_project || null,+ compose_service: entry.compose_service || null,created: entry.created || null,internal: entry.internal || false,};diff --git a/backend/collectors/docker_collector.js b/backend/collectors/docker_collector.jsindex 294ab6b..f9ccbd4 100644--- a/backend/collectors/docker_collector.js+++ b/backend/collectors/docker_collector.js@@ -218,6 +218,7 @@ class DockerCollector extends BaseCollector {containerName: container.name,containerId: container.id,target: `${container.id.substring(0, 12)}:internal(host-net)`,+ composeProject: container.composeProject || null,};port.created = containerCreationTimeMap.get(container.id) || null;break;@@ -240,6 +241,7 @@ class DockerCollector extends BaseCollector {target: dockerInfo.target,container_id: dockerInfo.containerId,app_id: dockerInfo.containerName,+ compose_project: dockerInfo.composeProject || null,});if (!dockerPortsMap.has(key)) {@@ -282,6 +284,8 @@ class DockerCollector extends BaseCollector {for (const container of containers) {const containerName = container.Names;const containerId = container.ID;+ const composeProject = container.Labels?.['com.docker.compose.project'] || null;+ const composeService = container.Labels?.['com.docker.compose.service'] || null;if (!container.Ports || container.Ports.length === 0) {continue;@@ -312,6 +316,8 @@ class DockerCollector extends BaseCollector {target: `${containerId}:${targetPort}`,container_id: containerId,app_id: containerName,+ compose_project: composeProject,+ compose_service: composeService,pids: [],}));@@ -344,6 +350,8 @@ class DockerCollector extends BaseCollector {const containerId = container.ID;const containerName = container.Names;const image = container.Image;+ const composeProject = container.Labels?.['com.docker.compose.project'] || null;+ const composeService = container.Labels?.['com.docker.compose.service'] || null;try {const [inspection, pids] = await Promise.all([this.dockerApi.inspectContainer(containerId),@@ -368,6 +376,8 @@ class DockerCollector extends BaseCollector {target: `${containerId.substring(0, 12)}:${portNum}(internal)`,container_id: containerId,app_id: containerName,+ compose_project: composeProject,+ compose_service: composeService,internal: true};internalPorts.push(internalPort);@@ -382,7 +392,9 @@ class DockerCollector extends BaseCollector {networkMode: networkMode,exposedPorts: exposedPorts,pids: pids,- internalPorts: internalPorts+ internalPorts: internalPorts,+ composeProject: composeProject,+ composeService: composeService};} catch (inspectErr) {this.logWarn(@@ -445,6 +457,7 @@ class DockerCollector extends BaseCollector {containerName: container.Names,containerId: container.ID,target: `${container.ID}:${port.host_port}`,+ composeProject: container.Labels?.['com.docker.compose.project'] || null,};}}@@ -502,11 +515,13 @@ class DockerCollector extends BaseCollector {try {const inspection = await this.dockerApi.inspectContainer(fullContainerId);const containerName = inspection.Name.replace(/^\//, '');+ const composeProject = inspection.Config?.Labels?.['com.docker.compose.project'] || null;return {containerName: containerName,containerId: fullContainerId,target: `${fullContainerId.substring(0, 12)}:internal`,+ composeProject: composeProject,};} catch (err) {this.logWarn(`Could not inspect container ${fullContainerId}:`, err.message);@@ -536,6 +551,7 @@ class DockerCollector extends BaseCollector {const containerName = container.Names;const containerId = container.ID;const image = container.Image;+ const composeProject = container.Labels?.['com.docker.compose.project'] || null;const nameLower = containerName.toLowerCase();const imageLower = image.toLowerCase();@@ -550,6 +566,7 @@ class DockerCollector extends BaseCollector {containerName: containerName,containerId: containerId,target: `${containerId.substring(0, 12)}:${port}`,+ composeProject: composeProject,};}@@ -562,6 +579,7 @@ class DockerCollector extends BaseCollector {containerName: containerName,containerId: containerId,target: `${containerId.substring(0, 12)}:${port}`,+ composeProject: composeProject,};}}diff --git a/backend/collectors/truenas_collector.js b/backend/collectors/truenas_collector.jsindex 68c7e99..9967aa3 100644--- a/backend/collectors/truenas_collector.js+++ b/backend/collectors/truenas_collector.js@@ -485,6 +485,8 @@ class TrueNASCollector extends BaseCollector {for (const container of containers) {const containerName = this._formatContainerNames(container.Names);const containerId = container.ID;+ const composeProject = container.Labels?.['com.docker.compose.project'] || null;+ const composeService = container.Labels?.['com.docker.compose.service'] || null;const rawPorts = await this.dockerApi.docker.getContainer(container.ID).inspect();const portBindings = rawPorts.NetworkSettings.Ports || {};@@ -516,6 +518,8 @@ class TrueNASCollector extends BaseCollector {container_id: containerId,vm_id: null,app_id: containerId,+ compose_project: composeProject,+ compose_service: composeService,});}}@@ -541,7 +545,9 @@ class TrueNASCollector extends BaseCollector {container_id: containerId,vm_id: null,app_id: containerId,- internal: true+ internal: true,+ compose_project: composeProject,+ compose_service: composeService,});}}@@ -1958,7 +1964,6 @@ class TrueNASCollector extends BaseCollector {}});- const totalCollected = (results.apps?.length || 0) + (results.vms?.length || 0) + (results.containers?.length || 0);const successCount = apiCalls.length - results.failures.length;if (results.failures.length === 0) {diff --git a/backend/package-lock.json b/backend/package-lock.jsonindex 2889fb8..cb66e85 100644--- a/backend/package-lock.json+++ b/backend/package-lock.json@@ -1,12 +1,12 @@{"name": "backend",- "version": "1.1.1",+ "version": "1.2.0","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "backend",- "version": "1.1.1",+ "version": "1.2.0","license": "ISC","dependencies": {"axios": "^1.9.0",diff --git a/frontend/src/App.jsx b/frontend/src/App.jsxindex 09e01be..fdd2fac 100644--- a/frontend/src/App.jsx+++ b/frontend/src/App.jsx@@ -250,6 +250,24 @@ export default function App() {}});+ const [groupingMode, setGroupingMode] = useState(() => {+ try {+ const saved = localStorage.getItem("groupingMode");+ return saved === "ports" ? "ports" : "services";+ } catch {+ return "services";+ }+ });++ const [showIcons, setShowIcons] = useState(() => {+ try {+ const saved = localStorage.getItem("showIcons");+ return saved !== "false";+ } catch {+ return true;+ }+ });+const [isSidebarOpen, setSidebarOpen] = useState(false);const [deepLinkContainer, setDeepLinkContainer] = useState(null);const [deepLinkServer, setDeepLinkServer] = useState(null);@@ -318,6 +336,22 @@ export default function App() {}}, [portLayout]);+ useEffect(() => {+ try {+ localStorage.setItem("groupingMode", groupingMode);+ } catch (error) {+ logger.warn("Failed to save grouping mode setting:", error);+ }+ }, [groupingMode]);++ useEffect(() => {+ try {+ localStorage.setItem("showIcons", showIcons.toString());+ } catch (error) {+ logger.warn("Failed to save show icons setting:", error);+ }+ }, [showIcons]);+useEffect(() => {if (selectedServer) {localStorage.setItem("selectedServerId", selectedServer);@@ -449,6 +483,8 @@ export default function App() {ignored: !!port.ignored,created: port.created || null,internal: port.internal || false,+ compose_project: port.compose_project || null,+ compose_service: port.compose_service || null,}));const uniquePorts = [];@@ -1826,6 +1862,10 @@ export default function App() {onInfoCardLayoutChange={setInfoCardLayout}portLayout={portLayout}onPortLayoutChange={setPortLayout}+ groupingMode={groupingMode}+ onGroupingModeChange={setGroupingMode}+ showIcons={showIcons}+ onShowIconsChange={setShowIcons}isExpanded={!!expandedServers[server.id]}onToggleExpanded={() => toggleServerExpanded(server.id)}openAccordionItems={openAccordions[server.id] ?? ["system-info", "vms"]}diff --git a/frontend/src/components/server/PortCard.jsx b/frontend/src/components/server/PortCard.jsxindex 6575969..2a1e146 100644--- a/frontend/src/components/server/PortCard.jsx+++ b/frontend/src/components/server/PortCard.jsx@@ -10,6 +10,7 @@ import { PortStatusIndicator } from "./PortStatusIndicator";import { PortActions } from "./PortActions";import { ActionButton } from "./ActionButton";import { InternalPortDetails } from "./InternalPortDetails";+import ServiceIcon from "@/components/ui/ServiceIcon";import {formatCreatedDate,formatCreatedTooltip,@@ -57,6 +58,7 @@ function PortCardComponent({selectionMode = false,isSelected = false,onToggleSelection,+ showIcons = false,}) {const [protocol, setProtocol] = useState("http");const [showDetails, setShowDetails] = useState(false);@@ -191,8 +193,9 @@ function PortCardComponent({setShowDetails(true);if (notifyOpenDetails && port.container_id) notifyOpenDetails(port.container_id);}}- className="inline-flex items-center w-fit whitespace-nowrap cursor-pointer rounded-md px-1.5 py-0.5 transition-colors hover:bg-slate-100/70 dark:hover:bg-slate-800/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/40"+ className="inline-flex items-center gap-1.5 w-fit whitespace-nowrap cursor-pointer rounded-md px-1.5 py-0.5 transition-colors hover:bg-slate-100/70 dark:hover:bg-slate-800/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/40">+ {showIcons && <ServiceIcon name={getDisplayServiceName(port)} size={16} />}{shouldHighlight? renderHighlightedText(highlightText(getDisplayServiceName(port), searchTerm)@@ -204,7 +207,8 @@ function PortCardComponent({</Tooltip></TooltipProvider>) : (- <span className="truncate inline-flex items-center">+ <span className="truncate inline-flex items-center gap-1.5">+ {showIcons && <ServiceIcon name={getDisplayServiceName(port)} size={16} />}{shouldHighlight? renderHighlightedText(highlightText(getDisplayServiceName(port), searchTerm)diff --git a/frontend/src/components/server/PortGridItem.jsx b/frontend/src/components/server/PortGridItem.jsxindex 89d8ab6..c049978 100644--- a/frontend/src/components/server/PortGridItem.jsx+++ b/frontend/src/components/server/PortGridItem.jsx@@ -10,6 +10,7 @@ import { PortStatusIndicator } from "./PortStatusIndicator";import { PortActions } from "./PortActions";import { ActionButton } from "./ActionButton";import { InternalPortDetails } from "./InternalPortDetails";+import ServiceIcon from "@/components/ui/ServiceIcon";import {formatCreatedDate,formatCreatedTooltip,@@ -62,6 +63,7 @@ export function PortGridItem({selectionMode = false,isSelected = false,onToggleSelection,+ showIcons = false,}) {const [protocol, setProtocol] = useState("http");const [showDetails, setShowDetails] = useState(false);@@ -209,8 +211,9 @@ export function PortGridItem({setShowDetails(true);if (notifyOpenDetails && port.container_id) notifyOpenDetails(port.container_id);}}- className="inline-flex items-center w-fit whitespace-nowrap cursor-pointer rounded-md px-1.5 py-0.5 transition-colors hover:bg-slate-100/70 dark:hover:bg-slate-800/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/40"+ className="inline-flex items-center gap-1.5 w-fit whitespace-nowrap cursor-pointer rounded-md px-1.5 py-0.5 transition-colors hover:bg-slate-100/70 dark:hover:bg-slate-800/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/40">+ {showIcons && <ServiceIcon name={getDisplayServiceName(port)} size={16} />}{shouldHighlight? renderHighlightedText(highlightText(getDisplayServiceName(port), searchTerm)): getDisplayServiceName(port)}@@ -220,7 +223,8 @@ export function PortGridItem({</Tooltip></TooltipProvider>) : (- <span className="truncate inline-flex items-center">+ <span className="truncate inline-flex items-center gap-1.5">+ {showIcons && <ServiceIcon name={getDisplayServiceName(port)} size={16} />}{shouldHighlight? renderHighlightedText(highlightText(getDisplayServiceName(port), searchTerm)): getDisplayServiceName(port)}diff --git a/frontend/src/components/server/PortTable.jsx b/frontend/src/components/server/PortTable.jsxindex 645d31a..d3cb38d 100644--- a/frontend/src/components/server/PortTable.jsx+++ b/frontend/src/components/server/PortTable.jsx@@ -27,6 +27,7 @@ export function PortTable({selectedPorts,onToggleSelection,onSelectAllPorts,+ showIcons = false,}) {const getSortIcon = (column) => {if (sortConfig.key !== column) {@@ -167,6 +168,7 @@ export function PortTable({selectionMode={selectionMode}isSelected={selectedPorts?.has(generatePortKey(serverId, port))}onToggleSelection={onToggleSelection}+ showIcons={showIcons}/>))}</tbody>diff --git a/frontend/src/components/server/PortTableRow.jsx b/frontend/src/components/server/PortTableRow.jsxindex e561ef1..8028d6e 100644--- a/frontend/src/components/server/PortTableRow.jsx+++ b/frontend/src/components/server/PortTableRow.jsx@@ -10,6 +10,7 @@ import { PortStatusIndicator } from "./PortStatusIndicator";import { PortActions } from "./PortActions";import { ActionButton } from "./ActionButton";import { InternalPortDetails } from "./InternalPortDetails";+import ServiceIcon from "@/components/ui/ServiceIcon";import {formatCreatedDate,formatCreatedTooltip,@@ -57,6 +58,7 @@ function PortTableRowComponent({selectionMode = false,isSelected = false,onToggleSelection,+ showIcons = false,}) {const [protocol, setProtocol] = useState("http");const [showDetails, setShowDetails] = useState(false);@@ -197,8 +199,9 @@ function PortTableRowComponent({<buttontype="button"onClick={() => setShowDetails(true)}- className="inline-flex items-center w-fit whitespace-nowrap cursor-pointer rounded-md px-1.5 py-0.5 transition-colors hover:bg-slate-100/70 dark:hover:bg-slate-800/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/40"+ className="inline-flex items-center gap-1.5 w-fit whitespace-nowrap cursor-pointer rounded-md px-1.5 py-0.5 transition-colors hover:bg-slate-100/70 dark:hover:bg-slate-800/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500/40">+ {showIcons && <ServiceIcon name={getDisplayServiceName(port)} size={16} />}{shouldHighlight? renderHighlightedText(highlightText(getDisplayServiceName(port), searchTerm)): getDisplayServiceName(port)}@@ -221,7 +224,8 @@ function PortTableRowComponent({</div>) : (<div className="flex items-center space-x-1">- <span className="truncate inline-flex items-center">+ <span className="truncate inline-flex items-center gap-1.5">+ {showIcons && <ServiceIcon name={getDisplayServiceName(port)} size={16} />}{shouldHighlight? renderHighlightedText(highlightText(getDisplayServiceName(port), searchTerm)): getDisplayServiceName(port)}diff --git a/frontend/src/components/server/ServerSection.jsx b/frontend/src/components/server/ServerSection.jsxindex 6955f97..f17588f 100644--- a/frontend/src/components/server/ServerSection.jsx+++ b/frontend/src/components/server/ServerSection.jsx@@ -18,10 +18,14 @@ import {RefreshCw,Copy,Check,+ Layers,+ Eye,+ EyeOff,} from "lucide-react";import { PortCard } from "./PortCard";import { PortGridItem } from "./PortGridItem";import { PortTable } from "./PortTable";+import { ServiceCard } from "./ServiceCard";import { HiddenPortsDrawer } from "./HiddenPortsDrawer";import { SystemInfoCard } from "./SystemInfoCard";import Logger from "../../lib/logger";@@ -74,6 +78,10 @@ function ServerSectionComponent({enhancedFeaturesEnabled,portLayout,onPortLayoutChange,+ groupingMode = "ports",+ onGroupingModeChange,+ showIcons = true,+ onShowIconsChange,isExpanded,onToggleExpanded,openAccordionItems,@@ -150,20 +158,6 @@ function ServerSectionComponent({return { internal, published, total: list.length };}, [data]);- const portMood = useMemo(() => {- const count = visiblePorts.length;- if (count === 0) {- return "It's empty in here.";- }- if (count < 10) {- return `Feels lonely with ${count} service${count === 1 ? "" : "s"}.`;- }- if (count > 99) {- return `Hoarder alert: Wow.. ${count} services.`;- }- return null;- }, [visiblePorts.length]);-useEffect(() => {const validKeys = ["default", "host_port", "owner", "created"];let { key, direction } = sortConfig;@@ -227,6 +221,73 @@ function ServerSectionComponent({return sortablePorts;}, [visiblePorts, sortConfig]);+ const groupedServices = useMemo(() => {+ if (groupingMode !== "services") return [];++ const serviceMap = new Map();++ sortedPorts.forEach((port) => {+ let serviceKey;+ let serviceName;++ if (port.source === "docker") {+ if (port.compose_project) {+ serviceKey = `docker:${port.compose_project}`;+ serviceName = port.compose_project;+ } else {+ serviceKey = `docker:${port.container_id || port.owner}`;+ serviceName = port.customServiceName || port.owner || "Unknown Container";+ }+ } else {+ serviceKey = `system:${port.owner || 'unknown'}`;+ serviceName = port.owner || "Unknown Process";+ }++ if (!serviceMap.has(serviceKey)) {+ serviceMap.set(serviceKey, {+ key: serviceKey,+ name: serviceName,+ isDocker: port.source === "docker",+ ports: [],+ });+ }++ serviceMap.get(serviceKey).ports.push(port);+ });++ const services = Array.from(serviceMap.values());+ services.sort((a, b) => a.name.localeCompare(b.name));++ return services;+ }, [sortedPorts, groupingMode]);++ const portMood = useMemo(() => {+ if (groupingMode === "services") {+ const count = groupedServices.length;+ if (count === 0) {+ return "It's empty in here.";+ }+ if (count < 5) {+ return `Feels lonely with ${count} service${count === 1 ? "" : "s"}.`;+ }+ if (count > 30) {+ return `Hoarder alert: Wow.. ${count} services.`;+ }+ return null;+ }+ const count = visiblePorts.length;+ if (count === 0) {+ return "It's empty in here.";+ }+ if (count < 10) {+ return `Feels lonely with ${count} port${count === 1 ? "" : "s"}.`;+ }+ if (count > 99) {+ return `Hoarder alert: Wow.. ${count} ports.`;+ }+ return null;+ }, [visiblePorts.length, groupingMode, groupedServices.length]);+useEffect(() => {try {localStorage.setItem("portSortConfig", JSON.stringify(sortConfig));@@ -420,20 +481,77 @@ function ServerSectionComponent({<TooltipContent side="bottom">{portMood? portMood- : `Published: ${counts.published}, Internal: ${counts.internal}${showInternal ? " (showing internal)" : " (hiding internal)"}`}+ : groupingMode === "services"+ ? `${groupedServices.length} services (${visiblePorts.length} ports)`+ : `Published: ${counts.published}, Internal: ${counts.internal}${showInternal ? " (showing internal)" : " (hiding internal)"}`}</TooltipContent></Tooltip></TooltipProvider>- Ports+ <div className="flex items-center bg-slate-100 dark:bg-slate-800 rounded-md p-0.5 mr-2">+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <button+ onClick={() => onGroupingModeChange("services")}+ className={`p-1.5 rounded transition-colors ${+ groupingMode === "services"+ ? "bg-white dark:bg-slate-700 text-slate-900 dark:text-slate-100 shadow-sm"+ : "text-slate-400 dark:text-slate-500 hover:text-slate-600 dark:hover:text-slate-300"+ }`}+ >+ <Layers className="h-4 w-4" />+ </button>+ </TooltipTrigger>+ <TooltipContent>View by Services</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <button+ onClick={() => onGroupingModeChange("ports")}+ className={`p-1.5 rounded transition-colors ${+ groupingMode === "ports"+ ? "bg-white dark:bg-slate-700 text-slate-900 dark:text-slate-100 shadow-sm"+ : "text-slate-400 dark:text-slate-500 hover:text-slate-600 dark:hover:text-slate-300"+ }`}+ >+ <List className="h-4 w-4" />+ </button>+ </TooltipTrigger>+ <TooltipContent>View by Ports</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <button+ onClick={() => onShowIconsChange(!showIcons)}+ className={`p-1.5 rounded transition-colors ml-1 ${+ showIcons+ ? "text-slate-600 dark:text-slate-300 hover:text-slate-800 dark:hover:text-slate-100"+ : "text-slate-400 dark:text-slate-500 hover:text-slate-600 dark:hover:text-slate-300"+ }`}+ >+ {showIcons ? <Eye className="h-4 w-4" /> : <EyeOff className="h-4 w-4" />}+ </button>+ </TooltipTrigger>+ <TooltipContent>{showIcons ? "Hide Icons" : "Show Icons"}</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ {groupingMode === "ports" ? "Ports" : "Services"}<TooltipProvider><Tooltip><TooltipTrigger asChild><span className="ml-2 text-sm font-normal text-slate-500 dark:text-slate-400 cursor-default">- ({visiblePorts.length})+ ({groupingMode === "services" ? groupedServices.length : visiblePorts.length})</span></TooltipTrigger><TooltipContent>- {`Published: ${counts.published}, Internal: ${counts.internal}${showInternal ? " (showing internal)" : " (hiding internal)"}`}+ {groupingMode === "services"+ ? `${groupedServices.length} services (${visiblePorts.length} ports total)`+ : `Published: ${counts.published}, Internal: ${counts.internal}${showInternal ? " (showing internal)" : " (hiding internal)"}`}</TooltipContent></Tooltip></TooltipProvider>@@ -718,6 +836,142 @@ function ServerSectionComponent({{ok && visiblePorts.length > 0 && (<div className={selectionMode ? "pb-20" : ""}>+ {groupingMode === "services" && portLayout === "list" && (+ <div className="space-y-3 p-4">+ {groupedServices.map((service) => (+ <ServiceCard+ key={service.key}+ serviceName={service.name}+ ports={service.ports}+ serverId={id}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ searchTerm={searchTerm}+ actionFeedback={actionFeedback}+ onCopy={onCopy}+ onNote={onNote}+ onToggleIgnore={onToggleIgnore}+ onRename={onRename}+ onOpenContainerDetails={onOpenContainerDetails}+ onCloseContainerDetails={onCloseContainerDetails}+ selectionMode={selectionMode}+ selectedPorts={selectedPorts}+ onToggleSelection={onToggleSelection}+ generatePortKey={generatePortKey}+ isDocker={service.isDocker}+ deepLinkContainerId={deepLinkContainerId}+ showIcons={showIcons}+ />+ ))}+ </div>+ )}+ {groupingMode === "services" && portLayout === "grid" && (+ <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 p-4">+ {groupedServices.map((service) => (+ <ServiceCard+ key={service.key}+ serviceName={service.name}+ ports={service.ports}+ serverId={id}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ searchTerm={searchTerm}+ actionFeedback={actionFeedback}+ onCopy={onCopy}+ onNote={onNote}+ onToggleIgnore={onToggleIgnore}+ onRename={onRename}+ onOpenContainerDetails={onOpenContainerDetails}+ onCloseContainerDetails={onCloseContainerDetails}+ selectionMode={selectionMode}+ selectedPorts={selectedPorts}+ onToggleSelection={onToggleSelection}+ generatePortKey={generatePortKey}+ isDocker={service.isDocker}+ compact={true}+ deepLinkContainerId={deepLinkContainerId}+ showIcons={showIcons}+ />+ ))}+ </div>+ )}+ {groupingMode === "services" && portLayout === "table" && (+ <div className="overflow-x-auto">+ <table className="min-w-full">+ <thead className="bg-slate-50 dark:bg-slate-800/50">+ <tr>+ {selectionMode && (+ <th+ scope="col"+ className="px-4 py-3 text-center text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wider"+ >+ </th>+ )}+ <th+ scope="col"+ className="px-4 py-3 text-left text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wider"+ >+ Service+ </th>+ <th+ scope="col"+ className="px-4 py-3 text-left text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wider"+ >+ Ports+ </th>+ <th+ scope="col"+ className="px-4 py-3 text-left text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wider"+ >+ Source+ </th>+ <th+ scope="col"+ className="px-4 py-3 text-left text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wider"+ >+ Created+ </th>+ <th+ scope="col"+ className="px-4 py-3 text-center text-xs font-medium text-slate-500 dark:text-slate-400 uppercase tracking-wider"+ >+ Count+ </th>+ </tr>+ </thead>+ <tbody className="divide-y divide-slate-100 dark:divide-slate-800 bg-white dark:bg-slate-900">+ {groupedServices.map((service) => (+ <ServiceCard+ key={service.key}+ serviceName={service.name}+ ports={service.ports}+ serverId={id}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ searchTerm={searchTerm}+ actionFeedback={actionFeedback}+ onCopy={onCopy}+ onNote={onNote}+ onToggleIgnore={onToggleIgnore}+ onRename={onRename}+ onOpenContainerDetails={onOpenContainerDetails}+ onCloseContainerDetails={onCloseContainerDetails}+ selectionMode={selectionMode}+ selectedPorts={selectedPorts}+ onToggleSelection={onToggleSelection}+ generatePortKey={generatePortKey}+ isDocker={service.isDocker}+ tableMode={true}+ deepLinkContainerId={deepLinkContainerId}+ showIcons={showIcons}+ />+ ))}+ </tbody>+ </table>+ </div>+ )}+ {groupingMode !== "services" && (+ <>{portLayout === "list" && (<>{/**@@ -785,6 +1039,7 @@ function ServerSectionComponent({selectionMode={selectionMode}isSelected={selectedPorts?.has(generatePortKey(id, port))}onToggleSelection={onToggleSelection}+ showIcons={showIcons}/>))}</ul>@@ -857,6 +1112,7 @@ function ServerSectionComponent({selectionMode={selectionMode}isSelected={selectedPorts?.has(generatePortKey(id, port))}onToggleSelection={onToggleSelection}+ showIcons={showIcons}/>))}</div>@@ -891,10 +1147,11 @@ function ServerSectionComponent({selectedPorts={selectedPorts}onToggleSelection={onToggleSelection}onSelectAllPorts={onSelectAllPorts}+ showIcons={showIcons}/>)}- {!isExpanded && sortedPorts.length > 8 && portLayout !== "grid" && (+ {!isExpanded && sortedPorts.length > 8 && portLayout !== "grid" && groupingMode !== "services" && (<div className="p-4 text-center border-t border-slate-100 dark:border-slate-800"><buttononClick={onToggleExpanded}@@ -904,12 +1161,14 @@ function ServerSectionComponent({</button></div>)}+ </>+ )}</div>)}{ok && visiblePorts.length === 0 && (<div className="p-6 text-center text-slate-500 dark:text-slate-400">- No ports detected or all ports are hidden.+ {groupingMode === "services" ? "No services detected or all ports are hidden." : "No ports detected or all ports are hidden."}</div>)}diff --git a/frontend/src/components/server/ServiceCard.jsx b/frontend/src/components/server/ServiceCard.jsxnew file mode 100644index 0000000..951b772--- /dev/null+++ b/frontend/src/components/server/ServiceCard.jsx@@ -0,0 +1,62 @@+import { ServiceCardList } from "./ServiceCardList";+import { ServiceCardGrid } from "./ServiceCardGrid";+import { ServiceCardTableRow } from "./ServiceCardTable";++export function ServiceCard({+ serviceName,+ ports,+ serverId,+ serverUrl,+ hostOverride,+ searchTerm,+ actionFeedback,+ onCopy,+ onNote,+ onToggleIgnore,+ onRename,+ onOpenContainerDetails,+ onCloseContainerDetails,+ selectionMode,+ selectedPorts,+ onToggleSelection,+ generatePortKey: _generatePortKey,+ isDocker = true,+ compact = false,+ tableMode = false,+ deepLinkContainerId,+ showIcons = true,+}) {+ const commonProps = {+ serviceName,+ ports,+ serverId,+ serverUrl,+ hostOverride,+ searchTerm,+ actionFeedback,+ onCopy,+ onNote,+ onToggleIgnore,+ onRename,+ onOpenContainerDetails,+ onCloseContainerDetails,+ selectionMode,+ selectedPorts,+ onToggleSelection,+ isDocker,+ deepLinkContainerId,+ showIcons,+ };++ if (tableMode) {+ return <ServiceCardTableRow {...commonProps} />;+ }++ if (compact) {+ return <ServiceCardGrid {...commonProps} />;+ }++ return <ServiceCardList {...commonProps} />;+}++export default ServiceCard;diff --git a/frontend/src/components/server/ServiceCardGrid.jsx b/frontend/src/components/server/ServiceCardGrid.jsxnew file mode 100644index 0000000..6d68f4b--- /dev/null+++ b/frontend/src/components/server/ServiceCardGrid.jsx@@ -0,0 +1,282 @@+import React, { useState } from "react";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";+import { PortCard } from "./PortCard";+import { generatePortKey } from "../../lib/utils/portUtils";+import { formatCreatedDate, formatCreatedTooltip } from "@/lib/utils";+import ServiceIcon from "@/components/ui/ServiceIcon";+import { ClickablePortBadge } from "./service-card-utils";++export function ServiceCardGrid({+ serviceName,+ ports,+ serverId,+ serverUrl,+ hostOverride,+ searchTerm,+ actionFeedback,+ onCopy,+ onNote,+ onToggleIgnore,+ onRename,+ onOpenContainerDetails,+ onCloseContainerDetails,+ selectionMode,+ selectedPorts,+ onToggleSelection,+ isDocker,+ deepLinkContainerId,+ showIcons = true,+}) {+ const [isExpanded, setIsExpanded] = useState(false);++ const publishedPorts = ports.filter((p) => !p.internal);+ const internalPorts = ports.filter((p) => p.internal);+ const oldestCreated = ports.reduce((oldest, p) => {+ if (!p.created) return oldest;+ if (!oldest) return p.created;+ return new Date(p.created) < new Date(oldest) ? p.created : oldest;+ }, null);++ const allSelected =+ ports.length > 0 &&+ ports.every((port) => selectedPorts?.has(generatePortKey(serverId, port)));++ const someSelected = ports.some((port) =>+ selectedPorts?.has(generatePortKey(serverId, port))+ );++ const handleSelectAllInService = (e) => {+ e.stopPropagation();+ ports.forEach((port) => {+ const isCurrentlySelected = selectedPorts?.has(+ generatePortKey(serverId, port)+ );+ if (allSelected && isCurrentlySelected) {+ onToggleSelection?.(port, serverId);+ } else if (!allSelected && !isCurrentlySelected) {+ onToggleSelection?.(port, serverId);+ }+ });+ };++ const handleBackdropClick = (e) => {+ if (e.target === e.currentTarget) {+ setIsExpanded(false);+ }+ };++ return (+ <>+ <div+ tabIndex="0"+ onClick={() => setIsExpanded(true)}+ className="group relative border border-slate-200 dark:border-slate-700 rounded-lg p-4 hover:shadow-lg hover:border-slate-300 dark:hover:border-slate-600 transition-all duration-200 min-h-[140px] flex flex-col justify-between bg-white dark:bg-slate-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 cursor-pointer"+ >+ {selectionMode && (+ <div className="absolute top-3 left-3 z-10">+ <input+ type="checkbox"+ checked={allSelected}+ ref={(el) => {+ if (el) el.indeterminate = someSelected && !allSelected;+ }}+ onChange={handleSelectAllInService}+ onClick={(e) => e.stopPropagation()}+ className="h-4 w-4 text-blue-600 focus:ring-blue-500 border-slate-300 dark:border-slate-600 rounded cursor-pointer"+ />+ </div>+ )}++ <div className={`flex items-start justify-between mb-3 ${selectionMode ? "ml-6" : ""}`}>+ <div className="flex items-center space-x-2 min-w-0 flex-1">+ {showIcons && <ServiceIcon name={serviceName} source={isDocker ? "docker" : "system"} size={24} className="flex-shrink-0" />}+ <div className="min-w-0 flex-1">+ <h4 className="font-semibold text-sm text-slate-900 dark:text-slate-100 truncate">+ {serviceName}+ </h4>+ <div className="flex items-center space-x-2 mt-0.5">+ <span+ className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium ${+ isDocker+ ? "bg-blue-100 text-blue-700 dark:bg-blue-800/30 dark:text-blue-300"+ : "bg-green-100 text-green-700 dark:bg-green-800/30 dark:text-green-300"+ }`}+ >+ {isDocker ? "docker" : "system"}+ </span>+ <span className="text-xs text-slate-500 dark:text-slate-400">+ {ports.length} port{ports.length !== 1 ? "s" : ""}+ </span>+ </div>+ </div>+ </div>+ </div>++ <div className="flex flex-wrap gap-1.5 mb-3">+ {publishedPorts.slice(0, 4).map((port) => (+ <ClickablePortBadge+ key={port.host_port}+ port={port}+ serverId={serverId}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ />+ ))}+ {publishedPorts.length > 4 && (+ <span className="inline-flex items-center px-2 py-1 rounded-full bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-300 text-xs">+ +{publishedPorts.length - 4}+ </span>+ )}+ </div>++ <div className="flex items-center justify-between text-xs mt-auto">+ {oldestCreated ? (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="inline-block px-2 py-1 rounded-full font-medium bg-slate-100 text-slate-500 dark:bg-slate-800/50 dark:text-slate-400">+ {formatCreatedDate(oldestCreated)}+ </span>+ </TooltipTrigger>+ <TooltipContent>+ {formatCreatedTooltip(oldestCreated)}+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ ) : (+ <span />+ )}+ {internalPorts.length > 0 && (+ <span className="text-slate-400 dark:text-slate-500 text-xs">+ +{internalPorts.length} internal+ </span>+ )}+ </div>+ </div>++ {isExpanded && (+ <div+ className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/40 backdrop-blur-sm animate-in fade-in duration-200"+ onClick={handleBackdropClick}+ >+ <div+ className="bg-white dark:bg-slate-900 rounded-xl shadow-2xl border border-slate-200 dark:border-slate-700 w-full max-w-lg max-h-[80vh] flex flex-col animate-in zoom-in-95 duration-200"+ onClick={(e) => e.stopPropagation()}+ >+ <div className="flex items-center justify-between p-4 border-b border-slate-200 dark:border-slate-700">+ <div className="flex items-center space-x-3">+ {selectionMode && (+ <input+ type="checkbox"+ checked={allSelected}+ ref={(el) => {+ if (el) el.indeterminate = someSelected && !allSelected;+ }}+ onChange={handleSelectAllInService}+ className="h-4 w-4 text-blue-600 focus:ring-blue-500 border-slate-300 dark:border-slate-600 rounded cursor-pointer"+ />+ )}+ {showIcons && <ServiceIcon name={serviceName} source={isDocker ? "docker" : "system"} size={28} />}+ <div>+ <h3 className="font-semibold text-base text-slate-900 dark:text-slate-100">+ {serviceName}+ </h3>+ <div className="flex items-center space-x-2 mt-0.5">+ <span+ className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium ${+ isDocker+ ? "bg-blue-100 text-blue-700 dark:bg-blue-800/30 dark:text-blue-300"+ : "bg-green-100 text-green-700 dark:bg-green-800/30 dark:text-green-300"+ }`}+ >+ {isDocker ? "docker" : "system"}+ </span>+ <span className="text-xs text-slate-500 dark:text-slate-400">+ {publishedPorts.length} published+ {internalPorts.length > 0 && `, ${internalPorts.length} internal`}+ </span>+ </div>+ </div>+ </div>+ <button+ onClick={() => setIsExpanded(false)}+ className="p-2 rounded-lg hover:bg-slate-100 dark:hover:bg-slate-800 transition-colors text-slate-400 hover:text-slate-600 dark:hover:text-slate-300"+ >+ <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">+ <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />+ </svg>+ </button>+ </div>++ <div className="flex-1 overflow-y-auto">+ {(() => {+ const containerGroups = new Map();+ ports.forEach((port) => {+ const containerKey = port.container_id || port.owner || 'unknown';+ const containerName = port.compose_service || port.owner || 'Unknown';+ if (!containerGroups.has(containerKey)) {+ containerGroups.set(containerKey, {+ name: containerName,+ containerId: port.container_id,+ ports: [],+ });+ }+ containerGroups.get(containerKey).ports.push(port);+ });++ return Array.from(containerGroups.values()).map((container, idx) => (+ <div key={container.containerId || container.name}>+ {containerGroups.size > 1 && (+ <div className={`px-4 py-2 bg-slate-50 dark:bg-slate-800/40 border-l-2 border-slate-300 dark:border-slate-600 flex items-center space-x-2 ${idx > 0 ? 'border-t border-slate-150 dark:border-slate-700' : ''}`}>+ {showIcons && <ServiceIcon name={container.name} source="docker" size={14} />}+ <span className="text-xs font-semibold text-slate-600 dark:text-slate-300">+ {container.name}+ </span>+ <span className="text-xs text-slate-400 dark:text-slate-500">+ ({container.ports.length} port{container.ports.length !== 1 ? 's' : ''})+ </span>+ </div>+ )}+ <ul className="divide-y divide-slate-100 dark:divide-slate-800">+ {container.ports.map((port) => (+ <PortCard+ key={generatePortKey(serverId, port)}+ port={port}+ itemKey={generatePortKey(serverId, port)}+ serverId={serverId}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ searchTerm={searchTerm}+ actionFeedback={actionFeedback}+ onCopy={onCopy}+ onEdit={onNote}+ onToggleIgnore={onToggleIgnore}+ onRename={onRename}+ forceOpenDetails={+ deepLinkContainerId &&+ port.container_id === deepLinkContainerId+ }+ notifyOpenDetails={onOpenContainerDetails}+ notifyCloseDetails={onCloseContainerDetails}+ selectionMode={selectionMode}+ isSelected={selectedPorts?.has(generatePortKey(serverId, port))}+ onToggleSelection={onToggleSelection}+ showIcons={showIcons}+ />+ ))}+ </ul>+ </div>+ ));+ })()}+ </div>+ </div>+ </div>+ )}+ </>+ );+}diff --git a/frontend/src/components/server/ServiceCardList.jsx b/frontend/src/components/server/ServiceCardList.jsxnew file mode 100644index 0000000..24a8d9f--- /dev/null+++ b/frontend/src/components/server/ServiceCardList.jsx@@ -0,0 +1,213 @@+import React, { useState } from "react";+import { ChevronDown, ChevronRight } from "lucide-react";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";+import { PortCard } from "./PortCard";+import { generatePortKey } from "../../lib/utils/portUtils";+import { formatCreatedDate, formatCreatedTooltip } from "@/lib/utils";+import ServiceIcon from "@/components/ui/ServiceIcon";+import { ClickablePortBadge } from "./service-card-utils";++export function ServiceCardList({+ serviceName,+ ports,+ serverId,+ serverUrl,+ hostOverride,+ searchTerm,+ actionFeedback,+ onCopy,+ onNote,+ onToggleIgnore,+ onRename,+ onOpenContainerDetails,+ onCloseContainerDetails,+ selectionMode,+ selectedPorts,+ onToggleSelection,+ isDocker,+ deepLinkContainerId,+ showIcons = true,+}) {+ const [isExpanded, setIsExpanded] = useState(false);++ const publishedPorts = ports.filter((p) => !p.internal);+ const _internalPorts = ports.filter((p) => p.internal);+ const oldestCreated = ports.reduce((oldest, p) => {+ if (!p.created) return oldest;+ if (!oldest) return p.created;+ return new Date(p.created) < new Date(oldest) ? p.created : oldest;+ }, null);++ const allSelected =+ ports.length > 0 &&+ ports.every((port) => selectedPorts?.has(generatePortKey(serverId, port)));++ const someSelected = ports.some((port) =>+ selectedPorts?.has(generatePortKey(serverId, port))+ );++ const handleSelectAllInService = (e) => {+ e.stopPropagation();+ ports.forEach((port) => {+ const isCurrentlySelected = selectedPorts?.has(+ generatePortKey(serverId, port)+ );+ if (allSelected && isCurrentlySelected) {+ onToggleSelection?.(port, serverId);+ } else if (!allSelected && !isCurrentlySelected) {+ onToggleSelection?.(port, serverId);+ }+ });+ };++ return (+ <div className="border border-slate-200 dark:border-slate-700 rounded-lg overflow-hidden bg-white dark:bg-slate-800/50">+ <div+ onClick={() => setIsExpanded(!isExpanded)}+ className="flex items-center justify-between p-4 cursor-pointer hover:bg-slate-50 dark:hover:bg-slate-800 transition-colors"+ >+ <div className="flex items-center space-x-3">+ {selectionMode && (+ <input+ type="checkbox"+ checked={allSelected}+ ref={(el) => {+ if (el) el.indeterminate = someSelected && !allSelected;+ }}+ onChange={handleSelectAllInService}+ onClick={(e) => e.stopPropagation()}+ className="h-4 w-4 text-blue-600 focus:ring-blue-500 border-slate-300 dark:border-slate-600 rounded cursor-pointer"+ />+ )}++ <div className="flex items-center">+ {isExpanded ? (+ <ChevronDown className="h-5 w-5 text-slate-400" />+ ) : (+ <ChevronRight className="h-5 w-5 text-slate-400" />+ )}+ </div>++ {showIcons && <ServiceIcon name={serviceName} source={isDocker ? "docker" : "system"} size={24} />}++ <div className="flex flex-col">+ <div className="flex items-center space-x-2">+ <span className="font-medium text-slate-900 dark:text-slate-100">+ {serviceName}+ </span>+ </div>+ <div className="flex items-center space-x-2 text-xs text-slate-500 dark:text-slate-400">+ <span+ className={`inline-block px-1.5 py-0.5 rounded ${isDocker ? "bg-blue-100 text-blue-700 dark:bg-blue-800/30 dark:text-blue-300" : "bg-green-100 text-green-700 dark:bg-green-800/30 dark:text-green-300"}`}+ >+ {isDocker ? "docker" : "system"}+ </span>+ <span>+ {ports.length} port{ports.length !== 1 ? "s" : ""}+ </span>+ {oldestCreated && (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span className="text-slate-400">+ {formatCreatedDate(oldestCreated)}+ </span>+ </TooltipTrigger>+ <TooltipContent>+ {formatCreatedTooltip(oldestCreated)}+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ )}+ </div>+ </div>+ </div>++ <div className="flex items-center space-x-2">+ {publishedPorts.slice(0, 4).map((port) => (+ <ClickablePortBadge+ key={port.host_port}+ port={port}+ serverId={serverId}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ />+ ))}+ {publishedPorts.length > 4 && (+ <span className="text-xs text-slate-500 dark:text-slate-400">+ +{publishedPorts.length - 4}+ </span>+ )}+ </div>+ </div>++ {isExpanded && (+ <div className="border-t border-slate-200 dark:border-slate-700">+ {(() => {+ const containerGroups = new Map();+ ports.forEach((port) => {+ const containerKey = port.container_id || port.owner || 'unknown';+ const containerName = port.compose_service || port.owner || 'Unknown';+ if (!containerGroups.has(containerKey)) {+ containerGroups.set(containerKey, {+ name: containerName,+ containerId: port.container_id,+ ports: [],+ });+ }+ containerGroups.get(containerKey).ports.push(port);+ });++ return Array.from(containerGroups.values()).map((container, idx) => (+ <div key={container.containerId || container.name} className={idx > 0 ? "border-t border-slate-150 dark:border-slate-700" : ""}>+ {containerGroups.size > 1 && (+ <div className="px-4 py-2 bg-slate-50 dark:bg-slate-800/40 border-l-2 border-slate-300 dark:border-slate-600 flex items-center space-x-2">+ {showIcons && <ServiceIcon name={container.name} source="docker" size={14} />}+ <span className="text-xs font-semibold text-slate-600 dark:text-slate-300">+ {container.name}+ </span>+ <span className="text-xs text-slate-400 dark:text-slate-500">+ ({container.ports.length} port{container.ports.length !== 1 ? 's' : ''})+ </span>+ </div>+ )}+ <ul className="divide-y divide-slate-100 dark:divide-slate-800">+ {container.ports.map((port) => (+ <PortCard+ key={generatePortKey(serverId, port)}+ port={port}+ itemKey={generatePortKey(serverId, port)}+ serverId={serverId}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ searchTerm={searchTerm}+ actionFeedback={actionFeedback}+ onCopy={onCopy}+ onEdit={onNote}+ onToggleIgnore={onToggleIgnore}+ onRename={onRename}+ forceOpenDetails={+ deepLinkContainerId && port.container_id === deepLinkContainerId+ }+ notifyOpenDetails={onOpenContainerDetails}+ notifyCloseDetails={onCloseContainerDetails}+ selectionMode={selectionMode}+ isSelected={selectedPorts?.has(generatePortKey(serverId, port))}+ onToggleSelection={onToggleSelection}+ showIcons={showIcons}+ />+ ))}+ </ul>+ </div>+ ));+ })()}+ </div>+ )}+ </div>+ );+}diff --git a/frontend/src/components/server/ServiceCardTable.jsx b/frontend/src/components/server/ServiceCardTable.jsxnew file mode 100644index 0000000..cd145ad--- /dev/null+++ b/frontend/src/components/server/ServiceCardTable.jsx@@ -0,0 +1,243 @@+import React, { useState } from "react";+import { ChevronDown, ChevronRight } from "lucide-react";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";+import { PortTableRow } from "./PortTableRow";+import { generatePortKey } from "../../lib/utils/portUtils";+import { formatCreatedDate, formatCreatedTooltip } from "@/lib/utils";+import ServiceIcon from "@/components/ui/ServiceIcon";+import { ClickablePortBadge } from "./service-card-utils";++export function ServiceCardTableRow({+ serviceName,+ ports,+ serverId,+ serverUrl,+ hostOverride,+ searchTerm,+ actionFeedback,+ onCopy,+ onNote,+ onToggleIgnore,+ onRename,+ onOpenContainerDetails,+ onCloseContainerDetails,+ selectionMode,+ selectedPorts,+ onToggleSelection,+ isDocker,+ deepLinkContainerId,+ showIcons = true,+}) {+ const [isExpanded, setIsExpanded] = useState(false);++ const publishedPorts = ports.filter((p) => !p.internal);+ const oldestCreated = ports.reduce((oldest, p) => {+ if (!p.created) return oldest;+ if (!oldest) return p.created;+ return new Date(p.created) < new Date(oldest) ? p.created : oldest;+ }, null);++ const allSelected =+ ports.length > 0 &&+ ports.every((port) => selectedPorts?.has(generatePortKey(serverId, port)));++ const someSelected = ports.some((port) =>+ selectedPorts?.has(generatePortKey(serverId, port))+ );++ const handleSelectAllInService = (e) => {+ e.stopPropagation();+ ports.forEach((port) => {+ const isCurrentlySelected = selectedPorts?.has(+ generatePortKey(serverId, port)+ );+ if (allSelected && isCurrentlySelected) {+ onToggleSelection?.(port, serverId);+ } else if (!allSelected && !isCurrentlySelected) {+ onToggleSelection?.(port, serverId);+ }+ });+ };++ return (+ <>+ <tr+ onClick={() => setIsExpanded(!isExpanded)}+ className="group border-b border-slate-200 dark:border-slate-700 hover:bg-slate-50 dark:hover:bg-slate-800/50 cursor-pointer transition-colors"+ >+ {selectionMode && (+ <td className="px-4 py-3 text-center">+ <input+ type="checkbox"+ checked={allSelected}+ ref={(el) => {+ if (el) el.indeterminate = someSelected && !allSelected;+ }}+ onChange={handleSelectAllInService}+ onClick={(e) => e.stopPropagation()}+ className="h-4 w-4 text-blue-600 focus:ring-blue-500 border-slate-300 dark:border-slate-600 rounded cursor-pointer"+ />+ </td>+ )}+ <td className="px-4 py-3">+ <div className="flex items-center space-x-3">+ {isExpanded ? (+ <ChevronDown className="h-4 w-4 text-slate-400 flex-shrink-0" />+ ) : (+ <ChevronRight className="h-4 w-4 text-slate-400 flex-shrink-0" />+ )}+ {showIcons && <ServiceIcon name={serviceName} source={isDocker ? "docker" : "system"} size={20} className="flex-shrink-0" />}+ <span className="font-medium text-sm text-slate-900 dark:text-slate-100">+ {serviceName}+ </span>+ </div>+ </td>+ <td className="px-4 py-3">+ <div className="flex items-center space-x-1 flex-wrap">+ {publishedPorts.slice(0, 5).map((port) => (+ <ClickablePortBadge+ key={port.host_port}+ port={port}+ serverId={serverId}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ />+ ))}+ {publishedPorts.length > 5 && (+ <span className="text-xs text-slate-400">+ +{publishedPorts.length - 5}+ </span>+ )}+ </div>+ </td>+ <td className="px-4 py-3">+ <span+ className={`inline-block px-2 py-0.5 rounded font-medium ${+ isDocker+ ? "bg-blue-100 text-blue-800 dark:bg-blue-800/30 dark:text-blue-200"+ : "bg-green-100 text-green-800 dark:bg-green-800/30 dark:text-green-200"+ }`}+ >+ {isDocker ? "docker" : "system"}+ </span>+ </td>+ <td className="px-4 py-3 text-xs text-slate-500 dark:text-slate-400">+ {oldestCreated ? (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span>{formatCreatedDate(oldestCreated)}</span>+ </TooltipTrigger>+ <TooltipContent>+ {formatCreatedTooltip(oldestCreated)}+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ ) : (+ "N/A"+ )}+ </td>+ <td className="px-4 py-3 text-center text-sm text-slate-600 dark:text-slate-300">+ {ports.length}+ </td>+ </tr>+ {isExpanded && (+ <tr className="bg-slate-50 dark:bg-slate-900/30">+ <td colSpan={selectionMode ? 7 : 6} className="p-0">+ <div className="border-t border-slate-200 dark:border-slate-700">+ <table className="min-w-full">+ <thead className="bg-slate-100/50 dark:bg-slate-800/30">+ <tr>+ {selectionMode && (+ <th scope="col" className="px-4 py-2 text-center text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider"></th>+ )}+ <th scope="col" className="px-4 py-2 text-center text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Status</th>+ <th scope="col" className="px-4 py-2 text-left text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Port</th>+ <th scope="col" className="px-4 py-2 text-left text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Container</th>+ <th scope="col" className="px-4 py-2 text-left text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Source</th>+ <th scope="col" className="px-4 py-2 text-left text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Host</th>+ <th scope="col" className="px-4 py-2 text-left text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Created</th>+ <th scope="col" className="px-4 py-2 text-right text-[10px] font-medium text-slate-400 dark:text-slate-500 uppercase tracking-wider">Actions</th>+ </tr>+ </thead>+ <tbody className="divide-y divide-slate-100 dark:divide-slate-800">+ {(() => {+ const containerGroups = new Map();+ ports.forEach((port) => {+ const containerKey = port.container_id || port.owner || 'unknown';+ const containerName = port.compose_service || port.owner || 'Unknown';+ if (!containerGroups.has(containerKey)) {+ containerGroups.set(containerKey, {+ name: containerName,+ containerId: port.container_id,+ ports: [],+ });+ }+ containerGroups.get(containerKey).ports.push(port);+ });++ const rows = [];+ Array.from(containerGroups.values()).forEach((container) => {+ if (containerGroups.size > 1) {+ rows.push(+ <tr key={`header-${container.containerId || container.name}`} className="bg-slate-50 dark:bg-slate-800/40">+ <td colSpan={selectionMode ? 8 : 7} className="px-4 py-1.5 border-l-2 border-slate-300 dark:border-slate-600">+ <div className="flex items-center space-x-2">+ {showIcons && <ServiceIcon name={container.name} source="docker" size={14} />}+ <span className="text-xs font-semibold text-slate-600 dark:text-slate-300">+ {container.name}+ </span>+ <span className="text-xs text-slate-400 dark:text-slate-500">+ ({container.ports.length} port{container.ports.length !== 1 ? 's' : ''})+ </span>+ </div>+ </td>+ </tr>+ );+ }+ container.ports.forEach((port) => {+ rows.push(+ <PortTableRow+ key={generatePortKey(serverId, port)}+ port={port}+ serverId={serverId}+ serverUrl={serverUrl}+ hostOverride={hostOverride}+ searchTerm={searchTerm}+ actionFeedback={actionFeedback}+ onCopy={onCopy}+ onNote={onNote}+ onToggleIgnore={onToggleIgnore}+ onRename={onRename}+ forceOpenDetails={+ deepLinkContainerId &&+ port.container_id === deepLinkContainerId+ }+ notifyOpenDetails={onOpenContainerDetails}+ notifyCloseDetails={onCloseContainerDetails}+ selectionMode={selectionMode}+ isSelected={selectedPorts?.has(+ generatePortKey(serverId, port)+ )}+ onToggleSelection={onToggleSelection}+ showIcons={showIcons}+ />+ );+ });+ });+ return rows;+ })()}+ </tbody>+ </table>+ </div>+ </td>+ </tr>+ )}+ </>+ );+}diff --git a/frontend/src/components/server/service-card-utils.jsx b/frontend/src/components/server/service-card-utils.jsxnew file mode 100644index 0000000..645c9c1--- /dev/null+++ b/frontend/src/components/server/service-card-utils.jsx@@ -0,0 +1,51 @@+import React from "react";+import { ExternalLink } from "lucide-react";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "@/components/ui/tooltip";++export function getHostForPort(port, serverId, serverUrl, hostOverride) {+ if (port.host_ip === "0.0.0.0" || port.host_ip === "127.0.0.1") {+ if (serverId === "local") {+ return hostOverride || window.location.hostname;+ } else if (serverUrl) {+ try {+ return new URL(serverUrl).hostname;+ } catch {+ return "localhost";+ }+ }+ return "localhost";+ }+ return port.host_ip;+}++export function ClickablePortBadge({ port, serverId, serverUrl, hostOverride }) {+ const host = getHostForPort(port, serverId, serverUrl, hostOverride);+ const url = `http://${host}:${port.host_port}`;++ return (+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <a+ href={url}+ target="_blank"+ rel="noopener noreferrer"+ onClick={(e) => e.stopPropagation()}+ className="group/badge inline-flex items-center space-x-1"+ >+ <span className="inline-flex items-center px-2 py-0.5 rounded-full bg-indigo-100 text-indigo-800 dark:bg-indigo-800/40 dark:text-indigo-200 text-xs font-medium">+ {port.host_port}+ </span>+ <ExternalLink className="h-3 w-3 text-indigo-600 dark:text-indigo-400 opacity-0 group-hover/badge:opacity-100 transition-opacity" />+ </a>+ </TooltipTrigger>+ <TooltipContent>{url}</TooltipContent>+ </Tooltip>+ </TooltipProvider>+ );+}diff --git a/frontend/src/components/ui/ServiceIcon.jsx b/frontend/src/components/ui/ServiceIcon.jsxnew file mode 100644index 0000000..17c5e48--- /dev/null+++ b/frontend/src/components/ui/ServiceIcon.jsx@@ -0,0 +1,142 @@+import { useState, useEffect, memo, useRef, useCallback } from 'react';+import { Box, Server, Cpu } from 'lucide-react';+import { getIconUrls } from '@/lib/service-icons';++const urlIndexCache = new Map();++function getCacheKey(name, isDark) {+ return `${name?.toLowerCase() || ''}:${isDark ? 'dark' : 'light'}`;+}++function ServiceIconComponent({ name, source = 'docker', className = '', size = 24 }) {+ const [isDark, setIsDark] = useState(() => document.documentElement.classList.contains('dark'));+ const [needsInvert, setNeedsInvert] = useState(false);+ const [isLoaded, setIsLoaded] = useState(false);+ const cacheKey = getCacheKey(name, isDark);+ const [urlIndex, setUrlIndex] = useState(() => urlIndexCache.get(cacheKey) ?? 0);+ const imgRef = useRef(null);++ useEffect(() => {+ const observer = new MutationObserver(() => {+ setIsDark(document.documentElement.classList.contains('dark'));+ });+ observer.observe(document.documentElement, { attributes: true, attributeFilter: ['class'] });+ return () => observer.disconnect();+ }, []);++ const urls = getIconUrls(name, isDark);+ const currentUrl = urls[urlIndex];+ const iconUrl = currentUrl?.url;+ const isThemeVariant = currentUrl?.isThemeVariant;++ useEffect(() => {+ const newCacheKey = getCacheKey(name, isDark);+ setUrlIndex(urlIndexCache.get(newCacheKey) ?? 0);+ setNeedsInvert(false);+ setIsLoaded(false);+ }, [isDark, name]);++ const checkBrightnessAndDecide = useCallback(() => {+ if (!imgRef.current) return;++ if (isThemeVariant) {+ setNeedsInvert(false);+ setIsLoaded(true);+ urlIndexCache.set(cacheKey, urlIndex);+ return;+ }++ try {+ const img = imgRef.current;+ const canvas = document.createElement('canvas');+ const ctx = canvas.getContext('2d');+ canvas.width = 24;+ canvas.height = 24;+ ctx.drawImage(img, 0, 0, 24, 24);+ const data = ctx.getImageData(0, 0, 24, 24).data;+ let totalBrightness = 0;+ let pixelCount = 0;+ for (let i = 0; i < data.length; i += 4) {+ if (data[i + 3] > 128) {+ totalBrightness += (data[i] * 0.299 + data[i + 1] * 0.587 + data[i + 2] * 0.114);+ pixelCount++;+ }+ }+ const avgBrightness = pixelCount > 0 ? totalBrightness / pixelCount : 255;++ if (isDark && avgBrightness < 60) {+ const nextVariantIdx = urls.findIndex((u, i) => i > urlIndex && u.isThemeVariant);+ if (nextVariantIdx !== -1) {+ setUrlIndex(nextVariantIdx);+ return;+ }+ setNeedsInvert(true);+ setIsLoaded(true);+ } else if (!isDark && avgBrightness > 200) {+ const nextVariantIdx = urls.findIndex((u, i) => i > urlIndex && u.isThemeVariant);+ if (nextVariantIdx !== -1) {+ setUrlIndex(nextVariantIdx);+ return;+ }+ setNeedsInvert(true);+ setIsLoaded(true);+ } else {+ setNeedsInvert(false);+ setIsLoaded(true);+ urlIndexCache.set(cacheKey, urlIndex);+ }+ } catch {+ setNeedsInvert(false);+ setIsLoaded(true);+ }+ }, [cacheKey, isDark, isThemeVariant, urlIndex, urls]);++ const FallbackIcon = source === 'docker' ? Box : source === 'system' ? Cpu : Server;+ const containerClasses = `inline-flex items-center justify-center relative ${className}`;+ const iconSize = size * 0.75;++ const handleError = () => {+ if (urlIndex + 1 < urls.length) {+ setUrlIndex(urlIndex + 1);+ setNeedsInvert(false);+ setIsLoaded(false);+ } else {+ setUrlIndex(-1);+ }+ };++ if (!iconUrl || urlIndex < 0) {+ return (+ <div className={containerClasses} style={{ width: size, height: size }}>+ <FallbackIcon className="text-slate-400 dark:text-slate-500" style={{ width: iconSize, height: iconSize }} />+ </div>+ );+ }++ return (+ <div className={containerClasses} style={{ width: size, height: size }}>+ {!isLoaded && (+ <FallbackIcon className="text-slate-400 dark:text-slate-500 absolute" style={{ width: iconSize, height: iconSize }} />+ )}+ <img+ ref={imgRef}+ src={iconUrl}+ alt=""+ width={size}+ height={size}+ className="rounded object-contain"+ style={{+ opacity: isLoaded ? 1 : 0,+ ...(needsInvert ? { filter: 'invert(1) hue-rotate(180deg)' } : {})+ }}+ crossOrigin="anonymous"+ onError={handleError}+ onLoad={checkBrightnessAndDecide}+ />+ </div>+ );+}++const ServiceIcon = memo(ServiceIconComponent);++export default ServiceIcon;diff --git a/frontend/src/lib/service-icons.js b/frontend/src/lib/service-icons.jsnew file mode 100644index 0000000..ce775d3--- /dev/null+++ b/frontend/src/lib/service-icons.js@@ -0,0 +1,117 @@+const HOMARR_BASE = 'https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons';+const SELFHST_BASE = 'https://cdn.jsdelivr.net/gh/selfhst/icons';++const ALIASES = {+ 'wg-easy': 'wireguard',+ 'npm': 'nginx-proxy-manager',+ 'pgvecto': 'postgres',+ 'pgvecto-rs': 'postgres',+ 'plex-media-server': 'plex',+ 'jellyfin-server': 'jellyfin',+ 'home-assistant-core': 'home-assistant',+ 'code-server': 'vscode',+ 'actual-server': 'actual',+ 'paperless-ngx': 'paperless',+ 'overseerr-overseerr': 'overseerr',+ 'radarr-radarr': 'radarr',+ 'sonarr-sonarr': 'sonarr',+ 'prowlarr-prowlarr': 'prowlarr',+ 'bazarr-bazarr': 'bazarr',+ 'lidarr-lidarr': 'lidarr',+ 'readarr-readarr': 'readarr',+ 'sabnzbd-sabnzbd': 'sabnzbd',+ 'qbittorrent-qbittorrent': 'qbittorrent',+ 'transmission-transmission': 'transmission',+ 'deluge-deluge': 'deluge',+};++export function extractServiceName(input) {+ if (!input) return '';++ let name = input.toLowerCase().trim();+ name = name.replace(/:[^/]+$/, '');++ const parts = name.split('/');+ name = parts[parts.length - 1] || parts[parts.length - 2] || '';++ name = name.replace(/^(ix-|k8s-|binhex-|linuxserver-|lscr\.io-|ghcr\.io-)/, '');+ name = name.replace(/^(umbrel[-_]|casaos-|cosmos-|tipi_|ynh-)/, '');+ name = name.replace(/^(lxc-\d+-?|vm-\d+-?)/, '');+ name = name.replace(/^(pkg-|cs-container-)/, '');++ name = name.replace(/[-_]\d+$/, '');++ return name;+}++function getNameVariants(extracted) {+ const variants = new Set([extracted]);++ const withoutSuffix = extracted.replace(/[-_](upgrade|test|dev|prod|staging|local|beta|alpha|server|daemon|db|proxy)$/, '');+ if (withoutSuffix !== extracted) variants.add(withoutSuffix);++ const hyphenParts = extracted.split('-');+ if (hyphenParts.length >= 2) {+ variants.add(hyphenParts[0]);+ variants.add(hyphenParts[hyphenParts.length - 1]);++ for (let i = 0; i < hyphenParts.length - 1; i++) {+ const twoPartName = hyphenParts[i] + '-' + hyphenParts[i + 1];+ variants.add(twoPartName);+ }++ const mid = Math.floor(hyphenParts.length / 2);+ const firstHalf = hyphenParts.slice(0, mid).join('-');+ const secondHalf = hyphenParts.slice(mid).join('-');+ if (firstHalf) variants.add(firstHalf);+ if (secondHalf && secondHalf !== firstHalf) variants.add(secondHalf);+ }++ const result = [];+ variants.forEach(v => {+ result.push(v);+ if (ALIASES[v]) result.push(ALIASES[v]);+ });++ return [...new Set(result)];+}++export function getIconUrls(input, isDarkMode = false) {+ if (!input) return [];++ const extracted = extractServiceName(input);+ if (!extracted) return [];++ const names = getNameVariants(extracted);+ const seen = new Set();+ const urls = [];++ const addUrl = (url, isThemeVariant = false) => {+ if (!seen.has(url)) {+ seen.add(url);+ urls.push({ url, isThemeVariant });+ }+ };++ names.forEach(n => {+ addUrl(`${HOMARR_BASE}/svg/${n}.svg`, false);++ if (isDarkMode) {+ addUrl(`${HOMARR_BASE}/svg/${n}-light.svg`, true);+ } else {+ addUrl(`${HOMARR_BASE}/svg/${n}-dark.svg`, true);+ }++ addUrl(`${SELFHST_BASE}/svg/${n}.svg`, false);++ if (isDarkMode) {+ addUrl(`${SELFHST_BASE}/svg/${n}-light.svg`, true);+ } else {+ addUrl(`${SELFHST_BASE}/svg/${n}-dark.svg`, true);+ }++ addUrl(`${HOMARR_BASE}/png/${n}.png`, false);+ });++ return urls;+}diff --git a/frontend/vite.config.js b/frontend/vite.config.jsindex 95a5f5e..c2cb01b 100644--- a/frontend/vite.config.js+++ b/frontend/vite.config.js@@ -17,7 +17,7 @@ export default defineConfig({server: {proxy: {'/api': {- target: 'http://localhost:4999',+ target: 'http://localhost:3000',changeOrigin: true,secure: false,},