fix(serverlist): corrected the time by removing teh Z at the end of the time

This commit is contained in:
2025-03-23 10:59:23 -05:00
parent 2ae3c8ba59
commit f940bcdc9d

View File

@@ -1,108 +1,126 @@
import {LstCard} from "@/components/extendedUI/LstCard"; import { LstCard } from "@/components/extendedUI/LstCard";
import { Skeleton } from "@/components/ui/skeleton";
import {Skeleton} from "@/components/ui/skeleton"; import {
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table"; Table,
import {useSessionStore} from "@/lib/store/sessionStore"; TableBody,
import {useModuleStore} from "@/lib/store/useModuleStore"; TableCell,
import {getServers} from "@/utils/querys/servers"; TableHead,
import {useQuery} from "@tanstack/react-query"; TableHeader,
import {useRouter} from "@tanstack/react-router"; TableRow,
import {format} from "date-fns"; } from "@/components/ui/table";
import { useSessionStore } from "@/lib/store/sessionStore";
import { useModuleStore } from "@/lib/store/useModuleStore";
import { getServers } from "@/utils/querys/servers";
import { useQuery } from "@tanstack/react-query";
import { useRouter } from "@tanstack/react-router";
import { format } from "date-fns";
import UpdateServer from "./UpdateServer"; import UpdateServer from "./UpdateServer";
import {adminUrlCheck} from "@/utils/adminUrlCheck"; import { adminUrlCheck } from "@/utils/adminUrlCheck";
import RestartServer from "./RestartServer"; import RestartServer from "./RestartServer";
import StopServer from "./StopServer"; import StopServer from "./StopServer";
import StartServer from "./StartServer"; import StartServer from "./StartServer";
import { formatInTimeZone } from "date-fns-tz";
export type Servers = { export type Servers = {
server_id?: string; server_id?: string;
sName?: string; sName?: string;
serverDNS?: string; serverDNS?: string;
plantToken?: string; plantToken?: string;
idAddress: string; idAddress: string;
lastUpdated: string; lastUpdated: string;
isUpgrading: boolean; isUpgrading: boolean;
}; };
export default function ServerPage() { export default function ServerPage() {
const {user, token} = useSessionStore(); const { user, token } = useSessionStore();
const {modules} = useModuleStore(); const { modules } = useModuleStore();
const router = useRouter(); const router = useRouter();
const {data, isError, error, isLoading} = useQuery(getServers(token ?? "")); const { data, isError, error, isLoading } = useQuery(getServers(token ?? ""));
const adminModule = modules.filter((n) => n.name === "admin"); const adminModule = modules.filter((n) => n.name === "admin");
const userLevel = user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || []; const userLevel =
user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || [];
if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) { if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) {
router.navigate({to: "/"}); router.navigate({ to: "/" });
} }
if (isError) { if (isError) {
return <div>{JSON.stringify(error)}</div>; return <div>{JSON.stringify(error)}</div>;
} }
return (
<LstCard className="m-2 flex place-content-center w-dvh"> console.log(data);
<Table> return (
<TableHeader> <LstCard className="m-2 flex place-content-center w-dvh">
<TableRow> <Table>
<TableHead>Name</TableHead> <TableHeader>
<TableHead>Server</TableHead> <TableRow>
<TableHead>PlantToken</TableHead> <TableHead>Name</TableHead>
<TableHead>IP Address</TableHead> <TableHead>Server</TableHead>
<TableHead>Date Last updated</TableHead> <TableHead>PlantToken</TableHead>
<TableHead>Update Server</TableHead> <TableHead>IP Address</TableHead>
</TableRow> <TableHead>Date Last updated</TableHead>
</TableHeader> <TableHead>Update Server</TableHead>
{isLoading ? ( </TableRow>
<> </TableHeader>
<TableBody> {isLoading ? (
{Array(10) <>
.fill(0) <TableBody>
.map((_, i) => ( {Array(10)
<TableRow key={i}> .fill(0)
<TableCell className="font-medium"> .map((_, i) => (
<Skeleton className="h-4" /> <TableRow key={i}>
</TableCell> <TableCell className="font-medium">
<TableCell> <Skeleton className="h-4" />
<Skeleton className="h-4" /> </TableCell>
</TableCell> <TableCell>
<TableCell> <Skeleton className="h-4" />
<Skeleton className="h-4" /> </TableCell>
</TableCell> <TableCell>
<TableCell> <Skeleton className="h-4" />
<Skeleton className="h-4" /> </TableCell>
</TableCell> <TableCell>
</TableRow> <Skeleton className="h-4" />
))} </TableCell>
</TableBody> </TableRow>
</> ))}
) : ( </TableBody>
<TableBody> </>
{data?.map((server: Servers) => ( ) : (
<TableRow key={server.server_id}> <TableBody>
<TableCell className="font-medium">{server.sName}</TableCell> {data?.map((server: Servers) => {
<TableCell className="font-medium">{server.serverDNS}</TableCell> const strippedDate = server.lastUpdated.replace("Z", ""); // Remove Z
<TableCell className="font-medium">{server.plantToken}</TableCell> const formattedDate = format(strippedDate, "MM/dd/yyyy hh:mm a");
<TableCell className="font-medium">{server.idAddress}</TableCell> return (
<TableCell className="font-medium"> <TableRow key={server.server_id}>
{format(server.lastUpdated, "MM/dd/yyyy hh:mm")} <TableCell className="font-medium">{server.sName}</TableCell>
</TableCell> <TableCell className="font-medium">
<TableCell className="font-medium"> {server.serverDNS}
{adminUrlCheck() && ( </TableCell>
<div className="flex flex-row"> <TableCell className="font-medium">
<UpdateServer server={server} token={token as string} /> {server.plantToken}
<StartServer /> </TableCell>
<StopServer /> <TableCell className="font-medium">
<RestartServer /> {server.idAddress}
</div> </TableCell>
)} <TableCell className="font-medium">{formattedDate}</TableCell>
</TableCell> <TableCell className="font-medium">
</TableRow> {adminUrlCheck() && (
))} <div className="flex flex-row">
</TableBody> <UpdateServer server={server} token={token as string} />
)} <StartServer />
</Table> <StopServer />
</LstCard> <RestartServer />
); </div>
)}
</TableCell>
</TableRow>
);
})}
</TableBody>
)}
</Table>
</LstCard>
);
} }