@headless-adminapp/app 1.4.3 → 1.4.8

package/builders/CommandBuilder/FormCommandBuilder.js

@@ -119,9 +119,6 @@ var FormCommandBuilder;
                 if (!recordId) {
                     return;
                 }
-                // if (typeof stringSet === 'function') {
-                //   stringSet = stringSet(context);
-                // }
                 const localizeSelector = (0, utils_1.createLocalizedSelector)(stringSet, localizedStringSet, context.locale.language);
                 try {
                     const confirmResult = await context.utility.openConfirmDialog({

package/dataform/DataFormProvider/utils.js

@@ -76,7 +76,7 @@ function getIsFieldDisabled({ attribute, isFormReadonly, disabledFields, control
         else if ('disabled' in control && control.disabled !== undefined) {
             disabled = control.disabled;
         }
-        else if (attribute && attribute.readonly !== undefined) {
+        else if (attribute?.readonly !== undefined) {
             disabled = attribute.readonly;
         }
     }

package/dataform/hooks/useFormSave.js

@@ -39,21 +39,23 @@ function useFormSave() {
     const saveRecord = (0, context_1.useContextSelector)(context_2.DataFormContext, (state) => state.saveRecordFn);
     const client = (0, react_query_1.useQueryClient)();
     const router = (0, route_1.useRouter)();
-    function showMessageAfterSave({ isCreatedMode }) {
+    function showMessageAfterSave({ mode }) {
         // Show notification
-        if (!isCreatedMode) {
-            openToastNotification({
-                type: 'success',
-                title: 'Record updated',
-                text: 'Record updated successfully',
-            });
-        }
-        else {
-            openToastNotification({
-                type: 'success',
-                title: 'Record created',
-                text: 'Record created successfully',
-            });
+        switch (mode) {
+            case 'create':
+                openToastNotification({
+                    type: 'success',
+                    title: 'Record created',
+                    text: 'Record created successfully',
+                });
+                break;
+            case 'update':
+                openToastNotification({
+                    type: 'success',
+                    title: 'Record updated',
+                    text: 'Record updated successfully',
+                });
+                break;
         }
     }
     const _save = async (mode) => {
@@ -107,7 +109,7 @@ function useFormSave() {
                     queryKey: ['data', 'retriveRecords'],
                 });
                 showMessageAfterSave({
-                    isCreatedMode: !record,
+                    mode: record ? 'update' : 'create',
                 });
             }
             catch (err) {

package/dataform/hooks/useLoadFormGridPage.js

@@ -19,9 +19,7 @@ function useLoadFormGridPage(logicalName, formId) {
         queryKey: ['experience-schema-form-commands', logicalName],
         queryFn: async () => {
             let commands = await experienceStore.getFormCommands(logicalName);
-            if (!commands) {
-                commands = formCommands;
-            }
+            commands ??= formCommands;
             return commands ?? [];
         },
         initialData: [],

package/dataform/utils/saveRecord.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModifiedValues = getModifiedValues;
 exports.saveRecord = saveRecord;
 exports.saveEditableGridControl = saveEditableGridControl;
-const utils_1 = require("../../dataform/DataFormProvider/utils");
+const utils_1 = require("../DataFormProvider/utils");
 function getModifiedValues(initialValues, values, exclude) {
     const keys = Object.keys(values);
     return keys.reduce((p, c) => {

package/datagrid/DataGridProvider/utils.d.ts

@@ -5,6 +5,7 @@ import { Filter } from '@headless-adminapp/core/transport';
 import { TransformedViewColumn } from '../context';
 export declare function transformColumnFilter<S extends SchemaAttributes = SchemaAttributes>(filter: Partial<Record<string, ColumnCondition>>, schema: Schema<S>, schemaStore: ISchemaStore): Record<string, ColumnCondition> | null;
 export declare function mergeConditions<S extends SchemaAttributes = SchemaAttributes>(schema: Schema<S>, filter: Filter | null | undefined, extraFilter: Filter | null | undefined, quickFilterResults: Filter | null | undefined, columnFilters: Partial<Record<string, ColumnCondition>> | undefined, schemaStore: ISchemaStore): Filter | null;
+export declare function mergeFilters(...filters: Array<Filter | null | undefined>): Filter | null;
 export declare function simplyfyFilter(filter: Filter): Filter | null;
 export declare function collectExpandedKeys(columns: TransformedViewColumn<SchemaAttributes>[]): Record<string, string[]>;
 export declare function collectGridColumns<S extends SchemaAttributes = SchemaAttributes>({ gridColumns, schema, }: {

package/datagrid/DataGridProvider/utils.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformColumnFilter = transformColumnFilter;
 exports.mergeConditions = mergeConditions;
+exports.mergeFilters = mergeFilters;
 exports.simplyfyFilter = simplyfyFilter;
 exports.collectExpandedKeys = collectExpandedKeys;
 exports.collectGridColumns = collectGridColumns;
@@ -116,6 +117,22 @@ function mergeConditions(schema, filter, extraFilter, quickFilterResults, column
         filters: filters,
     });
 }
+function mergeFilters(...filters) {
+    if (filters.length === 0) {
+        return null;
+    }
+    const nonNullFilters = filters.filter((f) => !!f);
+    if (nonNullFilters.length === 0) {
+        return null;
+    }
+    if (nonNullFilters.length === 1) {
+        return nonNullFilters[0];
+    }
+    return {
+        type: 'and',
+        filters: nonNullFilters,
+    };
+}
 function simplyfyFilter(filter) {
     const conditions = filter.conditions ?? [];
     const filters = [];

package/hooks/useDebouncedValue.js

@@ -3,22 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDebouncedValue = useDebouncedValue;
 const react_1 = require("react");
 function useDebouncedValue(value, wait, options = { leading: false }) {
-    const [_value, setValue] = (0, react_1.useState)(value);
+    const [internalValue, setInternalValue] = (0, react_1.useState)(value);
     const mountedRef = (0, react_1.useRef)(false);
-    const timeoutRef = (0, react_1.useRef)(null);
+    const timeoutRef = (0, react_1.useRef)();
     const cooldownRef = (0, react_1.useRef)(false);
     const cancel = () => window.clearTimeout(timeoutRef.current);
     (0, react_1.useEffect)(() => {
         if (mountedRef.current) {
             if (!cooldownRef.current && options.leading) {
                 cooldownRef.current = true;
-                setValue(value);
+                setInternalValue(value);
             }
             else {
                 cancel();
                 timeoutRef.current = window.setTimeout(() => {
                     cooldownRef.current = false;
-                    setValue(value);
+                    setInternalValue(value);
                 }, wait);
             }
         }
@@ -27,5 +27,5 @@ function useDebouncedValue(value, wait, options = { leading: false }) {
         mountedRef.current = true;
         return cancel;
     }, []);
-    return [_value, cancel];
+    return [internalValue, cancel];
 }

package/metadata/MetadataProvider.d.ts

@@ -1,11 +1,12 @@
 import { AppExperience } from '@headless-adminapp/core/experience/app';
 import { ISchemaExperienceStore, ISchemaStore, SchemaStore } from '@headless-adminapp/core/store';
 import { FC, PropsWithChildren } from 'react';
-import { SchemaExperienceStore } from '../store';
+import { IRecentItemStore, SchemaExperienceStore } from '../store';
 export interface MetadataProviderProps {
     schemaStore?: ISchemaStore;
     experienceStore?: ISchemaExperienceStore;
     appExperience?: AppExperience;
+    recentItemStore?: IRecentItemStore;
 }
 export declare const defaultSchemaStore: SchemaStore<import("@headless-adminapp/core/schema").SchemaAttributes>;
 export declare const defaultExperienceStore: SchemaExperienceStore;

package/metadata/MetadataProvider.js

@@ -5,6 +5,7 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const app_1 = require("@headless-adminapp/core/experience/app");
 const store_1 = require("@headless-adminapp/core/store");
 const icons_1 = require("@headless-adminapp/icons");
+const react_1 = require("react");
 const context_1 = require("../mutable/context");
 const store_2 = require("../store");
 const context_2 = require("./context");
@@ -24,12 +25,21 @@ const defaultApp = {
     },
     logo: {},
 };
-const MetadataProvider = ({ children, experienceStore = exports.defaultExperienceStore, schemaStore = exports.defaultSchemaStore, appExperience = defaultApp, }) => {
+const defaultRecentItemStore = new store_2.RecentItemStore();
+const MetadataProvider = ({ children, experienceStore = exports.defaultExperienceStore, schemaStore = exports.defaultSchemaStore, appExperience = defaultApp, recentItemStore = defaultRecentItemStore, }) => {
     const contextValue = (0, context_1.useCreateContextStore)({
         experienceStore,
         schemaStore,
         appExperience,
+        recentItemStore,
     });
+    (0, react_1.useEffect)(() => {
+        contextValue.setValue({
+            appExperience,
+            experienceStore,
+            schemaStore,
+        });
+    }, [contextValue, appExperience, experienceStore, schemaStore]);
     return ((0, jsx_runtime_1.jsx)(context_2.MetadataContext.Provider, { value: contextValue, children: children }));
 };
 exports.MetadataProvider = MetadataProvider;

package/metadata/context.d.ts

@@ -1,8 +1,10 @@
 import type { AppExperience } from '@headless-adminapp/core/experience/app';
 import type { ISchemaExperienceStore, ISchemaStore } from '@headless-adminapp/core/store';
+import { IRecentItemStore } from '../store';
 export interface MetadataContextState {
     schemaStore: ISchemaStore;
     experienceStore: ISchemaExperienceStore;
     appExperience: AppExperience;
+    recentItemStore: IRecentItemStore;
 }
 export declare const MetadataContext: import("react").Context<import("../mutable/context").ContextValue<MetadataContextState>>;

package/metadata/hooks/useExperienceViewCommands.js

@@ -12,9 +12,7 @@ function useExperienceViewCommands(logicalName) {
         queryKey: ['experience-schema-view-commands', logicalName],
         queryFn: async () => {
             let commands = await experienceStore.getViewCommands(logicalName);
-            if (!commands) {
-                commands = viewCommands;
-            }
+            commands ??= viewCommands;
             return commands ?? [];
         },
         initialData: [],

package/metadata/hooks/useExperienceViewSubgridCommands.js

@@ -12,9 +12,7 @@ function useExperienceViewSubgridCommands(logicalName) {
         queryKey: ['experience-schema-view-subgrid-commands', logicalName],
         queryFn: async () => {
             let commands = await experienceStore.getSubgridCommands(logicalName);
-            if (!commands) {
-                commands = subgridCommands;
-            }
+            commands ??= subgridCommands;
             return commands ?? [];
         },
         initialData: [],

package/metadata/hooks/useMetadata.d.ts

@@ -1,3 +1,4 @@
+import { IRecentItemStore } from '@headless-adminapp/app/store';
 import type { AppExperience } from '@headless-adminapp/core/experience/app';
 import type { Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import type { ISchemaExperienceStore, ISchemaStore } from '@headless-adminapp/core/store';
@@ -6,6 +7,7 @@ interface UseMetadataResult {
     schemaStore: ISchemaStore<SchemaAttributes>;
     appExperience: AppExperience;
     experienceStore: ISchemaExperienceStore;
+    recentItemStore: IRecentItemStore;
 }
 export declare function useMetadata(): UseMetadataResult;
 export {};

package/metadata/hooks/useMetadata.js

@@ -8,11 +8,13 @@ function useMetadata() {
     const schemaStore = (0, context_1.useContextSelector)(context_2.MetadataContext, (state) => state.schemaStore);
     const appExperience = (0, context_1.useContextSelector)(context_2.MetadataContext, (state) => state.appExperience);
     const experienceStore = (0, context_1.useContextSelector)(context_2.MetadataContext, (state) => state.experienceStore);
+    const recentItemStore = (0, context_1.useContextSelector)(context_2.MetadataContext, (state) => state.recentItemStore);
     const schemas = schemaStore.getAllSchema();
     return (0, react_1.useMemo)(() => ({
         schemas,
         schemaStore,
         appExperience,
         experienceStore,
-    }), [schemas, schemaStore, appExperience, experienceStore]);
+        recentItemStore,
+    }), [schemas, schemaStore, appExperience, experienceStore, recentItemStore]);
 }

package/metadata/hooks/useRecentItemStore.d.ts

@@ -0,0 +1,2 @@
+import { IRecentItemStore } from '../../store/RecentItemStore';
+export declare function useRecentItemStore(): IRecentItemStore;

package/metadata/hooks/useRecentItemStore.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useRecentItemStore = useRecentItemStore;
+const context_1 = require("../../mutable/context");
+const context_2 = require("../context");
+function useRecentItemStore() {
+    return (0, context_1.useContextSelector)(context_2.MetadataContext, (state) => state.recentItemStore);
+}

package/navigation/hooks/useOpenForm.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useOpenForm = useOpenForm;
 const app_1 = require("@headless-adminapp/core/experience/app");
 const react_1 = require("react");
-const hooks_1 = require("../../route/hooks/");
+const hooks_1 = require("../../route/hooks");
 const useRouteResolver_1 = require("../../route/hooks/useRouteResolver");
 function useOpenForm() {
     const routeResolver = (0, useRouteResolver_1.useRouteResolver)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.4.3",
+  "version": "1.4.8",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,5 +38,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "5c5739c442d4690430997c7f375fed5966cde046"
+  "gitHead": "f25faf823d592f7d9c0356c1ca238e9019b8e7c0"
 }

package/progress-indicator/ProgressIndicatorProvider.js

@@ -13,12 +13,10 @@ const ProgressIndicatorProvider = ({ children, }) => {
         setOverlayVisible(true);
         setMessage(message);
         if (delay) {
-            if (!showTimeoutRef.current) {
-                showTimeoutRef.current = setTimeout(() => {
-                    setVisible(true);
-                    showTimeoutRef.current = undefined;
-                }, delay);
-            }
+            showTimeoutRef.current ??= setTimeout(() => {
+                setVisible(true);
+                showTimeoutRef.current = undefined;
+            }, delay);
         }
         else {
             if (showTimeoutRef.current) {

package/recordset/hooks/useRecordSetResult.d.ts

@@ -1,7 +1,7 @@
-import { SchemaAttributes } from '@headless-adminapp/core/schema';
+import { InferredSchemaType, SchemaAttributes } from '@headless-adminapp/core/schema';
 export declare function useRecordSetResult(): {
     isLoading: boolean;
-    data: import("@headless-adminapp/core/transport").Data<SchemaAttributes>[] | undefined;
+    data: import("@headless-adminapp/core/transport").Data<InferredSchemaType<SchemaAttributes>>[] | undefined;
     cardView: import("@headless-adminapp/core/experience/view").CardView | null;
     schema: import("@headless-adminapp/core/schema").Schema<SchemaAttributes> | null;
 };

package/store/RecentItemStore.d.ts

@@ -0,0 +1,25 @@
+import { Id } from '@headless-adminapp/core';
+export interface IRecentItemStore {
+    getItems: <T = unknown>(cacheKey: string, limit?: number) => RecentItem<T>[];
+    addItem: <T = unknown>(cacheKey: string, id: Id, value: T, limit?: number) => void;
+    addListener: (cacheKey: string, listener: (items: RecentItem<unknown>[]) => void) => void;
+    removeListener: (cacheKey: string, listener: (items: RecentItem<unknown>[]) => void) => void;
+}
+export type RecentItem<T> = {
+    timestamp: number;
+    id: Id;
+    value: T;
+};
+export declare class RecentItemStore implements IRecentItemStore {
+    private data;
+    private readonly storageKey;
+    private readonly maxItems;
+    private listeners;
+    constructor();
+    private init;
+    private sync;
+    getItems<T = unknown>(cacheKey: string, limit?: number): RecentItem<T>[];
+    addItem<T = unknown>(cacheKey: string, id: Id, value: T, limit?: number): void;
+    addListener(cacheKey: string, listener: (items: RecentItem<unknown>[]) => void): void;
+    removeListener(cacheKey: string, listener: (items: RecentItem<unknown>[]) => void): void;
+}

package/store/RecentItemStore.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RecentItemStore = void 0;
+class RecentItemStore {
+    data = {};
+    storageKey = 'recent_items';
+    maxItems = 5;
+    listeners = {};
+    constructor() {
+        this.init();
+    }
+    init() {
+        const _data = localStorage.getItem(this.storageKey);
+        if (_data) {
+            this.data = JSON.parse(_data);
+        }
+        else {
+            this.data = {};
+        }
+    }
+    sync() {
+        localStorage.setItem(this.storageKey, JSON.stringify(this.data));
+    }
+    getItems(cacheKey, limit) {
+        if (!this.data[cacheKey]) {
+            return [];
+        }
+        if (limit) {
+            return this.data[cacheKey].slice(0, limit);
+        }
+        return this.data[cacheKey];
+    }
+    addItem(cacheKey, id, value, limit) {
+        if (!this.data[cacheKey]) {
+            this.data[cacheKey] = [];
+        }
+        const timestamp = Date.now();
+        if (this.data[cacheKey].some((item) => item.id === id)) {
+            // Remove existing item with the same ID
+            this.data[cacheKey] = this.data[cacheKey].filter((item) => item.id !== id);
+        }
+        const newItem = { timestamp, id, value };
+        this.data[cacheKey].unshift(newItem);
+        this.data[cacheKey] = this.data[cacheKey].slice(0, limit ?? this.maxItems); // Limit to max items
+        this.sync();
+        for (const listener of this.listeners[cacheKey] || []) {
+            listener(this.data[cacheKey]);
+        }
+    }
+    addListener(cacheKey, listener) {
+        if (!this.listeners[cacheKey]) {
+            this.listeners[cacheKey] = [];
+        }
+        this.listeners[cacheKey].push(listener);
+    }
+    removeListener(cacheKey, listener) {
+        if (!this.listeners[cacheKey]) {
+            return;
+        }
+        this.listeners[cacheKey] = this.listeners[cacheKey].filter((l) => l !== listener);
+    }
+}
+exports.RecentItemStore = RecentItemStore;

package/store/SchemaExperienceStore.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SchemaExperienceStore = void 0;
 exports.getDefaultCardView = getDefaultCardView;
+const utils_1 = require("@headless-adminapp/core/utils");
 function getDefaultCardView(schema) {
     return {
         primaryColumn: schema.primaryAttribute,
@@ -71,9 +72,7 @@ class SchemaExperienceStore {
         if (!validViewIds.length) {
             validViewIds = [experience.defaultViewId];
         }
-        if (!viewId) {
-            viewId = experience.defaultViewId;
-        }
+        viewId = (0, utils_1.stringWithDefault)(viewId, experience.defaultViewId);
         if (!validViewIds.includes(viewId)) {
             viewId = validViewIds[0];
         }
@@ -103,9 +102,7 @@ class SchemaExperienceStore {
         if (!validViewIds.length) {
             validViewIds = [experience.defaultViewId];
         }
-        if (!viewId) {
-            viewId = experience.defaultAssociatedViewId;
-        }
+        viewId = (0, utils_1.stringWithDefault)(viewId, experience.defaultAssociatedViewId);
         if (!validViewIds.includes(viewId)) {
             viewId = validViewIds[0];
         }
@@ -130,9 +127,7 @@ class SchemaExperienceStore {
     }
     async getViewLookupV2(logicalName, viewId) {
         const experience = await this.getExperience(logicalName);
-        if (!viewId) {
-            viewId = experience.defaultLookupId;
-        }
+        viewId = (0, utils_1.stringWithDefault)(viewId, experience.defaultLookupId);
         const view = experience.lookups.find((v) => v.id === viewId);
         if (!view) {
             throw new Error(`Lookup ${viewId} not found`);

package/store/index.d.ts

@@ -1,4 +1,4 @@
 export * from './ComponentStore';
 export * from './EventManager';
 export * from './SchemaExperienceStore';
-export * from './HistoryState';
+export * from './RecentItemStore';

package/store/index.js

@@ -17,4 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ComponentStore"), exports);
 __exportStar(require("./EventManager"), exports);
 __exportStar(require("./SchemaExperienceStore"), exports);
-__exportStar(require("./HistoryState"), exports);
+__exportStar(require("./RecentItemStore"), exports);

package/transport/context.js

@@ -3,9 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileServiceContext = exports.DataServiceContext = void 0;
 const react_1 = require("react");
 exports.DataServiceContext = (0, react_1.createContext)(undefined);
-// export const noopFileService = {
-//   uploadFile: async () => {
-//     throw new Error('File service not implemented');
-//   },
-// } as IFileService;
 exports.FileServiceContext = (0, react_1.createContext)(null);

package/utils/phone.js

@@ -21,7 +21,7 @@ function parsePhoneNumber(input, defaultCountry) {
             uri: phoneNumber.getURI(),
         };
     }
-    catch (error) {
+    catch {
         return {
             formattedInternationalValue: input,
             formattedNationalValue: input,

package/store/HistoryState.d.ts

@@ -1,7 +0,0 @@
-export interface HistoryStatePlugin {
-    getter: () => Record<string, Record<string, unknown>>;
-    setter: (value: Record<string, Record<string, unknown>>) => void;
-}
-export declare function registerHistoryStatePlugin(plugin: HistoryStatePlugin): void;
-export declare function getHistoryState<T extends Record<string, unknown> = Record<string, unknown>>(key: string): Partial<T>;
-export declare function setHistoryState(key: string, value: Record<string, unknown>): void;

package/store/HistoryState.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerHistoryStatePlugin = registerHistoryStatePlugin;
-exports.getHistoryState = getHistoryState;
-exports.setHistoryState = setHistoryState;
-let historyStatePlugin = null;
-function registerHistoryStatePlugin(plugin) {
-    historyStatePlugin = plugin;
-}
-function getHistoryState(key) {
-    if (!historyStatePlugin) {
-        return {};
-    }
-    if (!key || typeof key !== 'string' || key.startsWith('~')) {
-        return {};
-    }
-    const state = historyStatePlugin.getter();
-    return (state[key] || {});
-}
-function setHistoryState(key, value) {
-    if (!historyStatePlugin) {
-        return;
-    }
-    const currentState = historyStatePlugin.getter();
-    historyStatePlugin.setter({
-        ...currentState,
-        [key]: {
-            ...currentState[key],
-            ...value,
-        },
-    });
-}