@ramesesinc/platform-core 0.1.4 → 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/components/table/DataList.d.ts

@@ -80,9 +80,13 @@ export interface DataListAttr {
     className?: string;
     rowClassName?: (row: any, rowIndex: number) => string;
     depends?: string;
+    handle?: InnerDataListHandle;
 }
 export interface DataListProps {
     attr: DataListAttr;
 }
+type InnerDataListHandle = {
+    init: (ref: any) => void;
+};
 export declare const DataList: React.FC<DataListProps>;
 export default DataList;

package/dist/components/table/DataList.js

@@ -11,8 +11,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Columns, Eye, RefreshCcw, Search, Trash } from "lucide-react";
-import { useCallback, useState } from "react";
+import { useCallback, useRef, useState } from "react";
 import { useApp } from "../../core/AppContext";
+import { useDataContext } from "../../core/DataContext";
 import { DynamicComponent } from "../../core/DynamicComponent";
 import { usePageContext } from "../../core/PageContext";
 import Panel from "../../core/Panel";
@@ -22,7 +23,7 @@ import { getUrlPageParams } from "../../lib/utils/PageUtils";
 import { DataTable } from "./DataTable";
 import ListHandler from "./ListHandler";
 import { TableProvider, useTableContext } from "./TableContext";
-const InnerDataList = ({ cols, emptyMessage = "No data available", errorMessage, striped = false, bordered = false, hover = true, dense = false, showPagination = true, paginationPosition = "bottom", showPageInfo = true, showTotalCount = true, showRowsPerPage = true, rowsPerPageOptions = [5, 10, 20, 50, 100], searchable = false, searchPlaceholder = "Search...", searchDebounce = 300, onSearchChange, filters = [], showFilterPanel = false, onFilterChange, sortable = true, showSortIndicator = true, selectable = false, selectionMode = "multiple", onSelectionChange, selectOnRowClick = false, onRowClick, rowActions = [], bulkActions = [], showBulkActions = true, toolbarActions = [], showToolbar = true, toolbarTitle, showRefreshButton = true, showExportButton = false, onLoad, onError, onRefresh, onExport, className = "", rowClassName, depends, }) => {
+const InnerDataList = ({ cols, emptyMessage = "No data available", errorMessage, striped = false, bordered = false, hover = true, dense = false, showPagination = true, paginationPosition = "bottom", showPageInfo = true, showTotalCount = true, showRowsPerPage = true, rowsPerPageOptions = [5, 10, 20, 50, 100], searchable = false, searchPlaceholder = "Search...", searchDebounce = 300, onSearchChange, filters = [], showFilterPanel = false, onFilterChange, sortable = true, showSortIndicator = true, selectable = false, selectionMode = "multiple", onSelectionChange, selectOnRowClick = false, onRowClick, rowActions = [], bulkActions = [], showBulkActions = true, toolbarActions = [], showToolbar = true, toolbarTitle, showRefreshButton = true, showExportButton = false, onLoad, onError, onRefresh, onExport, className = "", rowClassName, depends, handle, }) => {
     const { listHandler, columns, rows, setRows, loading: ctxLoading, setLoading } = useTableContext();
     // ============================================================================
     // STATE
@@ -37,6 +38,17 @@ const InnerDataList = ({ cols, emptyMessage = "No data available", errorMessage,
     const [hiddenColumns, setHiddenColumns] = useState([]);
     const isLoading = ctxLoading || internalLoading;
     const pageContext = usePageContext();
+    const handleRef = {
+        setFilter: async (filter) => {
+            if (filter == null || listHandler == null)
+                return;
+            await listHandler.setFilter(filter);
+            await loadData();
+        },
+    };
+    if (handle != null) {
+        handle.init(handleRef);
+    }
     const refreshHandler = async () => {
         // console.log("refresh via notify depends", pageContext?.uuid);
         await handleRefresh();
@@ -284,18 +296,12 @@ const InnerDataList = ({ cols, emptyMessage = "No data available", errorMessage,
     // ============================================================================
     return (_jsxs("div", { className: `data-list ${className}`, children: [renderToolbar(), renderFilterPanel(), (paginationPosition === "both" || paginationPosition === "top") && renderPagination(), _jsx(DataTable, { data: rows, columns: sortableColumns, loading: isLoading, emptyMessage: emptyMessage, striped: striped, bordered: bordered, hover: hover, dense: dense, rowKey: "id", onRowClick: handleRowClick, selectedRows: selectedRows, onSelectionChange: handleSelectionChange, selectable: selectable, rowClassName: rowClassName }), (paginationPosition === "both" || paginationPosition === "bottom") && rows.length > 0 && renderPagination()] }));
 };
-// ============================================================================
-// PUBLIC DATALIST
-// - Only accepts attr
-// - All hooks (useApp, usePageContext) called here
-// - factory defined here
-// - resolves dynamic filter params before passing to TableProvider
-// ============================================================================
 export const DataList = ({ attr }) => {
-    const { cols, data, rowsPerPage, disableTotalCount, commonActions, rowActions, toolbarActions } = attr, rest = __rest(attr, ["cols", "data", "rowsPerPage", "disableTotalCount", "commonActions", "rowActions", "toolbarActions"]);
+    const { depends, cols, data, rowsPerPage, disableTotalCount, commonActions, rowActions, toolbarActions } = attr, rest = __rest(attr, ["depends", "cols", "data", "rowsPerPage", "disableTotalCount", "commonActions", "rowActions", "toolbarActions"]);
     // All hooks called here — this is a React component so hooks are valid
     const { tenant, module } = useApp();
     const pageContext = usePageContext();
+    const dataContext = useDataContext();
     // Factory defined here — ListHandler is a local import, no prop needed
     const listHandlerFactory = (config) => ListHandler(config);
     // Resolve dynamic placeholders in filter before ListHandler is constructed.
@@ -335,10 +341,22 @@ export const DataList = ({ attr }) => {
         newToolbarActions.push({
             label: "Filter",
             component: "LookupPage",
-            attr: Object.assign(Object.assign({}, commonActions.filterPage), { title: "Filter" }),
+            attr: Object.assign(Object.assign({}, commonActions.filterPage), { name: "customFilter", title: "Filter" }),
         });
     }
-    return (_jsx(TableProvider, { data: data, columns: cols, rowsPerPage: rowsPerPage, disableTotalCount: disableTotalCount, listHandlerFactory: listHandlerFactory, tenant: tenant !== null && tenant !== void 0 ? tenant : "", module: module !== null && module !== void 0 ? module : "", resolvedParams: resolveParams(), children: _jsx(InnerDataList, Object.assign({}, rest, { cols: cols, rowActions: newRowActions, toolbarActions: newToolbarActions })) }));
+    const handleRef = useRef(null);
+    const onRefresh = () => {
+        var _a;
+        const filter = dataContext === null || dataContext === void 0 ? void 0 : dataContext.get("customFilter");
+        (_a = handleRef.current) === null || _a === void 0 ? void 0 : _a.setFilter(filter !== null && filter !== void 0 ? filter : {});
+    };
+    useDependHandler({ name: "customFilter", onRefresh });
+    const innerHandle = {
+        init: (ref) => {
+            handleRef.current = ref;
+        },
+    };
+    return (_jsx(TableProvider, { data: data, columns: cols, rowsPerPage: rowsPerPage, disableTotalCount: disableTotalCount, listHandlerFactory: listHandlerFactory, tenant: tenant !== null && tenant !== void 0 ? tenant : "", module: module !== null && module !== void 0 ? module : "", resolvedParams: resolveParams(), children: _jsx(InnerDataList, Object.assign({}, rest, { cols: cols, rowActions: newRowActions, toolbarActions: newToolbarActions, depends: depends, handle: innerHandle })) }));
 };
 export default DataList;
 const RefreshButton = ({ show, onClick, size = 18 }) => {

package/dist/components/table/DataList.tsx

@@ -1,6 +1,7 @@
 import { Columns, Eye, RefreshCcw, Search, Trash } from "lucide-react";
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useRef, useState } from "react";
 import { useApp } from "../../core/AppContext";
+import { useDataContext } from "../../core/DataContext";
 import { DynamicComponent } from "../../core/DynamicComponent";
 import { usePageContext } from "../../core/PageContext";
 import Panel from "../../core/Panel";
@@ -123,6 +124,7 @@ export interface DataListAttr {
   rowClassName?: (row: any, rowIndex: number) => string;
 
   depends?: string;
+  handle?: InnerDataListHandle;
 }
 
 // ============================================================================
@@ -191,6 +193,8 @@ const InnerDataList: React.FC<InnerProps> = ({
   className = "",
   rowClassName,
   depends,
+
+  handle,
 }) => {
   const { listHandler, columns, rows, setRows, loading: ctxLoading, setLoading } = useTableContext();
 
@@ -211,6 +215,19 @@ const InnerDataList: React.FC<InnerProps> = ({
 
   const pageContext = usePageContext();
 
+  const handleRef = {
+    setFilter: async (filter: Record<string, any>): Promise<void> => {
+      if (filter == null || listHandler == null) return;
+
+      await listHandler.setFilter(filter);
+      await loadData();
+    },
+  };
+
+  if (handle != null) {
+    handle.init(handleRef);
+  }
+
   const refreshHandler = async () => {
     // console.log("refresh via notify depends", pageContext?.uuid);
     await handleRefresh();
@@ -611,12 +628,17 @@ const InnerDataList: React.FC<InnerProps> = ({
 // - resolves dynamic filter params before passing to TableProvider
 // ============================================================================
 
+type InnerDataListHandle = {
+  init: (ref: any) => void;
+};
+
 export const DataList: React.FC<DataListProps> = ({ attr }) => {
-  const { cols, data, rowsPerPage, disableTotalCount, commonActions, rowActions, toolbarActions, ...rest } = attr;
+  const { depends, cols, data, rowsPerPage, disableTotalCount, commonActions, rowActions, toolbarActions, ...rest } = attr;
 
   // All hooks called here — this is a React component so hooks are valid
   const { tenant, module } = useApp();
   const pageContext = usePageContext();
+  const dataContext = useDataContext();
 
   // Factory defined here — ListHandler is a local import, no prop needed
   const listHandlerFactory = (config: ListHandlerConfig): ListActionHandler => ListHandler(config);
@@ -676,11 +698,27 @@ export const DataList: React.FC<DataListProps> = ({ attr }) => {
       component: "LookupPage",
       attr: {
         ...commonActions.filterPage,
+        name: "customFilter",
         title: "Filter",
       },
     });
   }
 
+  const handleRef = useRef<any>(null);
+
+  const onRefresh = () => {
+    const filter = dataContext?.get("customFilter");
+    handleRef.current?.setFilter(filter ?? {});
+  };
+
+  useDependHandler({ name: "customFilter", onRefresh });
+
+  const innerHandle = {
+    init: (ref: any) => {
+      handleRef.current = ref;
+    },
+  } as InnerDataListHandle;
+
   return (
     <TableProvider
       data={data}
@@ -692,7 +730,7 @@ export const DataList: React.FC<DataListProps> = ({ attr }) => {
       module={module ?? ""}
       resolvedParams={resolveParams()}
     >
-      <InnerDataList {...rest} cols={cols} rowActions={newRowActions} toolbarActions={newToolbarActions} />
+      <InnerDataList {...rest} cols={cols} rowActions={newRowActions} toolbarActions={newToolbarActions} depends={depends} handle={innerHandle} />
     </TableProvider>
   );
 };

package/dist/components/table/ListHandler.js

@@ -35,7 +35,7 @@ export const ListHandler = (config) => {
     let hasMorePages = false;
     const getData = () => dataResult;
     const load = async () => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const queryParams = {
             cols,
             start: (currentPage - 1) * rowsPerPage,
@@ -58,10 +58,10 @@ export const ListHandler = (config) => {
             // console.log("datalist pass 1", { api, query: { ...queryParams, ...rest } });
             const result = await localAPI.exec(`/services/exec/${config.tenant}/${config.module}/${api}`, Object.assign(Object.assign({}, queryParams), rest));
             // console.log("datalist pass 2", { result });
-            dataResult = result.data || [];
+            dataResult = (_b = (_a = result.data) !== null && _a !== void 0 ? _a : result) !== null && _b !== void 0 ? _b : [];
             if (useCursorPagination) {
-                lastCursor = (_a = result.nextCursor) !== null && _a !== void 0 ? _a : null;
-                hasMorePages = (_b = result.hasMore) !== null && _b !== void 0 ? _b : false;
+                lastCursor = (_c = result.nextCursor) !== null && _c !== void 0 ? _c : null;
+                hasMorePages = (_d = result.hasMore) !== null && _d !== void 0 ? _d : false;
             }
             if (!disableTotalCount) {
                 totalRecordCount = result.total || 0;

package/dist/components/table/ListHandler.ts

@@ -122,7 +122,7 @@ export const ListHandler = (config: ListHandlerConfig): ListActionHandler => {
       // console.log("datalist pass 1", { api, query: { ...queryParams, ...rest } });
       const result = await localAPI.exec(`/services/exec/${config.tenant}/${config.module}/${api}`, { ...queryParams, ...rest });
       // console.log("datalist pass 2", { result });
-      dataResult = result.data || [];
+      dataResult = result.data ?? result ?? [];
 
       if (useCursorPagination) {
         lastCursor = result.nextCursor ?? null;

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.4",
+  "version": "0.1.6",
   "description": "Platform Core Library",
   "author": "Rameses Systems Inc.",
   "license": "MIT",