From f93bccac1bb6ccdec608908faffd36cefcb8951c Mon Sep 17 00:00:00 2001 From: Johanna Szepanski <johanna.szepanski@softhouse.se> Date: Wed, 14 Aug 2024 16:27:59 +0200 Subject: [PATCH] moved status related components into its own folder --- src/components/host/HostBadge.js | 2 +- src/components/host/{ => HostStatus}/HostStatus.js | 2 +- src/components/host/{ => HostStatus}/HostStatusData.js | 4 ++-- src/components/host/{ => HostStatus}/HostStatusIcon.js | 4 ++-- src/components/host/HostStatus/index.js | 5 +++++ src/components/host/index.js | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) rename src/components/host/{ => HostStatus}/HostStatus.js (94%) rename src/components/host/{ => HostStatus}/HostStatusData.js (91%) rename src/components/host/{ => HostStatus}/HostStatusIcon.js (95%) create mode 100644 src/components/host/HostStatus/index.js diff --git a/src/components/host/HostBadge.js b/src/components/host/HostBadge.js index 8820f13d..95efc645 100644 --- a/src/components/host/HostBadge.js +++ b/src/components/host/HostBadge.js @@ -1,5 +1,5 @@ import { IconBadge } from "@ess-ics/ce-ui-common"; -import { HostStatusIcon } from "./HostStatusIcon"; +import { HostStatusIcon } from "./HostStatus/HostStatusIcon"; export function HostBadge({ host, status, ...rest }) { return ( diff --git a/src/components/host/HostStatus.js b/src/components/host/HostStatus/HostStatus.js similarity index 94% rename from src/components/host/HostStatus.js rename to src/components/host/HostStatus/HostStatus.js index 3d4424bb..7948cadd 100644 --- a/src/components/host/HostStatus.js +++ b/src/components/host/HostStatus/HostStatus.js @@ -1,6 +1,6 @@ import { useContext, useMemo } from "react"; import { Grid, Skeleton } from "@mui/material"; -import { apiContext } from "../../api/DeployApi"; +import { apiContext } from "../../../api/DeployApi"; import { useAPIMethod } from "@ess-ics/ce-ui-common"; import { HostStatusIcon } from "./HostStatusIcon"; diff --git a/src/components/host/HostStatusData.js b/src/components/host/HostStatus/HostStatusData.js similarity index 91% rename from src/components/host/HostStatusData.js rename to src/components/host/HostStatus/HostStatusData.js index 4f00b182..8333cf54 100644 --- a/src/components/host/HostStatusData.js +++ b/src/components/host/HostStatus/HostStatusData.js @@ -1,11 +1,11 @@ -import { SEVERITY, STATUS } from "../common/Status"; +import { SEVERITY, STATUS } from "../../common/Status"; export const HOST_STATUS = { available: "available", unreachable: "unreachable" }; -export const getHostStatusInfo = (hostStatusInfo) => { +export const getHostStatus = (hostStatusInfo) => { let { status } = hostStatusInfo; const alertSeverity = hostStatusInfo?.alertSeverity?.toLowerCase(); status = status.toLowerCase(); diff --git a/src/components/host/HostStatusIcon.js b/src/components/host/HostStatus/HostStatusIcon.js similarity index 95% rename from src/components/host/HostStatusIcon.js rename to src/components/host/HostStatus/HostStatusIcon.js index e469a269..6cd41fd9 100644 --- a/src/components/host/HostStatusIcon.js +++ b/src/components/host/HostStatus/HostStatusIcon.js @@ -1,12 +1,12 @@ import { useTheme } from "@mui/material"; -import Popover from "../common/Popover"; +import Popover from "../../common/Popover"; import { StatusBadge, StatusIcon, STATUS, StatusPopoverContent, statusConfig -} from "../common/Status"; +} from "../../common/Status"; import { getHostStatusInfo } from "./HostStatusData"; export function HostStatusIcon({ hostStatus, hideAlerts = false }) { diff --git a/src/components/host/HostStatus/index.js b/src/components/host/HostStatus/index.js new file mode 100644 index 00000000..6499e5a5 --- /dev/null +++ b/src/components/host/HostStatus/index.js @@ -0,0 +1,5 @@ +import { HostStatus } from "./HostStatus"; +import { getHostStatus } from "./HostStatusData"; + +export { HostStatus, getHostStatus }; +export default HostStatus; diff --git a/src/components/host/index.js b/src/components/host/index.js index 775a2186..40b9013e 100644 --- a/src/components/host/index.js +++ b/src/components/host/index.js @@ -1,5 +1,5 @@ import { HostBadge } from "./HostBadge"; -import { HostStatusIcon } from "./HostStatusIcon"; +import { HostStatusIcon } from "./HostStatus/HostStatusIcon"; import { HostTable, rowDescription, createRow } from "./HostTable"; export { HostBadge, HostStatusIcon, HostTable, rowDescription, createRow }; -- GitLab