@headless-adminapp/app 1.4.22 → 1.4.24

package/calendar/types.d.ts

@@ -1,8 +1,9 @@
 import type { EventContentArg } from '@fullcalendar/core';
 import { AuthSession } from '@headless-adminapp/core/experience/auth';
 import { OpenFormOptions } from '@headless-adminapp/core/experience/command';
+import { RouterInstance } from '@headless-adminapp/core/navigation';
 import { InferredSchemaType, SchemaAttributes } from '@headless-adminapp/core/schema';
-import { InternalRouteResolver, RouterInstance } from '../route/context';
+import { InternalRouteResolver } from '../route/context';
 export interface CalendarEvent {
     id: string;
     title: string;

package/command/hooks/useBaseCommandHandlerContext.js

@@ -12,6 +12,7 @@ const hooks_2 = require("../../metadata/hooks");
 const hooks_3 = require("../../progress-indicator/hooks");
 const useOpenToastNotification_1 = require("../../toast-notification/hooks/useOpenToastNotification");
 const transport_1 = require("../../transport");
+const route_1 = require("@headless-adminapp/app/route");
 function useUtility() {
     const { hideProgressIndicator, showProgressIndicator } = (0, hooks_3.useProgressIndicator)();
     const openAlertDialog = (0, hooks_1.useOpenAlertDialog)();
@@ -39,9 +40,11 @@ function useUtility() {
 }
 function useNavigation() {
     const openForm = (0, navigation_1.useOpenForm)();
+    const router = (0, route_1.useRouter)();
     return (0, react_1.useMemo)(() => ({
         openForm,
-    }), [openForm]);
+        router,
+    }), [openForm, router]);
 }
 function useBaseCommandHandlerContext() {
     const dataService = (0, transport_1.useDataService)();

package/dataform/DataFormProvider/CalculatedField.js

@@ -54,10 +54,6 @@ const CalculatedField = () => {
                 }
                 const currentValue = formInstanceRef.current.getValues(item.attributeName);
                 const newValue = item.handler(record, relatedRecords);
-                console.log('Recalculated main record field:', item.attributeName, item, record, relatedRecords, {
-                    currentValue,
-                    newValue,
-                });
                 if (currentValue !== newValue) {
                     formInstanceRef.current.setValue(item.attributeName, newValue);
                     eventManager.emit(constants_1.EVENT_KEY_ON_FIELD_CHANGE, item.attributeName, newValue, currentValue);
@@ -70,10 +66,6 @@ const CalculatedField = () => {
                 }
                 const currentValue = formInstanceRef.current.getValues(`${alias}.${indexStr}.${item.attributeName}`);
                 const newValue = item.handler(record, {});
-                console.log('Subgrid row level calculation:', item.attributeName, item, record, {
-                    currentValue,
-                    newValue,
-                });
                 if (currentValue !== newValue) {
                     formInstanceRef.current.setValue(`${alias}.${indexStr}.${item.attributeName}`, newValue);
                     eventManager.emit(constants_1.EVENT_KEY_ON_FIELD_CHANGE, `${alias}.${indexStr}.${item.attributeName}`, newValue, currentValue);

package/dataform/utils/defaultParameters.d.ts

@@ -1,5 +1,5 @@
-import { RouterInstance } from '@headless-adminapp/app/route/context';
 import { FormExperience } from '@headless-adminapp/core/experience/form';
+import { RouterInstance } from '@headless-adminapp/core/navigation';
 import { Schema } from '@headless-adminapp/core/schema';
 export declare function getFormDefaultParameters(schema: Schema, formExperience: FormExperience, router: RouterInstance): {
     [x: string]: any;

package/dataform/utils/index.d.ts

@@ -60,3 +60,23 @@ export declare const generateValidationSchema: (<A extends SchemaAttributes = Sc
     [x: string]: any;
 }, "">) & MemoizedFunction;
 export declare const generateAttributeValidationSchema: ((attribute: Attribute, language: string, strings: FormValidationStringSet, region: string) => yup.Schema<any, any, any, "">) & MemoizedFunction;
+export declare const generateAttributesValidationSchema: (<A extends SchemaAttributes = SchemaAttributes>({ attributes, language, strings, region, }: {
+    attributes: A;
+    language: string;
+    strings: FormValidationStringSet;
+    region: string;
+}) => yup.ObjectSchema<{
+    [x: string]: any;
+}, yup.AnyObject, {
+    [x: string]: any;
+}, "">) & MemoizedFunction;
+export declare const attributesFormValidator: (<A extends SchemaAttributes = SchemaAttributes>({ attributes, language, strings, region, }: {
+    attributes: A;
+    language: string;
+    strings: FormValidationStringSet;
+    region: string;
+}) => (values: Record<string, any>, context: any, options: any) => Promise<ResolverResult<{
+    [x: string]: any;
+    [x: number]: any;
+    [x: symbol]: any;
+}>>) & MemoizedFunction;

package/dataform/utils/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAttributeValidationSchema = exports.generateValidationSchema = exports.editableSubgridFormValidator = exports.formValidator = exports.saveRecord = void 0;
+exports.attributesFormValidator = exports.generateAttributesValidationSchema = exports.generateAttributeValidationSchema = exports.generateValidationSchema = exports.editableSubgridFormValidator = exports.formValidator = exports.saveRecord = void 0;
 exports.getInitialValues = getInitialValues;
 const phone_1 = require("@headless-adminapp/app/utils/phone");
 const yup_1 = require("@hookform/resolvers/yup");
@@ -316,7 +316,7 @@ function extendAttributeStringValidationSchema({ attribute, validationSchema, la
         // extend the validation schema with the min length
         validationSchema = validationSchema.min(attribute.minLength, `${label}: ${strings.minLength}`);
     }
-    if (attribute.pattern) {
+    if ('pattern' in attribute && attribute.pattern) {
         // extend the validation schema with the pattern
         validationSchema = validationSchema.matches(new RegExp(attribute.pattern), `${label}: ${strings.invalidFormat}`);
     }
@@ -388,3 +388,29 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
     });
     return validationSchema;
 });
+exports.generateAttributesValidationSchema = (0, lodash_1.memoize)(function generateAttributesValidationSchema({ attributes, language, strings, region, }) {
+    const columns = Object.keys(attributes);
+    return yup.object().shape({
+        ...columns.reduce((acc, column) => {
+            const attribute = attributes[column];
+            const validationSchema = (0, exports.generateAttributeValidationSchema)(attribute, language, strings, region);
+            return {
+                ...acc,
+                [column]: validationSchema,
+            };
+        }, {}),
+    });
+}, (options) => JSON.stringify(options));
+exports.attributesFormValidator = (0, lodash_1.memoize)(function formValidator({ attributes, language, strings, region, }) {
+    return async (values, context, options) => {
+        const validator = (0, exports.generateAttributesValidationSchema)({
+            attributes,
+            language,
+            strings,
+            region,
+        });
+        const resolver = (0, yup_1.yupResolver)(validator);
+        const result = await resolver(values, context, options);
+        return result;
+    };
+}, (options) => JSON.stringify(options));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.4.22",
+  "version": "1.4.24",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,5 +38,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "8f687a2b8c3151c30c57f43105ac47c5d8c3ee79"
+  "gitHead": "3a4c06f1e18f8ac7861647b82d4a4f8cd8f0141c"
 }

