@headless-adminapp/app 0.0.17-alpha.45 → 0.0.17-alpha.47

package/board/hooks/useSearchText.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSearchText = useSearchText;
+const context_1 = require("@headless-adminapp/app/mutable/context");
 const react_1 = require("react");
-const context_1 = require("../context");
-const context_2 = require("@headless-adminapp/app/mutable/context");
+const context_2 = require("../context");
 function useSearchText() {
-    const searchText = (0, context_2.useContextSelector)(context_1.BoardContext, (context) => context.searchText);
-    const setValue = (0, context_2.useContextSetValue)(context_1.BoardContext);
+    const searchText = (0, context_1.useContextSelector)(context_2.BoardContext, (context) => context.searchText);
+    const setValue = (0, context_1.useContextSetValue)(context_2.BoardContext);
     const setSearchText = (0, react_1.useCallback)((value) => {
         setValue({ searchText: value });
     }, [setValue]);

package/dataform/hooks/useProcessFlowSteps.d.ts

@@ -1 +1 @@
-export declare function useProcessFlowSteps(): import("@headless-adminapp/core/experience/form/ProcessFlowInfo").ProcessFlowStep[] | undefined;
+export declare function useProcessFlowSteps(): import("@headless-adminapp/core/experience/form/ProcessFlowInfo").ProcessFlowStep[] | null | undefined;

package/dataform/hooks/useRecordTitle.d.ts

@@ -1 +1 @@
-export declare function useRecordTitle(): string;
+export declare function useRecordTitle(): any;

package/dataform/hooks/useRecordTitle.js

@@ -5,11 +5,18 @@ const useFormInstance_1 = require("./useFormInstance");
 const useFormSchema_1 = require("./useFormSchema");
 const useRecordId_1 = require("./useRecordId");
 function useRecordTitle() {
-    var _a;
     const formInstance = (0, useFormInstance_1.useFormInstance)();
     const schema = (0, useFormSchema_1.useDataFormSchema)();
     const recordId = (0, useRecordId_1.useRecordId)();
-    const primaryAttributeValue = (_a = formInstance.watch(schema.primaryAttribute)) !== null && _a !== void 0 ? _a : '';
+    let primaryAttributeValue = formInstance.watch(schema.primaryAttribute);
+    const primaryAttribute = schema.attributes[schema.primaryAttribute];
+    if ((primaryAttribute === null || primaryAttribute === void 0 ? void 0 : primaryAttribute.type) === 'lookup') {
+        // Handle lookup attribute as primary
+        primaryAttributeValue = primaryAttributeValue === null || primaryAttributeValue === void 0 ? void 0 : primaryAttributeValue.name;
+    }
+    if (primaryAttributeValue && typeof primaryAttributeValue !== 'string') {
+        return String(primaryAttributeValue);
+    }
     if (primaryAttributeValue) {
         return primaryAttributeValue;
     }

package/dataform/utils/index.js

@@ -303,7 +303,7 @@ exports.generateValidationSchema = (0, lodash_1.memoize)(function generateValida
     strings,
     readonlyAttributes,
 }));
-exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function generateAttributeValidationSchema(attribute, language, strings) {
+function createAttributeValidationSchema(attribute) {
     let validationSchema;
     switch (attribute.type) {
         case 'string':
@@ -321,44 +321,91 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
             validationSchema = yup.mixed().nullable();
             break;
     }
-    const label = (0, utils_1.localizedLabel)(language, attribute);
+    return validationSchema;
+}
+function extendAttributeRequiredValidationSchema({ attribute, validationSchema, label, strings, }) {
     if (attribute.required) {
         validationSchema = validationSchema.required(`${label}: ${strings.required}`);
     }
+    return validationSchema;
+}
+function extendAttributeValidationSchema({ attribute, validationSchema, label, strings, }) {
     switch (attribute.type) {
         case 'string':
-            if (attribute.maxLength) {
-                validationSchema = validationSchema.max(attribute.maxLength, `${label}: ${strings.maxLength}`);
-            }
-            if (attribute.minLength) {
-                validationSchema = validationSchema.min(attribute.minLength, `${label}: ${strings.minLength}`);
-            }
-            if (attribute.pattern) {
-                validationSchema = validationSchema.matches(new RegExp(attribute.pattern), `${label}: ${strings.invalidFormat}`);
-            }
-            if (attribute.format === 'email') {
-                validationSchema = validationSchema.email(`${label}: ${strings.invalidEmail}`);
-            }
-            else if (attribute.format === 'phone') {
-                validationSchema = validationSchema.matches(/^(\+\d{1,2}\s?)?\d{10}$/, `${label}: ${strings.invalidPhoneNumber}`);
-            }
+            validationSchema = extendAttributeStringValidationSchema({
+                attribute,
+                validationSchema: validationSchema,
+                label,
+                strings,
+            });
             break;
         case 'attachments':
-            if (attribute.required) {
-                validationSchema = validationSchema.min(1, `${label}: ${strings.required}`);
-            }
-            if (attribute.maxSize) {
-                validationSchema = validationSchema.test('fileSize', `${label}: ${strings.fileSizeExceeded}`, (value) => {
-                    if (!value) {
-                        return true;
-                    }
-                    return value.every((file) => (file === null || file === void 0 ? void 0 : file.size) && file.size <= attribute.maxSize);
-                });
-            }
+            validationSchema = extendAttributeAttachmentsValidationSchema({
+                attribute,
+                validationSchema: validationSchema,
+                label,
+                strings,
+            });
             break;
         default:
             break;
     }
+    return validationSchema;
+}
+function extendAttributeStringValidationSchema({ attribute, validationSchema, label, strings, }) {
+    if (attribute.maxLength) {
+        // extend the validation schema with the max length
+        validationSchema = validationSchema.max(attribute.maxLength, `${label}: ${strings.maxLength}`);
+    }
+    if (attribute.minLength) {
+        // extend the validation schema with the min length
+        validationSchema = validationSchema.min(attribute.minLength, `${label}: ${strings.minLength}`);
+    }
+    if (attribute.pattern) {
+        // extend the validation schema with the pattern
+        validationSchema = validationSchema.matches(new RegExp(attribute.pattern), `${label}: ${strings.invalidFormat}`);
+    }
+    if (attribute.format === 'email') {
+        // extend the validation schema with the email format
+        validationSchema = validationSchema.email(`${label}: ${strings.invalidEmail}`);
+    }
+    else if (attribute.format === 'phone') {
+        // extend the validation schema with the phone format
+        validationSchema = validationSchema.matches(/^(\+\d{1,2}\s?)?\d{10}$/, `${label}: ${strings.invalidPhoneNumber}`);
+    }
+    return validationSchema;
+}
+function extendAttributeAttachmentsValidationSchema({ attribute, validationSchema, label, strings, }) {
+    if (attribute.required) {
+        // extend the validation schema with the min length
+        validationSchema = validationSchema.min(1, `${label}: ${strings.required}`);
+    }
+    if (attribute.maxSize) {
+        // extend the validation schema with the max size
+        validationSchema = validationSchema.test('fileSize', `${label}: ${strings.fileSizeExceeded}`, (value) => {
+            if (!value) {
+                return true;
+            }
+            return value.every((file) => (file === null || file === void 0 ? void 0 : file.size) && file.size <= attribute.maxSize);
+        });
+    }
+    return validationSchema;
+}
+exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function generateAttributeValidationSchema(attribute, language, strings) {
+    let validationSchema = createAttributeValidationSchema(attribute);
+    const label = (0, utils_1.localizedLabel)(language, attribute);
+    validationSchema = extendAttributeRequiredValidationSchema({
+        attribute,
+        validationSchema,
+        label,
+        strings,
+    });
+    validationSchema = extendAttributeValidationSchema({
+        attribute,
+        validationSchema,
+        label,
+        strings,
+    });
     validationSchema = validationSchema.transform((value) => {
         if (value === '') {
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "0.0.17-alpha.45",
+  "version": "0.0.17-alpha.47",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -39,5 +39,5 @@
     "react-hook-form": "7.52.2",
     "yup": "^1.4.0"
   },
-  "gitHead": "7538074665d8fa6f67ca2a91e62ea32d09570a31"
+  "gitHead": "749a69f512d51c82f33fe27f8bbe5046fdeab4c5"
 }

package/utils/getAttributeFormattedValue.d.ts

@@ -13,5 +13,5 @@ export declare function getAttributeFormattedValue<A extends Attribute = Attribu
     currencySign?: 'accounting' | 'standard';
     currencyDisplay?: 'symbol' | 'narrowSymbol' | 'code';
     timezone?: string;
-}): string | null | undefined;
+}): string | null;
 export {};

package/utils/getAttributeFormattedValue.js

@@ -19,89 +19,124 @@ const defaultLocale = 'en-US';
 const defaultCurrency = 'USD';
 const defaultCurrencySign = 'accounting';
 const defaultCurrencyDisplay = 'symbol';
