@solidxai/core-ui 0.1.12-beta.1 → 0.1.12-beta.2

package/dist/routes/pages/admin/core/ListPage.tsx

@@ -1,13 +1,19 @@
 import { SolidListView } from "../../../../components/core/list/SolidListView";
 import { camelCase } from "lodash";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import { useParams, useSearchParams } from "react-router-dom";
 import type { SolidListViewHandle } from "../../../../components/core/list/SolidListView";
 import { registerListView, unregisterListView } from "../../../../components/core/list/listViewRegistry";
+import { usePathname } from "../../../../hooks/usePathname";
+import { useRouter } from "../../../../hooks/useRouter";
+import { resolveRetainedModelViewRoute, storeCurrentModelViewContext } from "../../../../helpers/modelViewPersistence";
 
 export function ListPage() {
   const params = useParams();
-  const [searchParams, setSearchParams] = useSearchParams();
+  const [searchParams] = useSearchParams();
+  const pathname = usePathname();
+  const router = useRouter();
+  const search = searchParams.toString();
 
   const moduleName = params.moduleName || "";
   const modelName = params.modelName ? camelCase(params.modelName) : "";
@@ -27,5 +33,26 @@ export function ListPage() {
     unregisterListView(listId);
   }, [listId]);
 
+  useEffect(() => {
+    const currentUrl = search ? `${pathname}?${search}` : pathname;
+    const hasSavedQuery = searchParams.has("savedQuery");
+
+    if (!hasSavedQuery) {
+      const retainedUrl = resolveRetainedModelViewRoute(currentUrl);
+      if (retainedUrl !== currentUrl) {
+        router.replace(retainedUrl);
+        return;
+      }
+    }
+
+    // savedQuery strip karke store karo
+    const params = new URLSearchParams(search);
+    params.delete("savedQuery");
+    const cleanSearch = params.toString();
+    const urlToStore = cleanSearch ? `${pathname}?${cleanSearch}` : pathname;
+
+    storeCurrentModelViewContext(urlToStore);
+  }, [pathname, search]);
+
   return <SolidListView ref={setListRef} key={listId} {...params} embeded={false} moduleName={moduleName} modelName={modelName} />;
 }

package/dist/routes/pages/admin/core/TreePage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreePage.d.ts","sourceRoot":"","sources":["../../../../../src/routes/pages/admin/core/TreePage.tsx"],"names":[],"mappings":"AAOA,wBAAgB,QAAQ,4CAsBvB"}
+{"version":3,"file":"TreePage.d.ts","sourceRoot":"","sources":["../../../../../src/routes/pages/admin/core/TreePage.tsx"],"names":[],"mappings":"AASA,wBAAgB,QAAQ,4CA6BvB"}

package/dist/routes/pages/admin/core/TreePage.js

@@ -11,13 +11,17 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { camelCase } from "lodash";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import { useParams, useSearchParams } from "react-router-dom";
 import { registerTree, unregisterTree } from "../../../../components/core/tree/treeViewRegistry";
 import { SolidTreeView } from "../../../../components/core/tree/SolidTreeView";
+import { storeCurrentModelViewContext } from "../../../../helpers/modelViewPersistence";
+import { usePathname } from "../../../../hooks/usePathname";
 export function TreePage() {
     var params = useParams();
-    var _a = useSearchParams(), searchParams = _a[0], setSearchParams = _a[1];
+    var searchParams = useSearchParams()[0];
+    var pathname = usePathname();
+    var search = searchParams.toString();
     var moduleName = params.moduleName || "";
     var modelName = params.modelName ? camelCase(params.modelName) : "";
     var menuItemId = searchParams.get("menuItemId") || "";
@@ -32,6 +36,10 @@ export function TreePage() {
         }
         unregisterTree(treeId);
     }, [treeId]);
+    useEffect(function () {
+        var currentUrl = search ? "".concat(pathname, "?").concat(search) : pathname;
+        storeCurrentModelViewContext(currentUrl);
+    }, [pathname, search]);
     return _jsx(SolidTreeView, __assign({ ref: setTreeRef }, params, { embeded: false, moduleName: moduleName, modelName: modelName }), moduleName + modelName + menuItemId + menuItemName + actionId + actionName);
 }
 //# sourceMappingURL=TreePage.js.map

