@headless-adminapp/app 1.1.0 → 1.1.5

package/builders/DefineFormExperience.d.ts

@@ -5,12 +5,13 @@ import type { SchemaAttributes } from '@headless-adminapp/core/schema';
 export declare namespace DefineFormExperience {
     export type Experience<S extends SchemaAttributes = SchemaAttributes> = (Pick<$FormExperience<S>, 'useHookFn' | 'relatedItems' | 'processFlow' | 'cloneAttributes' | 'defaultValues' | 'includeAttributes' | 'headerControls'> & {
         tabs: Tab<S>[];
-    }) | (keyof S)[];
+    }) | SectionControl<S>[];
     export function resolveExperience<S extends SchemaAttributes = SchemaAttributes>(v: Experience<S>): $FormExperience<S>;
-    type Tab<S extends SchemaAttributes = SchemaAttributes> = Pick<$Tab<S>, 'label' | 'localizedLabels' | 'name'> & ({
-        tabColumns: TabColumn<S>[];
+    type Tab<S extends SchemaAttributes = SchemaAttributes> = Pick<$Tab<S>, 'label' | 'localizedLabels' | 'name'> & {
         columnCount?: $Tab<S>['columnCount'];
         columnWidths?: $Tab<S>['columnWidths'];
+    } & ({
+        tabColumns: TabColumn<S>[];
     } | {
         sections: Section<S>[];
     } | {

package/builders/DefineFormExperience.js

@@ -41,13 +41,12 @@ var DefineFormExperience;
             name: v.name,
             localizedLabels: v.localizedLabels,
         };
+        tab.columnCount = v.columnCount ?? 2;
+        tab.columnWidths = v.columnWidths;
         if ('tabColumns' in v) {
-            tab.columnCount = v.columnCount ?? 2;
-            tab.columnWidths = v.columnWidths;
             tab.tabColumns = v.tabColumns.map(resolveTabColumn);
         }
         else if ('sections' in v) {
-            tab.columnCount = 2;
             tab.tabColumns = [
                 {
                     sections: v.sections.map(resolveSection),
@@ -55,7 +54,6 @@ var DefineFormExperience;
             ];
         }
         else if ('controls' in v) {
-            tab.columnCount = 2;
             tab.tabColumns = [
                 {
                     sections: [

package/calendar/types.d.ts

@@ -16,7 +16,7 @@ export interface CalendarEventsResolverFnOptions<SA extends SchemaAttributes = S
     auth: AuthSession | null;
 }
 export type CalendarEventsResolverFn<SA extends SchemaAttributes = SchemaAttributes> = (options: CalendarEventsResolverFnOptions<SA>) => Promise<CalendarEvent[]>;
-export type CalendarEventResolverFn<T extends CalendarEvent = CalendarEvent> = (id: string) => Promise<T>;
+export type CalendarEventResolverFn<T extends CalendarEvent = CalendarEvent> = (id: string) => Promise<Partial<T>>;
 export type CalendarEventSaveData<SA1 extends SchemaAttributes = SchemaAttributes, SA2 extends SchemaAttributes = SchemaAttributes> = Omit<CalendarEvent, 'id'> & {
     id?: CalendarEvent['id'];
 } & InferredSchemaType<SA1> & InferredSchemaType<SA2>;

package/dataform/utils/saveRecord.d.ts

@@ -1,27 +1,27 @@
+import { Id } from '@headless-adminapp/core';
 import { Form } from '@headless-adminapp/core/experience/form';
 import { InferredSchemaType, Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import { ISchemaStore } from '@headless-adminapp/core/store';
 import { IDataService } from '@headless-adminapp/core/transport';
 import { Nullable } from '@headless-adminapp/core/types';
 export declare function getModifiedValues(initialValues: any, values: any, exclude?: string[]): Record<string, any>;
-type SaveRecordResult = {
+export type SaveRecordResult = {
     success: true;
-    recordId: string;
+    recordId: Id;
 } | {
     success: false;
     title?: string;
     message: string;
     isError: boolean;
 };
-export interface SaveRecordFnOptions {
+export interface SaveRecordFnOptions<S extends SchemaAttributes = SchemaAttributes> {
     values: any;
-    form: Form<SchemaAttributes>;
-    record: InferredSchemaType<SchemaAttributes> | undefined;
-    initialValues: Nullable<InferredSchemaType<SchemaAttributes>>;
-    schema: Schema<SchemaAttributes>;
+    form: Form<S>;
+    record: InferredSchemaType<S> | undefined;
+    initialValues: Nullable<InferredSchemaType<S>>;
+    schema: Schema<S>;
     dataService: IDataService;
     schemaStore: ISchemaStore;
 }
 export type SaveRecordFn = (options: SaveRecordFnOptions) => Promise<SaveRecordResult>;
 export declare function saveRecord({ values, form, schema, dataService, initialValues, record, schemaStore, }: SaveRecordFnOptions): Promise<SaveRecordResult>;
-export {};

package/dataform/utils/saveRecord.js

@@ -81,7 +81,7 @@ async function createRecord({ values, form, schema, dataService, }) {
     const controls = (0, utils_1.getControls)(form);
     const editableGridControls = controls.filter((control) => control.type === 'editablegrid');
     const result = await dataService.createRecord(schema.logicalName, values);
-    const recordId = result[schema.idAttribute];
+    const recordId = result.id;
     for (const control of editableGridControls) {
         const gridRows = values[control.attributeName];
         for (const row of gridRows) {

package/datagrid/DataGridProvider/DataResolver.js

@@ -11,7 +11,6 @@ const context_2 = require("../context");
 const hooks_2 = require("../hooks");
 const useGridDisabled_1 = require("../hooks/useGridDisabled");
 const utils_1 = require("./utils");
-const MAX_RECORDS = 10000;
 function DataResolver() {
     const schema = (0, hooks_2.useDataGridSchema)();
     const view = (0, hooks_2.useSelectedView)();
@@ -20,7 +19,7 @@ function DataResolver() {
     const extraFilter = (0, hooks_2.useGridExtraFilter)();
     const [columnFilters] = (0, hooks_2.useGridColumnFilter)();
     const gridColumns = (0, hooks_2.useGridColumns)();
-    const maxRecords = (0, hooks_2.useMaxRecords)() ?? MAX_RECORDS;
+    const maxRecords = (0, hooks_2.useMaxRecords)();
     const [selectedIds] = (0, hooks_2.useGridSelection)();
     const disabled = (0, useGridDisabled_1.useGridDisabled)();
     const { schemaStore } = (0, useMetadata_1.useMetadata)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.1.0",
+  "version": "1.1.5",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -36,5 +36,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "a244ac890d3abda779c8f41c3cd51031381c062c"
+  "gitHead": "76976de5e79eb752b80bb090de8228392851f0cc"
 }

package/transport/hooks/useRetriveRecords.d.ts

@@ -9,7 +9,7 @@ interface UseRetriveRecordProps<S extends SchemaAttributes = SchemaAttributes> {
     sorting?: SortingState<S>;
     columns: string[];
     expand?: Partial<Record<string, string[]>>;
-    maxRecords: number;
+    maxRecords?: number;
     disabled?: boolean;
 }
 export declare function useRetrieveRecordsKey<S extends SchemaAttributes = SchemaAttributes>({ schema, search, filter, sorting, columns, expand, maxRecords, }: UseRetriveRecordProps<S>): QueryKey;

package/transport/hooks/useRetriveRecords.js

@@ -8,6 +8,7 @@ const transport_1 = require("@headless-adminapp/app/transport");
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("react");
 const ROWS_PER_PAGE = 100;
+const MAX_RECORDS = 10000;
 function useRetrieveRecordsKey({ schema, search, filter, sorting, columns, expand, maxRecords, }) {
     const queryKey = (0, react_1.useMemo)(() => [
         'data',
@@ -54,8 +55,9 @@ function useRetriveRecordsInternal(queryKey, { columns, expand, filter, maxRecor
             const params = queryContext.pageParam ?? {
                 pageIndex: 0,
             };
+            const _maxRecords = maxRecords ?? MAX_RECORDS;
             const skip = params.pageIndex * ROWS_PER_PAGE;
-            const limit = Math.min(ROWS_PER_PAGE, Math.max(0, maxRecords - skip));
+            const limit = Math.min(ROWS_PER_PAGE, Math.max(0, _maxRecords - skip));
             if (limit <= 0) {
                 return {
                     params: params,

package/utils/getAttributeFormattedValue.d.ts

@@ -3,6 +3,7 @@ interface AttributeFormattedValueStringsSet {
     yes: string;
     no: 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?: {
     maxCount?: number;
     strings?: AttributeFormattedValueStringsSet;

package/utils/getAttributeFormattedValue.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDuration = formatDuration;
 exports.getAttributeFormattedValue = getAttributeFormattedValue;
 const dayjs_1 = __importDefault(require("dayjs"));
 const timezone_1 = __importDefault(require("dayjs/plugin/timezone"));
@@ -104,11 +105,56 @@ function getAttributeMoneyFormattedValue(value, options) {
         currencyDisplay,
     }).format(value);
 }
+function getAttributeNumberFormattedValue(attribute, value, options) {
+    if (attribute.format === 'duration') {
+        return formatDuration(value);
+    }
+    if (attribute.format === 'time') {
+        return (0, dayjs_1.default)()
+            .startOf('day')
+            .add(value, 'minutes')
+            .format(options?.timeFormat ?? defaultTimeFormat);
+    }
+    return new Intl.NumberFormat(options?.locale).format(value);
+}
+function formatDuration(value) {
+    if (!value) {
+        return '';
+    }
+    // No decimal, if value is decimal, round to nearest whole number
+    // 1 - 1 minute
+    // 2-59 minutes -> 2-59 minutes
+    // 90 minutes -> 1.5 hours
+    // more than a day -> 1 day, 1.5 days, 2 days, etc.
+    // check if value has decimal
+    if (value % 1 !== 0) {
+        // round to nearest whole number
+        value = Math.round(value);
+    }
+    if (!value) {
+        return '';
+    }
+    if (value === 1) {
+        return '1 minute';
+    }
+    if (value < 60) {
+        return `${value} minutes`;
+    }
+    if (value === 60) {
+        return '1 hour';
+    }
+    if (value < 1440) {
+        return `${Number((value / 60).toFixed(2))} hours`;
+    }
+    if (value === 1440) {
+        return '1 day';
+    }
+    return `${Number((value / 1440).toFixed(2))} days`;
+}
 function getAttributeFormattedValue(attribute, value, options) {
     if (value === null || value === undefined) {
         return null;
     }
-    const locale = options?.locale ?? defaultLocale;
     const region = options?.region ?? 'US';
     switch (attribute.type) {
         case 'boolean':
@@ -128,7 +174,7 @@ function getAttributeFormattedValue(attribute, value, options) {
         case 'money':
             return getAttributeMoneyFormattedValue(value, options);
         case 'number':
-            return new Intl.NumberFormat(locale).format(value);
+            return getAttributeNumberFormattedValue(attribute, value, options);
         case 'attachment':
             return getAttributeAttachmentFormattedValue(value);
         case 'string':