feat: Capture epoch time in DateInput

Author: DafyddLlyr

editor.planx.uk/src/@planx/components/Calculate/Editor.tsx

@@ -60,6 +60,9 @@ export default function Component(props: Props) {
       // Type guard as mathjs evaluates `m` to a "Unit" object for "meter"
       if (typeof result === "number") {
         return result;
+        // Allow component to output booleans
+      } else if (typeof result === "boolean") {
+        return result;
       } else {
         return UNKNOWN;
       }

editor.planx.uk/src/@planx/components/Calculate/model.ts

@@ -72,7 +72,10 @@ export function evaluate(input: string, scope = {}, defaults = {}): number {
 
   function serializeKeys(object: any): Object {
     return Object.fromEntries(
-      Object.entries(object).map(([key, value]) => [serialize(key), value]),
+      Object.entries(object).map(([key, value]) => [
+        serialize(key),
+        Array.isArray(value) ? value[0] : value,
+      ]),
     );
   }
 

editor.planx.uk/src/@planx/components/DateInput/Public.test.tsx

@@ -33,6 +33,7 @@ test("submits a date", async () => {
   expect(handleSubmit).toHaveBeenCalledWith({
     data: {
       [componentId]: "2010-05-22",
+      [componentId + ".epoch"]: 1274486400,
     },
   });
 });
@@ -59,6 +60,7 @@ test("recovers previously submitted date when clicking the back button", async (
   expect(handleSubmit).toHaveBeenCalledWith({
     data: {
       [componentId]: "2010-05-22",
+      [componentId + ".epoch"]: 1274486400,
     },
   });
 });
@@ -87,6 +89,7 @@ test("recovers previously submitted date when clicking the back button even if a
   expect(handleSubmit).toHaveBeenCalledWith({
     data: {
       [dataField]: "2010-05-22",
+      [dataField + ".epoch"]: 1274486400,
     },
   });
 });

editor.planx.uk/src/@planx/components/DateInput/Public.tsx

@@ -22,7 +22,18 @@ const DateInputPublic: React.FC<Props> = (props) => {
       date: getPreviouslySubmittedData(props) ?? "",
     },
     onSubmit: (values) => {
-      props.handleSubmit?.(makeData(props, values.date));
+      const isoDate = makeData(props, values.date).data;
+      const passportKey = Object.keys(isoDate)[0];
+      const epochDate = {
+        [passportKey + ".epoch"]: new Date(values.date).valueOf() / 1000,
+      };
+
+      props.handleSubmit?.({
+        data: {
+          ...isoDate,
+          ...epochDate,
+        },
+      });
     },
     validateOnBlur: false,
     validateOnChange: false,

editor.planx.uk/src/@planx/components/shared/utils.ts

@@ -37,7 +37,7 @@ export const makeData = <T>(
   props: any,
   value: T,
   overwriteKey?: string,
-): {} | { data: Record<string, T> } => {
+): Record<string, never> | { data: Record<string, T> } => {
   if (isEmpty(value)) return {};
   else
     return {