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

package/higherOrder/BasePartial.js

@@ -107,7 +107,7 @@ var BasePartial = exports.BasePartial = function BasePartial(WrappedComponent, a
       return __jsx(WrappedComponent, combinedProps);
     };
 
-    // Apply BaseFragment HOC to our FragmentConsumer
+    // Apply BasePage HOC to our FragmentConsumer
     var EnhancedComponent = (0, _BasePage["default"])(FragmentConsumer, addPageScript, getVariables, componentInfo, {
       serviceDefs: serviceDefs,
       appLocale: appLocale,

package/higherOrder/BasePrefab.js

@@ -18,6 +18,8 @@ var _appstore = _interopRequireDefault(require("@wavemaker/react-runtime/core/ap
 var _appConfigSlice = require("@wavemaker/react-runtime/store/slices/appConfigSlice");
 var _PrefabContext = _interopRequireDefault(require("@wavemaker/react-runtime/context/PrefabContext"));
 var _spinner = require("../components/basic/spinner");
+var _withBaseWrapper = _interopRequireDefault(require("./withBaseWrapper"));
+var _metadata = require("@wavemaker/react-runtime/variables/metadata.service");
 var _excluded = ["pages", "partials", "componentType"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
@@ -50,11 +52,12 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
     var _useState2 = (0, _react.useState)(prefabDefinitions || {}),
       serviceDefs = _useState2[0],
       setServiceDefs = _useState2[1];
-    var baseUrl = appConfig !== null && appConfig !== void 0 && appConfig.url ? "".concat(appConfig.url, "/services/prefabs/").concat(prefabname, "/servicedefs") : "";
+    var baseUrl = (appConfig === null || appConfig === void 0 ? void 0 : appConfig.url) || "";
     // Fetch service definitions when component mounts only if not already in state
     (0, _react.useEffect)(function () {
       // Skip fetching if we already have the definitions in state
       if (prefabDefinitions || !baseUrl) {
+        _metadata.metadataService.setMetadata(prefabDefinitions || {}, prefabname);
         setLoading(false);
         return;
       }
@@ -76,30 +79,36 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
                 _context.next = 7;
                 return dispatch((0, _appConfigSlice.getPrefabDefinitions)({
                   prefabName: prefabname,
-                  baseUrl: appConfig.url || "",
+                  baseUrl: baseUrl,
                   pages: pages || []
                 })).unwrap();
               case 7:
                 response = _context.sent;
                 setServiceDefs(response || {});
+                _metadata.metadataService.setMetadata((response === null || response === void 0 ? void 0 : response.serviceDefs) || {}, prefabname);
                 _appstore["default"].set("".concat(prefabname, "-partials"), {
                   partials: partials || []
                 });
-                _context.next = 15;
+                // Call metadata service's load method to set metadata with correct base URL
+                // This is equivalent to Angular's this.$metadata.load(prefabName)
+                _context.next = 13;
+                return _metadata.metadataService.load(prefabname, baseUrl);
+              case 13:
+                _context.next = 18;
                 break;
-              case 12:
-                _context.prev = 12;
-                _context.t0 = _context["catch"](4);
-                console.error("Failed to fetch service definitions:", _context.t0);
               case 15:
                 _context.prev = 15;
-                setLoading(false);
-                return _context.finish(15);
+                _context.t0 = _context["catch"](4);
+                console.error("Failed to fetch service definitions:", _context.t0);
               case 18:
+                _context.prev = 18;
+                setLoading(false);
+                return _context.finish(18);
+              case 21:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[4, 12, 15, 18]]);
+          }, _callee, null, [[4, 15, 18, 21]]);
         }));
         return function fetchServiceDefs() {
           return _ref2.apply(this, arguments);
@@ -113,7 +122,9 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
     if (loading) {
       return __jsx(_spinner.WmSpinner, {
         show: true,
-        className: "baseprefab-spinner"
+        className: "baseprefab-spinner",
+        name: "baseprefab-spinner",
+        listener: {}
       });
     }
     var appLocale = (0, _merge["default"])({}, (i18n === null || i18n === void 0 ? void 0 : i18n.appLocale) || {}, (i18n === null || i18n === void 0 || (_i18n$prefabMessages = i18n.prefabMessages) === null || _i18n$prefabMessages === void 0 ? void 0 : _i18n$prefabMessages[prefabname]) || {});
@@ -139,15 +150,22 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
   });
   BasePrefabWrapper.displayName = "BasePrefabWrapper";
   var BasePrefabWithProvider = function BasePrefabWithProvider(props) {
-    return __jsx(_PrefabContext["default"], {
+    var _props$formArrayIndex;
+    return __jsx("div", {
+      hidden: props.hidden
+    }, __jsx(_PrefabContext["default"], {
       value: {
         inbound: props.inbound || {},
         outbound: props.outbound || {},
-        prefabName: props.name
+        prefabName: props.name,
+        parentForm: props.parentForm,
+        isParentList: props.isParentList,
+        formArrayIndex: (_props$formArrayIndex = props.formArrayIndex) !== null && _props$formArrayIndex !== void 0 ? _props$formArrayIndex : -1,
+        parentListName: props.parentListName
       }
-    }, __jsx(BasePrefabWrapper, props));
+    }, __jsx(BasePrefabWrapper, props)));
   };
   BasePrefabWithProvider.displayName = "BasePrefabWithProvider";
