@wavemaker/react-runtime 11.14.2-rc.6311 → 12.0.0-next.28533

package/variables/model-variable.js

@@ -7,20 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.ModelVariable = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lodashEs = require("lodash-es");
 var _baseVariable = require("./base-variable");
 var _variables = require("@wavemaker/variables");
-function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2["default"])(t); if (r) { var s = (0, _getPrototypeOf2["default"])(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2["default"])(this, e); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 var ModelVariable = exports.ModelVariable = /*#__PURE__*/function (_ModelVariable3) {
-  (0, _inherits2["default"])(ModelVariable, _ModelVariable3);
-  var _super = _createSuper(ModelVariable);
   function ModelVariable(config) {
     var _this;
     (0, _classCallCheck2["default"])(this, ModelVariable);
@@ -34,23 +34,30 @@ var ModelVariable = exports.ModelVariable = /*#__PURE__*/function (_ModelVariabl
       isList: config.isList,
       twoWayBinding: config.twoWayBinding
     };
-    _this = _super.call(this, variable);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "config", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "lastParams", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "dataSet", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "initialized", false);
+    _this = _callSuper(this, ModelVariable, [variable]);
+    (0, _defineProperty2["default"])(_this, "config", void 0);
+    (0, _defineProperty2["default"])(_this, "lastParams", void 0);
+    (0, _defineProperty2["default"])(_this, "dataSet", void 0);
+    (0, _defineProperty2["default"])(_this, "initialized", false);
     _this.config = config;
     _this.invoke();
     return _this;
   }
-  (0, _createClass2["default"])(ModelVariable, [{
+  (0, _inherits2["default"])(ModelVariable, _ModelVariable3);
+  return (0, _createClass2["default"])(ModelVariable, [{
     key: "invoke",
     value: function invoke(params, onSuccess, onError) {
       var result;
       try {
-        this.dataSet = this.config.paramProvider();
+        if (this.dataSet && this.config.paramProvider()) {
+          this.dataSet = _objectSpread(_objectSpread({}, this.config.paramProvider()), this.dataSet);
+        } else if (this.dataSet && Object.keys(this.dataSet).length !== 0) {
+          this.dataSet = _objectSpread({}, this.dataSet);
+        } else {
+          this.dataSet = this.config.paramProvider();
+        }
         this.notify(_baseVariable.VariableEvents.BEFORE_INVOKE, [this, this.dataSet]);
-        result = (0, _get2["default"])((0, _getPrototypeOf2["default"])(ModelVariable.prototype), "execute", this).call(this, params, function () {});
+        result = _superPropGet(ModelVariable, "execute", this, 3)([params, function () {}]);
         this.config.onSuccess && this.config.onSuccess(this, this.dataSet);
         onSuccess && onSuccess(this, this.dataSet);
         this.notify(_baseVariable.VariableEvents.SUCCESS, [this, this.dataSet]);
@@ -73,5 +80,4 @@ var ModelVariable = exports.ModelVariable = /*#__PURE__*/function (_ModelVariabl
       return Promise.resolve(this);
     }
   }]);
-  return ModelVariable;
 }(_variables.ModelVariable);

package/variables/service-variable.js

@@ -9,11 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _baseVariable = require("./base-variable");
 var _lodashEs = require("lodash-es");
@@ -22,18 +21,23 @@ var _variables = require("@wavemaker/variables");
 var _useHttp = require("@wavemaker/react-runtime/hooks/useHttp");
 var _formatUtil = require("../utils/format-util");
 var _eventNotifier = _interopRequireDefault(require("@wavemaker/react-runtime/core/event-notifier"));
-function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2["default"])(t); if (r) { var s = (0, _getPrototypeOf2["default"])(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2["default"])(this, e); }; }
+var _formatters = _interopRequireDefault(require("@wavemaker/react-runtime/core/formatters"));
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 var _ServiceVariableEvents = /*#__PURE__*/function (_ServiceVariableEvents) {
   _ServiceVariableEvents["BEFORE_INVOKE"] = "beforeInvoke";
   return _ServiceVariableEvents;
 }(_ServiceVariableEvents || {});
 var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceVariable3) {
-  (0, _inherits2["default"])(ServiceVariable, _ServiceVariable3);
-  var _super = _createSuper(ServiceVariable);
   function ServiceVariable(config) {
     var _this;
     (0, _classCallCheck2["default"])(this, ServiceVariable);
+    // Store context in httpService for global access
+    if (config._context) {
+      _useHttp.httpService.setContext(config._context);
+    }
+
     // Initialize with minimal configuration first
     var variableConfig = {
       name: config.name,
@@ -65,7 +69,9 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
       onError: function onError(context, args) {
         _this.notify(_baseVariable.VariableEvents.AFTER_INVOKE, [args.variable, args.data, args.options]);
         _this.notify(_baseVariable.VariableEvents.ERROR, [args.variable, args.data, args.options]);
-        _eventNotifier["default"].ROOT.notify("SERVICE_ERROR", [args.variable, args.data, args.options]);
+        if (args.data.includes("Violation")) {
+          _eventNotifier["default"].ROOT.notify("SERVICE_ERROR", [args.variable, args.data, args.options]);
+        }
         return config.onError && config.onError(args.variable, args.data, args.options);
       },
       onCanUpdate: function onCanUpdate(context, args) {
@@ -82,19 +88,24 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
         return config.onBeforeDatasetReady && config.onBeforeDatasetReady(args.variable, args.data, args.options);
       }
     };
-    _this = _super.call(this, variableConfig);
+    _this = _callSuper(this, ServiceVariable, [variableConfig]);
 
     // Set up event handlers
     _this.config = config;
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "cancelTokenSource", void 0);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "initialized", false);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "params", undefined);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "lastInvokedParams", undefined);
+    (0, _defineProperty2["default"])(_this, "cancelTokenSource", void 0);
+    (0, _defineProperty2["default"])(_this, "initialized", false);
+    (0, _defineProperty2["default"])(_this, "params", undefined);
+    (0, _defineProperty2["default"])(_this, "lastInvokedParams", undefined);
+    (0, _defineProperty2["default"])(_this, "dateFormatter", void 0);
+    (0, _defineProperty2["default"])(_this, "lastParams", undefined);
+    (0, _defineProperty2["default"])(_this, "lastParamProviderValues", undefined);
     _this.setupEventHandlers(config);
