@headless-adminapp/app 0.0.17-alpha.4 → 0.0.17-alpha.41

package/dataform/DataFormProvider/DataResolver.js

@@ -28,10 +28,10 @@ function getControls(form) {
     return controls;
 }
 function getColumns(form) {
-    var _a;
+    var _a, _b;
     const columns = Array.from(new Set([
         ...((_a = form.experience.includeAttributes) !== null && _a !== void 0 ? _a : []),
-        ...form.experience.headerControls,
+        ...((_b = form.experience.headerControls) !== null && _b !== void 0 ? _b : []),
         ...getControls(form)
             .filter((control) => control.type === 'standard')
             .map((control) => control.attributeName),
@@ -39,7 +39,7 @@ function getColumns(form) {
     return columns;
 }
 function getRecord(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ recordId, dataService, form, schema, columns, getSchema, }) {
+    return __awaiter(this, arguments, void 0, function* ({ recordId, dataService, form, schema, columns, schemaStore, }) {
         var _b;
         let record = null;
         try {
@@ -60,7 +60,7 @@ function getRecord(_a) {
             if (control.type !== 'editablegrid') {
                 continue;
             }
-            const controlSchema = getSchema(control.logicalName);
+            const controlSchema = schemaStore.getSchema(control.logicalName);
             const records = yield dataService.retriveRecords({
                 logicalName: controlSchema.logicalName,
                 filter: {
@@ -97,7 +97,7 @@ function DataResolver() {
     const form = (0, hooks_2.useSelectedForm)();
     const dataService = (0, transport_2.useDataService)();
     const recordId = (0, hooks_2.useRecordId)();
-    const { getSchema } = (0, hooks_1.useMetadata)();
+    const { schemaStore } = (0, hooks_1.useMetadata)();
     const setState = (0, mutable_1.useContextSetValue)(context_1.DataFormContext);
     const columns = (0, react_1.useMemo)(() => getColumns(form), [form]);
     const queryKey = (0, react_1.useMemo)(() => ['data', 'retriveRecord', schema.logicalName, recordId, columns], [columns, recordId, schema.logicalName]);
@@ -113,7 +113,7 @@ function DataResolver() {
                 form,
                 recordId,
                 schema,
-                getSchema,
+                schemaStore,
             });
             return record;
         }),

package/dataform/DataFormProvider/index.js

@@ -23,7 +23,7 @@ const DataResolver_1 = require("./DataResolver");
 const InitialValueResolver_1 = require("./InitialValueResolver");
 const ReadonlyInfoResolver_1 = require("./ReadonlyInfoResolver");
 function DataFormProvider(props) {
-    const { getSchema } = (0, useMetadata_1.useMetadata)();
+    const { schemaStore } = (0, useMetadata_1.useMetadata)();
     const { language } = (0, useLocale_1.useLocale)();
     const formValidationStrings = (0, FormValidationStringContext_1.useFormValidationStrings)();
     const [formReadOnly, setFormReadOnly] = (0, react_1.useState)(false); // A trick to provide readOnly info to formInstance
@@ -32,7 +32,7 @@ function DataFormProvider(props) {
         defaultValues: {},
         resolver: (0, utils_1.formValidator)({
             form: props.form,
-            getSchema,
+            schemaStore,
             language,
             schema: props.schema,
             strings: formValidationStrings,
@@ -65,7 +65,7 @@ function DataFormProvider(props) {
         props.schema,
         props.recordId,
         contextValue,
-        getSchema,
+        schemaStore,
         props.commands,
     ]);
     return ((0, jsx_runtime_1.jsx)(context_1.DataFormContext.Provider, { value: contextValue, children: (0, jsx_runtime_1.jsxs)(react_hook_form_1.FormProvider, Object.assign({}, formInstance, { children: [(0, jsx_runtime_1.jsx)(DataResolver_1.DataResolver, {}), (0, jsx_runtime_1.jsx)(InitialValueResolver_1.InitialValueResolver, {}), (0, jsx_runtime_1.jsx)(ReadonlyInfoResolver_1.ReadonlyInfoResolver, { setFormReadOnly: setFormReadOnly }), props.children] })) }));

package/dataform/hooks/useFormSave.js

@@ -17,6 +17,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useFormSave = useFormSave;
+// Wrapper - Loader, response message
+// Core - Extract modified fields, prepare operations, perform operations
+const route_1 = require("@headless-adminapp/app/route");
 const react_query_1 = require("@tanstack/react-query");
 const react_1 = require("react");
 const react_hook_form_1 = require("react-hook-form");
@@ -34,7 +37,7 @@ function useFormSave() {
     const form = (0, useSelectedForm_1.useSelectedForm)();
     const formInstance = (0, react_hook_form_1.useFormContext)();
     const record = (0, useFormRecord_1.useFormRecord)();
-    const { getSchema } = (0, useMetadata_1.useMetadata)();
+    const { schemaStore } = (0, useMetadata_1.useMetadata)();
     const schema = (0, useFormSchema_1.useDataFormSchema)();
     const initialValues = (0, context_1.useContextSelector)(context_2.DataFormContext, (state) => state.initialValues);
     const refresh = (0, context_1.useContextSelector)(context_2.DataFormContext, (state) => state.refresh);
@@ -42,6 +45,7 @@ function useFormSave() {
     const { showProgressIndicator, hideProgressIndicator } = (0, useProgressIndicator_1.useProgressIndicator)();
     const openToastNotification = (0, useOpenToastNotification_1.useOpenToastNotification)();
     const client = (0, react_query_1.useQueryClient)();
+    const router = (0, route_1.useRouter)();
     function showMessageAfterSave({ isCreatedMode }) {
         // Show notification
         if (!isCreatedMode) {
@@ -76,7 +80,7 @@ function useFormSave() {
                     initialValues: initialValues,
                     dataService,
                     schema: schema,
-                    getSchema,
+                    schemaStore,
                 });
                 if (!result.success) {
                     openToastNotification({
@@ -97,6 +101,9 @@ function useFormSave() {
                     yield client.invalidateQueries({
                         queryKey: ['data', 'retriveRecord'],
                     });
+                    if (mode === 'saveandclose') {
+                        router.back();
+                    }
                 }
                 yield client.invalidateQueries({
                     queryKey: ['data', 'retriveRecords'],

package/dataform/hooks/useLoadFormGridPage.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLoadFormGridPage = useLoadFormGridPage;
+const app_1 = require("@headless-adminapp/app/app");
 const react_query_1 = require("@tanstack/react-query");
 const hooks_1 = require("../../metadata/hooks");
 function useLoadFormGridPage(logicalName, formId) {
@@ -22,10 +23,15 @@ function useLoadFormGridPage(logicalName, formId) {
         }),
         placeholderData: react_query_1.keepPreviousData,
     });
+    const { app: { formCommands }, } = (0, app_1.useAppContext)();
     const { data: commands } = (0, react_query_1.useQuery)({
         queryKey: ['experience-schema-form-commands', logicalName],
         queryFn: () => __awaiter(this, void 0, void 0, function* () {
-            return experienceStore.getFormCommands(logicalName);
+            let commands = yield experienceStore.getFormCommands(logicalName);
+            if (!commands) {
+                commands = formCommands;
+            }
+            return commands !== null && commands !== void 0 ? commands : [];
         }),
         initialData: [],
     });
@@ -34,7 +40,7 @@ function useLoadFormGridPage(logicalName, formId) {
             loading: false,
             error: true,
             title: 'Schema not found',
-            message: 'The schema was not found',
+            message: `The schema "${logicalName}" was not found`,
         };
     }
     if (!form) {

package/dataform/hooks/useMainFormCommands.d.ts

@@ -1,16 +1,5 @@
 import { EntityFormCommandContext } from '@headless-adminapp/core/experience/form';
 import { CommandItemState } from '../../command';
-export declare function useFormControlContext(): {
-    data: any;
-    logicalName: string;
-    schema: import("@headless-adminapp/core/schema").Schema<import("@headless-adminapp/core/schema").SchemaAttributes>;
-    form: import("@headless-adminapp/core/experience/form").Form<import("@headless-adminapp/core/schema").SchemaAttributes>;
-    formId: string;
-    originalData: import("@headless-adminapp/core/transport").Data<import("@headless-adminapp/core/schema").InferredSchemaType<import("@headless-adminapp/core/schema").SchemaAttributes>> | null;
-    recordId: string | number;
-    refresh: () => Promise<void>;
-    save: (mode?: import("@headless-adminapp/core/experience/form").SaveMode) => Promise<void>;
-    readonly: boolean | undefined;
-};
+export declare function useFormControlContext(): EntityFormCommandContext['primaryControl'];
 export declare function useMainFormCommandHandlerContext(): EntityFormCommandContext;
 export declare function useMainFormCommands(): CommandItemState[][];

package/dataform/hooks/useMainFormCommands.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useFormControlContext = useFormControlContext;
 exports.useMainFormCommandHandlerContext = useMainFormCommandHandlerContext;
 exports.useMainFormCommands = useMainFormCommands;
+const route_1 = require("@headless-adminapp/app/route");
+const react_1 = require("react");
 const command_1 = require("../../command");
 const context_1 = require("../../mutable/context");
 const context_2 = require("../context");
@@ -13,6 +15,7 @@ const useFormSave_1 = require("./useFormSave");
 const useFormSchema_1 = require("./useFormSchema");
 const useRecordId_1 = require("./useRecordId");
 function useFormControlContext() {
+    var _a;
     const schema = (0, useFormSchema_1.useDataFormSchema)();
     const form = (0, context_1.useContextSelector)(context_2.DataFormContext, (state) => state.form);
     const originalData = (0, useFormRecord_1.useFormRecord)();
@@ -20,8 +23,12 @@ function useFormControlContext() {
     const save = (0, useFormSave_1.useFormSave)();
     const refresh = (0, context_1.useContextSelector)(context_2.DataFormContext, (state) => state.refresh);
     const formInstance = (0, useFormInstance_1.useFormInstance)();
-    const readonly = (0, useFormIsReadonly_1.useFormIsReadonly)();
+    const readonly = (_a = (0, useFormIsReadonly_1.useFormIsReadonly)()) !== null && _a !== void 0 ? _a : false;
     const data = formInstance.watch();
+    const router = (0, route_1.useRouter)();
+    const close = (0, react_1.useCallback)(() => {
+        router.back();
+    }, [router]);
     return {
         data,
         logicalName: schema.logicalName,
@@ -33,6 +40,7 @@ function useFormControlContext() {
         refresh,
         save,
         readonly,
+        close,
     };
 }
 function useMainFormCommandHandlerContext() {

package/dataform/utils/index.d.ts

@@ -1,6 +1,7 @@
 import type { Attribute } from '@headless-adminapp/core/attributes';
 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';
 import { MemoizedFunction } from 'lodash';
@@ -17,14 +18,14 @@ type SaveRecordResult = {
     message: string;
     isError: boolean;
 };
-export declare function saveRecord({ values, form, schema, dataService, initialValues, record, getSchema, }: {
+export declare function saveRecord({ values, form, schema, dataService, initialValues, record, schemaStore, }: {
     values: any;
     form: Form<SchemaAttributes>;
     record: InferredSchemaType<SchemaAttributes> | undefined;
     initialValues: Nullable<InferredSchemaType<SchemaAttributes>>;
     schema: Schema<SchemaAttributes>;
     dataService: IDataService;
-    getSchema: (logicalName: string) => Schema<SchemaAttributes>;
+    schemaStore: ISchemaStore;
 }): Promise<SaveRecordResult>;
 export declare function getInitialValues({ cloneRecord, form, record, recordId, defaultParameters, }: {
     cloneRecord: InferredSchemaType<SchemaAttributes> | undefined;
@@ -41,7 +42,7 @@ interface FormValidatorOptions<A extends SchemaAttributes = SchemaAttributes> {
     formReadOnly?: boolean;
     readonlyAttributes?: string[];
     strings: FormValidationStringSet;
-    getSchema: (logicalName: string) => Schema;
+    schemaStore: ISchemaStore;
 }
 type FormValidator = (<A extends SchemaAttributes = SchemaAttributes>(options: FormValidatorOptions<A>) => (values: Record<string, any>, context: any, options: any) => Promise<ResolverResult<{}>>) & MemoizedFunction;
 export declare const formValidator: FormValidator;

package/dataform/utils/index.js

@@ -39,8 +39,8 @@ exports.getInitialValues = getInitialValues;
 const yup_1 = require("@hookform/resolvers/yup");
 const lodash_1 = require("lodash");
 const yup = __importStar(require("yup"));
-const CommandBuilder_1 = require("../../builders/CommandBuilder");
 const DataResolver_1 = require("../../dataform/DataFormProvider/DataResolver");
+const utils_1 = require("../../locale/utils");
 function getModifiedValues(initialValues, values, exclude) {
     const keys = Object.keys(values);
     return keys.reduce((p, c) => {
@@ -57,7 +57,7 @@ function getModifiedValues(initialValues, values, exclude) {
     }, {});
 }
 function saveRecord(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ values, form, schema, dataService, initialValues, record, getSchema, }) {
+    return __awaiter(this, arguments, void 0, function* ({ values, form, schema, dataService, initialValues, record, schemaStore, }) {
         const controls = (0, DataResolver_1.getControls)(form);
         const editableGridControls = controls.filter((control) => control.type === 'editablegrid');
         const modifiedValues = getModifiedValues(initialValues, values, editableGridControls.map((x) => x.attributeName));
@@ -74,7 +74,7 @@ function saveRecord(_a) {
                 });
             }
             for (const control of editableGridControls) {
-                const gridSchema = getSchema(control.logicalName);
+                const gridSchema = schemaStore.getSchema(control.logicalName);
                 const gridRows = values[control.attributeName];
                 const initialGridRows = initialValues[control.attributeName];
                 const newRows = gridRows.filter((x) => !x[gridSchema.idAttribute]);
@@ -212,7 +212,7 @@ function getInitialValues({ cloneRecord, form, record, recordId, defaultParamete
         return Object.assign(Object.assign({}, acc), { [column]: value });
     }, {});
 }
-exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, schema, readonlyAttributes, formReadOnly, getSchema, language, strings, }) {
+exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, schema, readonlyAttributes, formReadOnly, schemaStore, language, strings, }) {
     return (values, context, options) => __awaiter(this, void 0, void 0, function* () {
         let validator = yup.object().shape({});
         if (!formReadOnly) {
@@ -243,7 +243,7 @@ exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, sch
                     if (control.type !== 'editablegrid') {
                         throw new Error('Invalid control type');
                     }
-                    const schema = getSchema(control.logicalName);
+                    const schema = schemaStore.getSchema(control.logicalName);
                     return {
                         columns: control.attributes,
                         schema: schema,
@@ -312,11 +312,16 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
         case 'number':
             validationSchema = yup.number().nullable();
             break;
+        case 'attachments':
+        case 'choices':
+        case 'lookups':
+            validationSchema = yup.array().nullable();
+            break;
         default:
             validationSchema = yup.mixed().nullable();
             break;
     }
-    const label = (0, CommandBuilder_1.localizedLabel)(language, attribute);
+    const label = (0, utils_1.localizedLabel)(language, attribute);
     if (attribute.required) {
         validationSchema = validationSchema.required(`${label}: ${strings.required}`);
     }
@@ -338,6 +343,19 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
                 validationSchema = validationSchema.matches(/^(\+\d{1,2}\s?)?\d{10}$/, `${label}: ${strings.invalidPhoneNumber}`);
             }
             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);
+                });
+            }
+            break;
         default:
             break;
     }

package/datagrid/DataGridProvider/DataResolver.js

@@ -21,41 +21,6 @@ const hooks_1 = require("../hooks");
 const utils_1 = require("./utils");
 const ROWS_PER_PAGE = 100;
 const MAX_RECORDS = 10000;
-function mergeConditions(schema, filter, extraFilter, columnFilters, getSchema) {
-    const conditions = [];
-    if (filter) {
-        conditions.push(filter);
-    }
-    if (extraFilter) {
-        conditions.push(extraFilter);
-    }
-    if (columnFilters) {
-        const transformedColumnFilters = (0, utils_1.transformColumnFilter)(columnFilters, schema, getSchema);
-        if (transformedColumnFilters) {
-            conditions.push({
-                type: 'and',
-                conditions: Object.entries(transformedColumnFilters).map(([field, condition]) => {
-                    return {
-                        field,
-                        operator: condition.operator,
-                        value: condition.value,
-                        extendedKey: condition.extendedKey,
-                    };
-                }),
-            });
-        }
-    }
-    if (conditions.length === 0) {
-        return null;
-    }
-    if (conditions.length === 1) {
-        return conditions[0];
-    }
-    return {
-        type: 'and',
-        conditions,
-    };
-}
 function DataResolver() {
     var _a;
     const schema = (0, hooks_1.useDataGridSchema)();
@@ -67,24 +32,17 @@ function DataResolver() {
     const [columnFilters] = (0, hooks_1.useGridColumnFilter)();
     const gridColumns = (0, hooks_1.useGridColumns)();
     const maxRecords = (_a = (0, hooks_1.useMaxRecords)()) !== null && _a !== void 0 ? _a : MAX_RECORDS;
-    const { getSchema } = (0, useMetadata_1.useMetadata)();
+    const [selectedIds] = (0, hooks_1.useGridSelection)();
+    const { schemaStore } = (0, useMetadata_1.useMetadata)();
+    const selectedIdsRef = (0, react_1.useRef)(selectedIds);
+    selectedIdsRef.current = selectedIds;
     const setState = (0, context_1.useContextSetValue)(context_2.GridContext);
     const [search] = (0, useDebouncedValue_1.useDebouncedValue)(searchText, 500);
     const columns = (0, react_1.useMemo)(() => Array.from(new Set([
         ...gridColumns.filter((x) => !x.expandedKey).map((x) => x.name),
         schema.primaryAttribute,
     ])), [gridColumns, schema.primaryAttribute]);
-    const expand = (0, react_1.useMemo)(() => gridColumns
-        .filter((x) => x.expandedKey)
-        .reduce((acc, x) => {
-        if (!acc[x.name]) {
-            acc[x.name] = [];
-        }
-        if (!acc[x.name].includes(x.expandedKey)) {
-            acc[x.name].push(x.expandedKey);
-        }
-        return acc;
-    }, {}), [gridColumns]);
+    const expand = (0, react_1.useMemo)(() => (0, utils_1.collectExpandedKeys)(gridColumns), [gridColumns]);
     const queryKey = (0, react_1.useMemo)(() => [
         'data',
         'retriveRecords',
@@ -150,7 +108,7 @@ function DataResolver() {
                 search,
                 columns: columns,
                 expand,
-                filter: mergeConditions(schema, view.experience.filter, extraFilter, columnFilters, getSchema),
+                filter: (0, utils_1.mergeConditions)(schema, view.experience.filter, extraFilter, columnFilters, schemaStore),
                 skip,
                 limit,
                 sort: sorting,
@@ -191,10 +149,12 @@ function DataResolver() {
             count: (_c = (_b = data === null || data === void 0 ? void 0 : data.pages) === null || _b === void 0 ? void 0 : _b[0].data.count) !== null && _c !== void 0 ? _c : 0,
             records: (_d = data === null || data === void 0 ? void 0 : data.pages.map((x) => x.data.records).flat()) !== null && _d !== void 0 ? _d : [],
         };
+        const selectedIds = selectedIdsRef.current.filter((x) => finalData.records.some((y) => y[schema.idAttribute] === x));
         setState({
             data: finalData,
+            selectedIds,
         });
-    }, [data, setState]);
+    }, [data, setState, schema.idAttribute]);
     (0, react_1.useEffect)(() => {
         setState({
             dataState: {

package/datagrid/DataGridProvider/index.d.ts

@@ -12,6 +12,11 @@ export interface DataGridProviderProps<S extends SchemaAttributes = SchemaAttrib
     commands: CommandItemExperience<CommandContext>[][];
     onChangeView?: (viewId: string) => void;
     isSubGrid?: boolean;
+    associated?: false | {
+        logicalName: string;
+        id: string;
+        refAttributeName: string;
+    };
     allowViewSelection?: boolean;
     maxRecords?: number;
 }

package/datagrid/DataGridProvider/index.js

@@ -45,6 +45,7 @@ function DataGridProvider(props) {
         isSubGrid: (_b = props.isSubGrid) !== null && _b !== void 0 ? _b : false,
         allowViewSelection: (_c = props.allowViewSelection) !== null && _c !== void 0 ? _c : false,
         maxRecords: props.maxRecords,
+        associated: props.associated,
     });
     (0, react_1.useEffect)(() => {
         var _a;
@@ -74,5 +75,12 @@ function DataGridProvider(props) {
             commands: props.commands,
         });
     }, [props.commands, contextValue]);
+    (0, react_1.useEffect)(() => {
+        var _a;
+        contextValue.setValue({
+            isSubGrid: (_a = props.isSubGrid) !== null && _a !== void 0 ? _a : false,
+            associated: props.associated,
+        });
+    }, [props.isSubGrid, props.associated, contextValue]);
     return ((0, jsx_runtime_1.jsxs)(context_2.GridContext.Provider, { value: contextValue, children: [(0, jsx_runtime_1.jsx)(DataResolver_1.DataResolver, {}), props.children] }));
 }

package/datagrid/DataGridProvider/transformViewColumns.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformViewColumns = transformViewColumns;
-const CommandBuilder_1 = require("../../builders/CommandBuilder");
+const utils_1 = require("../../locale/utils");
 function transformViewColumns(logicalName, columns, schemaStore, language) {
     const schema = schemaStore.getSchema(logicalName);
     return columns
-        .map((column) => {
+        .map(column => {
         const attribute = schema.attributes[column.name];
         if (!attribute) {
             return null;
         }
-        const label = (0, CommandBuilder_1.localizedLabel)(language, attribute);
+        const label = (0, utils_1.localizedLabel)(language, attribute);
         if (column.expandedKey) {
             if (attribute.type !== 'lookup') {
                 return null;
@@ -20,7 +20,7 @@ function transformViewColumns(logicalName, columns, schemaStore, language) {
             if (!lookupAttribute) {
                 return null;
             }
-            const lookupLabel = (0, CommandBuilder_1.localizedLabel)(language, lookupAttribute);
+            const lookupLabel = (0, utils_1.localizedLabel)(language, lookupAttribute);
             return Object.assign(Object.assign({}, column), { id: `${column.name}.${column.expandedKey}`, label: `${lookupLabel} (${label})` });
         }
         return Object.assign(Object.assign({}, column), { id: column.name, label: label });

package/datagrid/DataGridProvider/utils.d.ts

@@ -1,3 +1,8 @@
 import { ColumnCondition } from '@headless-adminapp/core/experience/view';
-import { Schema } from '@headless-adminapp/core/schema';
-export declare function transformColumnFilter(filter: Partial<Record<string, ColumnCondition>>, schema: Schema, getSchema: (logicalName: string) => Schema): Record<string, ColumnCondition> | null;
+import { Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
+import { ISchemaStore } from '@headless-adminapp/core/store';
+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, columnFilters: Partial<Record<string, ColumnCondition>> | undefined, schemaStore: ISchemaStore): Filter | null;
+export declare function collectExpandedKeys(columns: TransformedViewColumn<SchemaAttributes>[]): Record<string, string[]>;

package/datagrid/DataGridProvider/utils.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformColumnFilter = transformColumnFilter;
+exports.mergeConditions = mergeConditions;
+exports.collectExpandedKeys = collectExpandedKeys;
 const dayjs_1 = __importDefault(require("dayjs"));
-function transformColumnFilter(filter, schema, getSchema) {
+function transformColumnFilter(filter, schema, schemaStore) {
     const transformedResult = Object.entries(filter).reduce((acc, [id, value]) => {
         const [key, extendedKey] = id.split('.');
         let attribute = schema.attributes[key];
@@ -16,7 +18,7 @@ function transformColumnFilter(filter, schema, getSchema) {
             if (attribute.type !== 'lookup') {
                 throw new Error(`Invalid column filter key: ${id}. Key ${key} is not a lookup column.`);
             }
-            const lookupSchema = getSchema(attribute.entity);
+            const lookupSchema = schemaStore.getSchema(attribute.entity);
             attribute = lookupSchema.attributes[extendedKey];
         }
         if (!attribute) {
@@ -72,3 +74,51 @@ function transformColumnFilter(filter, schema, getSchema) {
     }
     return transformedResult;
 }
+function mergeConditions(schema, filter, extraFilter, columnFilters, schemaStore) {
+    const filters = [];
+    if (filter) {
+        filters.push(filter);
+    }
+    if (extraFilter) {
+        filters.push(extraFilter);
+    }
+    if (columnFilters) {
+        const transformedColumnFilters = transformColumnFilter(columnFilters, schema, schemaStore);
+        if (transformedColumnFilters) {
+            filters.push({
+                type: 'and',
+                conditions: Object.entries(transformedColumnFilters).map(([field, condition]) => {
+                    return {
+                        field,
+                        operator: condition.operator,
+                        value: condition.value,
+                        extendedKey: condition.extendedKey,
+                    };
+                }),
+            });
+        }
+    }
+    if (filters.length === 0) {
+        return null;
+    }
+    if (filters.length === 1) {
+        return filters[0];
+    }
+    return {
+        type: 'and',
+        filters: filters,
+    };
+}
+function collectExpandedKeys(columns) {
+    return columns
+        .filter((x) => x.expandedKey)
+        .reduce((acc, x) => {
+        if (!acc[x.name]) {
+            acc[x.name] = [];
+        }
+        if (!acc[x.name].includes(x.expandedKey)) {
+            acc[x.name].push(x.expandedKey);
+        }
+        return acc;
+    }, {});
+}

package/datagrid/column-filter/constants.js

@@ -463,8 +463,42 @@ const booleanOperatorOptions = [
         controls: [],
     },
 ];
-const idOperatorOptions = [];
-const attachmentOperatorOptions = [];
+const idOperatorOptions = [
+    {
+        value: 'not-null',
+        labelKey: 'containsData',
+        controls: [],
+    },
+    {
+        value: 'null',
+        labelKey: 'doesNotContainData',
+        controls: [],
+    },
+];
+const attachmentOperatorOptions = [
+    {
+        value: 'not-null',
+        labelKey: 'containsData',
+        controls: [],
+    },
+    {
+        value: 'null',
+        labelKey: 'doesNotContainData',
+        controls: [],
+    },
+];
+const mixedOperatorOptions = [
+    {
+        value: 'not-null',
+        labelKey: 'containsData',
+        controls: [],
+    },
+    {
+        value: 'null',
+        labelKey: 'doesNotContainData',
+        controls: [],
+    },
+];
 exports.operatorOptions = {
     id: idOperatorOptions,
     boolean: booleanOperatorOptions,
@@ -476,7 +510,8 @@ exports.operatorOptions = {
     number: numberOperatorOptions,
     string: stringOperatorOptions,
     attachment: attachmentOperatorOptions,
-    mixed: [],
+    attachments: [],
+    mixed: mixedOperatorOptions,
     daterange: [],
     lookups: [],
 };

package/datagrid/context.d.ts

@@ -1,20 +1,23 @@
 import { LocalizedDataLookup } from '@headless-adminapp/core/attributes';
 import { CommandItemExperience } from '@headless-adminapp/core/experience/command';
-import { ColumnCondition, EntityMainGridCommandContext, EntitySubGridCommandContext, SortingState, View, ViewColumn } from '@headless-adminapp/core/experience/view';
+import { ColumnCondition, EntityMainGridCommandContext, EntitySubGridCommandContext, SortingState, View } from '@headless-adminapp/core/experience/view';
+import { type TransformedViewColumn } from '@headless-adminapp/core/experience/view/ViewColumn';
 import { InferredSchemaType, Schema, SchemaAttributes } from '@headless-adminapp/core/schema';
 import { Filter, RetriveRecordsResult } from '@headless-adminapp/core/transport';
-export interface TransformedViewColumn<S extends SchemaAttributes = SchemaAttributes> extends ViewColumn<S> {
-    id: string;
-    label: string;
-}
+export { type TransformedViewColumn } from '@headless-adminapp/core/experience/view/ViewColumn';
 export interface GridContextState<S extends SchemaAttributes = SchemaAttributes, CommandContext extends EntityMainGridCommandContext | EntitySubGridCommandContext = EntityMainGridCommandContext> {
     schema: Schema<S>;
     view: View<S>;
     viewLookup: LocalizedDataLookup[];
     onChangeView?: (viewId: string) => void;
     extraFilter?: Filter;
-    commands: CommandItemExperience<CommandContext>[][];
+    commands?: CommandItemExperience<CommandContext>[][];
     maxRecords?: number;
+    associated?: false | {
+        logicalName: string;
+        id: string;
+        refAttributeName: string;
+    };
     columns: TransformedViewColumn<S>[];
     searchText: string;
     columnFilters: Partial<Record<keyof S, ColumnCondition>>;