Address review comments 1-4: Fix optional checks, remove redundant code, simplify column visibility, and share utility functions
Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>
This commit is contained in:
1 parent
9bf28c00cd
commit
762cdab78f
3 files changed
+24
-51
No files matched your search
@@ -1,6 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import type { MantineColor } from "@mantine/core";
|
import type { MantineColor } from "@mantine/core";
|
||||||
import { Avatar, Badge, Box, Button, Group, Text } from "@mantine/core";
|
import { Avatar, Badge, Box, Button, Group, Text } from "@mantine/core";
|
||||||
import {
|
import {
|
||||||
@@ -19,7 +18,7 @@ import type { RouterOutputs } from "@homarr/api";
|
|||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { humanFileSize, useTimeAgo } from "@homarr/common";
|
import { humanFileSize, useTimeAgo } from "@homarr/common";
|
||||||
import type { ContainerState } from "@homarr/docker";
|
import type { ContainerState } from "@homarr/docker";
|
||||||
import { containerStateColorMap } from "@homarr/docker/shared";
|
import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
|
||||||
import { useModalAction } from "@homarr/modals";
|
import { useModalAction } from "@homarr/modals";
|
||||||
import { AddDockerAppToHomarr, DockerLogsModal } from "@homarr/modals-collection";
|
import { AddDockerAppToHomarr, DockerLogsModal } from "@homarr/modals-collection";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
@@ -80,9 +79,10 @@ const createColumns = (
|
|||||||
accessorKey: "ports",
|
accessorKey: "ports",
|
||||||
header: t("docker.field.ports.label"),
|
header: t("docker.field.ports.label"),
|
||||||
Cell({ cell }) {
|
Cell({ cell }) {
|
||||||
if (!cell?.row?.original?.ports?.length) return null;
|
const ports = cell.row.original.ports;
|
||||||
|
if (!ports || ports.length === 0) return null;
|
||||||
return (
|
return (
|
||||||
<OverflowBadge overflowCount={1} data={cell.row.original.ports.map((port) => port.PrivatePort.toString())} />
|
<OverflowBadge overflowCount={1} data={ports.map((port) => port.PrivatePort.toString())} />
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -135,7 +135,6 @@ const createColumns = (
|
|||||||
export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"]) {
|
export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"]) {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
const tDocker = useScopedI18n("docker");
|
const tDocker = useScopedI18n("docker");
|
||||||
const [showStats, setShowStats] = useState(false);
|
|
||||||
const { data } = clientApi.docker.getContainers.useQuery(undefined, {
|
const { data } = clientApi.docker.getContainers.useQuery(undefined, {
|
||||||
initialData,
|
initialData,
|
||||||
refetchOnMount: false,
|
refetchOnMount: false,
|
||||||
@@ -209,14 +208,6 @@ export function DockerTable(initialData: RouterOutputs["docker"]["getContainers"
|
|||||||
columns: createColumns(t),
|
columns: createColumns(t),
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
table.setColumnVisibility((prev) => ({
|
|
||||||
...prev,
|
|
||||||
cpuUsage: showStats,
|
|
||||||
memoryUsage: showStats,
|
|
||||||
}));
|
|
||||||
}, [showStats, table]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Text>{tDocker("table.updated", { when: relativeTime })}</Text>
|
<Text>{tDocker("table.updated", { when: relativeTime })}</Text>
|
||||||
@@ -334,21 +325,3 @@ const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const memoryUsageColor = (number: number, state: string) => {
|
|
||||||
const mbUsage = number / 1024 / 1024;
|
|
||||||
if (mbUsage === 0 && state !== "running") return "red";
|
|
||||||
if (mbUsage < 128) return "green";
|
|
||||||
if (mbUsage < 256) return "yellow";
|
|
||||||
if (mbUsage < 512) return "orange";
|
|
||||||
return "red";
|
|
||||||
};
|
|
||||||
|
|
||||||
const cpuUsageColor = (number: number, state: string) => {
|
|
||||||
if (number === 0 && state !== "running") return "red";
|
|
||||||
if (number < 40) return "green";
|
|
||||||
if (number < 60) return "yellow";
|
|
||||||
if (number < 90) return "orange";
|
|
||||||
return "red";
|
|
||||||
};
|
|
||||||
|
|
||||||
const safeValue = (value?: number, fallback = 0) => (value !== undefined && !isNaN(value) ? value : fallback);
|
|
||||||
@@ -11,3 +11,22 @@ export const containerStateColorMap = {
|
|||||||
removing: "pink",
|
removing: "pink",
|
||||||
dead: "dark",
|
dead: "dark",
|
||||||
} satisfies Record<ContainerState, MantineColor>;
|
} satisfies Record<ContainerState, MantineColor>;
|
||||||
|
|
||||||
|
export const memoryUsageColor = (number: number, state: string): MantineColor => {
|
||||||
|
const mbUsage = number / 1024 / 1024;
|
||||||
|
if (mbUsage === 0 && state !== "running") return "red";
|
||||||
|
if (mbUsage < 128) return "green";
|
||||||
|
if (mbUsage < 256) return "yellow";
|
||||||
|
if (mbUsage < 512) return "orange";
|
||||||
|
return "red";
|
||||||
|
};
|
||||||
|
|
||||||
|
export const cpuUsageColor = (number: number, state: string): MantineColor => {
|
||||||
|
if (number === 0 && state !== "running") return "red";
|
||||||
|
if (number < 40) return "green";
|
||||||
|
if (number < 60) return "yellow";
|
||||||
|
if (number < 90) return "orange";
|
||||||
|
return "red";
|
||||||
|
};
|
||||||
|
|
||||||
|
export const safeValue = (value?: number, fallback = 0) => (value !== undefined && !isNaN(value) ? value : fallback);
|
||||||
@@ -11,7 +11,7 @@ import type { RouterOutputs } from "@homarr/api";
|
|||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { humanFileSize, useTimeAgo } from "@homarr/common";
|
import { humanFileSize, useTimeAgo } from "@homarr/common";
|
||||||
import type { ContainerState } from "@homarr/docker";
|
import type { ContainerState } from "@homarr/docker";
|
||||||
import { containerStateColorMap } from "@homarr/docker/shared";
|
import { containerStateColorMap, cpuUsageColor, memoryUsageColor, safeValue } from "@homarr/docker/shared";
|
||||||
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
|
||||||
import { useScopedI18n } from "@homarr/translation/client";
|
import { useScopedI18n } from "@homarr/translation/client";
|
||||||
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";
|
||||||
@@ -28,25 +28,6 @@ const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const memoryUsageColor = (number: number, state: string) => {
|
|
||||||
const mbUsage = number / 1024 / 1024;
|
|
||||||
if (mbUsage === 0 && state !== "running") return "red";
|
|
||||||
if (mbUsage < 128) return "green";
|
|
||||||
if (mbUsage < 256) return "yellow";
|
|
||||||
if (mbUsage < 512) return "orange";
|
|
||||||
return "red";
|
|
||||||
};
|
|
||||||
|
|
||||||
const cpuUsageColor = (number: number, state: string) => {
|
|
||||||
if (number === 0 && state !== "running") return "red";
|
|
||||||
if (number < 40) return "green";
|
|
||||||
if (number < 60) return "yellow";
|
|
||||||
if (number < 90) return "orange";
|
|
||||||
return "red";
|
|
||||||
};
|
|
||||||
|
|
||||||
const safeValue = (value?: number, fallback = 0) => (value !== undefined && !isNaN(value) ? value : fallback);
|
|
||||||
|
|
||||||
const actionIconIconStyle: IconProps["style"] = {
|
const actionIconIconStyle: IconProps["style"] = {
|
||||||
height: "var(--ai-icon-size)",
|
height: "var(--ai-icon-size)",
|
||||||
width: "var(--ai-icon-size)",
|
width: "var(--ai-icon-size)",
|
||||||
|
|||||||
Reference in new issue
Block a user