@ramesesinc/platform-core 0.1.9 → 0.1.11

package/dist/components/view/RootView.js

@@ -1,10 +1,10 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { getError } from "@ramesesinc/client";
 import { forwardRef, memo, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from "react";
 import Page from "../../core/Page";
 import { PageViewProvider } from "../../core/PageViewContext";
 const RootView = (props) => {
-    const { url, eventHandler, standalone = true } = props !== null && props !== void 0 ? props : {};
+    const { url, eventHandler, standalone = true, options = {} } = props !== null && props !== void 0 ? props : {};
     const [paths, setPaths] = useState([]);
     const mainPath = useRef("");
     const [newRootPath, setNewRootPath] = useState(null);
@@ -16,7 +16,8 @@ const RootView = (props) => {
         try {
             // console.log("RootView loadPage", path); // main#tasklist
             const pageUUID = "page-" + Math.random().toString(36).slice(2);
-            comp = _jsx(Page, { url: path }, pageUUID);
+            const newUrl = url.split("#");
+            comp = _jsx(Page, { url: path, options: options }, pageUUID);
         }
         catch (error) {
             const e = getError(error);
@@ -29,24 +30,24 @@ const RootView = (props) => {
         (_a = slotRef.current) === null || _a === void 0 ? void 0 : _a.update(comp);
     };
     useLayoutEffect(() => {
-        const paths = (url == null || url.trim() === "" ? "" : url).split("#");
-        // console.log("RootView useLayoutEffect ", url, paths);
-        const [firstPath] = paths;
-        mainPath.current = firstPath;
-        setPaths(paths);
+        const splitPaths = (url == null || url.trim() === "" ? "" : url).split("#");
+        const [mainPage] = splitPaths;
+        mainPath.current = mainPage;
+        setPaths(splitPaths);
     }, [url]);
+    // fires when paths changes — handles both initial load and url change
     useEffect(() => {
-        // this routine is for the initial loading
-        // pass the original url
-        loadPage(url);
-        setReInitPage(false);
+        if (paths.length === 0)
+            return;
+        loadPage(paths[0]);
     }, [paths]);
+    // fires when mode=window navigation happens
+    // setPaths first, then loadPage is triggered by paths useEffect
     useEffect(() => {
-        if (reInitPage) {
-            // let the initial loading take effect
+        if (newRootPath == null)
             return;
-        }
-        loadPage(newRootPath);
+        setPaths([newRootPath]); // ← paths updates first
+        // loadPage will be called by paths useEffect after setPaths takes effect
     }, [newRootPath]);
     const pageViewHandle = {
         displayName: "RootView#pageViewHandle",
@@ -54,7 +55,6 @@ const RootView = (props) => {
             providerRef.current = ref;
         },
         renderPage: (page) => {
-            // console.log("RootView renderPage", page);
             setNewRootPath(page);
         },
         isStandalone: () => standalone,
@@ -71,5 +71,5 @@ const ChildrenSlot = memo(forwardRef((_, ref) => {
             setContent(content);
         },
     }), []);
-    return _jsx(_Fragment, { children: content == null ? null : content });
+    return _jsx("div", { className: "px-2", children: content == null ? null : content });
 }));

package/dist/components/view/WizardView.d.ts

@@ -1,5 +1,5 @@
 type WizardViewProps = {
-    name: string;
+    title?: string;
     items: Record<string, any>[];
 };
 declare const WizardView: (props: WizardViewProps) => import("react/jsx-runtime").JSX.Element;

package/dist/components/view/WizardView.js

@@ -1,34 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useRef } from "react";
+import { useRef, useState } from "react";
 import { usePageContext } from "../../core/PageContext";
 import { StepHandler } from "../../core/StepHandler";
-import ComponentView from "./ComponentView";
+import WizardTemplate from "../../templates/WizardTemplate";
 const WizardView = (props) => {
-    const { name = "wizard", items = [] } = props !== null && props !== void 0 ? props : {};
-    const pageContext = usePageContext();
+    const { title, items = [] } = props !== null && props !== void 0 ? props : {};
+    const [currentItem, setCurrentItem] = useState(items[0]);
     const handlerRef = useRef(null);
+    const pageContext = usePageContext();
     if (handlerRef.current == null) {
-        const callback = (item) => {
-            var _a;
-            const onInit = (_a = item.events) === null || _a === void 0 ? void 0 : _a.onInit;
-            if (onInit != null && typeof onInit === "function") {
-                onInit();
-            }
-            pageContext === null || pageContext === void 0 ? void 0 : pageContext.set(name, item);
-        };
-        const handler = StepHandler(items, callback);
-        for (const it of items) {
-            const item = it;
-            if (item.attr == null)
-                item.attr = {};
-            item.attr.stepHandler = handler;
-            item.attr.events = {};
-        }
-        handlerRef.current = handler;
+        handlerRef.current = StepHandler(items, (item) => setCurrentItem(item), () => pageContext.getData());
     }
-    useEffect(() => {
-        pageContext === null || pageContext === void 0 ? void 0 : pageContext.set(name, items[0]);
-    }, []);
-    return (_jsx("div", { children: _jsx(ComponentView, { name: name, depends: name }) }));
+    return (_jsx(WizardTemplate, { title: (currentItem === null || currentItem === void 0 ? void 0 : currentItem.title) || title, component: currentItem === null || currentItem === void 0 ? void 0 : currentItem.component, componentid: currentItem === null || currentItem === void 0 ? void 0 : currentItem.componentid, attr: currentItem === null || currentItem === void 0 ? void 0 : currentItem.attr, stepHandler: handlerRef.current }));
 };
 export default WizardView;

