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

package/dist/components/core/kanban/SolidKanbanView.tsx

@@ -4,7 +4,9 @@ import { useGetSolidViewLayoutQuery } from "../../../redux/api/solidViewApi";
 import { useLazyCheckIfPermissionExistsQuery } from "../../../redux/api/userApi";
 import { DropResult } from "@hello-pangea/dnd";
 import qs from "qs";
-import { useEffect, useRef, useState } from "react";
+import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
+import { useSession } from "../../../hooks/useSession";
+import { resolveActiveUserId, resolveSavedFilterVariables } from "../../../helpers/resolveActiveUserId";
 import { SolidCreateButton } from "../common/SolidCreateButton";
 import { SolidGlobalSearchElement } from "../common/SolidGlobalSearchElement";
 import KanbanBoard from "./KanbanBoard";
@@ -50,6 +52,31 @@ type SolidKanbanViewParams = {
   moduleName: string;
   modelName: string;
   embeded: boolean;
+  customFilter?: any;
+};
+
+type SolidKanbanFilterInput = {
+  custom_filter_predicate?: any;
+  search_predicate?: any;
+  saved_filter_predicate?: any;
+  predefined_search_predicate?: any;
+};
+
+export type SolidKanbanViewHandle = {
+  refresh: () => void;
+  clearFilters: () => void;
+  applyFilter: (filter: SolidKanbanFilterInput) => void;
+  getSavedFilters: () => any[];
+  applySavedFilter: (name: string, variables?: Record<string, any>) => boolean;
+  setShowArchived: (value: boolean) => void;
+  getState: () => {
+    groupByFieldName: string;
+    showArchived: boolean;
+    filters: any;
+    filterPredicates: any;
+    kanbanData: any[];
+    loading: boolean;
+  };
 };
 
 type KanbanSwimlaneDefinition = {
@@ -119,12 +146,14 @@ const mergeKanbanGroupsWithDefinitions = (
 };
 
 
-export const SolidKanbanView = (params: SolidKanbanViewParams) => {
+export const SolidKanbanView = forwardRef<SolidKanbanViewHandle, SolidKanbanViewParams>((params, ref) => {
+  const session = useSession();
+  const user = session?.data?.user;
 
   const visibleNavbar = useSelector((state: any) => state.navbarState?.visibleNavbar);
   const dispatch = useDispatch()
 
-  const solidGlobalSearchElementRef = useRef();
+  const solidGlobalSearchElementRef = useRef<any>(null);
   const router = useRouter();
   const searchParams = useSearchParams();
   // TODO: The initial filter state will be created based on the fields which are present on this kanban view. 
@@ -542,7 +571,11 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
           }
           if (queryObject.saved_filter_predicate) {
             // @ts-ignore
-            filters.$and.push(queryObject.saved_filter_predicate);
+            filters.$and.push(resolveSavedFilterVariables(
+              queryObject.saved_filter_predicate,
+              user?.id,
+              queryObject.saved_filter_variables || {}
+            ).value);
           }
           if (queryObject.predefined_search_predicate) {
             // @ts-ignore
@@ -976,7 +1009,8 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
       }
       if (filterPredicates.saved_filter_predicate) {
         // @ts-ignore
-        queryfilter.$and.push(filterPredicates.saved_filter_predicate);
+        queryfilter.$and.push(filterPredicates.resolved_saved_filter_predicate ||
+          resolveActiveUserId(filterPredicates.saved_filter_predicate, user?.id));
       }
       if (filterPredicates.predefined_search_predicate) {
         // @ts-ignore
@@ -1031,6 +1065,8 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
         // @ts-ignore
         urlData.saved_filter_predicate = customFilter.saved_filter_predicate || {};
         // @ts-ignore
+        urlData.saved_filter_variables = customFilter.saved_filter_variables || {};
+        // @ts-ignore
         urlData.predefined_search_predicate = customFilter.predefined_search_predicate || {};
         // @ts-ignore
         urlData.predefined_search_chip = customFilter.predefined_search_chip || null;
@@ -1088,6 +1124,39 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
      loadKanbanBoard(filters);
   };
 
+  const cloneKanbanData = () => {
+    if (typeof structuredClone === "function") return structuredClone(kanbanViewData);
+    return JSON.parse(JSON.stringify(kanbanViewData));
+  };
+
+  useImperativeHandle(ref, () => ({
+    refresh: () => {
+      void loadKanbanBoard(filters);
+    },
+    clearFilters: () => {
+      setFilters(params.customFilter || { $and: [] });
+      setFilterPredicates(null);
+      solidGlobalSearchElementRef.current?.clearFilter?.();
+    },
+    applyFilter: (filter) => {
+      void handleApplyCustomFilter(filter);
+    },
+    getSavedFilters: () => solidGlobalSearchElementRef.current?.getSavedFilters?.() ?? [],
+    applySavedFilter: (name, variables) =>
+      solidGlobalSearchElementRef.current?.applySavedFilterByName?.(name, variables) ?? false,
+    setShowArchived: (value) => {
+      setShowArchived(value);
+    },
+    getState: () => ({
+      groupByFieldName,
+      showArchived,
+      filters,
+      filterPredicates,
+      kanbanData: cloneKanbanData(),
+      loading,
+    }),
+  }), [groupByFieldName, showArchived, filters, filterPredicates, kanbanViewData, loading]);
+
   const toggleBothSidebars = () => {
     if (visibleNavbar) {
       dispatch(toggleNavbar());   // close both
@@ -1113,7 +1182,11 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
                 */}
 
                 {/* <p className="m-0 view-title solid-text-wrapper">{kanbanViewTitle}</p> */}
-                <div className={`${showGlobalSearchElement ? "flex" : "hidden lg:flex"} mt-3 lg:mt-0  w-full lg:flex lg:min-w-0`}>
+                <div className="max-[576px]:hidden sm:hidden lg:flex w-full mt-3 lg:mt-0 lg:min-w-0">
+                  {/* Keep global search mounted for now because kanban bootstrap/filter hydration still flows through this element. */}
+                  <SolidGlobalSearchElement viewType="kanban" showSaveFilterPopup={showSaveFilterPopup} setShowSaveFilterPopup={setShowSaveFilterPopup} ref={solidGlobalSearchElementRef} viewData={solidKanbanViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter} filterPredicates={filterPredicates} ></SolidGlobalSearchElement>
+                </div>
+                <div className={`${showGlobalSearchElement ? "lg:flex" : "hidden"} lg:hidden mt-3 lg:mt-0 w-full lg:min-w-0`}>
                   {/* Keep global search mounted for now because kanban bootstrap/filter hydration still flows through this element. */}
                   <SolidGlobalSearchElement viewType="kanban" showSaveFilterPopup={showSaveFilterPopup} setShowSaveFilterPopup={setShowSaveFilterPopup} ref={solidGlobalSearchElementRef} viewData={solidKanbanViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter} filterPredicates={filterPredicates} ></SolidGlobalSearchElement>
                 </div>
@@ -1121,7 +1194,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
 
               <div className="flex items-center solid-header-buttons-wrapper solid-list-toolbar-actions lg:ml-auto">
                 <SolidHeaderRequestStatus label={headerRequestStatusLabel} />
-                <div className="flex lg:hidden">
+                 <div className="solid-list-search-toggle">
                   <SolidButton
                     type="button"
                     variant="outline"
@@ -1192,7 +1265,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
 
           <style>{`.p-datatable .p-datatable-loading-overlay {background-color: rgba(0, 0, 0, 0.0);}`}</style>
           {solidKanbanViewMetaData && kanbanViewData &&
-            <KanbanBoard groupByFieldName={groupByFieldName} kanbanViewData={kanbanViewData} maxSwimLanesCount={maxSwimLanesCount} solidKanbanViewMetaData={solidKanbanViewMetaData?.data} setKanbanViewData={setKanbanViewData} handleLoadMore={handleLoadMore} onDragEnd={onDragEnd} handleSwimLanePagination={handleSwimLanePagination} onDelete={actionsAllowed.includes(`${permissionExpression(params.modelName, 'delete')}`) && solidKanbanViewMetaData?.data?.solidView?.layout?.attrs.delete !== false ? openDeleteDialogForRecord : undefined} onRecover={handleRecoverRecord} setLightboxUrls={setLightboxUrls} setOpenLightbox={setOpenLightbox} editButtonUrl={editBaseUrl} recordClickAction={recordClickAction} showArchived={showArchived}></KanbanBoard>
+            <KanbanBoard groupByFieldName={groupByFieldName} kanbanViewData={kanbanViewData} maxSwimLanesCount={maxSwimLanesCount} solidKanbanViewMetaData={solidKanbanViewMetaData?.data} setKanbanViewData={setKanbanViewData} handleLoadMore={handleLoadMore} onDragEnd={onDragEnd} handleSwimLanePagination={handleSwimLanePagination} onDelete={actionsAllowed.includes(`${permissionExpression(params.modelName, 'delete')}`) && solidKanbanViewMetaData?.data?.solidView?.layout?.attrs.delete !== false ? openDeleteDialogForRecord : undefined} onRecover={handleRecoverRecord} setLightboxUrls={setLightboxUrls} setOpenLightbox={setOpenLightbox} editButtonUrl={editBaseUrl} recordClickAction={recordClickAction} showArchived={showArchived} params={params} handleCustomButtonClick={handleCustomButtonClick}></KanbanBoard>
           }
         </div>
       </div>
@@ -1242,4 +1315,4 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
       </SolidDialog>
     </div>
   );
-};
+});

