@wavemaker-ai/react-runtime 1.0.0-rc.309 → 1.0.0-rc.647469

package/higherOrder/BasePage.js

@@ -6,7 +6,7 @@ var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.withPageContext = exports["default"] = void 0;
+exports.withPageContext = exports.usePageReady = exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -35,7 +35,7 @@ var _formatters = _interopRequireDefault(require("../core/formatters"));
 var _AppContext2 = require("../context/AppContext");
 var _pageParamsUtil = require("../utils/page-params-util");
 var _AppSpinnerProvider = require("../context/AppSpinnerProvider");
-var _get = _interopRequireDefault(require("lodash-es/get"));
+var _get = _interopRequireDefault(require("lodash/get"));
 var _events = require("../core/constants/events");
 var _libErrorSkipper = require("../utils/lib-error-skipper");
 var _viewport = require("../store/viewport.service");
@@ -45,13 +45,51 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 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; }
 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; }
+/**
+ * Module-level Maps for page ready signaling.
+ * Each component is tracked by its componentName, preventing conflicts between
+ * pages, partials, and prefabs.
+ */
+var pageReadyCallbacks = new Map();
+var pageReadySignalled = new Set();
+/**
+ * Hook to signal that a page component has rendered and is ready.
+ * Call this at the top of your page component to trigger startup operations.
+ *
+ * This ensures widgets have mounted and subscribed before variables are invoked.
+ *
+ * @param componentName - The unique name of the component (e.g., "ChooseAPlansGrid")
+ *
+ * @example
+ * import { usePageReady } from '@wavemaker-ai/react-runtime/higherOrder/BasePage';
+ *
+ * const ChooseAPlansGridComponent = () => {
+ *   usePageReady("ChooseAPlansGrid"); // Signal ready on mount
+ *   return <WmPage>...</WmPage>;
+ * };
+ */
+var usePageReady = exports.usePageReady = function usePageReady(componentName) {
+  var signalledRef = (0, _react.useRef)(false);
+  (0, _react.useEffect)(function () {
+    if (!componentName || signalledRef.current) return;
+    signalledRef.current = true;
+    pageReadySignalled.add(componentName);
+
+    // Call callback if already registered (parent effect ran first)
+    var callback = pageReadyCallbacks.get(componentName);
+    if (callback) {
+      callback();
+    }
+    // Otherwise, the parent's effect will check pageReadySignalled and call handlePageReady
+  }, [componentName]);
+};
 var withPageContext = exports.withPageContext = function withPageContext(WrappedComponent, addPageScript, getVariables, componentInfo, prefabInfo) {
   var PageContextComponent = function PageContextComponent(props) {
-    var _useAppSpinner, _info$appConfig;
+    var _info$appConfig;
     var dispatch = (0, _store.useAppDispatch)();
-    var _ref = (_useAppSpinner = (0, _AppSpinnerProvider.useAppSpinner)()) !== null && _useAppSpinner !== void 0 ? _useAppSpinner : {},
-      show = _ref.show,
-      hide = _ref.hide;
+    var _useAppSpinner = (0, _AppSpinnerProvider.useAppSpinner)(),
+      show = _useAppSpinner.show,
+      hide = _useAppSpinner.hide;
     var i18n = (0, _store.useAppSelector)(function (state) {
       return state.i18n;
     });
@@ -124,9 +162,6 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     var _useState4 = (0, _react.useState)(false),
       isPageReady = _useState4[0],
       setIsPageReady = _useState4[1];
-    var pageReady = (0, _react.useCallback)(function () {
-      setIsPageReady(true);
-    }, []);
 
     // Initial page context state
     var _useState5 = (0, _react.useState)(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
@@ -142,7 +177,6 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         toaster: _toast.toastService,
         onContentReady: onContentReady,
         onChange: updateWidgetState,
-        pageReady: pageReady,
         App: {},
         eval: appContext === null || appContext === void 0 ? void 0 : appContext.eval,
         appLocale: (componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.appLocale) || i18n.appLocale || {},
@@ -157,8 +191,7 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         Viewport: _viewport.viewportService.getViewport(),
         formatMessage: _util.formatMessage,
         overriddenPropsRegistryRef: overriddenPropsRegistryRef.current,
-        layoutReady: layoutReady,
-        activePageName: componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentName
+        layoutReady: layoutReady
       })),
       pageContext = _useState5[0],
       setPageContext = _useState5[1];
