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

package/builders/CommandBuilder/FormCommandBuilder.js

@@ -132,7 +132,7 @@ var FormCommandBuilder;
                     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: (0, utils_1.plurialize)(1, localizeSelector((s) => s.successNotification.title)),

package/builders/CommandBuilder/SubgridCommandBuilder.js

@@ -50,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,
@@ -62,7 +62,7 @@ var SubgridCommandBuilder;
                 }
                 else {
                     context.navigation.openForm({
-                        logicalName: context.primaryControl.schema.logicalName,
+                        logicalName: context.secondaryControl.schema.logicalName,
                     });
                 }
             },
@@ -119,7 +119,7 @@ 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)),

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.22",
+  "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": "a6d5c09c93ce38a63c40db11e217000bb2276c99"
+  "gitHead": "ff177d1491eff81fa8ab0cdfc7e5e1d1b3edc18b"
 }