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

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/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");
@@ -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) {
@@ -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/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/datagrid/DataGridProvider/DataResolver.js

@@ -32,7 +32,10 @@ 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 [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([
@@ -146,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/DataSelectionResolve.d.ts

@@ -0,0 +1 @@
+export declare function DataSelectionResolver(): null;

package/datagrid/DataGridProvider/DataSelectionResolve.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataSelectionResolver = DataSelectionResolver;
+const react_1 = require("react");
+const hooks_1 = require("../hooks");
+function DataSelectionResolver() {
+    const data = (0, hooks_1.useGridData)();
+    const [selectedIds] = (0, hooks_1.useGridSelection)();
+    const selectedIdsRef = (0, react_1.useRef)(selectedIds);
+    selectedIdsRef.current = selectedIds;
+    (0, react_1.useEffect)(() => { }, [data]);
+    return null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "0.0.17-alpha.22",
+  "version": "0.0.17-alpha.24",
   "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": "3280eb0e29b7a026f0251771f564b33c123c9bec"
 }

package/transport/RestDataService/index.d.ts

@@ -3,11 +3,11 @@ import { RetriveRecordsFnOptions, RetriveRecordsResult } from '@headless-adminap
 interface RestDataServiceOptions {
     endpoint: string;
 }
+export declare function handleResponseError(response: Response): Promise<void>;
 export declare class RestDataService implements IDataService {
     protected readonly options: RestDataServiceOptions;
     constructor(options: RestDataServiceOptions);
     protected readonly headers: Record<string, string>;
-    protected handleResponseError(response: Response): Promise<void>;
     private getHeaders;
     setHeader(name: string, value: string): void;
     removeHeader(name: string): void;

package/transport/RestDataService/index.js

@@ -10,27 +10,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestDataService = void 0;
+exports.handleResponseError = handleResponseError;
 const transport_1 = require("@headless-adminapp/core/transport");
+function handleResponseError(response) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (response.ok) {
+            return;
+        }
+        if ((_a = response.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('application/json')) {
+            const data = yield response.json();
+            if (data.error) {
+                throw new transport_1.HttpError(response.status, data.error);
+            }
+        }
+        throw new transport_1.HttpError(response.status, response.statusText);
+    });
+}
 class RestDataService {
     constructor(options) {
         this.options = options;
         this.headers = {};
     }
-    handleResponseError(response) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (response.ok) {
-                return;
-            }
-            if ((_a = response.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('application/json')) {
-                const data = yield response.json();
-                if (data.error) {
-                    throw new transport_1.HttpError(response.status, data.error);
-                }
-            }
-            throw new transport_1.HttpError(response.status, response.statusText);
-        });
-    }
     getHeaders() {
         return Object.assign({ 'content-type': 'application/json' }, this.headers);
     }
@@ -47,7 +48,7 @@ class RestDataService {
                 method: 'POST',
                 body: JSON.stringify(data),
             });
-            yield this.handleResponseError(response);
+            yield handleResponseError(response);
             return response.json();
         });
     }