fix: Revert local times

stenic · Dec 20, 2022 · e44df39 · e44df39
1 parent 3da3109
commit e44df39
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -22,7 +22,6 @@
     "@types/react-dom": "^18.0.8",
     "graphql-request": "^5.0.0",
     "graphql-tag": "^2.12.6",
-    "moment": "^2.29.4",
     "oidc-client-ts": "^2.1.0",
     "react": "^18.2.0",
     "react-admin": "^4.4.4",
@@ -61,4 +60,4 @@
     ]
   },
   "proxy": "http://localhost:8080"
-}
+}
diff --git a/ui/src/scenes/feed/index.tsx b/ui/src/scenes/feed/index.tsx
@@ -11,7 +11,6 @@ import ListItemAvatar from "@mui/material/ListItemAvatar";
 import Avatar from "@mui/material/Avatar";
 import LinearProgress from "@mui/material/LinearProgress";
 import { VersionData } from "../../types/version";
-import moment from "moment";
 
 const Feed = () => {
   const { data, isLoading } = useGqlQuery(
@@ -63,7 +62,14 @@ const Feed = () => {
                         component="span"
                         color="text.primary"
                       >
-                        {moment(version.timestamp).format("llll")}
+                        {new Date(version.timestamp).toLocaleDateString()}
+                      </Typography>{" "}
+                      <Typography
+                        sx={{ display: "inline" }}
+                        component="span"
+                        color="text.secondary"
+                      >
+                        {new Date(version.timestamp).toLocaleTimeString()}
                       </Typography>
                     </React.Fragment>
                   }

diff --git a/ui/src/scenes/last/index.tsx b/ui/src/scenes/last/index.tsx
@@ -4,7 +4,6 @@ import Header from "../../components/Header";
 import { useGqlQuery } from "../../utils/http";
 import gql from "graphql-tag";
 import { VersionData } from "../../types/version";
-import moment from "moment";
 
 const LastVersions = () => {
   const { data, isLoading } = useGqlQuery(
@@ -64,8 +63,7 @@ const LastVersions = () => {
       headerName: "Date",
       flex: 1,
       type: "dateTime",
-      valueGetter: ({ value }: { value: string }) =>
-        value && moment(value).format("llll"),
+      valueGetter: ({ value }: { value: string }) => value && new Date(value),
     },
   ];
 

diff --git a/ui/src/scenes/versions/index.tsx b/ui/src/scenes/versions/index.tsx
@@ -4,7 +4,6 @@ import Header from "../../components/Header";
 import { useGqlQuery } from "../../utils/http";
 import gql from "graphql-tag";
 import { VersionData } from "../../types/version";
-import moment from "moment";
 
 const Versions = () => {
   const { data, isLoading } = useGqlQuery(
@@ -64,8 +63,7 @@ const Versions = () => {
       headerName: "Date",
       flex: 1,
       type: "dateTime",
-      valueGetter: ({ value }: { value: string }) =>
-        value && moment(value).format("llll"),
+      valueGetter: ({ value }: { value: string }) => value && new Date(value),
     },
   ];