package/dist/routes/pages/admin/core/TreePage.js.map

@@ -1 +1 @@
-{"version":3,"file":"TreePage.js","sourceRoot":"","sources":["../../../../../src/routes/pages/admin/core/TreePage.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAC;AAE/E,MAAM,UAAU,QAAQ;IACtB,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACrB,IAAA,KAAkC,eAAe,EAAE,EAAlD,YAAY,QAAA,EAAE,eAAe,QAAqB,CAAC;IAE1D,IAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC3C,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACxD,IAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAC5D,IAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACpD,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAExD,IAAM,MAAM,GAAG,eAAQ,UAAU,cAAI,SAAS,cAAI,UAAU,cAAI,YAAY,cAAI,QAAQ,cAAI,UAAU,CAAE,CAAC;IAEzG,IAAM,UAAU,GAAG,WAAW,CAAC,UAAC,MAAkC;QAChE,IAAI,MAAM,EAAE;YACV,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC7B,OAAO;SACR;QACD,cAAc,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,KAAC,aAAa,aAAC,GAAG,EAAE,UAAU,IAAuF,MAAM,IAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,KAApJ,UAAU,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,QAAQ,GAAG,UAAU,CAA8E,CAAC;AACvM,CAAC","sourcesContent":["import { camelCase } from \"lodash\";\nimport { useCallback } from \"react\";\nimport { useParams, useSearchParams } from \"react-router-dom\";\nimport type { SolidTreeViewHandle } from \"../../../../components/core/tree/SolidTreeView\";\nimport { registerTree, unregisterTree } from \"../../../../components/core/tree/treeViewRegistry\";\nimport { SolidTreeView } from \"../../../../components/core/tree/SolidTreeView\";\n\nexport function TreePage() {\n  const params = useParams();\n  const [searchParams, setSearchParams] = useSearchParams();\n\n  const moduleName = params.moduleName || \"\";\n  const modelName = params.modelName ? camelCase(params.modelName) : \"\";\n  const menuItemId = searchParams.get(\"menuItemId\") || \"\";\n  const menuItemName = searchParams.get(\"menuItemName\") || \"\";\n  const actionId = searchParams.get(\"actionId\") || \"\";\n  const actionName = searchParams.get(\"actionName\") || \"\";\n\n  const treeId = `page:${moduleName}:${modelName}:${menuItemId}:${menuItemName}:${actionId}:${actionName}`;\n\n  const setTreeRef = useCallback((handle: SolidTreeViewHandle | null) => {\n    if (handle) {\n      registerTree(treeId, handle);\n      return;\n    }\n    unregisterTree(treeId);\n  }, [treeId]);\n\n  return <SolidTreeView ref={setTreeRef} key={moduleName + modelName + menuItemId + menuItemName + actionId + actionName} {...params} embeded={false} moduleName={moduleName} modelName={modelName} />;\n}\n"]}
+{"version":3,"file":"TreePage.js","sourceRoot":"","sources":["../../../../../src/routes/pages/admin/core/TreePage.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAC;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,MAAM,UAAU,QAAQ;IACtB,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IACpB,IAAA,YAAY,GAAI,eAAe,EAAE,GAArB,CAAsB;IACzC,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;IAEvC,IAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC3C,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IACxD,IAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAC5D,IAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACpD,IAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;IAExD,IAAM,MAAM,GAAG,eAAQ,UAAU,cAAI,SAAS,cAAI,UAAU,cAAI,YAAY,cAAI,QAAQ,cAAI,UAAU,CAAE,CAAC;IAEzG,IAAM,UAAU,GAAG,WAAW,CAAC,UAAC,MAAkC;QAChE,IAAI,MAAM,EAAE;YACV,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC7B,OAAO;SACR;QACD,cAAc,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,SAAS,CAAC;QACR,IAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,UAAG,QAAQ,cAAI,MAAM,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC/D,4BAA4B,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvB,OAAO,KAAC,aAAa,aAAC,GAAG,EAAE,UAAU,IAAuF,MAAM,IAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,KAApJ,UAAU,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,QAAQ,GAAG,UAAU,CAA8E,CAAC;AACvM,CAAC","sourcesContent":["import { camelCase } from \"lodash\";\nimport { useCallback, useEffect } from \"react\";\nimport { useParams, useSearchParams } from \"react-router-dom\";\nimport type { SolidTreeViewHandle } from \"../../../../components/core/tree/SolidTreeView\";\nimport { registerTree, unregisterTree } from \"../../../../components/core/tree/treeViewRegistry\";\nimport { SolidTreeView } from \"../../../../components/core/tree/SolidTreeView\";\nimport { storeCurrentModelViewContext } from \"../../../../helpers/modelViewPersistence\";\nimport { usePathname } from \"../../../../hooks/usePathname\";\n\nexport function TreePage() {\n  const params = useParams();\n  const [searchParams] = useSearchParams();\n  const pathname = usePathname();\n  const search = searchParams.toString();\n\n  const moduleName = params.moduleName || \"\";\n  const modelName = params.modelName ? camelCase(params.modelName) : \"\";\n  const menuItemId = searchParams.get(\"menuItemId\") || \"\";\n  const menuItemName = searchParams.get(\"menuItemName\") || \"\";\n  const actionId = searchParams.get(\"actionId\") || \"\";\n  const actionName = searchParams.get(\"actionName\") || \"\";\n\n  const treeId = `page:${moduleName}:${modelName}:${menuItemId}:${menuItemName}:${actionId}:${actionName}`;\n\n  const setTreeRef = useCallback((handle: SolidTreeViewHandle | null) => {\n    if (handle) {\n      registerTree(treeId, handle);\n      return;\n    }\n    unregisterTree(treeId);\n  }, [treeId]);\n\n  useEffect(() => {\n    const currentUrl = search ? `${pathname}?${search}` : pathname;\n    storeCurrentModelViewContext(currentUrl);\n  }, [pathname, search]);\n\n  return <SolidTreeView ref={setTreeRef} key={moduleName + modelName + menuItemId + menuItemName + actionId + actionName} {...params} embeded={false} moduleName={moduleName} modelName={modelName} />;\n}\n"]}

package/dist/routes/pages/admin/core/TreePage.tsx

@@ -1,13 +1,17 @@
 import { camelCase } from "lodash";
-import { useCallback } from "react";
+import { useCallback, useEffect } from "react";
 import { useParams, useSearchParams } from "react-router-dom";
 import type { SolidTreeViewHandle } from "../../../../components/core/tree/SolidTreeView";
 import { registerTree, unregisterTree } from "../../../../components/core/tree/treeViewRegistry";
 import { SolidTreeView } from "../../../../components/core/tree/SolidTreeView";
+import { storeCurrentModelViewContext } from "../../../../helpers/modelViewPersistence";
+import { usePathname } from "../../../../hooks/usePathname";
 
 export function TreePage() {
   const params = useParams();
-  const [searchParams, setSearchParams] = useSearchParams();
+  const [searchParams] = useSearchParams();
+  const pathname = usePathname();
+  const search = searchParams.toString();
 
   const moduleName = params.moduleName || "";
   const modelName = params.modelName ? camelCase(params.modelName) : "";
@@ -26,5 +30,10 @@ export function TreePage() {
     unregisterTree(treeId);
   }, [treeId]);
 
+  useEffect(() => {
+    const currentUrl = search ? `${pathname}?${search}` : pathname;
+    storeCurrentModelViewContext(currentUrl);
+  }, [pathname, search]);
+
   return <SolidTreeView ref={setTreeRef} key={moduleName + modelName + menuItemId + menuItemName + actionId + actionName} {...params} embeded={false} moduleName={moduleName} modelName={modelName} />;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core-ui",
-  "version": "0.1.12-beta.1",
+  "version": "0.1.12-beta.2",
   "scripts": {
     "build:tailwind": "tailwindcss -i ./src/resources/solid-tailwind.css -o ./src/resources/solid-tailwind-generated.css -c ./tailwind.config.js --minify",
     "prebuild": "npm run build:tailwind && npm run copy-resources && npm run copy-styles",