@wavemaker-ai/react-runtime 1.0.0-rc.326 → 1.0.0-rc.328

package/higherOrder/BasePage.js

@@ -52,7 +52,6 @@ import {
 } from "../core/script-registry";
 import formatters from "../core/formatters";
 import { useAppProxy } from "../context/AppContext";
-import { syncLocaleMessages } from "../core/util";
 import {
   computeMergedPageParams,
   computePartialParamKey,
@@ -67,7 +66,7 @@ import { viewportService } from "../store/viewport.service";
 import { formatMessage } from "../core/util";
 const withPageContext = (WrappedComponent, addPageScript, getVariables, componentInfo, prefabInfo) => {
   const PageContextComponent = (props) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c;
     const dispatch = useAppDispatch();
     const { show, hide } = (_a = useAppSpinner()) != null ? _a : {};
     const i18n = useAppSelector((state) => state.i18n);
@@ -147,8 +146,7 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
         date: i18n.dateFormat,
         time: i18n.timeFormat,
         currency: i18n.currencyCode
-      },
-      i18n
+      }
     }, prefabInfo), props), componentInfo), {
       executeStartup,
       formatters,
@@ -312,9 +310,7 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
           if (!appProxy.appLocale) {
             appProxy.appLocale = {};
           }
-          if (!syncLocaleMessages(appProxy.appLocale, mergedAppLocale)) {
-            appProxy.appLocale = __spreadValues({}, mergedAppLocale);
-          }
+          appProxy.appLocale = __spreadValues({}, mergedAppLocale);
           const localeFormats = {
             date: i18n.dateFormat,
             time: i18n.timeFormat,
@@ -579,72 +575,37 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
       if (isLocaleSwitch && pageProxyRef.current) {
         pageProxyRef.current.Widgets = {};
       }
-      setPageContext((prev) => {
-        if (prev.selectedLocale === i18n.selectedLocale) {
-          return prev;
-        }
-        return __spreadValues(__spreadProps(__spreadValues({}, prev), {
-          selectedLocale: i18n.selectedLocale
-        }), isLocaleSwitch && { Widgets: {} });
-      });
-    }, [i18n.selectedLocale]);
-    const applyLocaleToProxies = useCallback(
-      (newAppLocale) => {
-        var _a2;
-        if (appProxy) {
-          if (!appProxy.appLocale) {
-            appProxy.appLocale = {};
-          }
-          if (!syncLocaleMessages(appProxy.appLocale, newAppLocale)) {
-            appProxy.appLocale = __spreadValues({}, newAppLocale);
-          }
-        }
-        if (pageProxyRef.current) {
-          if (!pageProxyRef.current.appLocale) {
-            pageProxyRef.current.appLocale = {};
-          }
-          if (!syncLocaleMessages(pageProxyRef.current.appLocale, newAppLocale)) {
-            pageProxyRef.current.appLocale = __spreadValues({}, newAppLocale);
-          }
-          if (pageProxyRef.current.App) {
-            pageProxyRef.current.App.appLocale = (_a2 = appProxy == null ? void 0 : appProxy.appLocale) != null ? _a2 : newAppLocale;
-          }
-        }
-      },
-      [appProxy == null ? void 0 : appProxy.appLocale]
-    );
-    if (isInitialized && pageProxyRef.current && ((_c = i18n.localeRevision) != null ? _c : 0) !== lastSyncedLocaleRevisionRef.current) {
-      const isLocaleChange = lastSyncedLocaleRevisionRef.current >= 0;
-      lastSyncedLocaleRevisionRef.current = (_d = i18n.localeRevision) != null ? _d : 0;
-      applyLocaleToProxies(i18n.appLocale);
-      if (isLocaleChange && (componentInfo == null ? void 0 : componentInfo.componentType) === "PAGE") {
-        addPageScript(appProxy, pageProxyRef.current);
-      }
-    }
-    useEffect(() => {
       const newAppLocale = merge({}, i18n.appLocale || {}, (prefabInfo == null ? void 0 : prefabInfo.appLocale) || {});
-      if (!isEqual(pageContext.appLocale, newAppLocale)) {
-        setPageContext((prev) => __spreadProps(__spreadValues({}, prev), {
-          appLocale: newAppLocale
-        }));
-      }
-    }, [i18n.appLocale]);
-    useEffect(() => {
       const localeFormats = {
         date: i18n.dateFormat,
         time: i18n.timeFormat,
         currency: i18n.currencyCode
       };
-      setPageContext((prev) => __spreadProps(__spreadValues({}, prev), {
-        localeFormats
-      }));
       if (pageProxyRef.current) {
+        const appLocaleChanged = !isEqual(pageProxyRef.current.appLocale, newAppLocale);
+        if (appLocaleChanged) {
+          appProxy.appLocale = newAppLocale;
+          pageProxyRef.current.appLocale = newAppLocale;
+          pageProxyRef.current.App.appLocale = newAppLocale;
+        }
         pageProxyRef.current.localeFormats = localeFormats;
         if (pageProxyRef.current.App) {
           pageProxyRef.current.App.localeFormats = localeFormats;
         }
       }
-    }, [i18n.dateFormat, i18n.timeFormat, i18n.currencyCode]);
+      setPageContext((prev) => {
+        const appLocaleChanged = !isEqual(prev.appLocale, newAppLocale);
+        if (prev.selectedLocale === i18n.selectedLocale && !appLocaleChanged) {
+          return __spreadProps(__spreadValues({}, prev), { localeFormats });
+        }
+        return __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, prev), {
+          selectedLocale: i18n.selectedLocale
+        }), isLocaleSwitch && { Widgets: {} }), {
+          appLocale: newAppLocale,
+          localeFormats
+        });
+      });
+    }, [i18n.selectedLocale, i18n.appLocale, i18n.dateFormat, i18n.timeFormat, i18n.currencyCode]);
     const pageName = (appProxy == null ? void 0 : appProxy.activePageName) || "";
     useEffect(() => {
       if ((componentInfo == null ? void 0 : componentInfo.componentType) === "PARTIAL" && pageName) {
@@ -702,14 +663,14 @@ const withPageContext = (WrappedComponent, addPageScript, getVariables, componen
         ((_a2 = appVariables[value]) == null ? void 0 : _a2.invokeOnParamChange) && ((_b2 = appVariables[value]) == null ? void 0 : _b2.invokeOnParamChange());
       });
     }
-    if (((_e = componentInfo == null ? void 0 : componentInfo.autoUpdateVariables) == null ? void 0 : _e.length) && onStartupCompletedRef.current) {
+    if (((_c = componentInfo == null ? void 0 : componentInfo.autoUpdateVariables) == null ? void 0 : _c.length) && onStartupCompletedRef.current) {
       const pageVariables = pageContext.Variables;
       componentInfo.autoUpdateVariables.forEach((value) => {
         var _a2, _b2;
         (_b2 = (_a2 = pageVariables[value]) == null ? void 0 : _a2.invokeOnParamChange) == null ? void 0 : _b2.call(_a2);
       });
     }
-    return /* @__PURE__ */ jsx(WidgetProvider, { value: { value: pageContext, proxy: pageProxyRef.current }, children: /* @__PURE__ */ jsx(WrappedComponent, __spreadValues({}, props), `locale-${(_f = i18n.localeRevision) != null ? _f : 0}`) });
+    return /* @__PURE__ */ jsx(WidgetProvider, { value: { value: pageContext, proxy: pageProxyRef.current }, children: /* @__PURE__ */ jsx(WrappedComponent, __spreadValues({}, props)) });
   };
   PageContextComponent.displayName = `WithPageContext(${WrappedComponent.displayName || WrappedComponent.name || "Component"})`;
   return PageContextComponent;

package/higherOrder/DataNav.js

@@ -419,13 +419,16 @@ const withDatasetAwareNavigation = (WrappedComponent) => {
       if (!navNodes || navNodes.length === 0) {
         return navNodes;
       }
+      if (!itemid && !binditemid.current) {
+        return navNodes;
+      }
       const currentRouteId = getCurrentRouteId();
       if (!currentRouteId) {
         return [];
       }
       const breadcrumbPath = findPathToNode(navNodes, currentRouteId);
       return breadcrumbPath.length > 0 ? breadcrumbPath : [];
-    }, [navNodes]);
+    }, [navNodes, itemid]);
     return /* @__PURE__ */ jsx(
       WrappedComponent,
       __spreadProps(__spreadValues({}, props), {

package/hooks/useHttp.js

@@ -157,7 +157,7 @@ class ModernHttpService {
     );
   }
   async send(options, variable) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const serviceInfo = variable.serviceInfo;
     let headers = new AxiosHeaders(options.headers);
     let requestBody = options.data;
@@ -178,8 +178,10 @@ class ModernHttpService {
       url = variable.config.baseUrl + options.url.replace("./", "/");
     } else if (url === (serviceInfo == null ? void 0 : serviceInfo.directPath) && options.url.startsWith("http")) {
       url = options.url;
+    } else if (variable.config.baseUrl.includes("/services") && ((_b = options.url) == null ? void 0 : _b.includes("/services"))) {
+      url = variable.config.baseUrl + ((_c = options.url.replace("./services", "")) == null ? void 0 : _c.replace("./", "/"));
     } else {
-      url = variable.config.baseUrl + ((_b = options.url.replace("./services", "")) == null ? void 0 : _b.replace("./", "/"));
+      url = variable.config.baseUrl + ((_d = options.url) == null ? void 0 : _d.replace("./", "/"));
     }
     if (!options.isDirectCall) {
       headers = headers.set("X-Requested-With", "XMLHttpRequest");

package/hooks/useLayoutSize.js

@@ -3,7 +3,7 @@ import { layoutSizeUtil } from "../utils/layoutsize-util";
 function useLayoutSize(ref, layoutWidth, layoutHeight) {
   useLayoutEffect(() => {
     if (ref.current && (layoutWidth || layoutHeight)) {
-      layoutSizeUtil(ref.current, layoutWidth, layoutHeight);
+      layoutSizeUtil(ref.current, layoutWidth == null ? void 0 : layoutWidth.trim(), layoutHeight == null ? void 0 : layoutHeight.trim());
     }
   }, [layoutWidth, layoutHeight]);
 }