@ramesesinc/platform-core 0.1.5 → 0.1.6

package/dist/components/index.d.ts

@@ -29,7 +29,7 @@ export { default as Refresh } from "./action/Refresh";
 export { default as SaveData } from "./action/SaveData";
 export { default as SelectData } from "./action/SelectData";
 export { default as LookupPage } from "./action/LookupPage";
-export { default as UpdateContext } from "./action/UpdateContext";
+export { default as UpdateState } from "./action/UpdateState";
 export { default as ViewBackPage } from "./action/ViewBackPage";
 export { default as ViewPage } from "./action/ViewPage";
 export { default as PageView } from "./view/PageView";

package/dist/components/index.js

@@ -35,7 +35,7 @@ export { default as Refresh } from "./action/Refresh";
 export { default as SaveData } from "./action/SaveData";
 export { default as SelectData } from "./action/SelectData";
 export { default as LookupPage } from "./action/LookupPage";
-export { default as UpdateContext } from "./action/UpdateContext";
+export { default as UpdateState } from "./action/UpdateState";
 export { default as ViewBackPage } from "./action/ViewBackPage";
 export { default as ViewPage } from "./action/ViewPage";
 export { default as PageView } from "./view/PageView";

package/dist/components/index.ts

@@ -41,7 +41,7 @@ export { default as SaveData } from "./action/SaveData";
 export { default as SelectData } from "./action/SelectData";
 
 export { default as LookupPage } from "./action/LookupPage";
-export { default as UpdateContext } from "./action/UpdateContext";
+export { default as UpdateState } from "./action/UpdateState";
 export { default as ViewBackPage } from "./action/ViewBackPage";
 export { default as ViewPage } from "./action/ViewPage";
 export { default as PageView } from "./view/PageView";

package/dist/core/PageCache.js

@@ -5,10 +5,23 @@ import React from "react";
 import { DynamicTemplate } from "./DynamicTemplate";
 // Simple in-memory cache
 const cache = {};
