@azrico/webobject 1.4.88 → 1.4.90

package/dist/src/WebObjects/WebObjectManager.js

@@ -42,7 +42,7 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
     _defineProperty(_assertThisInitialized(_this), "__last_web_path", "");
     _defineProperty(_assertThisInitialized(_this), "__last_web_type", "");
     if (_this.constructor["__save_message"]) {
-      _this.event_add("on_save", "onsave_sendmsg", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      _this.event_add("on_save", "on_save-sendmsg", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -79,6 +79,64 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
           }
         }, _callee);
       })));
+      _this.event_add("on_archive", "on_archive-sendmsg", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.t0 = _this.getSaveResultType();
+              _context2.next = _context2.t0 === "normal" ? 3 : 6;
+              break;
+            case 3:
+              _context2.next = 5;
+              return _global.gfunc.run_action("show_message", {
+                message: "Archived",
+                type: "success"
+              });
+            case 5:
+              return _context2.abrupt("return", _context2.sent);
+            case 6:
+              _context2.next = 8;
+              return _global.gfunc.run_action("show_message", {
+                message: "Not archived",
+                type: "error"
+              });
+            case 8:
+              return _context2.abrupt("return", _context2.sent);
+            case 9:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      })));
+      _this.event_add("on_delete", "on_delete-sendmsg", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.t0 = _this.getSaveResultType();
+              _context3.next = _context3.t0 === "normal" ? 3 : 6;
+              break;
+            case 3:
+              _context3.next = 5;
+              return _global.gfunc.run_action("show_message", {
+                message: "Deleted",
+                type: "success"
+              });
+            case 5:
+              return _context3.abrupt("return", _context3.sent);
+            case 6:
+              _context3.next = 8;
+              return _global.gfunc.run_action("show_message", {
+                message: "Not deleted",
+                type: "error"
+              });
+            case 8:
+              return _context3.abrupt("return", _context3.sent);
+            case 9:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      })));
     }
     return _this;
   }
@@ -107,23 +165,23 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
   }, {
     key: "setMetaValue",
     value: function setMetaValue(_x, _x2) {
-      return (_setMetaValue = _setMetaValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
+      return (_setMetaValue = _setMetaValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, value) {
         var _this$obj;
         var sendChange,
-          _args2 = arguments;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+          _args4 = arguments;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              sendChange = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : "auto";
-              _context2.next = 3;
+              sendChange = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : "auto";
+              _context4.next = 3;
               return (_this$obj = this.obj) === null || _this$obj === void 0 ? void 0 : _this$obj.setMetaValue(key, value, sendChange);
             case 3:
-              return _context2.abrupt("return", _context2.sent);
+              return _context4.abrupt("return", _context4.sent);
             case 4:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2, this);
+        }, _callee4, this);
       }))).apply(this, arguments);
     }
   }, {
@@ -136,68 +194,68 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
   }, {
     key: "get_deltaObject",
     value: function get_deltaObject() {
-      return (_get_deltaObject = _get_deltaObject || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      return (_get_deltaObject = _get_deltaObject || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _this$obj3;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context3.next = 2;
+              _context5.next = 2;
               return (_this$obj3 = this.obj) === null || _this$obj3 === void 0 ? void 0 : _this$obj3.get_deltaObject();
             case 2:
-              _context3.t0 = _context3.sent;
-              if (_context3.t0) {
-                _context3.next = 5;
+              _context5.t0 = _context5.sent;
+              if (_context5.t0) {
+                _context5.next = 5;
                 break;
               }
-              _context3.t0 = {};
+              _context5.t0 = {};
             case 5:
-              return _context3.abrupt("return", _context3.t0);
+              return _context5.abrupt("return", _context5.t0);
             case 6:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }))).apply(this, arguments);
     } /* ------------------------------ save and load ----------------------------- */
   }, {
     key: "Save",
     value: function Save() {
-      return (_Save = _Save || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return (_Save = _Save || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         var _this$obj4;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context4.next = 2;
+              _context6.next = 2;
               return (_this$obj4 = this.obj) === null || _this$obj4 === void 0 ? void 0 : _this$obj4.Save();
             case 2:
-              _context4.t0 = _context4.sent;
-              if (_context4.t0) {
-                _context4.next = 5;
+              _context6.t0 = _context6.sent;
+              if (_context6.t0) {
+                _context6.next = 5;
                 break;
               }
-              _context4.t0 = false;
+              _context6.t0 = false;
             case 5:
-              return _context4.abrupt("return", _context4.t0);
+              return _context6.abrupt("return", _context6.t0);
             case 6:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }))).apply(this, arguments);
     }
   }, {
     key: "Load",
     value: function Load(_x3) {
-      return (_Load = _Load || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(search) {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      return (_Load = _Load || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(search) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               throw Error("load not implented");
             case 1:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5);
+        }, _callee7);
       }))).apply(this, arguments);
     }
     /* -------------------------------------------------------------------------- */