+    _this.dateFormatter = _formatters["default"].get("toDate");
     return _this;
   }
   // Method to update firstRecord and lastRecord from the current dataset
-  (0, _createClass2["default"])(ServiceVariable, [{
+  (0, _inherits2["default"])(ServiceVariable, _ServiceVariable3);
+  return (0, _createClass2["default"])(ServiceVariable, [{
     key: "updateFirstAndLastRecord",
     value: function updateFirstAndLastRecord(data) {
       try {
@@ -113,72 +124,50 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
         console.error("Error updating firstRecord and lastRecord:", error);
       }
     }
-  }, {
-    key: "initialize",
-    value: function () {
-      var _initialize = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return this.completeInitialization();
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function initialize() {
-        return _initialize.apply(this, arguments);
-      }
-      return initialize;
-    }()
   }, {
     key: "setupEventHandlers",
     value: function setupEventHandlers(config) {
       // Implementation for setting up event handlers
     }
-  }, {
-    key: "completeInitialization",
-    value: function () {
-      var _completeInitialization = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // Complete the initialization with actual data
-              this.dataSet = this.config.paramProvider();
-              this.serviceInfo = this.config.getServiceInfo();
-              this.init();
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function completeInitialization() {
-        return _completeInitialization.apply(this, arguments);
-      }
-      return completeInitialization;
-    }()
   }, {
     key: "invokeOnParamChange",
     value: function () {
-      var _invokeOnParamChange = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var _invokeOnParamChange = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var _this2 = this;
-        var latest, last;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        var currentParams, currentParamProvider, currentDataBinding, paramsChanged, paramProviderChanged, latest, last;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
-              latest = (0, _lodashEs.merge)({}, this.config.paramProvider(), this.params || {}, this.dataBinding);
+              // Get current values from all sources
+              currentParams = this.params || {};
+              currentParamProvider = this.config.paramProvider() || {};
+              currentDataBinding = this.dataBinding || {}; // Detect what CHANGED since last invocation
+              paramsChanged = !(0, _lodashEs.isEqual)(this.lastParams, currentParams);
+              paramProviderChanged = !(0, _lodashEs.isEqual)(this.lastParamProviderValues, currentParamProvider); // Smart merge based on what actually changed:
+              if (paramsChanged && !paramProviderChanged) {
+                // Only script/params changed → params should win
+                latest = (0, _lodashEs.merge)({}, currentParamProvider, currentDataBinding, currentParams);
+              } else if (paramProviderChanged && !paramsChanged) {
+                // Only UI/paramProvider changed → paramProvider should win
+                latest = (0, _lodashEs.merge)({}, currentParams, currentDataBinding, currentParamProvider);
+              } else if (paramsChanged && paramProviderChanged) {
+                // Both changed → params wins (script is more intentional than UI)
+                latest = (0, _lodashEs.merge)({}, currentParamProvider, currentDataBinding, currentParams);
+              } else {
+                // Neither changed (first call) → params wins by default
+                latest = (0, _lodashEs.merge)({}, currentParamProvider, currentDataBinding, currentParams);
+              }
               last = this.lastInvokedParams || {};
               if (!(!(0, _lodashEs.isEqual)(last, latest) && latest !== undefined && !(0, _lodashEs.isEmpty)(latest))) {
-                _context3.next = 12;
+                _context.next = 21;
                 break;
               }
-              // Update lastInvokedParams to reflect the merged values
+              // Update all tracking values
               this.lastInvokedParams = (0, _common.deepCopy)({}, latest);
-              _context3.prev = 4;
-              _context3.next = 7;
+              this.lastParams = (0, _common.deepCopy)({}, currentParams);
+              this.lastParamProviderValues = (0, _common.deepCopy)({}, currentParamProvider);
+              _context.prev = 11;
+              _context.next = 14;
               return new Promise(function (resolve, reject) {
                 _this2.invoke(latest, function (data) {
                   return resolve(data);
@@ -186,20 +175,27 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
                   return reject(error);
                 });
               });
-            case 7:
-              _context3.next = 12;
+            case 14:
+              _context.next = 19;
               break;
-            case 9:
-              _context3.prev = 9;
-              _context3.t0 = _context3["catch"](4);
-              console.error("Error in invokeOnParamChange:", _context3.t0);
-            case 12:
-              return _context3.abrupt("return", this);
-            case 13:
+            case 16:
+              _context.prev = 16;
+              _context.t0 = _context["catch"](11);
+              console.error("Error in invokeOnParamChange:", _context.t0);
+            case 19:
+              _context.next = 23;
+              break;
+            case 21:
+              // Even if not invoking, update tracking to detect future changes
+              this.lastParams = (0, _common.deepCopy)({}, currentParams);
+              this.lastParamProviderValues = (0, _common.deepCopy)({}, currentParamProvider);
+            case 23:
+              return _context.abrupt("return", this);
+            case 24:
             case "end":
-              return _context3.stop();
+              return _context.stop();
           }
-        }, _callee3, this, [[4, 9]]);
+        }, _callee, this, [[11, 16]]);
       }));
       function invokeOnParamChange() {
         return _invokeOnParamChange.apply(this, arguments);
@@ -209,11 +205,11 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
   }, {
     key: "doNext",
     value: function () {
-      var _doNext = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      var _doNext = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this3 = this;
         var page;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               page = 0;
               if ((0, _lodashEs.isString)(this.pagination.page)) {
@@ -221,7 +217,7 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
               } else {
                 page = this.pagination.page + 1;
               }
-              return _context4.abrupt("return", new Promise(function (resolve, reject) {
+              return _context2.abrupt("return", new Promise(function (resolve, reject) {
                 _this3.invoke({
                   page: page
                 }, function (dataset) {
@@ -230,9 +226,9 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
               }));
             case 3:
             case "end":
-              return _context4.stop();
+              return _context2.stop();
           }
-        }, _callee4, this);
+        }, _callee2, this);
       }));
       function doNext() {
         return _doNext.apply(this, arguments);
@@ -254,13 +250,23 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
       }
       options = options || {};
       options.inputFields = this.params;