package/dist/core/AuthContext.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 // lib/context/AuthContext.tsx
 import { createContext, useContext, useEffect, useState } from "react";
-import * as auth from "../core/auth";
 import { useApp } from "./AppContext";
+import * as auth from "./auth";
 export const useAuth = () => {
     const ctx = useContext(AuthContext);
     if (!ctx)

package/dist/core/DynamicComponent.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 export interface DynamicComponentConfig {
-    component: string;
+    component?: string;
+    componentid?: string;
     attr?: Record<string, any>;
 }
 interface DynamicComponentProps {

package/dist/core/DynamicComponent.js

@@ -11,11 +11,33 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import React, { useEffect, useState } from "react";
 import { ResourceLoader } from "../lib/utils/ResourceLoader";
-import React from "react";
+import { DynamicTemplate } from "./DynamicTemplate";
+import { usePageContext } from "./PageContext";
 export const DynamicComponent = ({ config, fallback = _jsx("div", { style: { color: "red" }, children: "Component not found" }), onError, }) => {
-    const { component, attr = {} } = config !== null && config !== void 0 ? config : {};
+    const { component, componentid, attr = {} } = config !== null && config !== void 0 ? config : {};
     const _a = attr !== null && attr !== void 0 ? attr : {}, { key } = _a, restAttr = __rest(_a, ["key"]);
+    const pageContext = usePageContext();
+    const [resolvedNode, setResolvedNode] = useState(null);
+    useEffect(() => {
+        if (!componentid)
+            return;
+        pageContext.getMgmt("components", componentid).then((res) => {
+            if (!res)
+                return;
+            const { template, attr: resAttr } = res;
+            const mergedAttr = Object.assign(Object.assign({}, resAttr), restAttr);
+            setResolvedNode(_jsx(DynamicTemplate, { template: template, attr: mergedAttr }));
+        });
+    }, [componentid]);
+    // componentid path — wait for async resolution
+    if (componentid) {
+        return resolvedNode ? _jsx(_Fragment, { children: resolvedNode }) : null;
+    }
+    // component path — sync resolution via ResourceLoader
+    if (!component)
+        return _jsx(_Fragment, { children: fallback });
     let Comp;
     try {
         Comp = ResourceLoader.getComponent(component);

package/dist/core/Page.d.ts

@@ -1,6 +1,7 @@
 type PageProps = {
     url?: string | null;
     fallback?: React.ReactNode;
+    options?: Record<string, any>;
 };
 declare const Page: (props: PageProps) => import("react/jsx-runtime").JSX.Element;
 export default Page;

package/dist/core/Page.js

@@ -11,7 +11,7 @@ import { PageProvider } from "./PageContext";
 import { usePageViewContext } from "./PageViewContext";
 import { usePopupContext } from "./PopupContext";
 const Page = (props) => {
-    const { url: finalUrl, fallback = _jsx("div", { children: "Loading page..." }) } = props !== null && props !== void 0 ? props : {};
+    const { url: finalUrl, fallback = _jsx("div", { children: "Loading page..." }), options = {} } = props !== null && props !== void 0 ? props : {};
     const [uuid] = useState(() => Math.random().toString(36).slice(2));
     const [value, setValue] = useState(null);
     const [cache, setCache] = useState({});
@@ -101,10 +101,8 @@ const Page = (props) => {
                 params = res === null || res === void 0 ? void 0 : res.params;
             }
             const resolveParams = replaceValues(req.params, params);
-            // console.log("Page fetchData params", uuid, value, {params, resolveParams});
-            const resp = await pageContext.current.execService(req.api, resolveParams);
-            const { data } = resp !== null && resp !== void 0 ? resp : {};
-            result = data !== null && data !== void 0 ? data : resp;
+            // console.log("page fetchData exec service 1.2", req.api, resolveParams);
+            result = await pageContext.current.execService(req.api, resolveParams);
         }
         return result;
     }, [value]);
@@ -124,6 +122,9 @@ const Page = (props) => {
         getSelectedPath: () => {
             return originalData.selectedPath;
         },
+        getOptions: () => {
+            return options;
+        },
     };
     return (_jsx(PageProvider, { handle: pageHandle, children: _jsx(ChildrenSlot, { ref: slotRef }) }));
 };

package/dist/core/PageCache.d.ts

@@ -6,10 +6,8 @@ interface CacheFallback {
 export declare const getPage: (name: string, fallback: CacheFallback) => Promise<{
     template: import("react/jsx-runtime").JSX.Element;
     pageInfo: null;
-    hasSelectionHandling?: undefined;
 } | {
     template: React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement>;
     pageInfo: any;
-    hasSelectionHandling: any;
 }>;
 export {};

package/dist/core/PageCache.js

@@ -5,11 +5,6 @@ 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 ?? {};
-//   return { multi_tenant, tenant_name };
-// };
 export const getPage = async (name, fallback) => {
     let { getTenant: tenant, getModule: module } = fallback;
     const key = `${module}/${name}`; // ✅ unique per module
@@ -30,10 +25,10 @@ export const getPage = async (name, fallback) => {
         delete pageInfo.template;
         delete pageInfo.attr;
         const tmpl = _jsx(DynamicTemplate, { template: template, attr: Object.assign(Object.assign({}, attr), { title }) });
-        const hasSelectionHandling = template === "ExplorerTemplate";
-        cache[key] = { template: tmpl, pageInfo, hasSelectionHandling };
+        // const hasSelectionHandling = template === "ExplorerTemplate";
+        cache[key] = { template: tmpl, pageInfo /*, hasSelectionHandling*/ };
     }
     const pageCache = cache[key];
     const newTemplate = React.cloneElement(pageCache.template);
-    return { template: newTemplate, pageInfo: pageCache.pageInfo, hasSelectionHandling: pageCache.hasSelectionHandling };
+    return { template: newTemplate, pageInfo: pageCache.pageInfo /*, hasSelectionHandling: pageCache.hasSelectionHandling*/ };
 };

package/dist/core/PageContext.d.ts

@@ -34,6 +34,7 @@ export type PageContextValue = {
 export type PageHandle = {
     init: (ref: PageContextValue) => void;
     getSelectedPath: () => string | null;
+    getOptions: () => Record<string, any>;
 };
 export type PageProviderRef = {
     set: (name: string, value: any) => void;

package/dist/core/PageContext.js

@@ -37,7 +37,20 @@ export const PageProvider = ({ handle, children }) => {
     // console.log("PageContext paths", uuid, paths);
     const parentContext = useContext(PageContext);
     const pageView = usePageViewContext();
-    const binding = useBinding();
+    const { action = "read" } = (handle === null || handle === void 0 ? void 0 : handle.getOptions()) || {};
+    const binding = useBinding({}, action);
+    useLayoutEffect(() => {
+        var _a;
+        if (handle == null)
+            return;
+        handle.init(contextValue);
+        // load params from pageChain into binding
+        const chainInfo = pageView.getPageChainInfo();
+        const viewParams = (_a = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.params) !== null && _a !== void 0 ? _a : {};
+        Object.keys(viewParams).forEach((k) => {
+            set(k, viewParams[k]);
+        });
+    }, []);
     // setup the selectedPath from the handle
     useMemo(() => {
         // useLayoutEffect(() => {
@@ -112,7 +125,8 @@ export const PageProvider = ({ handle, children }) => {
     };
     const setData = (value, mode) => {
         if (binding && typeof binding.setData === "function") {
-            binding.setData(value, mode !== null && mode !== void 0 ? mode : "read");
+            const oldMode = binding.getMode();
+            binding.setData(value, mode !== null && mode !== void 0 ? mode : oldMode);
         }
         else {
             console.warn("binding.setData is not available, skipping data set");

package/dist/core/PageViewContext.d.ts

@@ -22,7 +22,6 @@ export type PageViewContextValue = {
     getTitle: () => string | null;
     setTitle: (title: string | null) => void;
     setPage: (page: string | null, options?: PageOptions) => void;
-    setSelectedPage: (page: string | null) => void;
     getSelectedPage: () => string | null;
     pushPage: (page: string) => void;
     popPage: () => void;
@@ -32,6 +31,12 @@ export type PageViewContextValue = {
     setSelectionHandling: (hasHandling: boolean) => void;
     getOriginalLocationInfo: () => PageChainInfo | null;
     getEventHandler: () => EventHandler | null;
+    isRootView: () => boolean;
+    getUrl: () => string;
+    getPage: () => string;
+    getParams: () => Record<string, string>;
+    getSubPaths: () => string[];
+    getPageChainInfo: () => PageChainInfo;
 };
 export type PageViewHandle = {
     init: (ref: PageViewContextValue) => void;
@@ -39,11 +44,12 @@ export type PageViewHandle = {
     isStandalone: () => boolean;
 };
 export type PageSelectionHandler = {};
-type PageChainInfo = {
+export type PageChainInfo = {
     path: string;
     base: string;
     page: string;
     options: PageOptions;
+    params: Record<string, any>;
 };
 type PageViewProviderProps = {
     paths: string[];