@azrico/webobject 1.4.91 → 1.4.92

package/dist/src/WebObjects/WebObject.d.ts

@@ -81,6 +81,7 @@ export declare class WebObject extends SimpleObject {
     static get_webname(): string;
     onDelete(...p: any): Promise<any>;
     onArchive(...p: any): Promise<any>;
+    onUnArchive(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;
     onSave(...p: any): Promise<any>;
     onAfterSave(...p: any): Promise<any>;

package/dist/src/WebObjects/WebObject.js

@@ -34,7 +34,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Delete, _Archive, _UnArchive, _get_deltaObject, _onDelete, _onArchive, _onLoad, _onSave, _onAfterSave, _onNew, _saveList, _get_single, _get_list) {
+var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Delete, _Archive, _UnArchive, _get_deltaObject, _onDelete, _onArchive, _onUnArchive, _onLoad, _onSave, _onAfterSave, _onNew, _saveList, _get_single, _get_list) {
   _inherits(WebObject, _SimpleObject);
   var _super = _createSuper(WebObject);
   function WebObject() {
@@ -536,7 +536,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              this.isArchived = true;
+              if (this.isSaved) this.isArchived = true;
               for (_len2 = _args10.length, p = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
                 p[_key2] = _args10[_key2];
               }
@@ -552,9 +552,9 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
       }))).apply(this, arguments);
     }
   }, {
-    key: "onLoad",
-    value: function onLoad() {
-      return (_onLoad = _onLoad || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+    key: "onUnArchive",
+    value: function onUnArchive() {
+      return (_onUnArchive = _onUnArchive || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var _this$manager3;
         var _len3,
           p,
@@ -563,12 +563,12 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              this.isDeleted = false;
+              if (this.isSaved) this.isArchived = false;
               for (_len3 = _args11.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 p[_key3] = _args11[_key3];
               }
               _context11.next = 4;
-              return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.onLoad.apply(_this$manager3, p);
+              return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.onUnArchive.apply(_this$manager3, p);
             case 4:
               return _context11.abrupt("return", _context11.sent);
             case 5:
@@ -579,75 +579,102 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
       }))).apply(this, arguments);
     }
   }, {
-    key: "onSave",
-    value: function onSave() {
-      return (_onSave = _onSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var _this$manager5;
-        var srObject,
-          _this$manager4,
-          _len4,
+    key: "onLoad",
+    value: function onLoad() {
+      return (_onLoad = _onLoad || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var _this$manager4;
+        var _len4,
           p,
           _key4,
           _args12 = arguments;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              this.isDeleted = false;
+              for (_len4 = _args12.length, p = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+                p[_key4] = _args12[_key4];
+              }
+              _context12.next = 4;
+              return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onLoad.apply(_this$manager4, p);
+            case 4:
+              return _context12.abrupt("return", _context12.sent);
+            case 5:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12, this);
+      }))).apply(this, arguments);
+    }
+  }, {
+    key: "onSave",
+    value: function onSave() {
+      return (_onSave = _onSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        var _this$manager6;
+        var srObject,
+          _this$manager5,
+          _len5,
+          p,
+          _key5,
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               if (!this.isSaved) {
-                _context12.next = 7;
+                _context13.next = 7;
                 break;
               }
               this.apply_changes();
               srObject = this.getSaveResult(true);
               if (!this.saveResultHasID(srObject)) {
-                _context12.next = 7;
+                _context13.next = 7;
                 break;
               }
               /* -------------------------------------------------------------------------- */
               WebObject.LoadIdsFromSaveResult(this, srObject);
-              _context12.next = 7;
-              return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.event_run("on_id_change");
+              _context13.next = 7;
+              return (_this$manager5 = this.manager) === null || _this$manager5 === void 0 ? void 0 : _this$manager5.event_run("on_id_change");
             case 7:
-              for (_len4 = _args12.length, p = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-                p[_key4] = _args12[_key4];
+              for (_len5 = _args13.length, p = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+                p[_key5] = _args13[_key5];
               }
-              _context12.next = 10;
-              return (_this$manager5 = this.manager) === null || _this$manager5 === void 0 ? void 0 : _this$manager5.onSave.apply(_this$manager5, p);
+              _context13.next = 10;
+              return (_this$manager6 = this.manager) === null || _this$manager6 === void 0 ? void 0 : _this$manager6.onSave.apply(_this$manager6, p);
             case 10:
-              _context12.next = 12;
+              _context13.next = 12;
               return this.onAfterSave();
             case 12:
-              return _context12.abrupt("return", true);
+              return _context13.abrupt("return", true);
             case 13:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }))).apply(this, arguments);
     }
   }, {
     key: "onAfterSave",
     value: function onAfterSave() {
-      return (_onAfterSave = _onAfterSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        var _this$manager6;
-        var _len5,
+      return (_onAfterSave = _onAfterSave || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        var _this$manager7;
+        var _len6,
           p,
-          _key5,
-          _args13 = arguments;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+          _key6,
+          _args14 = arguments;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              for (_len5 = _args13.length, p = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-                p[_key5] = _args13[_key5];
+              for (_len6 = _args14.length, p = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+                p[_key6] = _args14[_key6];
               }
-              _context13.next = 3;
-              return (_this$manager6 = this.manager) === null || _this$manager6 === void 0 ? void 0 : _this$manager6.onAfterSave.apply(_this$manager6, p);
+              _context14.next = 3;
+              return (_this$manager7 = this.manager) === null || _this$manager7 === void 0 ? void 0 : _this$manager7.onAfterSave.apply(_this$manager7, p);
             case 3:
-              return _context13.abrupt("return", true);
+              return _context14.abrupt("return", true);
             case 4:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }))).apply(this, arguments);
     }
   }, {
@@ -668,27 +695,27 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
   }, {
     key: "onNew",
     value: function onNew() {
-      return (_onNew = _onNew || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this$manager7;
-        var _len6,
+      return (_onNew = _onNew || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+        var _this$manager8;
+        var _len7,
           p,
-          _key6,
-          _args14 = arguments;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+          _key7,
+          _args15 = arguments;
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              for (_len6 = _args14.length, p = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
-                p[_key6] = _args14[_key6];
+              for (_len7 = _args15.length, p = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
+                p[_key7] = _args15[_key7];
               }
-              _context14.next = 3;
-              return (_this$manager7 = this.manager) === null || _this$manager7 === void 0 ? void 0 : _this$manager7.onNew.apply(_this$manager7, p);
+              _context15.next = 3;
+              return (_this$manager8 = this.manager) === null || _this$manager8 === void 0 ? void 0 : _this$manager8.onNew.apply(_this$manager8, p);
             case 3:
-              return _context14.abrupt("return", _context14.sent);
+              return _context15.abrupt("return", _context15.sent);
             case 4:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, this);
+        }, _callee15, this);
       }))).apply(this, arguments);
     } /* -------------------------------------------------------------------------- */
   }, {
@@ -735,7 +762,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
   }, {
     key: "saveList",
     value: function saveList(_x6) {
-      return (_saveList = _saveList || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(itemList) {
+      return (_saveList = _saveList || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(itemList) {
         var _extraOptions$chunksi;
         var extraOptions,
           chunks,
@@ -752,11 +779,11 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
           _item,
           _index2,
           _item2,
-          _args15 = arguments;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+          _args16 = arguments;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              extraOptions = _args15.length > 1 && _args15[1] !== undefined ? _args15[1] : {};
+              extraOptions = _args16.length > 1 && _args16[1] !== undefined ? _args16[1] : {};
               if (!extraOptions) extraOptions = {};
               chunks = (0, _object.array_chunks)(itemList, (_extraOptions$chunksi = extraOptions.chunksize) !== null && _extraOptions$chunksi !== void 0 ? _extraOptions$chunksi : 50);
               delete extraOptions.chunksize;
@@ -764,7 +791,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
               index = 0;
             case 6:
               if (!(index < chunks.length)) {
-                _context15.next = 36;
+                _context16.next = 36;
                 break;
               }
               items_to_save = chunks[index];
@@ -772,81 +799,81 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
               k = 0;
             case 10:
               if (!(k < items_to_save.length)) {
-                _context15.next = 19;
+                _context16.next = 19;
                 break;
               }
               item = items_to_save[k];
-              _context15.next = 14;
+              _context16.next = 14;
               return item.get_deltaObject();
             case 14:
-              dlt = _context15.sent;
+              dlt = _context16.sent;
               save_array.push(item.isNew ? _objectSpread({}, dlt) : _objectSpread({
                 _id: item.getID()
               }, dlt));
             case 16:
               k++;
-              _context15.next = 10;
+              _context16.next = 10;
               break;
             case 19:
-              _context15.next = 21;
+              _context16.next = 21;
               return _global.gfunc.run_action("post", putAddress, _objectSpread({
                 __save_list: WebObject.zipSaveList(save_array)
               }, extraOptions));
             case 21:
-              resultObject = _context15.sent;
+              resultObject = _context16.sent;
               if (!Array.isArray(resultObject)) {
-                _context15.next = 33;
+                _context16.next = 33;
                 break;
               }
               _index = 0;
             case 24:
               if (!(_index < Math.min(resultObject.length, items_to_save.length))) {
-                _context15.next = 33;
+                _context16.next = 33;
                 break;
               }
               res = resultObject[_index];
               _item = items_to_save[_index];
               _item.setSaveResult(res);
-              _context15.next = 30;
+              _context16.next = 30;
               return _item.onSave();
             case 30:
               _index++;
-              _context15.next = 24;
+              _context16.next = 24;
               break;
             case 33:
               index++;
-              _context15.next = 6;
+              _context16.next = 6;
               break;
             case 36:
               _index2 = 0;
             case 37:
               if (!(_index2 < itemList.length)) {
-                _context15.next = 46;
+                _context16.next = 46;
                 break;
               }
               _item2 = itemList[_index2];
               if (_item2.isSaved) {
-                _context15.next = 41;
+                _context16.next = 41;
                 break;
               }
-              return _context15.abrupt("return", false);
+              return _context16.abrupt("return", false);
             case 41:
               if (!(_item2.getSaveResultType() != "normal")) {
-                _context15.next = 43;
+                _context16.next = 43;
                 break;
               }
-              return _context15.abrupt("return", false);
+              return _context16.abrupt("return", false);
             case 43:
               _index2++;
-              _context15.next = 37;
+              _context16.next = 37;
               break;
             case 46:
-              return _context15.abrupt("return", true);
+              return _context16.abrupt("return", true);
             case 47:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }))).apply(this, arguments);
     }
   }, {
@@ -892,64 +919,64 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
   }, {
     key: "get_single",
     value: function get_single() {
-      return (_get_single = _get_single || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        var _len7,
+      return (_get_single = _get_single || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var _len8,
           p,
-          _key7,
+          _key8,
           search,
           readonly,
           fetchID,
           res,
           params,
-          _args16 = arguments;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+          _args17 = arguments;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              for (_len7 = _args16.length, p = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
-                p[_key7] = _args16[_key7];
+              for (_len8 = _args17.length, p = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
+                p[_key8] = _args17[_key8];
               }
               search = p.shift();
               readonly = p.shift();
               fetchID = p.shift();
               if (!(0, _object.object_isEmpty)(search)) {
-                _context16.next = 6;
+                _context17.next = 6;
                 break;
               }
-              return _context16.abrupt("return", undefined);
+              return _context17.abrupt("return", undefined);
             case 6:
               params = {};
               params.context = readonly ? "view" : "edit";
-              _context16.t0 = _typeof(search);
-              _context16.next = _context16.t0 === "string" ? 11 : _context16.t0 === "number" ? 11 : _context16.t0 === "object" ? 19 : 19;
+              _context17.t0 = _typeof(search);
+              _context17.next = _context17.t0 === "string" ? 11 : _context17.t0 === "number" ? 11 : _context17.t0 === "object" ? 19 : 19;
               break;
             case 11:
               search = String(search);
-              _context16.t1 = this;
-              _context16.t2 = this;
-              _context16.next = 16;
+              _context17.t1 = this;
+              _context17.t2 = this;
+              _context17.next = 16;
               return _global.gfunc.run_action("get", this.__web_path + "/" + search, params, {
                 fetchID: fetchID
               });
             case 16:
-              _context16.t3 = _context16.sent;
-              res = _context16.t1.ensure.call(_context16.t1, _context16.t2, _context16.t3);
-              return _context16.abrupt("break", 25);
+              _context17.t3 = _context17.sent;
+              res = _context17.t1.ensure.call(_context17.t1, _context17.t2, _context17.t3);
+              return _context17.abrupt("break", 25);
             case 19:
-              _context16.t4 = _object.object_first;
-              _context16.next = 22;
+              _context17.t4 = _object.object_first;
+              _context17.next = 22;
               return this.get_list(search, readonly, fetchID);
             case 22:
-              _context16.t5 = _context16.sent;
-              res = (0, _context16.t4)(_context16.t5);
-              return _context16.abrupt("break", 25);
+              _context17.t5 = _context17.sent;
+              res = (0, _context17.t4)(_context17.t5);
+              return _context17.abrupt("break", 25);
             case 25:
               WebObject.setReadonly(res, readonly);
-              return _context16.abrupt("return", res);
+              return _context17.abrupt("return", res);
             case 27:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }))).apply(this, arguments);
     }
     /**
@@ -959,42 +986,42 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
   }, {
     key: "get_list",
     value: function get_list() {
-      return (_get_list = _get_list || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        var _len8,
+      return (_get_list = _get_list || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        var _len9,
           p,
-          _key8,
+          _key9,
           search,
           readonly,
           fetchID,
           result_items,
           selftype,
           res,
-          _args17 = arguments;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+          _args18 = arguments;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              for (_len8 = _args17.length, p = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
-                p[_key8] = _args17[_key8];
+              for (_len9 = _args18.length, p = new Array(_len9), _key9 = 0; _key9 < _len9; _key9++) {
+                p[_key9] = _args18[_key9];
               }
               search = p.shift();
               readonly = p.shift();
               fetchID = p.shift();
               if (!search) search = {};
-              _context17.next = 7;
+              _context18.next = 7;
               return _global.gfunc.run_action("get", this.__web_path, search, {
                 fetchID: fetchID
               });
             case 7:
-              result_items = _context17.sent;
+              result_items = _context18.sent;
               selftype = this.prototype;
               res = WebObject.map_rowindex(WebObject.mapto(selftype, result_items, readonly));
               WebObject.setReadonly(res, readonly);
-              return _context17.abrupt("return", res);
+              return _context18.abrupt("return", res);
             case 12:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }))).apply(this, arguments);
     }
   }]);

package/dist/src/WebObjects/WebObjectManager.js

@@ -355,7 +355,7 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              if (this.obj) {
+              if (this.obj && this.isSaved) {
                 this.obj.isArchived = true;
               }
               _context10.next = 3;
@@ -379,7 +379,7 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              if (this.obj) {
+              if (this.obj && this.isSaved) {
                 this.obj.isArchived = false;
               }
               _context11.next = 3;

package/package.json

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