package/dist/components/core/kanban/kanbanViewRegistry.d.ts

@@ -0,0 +1,7 @@
+import type { SolidKanbanViewHandle } from "./SolidKanbanView";
+export declare const registerKanbanView: (kanbanId: string, handle: SolidKanbanViewHandle) => void;
+export declare const unregisterKanbanView: (kanbanId: string) => void;
+export declare const getKanbanView: (kanbanId: string) => SolidKanbanViewHandle | undefined;
+export declare const hasKanbanView: (kanbanId: string) => boolean;
+export declare const getRegisteredKanbanViewIds: () => string[];
+//# sourceMappingURL=kanbanViewRegistry.d.ts.map

package/dist/components/core/kanban/kanbanViewRegistry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"kanbanViewRegistry.d.ts","sourceRoot":"","sources":["../../../../src/components/core/kanban/kanbanViewRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAI/D,eAAO,MAAM,kBAAkB,aAAc,MAAM,UAAU,qBAAqB,KAAG,IAEpF,CAAC;AAEF,eAAO,MAAM,oBAAoB,aAAc,MAAM,KAAG,IAEvD,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,qBAAqB,GAAG,SAExE,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,OAEhD,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,MAAM,EAEnD,CAAC"}

package/dist/components/core/kanban/kanbanViewRegistry.js

