@sphereon/ui-components.ssi-react 0.4.1-unstable.169 → 0.4.1-unstable.171

package/dist/components/views/FormView/index.js

@@ -7,25 +7,23 @@ import addFormats from 'ajv-formats';
 import { formatDate } from '../../../helpers';
 import { createFormViewAjv } from '../../../utils/Ajv';
 import { jsonFormsMaterialRenderers } from '../../../renders/jsonFormsRenders';
-const defaultAjv = new Ajv({ useDefaults: true });
-addFormats(defaultAjv);
-defaultAjv.addKeyword({
-    keyword: 'dateFormat',
-    modifying: true,
-    validate: (dateFormat, data, parentSchema, dataCxt) => {
-        if (typeof data === 'string') {
-            if (!dataCxt?.parentData || dataCxt.parentDataProperty === undefined) {
-                return true;
-            }
-            const formatted = formatDate(data, dateFormat);
-            if (formatted && formatted !== 'Invalid date') {
-                dataCxt.parentData[dataCxt.parentDataProperty] = formatted;
-            }
+const dateFormatValidator = (dateFormat, data, parentSchema, dataCxt) => {
+    if (typeof data === 'string') {
+        if (!dataCxt?.parentData || dataCxt.parentDataProperty === undefined) {
             return true;
         }
-        return false;
+        const formatted = formatDate(data, dateFormat);
+        if (formatted && formatted !== 'Invalid date') {
+            dataCxt.parentData[dataCxt.parentDataProperty] = formatted;
+        }
+        return true;
     }
-});
+    return false;
+};
+const defaultAjv = new Ajv({ useDefaults: true });
+addFormats(defaultAjv);
+defaultAjv.addKeyword({ keyword: 'dateFormat', modifying: true, validate: dateFormatValidator });
+defaultAjv.addKeyword({ keyword: 'isoDateFormat', modifying: true, validate: dateFormatValidator });
 const FormView = (props) => {
     const { schema, uiSchema, validationMode = 'ValidateAndShow', renderers = jsonFormsMaterialRenderers, cells = materialCells, style, middleware, onFormStateChange, readonly = false, config, } = props;
     const [data, setData] = useState(props.data);

package/dist/helpers/DateHelper/index.d.ts

@@ -1,2 +1,3 @@
 export type DateFormat = 'date-time' | 'date' | 'time' | 'iso-date-time' | 'iso-date' | 'iso-time' | undefined;
 export declare const formatDate: (dateString?: string, format?: DateFormat | string) => string;
+export declare const formatDateToISO: (dateString?: string, format?: DateFormat) => string;

package/dist/helpers/DateHelper/index.js

@@ -26,6 +26,11 @@ const applyCustomFormat = (date, format) => {
                 i = closeIdx + 1;
                 continue;
             }
+            else {
+                result += char;
+                i += 1;
+                continue;
+            }
         }
         const token = orderedTokens.find((t) => format.startsWith(t, i));
         if (token) {
@@ -84,3 +89,12 @@ export const formatDate = (dateString, format = 'date-time') => {
         return date.toString();
     }
 };
+export const formatDateToISO = (dateString, format = 'date-time') => {
+    if (format === 'date-time')
+        return formatDate(dateString, 'iso-date-time');
+    if (format === 'date')
+        return formatDate(dateString, 'iso-date');
+    if (format === 'time')
+        return formatDate(dateString, 'iso-time');
+    return formatDate(dateString, format);
+};

package/dist/utils/Ajv.d.ts

@@ -1,9 +1,14 @@
 import { DateFormat } from '../helpers';
 import Ajv, { AnySchemaObject } from 'ajv';
 import { DataValidationCxt } from 'ajv/dist/types';
-export declare const createFormViewAjv: () => Ajv;
+export declare const dateFormatAjvKeyword: {
+    keyword: string;
+    modifying: boolean;
+    validate: (schema: DateFormat | string, data: any, parentSchema?: AnySchemaObject, dataCxt?: DataValidationCxt) => boolean;
+};
 export declare const isDateFormatAjvKeyword: {
     keyword: string;
     modifying: boolean;
-    validate: (schema: DateFormat, data: any, parentSchema?: AnySchemaObject, dataCxt?: DataValidationCxt) => boolean;
+    validate: (schema: DateFormat | string, data: any, parentSchema?: AnySchemaObject, dataCxt?: DataValidationCxt) => boolean;
 };
+export declare const createFormViewAjv: () => Ajv;

package/dist/utils/Ajv.js

@@ -1,26 +1,33 @@
 import { formatDate } from '../helpers';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
+const dateFormatValidator = (schema, data, parentSchema, dataCxt) => {
+    if (typeof data === 'string') {
+        if (!dataCxt?.parentData || dataCxt.parentDataProperty === undefined) {
+            return true;
+        }
+        const formatted = formatDate(data, schema);
+        if (formatted && formatted !== 'Invalid date') {
+            dataCxt.parentData[dataCxt.parentDataProperty] = formatted;
+        }
+        return true;
+    }
+    return false;
+};
+export const dateFormatAjvKeyword = {
+    keyword: 'dateFormat',
+    modifying: true,
+    validate: dateFormatValidator,
+};
+export const isDateFormatAjvKeyword = {
+    keyword: 'isoDateFormat',
+    modifying: true,
+    validate: dateFormatValidator,
+};
 export const createFormViewAjv = () => {
     const ajv = new Ajv({ useDefaults: true });
     addFormats(ajv);
+    ajv.addKeyword(dateFormatAjvKeyword);
     ajv.addKeyword(isDateFormatAjvKeyword);
     return ajv;
 };
-export const isDateFormatAjvKeyword = {
-    keyword: 'isoDateFormat',
-    modifying: true,
-    validate: (schema, data, parentSchema, dataCxt) => {
-        if (typeof data === 'string') {
-            if (!dataCxt?.parentData || dataCxt.parentDataProperty === undefined) {
-                return true;
-            }
-            const formatted = formatDate(data, schema);
-            if (formatted && formatted !== 'Invalid date') {
-                dataCxt.parentData[dataCxt.parentDataProperty] = formatted;
-            }
-            return true;
-        }
-        return false;
-    }
-};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ui-components.ssi-react",
   "private": false,
-  "version": "0.4.1-unstable.169+31255b3",
+  "version": "0.4.1-unstable.171+f7cbb44",
   "description": "SSI UI components for React",
   "repository": "git@github.com:Sphereon-Opensource/UI-Components.git",
   "author": "Sphereon <dev@sphereon.com>",
@@ -50,7 +50,7 @@
     "@mui/x-date-pickers": "^8.18.0",
     "@sphereon/ssi-sdk.data-store-types": "0.36.1-next.159",
     "@sphereon/ssi-types": "0.36.1-next.159",
-    "@sphereon/ui-components.core": "0.4.1-unstable.169+31255b3",
+    "@sphereon/ui-components.core": "0.4.1-unstable.171+f7cbb44",
     "@tanstack/react-table": "^8.9.3",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
@@ -72,5 +72,5 @@
   "peerDependencies": {
     "react": ">= 18"
   },
-  "gitHead": "31255b3215b56170050a1e6cd85c4a279b57625a"
+  "gitHead": "f7cbb440c40f1dcb7fe3e28b3888a403cefd9900"
 }