@genesislcap/foundation-forms 14.354.0 → 14.354.1

package/dist/custom-elements.json

@@ -523,6 +523,198 @@
         }
       ]
     },
+    {
+      "kind": "javascript-module",
+      "path": "src/jsonforms/json-forms.ts",
+      "declarations": [
+        {
+          "kind": "class",
+          "description": "",
+          "name": "JSONForms",
+          "members": [
+            {
+              "kind": "field",
+              "name": "submitted",
+              "type": {
+                "text": "boolean"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "prefix"
+            },
+            {
+              "kind": "method",
+              "name": "prefixChanged"
+            },
+            {
+              "kind": "field",
+              "name": "jsonforms"
+            },
+            {
+              "kind": "field",
+              "name": "i18n"
+            },
+            {
+              "kind": "field",
+              "name": "uichemaToUse"
+            },
+            {
+              "kind": "field",
+              "name": "schema"
+            },
+            {
+              "kind": "method",
+              "name": "schemaChanged"
+            },
+            {
+              "kind": "field",
+              "name": "uischema",
+              "type": {
+                "text": "UISchemaElement"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "uischemaChanged"
+            },
+            {
+              "kind": "field",
+              "name": "data"
+            },
+            {
+              "kind": "method",
+              "name": "dataChanged"
+            },
+            {
+              "kind": "field",
+              "name": "renderers",
+              "type": {
+                "text": "JsonFormsRendererRegistryEntry[]"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "renderersChanged"
+            },
+            {
+              "kind": "field",
+              "name": "validationMode",
+              "type": {
+                "text": "ValidationMode"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "validationModeChanged"
+            },
+            {
+              "kind": "field",
+              "name": "ajv",
+              "type": {
+                "text": "Ajv"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "ajvChanged"
+            },
+            {
+              "kind": "field",
+              "name": "readonly",
+              "type": {
+                "text": "boolean"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "readonlyChanged"
+            },
+            {
+              "kind": "field",
+              "name": "config",
+              "type": {
+                "text": "any"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "configChanged"
+            },
+            {
+              "kind": "field",
+              "name": "props",
+              "type": {
+                "text": "RendererProps"
+              },
+              "readonly": true
+            },
+            {
+              "kind": "field",
+              "name": "dispatch"
+            },
+            {
+              "kind": "field",
+              "name": "validate",
+              "description": "Performs client-side validation by running the validator defined in the UI schema.",
+              "parameters": [
+                {
+                  "description": "the UI schema",
+                  "name": "uischema"
+                }
+              ],
+              "return": {
+                "type": {
+                  "text": ""
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "copyUISchemaToClipboard"
+            }
+          ],
+          "attributes": [
+            {
+              "type": {
+                "text": "boolean"
+              },
+              "fieldName": "submitted"
+            },
+            {
+              "type": {
+                "text": "boolean"
+              },
+              "fieldName": "readonly"
+            }
+          ],
+          "superclass": {
+            "name": "FASTElement",
+            "package": "@microsoft/fast-element"
+          },
+          "tagName": "json-forms",
+          "customElement": true
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "JSONForms",
+          "declaration": {
+            "name": "JSONForms",
+            "module": "src/jsonforms/json-forms.ts"
+          }
+        },
+        {
+          "kind": "custom-element-definition",
+          "name": "json-forms",
+          "declaration": {
+            "name": "JSONForms",
+            "module": "src/jsonforms/json-forms.ts"
+          }
+        }
+      ]
+    },
     {
       "kind": "javascript-module",
       "path": "src/filters/filters.styles.ts",
@@ -1007,198 +1199,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/jsonforms/json-forms.ts",
-      "declarations": [
-        {
-          "kind": "class",
-          "description": "",
-          "name": "JSONForms",
-          "members": [
-            {
-              "kind": "field",
-              "name": "submitted",
-              "type": {
-                "text": "boolean"
-              }
-            },
-            {
-              "kind": "field",
-              "name": "prefix"
-            },
-            {
-              "kind": "method",
-              "name": "prefixChanged"
-            },
-            {
-              "kind": "field",
-              "name": "jsonforms"
-            },
-            {
-              "kind": "field",
-              "name": "i18n"
-            },
-            {
-              "kind": "field",
-              "name": "uichemaToUse"
-            },
-            {
-              "kind": "field",
-              "name": "schema"
-            },
-            {
-              "kind": "method",
-              "name": "schemaChanged"
-            },
-            {
-              "kind": "field",
-              "name": "uischema",
-              "type": {
-                "text": "UISchemaElement"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "uischemaChanged"
-            },
-            {
-              "kind": "field",
-              "name": "data"
-            },
-            {
-              "kind": "method",
-              "name": "dataChanged"
-            },
-            {
-              "kind": "field",
-              "name": "renderers",
-              "type": {
-                "text": "JsonFormsRendererRegistryEntry[]"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "renderersChanged"
-            },
-            {
-              "kind": "field",
-              "name": "validationMode",
-              "type": {
-                "text": "ValidationMode"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "validationModeChanged"
-            },
-            {
-              "kind": "field",
-              "name": "ajv",
-              "type": {
-                "text": "Ajv"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "ajvChanged"
-            },
-            {
-              "kind": "field",
-              "name": "readonly",
-              "type": {
-                "text": "boolean"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "readonlyChanged"
-            },
-            {
-              "kind": "field",
-              "name": "config",
-              "type": {
-                "text": "any"
-              }
-            },
-            {
-              "kind": "method",
-              "name": "configChanged"
-            },
-            {
-              "kind": "field",
-              "name": "props",
-              "type": {
-                "text": "RendererProps"
-              },
-              "readonly": true
-            },
-            {
-              "kind": "field",
-              "name": "dispatch"
-            },
-            {
-              "kind": "field",
-              "name": "validate",
-              "description": "Performs client-side validation by running the validator defined in the UI schema.",
-              "parameters": [
-                {
-                  "description": "the UI schema",
-                  "name": "uischema"
-                }
-              ],
-              "return": {
-                "type": {
-                  "text": ""
-                }
-              }
-            },
-            {
-              "kind": "method",
-              "name": "copyUISchemaToClipboard"
-            }
-          ],
-          "attributes": [
-            {
-              "type": {
-                "text": "boolean"
-              },
-              "fieldName": "submitted"
-            },
-            {
-              "type": {
-                "text": "boolean"
-              },
-              "fieldName": "readonly"
-            }
-          ],
-          "superclass": {
-            "name": "FASTElement",
-            "package": "@microsoft/fast-element"
-          },
-          "tagName": "json-forms",
-          "customElement": true
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "JSONForms",
-          "declaration": {
-            "name": "JSONForms",
-            "module": "src/jsonforms/json-forms.ts"
-          }
-        },
-        {
-          "kind": "custom-element-definition",
-          "name": "json-forms",
-          "declaration": {
-            "name": "JSONForms",
-            "module": "src/jsonforms/json-forms.ts"
-          }
-        }
-      ]
-    },
     {
       "kind": "javascript-module",
       "path": "src/utils/confirmation-dialog-utils.ts",

package/dist/dts/jsonforms/renderers/FilterDateControlRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterDateControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterDateControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,2BAA2B,GAAI,SAAQ,MAAe,6DAuDlE,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,aAM5C,CAAC"}
+{"version":3,"file":"FilterDateControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterDateControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA6B5C,eAAO,MAAM,2BAA2B,GAAI,SAAQ,MAAe,6DAmFlE,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,aAM5C,CAAC"}

package/dist/dts/jsonforms/renderers/FilterNumberControlRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterNumberControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterNumberControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,mCAAmC,GAAI,SAAQ,MAAe,6DAyD1E,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,aAM9C,CAAC"}
+{"version":3,"file":"FilterNumberControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterNumberControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,mCAAmC,GAAI,SAAQ,MAAe,6DA0D1E,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,aAM9C,CAAC"}

package/dist/dts/jsonforms/renderers/FilterTimeControlRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterTimeControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterTimeControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,2BAA2B,GAAI,SAAQ,MAAe,6DA0DlE,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,aAM5C,CAAC"}
+{"version":3,"file":"FilterTimeControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterTimeControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,2BAA2B,GAAI,SAAQ,MAAe,6DAiElE,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,aAM5C,CAAC"}

package/dist/dts/jsonforms/testers/isDate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isDate.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isDate.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW,kCAOvB,CAAC"}
+{"version":3,"file":"isDate.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isDate.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,WAAW,kCAUvB,CAAC"}

package/dist/dts/jsonforms/testers/isOneOfNumber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isOneOfNumber.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isOneOfNumber.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa,kCAKzB,CAAC"}
+{"version":3,"file":"isOneOfNumber.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isOneOfNumber.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,aAAa,kCAYzB,CAAC"}

package/dist/dts/utils/filters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/utils/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAkC,MAAM,kCAAkC,CAAC;AAM9F,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,GAAG,gBA8E7C,CAAC"}
+{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/utils/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAkC,MAAM,kCAAkC,CAAC;AAE9F,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,GAAG,gBAoF7C,CAAC"}

package/dist/esm/jsonforms/renderers/FilterDateControlRenderer.js

@@ -1,61 +1,100 @@
 import { mapStateToControlProps, rankWith } from '@jsonforms/core';
 import { html } from '@microsoft/fast-element';
+import { GenesisType } from '../../utils';
 import { isOneOfDate } from '../testers/isDate';
 import { DATE_CONTROL_RANK } from './RenderersRanks';
+/**
+ * @internal
+ */
+const typeSwitch = (control) => { var _a; return ((_a = control.schema) === null || _a === void 0 ? void 0 : _a.genesisType) === GenesisType.DATETIME ? 'datetime-local' : 'date'; };
+/**
+ * Formats a timestamp value for date/datetime-local input
+ * @internal
+ */
+const formatDateValue = (timestamp, inputType) => {
+    if (timestamp === undefined || timestamp === null)
+        return '';
+    const date = new Date(timestamp);
+    const padded = (dateComponent) => dateComponent.toString().padStart(2, '0');
+    const year = date.getFullYear();
+    const month = padded(date.getMonth() + 1);
+    const day = padded(date.getDate());
+    const hour = padded(date.getHours());
+    const minute = padded(date.getMinutes());
+    return `${year}-${month}-${day}` + (inputType === 'datetime-local' ? `T${hour}:${minute}` : '');
+};
 export const DateControlRendererTemplate = (prefix = 'zero') => html `
   <template>
     <control-wrapper :control=${(x) => x.control} ?submitted=${(x) => x.submitted} prefix="${prefix}">
       <${prefix}-text-field
         :value=${(x) => {
-    var _a, _b;
-    return ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) === undefined || ((_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min) === null
-        ? ''
-        : new Intl.DateTimeFormat('fr-CA', {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-            timeZone: 'UTC',
-        }).format(x.control.data.min);
+    var _a;
+    const inputType = typeSwitch(x.control);
+    return formatDateValue((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min, inputType);
 }}
         id=${(x) => `min-${x.control.path}`}
-        type="date"
+        type="${(x) => typeSwitch(x.control)}"
         data-test-id=${(x) => `min-${x.control.path}`}
         tabindex="${(x) => { var _a, _b; return (_b = (_a = x.control.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.tabIndex; }}"
         @blur=${(x, c) => {
-    var _a, _b;
-    const value = c.event.target.control.valueAsNumber;
+    var _a, _b, _c;
+    const target = c.event.target;
+    const inputValue = target.value;
+    const inputType = typeSwitch(x.control);
+    let minValue;
+    if (inputValue) {
+        minValue = new Date(inputValue).getTime();
+    }
+    const maxValue = ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) !== undefined &&
+        minValue !== undefined &&
+        ((_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max) < minValue
+        ? undefined
+        : (_c = x.control.data) === null || _c === void 0 ? void 0 : _c.max;
     x.control.handleChange(x.control.path, {
-        min: value ? value : undefined,
-        max: ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) < value ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max,
-        type: 'date',
+        min: minValue,
+        max: maxValue,
+        type: inputType === 'datetime-local' ? 'datetime' : 'date',
     });
     x.onBlur();
 }}
         style="width: 100%"
       ></${prefix}-text-field>
+      <span
+        style="
+        font-size: xx-large; 
+        color: var(--neutral-stroke-divider-rest);
+        padding: calc(var(--design-unit) * 1px);"
+      >
+        -
+      </span>
       <${prefix}-text-field
         :value=${(x) => {
-    var _a, _b;
-    return ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max) === undefined || ((_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max) === null
-        ? ''
-        : new Intl.DateTimeFormat('fr-CA', {
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-            timeZone: 'UTC',
-        }).format(x.control.data.max);
+    var _a;
+    const inputType = typeSwitch(x.control);
+    return formatDateValue((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max, inputType);
 }}
         id=${(x) => `max-${x.control.path}`}
-        type="date"
+        type="${(x) => typeSwitch(x.control)}"
         data-test-id=${(x) => `max-${x.control.path}`}
         tabindex="${(x) => { var _a, _b; return (_b = (_a = x.control.uischema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.tabIndex; }}"
         @blur=${(x, c) => {
-    var _a, _b;
-    const value = c.event.target.control.valueAsNumber;
+    var _a, _b, _c;
+    const target = c.event.target;
+    const inputValue = target.value;
+    const inputType = typeSwitch(x.control);
+    let maxValue;
+    if (inputValue) {
+        maxValue = new Date(inputValue).getTime();
+    }
+    const minValue = ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) !== undefined &&
+        maxValue !== undefined &&
+        ((_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min) > maxValue
+        ? undefined
+        : (_c = x.control.data) === null || _c === void 0 ? void 0 : _c.min;
     x.control.handleChange(x.control.path, {
-        min: ((_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min) > value ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min,
-        max: value ? value : undefined,
-        type: 'date',
+        min: minValue,
+        max: maxValue,
+        type: inputType === 'datetime-local' ? 'datetime' : 'date',
     });
     x.onBlur();
 }}

package/dist/esm/jsonforms/renderers/FilterNumberControlRenderer.js

@@ -29,7 +29,8 @@ export const FilterNumberControlRendererTemplate = (prefix = 'zero') => html `
       <span
         style="
         font-size: xx-large; 
-        color: rgb(135, 155, 166);"
+        color: var(--neutral-stroke-divider-rest);
+        padding: calc(var(--design-unit) * 1px);"
       >
         -
       </span>

package/dist/esm/jsonforms/renderers/FilterTimeControlRenderer.js

@@ -36,7 +36,14 @@ export const TimeControlRendererTemplate = (prefix = 'zero') => html `
 }}
         style="width: 100%"
       ></${prefix}-text-field>
-
+      <span
+        style="
+        font-size: xx-large; 
+        color: var(--neutral-stroke-divider-rest);
+        padding: calc(var(--design-unit) * 1px);"
+      >
+        -
+      </span>
       <${prefix}-text-field
         :value=${(x) => {
     var _a;

package/dist/esm/jsonforms/testers/isDate.js

@@ -1,5 +1,8 @@
 import { or, schemaMatches } from '@jsonforms/core';
+import { GenesisType } from '../../utils/types';
 const isDateDescription = (s) => s.description === 'org.joda.time.DateTime';
 const isDate = schemaMatches(isDateDescription);
-export const isOneOfDate = or(isDate, schemaMatches((schema) => schema.hasOwnProperty('oneOf') &&
-    schema.oneOf.some((s) => s.description === 'org.joda.time.DateTime')));
+const isDateGenesisType = (s) => s.genesisType === GenesisType.DATE || s.genesisType === GenesisType.DATETIME;
+const isDateByGenesisType = schemaMatches(isDateGenesisType);
+export const isOneOfDate = or(isDate, isDateByGenesisType, schemaMatches((schema) => schema.hasOwnProperty('oneOf') &&
+    schema.oneOf.some((s) => s.description === 'org.joda.time.DateTime' || isDateGenesisType(s))));

package/dist/esm/jsonforms/testers/isOneOfNumber.js

@@ -1,5 +1,12 @@
-import { hasType, schemaMatches } from '@jsonforms/core';
+import { hasType, or, schemaMatches } from '@jsonforms/core';
+import { GenesisType } from '../../utils/types';
 const hasTypeNumberOrInteger = (schema) => hasType(schema, 'number') || hasType(schema, 'integer');
-export const isOneOfNumber = schemaMatches((schema) => hasTypeNumberOrInteger(schema) ||
+const isNumberGenesisType = (s) => s.genesisType === GenesisType.DOUBLE ||
+    s.genesisType === GenesisType.INT ||
+    s.genesisType === GenesisType.SHORT ||
+    s.genesisType === GenesisType.LONG ||
+    s.genesisType === GenesisType.BIGDECIMAL;
+const isNumberByGenesisType = schemaMatches(isNumberGenesisType);
+export const isOneOfNumber = or(schemaMatches((schema) => hasTypeNumberOrInteger(schema) ||
     (schema.hasOwnProperty('oneOf') &&
-        schema.oneOf.some((s) => hasTypeNumberOrInteger(s))));
+        schema.oneOf.some((s) => hasTypeNumberOrInteger(s)))), isNumberByGenesisType, schemaMatches((schema) => schema.hasOwnProperty('oneOf') && schema.oneOf.some((s) => isNumberGenesisType(s))));

package/dist/esm/utils/filters.js

@@ -1,7 +1,4 @@
 import { ExpressionBuilder, Serialisers } from '@genesislcap/foundation-criteria';
-const hour = 23;
-const minute = 59;
-const sec = 999;
 /**
  * Creates a expressions/criteria from given payload
  * @internal
@@ -37,6 +34,12 @@ export const createExpressions = (payload) => {
                         ...expressions.dateOptions,
                     ];
                 }
+                if (value.type == 'datetime') {
+                    expressions.dateOptions = [
+                        ...dateNumberExpressions(key, value, 'datetime'),
+                        ...expressions.dateOptions,
+                    ];
+                }
                 if (value.type == 'time') {
                     expressions.dateOptions = [
                         ...dateNumberExpressions(key, value, 'time'),
@@ -106,6 +109,13 @@ const dateNumberExpressions = (key, value, type) => {
             endSerialiser = Serialisers.dateIsLessEqual;
             break;
         }
+        case 'datetime': {
+            startValue = value.min ? convertTimestampToDateTime(value.min) : undefined;
+            endValue = value.max ? convertTimestampToDateTime(value.max) : undefined;
+            startSerialiser = Serialisers.dateTimeIsGreaterEqual;
+            endSerialiser = Serialisers.dateTimeIsLessEqual;
+            break;
+        }
         case 'number':
         default: {
             startValue = value.min;
@@ -135,11 +145,23 @@ const dateNumberExpressions = (key, value, type) => {
     return expressions;
 };
 const convertTimestampToDate = (timestamp) => {
-    const months = (new Date(timestamp).getUTCMonth() + 1).toString().padStart(2, '0');
-    const days = new Date(timestamp).getUTCDate().toString().padStart(2, '0');
-    const year = new Date(timestamp).getUTCFullYear().toString();
+    const months = (new Date(timestamp).getMonth() + 1).toString().padStart(2, '0');
+    const days = new Date(timestamp).getDate().toString().padStart(2, '0');
+    const year = new Date(timestamp).getFullYear().toString();
     return [year, months, days].join('');
 };
+const convertTimestampToDateTime = (timestamp) => {
+    const date = new Date(timestamp);
+    const year = date.getFullYear().toString();
+    const months = (date.getMonth() + 1).toString().padStart(2, '0');
+    const days = date.getDate().toString().padStart(2, '0');
+    const hours = date.getHours().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, '0');
+    const seconds = date.getSeconds().toString().padStart(2, '0');
+    const datePart = [year, months, days].join('');
+    const timePart = [hours, minutes, seconds].join(':');
+    return `${datePart}-${timePart}`;
+};
 const convertTimeToDateTime = (time) => {
     const [hours, minutes] = time.split(':').map(Number);
     const today = new Date();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/foundation-forms",
   "description": "Genesis Foundation Forms",
-  "version": "14.354.0",
+  "version": "14.354.1",
   "sideEffects": false,
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/esm/index.js",
@@ -48,22 +48,22 @@
     }
   },
   "devDependencies": {
-    "@genesislcap/foundation-testing": "14.354.0",
-    "@genesislcap/genx": "14.354.0",
-    "@genesislcap/rollup-builder": "14.354.0",
-    "@genesislcap/ts-builder": "14.354.0",
-    "@genesislcap/uvu-playwright-builder": "14.354.0",
-    "@genesislcap/vite-builder": "14.354.0",
-    "@genesislcap/webpack-builder": "14.354.0",
+    "@genesislcap/foundation-testing": "14.354.1",
+    "@genesislcap/genx": "14.354.1",
+    "@genesislcap/rollup-builder": "14.354.1",
+    "@genesislcap/ts-builder": "14.354.1",
+    "@genesislcap/uvu-playwright-builder": "14.354.1",
+    "@genesislcap/vite-builder": "14.354.1",
+    "@genesislcap/webpack-builder": "14.354.1",
     "@types/json-schema": "^7.0.11"
   },
   "dependencies": {
-    "@genesislcap/foundation-comms": "14.354.0",
-    "@genesislcap/foundation-criteria": "14.354.0",
-    "@genesislcap/foundation-logger": "14.354.0",
-    "@genesislcap/foundation-notifications": "14.354.0",
-    "@genesislcap/foundation-ui": "14.354.0",
-    "@genesislcap/foundation-utils": "14.354.0",
+    "@genesislcap/foundation-comms": "14.354.1",
+    "@genesislcap/foundation-criteria": "14.354.1",
+    "@genesislcap/foundation-logger": "14.354.1",
+    "@genesislcap/foundation-notifications": "14.354.1",
+    "@genesislcap/foundation-ui": "14.354.1",
+    "@genesislcap/foundation-utils": "14.354.1",
     "@json-schema-tools/dereferencer": "^1.6.1",
     "@jsonforms/core": "^3.2.1",
     "@microsoft/fast-components": "2.30.6",
@@ -84,5 +84,5 @@
     "access": "public"
   },
   "customElements": "dist/custom-elements.json",
-  "gitHead": "a039dbb62a416e049fb61d2e2451bac4c2e56950"
+  "gitHead": "f895bab2961a8d114d896536c573bd8eb46dff12"
 }