@@ -0,0 +1,17 @@
+var kanbanViewRegistry = new Map();
+export var registerKanbanView = function (kanbanId, handle) {
+    kanbanViewRegistry.set(kanbanId, handle);
+};
+export var unregisterKanbanView = function (kanbanId) {
+    kanbanViewRegistry.delete(kanbanId);
+};
+export var getKanbanView = function (kanbanId) {
+    return kanbanViewRegistry.get(kanbanId);
+};
+export var hasKanbanView = function (kanbanId) {
+    return kanbanViewRegistry.has(kanbanId);
+};
+export var getRegisteredKanbanViewIds = function () {
+    return Array.from(kanbanViewRegistry.keys());
+};
+//# sourceMappingURL=kanbanViewRegistry.js.map

package/dist/components/core/kanban/kanbanViewRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kanbanViewRegistry.js","sourceRoot":"","sources":["../../../../src/components/core/kanban/kanbanViewRegistry.ts"],"names":[],"mappings":"AAEA,IAAM,kBAAkB,GAAG,IAAI,GAAG,EAAiC,CAAC;AAEpE,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,QAAgB,EAAE,MAA6B;IAChF,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,oBAAoB,GAAG,UAAC,QAAgB;IACnD,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,aAAa,GAAG,UAAC,QAAgB;IAC5C,OAAO,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,aAAa,GAAG,UAAC,QAAgB;IAC5C,OAAO,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,0BAA0B,GAAG;IACxC,OAAO,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC","sourcesContent":["import type { SolidKanbanViewHandle } from \"./SolidKanbanView\";\n\nconst kanbanViewRegistry = new Map<string, SolidKanbanViewHandle>();\n\nexport const registerKanbanView = (kanbanId: string, handle: SolidKanbanViewHandle): void => {\n  kanbanViewRegistry.set(kanbanId, handle);\n};\n\nexport const unregisterKanbanView = (kanbanId: string): void => {\n  kanbanViewRegistry.delete(kanbanId);\n};\n\nexport const getKanbanView = (kanbanId: string): SolidKanbanViewHandle | undefined => {\n  return kanbanViewRegistry.get(kanbanId);\n};\n\nexport const hasKanbanView = (kanbanId: string): boolean => {\n  return kanbanViewRegistry.has(kanbanId);\n};\n\nexport const getRegisteredKanbanViewIds = (): string[] => {\n  return Array.from(kanbanViewRegistry.keys());\n};\n"]}

