@headless-adminapp/app 0.0.17-alpha.7 → 0.0.17-alpha.8

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 [];
         }),
         initialData: [],
     });

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) => {
@@ -59,8 +59,8 @@ function getModifiedValues(initialValues, values, exclude) {
 function saveRecord(_a) {
     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));
+        const editableGridControls = controls.filter(control => control.type === 'editablegrid');
+        const modifiedValues = getModifiedValues(initialValues, values, editableGridControls.map(x => x.attributeName));
         let recordId;
         if (record) {
             recordId = record[schema.idAttribute];
@@ -77,9 +77,9 @@ function saveRecord(_a) {
                 const gridSchema = schemaStore.getSchema(control.logicalName);
                 const gridRows = values[control.attributeName];
                 const initialGridRows = initialValues[control.attributeName];
-                const newRows = gridRows.filter((x) => !x[gridSchema.idAttribute]);
-                const updatedRows = gridRows.filter((x) => x[gridSchema.idAttribute]);
-                const deletedIds = initialGridRows === null || initialGridRows === void 0 ? void 0 : initialGridRows.map((x) => x[gridSchema.idAttribute]).filter((id) => !gridRows.find((x) => x[gridSchema.idAttribute] === id));
+                const newRows = gridRows.filter(x => !x[gridSchema.idAttribute]);
+                const updatedRows = gridRows.filter(x => x[gridSchema.idAttribute]);
+                const deletedIds = initialGridRows === null || initialGridRows === void 0 ? void 0 : initialGridRows.map(x => x[gridSchema.idAttribute]).filter(id => !gridRows.find(x => x[gridSchema.idAttribute] === id));
                 for (const row of newRows) {
                     operations.push({
                         type: 'create',
@@ -90,7 +90,7 @@ function saveRecord(_a) {
                     });
                 }
                 for (const row of updatedRows) {
-                    const initialRow = initialGridRows.find((x) => x[gridSchema.idAttribute] === row[gridSchema.idAttribute]);
+                    const initialRow = initialGridRows.find(x => x[gridSchema.idAttribute] === row[gridSchema.idAttribute]);
                     if (!initialRow) {
                         throw new Error('Initial row not found');
                     }
@@ -154,10 +154,10 @@ function saveRecord(_a) {
 }
 function getInitialValues({ cloneRecord, form, record, recordId, defaultParameters, }) {
     const formColumns = (0, DataResolver_1.getColumns)(form);
-    const editableGridControls = (0, DataResolver_1.getControls)(form).filter((control) => control.type === 'editablegrid');
+    const editableGridControls = (0, DataResolver_1.getControls)(form).filter(control => control.type === 'editablegrid');
     const allColumns = [
         ...formColumns,
-        ...editableGridControls.map((x) => x.attributeName),
+        ...editableGridControls.map(x => x.attributeName),
     ];
     if (!recordId && !record && form.experience.cloneAttributes && cloneRecord) {
         const cloneAttributesObj = form.experience.cloneAttributes.reduce((acc, item) => {
@@ -217,12 +217,12 @@ exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, sch
         let validator = yup.object().shape({});
         if (!formReadOnly) {
             const activeControls = form.experience.tabs
-                .flatMap((tab) => tab.tabColumns)
-                .flatMap((tabColumn) => tabColumn.sections)
-                .flatMap((section) => {
+                .flatMap(tab => tab.tabColumns)
+                .flatMap(tabColumn => tabColumn.sections)
+                .flatMap(section => {
                 return section.controls;
             })
-                .filter((control) => {
+                .filter(control => {
                 if (control.type === 'standard') {
                     const attribute = schema.attributes[control.attributeName];
                     if (attribute.readonly) {
@@ -231,15 +231,15 @@ exports.formValidator = (0, lodash_1.memoize)(function formValidator({ form, sch
                 }
                 return true;
             });
-            const editableGridControls = activeControls.filter((control) => control.type === 'editablegrid');
+            const editableGridControls = activeControls.filter(control => control.type === 'editablegrid');
             const columns = Array.from(new Set([
                 schema.primaryAttribute,
                 ...activeControls
-                    .filter((control) => control.type === 'standard')
-                    .map((control) => control.attributeName),
+                    .filter(control => control.type === 'standard')
+                    .map(control => control.attributeName),
             ]));
             validator = (0, exports.generateValidationSchema)({
-                editableGrids: editableGridControls.map((control) => {
+                editableGrids: editableGridControls.map(control => {
                     if (control.type !== 'editablegrid') {
                         throw new Error('Invalid control type');
                     }
@@ -316,7 +316,7 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
             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}`);
     }
@@ -341,7 +341,7 @@ exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function gener
         default:
             break;
     }
-    validationSchema = validationSchema.transform((value) => {
+    validationSchema = validationSchema.transform(value => {
         if (value === '') {
             return null;
         }

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/context.d.ts

@@ -11,7 +11,7 @@ export interface GridContextState<S extends SchemaAttributes = SchemaAttributes,
     viewLookup: LocalizedDataLookup[];
     onChangeView?: (viewId: string) => void;
     extraFilter?: Filter;
-    commands: CommandItemExperience<CommandContext>[][];
+    commands?: CommandItemExperience<CommandContext>[][];
     maxRecords?: number;
     columns: TransformedViewColumn<S>[];
     searchText: string;

package/datagrid/hooks/useGridCommands.d.ts

@@ -1,3 +1,6 @@
 import { CommandItemExperience } from '@headless-adminapp/core/experience/command';
 import { EntityMainGridCommandContext, EntitySubGridCommandContext } from '@headless-adminapp/core/experience/view';
+/**
+ * @deprecated
+ */
 export declare function useGridCommands<CommandContext extends EntityMainGridCommandContext | EntitySubGridCommandContext = EntityMainGridCommandContext>(): CommandItemExperience<CommandContext>[][];

package/datagrid/hooks/useGridCommands.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useGridCommands = useGridCommands;
 const context_1 = require("../../mutable/context");
 const context_2 = require("../context");
+/**
+ * @deprecated
+ */
 function useGridCommands() {
     const commands = (0, context_1.useContextSelector)(context_2.GridContext, (state) => state.commands);
     return commands;

package/datagrid/hooks/useMainGridCommands.js

@@ -5,14 +5,16 @@ exports.useGridControlContext = useGridControlContext;
 exports.useMainGridCommandHandlerContext = useMainGridCommandHandlerContext;
 exports.useMainGridCommands = useMainGridCommands;
 exports.useMainGridContextCommands = useMainGridContextCommands;
+const app_1 = require("@headless-adminapp/app/app");
+const mutable_1 = require("@headless-adminapp/app/mutable");
 const react_1 = require("react");
 const command_1 = require("../../command");
 const hooks_1 = require("../../dialog/hooks");
 const useProgressIndicator_1 = require("../../progress-indicator/hooks/useProgressIndicator");
 const useOpenToastNotification_1 = require("../../toast-notification/hooks/useOpenToastNotification");
+const context_1 = require("../context");
 const useGridColumnFilter_1 = require("./useGridColumnFilter");
 const useGridColumns_1 = require("./useGridColumns");
-const useGridCommands_1 = require("./useGridCommands");
 const useGridData_1 = require("./useGridData");
 const useGridExtraFilter_1 = require("./useGridExtraFilter");
 const useGridRefresh_1 = require("./useGridRefresh");
@@ -84,13 +86,20 @@ function useMainGridCommandHandlerContext() {
     const primaryControl = useGridControlContext();
     return Object.assign(Object.assign({}, baseHandlerContext), { primaryControl });
 }
+const emptyCommands = [];
+function useGridCommands() {
+    var _a;
+    const commands = (0, mutable_1.useContextSelector)(context_1.GridContext, (state) => state.commands);
+    const { app: { viewCommands: defaultCommands }, } = (0, app_1.useAppContext)();
+    return (_a = commands !== null && commands !== void 0 ? commands : defaultCommands) !== null && _a !== void 0 ? _a : emptyCommands;
+}
 function useMainGridCommands() {
-    const commands = (0, useGridCommands_1.useGridCommands)();
+    const commands = useGridCommands();
     const handlerContext = useMainGridCommandHandlerContext();
     return (0, command_1.useCommands)(commands, handlerContext);
 }
 function useMainGridContextCommands() {
-    const commands = (0, useGridCommands_1.useGridCommands)();
+    const commands = useGridCommands();
     const handlerContext = useMainGridCommandHandlerContext();
     return (0, command_1.useCommands)(commands, handlerContext, (command) => { var _a; return (_a = ('isContextMenu' in command && command.isContextMenu)) !== null && _a !== void 0 ? _a : false; });
 }

package/datagrid/hooks/useSubGridCommands.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useSubGridCommandHandlerContext = useSubGridCommandHandlerContext;
 exports.useSubGridCommands = useSubGridCommands;
 exports.useSubGridContextCommands = useSubGridContextCommands;
+const app_1 = require("@headless-adminapp/app/app");
+const mutable_1 = require("@headless-adminapp/app/mutable");
 const react_1 = require("react");
 const command_1 = require("../../command");
 const useMainFormCommands_1 = require("../../dataform/hooks/useMainFormCommands");
+const context_1 = require("../context");
 const useGridColumnFilter_1 = require("./useGridColumnFilter");
-const useGridCommands_1 = require("./useGridCommands");
 const useGridData_1 = require("./useGridData");
 const useGridExtraFilter_1 = require("./useGridExtraFilter");
 const useGridRefresh_1 = require("./useGridRefresh");
@@ -51,13 +53,20 @@ function useSubGridCommandHandlerContext() {
             extraFilter,
         } });
 }
+const emptyCommands = [];
+function useGridCommands() {
+    var _a;
+    const commands = (0, mutable_1.useContextSelector)(context_1.GridContext, (state) => state.commands);
+    const { app: { subgridCommands: defaultCommands }, } = (0, app_1.useAppContext)();
+    return (_a = commands !== null && commands !== void 0 ? commands : defaultCommands) !== null && _a !== void 0 ? _a : emptyCommands;
+}
 function useSubGridCommands() {
-    const commands = (0, useGridCommands_1.useGridCommands)();
+    const commands = useGridCommands();
     const handlerContext = useSubGridCommandHandlerContext();
     return (0, command_1.useCommands)(commands, handlerContext);
 }
 function useSubGridContextCommands() {
-    const commands = (0, useGridCommands_1.useGridCommands)();
+    const commands = useGridCommands();
     const handlerContext = useSubGridCommandHandlerContext();
     return (0, command_1.useCommands)(commands, handlerContext, (command) => { var _a; return (_a = ('isContextMenu' in command && command.isContextMenu)) !== null && _a !== void 0 ? _a : false; });
 }

package/locale/utils.d.ts

@@ -0,0 +1,5 @@
+import { Localized } from '@headless-adminapp/core/types';
+export declare function localizedLabel<T extends {
+    label: string;
+    localizedLabels?: Localized<string>;
+}>(language: string, value: T, fallback?: T): string;

package/locale/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.localizedLabel = localizedLabel;
+function localizedLabel(language, value, fallback) {
+    var _a, _b, _c, _d, _e;
+    return ((_e = (_d = (_b = (_a = value.localizedLabels) === null || _a === void 0 ? void 0 : _a[language]) !== null && _b !== void 0 ? _b : (_c = fallback === null || fallback === void 0 ? void 0 : fallback.localizedLabels) === null || _c === void 0 ? void 0 : _c[language]) !== null && _d !== void 0 ? _d : value.label) !== null && _e !== void 0 ? _e : fallback === null || fallback === void 0 ? void 0 : fallback.label);
+}

package/metadata/hooks/useExperienceViewCommands.d.ts

@@ -1,4 +1,4 @@
 /** @todo move in different dir */
 export declare function useExperienceViewCommands(logicalName: string): {
-    commands: import("@headless-adminapp/core/experience/view").EntityMainGridCommandItemExperience[][];
+    commands: never[];
 };

package/metadata/hooks/useExperienceViewCommands.js

@@ -10,15 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useExperienceViewCommands = useExperienceViewCommands;
+const app_1 = require("@headless-adminapp/app/app");
 const react_query_1 = require("@tanstack/react-query");
 const useExperienceStore_1 = require("./useExperienceStore");
 /** @todo move in different dir */
 function useExperienceViewCommands(logicalName) {
     const experienceStore = (0, useExperienceStore_1.useExperienceStore)();
+    const { app: { viewCommands }, } = (0, app_1.useAppContext)();
     const { data: commands } = (0, react_query_1.useQuery)({
         queryKey: ['experience-schema-view-commands', logicalName],
         queryFn: () => __awaiter(this, void 0, void 0, function* () {
-            return experienceStore.getViewCommands(logicalName);
+            let commands = yield experienceStore.getViewCommands(logicalName);
+            if (!commands) {
+                commands = viewCommands;
+            }
+            return [];
         }),
         initialData: [],
     });

package/metadata/hooks/useExperienceViewSubgridCommands.d.ts

@@ -1,4 +1,4 @@
 /** @todo move in different dir */
 export declare function useExperienceViewSubgridCommands(logicalName: string): {
-    commands: import("@headless-adminapp/core/experience/view").SubGridCommandItemExperience[][];
+    commands: never[];
 };

package/metadata/hooks/useExperienceViewSubgridCommands.js

@@ -10,15 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useExperienceViewSubgridCommands = useExperienceViewSubgridCommands;
+const app_1 = require("@headless-adminapp/app/app");
 const react_query_1 = require("@tanstack/react-query");
 const useExperienceStore_1 = require("./useExperienceStore");
 /** @todo move in different dir */
 function useExperienceViewSubgridCommands(logicalName) {
     const experienceStore = (0, useExperienceStore_1.useExperienceStore)();
+    const { app: { subgridCommands }, } = (0, app_1.useAppContext)();
     const { data: commands } = (0, react_query_1.useQuery)({
         queryKey: ['experience-schema-view-subgrid-commands', logicalName],
         queryFn: () => __awaiter(this, void 0, void 0, function* () {
-            return experienceStore.getSubgridCommands(logicalName);
+            let commands = yield experienceStore.getSubgridCommands(logicalName);
+            if (!commands) {
+                commands = subgridCommands;
+            }
+            return [];
         }),
         initialData: [],
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "0.0.17-alpha.7",
+  "version": "0.0.17-alpha.8",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -38,5 +38,5 @@
     "react-hook-form": "7.52.2",
     "yup": "^1.4.0"
   },
-  "gitHead": "5b53560e1c0b20e0bb0e74e820a96c7c75e2c43b"
+  "gitHead": "0c369830a0ba4aa5744cc307f8947ae9660980c4"
 }

package/store/SchemaExperienceStore.d.ts

@@ -23,9 +23,9 @@ export declare class SchemaExperienceStore implements ISchemaExperienceStore {
     getDefaultViewLookupId(logicalName: string): Promise<string>;
     getForm<S extends SchemaAttributes = SchemaAttributes>(logicalName: string, formId: string): Promise<Form<S>>;
     getQuickCreateForm<S extends SchemaAttributes = SchemaAttributes>(logicalName: string, formId: string): Promise<QuickCreateForm<S>>;
-    getViewCommands(logicalName: string): Promise<EntityMainGridCommandItemExperience[][]>;
-    getFormCommands(logicalName: string): Promise<EntityMainFormCommandItemExperience[][]>;
-    getSubgridCommands(logicalName: string): Promise<SubGridCommandItemExperience[][]>;
+    getViewCommands(logicalName: string): Promise<EntityMainGridCommandItemExperience[][] | undefined>;
+    getFormCommands(logicalName: string): Promise<EntityMainFormCommandItemExperience[][] | undefined>;
+    getSubgridCommands(logicalName: string): Promise<SubGridCommandItemExperience[][] | undefined>;
     getSchemaMetadataList(): SchemaMetadata[];
     getExperienceSchemaMetadatList(): Promise<SchemaExperienceMetadata[]>;
 }