diff --git a/src/components/EventReports.tsx b/src/components/EventReports.tsx
index d444ce8..810cce8 100644
--- a/src/components/EventReports.tsx
+++ b/src/components/EventReports.tsx
@@ -21,15 +21,7 @@ import { MXCField } from "./media";
import PageviewIcon from "@mui/icons-material/Pageview";
import ReportIcon from "@mui/icons-material/Warning";
import ViewListIcon from "@mui/icons-material/ViewList";
-
-const date_format: Intl.DateTimeFormatOptions = {
- year: "numeric",
- month: "2-digit",
- day: "2-digit",
- hour: "2-digit",
- minute: "2-digit",
- second: "2-digit",
-};
+import { date_format } from "./date";
const ReportPagination = () => (
diff --git a/src/components/RegistrationTokens.tsx b/src/components/RegistrationTokens.tsx
index 9564d95..c737fb8 100644
--- a/src/components/RegistrationTokens.tsx
+++ b/src/components/RegistrationTokens.tsx
@@ -22,41 +22,12 @@ import {
Toolbar,
} from "react-admin";
import RegistrationTokenIcon from "@mui/icons-material/ConfirmationNumber";
-
-const date_format = {
- year: "numeric",
- month: "2-digit",
- day: "2-digit",
- hour: "2-digit",
- minute: "2-digit",
- second: "2-digit",
-};
+import { date_format, dateFormatter, dateParser } from "./date";
const validateToken = [regex(/^[A-Za-z0-9._~-]{0,64}$/)];
const validateUsesAllowed = [number()];
const validateLength = [number(), maxValue(64)];
-const dateParser = v => {
- const d = new Date(v);
- if (isNaN(d)) return 0;
- return d.getTime();
-};
-
-const dateFormatter = v => {
- if (v === undefined || v === null) return;
- const d = new Date(v);
-
- const pad = "00";
- const year = d.getFullYear().toString();
- const month = (pad + (d.getMonth() + 1).toString()).slice(-2);
- const day = (pad + d.getDate().toString()).slice(-2);
- const hour = (pad + d.getHours().toString()).slice(-2);
- const minute = (pad + d.getMinutes().toString()).slice(-2);
-
- // target format yyyy-MM-ddThh:mm
- return `${year}-${month}-${day}T${hour}:${minute}`;
-};
-
const registrationTokenFilters = [];
export const RegistrationTokenList = (props: ListProps) => (
diff --git a/src/components/date.ts b/src/components/date.ts
index 91aa096..3f8094d 100644
--- a/src/components/date.ts
+++ b/src/components/date.ts
@@ -1,4 +1,4 @@
-export const DATE_FORMAT: Intl.DateTimeFormatOptions = {
+export const date_format: Intl.DateTimeFormatOptions = {
year: "numeric",
month: "2-digit",
day: "2-digit",
diff --git a/src/components/destinations.tsx b/src/components/destinations.tsx
index 90681be..a574181 100644
--- a/src/components/destinations.tsx
+++ b/src/components/destinations.tsx
@@ -29,7 +29,7 @@ import {
useTranslate,
} from "react-admin";
-import { DATE_FORMAT } from "./date";
+import { date_format } from "./date";
const DestinationPagination = () => (
@@ -112,8 +112,8 @@ export const DestinationList = (props: ListProps) => {
bulkActionButtons={false}
>
-
-
+
+
@@ -133,8 +133,8 @@ export const DestinationShow = (props: ShowProps) => {
}>
-
-
+
+
diff --git a/src/components/media.tsx b/src/components/media.tsx
index 21d480f..279a512 100644
--- a/src/components/media.tsx
+++ b/src/components/media.tsx
@@ -34,17 +34,12 @@ import LockIcon from "@mui/icons-material/Lock";
import LockOpenIcon from "@mui/icons-material/LockOpen";
import FileOpenIcon from "@mui/icons-material/FileOpen";
import { alpha, useTheme } from "@mui/material/styles";
+import { dateParser } from "./date";
import { getMediaUrl } from "../synapse/synapse";
const DeleteMediaDialog = ({ open, onClose, onSubmit }) => {
const translate = useTranslate();
- const dateParser = v => {
- const d = new Date(v);
- if (isNaN(d)) return 0;
- return d.getTime();
- };
-
const DeleteMediaToolbar = (props: ToolbarProps) => (
(
diff --git a/src/components/users.tsx b/src/components/users.tsx
index 8ecacfa..8fb7a9a 100644
--- a/src/components/users.tsx
+++ b/src/components/users.tsx
@@ -57,6 +57,7 @@ import {
ProtectMediaButton,
QuarantineMediaButton,
} from "./media";
+import { date_format } from "./date";
const choices_medium = [
{ id: "email", name: "resources.users.email" },
@@ -68,15 +69,6 @@ const choices_type = [
{ id: "support", name: "support" },
];
-const date_format: Intl.DateTimeFormatOptions = {
- year: "numeric",
- month: "2-digit",
- day: "2-digit",
- hour: "2-digit",
- minute: "2-digit",
- second: "2-digit",
-};
-
const UserListActions = () => {
const { isLoading, total } = useListContext();
return (