package/dist/components/core/kanban/kanbanViewRegistry.ts

@@ -0,0 +1,23 @@
+import type { SolidKanbanViewHandle } from "./SolidKanbanView";
+
+const kanbanViewRegistry = new Map<string, SolidKanbanViewHandle>();
+
+export const registerKanbanView = (kanbanId: string, handle: SolidKanbanViewHandle): void => {
+  kanbanViewRegistry.set(kanbanId, handle);
+};
+
+export const unregisterKanbanView = (kanbanId: string): void => {
+  kanbanViewRegistry.delete(kanbanId);
+};
+
+export const getKanbanView = (kanbanId: string): SolidKanbanViewHandle | undefined => {
+  return kanbanViewRegistry.get(kanbanId);
+};
+
+export const hasKanbanView = (kanbanId: string): boolean => {
+  return kanbanViewRegistry.has(kanbanId);
+};
+
+export const getRegisteredKanbanViewIds = (): string[] => {
+  return Array.from(kanbanViewRegistry.keys());
+};

package/dist/components/core/list/PLAN.md

@@ -57,7 +57,7 @@
   Keep existing predicate/rule state shape and `transformFilterRules(...)` contract unchanged.
 - [ ] Replace remaining Prime icon class usage in filter flow with non-Prime icons.
 - [ ] Audit `SolidFilterFields` and list filter input widgets for hidden Prime event-shape coupling.
-- [ ] Preserve saved filter URL behavior (`savedQuery`) and local cache behavior.
+- [ ] Preserve local-storage saved-filter application and rehydration behavior without URL state.
 - [ ] Confirm relation filter hydration still works.
 - [ ] Preserve `clearFilter()` and imperative `SolidListViewHandle.applyFilter(...)` behavior unchanged.
 

package/dist/components/core/list/SolidListView.d.ts

@@ -38,6 +38,17 @@ export type SolidListViewHandle = {
         saved_filter_predicate?: any;
         predefined_search_predicate?: any;
     }) => void;
