@michalrakus/x-react-web-lib 1.38.4 → 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/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/package.json

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