@@ -233,32 +291,32 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
   }, {
     key: "onNew",
     value: function onNew() {
-      return (_onNew = _onNew || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      return (_onNew = _onNew || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this$obj9;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (this.canModify) {
                 (_this$obj9 = this.obj) === null || _this$obj9 === void 0 || _this$obj9.setOriginal();
               }
-              _context6.next = 3;
+              _context8.next = 3;
               return this.event_run("on_new");
             case 3:
-              _context6.next = 5;
+              _context8.next = 5;
               return this.event_run("on_change", true);
             case 5:
-              _context6.next = 7;
+              _context8.next = 7;
               return this.event_run("on_after_new");
             case 7:
-              _context6.next = 9;
+              _context8.next = 9;
               return Promise.resolve(true);
             case 9:
-              return _context6.abrupt("return", _context6.sent);
+              return _context8.abrupt("return", _context8.sent);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee8, this);
       }))).apply(this, arguments);
     }
     /**
@@ -269,49 +327,49 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
   }, {
     key: "onDelete",
     value: function onDelete() {
-      return (_onDelete = _onDelete || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      return (_onDelete = _onDelete || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (this.obj) {
                 this.obj.isDeleted = true;
               }
-              _context7.next = 3;
+              _context9.next = 3;
               return this.event_run("on_delete");
             case 3:
-              _context7.next = 5;
+              _context9.next = 5;
               return this.event_run("on_after_delete");
             case 5:
-              return _context7.abrupt("return", true);
+              return _context9.abrupt("return", true);
             case 6:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee9, this);
       }))).apply(this, arguments);
     }
   }, {
     key: "onArchive",
     value: function onArchive() {
-      return (_onArchive = _onArchive || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      return (_onArchive = _onArchive || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               if (this.obj) {
                 this.obj.isDeleted = true;
               }
-              _context8.next = 3;
+              _context10.next = 3;
               return this.event_run("on_archive");
             case 3:
-              _context8.next = 5;
+              _context10.next = 5;
               return this.event_run("on_after_archive");
             case 5:
-              return _context8.abrupt("return", true);
+              return _context10.abrupt("return", true);
             case 6:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }))).apply(this, arguments);
     }
     /**
@@ -322,32 +380,32 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
   }, {
     key: "onLoad",
     value: function onLoad() {
-      return (_onLoad = _onLoad || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      return (_onLoad = _onLoad || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
               if (this.canModify && this.obj) {
                 this.obj.isDeleted = false;
                 this.obj.setOriginal();
               }
-              _context9.next = 3;
+              _context11.next = 3;
               return this.event_run("on_load");
             case 3:
-              _context9.next = 5;
+              _context11.next = 5;
               return this.event_run("on_change", true);
             case 5:
-              _context9.next = 7;
+              _context11.next = 7;
               return this.event_run("on_after_load");
             case 7:
-              _context9.next = 9;
+              _context11.next = 9;
               return this.event_run("on_load_finished");
             case 9:
-              return _context9.abrupt("return", true);
+              return _context11.abrupt("return", true);
             case 10:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee11, this);
       }))).apply(this, arguments);
     }
     /**
@@ -358,49 +416,49 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
   }, {
     key: "onSave",
     value: function onSave() {
-      return (_onSave = _onSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      return (_onSave = _onSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              _context10.next = 2;
+              _context12.next = 2;
               return this.event_run("on_save");
             case 2:
-              _context10.next = 4;
+              _context12.next = 4;
               return this.event_run("on_change", true);
             case 4:
-              _context10.next = 6;
+              _context12.next = 6;
               return Promise.resolve(true);
             case 6:
-              return _context10.abrupt("return", _context10.sent);
+              return _context12.abrupt("return", _context12.sent);
             case 7:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }))).apply(this, arguments);
     }
   }, {
     key: "onAfterSave",
     value: function onAfterSave() {
-      return (_onAfterSave = _onAfterSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+      return (_onAfterSave = _onAfterSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _context11.next = 2;
+              _context13.next = 2;
               return this.event_run("on_after_save");
             case 2:
-              _context11.next = 4;
+              _context13.next = 4;
               return this.event_run("on_save_finished");
             case 4:
-              _context11.next = 6;
+              _context13.next = 6;
               return Promise.resolve(true);
             case 6:
-              return _context11.abrupt("return", _context11.sent);
+              return _context13.abrupt("return", _context13.sent);
             case 7:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11, this);
+        }, _callee13, this);
       }))).apply(this, arguments);
     }
   }]);

package/dist/src/structs/SimpleObject.d.ts

@@ -191,7 +191,7 @@ export declare class SimpleObject extends MapableObject {
      * and its type
      * @param toObj
      */
-    setSaveResult(toObj: any, type?: saveResultType | "auto"): void;
+    setSaveResult(toObj: any, type?: saveResultType | "auto", registerErrors?: boolean): void;
     getSaveResult(original?: boolean): any;
     getSaveResultType(): saveResultType;
     static setTemp(obj: SimpleObject | any, key: string, value: any, sendChanges?: sendChangesType): Promise<void>;

package/dist/src/structs/SimpleObject.js

@@ -865,12 +865,17 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setTemp, _
      */
     function setSaveResult(toObj) {
       var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "auto";
+      var registerErrors = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       _classPrivateMethodGet(this, _setSaveResultObject, _setSaveResultObject2).call(this, toObj);
       //check if the given object is a valid save result
       if (type === "error") this.__saveResultIsSuccess = false;else this.__saveResultIsSuccess = Boolean(type === "nothing" || this.constructor["isResultValid"](toObj));
       if (type === "auto") {
         type = this.__saveResultIsSuccess ? "normal" : "error";
       }
+      if (registerErrors && !this.__saveResultIsSuccess) {
+        console.error("bad save result : ", this.__saveResultObject);
+        SimpleObject.addError(this, "save result is not valid", "the response from server was not valid", true);
+      }
       this.__saveResultType = type;
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.88",
+    "version": "1.4.90",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",