+    /**
+     * Returns the saved filters currently available in the list view, including
+     * any seeded/system filters supplied by the view.
+     */
+    getSavedFilters: () => any[];
+    /**
+     * Applies the currently available saved filter with the given name using the
+     * same selection path as clicking that filter in the search UI.
+     * Returns false when no saved filter with that name is available.
+     */
+    applySavedFilter: (name: string, variables?: Record<string, any>) => boolean;
     /**
      * Updates pagination state directly.
      * Use this when a caller needs to jump to a specific page window

package/dist/components/core/list/SolidListView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidListView.d.ts","sourceRoot":"","sources":["../../../../src/components/core/list/SolidListView.tsx"],"names":[],"mappings":";AAoEA,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6BAA6B,CAAC,EAAE,GAAG,CAAC;IACpC,8BAA8B,CAAC,EAAE,GAAG,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,uBAAuB,CAAC,EAAE,GAAG,CAAC;QAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC;QACvB,sBAAsB,CAAC,EAAE,GAAG,CAAC;QAC7B,2BAA2B,CAAC,EAAE,GAAG,CAAC;KACnC,KAAK,IAAI,CAAC;IACX;;;;OAIG;IACH,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D;;;OAGG;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACpE;;;OAGG;IACH,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1C;;;OAGG;IACH,QAAQ,EAAE,MAAM;QACd,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;QACb,gBAAgB,EAAE,GAAG,CAAC;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,aAAa,qHAgzDxB,CAAC"}
+{"version":3,"file":"SolidListView.d.ts","sourceRoot":"","sources":["../../../../src/components/core/list/SolidListView.tsx"],"names":[],"mappings":";AAqEA,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,6BAA6B,CAAC,EAAE,GAAG,CAAC;IACpC,8BAA8B,CAAC,EAAE,GAAG,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;;;;OAKG;IACH,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB;;;;OAIG;IACH,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB;;;;;;OAMG;IACH,WAAW,EAAE,CAAC,MAAM,EAAE;QACpB,uBAAuB,CAAC,EAAE,GAAG,CAAC;QAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC;QACvB,sBAAsB,CAAC,EAAE,GAAG,CAAC;QAC7B,2BAA2B,CAAC,EAAE,GAAG,CAAC;KACnC,KAAK,IAAI,CAAC;IACX;;;OAGG;IACH,eAAe,EAAE,MAAM,GAAG,EAAE,CAAC;IAC7B;;;;OAIG;IACH,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;IAC7E;;;;OAIG;IACH,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D;;;OAGG;IACH,OAAO,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACpE;;;OAGG;IACH,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IAC1C;;;OAGG;IACH,QAAQ,EAAE,MAAM;QACd,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;QACb,gBAAgB,EAAE,GAAG,CAAC;QACtB,QAAQ,EAAE,GAAG,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,aAAa,qHA+0DxB,CAAC"}

package/dist/components/core/list/SolidListView.js

@@ -54,7 +54,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useState, useEffect, useRef, useMemo, useImperativeHandle } from "react";
 import { SolidDataTable as DataTable, Column } from "./SolidDataTable";
 import qs from "qs";
@@ -87,6 +87,7 @@ import styles from "./SolidListViewWrapper.module.css";
 import { isArchivedListRow } from "./columns/PublishStatusColumnDefaults";
 import { getExtensionFunction } from "../../../helpers/registry";
 import { useSession } from "../../../hooks/useSession";
+import { resolveActiveUserId } from "../../../helpers/resolveActiveUserId";
 import { ERROR_MESSAGES } from "../../../constants/error-messages";
 import { getSettingsMap, resolveRecordClickAction } from "../../../helpers/settingsPayload";
 import { useGetSolidSettingsQuery } from "../../../redux/api/solidSettingsApi";
@@ -735,6 +736,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                         fileterTobeStored.custom_filter_predicate = latestFilterPredicatesRef.current.custom_filter_predicate || null;
                         fileterTobeStored.search_predicate = latestFilterPredicatesRef.current.search_predicate || null;
                         fileterTobeStored.saved_filter_predicate = latestFilterPredicatesRef.current.saved_filter_predicate || null;
+                        fileterTobeStored.saved_filter_variables = latestFilterPredicatesRef.current.saved_filter_variables || {};
                         fileterTobeStored.saved_filter_id = latestFilterPredicatesRef.current.saved_filter_id || null;
                         fileterTobeStored.saved_filter_system_key = latestFilterPredicatesRef.current.saved_filter_system_key || null;
                         fileterTobeStored.saved_filter_name = latestFilterPredicatesRef.current.saved_filter_name || null;
@@ -759,7 +761,8 @@ export var SolidListView = forwardRef(function (params, ref) {
             queryfilter.$and.push(filterPredicates.search_predicate);
         }
         if (filterPredicates.saved_filter_predicate) {
-            queryfilter.$and.push(filterPredicates.saved_filter_predicate);
+            queryfilter.$and.push(filterPredicates.resolved_saved_filter_predicate ||
+                resolveActiveUserId(filterPredicates.saved_filter_predicate, user === null || user === void 0 ? void 0 : user.id));
         }
         if (filterPredicates.predefined_search_predicate) {
             queryfilter.$and.push(filterPredicates.predefined_search_predicate);
@@ -888,6 +891,8 @@ export var SolidListView = forwardRef(function (params, ref) {
         applyFilter: function (filter) {
             handleApplyCustomFilter(filter);
         },
+        getSavedFilters: function () { var _a, _b, _c; return (_c = (_b = (_a = solidGlobalSearchElementRef.current) === null || _a === void 0 ? void 0 : _a.getSavedFilters) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : []; },
+        applySavedFilter: function (name, variables) { var _a, _b, _c; return (_c = (_b = (_a = solidGlobalSearchElementRef.current) === null || _a === void 0 ? void 0 : _a.applySavedFilterByName) === null || _b === void 0 ? void 0 : _b.call(_a, name, variables)) !== null && _c !== void 0 ? _c : false; },
         setPagination: function (nextFirst, nextRows) {
             setFirst(nextFirst);
             setRows(nextRows);
@@ -1240,7 +1245,7 @@ export var SolidListView = forwardRef(function (params, ref) {
     //   }
     // };
     return (_jsxs("div", { className: "page-parent-wrapper ".concat(isEmbeddedList ? "solid-list-page-wrapper-embedded" : "solid-list-page-wrapper", " flex ").concat(isEmbeddedList ? "min-h-0 overflow-visible" : "h-full min-h-0 overflow-hidden"), children: [_jsx("div", { className: "solid-list-content flex flex-col ".concat(isEmbeddedList ? "min-h-0" : "flex-grow-1", " ").concat(styles.ListContentWrapper), children: _jsxs("div", { className: "solid-list-surface flex flex-col min-h-0 ".concat(isEmbeddedList ? "" : "flex-1"), children: [solidListViewInitialMetaData &&
-                            _jsx("div", { className: "page-header solid-list-toolbar flex-col lg:flex-row", children: _jsxs("div", { className: "flex w-full flex-col-reverse  lg:flex-row lg:items-center items-end", children: [_jsx("div", { className: "solid-list-toolbar-left flex w-full items-center gap-3 lg:min-w-0 lg:flex-1", children: params.embeded === false && (_jsx("div", { className: "".concat(showGlobalSearchElement ? "flex" : "hidden lg:flex", " mt-3 lg:mt-0 w-full lg:flex lg:min-w-0"), children: _jsx(SolidGlobalSearchElement, { viewType: "list", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidListViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter, filterPredicates: filterPredicates, definedFilters: definedFilters, onRemoveDefinedFilter: removeDefinedFilter, onApplyDefinedFilter: applyDefinedFilter }, params.modelName) })) }), _jsxs("div", { className: "flex items-center solid-header-buttons-wrapper solid-list-toolbar-actions lg:ml-auto", children: [_jsx(SolidHeaderRequestStatus, { label: headerRequestStatusLabel }), params.embeded === false && (_jsx("div", { className: "flex lg:hidden", children: _jsx(SolidButton, { type: "button", size: "small", variant: "outline", className: "solid-icon-button", onClick: function () { return setShowGlobalSearchElement(!showGlobalSearchElement); }, leftIcon: _jsx(Search, { size: 14 }) }) })), _jsx("div", { className: "solid-header-buttons-wrapper hidden items-center lg:flex", children: (_0 = visibleHeaderButtons === null || visibleHeaderButtons === void 0 ? void 0 : visibleHeaderButtons.filter(function (rb) { return rb.attrs.actionInContextMenu != true; })) === null || _0 === void 0 ? void 0 : _0.map(function (button, index) { return (_jsx(SolidListViewHeaderButton, { button: button, params: params, solidListViewMetaData: solidListViewMetaData, handleCustomButtonClick: handleCustomButtonClick, selectedRecords: selectedRecords, filters: filters }, index)); }) }), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) &&
+                            _jsx("div", { className: "page-header solid-list-toolbar flex-col lg:flex-row", children: _jsxs("div", { className: "flex w-full flex-col-reverse  lg:flex-row lg:items-center items-end", children: [_jsx("div", { className: "solid-list-toolbar-left flex w-full items-center gap-3 lg:min-w-0 lg:flex-1", children: params.embeded === false && (_jsxs(_Fragment, { children: [_jsx("div", { className: "max-[576px]:hidden sm:hidden lg:flex w-full mt-3 lg:mt-0  lg:min-w-0", children: _jsx(SolidGlobalSearchElement, { viewType: "list", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidListViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter, filterPredicates: filterPredicates, definedFilters: definedFilters, onRemoveDefinedFilter: removeDefinedFilter, onApplyDefinedFilter: applyDefinedFilter }, params.modelName) }), _jsx("div", { className: "".concat(showGlobalSearchElement ? "lg:flex" : "hidden", " lg:hidden mt-3 lg:mt-0 w-full lg:min-w-0"), children: _jsx(SolidGlobalSearchElement, { viewType: "list", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidListViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter, filterPredicates: filterPredicates, definedFilters: definedFilters, onRemoveDefinedFilter: removeDefinedFilter, onApplyDefinedFilter: applyDefinedFilter }, params.modelName) })] })) }), _jsxs("div", { className: "flex items-center solid-header-buttons-wrapper solid-list-toolbar-actions lg:ml-auto", children: [_jsx(SolidHeaderRequestStatus, { label: headerRequestStatusLabel }), params.embeded === false && (_jsx("div", { className: "solid-list-search-toggle", children: _jsx(SolidButton, { type: "button", size: "small", variant: "outline", className: "solid-icon-button", onClick: function () { return setShowGlobalSearchElement(!showGlobalSearchElement); }, leftIcon: _jsx(Search, { size: 14 }) }) })), _jsx("div", { className: "solid-header-buttons-wrapper hidden items-center lg:flex", children: (_0 = visibleHeaderButtons === null || visibleHeaderButtons === void 0 ? void 0 : visibleHeaderButtons.filter(function (rb) { return rb.attrs.actionInContextMenu != true; })) === null || _0 === void 0 ? void 0 : _0.map(function (button, index) { return (_jsx(SolidListViewHeaderButton, { button: button, params: params, solidListViewMetaData: solidListViewMetaData, handleCustomButtonClick: handleCustomButtonClick, selectedRecords: selectedRecords, filters: filters }, index)); }) }), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) &&
                                                     ((_1 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _1 === void 0 ? void 0 : _1.create) !== false &&
                                                     params.embeded !== true &&
                                                     ((_4 = (_3 = (_2 = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _2 === void 0 ? void 0 : _2.solidView) === null || _3 === void 0 ? void 0 : _3.layout) === null || _4 === void 0 ? void 0 : _4.attrs.showDefaultAddButton) !== false && (_jsx(SolidCreateButton, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, solidListViewLayout: solidListViewLayout, responsiveIconOnly: true })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) &&
@@ -1340,12 +1345,12 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                                         setDeleteEntity(true);
                                                                     }
                                                                 } })) }));
-                                                    } })), hasAnyContextMenuActions && (_jsx(Column, { frozen: true, alignFrozen: "right", body: function (rowData) {
+                                                    } })), hasAnyContextMenuActions && (_jsx(Column, { frozen: true, alignFrozen: "right", className: "solid-data-table-row-action-cell", body: function (rowData) {
                                                 var _a;
-                                                return (rowData === null || rowData === void 0 ? void 0 : rowData.deletedAt) ? (_jsx("div", { className: "flex justify-content-center align-items-center", "data-no-row-click": "true", children: _jsx("a", { onClick: function (event) {
+                                                return (rowData === null || rowData === void 0 ? void 0 : rowData.deletedAt) ? (_jsx("div", { className: "flex justify-content-center align-items-center", "data-no-row-click": "true", children: _jsx("button", { type: "button", onClick: function (event) {
                                                             event.stopPropagation();
                                                             recoverById(rowData.id);
-                                                        }, className: "retrieve-button solid-row-menu-trigger", children: _jsx(RotateCcw, { size: 14, className: styles.retrieveIcon }) }) })) : (_jsx(_Fragment, { children: ((_a = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _a === void 0 ? void 0 : _a.showRowContextMenu) !== false &&
+                                                        }, className: "retrieve-button solid-row-menu-trigger", "aria-label": "Recover record", title: "Recover", children: _jsx(RotateCcw, { size: 14, className: styles.retrieveIcon }) }) })) : (_jsx(_Fragment, { children: ((_a = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _a === void 0 ? void 0 : _a.showRowContextMenu) !== false &&
                                                         !isArchivedListRow(isDraftPublishWorkflowEnabled, rowData) && (_jsx("div", { className: "flex justify-end", "data-no-row-click": "true", children: _jsx(SolidListViewRowActionsMenu, { rowData: rowData, hasEditInContextMenu: hasEditInContextMenu, hasDeleteInContextMenu: hasDeleteInContextMenu, hasCustomContextMenuButtons: hasCustomContextMenuButtons, solidListViewLayout: solidListViewLayout, solidListViewMetaData: solidListViewMetaData, params: params, handleCustomButtonClick: handleCustomButtonClick, contentClassName: styles.rowActionsOverlay, onSelectRow: function (selectedRow) {
                                                                 setSelectedSolidViewData(selectedRow);
                                                             }, onEdit: function (selectedRow) {