+function getAttributeLookupsFormattedValue(value, options) {
+    const items = value === null || value === void 0 ? void 0 : value.map((v) => v.name);
+    if ((options === null || options === void 0 ? void 0 : options.maxCount) && (items === null || items === void 0 ? void 0 : items.length) > options.maxCount) {
+        return (items.slice(0, options.maxCount).join(', ') +
+            ` (+${items.length - options.maxCount})`);
+    }
+    else {
+        return items === null || items === void 0 ? void 0 : items.join(', ');
+    }
+}
+function getAttributeAttachmentFormattedValue(value) {
+    var _a;
+    return (_a = value === null || value === void 0 ? void 0 : value.url) !== null && _a !== void 0 ? _a : null;
+}
+function getAttributeDateFormattedValue(attribute, value, options) {
+    var _a, _b;
+    const dateFormat = (_a = options === null || options === void 0 ? void 0 : options.dateFormat) !== null && _a !== void 0 ? _a : defaultDateFormat;
+    const timeFormat = (_b = options === null || options === void 0 ? void 0 : options.timeFormat) !== null && _b !== void 0 ? _b : defaultTimeFormat;
+    if (attribute.format === 'datetime') {
+        return (0, dayjs_1.default)(value)
+            .tz(options === null || options === void 0 ? void 0 : options.timezone)
+            .format(dateFormat + ' ' + timeFormat);
+    }
+    else {
+        return (0, dayjs_1.default)(value)
+            .tz(options === null || options === void 0 ? void 0 : options.timezone)
+            .format(dateFormat);
+    }
+}
+function getAttributeDateRangeFormattedValue(value, options) {
+    var _a;
+    if (!value)
+        return null;
+    const dateFormat = (_a = options === null || options === void 0 ? void 0 : options.dateFormat) !== null && _a !== void 0 ? _a : defaultDateFormat;
+    const from = value[0];
+    const to = value[1];
+    if (!from && !to) {
+        return null;
+    }
+    if (from && to) {
+        return ((0, dayjs_1.default)(from).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat) +
+            ' - ' +
+            (0, dayjs_1.default)(to).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat));
+    }
+    if (from) {
+        return 'After ' + (0, dayjs_1.default)(from).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat);
+    }
+    if (to) {
+        return 'Before ' + (0, dayjs_1.default)(to).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat);
+    }
+    return null;
+}
+function getAttributeBooleanFormattedValue(attribute, value, options) {
+    var _a, _b, _c;
+    const strings = (_a = options === null || options === void 0 ? void 0 : options.strings) !== null && _a !== void 0 ? _a : defaultAttributeFormattedValueStrings;
+    return value
+        ? (_b = attribute.trueLabel) !== null && _b !== void 0 ? _b : strings.yes
+        : (_c = attribute.falseLabel) !== null && _c !== void 0 ? _c : strings.no;
+}
+function getAttributeChoiceFormattedValue(attribute, value) {
+    var _a;
+    return ((_a = attribute.options.find((option) => option.value === value)) !== null && _a !== void 0 ? _a : {
+        label: '',
+    }).label;
+}
+function getAttributeChoicesFormattedValue(attribute, value) {
+    return value
+        .map((v) => {
+        var _a;
+        return ((_a = attribute.options.find((option) => option.value === v)) !== null && _a !== void 0 ? _a : {
+            label: '',
+        }).label;
+    })
+        .join(', ');
+}
+function getAttributeLookupFormattedValue(value) {
+    return value === null || value === void 0 ? void 0 : value.name;
+}
+function getAttributeMoneyFormattedValue(value, options) {
+    var _a, _b, _c, _d;
+    const locale = (_a = options === null || options === void 0 ? void 0 : options.locale) !== null && _a !== void 0 ? _a : defaultLocale;
+    const currency = (_b = options === null || options === void 0 ? void 0 : options.currency) !== null && _b !== void 0 ? _b : defaultCurrency;
+    const currencySign = (_c = options === null || options === void 0 ? void 0 : options.currencySign) !== null && _c !== void 0 ? _c : defaultCurrencySign;
+    const currencyDisplay = (_d = options === null || options === void 0 ? void 0 : options.currencyDisplay) !== null && _d !== void 0 ? _d : defaultCurrencyDisplay;
+    return new Intl.NumberFormat(locale, {
+        style: 'currency',
+        currency,
+        currencySign,
+        currencyDisplay,
+    }).format(value);
+}
 function getAttributeFormattedValue(attribute, value, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a;
     if (value === null || value === undefined) {
         return null;
     }
-    const strings = (_a = options === null || options === void 0 ? void 0 : options.strings) !== null && _a !== void 0 ? _a : defaultAttributeFormattedValueStrings;
-    const dateFormat = (_b = options === null || options === void 0 ? void 0 : options.dateFormat) !== null && _b !== void 0 ? _b : defaultDateFormat;
-    const timeFormat = (_c = options === null || options === void 0 ? void 0 : options.timeFormat) !== null && _c !== void 0 ? _c : defaultTimeFormat;
-    const locale = (_d = options === null || options === void 0 ? void 0 : options.locale) !== null && _d !== void 0 ? _d : defaultLocale;
-    const currency = (_e = options === null || options === void 0 ? void 0 : options.currency) !== null && _e !== void 0 ? _e : defaultCurrency;
-    const currencySign = (_f = options === null || options === void 0 ? void 0 : options.currencySign) !== null && _f !== void 0 ? _f : defaultCurrencySign;
-    const currencyDisplay = (_g = options === null || options === void 0 ? void 0 : options.currencyDisplay) !== null && _g !== void 0 ? _g : defaultCurrencyDisplay;
+    const locale = (_a = options === null || options === void 0 ? void 0 : options.locale) !== null && _a !== void 0 ? _a : defaultLocale;
     switch (attribute.type) {
         case 'boolean':
-            return value
-                ? (_h = attribute.trueLabel) !== null && _h !== void 0 ? _h : strings.yes
-                : (_j = attribute.falseLabel) !== null && _j !== void 0 ? _j : strings.no;
+            return getAttributeBooleanFormattedValue(attribute, value, options);
         case 'choice':
-            return ((_k = attribute.options.find((option) => option.value === value)) !== null && _k !== void 0 ? _k : {
-                label: '',
-            }).label;
+            return getAttributeChoiceFormattedValue(attribute, value);
         case 'choices':
-            return value
-                .map((v) => {
-                var _a;
-                return ((_a = attribute.options.find((option) => option.value === v)) !== null && _a !== void 0 ? _a : {
-                    label: '',
-                }).label;
-            })
-                .join(', ');
+            return getAttributeChoicesFormattedValue(attribute, value);
         case 'date':
-            if (attribute.format === 'datetime') {
-                return (0, dayjs_1.default)(value)
-                    .tz(options === null || options === void 0 ? void 0 : options.timezone)
-                    .format(dateFormat + ' ' + timeFormat);
-            }
-            else {
-                return (0, dayjs_1.default)(value)
-                    .tz(options === null || options === void 0 ? void 0 : options.timezone)
-                    .format(dateFormat);
-            }
+            return getAttributeDateFormattedValue(attribute, value, options);
         case 'daterange':
-            if (!value)
-                return null;
-            const from = value[0];
-            const to = value[1];
-            if (!from && !to) {
-                return null;
-            }
-            if (from && to) {
-                return ((0, dayjs_1.default)(from).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat) +
-                    ' - ' +
-                    (0, dayjs_1.default)(to).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat));
-            }
-            if (from) {
-                return 'After ' + (0, dayjs_1.default)(from).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat);
-            }
-            if (to) {
-                return 'Before ' + (0, dayjs_1.default)(to).tz(options === null || options === void 0 ? void 0 : options.timezone).format(dateFormat);
-            }
-            return null;
+            return getAttributeDateRangeFormattedValue(value, options);
         case 'lookup':
-            return value === null || value === void 0 ? void 0 : value.name;
+            return getAttributeLookupFormattedValue(value);
         case 'lookups':
-            const items = value === null || value === void 0 ? void 0 : value.map((v) => v.name);
-            if ((options === null || options === void 0 ? void 0 : options.maxCount) && (items === null || items === void 0 ? void 0 : items.length) > options.maxCount) {
-                return (items.slice(0, options.maxCount).join(', ') +
-                    ` (+${items.length - options.maxCount})`);
-            }
-            else {
-                return items === null || items === void 0 ? void 0 : items.join(', ');
-            }
+            return getAttributeLookupsFormattedValue(value, options);
         case 'money':
-            return new Intl.NumberFormat(locale, {
-                style: 'currency',
-                currency,
-                currencySign,
-                currencyDisplay,
-            }).format(value);
+            return getAttributeMoneyFormattedValue(value, options);
         case 'number':
             return new Intl.NumberFormat(locale).format(value);
         case 'attachment':
-            return (_l = value === null || value === void 0 ? void 0 : value.url) !== null && _l !== void 0 ? _l : null;
+            return getAttributeAttachmentFormattedValue(value);
         default:
             return typeof value === 'object'
                 ? JSON.stringify(value)