+      this.lastInvokedParams = this.params;
 
+      // Normalize orderBy option
+      if (!options.orderBy) {
+        var cfg = this.config;
+        var defaultOrder = (cfg === null || cfg === void 0 ? void 0 : cfg.orderBy) || (cfg === null || cfg === void 0 ? void 0 : cfg.orderby) || this.orderBy || this.orderby;
+        if (defaultOrder) {
+          var norm = String(defaultOrder);
+          options.orderBy = norm.includes(":") ? norm.replace(/:/g, " ") : norm;
+        }
+      }
       // Get the latest service definition
       this.serviceInfo = this.config.getServiceInfo();
       if (!this.serviceInfo) {
         console.error("Service Info is missing for (".concat(this.name, ") variable."));
       }
-      return (0, _get2["default"])((0, _getPrototypeOf2["default"])(ServiceVariable.prototype), "invoke", this).call(this, options, onSuccess, onError);
+      return _superPropGet(ServiceVariable, "invoke", this, 3)([options, onSuccess, onError]);
     }
   }, {
     key: "setInput",
@@ -269,7 +275,6 @@ var ServiceVariable = exports.ServiceVariable = /*#__PURE__*/function (_ServiceV
       return this.params;
     }
   }]);
-  return ServiceVariable;
 }(_variables.ServiceVariable);
 var _setInput = exports._setInput = function _setInput(targetObj, key, val, options) {
   targetObj = targetObj || {};