-  return BasePrefabWithProvider;
+  return (0, _withBaseWrapper["default"])(BasePrefabWithProvider);
 };
 var _default = exports["default"] = BasePrefab;

package/higherOrder/DataNav.js

@@ -7,13 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleNavigation = exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = require("lodash");
 var _withBaseWrapper = require("@wavemaker/react-runtime/higherOrder/withBaseWrapper");
-var _excluded = ["dataset", "itemicon", "itemlabel", "itemhint", "itemlink", "itemtarget", "itembadge", "itemchildren", "itemaction", "itemclass", "itemid", "isactive", "userrole", "orderby", "datafield", "displayfield", "listener", "styles", "className"];
+var _excluded = ["itemicon", "itemlabel", "itemhint", "itemlink", "itemtarget", "itembadge", "itemchildren", "itemaction", "itemclass", "itemid", "isactive", "userrole", "orderby", "datafield", "displayfield", "listener", "styles", "className"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -25,7 +26,7 @@ var getValidLink = function getValidLink(link) {
   if (routRegex.test(link)) {
     var match = link.match(/[\w]+.*/);
     if (match) {
-      link = "#/".concat(match[0]);
+      link = "".concat(match[0]);
     }
   } else if (link.startsWith("www.")) {
     link = "//".concat(link);
@@ -35,9 +36,6 @@ var getValidLink = function getValidLink(link) {
 var getElement = function getElement(obj, key) {
   return obj && obj[key];
 };
-var isDefined = function isDefined(value) {
-  return value !== undefined;
-};
 var validateAccessRoles = function validateAccessRoles(roles, userRoles) {
   if (!roles || typeof roles !== "string") return true;
   var roleList = roles.split(",").map(function (role) {
@@ -82,19 +80,19 @@ var getCurrentRouteId = function getCurrentRouteId() {
   var segments = path.split("/");
   return segments[segments.length - 1] || "Main";
 };
-var findPathToNode = function findPathToNode(nodes, targetId) {
+var _findPathToNode = function findPathToNode(nodes, targetId) {
   var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var _iterator = _createForOfIteratorHelper(nodes),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _node$link, _node$children;
+      var _node$children;
       var node = _step.value;
-      if (node.id === targetId || (_node$link = node.link) !== null && _node$link !== void 0 && _node$link.includes(targetId)) {
+      if (node.id === targetId) {
         return [].concat((0, _toConsumableArray2["default"])(path), [node]);
       }
       if ((_node$children = node.children) !== null && _node$children !== void 0 && _node$children.length) {
-        var foundPath = findPathToNode(node.children, targetId, [].concat((0, _toConsumableArray2["default"])(path), [node]));
+        var foundPath = _findPathToNode(node.children, targetId, [].concat((0, _toConsumableArray2["default"])(path), [node]));
         if (foundPath.length) {
           return foundPath;
         }
@@ -107,6 +105,61 @@ var findPathToNode = function findPathToNode(nodes, targetId) {
   }
   return [];
 };
+var _findNodeById = function findNodeById(data, targetId) {
+  var itemIdField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "id";
+  var _iterator2 = _createForOfIteratorHelper(data),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var item = _step2.value;
+      if (item && (0, _typeof2["default"])(item) === "object") {
+        // Check if current item matches the target id
+        if (item[itemIdField] === targetId) {
+          return true;
+        }
+        // Recursively check children
+        if (Array.isArray(item.children) && item.children.length > 0) {
+          if (_findNodeById(item.children, targetId, itemIdField)) {
+            return true;
+          }
+        }
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return false;
+};
+
+// Helper function to find the correct array from array of arrays based on current route
+var findMatchingDataset = function findMatchingDataset(data, currentRouteId) {
+  var itemIdField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "id";
+  if (!Array.isArray(data) || data.length === 0) {
+    return data || [];
+  }
+
+  // If the first element is not an array, return as is
+  if (!Array.isArray(data[0])) {
+    return data;
+  }
+
+  // It's an array of arrays - search through each array
+  for (var i = 0; i < data.length; i++) {
+    var arrayItem = data[i];
+
+    // Flatten the array item to get all objects regardless of nesting using lodash
+    var flattenedArray = (0, _lodash.flattenDeep)([arrayItem]);
+    if (flattenedArray.length > 0 && _findNodeById(flattenedArray, currentRouteId, itemIdField)) {
+      return flattenedArray;
+    }
+  }
+
+  // If no match found, flatten and return the first array as fallback
+  var fallbackArray = (0, _lodash.flattenDeep)([data[0]]);
+  return fallbackArray.length > 0 ? fallbackArray : data;
+};
 var handleNavigation = exports.handleNavigation = function handleNavigation(item, event) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var onBeforenavigate = options.onBeforenavigate,
@@ -136,8 +189,7 @@ var handleNavigation = exports.handleNavigation = function handleNavigation(item
 var withDatasetAwareNavigation = function withDatasetAwareNavigation(WrappedComponent) {
   var NavigationWrappedComponent = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var _listener$appConfig, _securityService$logg;
-    var dataset = props.dataset,
-      itemicon = props.itemicon,
+    var itemicon = props.itemicon,
       itemlabel = props.itemlabel,
       itemhint = props.itemhint,
       itemlink = props.itemlink,
@@ -156,6 +208,17 @@ var withDatasetAwareNavigation = function withDatasetAwareNavigation(WrappedComp
       styles = props.styles,
       className = props.className,
       restProps = (0, _objectWithoutProperties2["default"])(props, _excluded);
+    var dataset = (0, _react.useMemo)(function () {
+      var data = typeof props.dataset === "function" ? props.dataset() : props.dataset;
+
+      // Handle array of arrays by finding the correct array based on current route
+      if (Array.isArray(data) && data.length > 0 && Array.isArray(data[0])) {
+        var currentRouteId = getCurrentRouteId();
+        var itemIdField = itemid || "id";
+        data = findMatchingDataset(data, currentRouteId, itemIdField);
+      }
+      return data || [];
+    }, [props.dataset, itemid]);
     var _useState = (0, _react.useState)([]),
       navNodes = _useState[0],
       setNavNodes = _useState[1];
@@ -220,7 +283,7 @@ var withDatasetAwareNavigation = function withDatasetAwareNavigation(WrappedComp
         roleField: userrole || "role"
       };
     };
-    var getNode = function getNode(fields, node) {
+    var _getNode = function getNode(fields, node) {
       var context = {};
 
       // Handle different node structures
@@ -234,7 +297,7 @@ var withDatasetAwareNavigation = function withDatasetAwareNavigation(WrappedComp
       } else if ((0, _typeof2["default"])(node) === "object") {
         var childrenData = getElement(node, fields.childrenField);
         var children = Array.isArray(childrenData) ? childrenData.map(function (child) {
-          return getNode(fields, child);
+          return _getNode(fields, child);
         }) : [];
         processedNode = {
           action: getEvaluatedData(node, {
@@ -352,7 +415,7 @@ var withDatasetAwareNavigation = function withDatasetAwareNavigation(WrappedComp
         var nodeFields = _itemFieldMap.current;
         nodes = nodes.reduce(function (result, node) {
           if (validateAccessRoles(getElement(node, nodeFields.roleField), userRoles)) {
-            result.push(getNode(nodeFields, node));
+            result.push(_getNode(nodeFields, node));
           }
           return result;
         }, []);
@@ -364,9 +427,29 @@ var withDatasetAwareNavigation = function withDatasetAwareNavigation(WrappedComp
       var newNodes = getNodes();
       setNavNodes(newNodes);
     };
+
+    // Check if the wrapped component is a breadcrumb component
+    // Filter navNodes for breadcrumb components to show only path to current page
+    var filteredNavNodes = (0, _react.useMemo)(function () {
+      if (!navNodes || navNodes.length === 0) {
+        return navNodes;
+      }
+      var currentRouteId = getCurrentRouteId();
+
+      // If no route ID, return empty
+      if (!currentRouteId) {
+        return [];
+      }
+
+      // Find the path to the current page
+      var breadcrumbPath = _findPathToNode(navNodes, currentRouteId);
+
+      // Return the path if found, otherwise return empty
+      return breadcrumbPath.length > 0 ? breadcrumbPath : [];
+    }, [navNodes]);
     return __jsx(WrappedComponent, (0, _extends2["default"])({}, props, {
       ref: ref,
-      navNodes: navNodes,
+      navNodes: filteredNavNodes,
       resetNavNodes: resetNodes,
       handleNavigation: handleNavigation
     }));

package/higherOrder/helper.js

@@ -38,6 +38,11 @@ var BaseAppInitialState = exports.BaseAppInitialState = {
 };
 function importModule(moduleName) {
   if (moduleName === "moment") {
+    var locale = (0, _util.getTimezone)();
+    var guessedTz = locale || _momentTimezone["default"].tz && typeof _momentTimezone["default"].tz.guess === "function" && _momentTimezone["default"].tz.guess() || typeof Intl !== "undefined" && Intl.DateTimeFormat && Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
+    if (_momentTimezone["default"].tz && typeof _momentTimezone["default"].tz.setDefault === "function") {
+      _momentTimezone["default"].tz.setDefault(guessedTz);
+    }
     return _momentTimezone["default"];
   }
 }

package/higherOrder/withBaseWrapper.js

@@ -16,8 +16,7 @@ var _isEqual = _interopRequireDefault(require("lodash-es/isEqual"));
 var _useDeviceVisibility2 = require("@wavemaker/react-runtime/hooks/useDeviceVisibility");
 var _WidgetProvider = require("@wavemaker/react-runtime/context/WidgetProvider");
 var _styleUtils = require("@wavemaker/react-runtime/utils/style-utils");
-var _scriptRegistry = require("@wavemaker/react-runtime/core/script-registry");
-var _excluded = ["show", "name", "deferload"];
+var _excluded = ["show", "deferload"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
 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; }
@@ -27,18 +26,17 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
     var _pageContext$Widgets, _mergedProps$show, _mergedProps$show2;
     var _props$show = props.show,
       show = _props$show === void 0 ? true : _props$show,
-      name = props.name,
-      _props$deferload = props.deferload,
-      deferload = _props$deferload === void 0 ? true : _props$deferload,
+      deferload = props.deferload,
       rest = (0, _objectWithoutProperties2["default"])(props, _excluded);
+    var name = props["item-id"] || props.name;
+    var _usePageContext = (0, _WidgetProvider.usePageContext)(),
+      pageContext = _usePageContext.pageContext,
+      updateWidgetState = _usePageContext.updateWidgetState,
+      destroy = _usePageContext.destroy;
 
     // All hooks must be called before any early returns
     var _useDeviceVisibility = (0, _useDeviceVisibility2.useDeviceVisibility)(props.showindevice || ["all"]),
       isHidden = _useDeviceVisibility.isHidden;
-    var _usePageContext = (0, _WidgetProvider.usePageContext)(),
-      pageContext = _usePageContext.pageContext,
-      updateWidgetState = _usePageContext.updateWidgetState,
-      cleanup = _usePageContext.cleanup;
 
     // Extract widget-id from component props
     var componentWidgetId = (0, _react.useMemo)(function () {
@@ -74,32 +72,45 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
       // OR if no widget-id filtering is needed (backward compatibility)
       var shouldMergeFromContext = !componentWidgetId || !contextWidgetId || componentWidgetId === contextWidgetId;
       var mergedState = _objectSpread({}, props);
+      var registry = pageContext === null || pageContext === void 0 ? void 0 : pageContext.overriddenPropsRegistry;
       var datavalue = (_props$datavalue = props.datavalue) !== null && _props$datavalue !== void 0 ? _props$datavalue : widget.datavalue;
-      if (shouldMergeFromContext && (0, _scriptRegistry.isWidgetOverridden)(name, componentWidgetId)) {
-        // Apply widget-id specific overridden properties from the registry
-        var widgetOverrides = (0, _scriptRegistry.getWidgetOverrides)(name, componentWidgetId);
-        Object.keys(widgetOverrides).forEach(function (key) {
-          mergedState[key] = widgetOverrides[key];
-        });
 
-        // Then handle other widget properties that are not overridden
-        Object.keys(widget).forEach(function (key) {
-          if (!(0, _scriptRegistry.isPropOverridden)(name, key, componentWidgetId)) {
-            mergedState[key] = props[key];
-          }
-        });
+      // need to check it's causing other issues
+      // if (props.field) {
+      //   if (props.field && props.formName !== widget.formName) {
+      //     return props;
+      //   }
+      // }
+      if (shouldMergeFromContext && registry !== null && registry !== void 0 && registry.isWidgetOverridden(name, componentWidgetId) && !props.formfield) {
+        // Apply widget-id specific overridden properties from the registry
+        var widgetOverrides = registry === null || registry === void 0 ? void 0 : registry.getWidgetOverrides(name, componentWidgetId || "");
+        if (widgetOverrides) {
+          Object.keys(widgetOverrides).forEach(function (key) {
+            mergedState[key] = widgetOverrides[key];
+            if (props.prefab && key !== "inbound" && key !== "outbound" && key !== "show") {
+              var updatedInbound = _objectSpread(_objectSpread({}, props.inbound), {}, (0, _defineProperty2["default"])({}, key, widgetOverrides[key]));
+              mergedState.inbound = updatedInbound;
+            }
+          });
+
+          // Then handle other widget properties that are not overridden
+          Object.keys(widget).forEach(function (key) {
+            var isPropOverriddenCheck = registry === null || registry === void 0 ? void 0 : registry.isPropOverridden(name, key, componentWidgetId || "");
+            if (!isPropOverriddenCheck) {
+              mergedState[key] = props[key];
+            }
+          });
+        }
       } else if (shouldMergeFromContext) {
         // For regular widgets (no widget-id or matching widget-id), merge with component props taking precedence
-        mergedState = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, widget), props), WrappedComponent.displayName === "WmFormField" && !props.value ? {
-          value: datavalue
-        } : {}), {}, {
+        mergedState = _objectSpread(_objectSpread(_objectSpread({}, widget), props), WrappedComponent.displayName === "WmFormField" && !props.value && {
+          value: datavalue,
           datavalue: datavalue
         });
       } else {
         // Widget-id mismatch: component stays independent with only its own props
-        mergedState = _objectSpread(_objectSpread(_objectSpread({}, props), WrappedComponent.displayName === "WmFormField" && !props.value ? {
-          value: datavalue
-        } : {}), {}, {
+        mergedState = _objectSpread(_objectSpread({}, props), WrappedComponent.displayName === "WmFormField" && !props.value && {
+          value: datavalue,
           datavalue: datavalue
         });
       }
@@ -168,11 +179,13 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
       deferload: deferload.toString()
     }, {
       show: mergedProps === null || mergedProps === void 0 || (_mergedProps$show2 = mergedProps.show) === null || _mergedProps$show2 === void 0 ? void 0 : _mergedProps$show2.toString(),
-      name: name,
+      name: props.name,
       className: computedClassName,
       styles: computedStyles
     }, (props === null || props === void 0 ? void 0 : props.dataset) && {
       dataset: props === null || props === void 0 ? void 0 : props.dataset
+    }, {
+      destroy: destroy
     }));
   };
   WithBaseComponent.displayName = "WithBase(".concat(WrappedComponent.displayName || WrappedComponent.name || "Component", ")");

package/hooks/useAuth.js

@@ -12,6 +12,7 @@ var _react = require("react");
 var _store = require("../store");
 var _authSlice = require("@wavemaker/react-runtime/store/slices/authSlice");
 var _includes = _interopRequireDefault(require("lodash-es/includes"));
+var _appConfigSlice = require("../store/slices/appConfigSlice");
 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; }
 var useAuth = exports.useAuth = function useAuth() {
@@ -133,16 +134,21 @@ var useAuth = exports.useAuth = function useAuth() {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (baseURL) {
-              _context4.next = 2;
+              _context4.next = 6;
               break;
             }
-            return _context4.abrupt("return", Promise.resolve({}));
-          case 2:
+            dispatch((0, _authSlice.setPageLoading)(true));
             _context4.next = 4;
-            return dispatch((0, _authSlice.loadSecurityInfo)(baseURL)).unwrap();
+            return dispatch((0, _appConfigSlice.getServiceDefinitions)(baseURL)).unwrap();
           case 4:
+            dispatch((0, _authSlice.setPageLoading)(false));
+            return _context4.abrupt("return", Promise.resolve({}));
+          case 6:
+            _context4.next = 8;
+            return dispatch((0, _authSlice.loadSecurityInfo)(baseURL)).unwrap();
+          case 8:
             return _context4.abrupt("return", _context4.sent);
-          case 5:
+          case 9:
           case "end":
             return _context4.stop();
         }