@headless-adminapp/app 0.0.17-alpha.21 → 0.0.17-alpha.23

package/builders/CommandBuilder/DefaultCommandBuilder.d.ts

@@ -52,15 +52,18 @@ export declare namespace DefaultCommandBuilder {
     interface CreateDefaultSubgridCommandStrings {
         new: string;
         edit: string;
+        delete: string;
         refresh: string;
         export: string;
         exportCsv: string;
         exportExcel: string;
+        deleteRecordCommandStringSet: ViewCommandBuilder.DeleteRecordCommandStringSet;
     }
     interface CreateDefaultSubgridCommandOptions {
         icons: {
             New: Icon;
             Edit: Icon;
+            Delete: Icon;
             Refresh: Icon;
             Export: Icon;
             ExportCsv: Icon;

package/builders/CommandBuilder/DefaultCommandBuilder.js

@@ -112,10 +112,12 @@ var DefaultCommandBuilder;
     const defaultSubgridCommandStrings = {
         new: 'New',
         edit: 'Edit',
+        delete: 'Delete',
         refresh: 'Refresh',
         export: 'Export',
         exportCsv: 'CSV',
         exportExcel: 'Excel',
+        deleteRecordCommandStringSet: ViewCommandBuilder_1.ViewCommandBuilder.defaultDeleteRecordStringSet,
     };
     function createDefaultSubgridCommands({ icons, strings = defaultSubgridCommandStrings, localizedSrings, }) {
         return [
@@ -130,6 +132,13 @@ var DefaultCommandBuilder;
                     text: strings.edit,
                     localizedTexts: extractLocalizedStrings(localizedSrings, (x) => x.edit),
                 }),
+                SubgridCommandBuilder_1.SubgridCommandBuilder.createDeleteRecordCommand({
+                    Icon: icons.Delete,
+                    text: strings.delete,
+                    localizedText: extractLocalizedStrings(localizedSrings, (x) => x.delete),
+                    stringSet: strings.deleteRecordCommandStringSet,
+                    localizedStringSet: extractLocalizedStrings(localizedSrings, (x) => x.deleteRecordCommandStringSet),
+                }),
                 SubgridCommandBuilder_1.SubgridCommandBuilder.createRefreshCommand({
                     Icon: icons.Refresh,
                     text: strings.refresh,

package/builders/CommandBuilder/FormCommandBuilder.d.ts

@@ -1,4 +1,4 @@
-import { EntityFormCommandContext, EntityMainFormCommandItemExperience } from '@headless-adminapp/core/experience/form';
+import { EntityMainFormCommandItemExperience } from '@headless-adminapp/core/experience/form';
 import { Localized } from '@headless-adminapp/core/types';
 import { Icon } from '@headless-adminapp/icons';
 export declare namespace FormCommandBuilder {
@@ -14,29 +14,29 @@ export declare namespace FormCommandBuilder {
     }): EntityMainFormCommandItemExperience;
     interface DeleteRecordCommandStringSet {
         confirmation: {
-            title: string;
-            text: string;
+            title: string | [string, string];
+            text: string | [string, string];
             buttonCancel: string;
             buttonConfirm: string;
         };
         status: {
-            deleting: string;
+            deleting: string | [string, string];
         };
         successNotification: {
-            title: string;
-            text: string;
+            title: string | [string, string];
+            text: string | [string, string];
         };
         errorNotification: {
             title: string;
         };
     }
     const defaultDeleteRecordStringSet: DeleteRecordCommandStringSet;
-    function createDeleteCommand({ Icon, text, localizedTexts, stringSet, }: {
+    function createDeleteCommand({ Icon, text, localizedTexts, stringSet, localizedStringSet, }: {
         Icon: Icon;
         text: string;
         localizedTexts?: Record<string, string>;
-        stringSet: DeleteRecordCommandStringSet | ((context: EntityFormCommandContext) => DeleteRecordCommandStringSet);
-        localizedStringSet?: Localized<DeleteRecordCommandStringSet | ((context: EntityFormCommandContext) => DeleteRecordCommandStringSet)>;
+        stringSet: DeleteRecordCommandStringSet;
+        localizedStringSet?: Localized<DeleteRecordCommandStringSet>;
     }): EntityMainFormCommandItemExperience;
     function createRefreshCommand({ Icon, text, localizedTexts, }: {
         Icon: Icon;

package/builders/CommandBuilder/FormCommandBuilder.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormCommandBuilder = void 0;
+const utils_1 = require("./utils");
 var EnabledRules;
 (function (EnabledRules) {
     function HasCreatePermisssion(context) {
@@ -99,7 +100,7 @@ var FormCommandBuilder;
             title: 'Error',
         },
     };
-    function createDeleteCommand({ Icon, text, localizedTexts, stringSet, }) {
+    function createDeleteCommand({ Icon, text, localizedTexts, stringSet, localizedStringSet, }) {
         return {
             Icon: Icon,
             type: 'button',
@@ -117,24 +118,25 @@ var FormCommandBuilder;
                 if (!recordId) {
                     return;
                 }
-                if (typeof stringSet === 'function') {
-                    stringSet = stringSet(context);
-                }
+                // if (typeof stringSet === 'function') {
+                //   stringSet = stringSet(context);
+                // }
+                const localizeSelector = (0, utils_1.createLocalizedSelector)(stringSet, localizedStringSet, context.locale.language);
                 try {
                     const confirmResult = yield context.utility.openConfirmDialog({
-                        title: stringSet.confirmation.title,
-                        text: stringSet.confirmation.text,
+                        title: (0, utils_1.plurialize)(1, localizeSelector((s) => s.confirmation.title)),
+                        text: (0, utils_1.plurialize)(1, localizeSelector((s) => s.confirmation.text)),
                         cancelButtonLabel: stringSet.confirmation.buttonCancel,
                         confirmButtonLabel: stringSet.confirmation.buttonConfirm,
                     });
                     if (!(confirmResult === null || confirmResult === void 0 ? void 0 : confirmResult.confirmed)) {
                         return;
                     }
-                    context.utility.showProgressIndicator(stringSet.status.deleting + '...');
+                    context.utility.showProgressIndicator((0, utils_1.plurialize)(1, localizeSelector((s) => s.status.deleting)) + '...');
                     yield context.dataService.deleteRecord(context.primaryControl.logicalName, recordId);
                     context.utility.showNotification({
-                        title: stringSet.successNotification.title,
-                        text: stringSet.successNotification.text,
+                        title: (0, utils_1.plurialize)(1, localizeSelector((s) => s.successNotification.title)),
+                        text: (0, utils_1.plurialize)(1, localizeSelector((s) => s.successNotification.text)),
                         type: 'success',
                     });
                     context.primaryControl.close();

package/builders/CommandBuilder/SubgridCommandBuilder.d.ts

@@ -1,49 +1,31 @@
 import { SubGridCommandItemExperience } from '@headless-adminapp/core/experience/view';
 import { Localized } from '@headless-adminapp/core/types';
 import { Icon } from '@headless-adminapp/icons';
+import { ViewCommandBuilder } from './ViewCommandBuilder';
 export declare namespace SubgridCommandBuilder {
-    export function createNewRecordCommand({ Icon, text, localizedTexts, }: {
+    function createNewRecordCommand({ Icon, text, localizedTexts, }: {
         Icon: Icon;
         text: string;
         localizedTexts?: Record<string, string>;
     }): SubGridCommandItemExperience;
-    export function createEditRecordCommand({ Icon, text, localizedTexts, }: {
+    function createEditRecordCommand({ Icon, text, localizedTexts, }: {
         Icon: Icon;
         text: string;
         localizedTexts?: Record<string, string>;
     }): SubGridCommandItemExperience;
-    interface DeleteRecordCommandStringSet {
-        confirmation: {
-            title: string | string[];
-            text: string | string[];
-            buttonCancel: string;
-            buttonConfirm: string;
-        };
-        status: {
-            deleting: string | string[];
-        };
-        successNotification: {
-            title: string | string[];
-            text: string | string[];
-        };
-        errorNotification: {
-            title: string;
-        };
-    }
-    export const defaultDeleteRecordStringSet: DeleteRecordCommandStringSet;
-    export function createDeleteRecordCommand({ Icon, localizedText, text, stringSet, localizedStringSet, }: {
+    function createDeleteRecordCommand({ Icon, localizedText, text, stringSet, localizedStringSet, }: {
         Icon: Icon;
         text: string;
         localizedText?: Record<string, string>;
-        stringSet?: DeleteRecordCommandStringSet;
-        localizedStringSet?: Localized<DeleteRecordCommandStringSet>;
+        stringSet?: ViewCommandBuilder.DeleteRecordCommandStringSet;
+        localizedStringSet?: Localized<ViewCommandBuilder.DeleteRecordCommandStringSet>;
     }): SubGridCommandItemExperience;
-    export function createRefreshCommand({ Icon, localizedTexts, text, }: {
+    function createRefreshCommand({ Icon, localizedTexts, text, }: {
         Icon: Icon;
         text: string;
         localizedTexts?: Record<string, string>;
     }): SubGridCommandItemExperience;
-    export function createExportCommand({ button, csv, excel, }: {
+    function createExportCommand({ button, csv, excel, }: {
         button: {
             Icon: Icon;
             text: string;
@@ -60,5 +42,4 @@ export declare namespace SubgridCommandBuilder {
             localizedTexts?: Record<string, string>;
         };
     }): SubGridCommandItemExperience;
-    export {};
 }

package/builders/CommandBuilder/SubgridCommandBuilder.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubgridCommandBuilder = void 0;
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
+const ViewCommandBuilder_1 = require("./ViewCommandBuilder");
 var EnabledRules;
 (function (EnabledRules) {
     function HasCreatePermisssion(context) {
@@ -49,7 +50,7 @@ var SubgridCommandBuilder;
             onClick: (context) => {
                 if (context.secondaryControl.associated) {
                     context.navigation.openForm({
-                        logicalName: context.primaryControl.schema.logicalName,
+                        logicalName: context.secondaryControl.schema.logicalName,
                         parameters: {
                             [context.secondaryControl.associated.refAttributeName]: {
                                 id: context.secondaryControl.associated.id,
@@ -61,7 +62,7 @@ var SubgridCommandBuilder;
                 }
                 else {
                     context.navigation.openForm({
-                        logicalName: context.primaryControl.schema.logicalName,
+                        logicalName: context.secondaryControl.schema.logicalName,
                     });
                 }
             },
@@ -92,28 +93,7 @@ var SubgridCommandBuilder;
         msg = msg.replace('{count}', count.toString());
         return msg;
     }
-    SubgridCommandBuilder.defaultDeleteRecordStringSet = {
-        confirmation: {
-            text: [
-                'Are you sure you want to delete this record?',
-                'Are you sure you want to delete selected records?',
-            ],
-            title: ['Delete record', 'Delete records'],
-            buttonConfirm: 'Delete',
-            buttonCancel: 'Cancel',
-        },
-        status: {
-            deleting: ['Deleting record', 'Deleting records'],
-        },
-        successNotification: {
-            title: ['Record deleted', 'Records deleted'],
-            text: ['Record deleted successfully', 'Records deleted successfully'],
-        },
-        errorNotification: {
-            title: 'Error',
-        },
-    };
-    function createDeleteRecordCommand({ Icon, localizedText, text, stringSet = SubgridCommandBuilder.defaultDeleteRecordStringSet, localizedStringSet, }) {
+    function createDeleteRecordCommand({ Icon, localizedText, text, stringSet = ViewCommandBuilder_1.ViewCommandBuilder.defaultDeleteRecordStringSet, localizedStringSet, }) {
         return {
             type: 'button',
             Icon,
@@ -139,14 +119,14 @@ var SubgridCommandBuilder;
                     }
                     context.utility.showProgressIndicator(plurialize(recordIds.length, localizeSelector((s) => s.status.deleting)) + '...');
                     for (const recordId of recordIds) {
-                        yield context.dataService.deleteRecord(context.primaryControl.logicalName, recordId);
+                        yield context.dataService.deleteRecord(context.secondaryControl.logicalName, recordId);
                     }
                     context.utility.showNotification({
                         title: plurialize(recordIds.length, localizeSelector((s) => s.successNotification.title)),
                         text: plurialize(recordIds.length, localizeSelector((s) => s.successNotification.text)),
                         type: 'success',
                     });
-                    yield context.primaryControl.refresh();
+                    context.secondaryControl.refresh();
                 }
                 catch (error) {
                     context.utility.showNotification({

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "0.0.17-alpha.21",
+  "version": "0.0.17-alpha.23",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -39,5 +39,5 @@
     "react-hook-form": "7.52.2",
     "yup": "^1.4.0"
   },
-  "gitHead": "559490088acc4f2c5c54a7d6aa913f21747ccee8"
+  "gitHead": "ff177d1491eff81fa8ab0cdfc7e5e1d1b3edc18b"
 }