package/route/RouteProvider.d.ts

@@ -1,6 +1,6 @@
 import { IsRouteActive, RouteResolver } from '@headless-adminapp/core/experience/route';
+import { RouterInstance } from '@headless-adminapp/core/navigation';
 import { FC, PropsWithChildren } from 'react';
-import { RouterInstance } from './context';
 import { ReadonlyURLSearchParams } from './types';
 export interface RouteProviderProps {
     router: RouterInstance;

package/route/context.d.ts

@@ -1,24 +1,8 @@
 import { NavPageItem } from '@headless-adminapp/core/experience/app';
+import { RouterInstance } from '@headless-adminapp/core/navigation';
 import { ReadonlyURLSearchParams } from './types';
 export type InternalRouteResolver = (item: NavPageItem) => string;
 export type InternalIsRouteActive = (path: string, item: NavPageItem) => boolean;
-interface NavigateOptions {
-    state?: any;
-}
-export type GuardFn = () => boolean | Promise<boolean>;
-export interface RouterInstance {
-    back: () => Promise<void>;
-    forward: () => Promise<void>;
-    push(href: string, options?: NavigateOptions): Promise<void>;
-    replace(href: string, options?: NavigateOptions): Promise<void>;
-    prefetch(href: string): void;
-    setState(state: any): void;
-    setState(key: string, state: any): void;
-    getState<T = any>(): T;
-    getState<T = any>(key: string): T | undefined;
-    registerGuard(fn: GuardFn): void;
-    unregisterGuard(fn: GuardFn): void;
-}
 export declare const RouterContext: import("react").Context<RouterInstance>;
 export declare const RouterPathnameContext: import("react").Context<string>;
 export declare const RouterSearchParamsContext: import("react").Context<ReadonlyURLSearchParams>;
@@ -28,4 +12,3 @@ export interface RouteHelperContext {
     isRouteActive: InternalIsRouteActive;
 }
 export declare const RouteHelperContext: import("react").Context<RouteHelperContext>;
-export {};

package/route/hooks/useRouter.d.ts

@@ -1 +1 @@
-export declare function useRouter(): import("../context").RouterInstance;
+export declare function useRouter(): import("@headless-adminapp/core/navigation").RouterInstance;