@solidxai/core-ui 0.1.14 → 0.1.15-beta.0

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,14 @@ 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.saved_filter_id = customFilter.saved_filter_id || null;
+        // @ts-ignore
+        urlData.saved_filter_system_key = customFilter.saved_filter_system_key || null;
+        // @ts-ignore
+        urlData.saved_filter_name = customFilter.saved_filter_name || null;
+        // @ts-ignore
         urlData.predefined_search_predicate = customFilter.predefined_search_predicate || {};
         // @ts-ignore
         urlData.predefined_search_chip = customFilter.predefined_search_chip || null;
@@ -1088,6 +1130,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 +1188,10 @@ 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`}>
+                {/* Base `hidden` must be avoided here: the consuming app's Tailwind CSS loads after this
+                    library's generated CSS, so the app's base `.hidden` would override our media-scoped
+                    `lg:flex`. Only media-scoped visibility classes are safe on this element. */}
+                <div className={`${showGlobalSearchElement ? "flex" : "max-lg: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>
@@ -1121,7 +1199,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 +1270,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 +1320,4 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
       </SolidDialog>
     </div>
   );
-};
+});

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,qHAozDxB,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,qHAqwDxB,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";
@@ -147,11 +148,6 @@ export var SolidListView = forwardRef(function (params, ref) {
     var _48 = useState(false), showSaveFilterPopup = _48[0], setShowSaveFilterPopup = _48[1];
     var _49 = useState(false), showGlobalSearchElement = _49[0], setShowGlobalSearchElement = _49[1];
     var suppressNextFilterPaginationResetRef = useRef(false);
-    // Filters offered by an onBeforeListDataLoad handler (event.definedFilters).
-    // Each stays independently removable via the search bar's pill UI rather
-    // than being baked directly into the outgoing query filter.
-    var _50 = useState([]), definedFilters = _50[0], setDefinedFilters = _50[1];
-    var definedFilterOverridesRef = useRef({});
     var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
     var handleCustomButtonClick = useHandleListCustomButtonClick();
     var visibleHeaderButtons = useMemo(function () {
@@ -159,7 +155,7 @@ export var SolidListView = forwardRef(function (params, ref) {
         return ((_b = (_a = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _a === void 0 ? void 0 : _a.headerButtons) !== null && _b !== void 0 ? _b : []).filter(function (button) { return isButtonVisibleInCurrentEnv(button === null || button === void 0 ? void 0 : button.attrs); });
     }, [(_g = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _g === void 0 ? void 0 : _g.headerButtons]);
     var editBaseUrl = useMemo(function () { return normalizeSolidListTreeKanbanActionPath(pathname, editButtonUrl || "form"); }, [editButtonUrl, pathname]);
-    var rowClickFormMode = useMemo(function () {
+    var recordClickFormMode = useMemo(function () {
         var _a, _b, _c;
         var isSystemModule = ((_c = (_b = (_a = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidView) === null || _b === void 0 ? void 0 : _b.module) === null || _c === void 0 ? void 0 : _c.isSystem) === true;
         if (isSystemModule) {
@@ -269,7 +265,7 @@ export var SolidListView = forwardRef(function (params, ref) {
     }, {
         encodeValuesOnly: true,
     });
-    var _51 = useGetSolidViewLayoutQuery(listViewMetaDataQs), solidListViewInitialMetaData = _51.data, solidListViewMetaDataError = _51.error, solidListViewMetaDataIsLoading = _51.isLoading, solidListViewMetaDataIsError = _51.isError, refetch = _51.refetch;
+    var _50 = useGetSolidViewLayoutQuery(listViewMetaDataQs), solidListViewInitialMetaData = _50.data, solidListViewMetaDataError = _50.error, solidListViewMetaDataIsLoading = _50.isLoading, solidListViewMetaDataIsError = _50.isError, refetch = _50.refetch;
     var initialFilterMethod = function () {
         var _a, _b, _c, _d;
         var solidView = (_a = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidView;
@@ -392,15 +388,15 @@ export var SolidListView = forwardRef(function (params, ref) {
     //   { label: 'List ', value: 'list', image: ListImage },
     //   { label: 'Kanban', value: 'kanban', image: KanbanImage },
     // ]
-    var _52 = useState(sizeOptions[1].value), size = _52[0], setSize = _52[1];
-    var _53 = useState([]), viewModes = _53[0], setViewModes = _53[1];
+    var _51 = useState(sizeOptions[1].value), size = _51[0], setSize = _51[1];
+    var _52 = useState([]), viewModes = _52[0], setViewModes = _52[1];
     // Custom Row Action
-    var _54 = useState(false), listViewRowActionPopupState = _54[0], setListViewRowActionPopupState = _54[1];
-    var _55 = useState(), listViewRowActionData = _55[0], setListRowActionData = _55[1];
+    var _53 = useState(false), listViewRowActionPopupState = _53[0], setListViewRowActionPopupState = _53[1];
+    var _54 = useState(), listViewRowActionData = _54[0], setListRowActionData = _54[1];
     // Get the list view data.
-    var _56 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _56[0], _57 = _56[1], solidEntityListViewData = _57.data, isLoading = _57.isLoading, isListViewFetching = _57.isFetching, error = _57.error;
-    var _58 = useLazyRecoverSolidEntityByIdQuery(), triggerRecoverSolidEntitiesById = _58[0], _59 = _58[1], recoverByIdData = _59.data, recoverByIdIsLoading = _59.isLoading, recoverByIdError = _59.error, recoverByIdIsError = _59.isError, recoverByIdIsSuccess = _59.isSuccess;
-    var _60 = useRecoverSolidEntityMutation(), triggerRecoverSolidEntities = _60[0], _61 = _60[1], recoverByData = _61.data, recoverByIsLoading = _61.isLoading, recoverError = _61.error, recoverIsError = _61.isError, recoverByIsSuccess = _61.isSuccess;
+    var _55 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _55[0], _56 = _55[1], solidEntityListViewData = _56.data, isLoading = _56.isLoading, isListViewFetching = _56.isFetching, error = _56.error;
+    var _57 = useLazyRecoverSolidEntityByIdQuery(), triggerRecoverSolidEntitiesById = _57[0], _58 = _57[1], recoverByIdData = _58.data, recoverByIdIsLoading = _58.isLoading, recoverByIdError = _58.error, recoverByIdIsError = _58.isError, recoverByIdIsSuccess = _58.isSuccess;
+    var _59 = useRecoverSolidEntityMutation(), triggerRecoverSolidEntities = _59[0], _60 = _59[1], recoverByData = _60.data, recoverByIsLoading = _60.isLoading, recoverError = _60.error, recoverIsError = _60.isError, recoverByIsSuccess = _60.isSuccess;
     // After data is fetched populate the list view state so as to be able to render the data.
     useEffect(function () {
         if (solidEntityListViewData) {
@@ -432,9 +428,9 @@ export var SolidListView = forwardRef(function (params, ref) {
             setLoading(false);
         }
     }, [solidEntityListViewData]);
-    var _62 = useDeleteSolidEntityMutation(), deleteSolidSingleEntiry = _62[0], isDeleteSolidSingleEntitySuccess = _62[1].isSuccess;
+    var _61 = useDeleteSolidEntityMutation(), deleteSolidSingleEntiry = _61[0], isDeleteSolidSingleEntitySuccess = _61[1].isSuccess;
     // Delete mutation
-    var _63 = useDeleteMultipleSolidEntitiesMutation(), deleteManySolidEntities = _63[0], _64 = _63[1], isSolidEntitiesDeleted = _64.isLoading, isDeleteSolidEntitiesSucess = _64.isSuccess, isSolidEntitiesDeleteError = _64.isError, SolidEntitiesDeleteError = _64.error, DeletedSolidEntities = _64.data;
+    var _62 = useDeleteMultipleSolidEntitiesMutation(), deleteManySolidEntities = _62[0], _63 = _62[1], isSolidEntitiesDeleted = _63.isLoading, isDeleteSolidEntitiesSucess = _63.isSuccess, isSolidEntitiesDeleteError = _63.isError, SolidEntitiesDeleteError = _63.error, DeletedSolidEntities = _63.data;
     // Fetch data after toPopulate has been populated...
     useEffect(function () {
         var _a;
@@ -519,6 +515,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                                 listData: listViewData,
                                 totalRecords: totalRecords,
                                 type: "onListLoad",
+                                isInitialLoad: !hasFiredInitialOnListLoadRef.current,
                                 viewMetadata: (_g = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _g === void 0 ? void 0 : _g.solidView,
                                 listViewLayout: listLayout,
                                 queryParams: {
@@ -531,6 +528,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                                 session: session.data,
                                 params: params
                             };
+                            hasFiredInitialOnListLoadRef.current = true;
                             if (!dynamicHeader) return [3 /*break*/, 3];
                             dynamicExtensionFunction = getExtensionFunction(dynamicHeader);
                             if (!dynamicExtensionFunction) return [3 /*break*/, 2];
@@ -564,6 +562,8 @@ export var SolidListView = forwardRef(function (params, ref) {
     var latestFilterPredicatesRef = useRef(filterPredicates);
     var latestSortFieldRef = useRef(sortField);
     var latestSortOrderRef = useRef(sortOrder);
+    var hasFiredInitialOnBeforeListDataLoadRef = useRef(false);
+    var hasFiredInitialOnListLoadRef = useRef(false);
     useEffect(function () {
         latestSortFieldRef.current = sortField;
     }, [sortField]);
@@ -622,18 +622,17 @@ export var SolidListView = forwardRef(function (params, ref) {
         setSelectedRecoverRecords(deletedRecords);
     };
     var setQueryString = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var solidFieldsMetadata, explicitLocale, queryData, resolvedLocale, currentSortField, currentSortOrder, meta, resolvedField, dynamicHeader, dynamicExtensionFunction, event, updatedListData, nextDefinedFilters, reconciledDefinedFilters_1, activeDefinedFilterPredicates, mergedFilters, err_1, queryString, fileterTobeStored;
-        var _a;
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        return __generator(this, function (_m) {
-            switch (_m.label) {
+        var solidFieldsMetadata, explicitLocale, queryData, resolvedLocale, currentSortField, currentSortOrder, meta, resolvedField, dynamicHeader, dynamicExtensionFunction, isInitialLoad, event, updatedListData, err_1, queryString, fileterTobeStored;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        return __generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
-                    solidFieldsMetadata = (_b = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _b === void 0 ? void 0 : _b.solidFieldsMetadata;
+                    solidFieldsMetadata = (_a = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidFieldsMetadata;
                     explicitLocale = resolveLocaleFromFilter(latestFiltersRef.current);
                     queryData = {
                         offset: first,
                         limit: rows,
-                        filters: (_c = latestFiltersRef.current) !== null && _c !== void 0 ? _c : latestFiltersRef.current,
+                        filters: (_b = latestFiltersRef.current) !== null && _b !== void 0 ? _b : latestFiltersRef.current,
                         populate: toPopulate,
                         populateMedia: toPopulateMedia,
                     };
@@ -651,7 +650,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                         else {
                             resolvedField = currentSortField;
                             if ((meta === null || meta === void 0 ? void 0 : meta.type) === "relation" && (meta === null || meta === void 0 ? void 0 : meta.relationType) === "many-to-one") {
-                                resolvedField = "".concat(currentSortField, ".").concat((_e = (_d = meta === null || meta === void 0 ? void 0 : meta.relationModel) === null || _d === void 0 ? void 0 : _d.userKeyField) === null || _e === void 0 ? void 0 : _e.name);
+                                resolvedField = "".concat(currentSortField, ".").concat((_d = (_c = meta === null || meta === void 0 ? void 0 : meta.relationModel) === null || _c === void 0 ? void 0 : _c.userKeyField) === null || _d === void 0 ? void 0 : _d.name);
                             }
                             queryData.sort = ["".concat(resolvedField, ":").concat(currentSortOrder === 1 ? "asc" : "desc")];
                         }
@@ -662,12 +661,15 @@ export var SolidListView = forwardRef(function (params, ref) {
                     if (showArchived) {
                         queryData.showSoftDeleted = "inclusive";
                     }
-                    dynamicHeader = (_h = (_g = (_f = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _f === void 0 ? void 0 : _f.solidView) === null || _g === void 0 ? void 0 : _g.layout) === null || _h === void 0 ? void 0 : _h.onBeforeListDataLoad;
+                    dynamicHeader = (_g = (_f = (_e = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _e === void 0 ? void 0 : _e.solidView) === null || _f === void 0 ? void 0 : _f.layout) === null || _g === void 0 ? void 0 : _g.onBeforeListDataLoad;
                     dynamicExtensionFunction = null;
+                    isInitialLoad = !hasFiredInitialOnBeforeListDataLoadRef.current;
+                    hasFiredInitialOnBeforeListDataLoadRef.current = true;
                     event = {
                         type: "onBeforeListDataLoad",
-                        fieldsMetadata: (_j = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _j === void 0 ? void 0 : _j.solidFieldsMetadata,
-                        viewMetadata: (_k = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _k === void 0 ? void 0 : _k.solidView,
+                        isInitialLoad: isInitialLoad,
+                        fieldsMetadata: (_h = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _h === void 0 ? void 0 : _h.solidFieldsMetadata,
+                        viewMetadata: (_j = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _j === void 0 ? void 0 : _j.solidView,
                         listViewLayout: solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data.solidView.layout,
                         filter: structuredClone(queryData),
                         queryParams: {
@@ -680,53 +682,24 @@ export var SolidListView = forwardRef(function (params, ref) {
                         session: session.data,
                         params: params
                     };
-                    if (!dynamicHeader) return [3 /*break*/, 5];
+                    if (!dynamicHeader) return [3 /*break*/, 4];
                     dynamicExtensionFunction = getExtensionFunction(dynamicHeader);
                     if (!dynamicExtensionFunction) return [3 /*break*/, 4];
-                    _m.label = 1;
+                    _k.label = 1;
                 case 1:
-                    _m.trys.push([1, 3, , 4]);
+                    _k.trys.push([1, 3, , 4]);
                     return [4 /*yield*/, dynamicExtensionFunction(event)];
                 case 2:
-                    updatedListData = _m.sent();
+                    updatedListData = _k.sent();
                     if (updatedListData && (updatedListData === null || updatedListData === void 0 ? void 0 : updatedListData.filterApplied) && (updatedListData === null || updatedListData === void 0 ? void 0 : updatedListData.newFilter)) {
                         queryData = updatedListData === null || updatedListData === void 0 ? void 0 : updatedListData.newFilter;
                     }
-                    nextDefinedFilters = (_l = updatedListData === null || updatedListData === void 0 ? void 0 : updatedListData.definedFilters) !== null && _l !== void 0 ? _l : [];
-                    reconciledDefinedFilters_1 = nextDefinedFilters.map(function (def) {
-                        var hasOverride = Object.prototype.hasOwnProperty.call(definedFilterOverridesRef.current, def.key);
-                        var applied = hasOverride ? definedFilterOverridesRef.current[def.key] : def.applied;
-                        definedFilterOverridesRef.current[def.key] = applied;
-                        return __assign(__assign({}, def), { applied: applied });
-                    });
-                    Object.keys(definedFilterOverridesRef.current).forEach(function (key) {
-                        if (!reconciledDefinedFilters_1.some(function (def) { return def.key === key; })) {
-                            delete definedFilterOverridesRef.current[key];
-                        }
-                    });
-                    setDefinedFilters(reconciledDefinedFilters_1);
-                    activeDefinedFilterPredicates = reconciledDefinedFilters_1
-                        .filter(function (def) { return def.applied; })
-                        .map(function (def) { return def.predicate; });
-                    if (activeDefinedFilterPredicates.length > 0) {
-                        mergedFilters = queryData.filters ? structuredClone(queryData.filters) : {};
-                        mergedFilters.$and = Array.isArray(mergedFilters.$and) ? mergedFilters.$and : [];
-                        (_a = mergedFilters.$and).push.apply(_a, activeDefinedFilterPredicates);
-                        queryData.filters = mergedFilters;
-                    }
                     return [3 /*break*/, 4];
                 case 3:
-                    err_1 = _m.sent();
+                    err_1 = _k.sent();
                     console.error("Error executing onBeforeListDataLoad extension:", err_1);
                     return [3 /*break*/, 4];
-                case 4: return [3 /*break*/, 6];
-                case 5:
-                    if (Object.keys(definedFilterOverridesRef.current).length > 0) {
-                        definedFilterOverridesRef.current = {};
-                        setDefinedFilters([]);
-                    }
-                    _m.label = 6;
-                case 6:
+                case 4:
                     queryString = qs.stringify(queryData, { encodeValuesOnly: true });
                     if (latestFilterPredicatesRef.current) {
                         fileterTobeStored = structuredClone(queryData);
@@ -735,6 +708,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 +733,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);
@@ -837,24 +812,6 @@ export var SolidListView = forwardRef(function (params, ref) {
         }
         // Force synchronous state updates
     };
-    // Removes a single handler-offered filter pill. The override persists for
-    // the rest of this mount (setQueryString reconciliation keeps it applied:false
-    // on subsequent fetches) but is not persisted beyond it.
-    var removeDefinedFilter = function (key) {
-        definedFilterOverridesRef.current[key] = false;
-        setDefinedFilters(function (prev) { return prev.map(function (def) { return (def.key === key ? __assign(__assign({}, def), { applied: false }) : def); }); });
-        setFirst(0);
-        void setQueryString();
-    };
-    // Applies a handler-offered filter the user picked from the "defined
-    // filters" list (one the handler returned with applied:false by default).
-    // Mirrors removeDefinedFilter in the other direction.
-    var applyDefinedFilter = function (key) {
-        definedFilterOverridesRef.current[key] = true;
-        setDefinedFilters(function (prev) { return prev.map(function (def) { return (def.key === key ? __assign(__assign({}, def), { applied: true }) : def); }); });
-        setFirst(0);
-        void setQueryString();
-    };
     // clear Filter
     var clearFilter = function () {
         if (solidListViewMetaData) {
@@ -888,6 +845,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);
@@ -924,8 +883,8 @@ export var SolidListView = forwardRef(function (params, ref) {
         loading,
         listViewData,
     ]);
-    var _65 = useState(), selectedSolidViewData = _65[0], setSelectedSolidViewData = _65[1];
-    var _66 = useState(false), deleteEntity = _66[0], setDeleteEntity = _66[1];
+    var _64 = useState(), selectedSolidViewData = _64[0], setSelectedSolidViewData = _64[1];
+    var _65 = useState(false), deleteEntity = _65[0], setDeleteEntity = _65[1];
     // Recover functions
     var recoverById = function (id) {
         triggerRecoverSolidEntitiesById(id);
@@ -999,8 +958,8 @@ export var SolidListView = forwardRef(function (params, ref) {
         setSelectedRecoverRecords([]);
     };
     var entityDisplayName = ((_k = (_j = (_h = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _h === void 0 ? void 0 : _h.solidView) === null || _j === void 0 ? void 0 : _j.model) === null || _k === void 0 ? void 0 : _k.displayName) || (params === null || params === void 0 ? void 0 : params.modelName);
-    var _67 = useState(false), openLightbox = _67[0], setOpenLightbox = _67[1];
-    var _68 = useState([]), lightboxUrls = _68[0], setLightboxUrls = _68[1];
+    var _66 = useState(false), openLightbox = _66[0], setOpenLightbox = _66[1];
+    var _67 = useState([]), lightboxUrls = _67[0], setLightboxUrls = _67[1];
     // Render columns dynamically based on metadata
     var renderColumnsDynamically = function (solidListViewMetaData, solidListViewLayout) {
         var _a;
@@ -1038,7 +997,8 @@ export var SolidListView = forwardRef(function (params, ref) {
                         column: column,
                         setLightboxUrls: setLightboxUrls,
                         setOpenLightbox: setOpenLightbox,
-                        embeded: params.embeded
+                        embeded: params.embeded,
+                        recordClickAction: recordClickFormMode
                     });
                 }
                 else {
@@ -1052,7 +1012,8 @@ export var SolidListView = forwardRef(function (params, ref) {
                     column: column,
                     setLightboxUrls: setLightboxUrls,
                     setOpenLightbox: setOpenLightbox,
-                    embeded: params.embeded
+                    embeded: params.embeded,
+                    recordClickAction: recordClickFormMode
                 });
             }
         });
@@ -1240,7 +1201,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 && (_jsx(_Fragment, { children: _jsx("div", { className: "".concat(showGlobalSearchElement ? "flex" : "max-lg: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 }, 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'))) &&
@@ -1276,7 +1237,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                                         }
                                         else {
                                             storeCurrentModelViewContext();
-                                            router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=").concat(rowClickFormMode, "&").concat(buildEditNavigationQueryString(rowData)));
+                                            router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=").concat(recordClickFormMode, "&").concat(buildEditNavigationQueryString(rowData)));
                                         }
                                     }, children: [params.embeded === true ? null : (_jsx(Column, { selectionMode: "multiple", headerStyle: { width: "3em" } })), solidListViewMetaData && solidListViewLayout && renderColumnsDynamically(solidListViewMetaData, solidListViewLayout), ((_18 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _18 === void 0 ? void 0 : _18.rowButtons) &&
                                             ((_19 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _19 === void 0 ? void 0 : _19.rowButtons.filter(function (rb) {