@michalrakus/x-react-web-lib 1.38.3 → 1.38.5

package/lib/components/XFormBase.js

@@ -451,7 +451,7 @@ var XFormBase = /** @class */ (function (_super) {
                         return [3 /*break*/, 5];
                     case 4:
                         e_4 = _a.sent();
-                        XUtils_1.XUtils.showErrorMessage("Save row failed.", e_4);
+                        XUtils_1.XUtils.showErrorMessage("Save row failed.", e_4, this.entity);
                         return [2 /*return*/]; // zostavame vo formulari
                     case 5:
                         if (this.props.onSaveOrCancel !== undefined) {

package/lib/components/XLazyDataTable/XLazyDataTable.d.ts

@@ -3,7 +3,7 @@ import { DataTableFilterMeta, DataTableFilterMetaData, DataTableOperatorFilterMe
 import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
 import { XStorageType, XViewStatusOrBoolean } from "../XUtils";
 import { XSearchBrowseParams } from "../XSearchBrowseParams";
-import { XAggregateFunction, XCustomFilter } from "../../serverApi/FindParam";
+import { FindParam, XAggregateFunction, XCustomFilter } from "../../serverApi/FindParam";
 import { XOnSaveOrCancelProp } from "../XFormBase";
 import { IconType } from "primereact/utils";
 import { ButtonProps } from "primereact/button";
@@ -12,11 +12,12 @@ export type XBetweenFilterProp = "row" | "column" | undefined;
 export type XMultilineRenderType = "singleLine" | "fewLines" | "allLines";
 export type XOpenFormForInsert = (initValues?: object, onSaveOrCancel?: XOnSaveOrCancelProp, form?: JSX.Element) => void;
 export type XOpenFormForUpdate = (id: number, onSaveOrCancel?: XOnSaveOrCancelProp, form?: JSX.Element) => void;
+export type XAppButtonForRowOnClick = (selectedRow: any, findParam: FindParam) => void;
 export interface XAppButtonForRow {
     key?: string;
     icon?: IconType<ButtonProps>;
     label: string;
-    onClick: (selectedRow: any) => void;
+    onClick: XAppButtonForRowOnClick;
     style?: React.CSSProperties;
 }
 export interface XOptionalCustomFilter {

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -628,11 +628,11 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
                     setupExpandedRows(findResult, multilineSwitchValue);
                     setLoading(false);
                     // save table state into session/local
-                    //saveTableState(findParam); <- old solution, state is saved immediatelly after change of some filter field, sorting, etc.
-                    // odlozime si filter hodnoty pre pripadny export - deep cloning vyzera ze netreba
-                    setFiltersAfterFiltering(filters);
+                    //saveTableState(findParam); <- old solution, state is saved immediately after change of some filter field, sorting, etc.
+                    // odlozime si filter hodnoty pre pripadny export (maybe simple cloning is enough, but to be sure we use deep)
+                    setFiltersAfterFiltering(_.cloneDeep(filters));
                     setFtsInputValueAfterFiltering(ftsInputValue ? __assign({}, ftsInputValue) : undefined);
-                    setOptionalCustomFilterAfterFiltering(optionalCustomFilter);
+                    setOptionalCustomFilterAfterFiltering(optionalCustomFilter ? _.cloneDeep(optionalCustomFilter) : undefined);
                     // async check for new version - the purpose is to get new version of app to the browser (if available) in short time (10 minutes)
                     // (if there is no new version, the check will run async (as the last operation) and nothing will happen)
                     XUtils_1.XUtils.reloadIfNewVersion();
@@ -968,39 +968,41 @@ exports.XLazyDataTable = (0, react_1.forwardRef)(function (_a, ref) {
     }); };
     var onClickAppButtonForRow = function (onClick) {
         if (selectedRow !== null) {
-            onClick(selectedRow);
+            onClick(selectedRow, createFindParamUsingAfterFiltering());
         }
         else {
             alert((0, XLocale_1.xLocaleOption)('pleaseSelectRow'));
         }
     };
     var onClickExport = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var fields, findParam, findResult, exportParams;
+        var findParam, findResult, exportParams;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    fields = getFields(false);
-                    findParam = {
-                        resultType: FindParam_1.ResultType.OnlyRowCount,
-                        first: first,
-                        rows: rowsLocal,
-                        filters: filtersAfterFiltering,
-                        fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
-                        customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
-                        multiSortMeta: multiSortMeta,
-                        entity: props.entity,
-                        fields: fields,
-                        aggregateItems: aggregateItems
-                    };
+                    findParam = createFindParamUsingAfterFiltering();
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
-                    exportParams = createExportParams(fields, findResult.totalRecords);
+                    exportParams = createExportParams(getFields(false), findResult.totalRecords);
                     setExportRowsDialogState({ dialogOpened: true, exportParams: exportParams });
                     return [2 /*return*/];
             }
         });
     }); };