+const getPlatformInfo = async () => {
+    const platform = await localAPI.getPlatform();
+    const { multi_tenant, tenant_name } = platform !== null && platform !== void 0 ? platform : {};
+    return { multi_tenant, tenant_name };
+};
 export const getPage = async (name, fallback) => {
-    const { getTenant: tenant, getModule: module } = fallback;
+    let { getTenant: tenant, getModule: module } = fallback;
     const key = `${module}/${name}`; // ✅ unique per module
     if (!cache[key]) {
+        if (tenant == null || tenant.trim() === "") {
+            // get tenant from platform/info API  
+            const platform = await localAPI.getPlatform();
+            const { multi_tenant, tenant_name } = platform !== null && platform !== void 0 ? platform : {};
+            if (String(multi_tenant) === "false") {
+                tenant = tenant_name !== null && tenant_name !== void 0 ? tenant_name : "";
+            }
+        }
         const pageInfo = await localAPI.useMgmt(tenant, module).get("pages", name);
         if (!pageInfo) {
             return { template: _jsxs("div", { className: "text-red-500 p-2 border border-red-500", children: ["Page \"", name, "\" not found."] }), pageInfo: null };

package/dist/core/PageContext.js

@@ -2,7 +2,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useBinding } from "@ramesesinc/client";
 import { localAPI } from "@ramesesinc/lib/local-api";
-import { createContext, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { createContext, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { parseHashUrl } from "../lib/utils/PageUtils";
 import { useApp } from "./AppContext";
 import { DataBindingProvider } from "./DataContext";
@@ -39,18 +39,30 @@ export const PageProvider = ({ handle, children }) => {
     const pageView = usePageViewContext();
     const binding = useBinding();
     // setup the selectedPath from the handle
-    useMemo(() => {
+    // useMemo(() => {
+    useLayoutEffect(() => {
         const path = handle === null || handle === void 0 ? void 0 : handle.getSelectedPath();
-        binding.set("selectedPage", path);
-        return path;
-    }, [handle]);
+        if (binding && typeof binding.set === "function") {
+            binding.set("selectedPage", path);
+        }
+        else {
+            console.warn("binding.set is not available, skipping selectedPage setup");
+        }
+        // return path;
+    }, [handle, binding]);
     // for DEV purposes only
-    useMemo(() => {
+    // useMemo(() => {
+    useLayoutEffect(() => {
         const dependHandler = () => {
             // console.log("selectedPage changed => ", binding.get("selectedPage"));
         };
-        binding.dependsTo("selectedPage", dependHandler);
-    }, []);
+        if (binding && typeof binding.dependsTo === "function") {
+            binding.dependsTo("selectedPage", dependHandler);
+        }
+        else {
+            console.warn("binding.dependsTo is not available, skipping dependency setup");
+        }
+    }, [binding]);
     const dataApiHandler = useRef(null);
     const { tenant, module } = useApp();
     const providerRef = {
@@ -90,14 +102,31 @@ export const PageProvider = ({ handle, children }) => {
     };
     /* ------------------ Data ------------------ */
     const getData = () => {
-        return binding.getData();
+        if (binding && typeof binding.getData === "function") {
+            return binding.getData();
+        }
+        else {
+            console.warn("binding.getData is not available, returning {}");
+            return {};
+        }
     };
     const setData = (value, mode) => {
-        binding.setData(value, mode !== null && mode !== void 0 ? mode : "read");
+        if (binding && typeof binding.setData === "function") {
+            binding.setData(value, mode !== null && mode !== void 0 ? mode : "read");
+        }
+        else {
+            console.warn("binding.setData is not available, skipping data set");
+        }
     };
     /* ------------------ Reactive deps ------------------ */
     const dependsTo = (name, callback) => {
-        return binding.dependsTo(name, callback);
+        if (binding && typeof binding.dependsTo === "function") {
+            return binding.dependsTo(name, callback);
+        }
+        else {
+            console.warn("binding.dependsTo is not available, returning no-op function");
+            return () => { };
+        }
     };
     const notifyDepends = (name) => {
         binding.notifyDepends(name);
@@ -110,19 +139,41 @@ export const PageProvider = ({ handle, children }) => {
     /* ------------------ Internal props setter ------------------ */
     const set = (name, value) => {
         if (name === "data") {
-            binding.setData(value);
+            if (binding && typeof binding.setData === "function") {
+                binding.setData(value);
+            }
+            else {
+                console.warn("binding.setData is not available, skipping data set");
+            }
         }
         else {
-            binding.set(name, value);
+            if (binding && typeof binding.set === "function") {
+                binding.set(name, value);
+            }
+            else {
+                console.warn("binding.set is not available, skipping set:", name, value);
+            }
         }
     };
     const get = (name) => {
         if (name === "data") {
-            return binding.getData();
+            if (binding && typeof binding.getData === "function") {
+                return binding.getData();
+            }
+            else {
+                console.warn("binding.getData is not available, returning {}");
+                return {};
+            }
+        }
+        if (binding && typeof binding.get === "function") {
+            const val = binding.get(name);
+            // console.log("page context get", name, val, binding.getData());
+            return val;
+        }
+        else {
+            console.warn("binding.get is not available, returning undefined for:", name);
+            return undefined;
         }
-        const val = binding.get(name);
-        // console.log("page context get", name, val, binding.getData());
-        return val;
     };
     const buildParams = (inputParams, queryParams) => {
         return inputParams;
@@ -144,10 +195,21 @@ export const PageProvider = ({ handle, children }) => {
         return result;
     };
     const setPageParams = (params) => {
-        binding.set("pageParams", params);
+        if (binding && typeof binding.set === "function") {
+            binding.set("pageParams", params);
+        }
+        else {
+            console.warn("binding.set is not available, skipping pageParams set");
+        }
     };
     const getPageParams = () => {
-        return binding.get("pageParams");
+        if (binding && typeof binding.get === "function") {
+            return binding.get("pageParams");
+        }
+        else {
+            console.warn("binding.get is not available, returning {} for pageParams");
+            return {};
+        }
     };
     /* ------------------ Context value ------------------ */
     const values = {
@@ -170,7 +232,7 @@ export const PageProvider = ({ handle, children }) => {
         getMgmt,
         postMgmt,
         getAllData: () => {
-            const allData = Object.assign(Object.assign({}, binding.getUiData()), { data: binding.getData(), pageParams: getPageParams() });
+            const allData = Object.assign(Object.assign({}, (binding && typeof binding.getUiData === "function" ? binding.getUiData() : {})), { data: binding && typeof binding.getData === "function" ? binding.getData() : {}, pageParams: getPageParams() });
             return allData;
         },
         setPageParams,

package/dist/core/PageViewContext.js

@@ -187,7 +187,7 @@ export const PageViewProvider = ({ paths, handle, children, prefix = "page", eve
     };
     const popPage = () => {
         var _a, _b, _c;
-        // console.log("popPage (pageChain)", uuid, prefix, pageChain);
+        // console.log("popPage (pageChain)", uuid, prefix, JSON.stringify(pageChain));
         const { previous: prevChain } = pageChain;
         if (prevChain == null) {
             return;
@@ -205,15 +205,25 @@ export const PageViewProvider = ({ paths, handle, children, prefix = "page", eve
             const idx = newPath.lastIndexOf("/");
             if (idx >= 0) {
                 newPath = path.substring(idx + 1);
+                // newPath = newPath.substring(idx + 1);
             }
             page = newPath;
-            // console.log("popPage 1.1", uuid, page);
+            // console.log("popPage 1.3", uuid, page);
         }
         else {
             const [, ...anchors] = path.split("#");
             page = (_b = anchors.at(-1)) !== null && _b !== void 0 ? _b : "";
+            // console.log("popPage 1.4", uuid, "page:", page, "path:", path);
             if (page === "") {
-                page = path;
+                // page = path;
+                const withoutHash = path.split("#")[0];
+                const idx = withoutHash.lastIndexOf("/");
+                if (idx >= 0) {
+                    page = withoutHash.substring(idx + 1);
+                }
+                else {
+                    page = path;
+                }
             }
         }
         const newPageChain = Object.assign({}, prevChain);
@@ -221,6 +231,7 @@ export const PageViewProvider = ({ paths, handle, children, prefix = "page", eve
         if (!standalone) {
             history.pushState(null, "", path);
         }
+        // console.log("popPage 2", uuid, page);
         (_c = handleRef.current) === null || _c === void 0 ? void 0 : _c.renderPage(page);
     };
     const hasBackPage = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramesesinc/platform-core",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Platform Core Library",
   "author": "Rameses Systems Inc.",
   "license": "MIT",