fix(serverlist): corrected the time by removing teh Z at the end of the time
This commit is contained in:
@@ -1,7 +1,13 @@
|
|||||||
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 {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
|
import {
|
||||||
|
Table,
|
||||||
|
TableBody,
|
||||||
|
TableCell,
|
||||||
|
TableHead,
|
||||||
|
TableHeader,
|
||||||
|
TableRow,
|
||||||
|
} from "@/components/ui/table";
|
||||||
import { useSessionStore } from "@/lib/store/sessionStore";
|
import { useSessionStore } from "@/lib/store/sessionStore";
|
||||||
import { useModuleStore } from "@/lib/store/useModuleStore";
|
import { useModuleStore } from "@/lib/store/useModuleStore";
|
||||||
import { getServers } from "@/utils/querys/servers";
|
import { getServers } from "@/utils/querys/servers";
|
||||||
@@ -13,6 +19,7 @@ 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;
|
||||||
@@ -32,7 +39,8 @@ export default function ServerPage() {
|
|||||||
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: "/" });
|
||||||
@@ -41,6 +49,8 @@ export default function ServerPage() {
|
|||||||
if (isError) {
|
if (isError) {
|
||||||
return <div>{JSON.stringify(error)}</div>;
|
return <div>{JSON.stringify(error)}</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log(data);
|
||||||
return (
|
return (
|
||||||
<LstCard className="m-2 flex place-content-center w-dvh">
|
<LstCard className="m-2 flex place-content-center w-dvh">
|
||||||
<Table>
|
<Table>
|
||||||
@@ -79,15 +89,22 @@ export default function ServerPage() {
|
|||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{data?.map((server: Servers) => (
|
{data?.map((server: Servers) => {
|
||||||
|
const strippedDate = server.lastUpdated.replace("Z", ""); // Remove Z
|
||||||
|
const formattedDate = format(strippedDate, "MM/dd/yyyy hh:mm a");
|
||||||
|
return (
|
||||||
<TableRow key={server.server_id}>
|
<TableRow key={server.server_id}>
|
||||||
<TableCell className="font-medium">{server.sName}</TableCell>
|
<TableCell className="font-medium">{server.sName}</TableCell>
|
||||||
<TableCell className="font-medium">{server.serverDNS}</TableCell>
|
|
||||||
<TableCell className="font-medium">{server.plantToken}</TableCell>
|
|
||||||
<TableCell className="font-medium">{server.idAddress}</TableCell>
|
|
||||||
<TableCell className="font-medium">
|
<TableCell className="font-medium">
|
||||||
{format(server.lastUpdated, "MM/dd/yyyy hh:mm")}
|
{server.serverDNS}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
|
<TableCell className="font-medium">
|
||||||
|
{server.plantToken}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell className="font-medium">
|
||||||
|
{server.idAddress}
|
||||||
|
</TableCell>
|
||||||
|
<TableCell className="font-medium">{formattedDate}</TableCell>
|
||||||
<TableCell className="font-medium">
|
<TableCell className="font-medium">
|
||||||
{adminUrlCheck() && (
|
{adminUrlCheck() && (
|
||||||
<div className="flex flex-row">
|
<div className="flex flex-row">
|
||||||
@@ -99,7 +116,8 @@ export default function ServerPage() {
|
|||||||
)}
|
)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
))}
|
);
|
||||||
|
})}
|
||||||
</TableBody>
|
</TableBody>
|
||||||
)}
|
)}
|
||||||
</Table>
|
</Table>
|
||||||
|
|||||||
Reference in New Issue
Block a user