+    var createFindParamUsingAfterFiltering = function () {
+        return {
+            resultType: FindParam_1.ResultType.OnlyRowCount,
+            first: first,
+            rows: rowsLocal,
+            filters: filtersAfterFiltering,
+            fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
+            customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
+            multiSortMeta: multiSortMeta,
+            entity: props.entity,
+            fields: getFields(false),
+            aggregateItems: aggregateItems
+        };
+    };
     var createExportParams = function (fields, rowCount) {
         var queryParam = {
             filters: filtersAfterFiltering,

package/lib/components/XUtils.d.ts

@@ -101,7 +101,8 @@ export declare class XUtils {
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;
     static isReadOnlyTableField(path: string | undefined, readOnly: XTableFieldReadOnlyProp | undefined, object: XObject | null, tableRow: any): boolean;
     static markNotNull(label: string): string;
-    static showErrorMessage(message: string, e: unknown): void;
+    static showErrorMessage(message: string, e: unknown, entity?: string): void;
+    private static extractEntity;
     static createTooltipOrErrorProps(error: string | undefined, tooltip?: string | undefined): object;
     static addClassName(props: {
         [key: string]: any;

package/lib/components/XUtils.js

@@ -609,7 +609,7 @@ var XUtils = exports.XUtils = /** @class */ (function () {
     XUtils.markNotNull = function (label) {
         return label + ' *';
     };
-    XUtils.showErrorMessage = function (message, e) {
+    XUtils.showErrorMessage = function (message, e, entity) {
         var msg = message + XUtilsCommon_1.XUtilsCommon.newLine;
         if (e instanceof XResponseError_1.XResponseError) {
             if (e.xResponseErrorBody.exceptionName === 'XAppError') {
@@ -617,8 +617,17 @@ var XUtils = exports.XUtils = /** @class */ (function () {
                 msg += e.xResponseErrorBody.message;
             }
             else if (e.xResponseErrorBody.exceptionName === 'OptimisticLockVersionMismatchError') {
-                // better error message for optimistic locking
-                msg += (0, XLocale_1.xLocaleOption)('optimisticLockFailed');
+                // TODO - better error message for optimistic locking (modifDate + modifUser)
+                // for now, we add entity to the message if the entity from the OptimisticLockVersionMismatchError is different from the entity beeing saved
+                // (it is rare but it can be very confusing)
+                var entityParam = ""; // default
+                if (entity && e.xResponseErrorBody.message) {
+                    var entityFromError = XUtils.extractEntity(e.xResponseErrorBody.message);
+                    if (entityFromError !== entity) {
+                        entityParam = " " + entityFromError;
+                    }
+                }
+                msg += (0, XLocale_1.xLocaleOption)('optimisticLockFailed', { entity: entityParam });
             }
             else {
                 msg += e.message + XUtilsCommon_1.XUtilsCommon.newLine;
@@ -634,6 +643,10 @@ var XUtils = exports.XUtils = /** @class */ (function () {
         }
         alert(msg);
     };
+    XUtils.extractEntity = function (msg) {
+        var match = msg.match(/The optimistic lock on entity ([A-Za-z0-9_]+) failed/);
+        return match ? match[1] : "unknown";
+    };
     // pouziva sa hlavne na inputy
     XUtils.createTooltipOrErrorProps = function (error, tooltip) {
         // error ma prednost, ak nemame error, dame tooltip ak mame

package/lib/components/locale/x-en.json

@@ -18,7 +18,7 @@
         "cancel": "Cancel",
         "cancelEditConfirm": "Are you sure to cancel editing? All changes will be lost.",
         "pessimisticLockNotAcquired": "The row is being edited by the user {lockXUser} from {lockDate}\nDo you still want to edit the row? (The choice Cancel will open the form in read only mode).",
-        "optimisticLockFailed": "Someone else has changed the row during the editation. Sorry, you have to cancel the editation and start the editation again.",
+        "optimisticLockFailed": "Someone else has changed the row{entity} during the editation. Sorry, you have to cancel the editation and start the editation again.",
         "formRemoveRowConfirm": "Are you sure to remove the row?",
         "xIsNotNull": "Is not null",
         "xIsNull": "Is null",

package/lib/modules/docTemplates/xt-doc-template.d.ts

@@ -11,6 +11,7 @@ export interface XtDocTemplate {
     templateId: string | null;
     templateType: XEnum;
     templateXFile: XFile;
+    fileNameTemplate: string | null;
     availableInForms: boolean;
     modifDate: Date | null;
     modifXUser: XUser | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.38.3",
+  "version": "1.38.5",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",