@solidxai/core-ui 0.1.14-beta.9 → 0.1.14

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

@@ -1 +1 @@
-{"version":3,"file":"ListPage.js","sourceRoot":"","sources":["../../../../../src/routes/pages/admin/core/ListPage.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gDAAgD,CAAC;AAC/E,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,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACzG,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AAEvH,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,SAAS,EAAE,CAAC;IAC3B,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;IAEtE,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,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjC,OAAO;SACR;QACD,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7B,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,IAAM,WAAW,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;QAC9D,IAAI,WAAW,KAAK,UAAU,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5B,OAAO;SACR;QAED,4BAA4B,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvB,OAAO,KAAC,aAAa,aAAC,GAAG,EAAE,UAAU,IAAmB,MAAM,IAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,KAAhF,MAAM,CAA8E,CAAC;AACnI,CAAC","sourcesContent":["import { SolidListView } from \"../../../../components/core/list/SolidListView\";\nimport { camelCase } from \"lodash\";\nimport { useCallback, useEffect } from \"react\";\nimport { useParams, useSearchParams } from \"react-router-dom\";\nimport type { SolidListViewHandle } from \"../../../../components/core/list/SolidListView\";\nimport { registerListView, unregisterListView } from \"../../../../components/core/list/listViewRegistry\";\nimport { usePathname } from \"../../../../hooks/usePathname\";\nimport { useRouter } from \"../../../../hooks/useRouter\";\nimport { resolveRetainedModelViewRoute, storeCurrentModelViewContext } from \"../../../../helpers/modelViewPersistence\";\n\nexport function ListPage() {\n  const params = useParams();\n  const [searchParams] = useSearchParams();\n  const pathname = usePathname();\n  const router = useRouter();\n  const search = searchParams.toString();\n\n  const moduleName = params.moduleName || \"\";\n  const modelName = params.modelName ? camelCase(params.modelName) : \"\";\n\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 listId = `page:${moduleName}:${modelName}:${menuItemId}:${menuItemName}:${actionId}:${actionName}`;\n\n  const setListRef = useCallback((handle: SolidListViewHandle | null) => {\n    if (handle) {\n      registerListView(listId, handle);\n      return;\n    }\n    unregisterListView(listId);\n  }, [listId]);\n\n  useEffect(() => {\n    const currentUrl = search ? `${pathname}?${search}` : pathname;\n    const retainedUrl = resolveRetainedModelViewRoute(currentUrl);\n    if (retainedUrl !== currentUrl) {\n      router.replace(retainedUrl);\n      return;\n    }\n\n    storeCurrentModelViewContext(currentUrl);\n  }, [pathname, search]);\n\n  return <SolidListView ref={setListRef} key={listId} {...params} embeded={false} moduleName={moduleName} modelName={modelName} />;\n}\n"]}
+{"version":3,"file":"ListPage.js","sourceRoot":"","sources":["../../../../../src/routes/pages/admin/core/ListPage.tsx"],"names":[],"mappings":"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","sourcesContent":["import { SolidListView } from \"../../../../components/core/list/SolidListView\";\nimport { camelCase } from \"lodash\";\nimport { useCallback, useEffect } from \"react\";\nimport { useParams, useSearchParams } from \"react-router-dom\";\nimport type { SolidListViewHandle } from \"../../../../components/core/list/SolidListView\";\nimport { registerListView, unregisterListView } from \"../../../../components/core/list/listViewRegistry\";\nimport { usePathname } from \"../../../../hooks/usePathname\";\nimport { useRouter } from \"../../../../hooks/useRouter\";\nimport { resolveRetainedModelViewRoute, storeCurrentModelViewContext } from \"../../../../helpers/modelViewPersistence\";\n\nexport function ListPage() {\n  const params = useParams();\n  const [searchParams] = useSearchParams();\n  const pathname = usePathname();\n  const router = useRouter();\n  const search = searchParams.toString();\n\n  const moduleName = params.moduleName || \"\";\n  const modelName = params.modelName ? camelCase(params.modelName) : \"\";\n\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 listId = `page:${moduleName}:${modelName}:${menuItemId}:${menuItemName}:${actionId}:${actionName}`;\n\n  const setListRef = useCallback((handle: SolidListViewHandle | null) => {\n    if (handle) {\n      registerListView(listId, handle);\n      return;\n    }\n    unregisterListView(listId);\n  }, [listId]);\n\n  useEffect(() => {\n    const currentUrl = search ? `${pathname}?${search}` : pathname;\n    const hasSavedQuery = searchParams.has(\"savedQuery\");\n\n    if (!hasSavedQuery) {\n      const retainedUrl = resolveRetainedModelViewRoute(currentUrl);\n      if (retainedUrl !== currentUrl) {\n        router.replace(retainedUrl);\n        return;\n      }\n    }\n\n    // savedQuery strip karke store karo\n    const params = new URLSearchParams(search);\n    params.delete(\"savedQuery\");\n    const cleanSearch = params.toString();\n    const urlToStore = cleanSearch ? `${pathname}?${cleanSearch}` : pathname;\n\n    storeCurrentModelViewContext(urlToStore);\n  }, [pathname, search]);\n\n  return <SolidListView ref={setListRef} key={listId} {...params} embeded={false} moduleName={moduleName} modelName={modelName} />;\n}\n"]}

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

@@ -35,13 +35,23 @@ export function ListPage() {
 
   useEffect(() => {
     const currentUrl = search ? `${pathname}?${search}` : pathname;
-    const retainedUrl = resolveRetainedModelViewRoute(currentUrl);
-    if (retainedUrl !== currentUrl) {
-      router.replace(retainedUrl);
-      return;
+    const hasSavedQuery = searchParams.has("savedQuery");
+
+    if (!hasSavedQuery) {
+      const retainedUrl = resolveRetainedModelViewRoute(currentUrl);
+      if (retainedUrl !== currentUrl) {
+        router.replace(retainedUrl);
+        return;
+      }
     }
 
-    storeCurrentModelViewContext(currentUrl);
+    // 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/types/solid-core.d.ts

@@ -108,15 +108,7 @@ export type LayoutAttribute = {
     showEditFormButton?: boolean;
     showAddFormButton?: boolean;
     showDeleteFormButton?: boolean;
-    action?: string;
-    actionInContextMenu?: boolean;
-    openInPopup?: boolean;
-    popupWidth?: string;
-    closable?: boolean;
-    roles?: string[];
-    env?: string[] | string;
     formButtons?: any;
-    headerButtons?: any;
     rowButtons?: any;
     whereClause?: string;
     disabled?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/core-ui",
-  "version": "0.1.14-beta.9",
+  "version": "0.1.14",
   "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",