@headless-adminapp/app 1.2.3 → 1.3.1

package/builders/CommandBuilder/SubgridCommandBuilder.js

@@ -208,6 +208,7 @@ var SubgridCommandBuilder;
                                     records: result.records,
                                     schema: context.secondaryControl.schema,
                                     schemaStore: context.stores.schemaStore,
+                                    locale: context.locale,
                                 });
                             }
                             finally {
@@ -241,6 +242,7 @@ var SubgridCommandBuilder;
                                     records: result.records,
                                     schema: context.secondaryControl.schema,
                                     schemaStore: context.stores.schemaStore,
+                                    locale: context.locale,
                                 });
                             }
                             finally {

package/builders/CommandBuilder/ViewCommandBuilder.js

@@ -310,6 +310,7 @@ async function exportRecordsToExcel(context) {
             records: result.records,
             schema: context.primaryControl.schema,
             schemaStore: context.stores.schemaStore,
+            locale: context.locale,
         });
     }
     finally {
@@ -326,6 +327,7 @@ async function exportRecordsToCSV(context) {
             records: result.records,
             schema: context.primaryControl.schema,
             schemaStore: context.stores.schemaStore,
+            locale: context.locale,
         });
     }
     finally {

package/builders/utils.d.ts

@@ -1,3 +1,4 @@
+import { Locale } from '@headless-adminapp/core/experience/locale';
 import { ColumnCondition, SortingState, View } from '@headless-adminapp/core/experience/view';
 import { InferredSchemaType, Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import { ISchemaStore } from '@headless-adminapp/core/store';
@@ -9,6 +10,7 @@ type ExportFn<S extends SchemaAttributes = SchemaAttributes> = (option: {
     gridColumns: TransformedViewColumn<SchemaAttributes>[];
     schemaStore: ISchemaStore;
     fileName: string;
+    locale: Locale;
 }) => Promise<void>;
 export declare const exportRecordsCSV: ExportFn;
 export declare const exportRecordsXLS: ExportFn;

package/builders/utils.js

@@ -69,7 +69,7 @@ function extractAttributeData({ column, record, schema, schemaStore, }) {
         value,
     };
 }
-const exportRecordsCSV = async ({ schema, records, gridColumns, schemaStore, fileName, }) => {
+const exportRecordsCSV = async ({ schema, records, gridColumns, schemaStore, fileName, locale, }) => {
     const csvDownload = await Promise.resolve().then(() => __importStar(require('json-to-csv-export')));
     const headers = getHeaders(schema, gridColumns, schemaStore);
     const cellData = records.map((record) => {
@@ -83,7 +83,7 @@ const exportRecordsCSV = async ({ schema, records, gridColumns, schemaStore, fil
             if (attribute.type === 'money' || attribute.type === 'number') {
                 return value?.toString() ?? '';
             }
-            return (0, utils_2.getAttributeFormattedValue)(attribute, value) ?? '';
+            return (0, utils_2.getAttributeFormattedValue)(attribute, value, locale) ?? '';
         });
     });
     csvDownload.default({
@@ -94,7 +94,7 @@ const exportRecordsCSV = async ({ schema, records, gridColumns, schemaStore, fil
     });
 };
 exports.exportRecordsCSV = exportRecordsCSV;
-const exportRecordsXLS = async ({ fileName, gridColumns, records, schema, schemaStore, }) => {
+const exportRecordsXLS = async ({ fileName, gridColumns, records, schema, schemaStore, locale, }) => {
     const ExcelJS = await Promise.resolve().then(() => __importStar(require('exceljs')));
     const headers = getHeaders(schema, gridColumns, schemaStore);
     const cellData = records.map((item) => {
@@ -115,7 +115,7 @@ const exportRecordsXLS = async ({ fileName, gridColumns, records, schema, schema
                 case 'date':
                     return value ? new Date(value) : undefined;
                 default:
-                    return (0, utils_2.getAttributeFormattedValue)(attribute, value);
+                    return (0, utils_2.getAttributeFormattedValue)(attribute, value, locale);
             }
         });
     });
@@ -130,9 +130,9 @@ const exportRecordsXLS = async ({ fileName, gridColumns, records, schema, schema
     gridColumns.forEach((column, index) => {
         const attribute = getAttribute({ column, schema, schemaStore });
         const sheetColumn = worksheet.getColumn(index + 1);
-        let formatFn = (value) => (0, utils_2.getAttributeFormattedValue)(attribute, value) ?? '';
+        let formatFn = (value) => (0, utils_2.getAttributeFormattedValue)(attribute, value, locale) ?? '';
         if (attribute?.type === 'money') {
-            sheetColumn.numFmt = '"₹" #,##0.00';
+            sheetColumn.numFmt = `"₹" #,##0.00`;
         }
         let maxLength = 0;
         sheetColumn.eachCell((cell) => {

package/components/ScrollView/index.js

@@ -8,9 +8,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const clsx_1 = __importDefault(require("clsx"));
 const react_1 = require("react");
 const react_custom_scrollbars_2_1 = require("react-custom-scrollbars-2");
-function getReaminingSpace(div) {
-    return div.scrollHeight - div.scrollTop - div.clientHeight;
-}
 const ScrollView = ({ children, className, rtl, autoHide, onScroll, shadowEffect = false, }) => {
     const [isTop, setIsTop] = (0, react_1.useState)(true);
     const [isBottom, setIsBottom] = (0, react_1.useState)(false);

package/datagrid/column-filter/constants.js

@@ -286,21 +286,6 @@ const dateOperatorOptions = [
         labelKey: 'nextXDays',
         controls: [],
     },
-    {
-        value: 'next-x-weeks',
-        labelKey: 'nextXWeeks',
-        controls: [],
-    },
-    {
-        value: 'next-x-months',
-        labelKey: 'nextXMonths',
-        controls: [],
-    },
-    {
-        value: 'next-x-years',
-        labelKey: 'nextXYears',
-        controls: [],
-    },
     {
         value: 'last-week',
         labelKey: 'lastWeek',
@@ -336,21 +321,6 @@ const dateOperatorOptions = [
         labelKey: 'lastXDays',
         controls: ['number'],
     },
-    {
-        value: 'last-x-weeks',
-        labelKey: 'lastXWeeks',
-        controls: ['number'],
-    },
-    {
-        value: 'last-x-months',
-        labelKey: 'lastXMonths',
-        controls: ['number'],
-    },
-    {
-        value: 'last-x-years',
-        labelKey: 'lastXYears',
-        controls: ['number'],
-    },
     {
         value: 'olderthan-x-hours',
         labelKey: 'olderthanXHours',
@@ -361,25 +331,10 @@ const dateOperatorOptions = [
         labelKey: 'olderthanXDays',
         controls: ['number'],
     },
-    {
-        value: 'olderthan-x-weeks',
-        labelKey: 'olderthanXWeeks',
-        controls: ['number'],
-    },
-    {
-        value: 'olderthan-x-months',
-        labelKey: 'olderthanXMonths',
-        controls: ['number'],
-    },
-    {
-        value: 'olderthan-x-years',
-        labelKey: 'olderthanXYears',
-        controls: ['number'],
-    },
     {
         value: 'in-fiscal-year',
         labelKey: 'inFiscalYear',
-        controls: [],
+        controls: ['number'],
     },
     {
         value: 'between',

package/locale/LocaleProvider.d.ts

@@ -6,6 +6,7 @@ export interface LocaleProviderProps {
     options?: {
         direction?: Locale['direction'];
         dateFormats?: Locale['dateFormats'];
+        dateRangeFormats?: Locale['dateRangeFormats'];
         timeFormats?: Locale['timeFormats'];
         currency?: Partial<Locale['currency']>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -37,5 +37,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "8d3c42183ed245a59d5200b4f0d4d271ebfe2160"
+  "gitHead": "019339a44fae0fcce5466041f922710b08b79172"
 }

package/utils/getAttributeFormattedValue.d.ts

@@ -1,19 +1,26 @@
-import { Attribute, InferredAttributeType } from '@headless-adminapp/core/attributes';
+import { Attribute, BooleanAttribute, DateAttribute, InferredAttributeType } from '@headless-adminapp/core/attributes';
+import { ChoicesAttribute } from '@headless-adminapp/core/attributes/ChoiceAttribute';
+import { Locale } from '@headless-adminapp/core/experience/locale/types';
 interface AttributeFormattedValueStringsSet {
     yes: string;
     no: string;
 }
+export declare function getAttributeLookupsFormattedValue(value: unknown, options?: {
+    maxCount?: number;
+}): string;
+export declare function getAttributeAttachmentFormattedValue(value: unknown): string;
+export declare function getAttributeDateFormattedValue(attribute: DateAttribute, value: unknown, locale: Locale): string;
+export declare function getAttributeDateRangeFormattedValue(value: unknown, locale: Locale): string;
+export declare function getAttributeBooleanFormattedValue(attribute: BooleanAttribute, value: unknown, options?: {
+    strings?: AttributeFormattedValueStringsSet;
+}): string;
+export declare function getAttributeChoicesFormattedValue(attribute: ChoicesAttribute<string | number>, value: unknown): string;
+export declare function getAttributeLookupFormattedValue(value: unknown): string;
+export declare function getAttributeRegardingFormattedValue(value: unknown): string;
+export declare function getAttributeMoneyFormattedValue(value: unknown, locale: Locale): string;
 export declare function formatDuration(value: number | null): string;
-export declare function getAttributeFormattedValue<A extends Attribute = Attribute>(attribute: Attribute, value: InferredAttributeType<A> | null | undefined, options?: {
+export declare function getAttributeFormattedValue<A extends Attribute = Attribute>(attribute: Attribute, value: InferredAttributeType<A> | null | undefined, locale: Locale, options?: {
     maxCount?: number;
     strings?: AttributeFormattedValueStringsSet;
-    dateFormat?: string;
-    timeFormat?: string;
-    locale?: string;
-    currency?: string;
-    currencySign?: 'accounting' | 'standard';
-    currencyDisplay?: 'symbol' | 'narrowSymbol' | 'code';
-    timezone?: string;
-    region?: string;
 }): string | null;
 export {};

package/utils/getAttributeFormattedValue.js

@@ -3,6 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAttributeLookupsFormattedValue = getAttributeLookupsFormattedValue;
+exports.getAttributeAttachmentFormattedValue = getAttributeAttachmentFormattedValue;
+exports.getAttributeDateFormattedValue = getAttributeDateFormattedValue;
+exports.getAttributeDateRangeFormattedValue = getAttributeDateRangeFormattedValue;
+exports.getAttributeBooleanFormattedValue = getAttributeBooleanFormattedValue;
+exports.getAttributeChoicesFormattedValue = getAttributeChoicesFormattedValue;
+exports.getAttributeLookupFormattedValue = getAttributeLookupFormattedValue;
+exports.getAttributeRegardingFormattedValue = getAttributeRegardingFormattedValue;
+exports.getAttributeMoneyFormattedValue = getAttributeMoneyFormattedValue;
 exports.formatDuration = formatDuration;
 exports.getAttributeFormattedValue = getAttributeFormattedValue;
 const dayjs_1 = __importDefault(require("dayjs"));
@@ -15,12 +24,6 @@ const defaultAttributeFormattedValueStrings = {
     yes: 'Yes',
     no: 'No',
 };
-const defaultDateFormat = 'YYYY-MM-DD';
-const defaultTimeFormat = 'HH:mm';
-const defaultLocale = 'en-US';
-const defaultCurrency = 'USD';
-const defaultCurrencySign = 'accounting';
-const defaultCurrencyDisplay = 'symbol';
 function getAttributeLookupsFormattedValue(value, options) {
     const items = value?.map((v) => v.name);
     if (options?.maxCount && items?.length > options.maxCount) {
@@ -34,41 +37,50 @@ function getAttributeLookupsFormattedValue(value, options) {
 function getAttributeAttachmentFormattedValue(value) {
     return value?.url ?? null;
 }
-function getAttributeDateFormattedValue(attribute, value, options) {
-    const dateFormat = options?.dateFormat ?? defaultDateFormat;
-    const timeFormat = options?.timeFormat ?? defaultTimeFormat;
+function getAttributeDateFormattedValue(attribute, value, locale) {
     if (attribute.format === 'datetime') {
         return (0, dayjs_1.default)(value)
-            .tz(options?.timezone)
-            .format(dateFormat + ' ' + timeFormat);
+            .tz(locale?.timezone)
+            .format(locale.dateFormats.short + ' ' + locale.timeFormats.short);
     }
     else {
-        return (0, dayjs_1.default)(value)
-            .tz(options?.timezone)
-            .format(dateFormat);
+        return (0, dayjs_1.default)(value).format(locale.dateFormats.short);
     }
 }
-function getAttributeDateRangeFormattedValue(value, options) {
-    if (!value)
-        return null;
-    const dateFormat = options?.dateFormat ?? defaultDateFormat;
-    const from = value[0];
-    const to = value[1];
-    if (!from && !to) {
-        return null;
+function getAttributeDateRangeFormattedValue(value, locale) {
+    if (!value) {
+        return '';
     }
-    if (from && to) {
-        return ((0, dayjs_1.default)(from).tz(options?.timezone).format(dateFormat) +
-            ' - ' +
-            (0, dayjs_1.default)(to).tz(options?.timezone).format(dateFormat));
+    if (!Array.isArray(value) || value.length !== 2) {
+        return '';
     }
-    if (from) {
-        return 'After ' + (0, dayjs_1.default)(from).tz(options?.timezone).format(dateFormat);
+    if (!value[0] || !value[1]) {
+        return '';
     }
-    if (to) {
-        return 'Before ' + (0, dayjs_1.default)(to).tz(options?.timezone).format(dateFormat);
+    const dateRangeFormat = locale.dateRangeFormats.short;
+    const [start, end] = value.map((date) => (0, dayjs_1.default)(date));
+    if (start.isSame(end, 'year')) {
+        if (start.isSame(end, 'month')) {
+            if (start.isSame(end, 'day')) {
+                return start.format(dateRangeFormat.date);
+            }
+            else {
+                return (start.format(dateRangeFormat.sameMonth[0]) +
+                    dateRangeFormat.separator +
+                    end.format(dateRangeFormat.sameMonth[1]));
+            }
+        }
+        else {
+            return (start.format(dateRangeFormat.sameYear[0]) +
+                dateRangeFormat.separator +
+                end.format(dateRangeFormat.sameYear[1]));
+        }
+    }
+    else {
+        return (start.format(dateRangeFormat.date) +
+            dateRangeFormat.separator +
+            end.format(dateRangeFormat.date));
     }
-    return null;
 }
 function getAttributeBooleanFormattedValue(attribute, value, options) {
     const strings = options?.strings ?? defaultAttributeFormattedValueStrings;
@@ -96,19 +108,15 @@ function getAttributeLookupFormattedValue(value) {
 function getAttributeRegardingFormattedValue(value) {
     return value?.name;
 }
-function getAttributeMoneyFormattedValue(value, options) {
-    const locale = options?.locale ?? defaultLocale;
-    const currency = options?.currency ?? defaultCurrency;
-    const currencySign = options?.currencySign ?? defaultCurrencySign;
-    const currencyDisplay = options?.currencyDisplay ?? defaultCurrencyDisplay;
-    return new Intl.NumberFormat(locale, {
+function getAttributeMoneyFormattedValue(value, locale) {
+    return new Intl.NumberFormat(locale.locale, {
         style: 'currency',
-        currency,
-        currencySign,
-        currencyDisplay,
+        currency: locale.currency.currency,
+        currencySign: locale.currency.currencySign,
+        currencyDisplay: locale.currency.currencyDisplay,
     }).format(value);
 }
-function getAttributeNumberFormattedValue(attribute, value, options) {
+function getAttributeNumberFormattedValue(attribute, value, locale) {
     if (attribute.format === 'duration') {
         return formatDuration(value);
     }
@@ -116,9 +124,9 @@ function getAttributeNumberFormattedValue(attribute, value, options) {
         return (0, dayjs_1.default)()
             .startOf('day')
             .add(value, 'minutes')
-            .format(options?.timeFormat ?? defaultTimeFormat);
+            .format(locale.timeFormats.short);
     }
-    return new Intl.NumberFormat(options?.locale).format(value);
+    return new Intl.NumberFormat(locale.locale).format(value);
 }
 function formatDuration(value) {
     if (!value) {
@@ -154,11 +162,11 @@ function formatDuration(value) {
     }
     return `${Number((value / 1440).toFixed(2))} days`;
 }
-function getAttributeFormattedValue(attribute, value, options) {
+function getAttributeFormattedValue(attribute, value, locale, options) {
     if (value === null || value === undefined) {
         return null;
     }
-    const region = options?.region ?? 'US';
+    const region = locale.region;
     switch (attribute.type) {
         case 'boolean':
             return getAttributeBooleanFormattedValue(attribute, value, options);
@@ -167,9 +175,9 @@ function getAttributeFormattedValue(attribute, value, options) {
         case 'choices':
             return getAttributeChoicesFormattedValue(attribute, value);
         case 'date':
-            return getAttributeDateFormattedValue(attribute, value, options);
+            return getAttributeDateFormattedValue(attribute, value, locale);
         case 'daterange':
-            return getAttributeDateRangeFormattedValue(value, options);
+            return getAttributeDateRangeFormattedValue(value, locale);
         case 'lookup':
             return getAttributeLookupFormattedValue(value);
         case 'lookups':
@@ -177,9 +185,9 @@ function getAttributeFormattedValue(attribute, value, options) {
         case 'regarding':
             return getAttributeRegardingFormattedValue(value);
         case 'money':
-            return getAttributeMoneyFormattedValue(value, options);
+            return getAttributeMoneyFormattedValue(value, locale);
         case 'number':
-            return getAttributeNumberFormattedValue(attribute, value, options);
+            return getAttributeNumberFormattedValue(attribute, value, locale);
         case 'attachment':
             return getAttributeAttachmentFormattedValue(value);
         case 'string':