@@ -199,11 +232,11 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
       var paramValues = (0, _pageParamsUtil.extractPartialParamValues)(props.params || [], props);
 
       // Update pageParams for each param key when prop values change
-      Object.entries(paramValues).forEach(function (_ref2) {
+      Object.entries(paramValues).forEach(function (_ref) {
         var _pageProxyRef$current;
-        var _ref3 = (0, _slicedToArray2["default"])(_ref2, 2),
-          key = _ref3[0],
-          newValue = _ref3[1];
+        var _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
+          key = _ref2[0],
+          newValue = _ref2[1];
         if (!(0, _isEqual["default"])((_pageProxyRef$current = pageProxyRef.current.pageParams) === null || _pageProxyRef$current === void 0 ? void 0 : _pageProxyRef$current[key], newValue)) {
           if (!pageProxyRef.current.pageParams) {
             pageProxyRef.current.pageParams = {};
@@ -295,7 +328,7 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
       // Set initialization flag
       isInitializingRef.current = true;
       var initializeComponent = /*#__PURE__*/function () {
-        var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var pageProxy, pageVariables, appVariables, APP_VARIABLES, _mergeVariablesAndAct, Variables, Actions, urlParams, newParams, localeFormats, _pageName;
           return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
@@ -347,7 +380,6 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
                   pageProxy.Variables = Variables;
                   pageProxy.Actions = Actions;
                   pageProxy.pageParams = _objectSpread({}, newParams);
-                  pageProxy.pageReady = pageReady;
                   pageProxy.App = _objectSpread(_objectSpread({}, appProxy), initialAppConfig);
                   pageProxy.selectedLocale = i18n.selectedLocale || "en";
                   pageProxy.overriddenPropsRegistry = overriddenPropsRegistryRef.current;
@@ -393,7 +425,7 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
           }, _callee);
         }));
         return function initializeComponent() {
-          return _ref4.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }();
       initializeComponent();
@@ -403,11 +435,11 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         var _overriddenPropsRegis;
         // Cancel all pending page operations
         if (pageProxyRef.current) {
-          var _ref5 = getVariables(pageProxyRef.current) || {},
-            _ref5$Variables = _ref5.Variables,
-            Variables = _ref5$Variables === void 0 ? {} : _ref5$Variables,
-            _ref5$Actions = _ref5.Actions,
-            Actions = _ref5$Actions === void 0 ? {} : _ref5$Actions;
+          var _ref4 = getVariables(pageProxyRef.current) || {},
+            _ref4$Variables = _ref4.Variables,
+            Variables = _ref4$Variables === void 0 ? {} : _ref4$Variables,
+            _ref4$Actions = _ref4.Actions,
+            Actions = _ref4$Actions === void 0 ? {} : _ref4$Actions;
 
           // Cancel page variables
           Object.values(Variables).forEach(function (variable) {
@@ -438,10 +470,10 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         // clearOverriddenProps();
 
         // Unsubscribe from events
-        subscriptionsRef.current.forEach(function (_ref6) {
-          var variable = _ref6.variable,
-            event = _ref6.event,
-            handler = _ref6.handler;
+        subscriptionsRef.current.forEach(function (_ref5) {
+          var variable = _ref5.variable,
+            event = _ref5.event,
+            handler = _ref5.handler;
           if (variable !== null && variable !== void 0 && variable.unsubscribe) {
             try {
               variable.unsubscribe(event, handler);
@@ -462,11 +494,11 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         return;
       }
       try {
-        var _ref7 = getVariables(pageProxyRef.current) || {
+        var _ref6 = getVariables(pageProxyRef.current) || {
             Variables: {}
           },
-          _ref7$Variables = _ref7.Variables,
-          pageVars = _ref7$Variables === void 0 ? {} : _ref7$Variables;
+          _ref6$Variables = _ref6.Variables,
+          pageVars = _ref6$Variables === void 0 ? {} : _ref6$Variables;
         var pageVarNames = new Set(Object.keys(pageVars || {}));
         subscribeAppVariablesIfNeeded(appContext.Variables || {}, pageVarNames);
         appVarSubscriptionsDoneRef.current = true;
@@ -529,10 +561,10 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
       };
 
       // Set up subscriptions (avoid duplicates by name)
-      Object.entries(variables).forEach(function (_ref8) {
-        var _ref9 = (0, _slicedToArray2["default"])(_ref8, 2),
-          name = _ref9[0],
-          variable = _ref9[1];
+      Object.entries(variables).forEach(function (_ref7) {
+        var _ref8 = (0, _slicedToArray2["default"])(_ref7, 2),
+          name = _ref8[0],
+          variable = _ref8[1];
         if (subscribedVariableNamesRef.current.has(name)) {
           return;
         }
@@ -556,10 +588,10 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     // Subscribe to app-level variables that are not shadowed by page variables
     var subscribeAppVariablesIfNeeded = function subscribeAppVariablesIfNeeded(appVars, pageVarNames) {
       var appVarsOnly = {};
-      Object.entries(appVars || {}).forEach(function (_ref0) {
-        var _ref1 = (0, _slicedToArray2["default"])(_ref0, 2),
-          name = _ref1[0],
-          variable = _ref1[1];
+      Object.entries(appVars || {}).forEach(function (_ref9) {
+        var _ref0 = (0, _slicedToArray2["default"])(_ref9, 2),
+          name = _ref0[0],
+          variable = _ref0[1];
         if (!pageVarNames.has(name) && !subscribedVariableNamesRef.current.has(name)) {
           appVarsOnly[name] = variable;
         }
@@ -571,12 +603,12 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
 
     // Execute startup operations
     var executeStartupOperations = /*#__PURE__*/function () {
-      var _ref10 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(Variables, Actions) {
-        var _ref11, _ref11$startUpActions, startUpActions, _ref11$startUpVariabl, startUpVariables, variablePromises;
+      var _ref1 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(Variables, Actions) {
+        var _ref10, _ref10$startUpActions, startUpActions, _ref10$startUpVariabl, startUpVariables, variablePromises;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _ref11 = componentInfo || {}, _ref11$startUpActions = _ref11.startUpActions, startUpActions = _ref11$startUpActions === void 0 ? [] : _ref11$startUpActions, _ref11$startUpVariabl = _ref11.startUpVariables, startUpVariables = _ref11$startUpVariabl === void 0 ? [] : _ref11$startUpVariabl; // Track startup operations
+              _ref10 = componentInfo || {}, _ref10$startUpActions = _ref10.startUpActions, startUpActions = _ref10$startUpActions === void 0 ? [] : _ref10$startUpActions, _ref10$startUpVariabl = _ref10.startUpVariables, startUpVariables = _ref10$startUpVariabl === void 0 ? [] : _ref10$startUpVariabl; // Track startup operations
               startUpVariables.forEach(function (name) {
                 return pendingStartupOpsRef.current.add(name);
               });
@@ -637,7 +669,7 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         }, _callee2, null, [[5, 15]]);
       }));
       return function executeStartupOperations(_x, _x2) {
-        return _ref10.apply(this, arguments);
+        return _ref1.apply(this, arguments);
       };
     }();
     function layoutReady() {
@@ -743,15 +775,12 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     (0, _react.useEffect)(function () {
       var newAppLocale = (0, _merge["default"])({}, i18n.appLocale || {}, (prefabInfo === null || prefabInfo === void 0 ? void 0 : prefabInfo.appLocale) || {});
       if (!(0, _isEqual["default"])(pageContext.appLocale, newAppLocale)) {
-        var _pageProxyRef$current3;
         setPageContext(function (prev) {
           return _objectSpread(_objectSpread({}, prev), {}, {
             appLocale: newAppLocale
           });
         });
-        if ((_pageProxyRef$current3 = pageProxyRef.current) !== null && _pageProxyRef$current3 !== void 0 && _pageProxyRef$current3.App) {
-          pageProxyRef.current.App.appLocale = newAppLocale;
-        }
+        pageProxyRef.current.App.appLocale = newAppLocale;
       }
     }, [i18n.appLocale]);
     (0, _react.useEffect)(function () {
@@ -772,6 +801,12 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         }
       }
     }, [i18n.dateFormat, i18n.timeFormat, i18n.currencyCode]);
+
+    // Callback for when page component signals it's ready
+    // This is called by usePageReady() hook in the page component
+    var handlePageReady = (0, _react.useCallback)(function () {
+      setIsPageReady(true);
+    }, []);
     var pageName = (appProxy === null || appProxy === void 0 ? void 0 : appProxy.activePageName) || "";
     (0, _react.useEffect)(function () {
       if ((componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentType) === "PARTIAL" && pageName) {
@@ -786,13 +821,30 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
       }
     }, [pageName]);
 
+    // Register the callback at module level so usePageReady() can call it
+    // Uses componentName as key to avoid conflicts between pages/partials/prefabs
+    var componentName = componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentName;
+    (0, _react.useEffect)(function () {
+      if (!componentName) return;
+      pageReadyCallbacks.set(componentName, handlePageReady);
+
+      // Check if child already signalled ready before this effect ran
+      if (pageReadySignalled.has(componentName)) {
+        handlePageReady();
+      }
+      return function () {
+        pageReadyCallbacks["delete"](componentName);
+        pageReadySignalled["delete"](componentName);
+      };
+    }, [componentName, handlePageReady]);
+
     // Execute startup when both conditions are met:
     // 1. Page is initialized (context ready)
-    // 2. Page component has called pageReady() after widgets have rendered and subscribed
+    // 2. Page component has signaled ready (widgets have rendered and subscribed)
     (0, _react.useEffect)(function () {
       if (isInitialized && isPageReady && isMountedRef.current && !onStartupCompletedRef.current && pageProxyRef.current) {
         var runStartup = /*#__PURE__*/function () {
-          var _ref12 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+          var _ref11 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var tabNameFromUrl, tabNameToSelect;
             return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
@@ -840,7 +892,7 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
             }, _callee3);
           }));
           return function runStartup() {
-            return _ref12.apply(this, arguments);
+            return _ref11.apply(this, arguments);
           };
         }();
         runStartup();
@@ -853,7 +905,6 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
       }
     }, [startupComplete, isLayoutReady]);
     (0, _react.useEffect)(function () {
-      isMountedRef.current = true;
       return function () {
         isMountedRef.current = false;
         // Cleanup viewport service when component unmounts
@@ -890,8 +941,8 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     if (pageContext.autoUpdateVariables && onStartupCompletedRef.current) {
       var pageVariables = pageContext.Variables;
       componentInfo === null || componentInfo === void 0 || componentInfo.autoUpdateVariables.forEach(function (value) {
-        var _pageVariables$value, _pageVariables$value$;
-        (_pageVariables$value = pageVariables[value]) === null || _pageVariables$value === void 0 || (_pageVariables$value$ = _pageVariables$value.invokeOnParamChange) === null || _pageVariables$value$ === void 0 || _pageVariables$value$.call(_pageVariables$value);
+        var _pageVariables$value, _pageVariables$value2;
+        ((_pageVariables$value = pageVariables[value]) === null || _pageVariables$value === void 0 ? void 0 : _pageVariables$value.invokeOnParamChange) && ((_pageVariables$value2 = pageVariables[value]) === null || _pageVariables$value2 === void 0 ? void 0 : _pageVariables$value2.invokeOnParamChange());
       });
     }
 

package/higherOrder/BasePrefab.js

@@ -36,8 +36,6 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
       partials = _ref.partials,
       componentType = _ref.componentType,
       rest = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
-    /** When preview passes `prefabname=""` for app-context metadata, keep bundle identity from codegen. */
-    var bundleId = prefabname || (componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentName) || "";
     var dispatch = (0, _store.useAppDispatch)();
     var appConfig = (0, _store.useAppSelector)(function (state) {
       return state.info.appConfig;
@@ -45,12 +43,9 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
     var i18n = (0, _store.useAppSelector)(function (state) {
       return state.i18n;
     });
-    var isServiceDefsLoading = (0, _react.useRef)(false);
-    // Cached payload from getPrefabDefinitions (stored under `info.prefabs[prefabName]`)
+    // Get prefab definitions from state if available
     var prefabDefinitions = (0, _store.useAppSelector)(function (state) {
-      var _state$info, _prefabs$prefabname;
-      var prefabs = (_state$info = state.info) === null || _state$info === void 0 ? void 0 : _state$info.prefabs;
-      return (_prefabs$prefabname = prefabs === null || prefabs === void 0 ? void 0 : prefabs[prefabname]) !== null && _prefabs$prefabname !== void 0 ? _prefabs$prefabname : null;
+      return state.info[prefabname] ? state.info[prefabname] : null;
     });
     var _useState = (0, _react.useState)(prefabDefinitions ? false : true),
       loading = _useState[0],
@@ -59,61 +54,6 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
       serviceDefs = _useState2[0],
       setServiceDefs = _useState2[1];
     var baseUrl = (appConfig === null || appConfig === void 0 ? void 0 : appConfig.url) || "";
-    var fetchServiceDefs = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var response;
-        return _regenerator["default"].wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (baseUrl) {
-                _context.next = 4;
-                break;
-              }
-              console.warn("Base URL is not available");
-              setLoading(false);
-              return _context.abrupt("return");
-            case 4:
-              _context.prev = 4;
-              isServiceDefsLoading.current = true;
-              // Dispatch Redux action to store in state
-              _context.next = 8;
-              return dispatch((0, _appConfigSlice.getPrefabDefinitions)({
-                prefabName: prefabname,
-                baseUrl: baseUrl,
-                pages: pages || []
-              })).unwrap();
-            case 8:
-              response = _context.sent;
-              setServiceDefs(response || {});
-              _metadata.metadataService.setMetadata((response === null || response === void 0 ? void 0 : response.serviceDefs) || {}, prefabname);
-              _appstore["default"].set("".concat(bundleId, "-partials"), {
-                partials: partials || []
-              });
-              // 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 = 14;
-              return _metadata.metadataService.load(prefabname, baseUrl);
-            case 14:
-              _context.next = 19;
-              break;
-            case 16:
-              _context.prev = 16;
-              _context.t0 = _context["catch"](4);
-              console.error("Failed to fetch service definitions:", _context.t0);
-            case 19:
-              _context.prev = 19;
-              setLoading(false);
-              return _context.finish(19);
-            case 22:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, null, [[4, 16, 19, 22]]);
-      }));
-      return function fetchServiceDefs() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
     // 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
@@ -122,12 +62,62 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
         setLoading(false);
         return;
       }
-      if (isServiceDefsLoading.current) {
-        return;
-      }
+      var fetchServiceDefs = /*#__PURE__*/function () {
+        var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var response;
+          return _regenerator["default"].wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (baseUrl) {
+                  _context.next = 4;
+                  break;
+                }
+                console.warn("Base URL is not available");
+                setLoading(false);
+                return _context.abrupt("return");
+              case 4:
+                _context.prev = 4;
+                _context.next = 7;
+                return dispatch((0, _appConfigSlice.getPrefabDefinitions)({
+                  prefabName: prefabname,
+                  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 || []
+                });
+                // 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 15:
+                _context.prev = 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, 15, 18, 21]]);
+        }));
+        return function fetchServiceDefs() {
+          return _ref2.apply(this, arguments);
+        };
+      }();
       fetchServiceDefs();
     }, [baseUrl, prefabname, dispatch, prefabDefinitions]);
-    if (prefabname == null) {
+    if (!prefabname) {
       return null;
     }
     if (loading) {
@@ -138,7 +128,7 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
         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[bundleId]) || {});
+    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]) || {});
     var FragmentConsumer = function FragmentConsumer(fragmentProps) {
       var combinedProps = _objectSpread(_objectSpread({}, props), fragmentProps);
       return __jsx(WrappedComponent, combinedProps);
@@ -147,13 +137,13 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
     // Apply BasePage HOC to our FragmentConsumer
     var EnhancedComponent = (0, _BasePage["default"])(FragmentConsumer, addPageScript, getVariables, // @ts-expect-error
     _objectSpread(_objectSpread({}, rest), {}, {
-      componentName: bundleId,
+      componentName: prefabname,
       componentType: componentType
     }), _objectSpread({
       serviceDefs: (serviceDefs === null || serviceDefs === void 0 ? void 0 : serviceDefs.serviceDefs) || {},
       appLocale: appLocale,
       prefab: true,
-      prefabName: bundleId,
+      prefabName: prefabname,
       name: props.name
     }, props.outbound));
     return __jsx(_react["default"].Fragment, null, __jsx(EnhancedComponent, props));

package/higherOrder/props.d.ts

@@ -41,7 +41,6 @@ export interface Props {
      * The proxy/viewParent for the widget.
      */
     viewParent?: any;
-    destroy?: ((names: string[]) => void) | ((formName?: string) => void);
     hint?: string;
     arialabel?: string;
     tabindex?: number;

package/higherOrder/withBaseWrapper.js

@@ -82,7 +82,7 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
       var mergedState = _objectSpread({}, props);
       var registry = pageContext === null || pageContext === void 0 ? void 0 : pageContext.overriddenPropsRegistry;
       var widgetDatavalue = widget.datavalue;
-      var datavalue = widgetDatavalue !== null && widgetDatavalue !== void 0 ? widgetDatavalue : props.datavalue;
+      var datavalue = props.datavalue !== undefined ? props.datavalue : widgetDatavalue;
       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 || "");
@@ -111,10 +111,11 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
           });
         }
       } 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), props !== null && props !== void 0 && props.formfield ? {
           datavalue: props.datavalue
-        } : {
-          datavalue: widgetDatavalue !== null && widgetDatavalue !== void 0 ? widgetDatavalue : props.datavalue
+        } : widgetDatavalue !== undefined && props.datavalue === undefined && {
+          datavalue: widgetDatavalue
         }), component === "WmFormField" && !props["value"] && {
           value: datavalue,
           datavalue: datavalue

package/hooks/useAccess.js

@@ -108,19 +108,6 @@ var useAccess = exports.useAccess = function useAccess(options) {
     // Don't check multiple times
     if (hasCheckedRef.current) return;
 
-    // Skip access check entirely when security is disabled
-    if (!isSecurityEnabled) {
-      var grantedState = {
-        hasAccess: true,
-        loading: false,
-        error: null
-      };
-      accessCache.set(cacheKey, grantedState);
-      setLocalState(grantedState);
-      hasCheckedRef.current = true;
-      return;
-    }
-
     // Check if we already have valid cached result
     var cached = accessCache.get(cacheKey);
     if (cached && !cached.loading) {

package/mui-config/theme.js

@@ -301,7 +301,10 @@ var theme = (0, _styles.createTheme)({
       styleOverrides: {
         root: {
           textDecoration: "none",
-          color: "inherit"
+          color: "inherit",
+          "&:hover": {
+            textDecoration: "none"
+          }
         }
       }
     },