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

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

@@ -87,6 +87,7 @@ import { getExtensionFunction } from "../../../helpers/registry";
 import { useSession } from "../../../hooks/useSession";
 import { ERROR_MESSAGES } from "../../../constants/error-messages";
 import { normalizeSolidListTreeKanbanActionPath } from "../../../helpers/routePaths";
+import { storeCurrentModelViewContext } from "../../../helpers/modelViewPersistence";
 import { getMediaTypeFromUrl } from "../../../helpers/mediaType";
 import { SolidListViewRowActionsMenu } from "./SolidListViewRowActionsMenu";
 import { SolidHeaderRequestStatus } from "../../common/SolidHeaderRequestStatus";
@@ -97,6 +98,45 @@ import { Pencil, Plus, RefreshCw, RotateCcw, Search, Trash2 } from "lucide-react
 var getRandomInt = function (min, max) {
     return Math.floor(Math.random() * (max - min + 1)) + min;
 };
+var hasMeaningfulPersistedFilterValue = function (value) {
+    if (value === null || value === undefined)
+        return false;
+    if (typeof value === "string")
+        return value.trim().length > 0;
+    if (typeof value === "number" || typeof value === "boolean")
+        return true;
+    if (Array.isArray(value))
+        return value.some(function (item) { return hasMeaningfulPersistedFilterValue(item); });
+    if (typeof value === "object")
+        return hasMeaningfulPersistedFilter(value);
+    return false;
+};
+export var hasMeaningfulPersistedFilter = function (filterObject) {
+    if (!filterObject || typeof filterObject !== "object")
+        return false;
+    if (Array.isArray(filterObject)) {
+        return filterObject.some(function (item) { return hasMeaningfulPersistedFilter(item) || hasMeaningfulPersistedFilterValue(item); });
+    }
+    return Object.entries(filterObject).some(function (_a) {
+        var key = _a[0], val = _a[1];
+        if (key === "matchMode" || key === "operator")
+            return false;
+        if (key === "value")
+            return hasMeaningfulPersistedFilterValue(val);
+        if ((key === "$and" || key === "$or") && Array.isArray(val)) {
+            return val.some(function (item) { return hasMeaningfulPersistedFilter(item) || hasMeaningfulPersistedFilterValue(item); });
+        }
+        if (typeof val === "object")
+            return hasMeaningfulPersistedFilter(val);
+        return hasMeaningfulPersistedFilterValue(val);
+    });
+};
+export var hasStoredFilterPredicates = function (queryObject) {
+    return hasMeaningfulPersistedFilter(queryObject === null || queryObject === void 0 ? void 0 : queryObject.custom_filter_predicate) ||
+        hasMeaningfulPersistedFilter(queryObject === null || queryObject === void 0 ? void 0 : queryObject.search_predicate) ||
+        hasMeaningfulPersistedFilter(queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_predicate) ||
+        hasMeaningfulPersistedFilter(queryObject === null || queryObject === void 0 ? void 0 : queryObject.predefined_search_predicate);
+};
 export var getFilterObjectFromLocalStorage = function () {
     var currentPageUrl = window.location.pathname; // Get the current page URL
     var encodedQueryString = localStorage.getItem(currentPageUrl); // Retrieve the encoded query string from local storage
@@ -148,7 +188,7 @@ export var setFilterObjectToLocalStorageByUrl = function (url, queryObject) {
     return null;
 };
 export var SolidListView = forwardRef(function (params, ref) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25;
     var session = useSession();
     var user = (_a = session === null || session === void 0 ? void 0 : session.data) === null || _a === void 0 ? void 0 : _a.user;
     var dispatch = useDispatch();
@@ -158,43 +198,101 @@ export var SolidListView = forwardRef(function (params, ref) {
     var router = useRouter();
     var searchParams = useSearchParams();
     var localeName = searchParams.get("locale");
-    var _23 = useState(null), solidListViewMetaData = _23[0], setSolidListViewMetaData = _23[1];
-    var _24 = useState(null), solidListViewLayout = _24[0], setSolidListViewLayout = _24[1];
-    var _25 = useState(false), isDraftPublishWorkflowEnabled = _25[0], setIsDraftPublishWorkflowEnabled = _25[1];
+    var _26 = useState(null), solidListViewMetaData = _26[0], setSolidListViewMetaData = _26[1];
+    var _27 = useState(null), solidListViewLayout = _27[0], setSolidListViewLayout = _27[1];
+    var _28 = useState(false), isDraftPublishWorkflowEnabled = _28[0], setIsDraftPublishWorkflowEnabled = _28[1];
+    var internationalisationEnabled = Boolean((_d = (_c = (_b = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _b === void 0 ? void 0 : _b.solidView) === null || _c === void 0 ? void 0 : _c.model) === null || _d === void 0 ? void 0 : _d.internationalisation);
     // Filter query realted states
-    var _26 = useState(null), filters = _26[0], setFilters = _26[1];
-    var _27 = useState(0), totalRecords = _27[0], setTotalRecords = _27[1];
-    var _28 = useState(0), first = _28[0], setFirst = _28[1];
-    var _29 = useState(((_b = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _b === void 0 ? void 0 : _b.defaultPageSize) ? (_c = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _c === void 0 ? void 0 : _c.defaultPageSize : 10), rows = _29[0], setRows = _29[1];
-    var _30 = useState("id"), sortField = _30[0], setSortField = _30[1];
-    var _31 = useState(-1), sortOrder = _31[0], setSortOrder = _31[1];
-    var _32 = useState([]), toPopulate = _32[0], setToPopulate = _32[1];
-    var _33 = useState([]), toPopulateMedia = _33[0], setToPopulateMedia = _33[1];
-    var _34 = useState([]), actionsAllowed = _34[0], setActionsAllowed = _34[1];
+    var _29 = useState(null), filters = _29[0], setFilters = _29[1];
+    var _30 = useState(0), totalRecords = _30[0], setTotalRecords = _30[1];
+    var _31 = useState(0), first = _31[0], setFirst = _31[1];
+    var _32 = useState(((_e = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _e === void 0 ? void 0 : _e.defaultPageSize) ? (_f = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _f === void 0 ? void 0 : _f.defaultPageSize : 10), rows = _32[0], setRows = _32[1];
+    var _33 = useState("id"), sortField = _33[0], setSortField = _33[1];
+    var _34 = useState(-1), sortOrder = _34[0], setSortOrder = _34[1];
+    var _35 = useState([]), toPopulate = _35[0], setToPopulate = _35[1];
+    var _36 = useState([]), toPopulateMedia = _36[0], setToPopulateMedia = _36[1];
+    var _37 = useState([]), actionsAllowed = _37[0], setActionsAllowed = _37[1];
     // All list view state.
-    var _35 = useState([]), listViewData = _35[0], setListViewData = _35[1];
-    var _36 = useState([]), selectedRecords = _36[0], setSelectedRecords = _36[1];
-    var _37 = useState([]), selectedRecoverRecords = _37[0], setSelectedRecoverRecords = _37[1];
-    var _38 = useState(true), loading = _38[0], setLoading = _38[1];
-    var _39 = useState(false), isDialogVisible = _39[0], setDialogVisible = _39[1];
-    var _40 = useState(false), isRecoverDialogVisible = _40[0], setRecoverDialogVisible = _40[1];
-    var _41 = useState(), createButtonUrl = _41[0], setCreateButtonUrl = _41[1];
-    var _42 = useState(), editButtonUrl = _42[0], setEditButtonUrl = _42[1];
-    var _43 = useState({}), createActionQueryParams = _43[0], setCreateActionQueryParams = _43[1];
-    var _44 = useState({}), editActionQueryParams = _44[0], setEditActionQueryParams = _44[1];
-    var _45 = useState(false), showArchived = _45[0], setShowArchived = _45[1];
-    var _46 = useState(false), queryDataLoaded = _46[0], setQueryDataLoaded = _46[1];
-    var _47 = useState(null), filterPredicates = _47[0], setFilterPredicates = _47[1];
-    var _48 = useState(false), showSaveFilterPopup = _48[0], setShowSaveFilterPopup = _48[1];
-    var _49 = useState(false), showGlobalSearchElement = _49[0], setShowGlobalSearchElement = _49[1];
+    var _38 = useState([]), listViewData = _38[0], setListViewData = _38[1];
+    var _39 = useState([]), selectedRecords = _39[0], setSelectedRecords = _39[1];
+    var _40 = useState([]), selectedRecoverRecords = _40[0], setSelectedRecoverRecords = _40[1];
+    var _41 = useState(true), loading = _41[0], setLoading = _41[1];
+    var _42 = useState(false), isDialogVisible = _42[0], setDialogVisible = _42[1];
+    var _43 = useState(false), isRecoverDialogVisible = _43[0], setRecoverDialogVisible = _43[1];
+    var _44 = useState(), createButtonUrl = _44[0], setCreateButtonUrl = _44[1];
+    var _45 = useState(), editButtonUrl = _45[0], setEditButtonUrl = _45[1];
+    var _46 = useState({}), createActionQueryParams = _46[0], setCreateActionQueryParams = _46[1];
+    var _47 = useState({}), editActionQueryParams = _47[0], setEditActionQueryParams = _47[1];
+    var _48 = useState(false), showArchived = _48[0], setShowArchived = _48[1];
+    var _49 = useState(false), queryDataLoaded = _49[0], setQueryDataLoaded = _49[1];
+    var _50 = useState(null), filterPredicates = _50[0], setFilterPredicates = _50[1];
+    var _51 = useState(false), showSaveFilterPopup = _51[0], setShowSaveFilterPopup = _51[1];
+    var _52 = useState(false), showGlobalSearchElement = _52[0], setShowGlobalSearchElement = _52[1];
     var suppressNextFilterPaginationResetRef = useRef(false);
     var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
     var handleCustomButtonClick = useHandleListCustomButtonClick();
     var visibleHeaderButtons = useMemo(function () {
         var _a, _b;
         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); });
-    }, [(_d = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _d === void 0 ? void 0 : _d.headerButtons]);
+    }, [(_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 resolveLocaleFromFilter = function (filterNode) {
+        if (!filterNode || typeof filterNode !== "object")
+            return null;
+        if (Array.isArray(filterNode)) {
+            for (var _i = 0, filterNode_1 = filterNode; _i < filterNode_1.length; _i++) {
+                var item = filterNode_1[_i];
+                var resolved = resolveLocaleFromFilter(item);
+                if (resolved)
+                    return resolved;
+            }
+            return null;
+        }
+        if (Object.prototype.hasOwnProperty.call(filterNode, "localeName")) {
+            var localeFilter = filterNode.localeName;
+            if (typeof localeFilter === "string") {
+                return localeFilter;
+            }
+            if (localeFilter && typeof localeFilter === "object") {
+                for (var _a = 0, _b = ["$eqi", "$eq", "$in", "$containsi", "$contains"]; _a < _b.length; _a++) {
+                    var key = _b[_a];
+                    var localeValue = localeFilter[key];
+                    if (typeof localeValue === "string" && localeValue.trim()) {
+                        return localeValue;
+                    }
+                    if (Array.isArray(localeValue) && localeValue.length > 0) {
+                        var firstValue = localeValue[0];
+                        if (typeof firstValue === "string" && firstValue.trim()) {
+                            return firstValue;
+                        }
+                    }
+                }
+            }
+        }
+        for (var _c = 0, _d = Object.values(filterNode); _c < _d.length; _c++) {
+            var value = _d[_c];
+            var resolved = resolveLocaleFromFilter(value);
+            if (resolved)
+                return resolved;
+        }
+        return null;
+    };
+    var getResolvedListLocale = function () { return resolveLocaleFromFilter(latestFiltersRef.current) || localeName || null; };
+    var buildEditNavigationQueryString = function (rowData) {
+        var _a;
+        var queryParams = new URLSearchParams(editActionQueryParams);
+        if (internationalisationEnabled) {
+            var resolvedLocale = (rowData === null || rowData === void 0 ? void 0 : rowData.localeName) || getResolvedListLocale();
+            if (resolvedLocale) {
+                queryParams.set("locale", resolvedLocale);
+            }
+            var defaultEntityLocaleId = (_a = rowData === null || rowData === void 0 ? void 0 : rowData.defaultEntityLocaleId) !== null && _a !== void 0 ? _a : rowData === null || rowData === void 0 ? void 0 : rowData.id;
+            if (defaultEntityLocaleId !== undefined && defaultEntityLocaleId !== null && defaultEntityLocaleId !== "") {
+                queryParams.set("defaultEntityLocaleId", String(defaultEntityLocaleId));
+            }
+        }
+        return queryParams.toString();
+    };
     useEffect(function () {
         var fetchPermissions = function () { return __awaiter(void 0, void 0, void 0, function () {
             var permissionNames, queryData, queryString, response;
@@ -252,7 +350,7 @@ export var SolidListView = forwardRef(function (params, ref) {
     }, {
         encodeValuesOnly: true,
     });
-    var _50 = useGetSolidViewLayoutQuery(listViewMetaDataQs), solidListViewInitialMetaData = _50.data, solidListViewMetaDataError = _50.error, solidListViewMetaDataIsLoading = _50.isLoading, solidListViewMetaDataIsError = _50.isError, refetch = _50.refetch;
+    var _53 = useGetSolidViewLayoutQuery(listViewMetaDataQs), solidListViewInitialMetaData = _53.data, solidListViewMetaDataError = _53.error, solidListViewMetaDataIsLoading = _53.isLoading, solidListViewMetaDataIsError = _53.isError, refetch = _53.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;
@@ -346,19 +444,12 @@ export var SolidListView = forwardRef(function (params, ref) {
             var listLayoutAttrs = solidListViewLayout.attrs;
             var createActionUrl = (listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.createAction) && ((_a = listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.createAction) === null || _a === void 0 ? void 0 : _a.type) === "custom" ? (_b = listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.createAction) === null || _b === void 0 ? void 0 : _b.customComponent : "form/new";
             var editActionUrl = (listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.editAction) && ((_c = listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.editAction) === null || _c === void 0 ? void 0 : _c.type) === "custom" ? (_d = listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.editAction) === null || _d === void 0 ? void 0 : _d.customComponent : "form";
+            var resolvedListLocale = getResolvedListLocale();
             if (listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.createAction) {
-                setCreateActionQueryParams({
-                    actionName: listLayoutAttrs.createAction.name,
-                    actionType: listLayoutAttrs.createAction.type,
-                    actionContext: listLayoutAttrs.createAction.context,
-                });
+                setCreateActionQueryParams(__assign({ actionName: listLayoutAttrs.createAction.name, actionType: listLayoutAttrs.createAction.type, actionContext: listLayoutAttrs.createAction.context }, (internationalisationEnabled && resolvedListLocale ? { locale: resolvedListLocale } : {})));
             }
             if (listLayoutAttrs === null || listLayoutAttrs === void 0 ? void 0 : listLayoutAttrs.editAction) {
-                setEditActionQueryParams({
-                    actionName: listLayoutAttrs.editAction.name,
-                    actionType: listLayoutAttrs.editAction.type,
-                    actionContext: listLayoutAttrs.editAction.context,
-                });
+                setEditActionQueryParams(__assign({ actionName: listLayoutAttrs.editAction.name, actionType: listLayoutAttrs.editAction.type, actionContext: listLayoutAttrs.editAction.context }, (internationalisationEnabled && resolvedListLocale ? { locale: resolvedListLocale } : {})));
             }
             // const viewModes = listLayoutAttrs?.allowedViews && listLayoutAttrs?.allowedViews.length > 0 && listLayoutAttrs?.allowedViews.map((view: any) => { return { label: capitalize(view), value: view }; });
             setViewModes((_e = solidListViewInitialMetaData === null || solidListViewInitialMetaData === void 0 ? void 0 : solidListViewInitialMetaData.data) === null || _e === void 0 ? void 0 : _e.viewModes);
@@ -379,15 +470,15 @@ export var SolidListView = forwardRef(function (params, ref) {
     //   { label: 'List ', value: 'list', image: ListImage },
     //   { label: 'Kanban', value: 'kanban', image: KanbanImage },
     // ]
-    var _51 = useState(sizeOptions[1].value), size = _51[0], setSize = _51[1];
-    var _52 = useState([]), viewModes = _52[0], setViewModes = _52[1];
+    var _54 = useState(sizeOptions[1].value), size = _54[0], setSize = _54[1];
+    var _55 = useState([]), viewModes = _55[0], setViewModes = _55[1];
     // Custom Row Action
-    var _53 = useState(false), listViewRowActionPopupState = _53[0], setListViewRowActionPopupState = _53[1];
-    var _54 = useState(), listViewRowActionData = _54[0], setListRowActionData = _54[1];
+    var _56 = useState(false), listViewRowActionPopupState = _56[0], setListViewRowActionPopupState = _56[1];
+    var _57 = useState(), listViewRowActionData = _57[0], setListRowActionData = _57[1];
     // Get the list view data.
-    var _55 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _55[0], _56 = _55[1], solidEntityListViewData = _56.data, isLoading = _56.isLoading, 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;
+    var _58 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _58[0], _59 = _58[1], solidEntityListViewData = _59.data, isLoading = _59.isLoading, error = _59.error;
+    var _60 = useLazyRecoverSolidEntityByIdQuery(), triggerRecoverSolidEntitiesById = _60[0], _61 = _60[1], recoverByIdData = _61.data, recoverByIdIsLoading = _61.isLoading, recoverByIdError = _61.error, recoverByIdIsError = _61.isError, recoverByIdIsSuccess = _61.isSuccess;
+    var _62 = useRecoverSolidEntityMutation(), triggerRecoverSolidEntities = _62[0], _63 = _62[1], recoverByData = _63.data, recoverByIsLoading = _63.isLoading, recoverError = _63.error, recoverIsError = _63.isError, recoverByIsSuccess = _63.isSuccess;
     // After data is fetched populate the list view state so as to be able to render the data.
     useEffect(function () {
         if (solidEntityListViewData) {
@@ -419,9 +510,9 @@ export var SolidListView = forwardRef(function (params, ref) {
             setLoading(false);
         }
     }, [solidEntityListViewData]);
-    var _61 = useDeleteSolidEntityMutation(), deleteSolidSingleEntiry = _61[0], isDeleteSolidSingleEntitySuccess = _61[1].isSuccess;
+    var _64 = useDeleteSolidEntityMutation(), deleteSolidSingleEntiry = _64[0], isDeleteSolidSingleEntitySuccess = _64[1].isSuccess;
     // Delete mutation
-    var _62 = useDeleteMultipleSolidEntitiesMutation(), deleteManySolidEntities = _62[0], _63 = _62[1], isSolidEntitiesDeleted = _63.isLoading, isDeleteSolidEntitiesSucess = _63.isSuccess, isSolidEntitiesDeleteError = _63.isError, SolidEntitiesDeleteError = _63.error, DeletedSolidEntities = _63.data;
+    var _65 = useDeleteMultipleSolidEntitiesMutation(), deleteManySolidEntities = _65[0], _66 = _65[1], isSolidEntitiesDeleted = _66.isLoading, isDeleteSolidEntitiesSucess = _66.isSuccess, isSolidEntitiesDeleteError = _66.isError, SolidEntitiesDeleteError = _66.error, DeletedSolidEntities = _66.data;
     // Fetch data after toPopulate has been populated...
     useEffect(function () {
         var _a;
@@ -453,6 +544,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                 }
                 setSortField(restoredSortField);
                 setSortOrder(restoredSortOrder);
+                setShowArchived(queryObject.showArchived === true || queryObject.showArchived === "true" || queryObject.showSoftDeleted === "inclusive");
                 var _c = initialFilterMethod(), populate = _c.populate, populateMedia = _c.populateMedia;
                 setToPopulate(populate);
                 setToPopulateMedia(populateMedia);
@@ -465,6 +557,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                 setToPopulate(populate);
                 setToPopulateMedia(populateMedia);
                 setFirst(0);
+                setShowArchived(false);
             }
             //below line was added to handle state stale issue when we converted boilerplate to vite 
             //since now we dont need it becuase our component is remounted on every router change
@@ -607,20 +700,24 @@ export var SolidListView = forwardRef(function (params, ref) {
         setSelectedRecoverRecords(deletedRecords);
     };
     var setQueryString = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var solidFieldsMetadata, queryData, currentSortField, currentSortOrder, meta, resolvedField, dynamicHeader, dynamicExtensionFunction, event, updatedListData, err_1, queryString, fileterTobeStored;
+        var solidFieldsMetadata, explicitLocale, queryData, resolvedLocale, currentSortField, currentSortOrder, meta, resolvedField, dynamicHeader, dynamicExtensionFunction, 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 = (_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: (_b = latestFiltersRef.current) !== null && _b !== void 0 ? _b : latestFiltersRef.current,
                         populate: toPopulate,
                         populateMedia: toPopulateMedia,
-                        locale: localeName ? localeName : "en",
                     };
+                    resolvedLocale = explicitLocale || localeName;
+                    if (resolvedLocale) {
+                        queryData.locale = resolvedLocale;
+                    }
                     currentSortField = latestSortFieldRef.current;
                     currentSortOrder = latestSortOrderRef.current;
                     if (currentSortField && (currentSortOrder === 1 || currentSortOrder === -1)) {
@@ -794,6 +891,7 @@ export var SolidListView = forwardRef(function (params, ref) {
             setToPopulate(populate);
             setToPopulateMedia(populateMedia);
         }
+        setFirst(0);
         latestFiltersRef.current = {
             $and: []
         };
@@ -852,9 +950,9 @@ export var SolidListView = forwardRef(function (params, ref) {
         loading,
         listViewData,
     ]);
-    var _64 = useState(), selectedSolidViewData = _64[0], setSelectedSolidViewData = _64[1];
+    var _67 = useState(), selectedSolidViewData = _67[0], setSelectedSolidViewData = _67[1];
     var selectedDataRef = useRef();
-    var _65 = useState(false), deleteEntity = _65[0], setDeleteEntity = _65[1];
+    var _68 = useState(false), deleteEntity = _68[0], setDeleteEntity = _68[1];
     // Recover functions
     var recoverById = function (id) {
         triggerRecoverSolidEntitiesById(id);
@@ -927,9 +1025,9 @@ export var SolidListView = forwardRef(function (params, ref) {
         setSelectedRecords([]);
         setSelectedRecoverRecords([]);
     };
-    var entityDisplayName = ((_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.model) === null || _g === void 0 ? void 0 : _g.displayName) || (params === null || params === void 0 ? void 0 : params.modelName);
-    var _66 = useState(false), openLightbox = _66[0], setOpenLightbox = _66[1];
-    var _67 = useState([]), lightboxUrls = _67[0], setLightboxUrls = _67[1];
+    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 _69 = useState(false), openLightbox = _69[0], setOpenLightbox = _69[1];
+    var _70 = useState([]), lightboxUrls = _70[0], setLightboxUrls = _70[1];
     // Render columns dynamically based on metadata
     var renderColumnsDynamically = function (solidListViewMetaData, solidListViewLayout) {
         var _a;
@@ -1086,6 +1184,10 @@ export var SolidListView = forwardRef(function (params, ref) {
     //   );
     // }
     var handleFetchUpdatedRecords = function () {
+        if (hasAnyActiveFilters) {
+            clearFilter();
+            return;
+        }
         setQueryString();
     };
     var handleDeleteEntity = function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -1134,15 +1236,15 @@ export var SolidListView = forwardRef(function (params, ref) {
             .filter(function (slide) { return !!slide; })
         : [];
     var hasEditInContextMenu = actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'update'))) &&
-        ((_h = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _h === void 0 ? void 0 : _h.edit) !== false &&
-        ((_j = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _j === void 0 ? void 0 : _j.showDefaultEditButton) !== false &&
-        ((_k = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _k === void 0 ? void 0 : _k.showRowEditInContextMenu) !== false &&
-        !(isDraftPublishWorkflowEnabled && ((_l = selectedDataRef.current) === null || _l === void 0 ? void 0 : _l.publishedAt));
-    var hasDeleteInContextMenu = actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'delete'))) &&
-        ((_m = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _m === void 0 ? void 0 : _m.delete) !== false &&
-        ((_o = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _o === void 0 ? void 0 : _o.showRowDeleteInContextMenu) !== false &&
+        ((_l = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _l === void 0 ? void 0 : _l.edit) !== false &&
+        ((_m = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _m === void 0 ? void 0 : _m.showDefaultEditButton) !== false &&
+        ((_o = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _o === void 0 ? void 0 : _o.showRowEditInContextMenu) !== false &&
         !(isDraftPublishWorkflowEnabled && ((_p = selectedDataRef.current) === null || _p === void 0 ? void 0 : _p.publishedAt));
-    var hasCustomContextMenuButtons = (_r = (_q = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _q === void 0 ? void 0 : _q.rowButtons) === null || _r === void 0 ? void 0 : _r.some(function (rb) { var _a; return ((_a = rb === null || rb === void 0 ? void 0 : rb.attrs) === null || _a === void 0 ? void 0 : _a.actionInContextMenu) === true && isButtonVisibleInCurrentEnv(rb === null || rb === void 0 ? void 0 : rb.attrs); });
+    var hasDeleteInContextMenu = actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'delete'))) &&
+        ((_q = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _q === void 0 ? void 0 : _q.delete) !== false &&
+        ((_r = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _r === void 0 ? void 0 : _r.showRowDeleteInContextMenu) !== false &&
+        !(isDraftPublishWorkflowEnabled && ((_s = selectedDataRef.current) === null || _s === void 0 ? void 0 : _s.publishedAt));
+    var hasCustomContextMenuButtons = (_u = (_t = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _t === void 0 ? void 0 : _t.rowButtons) === null || _u === void 0 ? void 0 : _u.some(function (rb) { var _a; return ((_a = rb === null || rb === void 0 ? void 0 : rb.attrs) === null || _a === void 0 ? void 0 : _a.actionInContextMenu) === true && isButtonVisibleInCurrentEnv(rb === null || rb === void 0 ? void 0 : rb.attrs); });
     var hasAnyContextMenuActions = hasEditInContextMenu || hasDeleteInContextMenu || hasCustomContextMenuButtons;
     // const toggleBothSidebars = () => {
     //   if (visibleNavbar) {
@@ -1152,32 +1254,34 @@ export var SolidListView = forwardRef(function (params, ref) {
     //   }
     // };
     return (_jsxs("div", { className: "page-parent-wrapper solid-list-page-wrapper flex h-full min-h-0 overflow-hidden", children: [_jsx("div", { className: "solid-list-content  flex flex-col flex-grow-1 ".concat(styles.ListContentWrapper), children: _jsxs("div", { className: "solid-list-surface flex flex-col flex-1 min-h-0", children: [solidListViewInitialMetaData &&
-                            _jsxs("div", { className: "page-header solid-list-toolbar flex-col lg:flex-row", children: [_jsxs("div", { className: "flex justify-between w-full", children: [_jsxs("div", { className: "solid-list-toolbar-left flex w-full items-center gap-3", children: [_jsx("div", { className: 'flex items-center gap-2', children: _jsx("p", { className: "m-0 view-title solid-list-view-text-wrapper", children: ((_u = (_t = (_s = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _s === void 0 ? void 0 : _s.solidView) === null || _t === void 0 ? void 0 : _t.action) === null || _u === void 0 ? void 0 : _u.displayName) || ((_w = (_v = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _v === void 0 ? void 0 : _v.solidView) === null || _w === void 0 ? void 0 : _w.displayName) }) }), params.embeded === false && (_jsx("div", { className: "hidden lg:flex", 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", 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: (_x = visibleHeaderButtons === null || visibleHeaderButtons === void 0 ? void 0 : visibleHeaderButtons.filter(function (rb) { return rb.attrs.actionInContextMenu != true; })) === null || _x === void 0 ? void 0 : _x.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'))) &&
-                                                        ((_y = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _y === void 0 ? void 0 : _y.create) !== false &&
+                            _jsxs("div", { className: "page-header solid-list-toolbar flex-col lg:flex-row", children: [_jsxs("div", { className: "flex justify-between w-full", children: [_jsxs("div", { className: "solid-list-toolbar-left flex w-full items-center gap-3", children: [_jsx("div", { className: 'flex items-center gap-2', children: _jsx("p", { className: "m-0 view-title solid-list-view-text-wrapper", children: ((_x = (_w = (_v = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _v === void 0 ? void 0 : _v.solidView) === null || _w === void 0 ? void 0 : _w.action) === null || _x === void 0 ? void 0 : _x.displayName) || ((_z = (_y = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _y === void 0 ? void 0 : _y.solidView) === null || _z === void 0 ? void 0 : _z.displayName) }) }), params.embeded === false && (_jsx("div", { className: "hidden lg:flex", 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", 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'))) &&
+                                                        ((_1 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _1 === void 0 ? void 0 : _1.create) !== false &&
                                                         params.embeded !== true &&
-                                                        ((_1 = (_0 = (_z = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _z === void 0 ? void 0 : _z.solidView) === null || _0 === void 0 ? void 0 : _0.layout) === null || _1 === void 0 ? void 0 : _1.attrs.showDefaultAddButton) !== false && (_jsx(SolidCreateButton, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, solidListViewLayout: solidListViewLayout, responsiveIconOnly: true })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) &&
-                                                        ((_2 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _2 === void 0 ? void 0 : _2.create) !== false &&
+                                                        ((_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'))) &&
+                                                        ((_5 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _5 === void 0 ? void 0 : _5.create) !== false &&
                                                         params.embeded == true &&
                                                         params.inlineCreate == true &&
-                                                        searchParams.get("viewMode") !== "view" && (_jsx(SolidButton, { type: "button", icon: (_3 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _3 === void 0 ? void 0 : _3.addButtonIcon, leftIcon: !((_4 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _4 === void 0 ? void 0 : _4.addButtonIcon) ? _jsx(Plus, { size: 14 }) : undefined, className: "".concat((_5 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _5 === void 0 ? void 0 : _5.addButtonClassName), size: "small", onClick: function () { return params.handleAddClickForEmbeddedView("new"); }, children: ((_6 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _6 === void 0 ? void 0 : _6.addButtonTitle) ? (_7 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _7 === void 0 ? void 0 : _7.addButtonTitle : "Add" })), params.embeded !== true && (_jsx(SolidButton, { type: "button", size: "small", variant: "outline", className: "solid-icon-button ", onClick: function () {
+                                                        searchParams.get("viewMode") !== "view" && (_jsx(SolidButton, { type: "button", icon: (_6 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _6 === void 0 ? void 0 : _6.addButtonIcon, leftIcon: !((_7 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _7 === void 0 ? void 0 : _7.addButtonIcon) ? _jsx(Plus, { size: 14 }) : undefined, className: "".concat((_8 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _8 === void 0 ? void 0 : _8.addButtonClassName), size: "small", onClick: function () { return params.handleAddClickForEmbeddedView("new"); }, children: ((_9 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _9 === void 0 ? void 0 : _9.addButtonTitle) ? (_10 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _10 === void 0 ? void 0 : _10.addButtonTitle : "Add" })), params.embeded !== true && (_jsx(SolidButton, { type: "button", size: "small", variant: "outline", className: "solid-icon-button ", onClick: function () {
                                                             setQueryString();
-                                                        }, leftIcon: _jsx(RefreshCw, { size: 14 }) })), showArchived && (_jsx(SolidButton, { type: "button", size: "small", variant: "secondary", className: "hidden lg:flex", onClick: function () { return setRecoverDialogVisible(true); }, leftIcon: _jsx(RotateCcw, { size: 14 }), children: "Recover" })), params.embeded === false &&
-                                                        ((_8 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _8 === void 0 ? void 0 : _8.configureView) !== false && (_jsx(SolidListViewConfigure, { listViewMetaData: solidListViewMetaData, solidListViewLayout: solidListViewLayout, setShowArchived: setShowArchived, showArchived: showArchived, viewData: solidListViewMetaData, sizeOptions: sizeOptions, setSize: setSize, size: size, viewModes: viewModes, params: params, actionsAllowed: actionsAllowed, selectedRecords: selectedRecords, setDialogVisible: setDialogVisible, setShowSaveFilterPopup: setShowSaveFilterPopup, filters: filters, handleFetchUpdatedRecords: handleFetchUpdatedRecords, setRecoverDialogVisible: setRecoverDialogVisible }))] })] }), showGlobalSearchElement && params.embeded === false && (_jsx("div", { className: "flex lg:hidden", children: _jsx(SolidGlobalSearchElement, { viewType: "list", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidListViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter, filterPredicates: filterPredicates }) }))] }), showListBodyLoadingPlaceholder ? (_jsx("div", { className: "solid-view-loading-body-spacer flex-1 min-h-0" })) : (_jsx(_Fragment, { children: isListViewEmptyWithoutFilters ? (_jsx(SolidEmptyListViewPlaceholder, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, actionsAllowed: actionsAllowed, params: params, solidListViewMetaData: solidListViewMetaData, handleFetchUpdatedRecords: handleFetchUpdatedRecords })) : (_jsx("div", { className: "solid-datatable-wrapper solid-list-table-area flex-1 min-h-0 overflow-hidden ".concat(styles.listTableArea), children: _jsxs(DataTable, { value: listViewData, 
+                                                        }, leftIcon: _jsx(RefreshCw, { size: 14 }) })), showArchived && selectedRecoverRecords.length > 0 && (_jsx(SolidButton, { type: "button", size: "small", variant: "secondary", className: "hidden lg:flex", onClick: function () { return setRecoverDialogVisible(true); }, leftIcon: _jsx(RotateCcw, { size: 14 }), children: "Recover" })), params.embeded === false &&
+                                                        ((_11 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _11 === void 0 ? void 0 : _11.configureView) !== false && (_jsx(SolidListViewConfigure, { listViewMetaData: solidListViewMetaData, solidListViewLayout: solidListViewLayout, setShowArchived: setShowArchived, showArchived: showArchived, viewData: solidListViewMetaData, sizeOptions: sizeOptions, setSize: setSize, size: size, viewModes: viewModes, params: params, actionsAllowed: actionsAllowed, selectedRecords: selectedRecords, setDialogVisible: setDialogVisible, setShowSaveFilterPopup: setShowSaveFilterPopup, filters: filters, handleFetchUpdatedRecords: handleFetchUpdatedRecords, setRecoverDialogVisible: setRecoverDialogVisible }))] })] }), showGlobalSearchElement && params.embeded === false && window.innerWidth < 991 && (_jsx("div", { className: "flex lg:hidden", children: _jsx(SolidGlobalSearchElement, { viewType: "list", showSaveFilterPopup: showSaveFilterPopup, setShowSaveFilterPopup: setShowSaveFilterPopup, ref: solidGlobalSearchElementRef, viewData: solidListViewMetaData, handleApplyCustomFilter: handleApplyCustomFilter, filterPredicates: filterPredicates }) }))] }), showListBodyLoadingPlaceholder ? (_jsx("div", { className: "solid-view-loading-body-spacer flex-1 min-h-0" })) : (_jsx(_Fragment, { children: isListViewEmptyWithoutFilters ? (_jsx(SolidEmptyListViewPlaceholder, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, actionsAllowed: actionsAllowed, params: params, solidListViewMetaData: solidListViewMetaData, handleFetchUpdatedRecords: handleFetchUpdatedRecords })) : (_jsx("div", { className: "solid-datatable-wrapper solid-list-table-area flex-1 min-h-0 overflow-hidden ".concat(styles.listTableArea), children: _jsxs(DataTable, { value: listViewData, 
                                     // viewportHeight={params.embeded === true ? undefined : "calc(100dvh - 128px)"}
                                     rowClassName: function (rowData) {
                                         return rowData.deletedAt ? "greyed-out-row" : "";
                                     }, showGridlines: false, lazy: true, scrollable: true, 
                                     // scrollHeight="90vh"
-                                    size: size, resizableColumns: true, columnResizeMode: "expand", paginator: true, rows: rows, rowsPerPageOptions: (_9 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _9 === void 0 ? void 0 : _9.pageSizeOptions, dataKey: "id", emptyMessage: ((_12 = (_11 = (_10 = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _10 === void 0 ? void 0 : _10.solidView) === null || _11 === void 0 ? void 0 : _11.model) === null || _12 === void 0 ? void 0 : _12.description) ||
+                                    size: size, resizableColumns: true, columnResizeMode: "expand", paginator: true, rows: rows, rowsPerPageOptions: (_12 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _12 === void 0 ? void 0 : _12.pageSizeOptions, dataKey: "id", emptyMessage: ((_15 = (_14 = (_13 = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _13 === void 0 ? void 0 : _13.solidView) === null || _14 === void 0 ? void 0 : _14.model) === null || _15 === void 0 ? void 0 : _15.description) ||
                                         "No Entities found", filterDisplay: "menu", totalRecords: totalRecords, first: first, onPage: onPageChange, onSort: function (e) { return onSort(e); }, sortField: sortField || undefined, sortOrder: sortOrder, loading: false, 
                                     // loading={loading || isLoading}
                                     selection: params.embeded === true
                                         ? []
-                                        : __spreadArray(__spreadArray([], selectedRecords, true), selectedRecoverRecords, true), onSelectionChange: params.embeded === true ? undefined : onSelectionChange, selectionMode: params.embeded === true ? null : "checkbox", removableSort: (_14 = (_13 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _13 === void 0 ? void 0 : _13.removableSort) !== null && _14 !== void 0 ? _14 : true, sortMode: "single", paginatorTemplate: "RowsPerPageDropdown CurrentPageReport PrevPageLink NextPageLink", currentPageReportTemplate: "{first} - {last} of {totalRecords}", onRowClick: function (e) {
+                                        : __spreadArray(__spreadArray([], selectedRecords, true), selectedRecoverRecords, true), onSelectionChange: params.embeded === true ? undefined : onSelectionChange, selectionMode: params.embeded === true ? null : "checkbox", removableSort: (_17 = (_16 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _16 === void 0 ? void 0 : _16.removableSort) !== null && _17 !== void 0 ? _17 : true, sortMode: "single", paginatorTemplate: "RowsPerPageDropdown CurrentPageReport PrevPageLink NextPageLink", currentPageReportTemplate: "{first} - {last} of {totalRecords}", onRowClick: function (e) {
                                         var _a, _b;
                                         var rowData = e.data;
                                         if (((_a = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _a === void 0 ? void 0 : _a.disableRowClick) === true)
                                             return;
+                                        if (rowData === null || rowData === void 0 ? void 0 : rowData.deletedAt)
+                                            return;
                                         var hasFindPermission = actionsAllowed.includes(permissionExpression(params.modelName, 'findOne'));
                                         var hasUpdatePermission = actionsAllowed.includes(permissionExpression(params.modelName, 'update')) &&
                                             ((_b = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _b === void 0 ? void 0 : _b.edit) !== false;
@@ -1187,21 +1291,11 @@ export var SolidListView = forwardRef(function (params, ref) {
                                             params.handleEditClickForEmbeddedView(rowData === null || rowData === void 0 ? void 0 : rowData.id);
                                         }
                                         else {
-                                            if (typeof window !== "undefined") {
-                                                // store a simple marker for the caller
-                                                // also store the full current URL so Back can restore exact state (including action params)
-                                                try {
-                                                    sessionStorage.setItem("fromView", "list");
-                                                    sessionStorage.setItem("fromViewUrl", window.location.pathname + window.location.search);
-                                                }
-                                                catch (e) {
-                                                    // ignore storage errors
-                                                }
-                                            }
-                                            router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=view&").concat(new URLSearchParams(editActionQueryParams).toString()));
+                                            storeCurrentModelViewContext();
+                                            router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=view&").concat(buildEditNavigationQueryString(rowData)));
                                         }
-                                    }, children: [params.embeded === true ? null : (_jsx(Column, { selectionMode: "multiple", headerStyle: { width: "3em" } })), solidListViewMetaData && solidListViewLayout && renderColumnsDynamically(solidListViewMetaData, solidListViewLayout), ((_15 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _15 === void 0 ? void 0 : _15.rowButtons) &&
-                                            ((_16 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _16 === void 0 ? void 0 : _16.rowButtons.filter(function (rb) {
+                                    }, 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) {
                                                 var _a, _b;
                                                 var roles = ((_a = rb === null || rb === void 0 ? void 0 : rb.attrs) === null || _a === void 0 ? void 0 : _a.roles) || [];
                                                 var isInContextMenu = rb.attrs.actionInContextMenu === true;
@@ -1233,8 +1327,8 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                         })());
                                                     } }, index));
                                             })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'update'))) &&
-                                            ((_17 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _17 === void 0 ? void 0 : _17.edit) !== false &&
-                                            ((_18 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _18 === void 0 ? void 0 : _18.showRowEditInContextMenu) ===
+                                            ((_20 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _20 === void 0 ? void 0 : _20.edit) !== false &&
+                                            ((_21 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _21 === void 0 ? void 0 : _21.showRowEditInContextMenu) ===
                                                 false && (_jsx(Column, { header: "Edit", body: function (rowData) {
                                                 var shouldHideEditOrDeleteButton = isDraftPublishWorkflowEnabled && (rowData === null || rowData === void 0 ? void 0 : rowData.publishedAt);
                                                 return (_jsx(_Fragment, { children: !shouldHideEditOrDeleteButton && (_jsx(SolidButton, { type: "button", variant: "ghost", className: "solid-inline-row-button solid-inline-row-button-icon", size: "small", leftIcon: _jsx(Pencil, { size: 14 }), onClick: function () {
@@ -1242,21 +1336,15 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                                 params.handleEditClickForEmbeddedView(rowData === null || rowData === void 0 ? void 0 : rowData.id);
                                                             }
                                                             else {
-                                                                if (typeof window !== "undefined") {
-                                                                    try {
-                                                                        sessionStorage.setItem("fromView", "list");
-                                                                        sessionStorage.setItem("fromViewUrl", window.location.pathname + window.location.search);
-                                                                    }
-                                                                    catch (e) { }
-                                                                }
-                                                                router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=edit&").concat(new URLSearchParams(editActionQueryParams).toString()));
+                                                                storeCurrentModelViewContext();
+                                                                router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=edit&").concat(buildEditNavigationQueryString(rowData)));
                                                             }
                                                         } })) }));
                                             } })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'delete'))) &&
-                                            ((_19 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _19 === void 0 ? void 0 : _19.delete) !== false &&
+                                            ((_22 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _22 === void 0 ? void 0 : _22.delete) !== false &&
                                             (params.embeded ||
-                                                (((_20 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _20 === void 0 ? void 0 : _20.showRowDeleteInContextMenu) !== undefined &&
-                                                    ((_21 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _21 === void 0 ? void 0 : _21.showRowDeleteInContextMenu) !== true))
+                                                (((_23 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _23 === void 0 ? void 0 : _23.showRowDeleteInContextMenu) !== undefined &&
+                                                    ((_24 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _24 === void 0 ? void 0 : _24.showRowDeleteInContextMenu) !== true))
                                             &&
                                                 (_jsx(Column, { header: "Delete", body: function (rowData) {
                                                         var shouldHideEditOrDeleteButton = isDraftPublishWorkflowEnabled && (rowData === null || rowData === void 0 ? void 0 : rowData.publishedAt);
@@ -1271,10 +1359,10 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                                 } })) }));
                                                     } })), hasAnyContextMenuActions && (_jsx(Column, { frozen: true, alignFrozen: "right", body: function (rowData) {
                                                 var _a;
-                                                return (rowData === null || rowData === void 0 ? void 0 : rowData.deletedAt) ? (_jsx("a", { 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) !==
+                                                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) {
+                                                            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 && (_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) {
                                                                 selectedDataRef.current = selectedRow;
                                                                 setSelectedSolidViewData(selectedRow);
@@ -1283,12 +1371,8 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                                     params.handleEditClickForEmbeddedView(selectedRow === null || selectedRow === void 0 ? void 0 : selectedRow.id);
                                                                 }
                                                                 else {
-                                                                    try {
-                                                                        sessionStorage.setItem("fromView", "list");
-                                                                        sessionStorage.setItem("fromViewUrl", window.location.pathname + window.location.search);
-                                                                    }
-                                                                    catch (e) { }
-                                                                    router.push("".concat(editBaseUrl, "/").concat(selectedRow === null || selectedRow === void 0 ? void 0 : selectedRow.id, "?viewMode=edit&").concat(new URLSearchParams(editActionQueryParams).toString()));
+                                                                    storeCurrentModelViewContext();
+                                                                    router.push("".concat(editBaseUrl, "/").concat(selectedRow === null || selectedRow === void 0 ? void 0 : selectedRow.id, "?viewMode=edit&").concat(buildEditNavigationQueryString(selectedRow)));
                                                                 }
                                                             }, onDelete: function (selectedRow) {
                                                                 setSelectedSolidViewData(selectedRow);
@@ -1302,7 +1386,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                     if (!open) {
                         closeListViewRowActionPopup();
                     }
-                }, children: [_jsxs(SolidDialogHeader, { children: [_jsx(SolidDialogTitle, { children: ((_22 = listViewRowActionData === null || listViewRowActionData === void 0 ? void 0 : listViewRowActionData.rowAction) === null || _22 === void 0 ? void 0 : _22.label) || "Action" }), _jsx(SolidDialogClose, {})] }), _jsx(SolidDialogSeparator, {}), _jsx(SolidDialogBody, { children: _jsx(ListViewRowActionPopup, { context: listViewRowActionData }) })] })), _jsx(SolidConfirmDialog, { open: deleteEntity, onCancel: function () { return setDeleteEntity(false); }, onConfirm: handleDeleteEntity, className: "solid-shadcn-confirm-dialog solid-delete-confirm-dialog", headerClassName: "solid-shadcn-dialog-head", bodyClassName: "solid-shadcn-dialog-body", footerClassName: "solid-shadcn-dialog-actions", separatorClassName: "solid-shadcn-dialog-sep", showSeparator: true, title: "Delete ".concat(entityDisplayName), message: _jsx("p", { className: "solid-shadcn-dialog-text", children: "Are you sure you want to delete this ".concat(entityDisplayName, "?") }), confirmLabel: "Delete", cancelLabel: "Cancel" }), openLightbox && (_jsx(SolidLightbox, { open: openLightbox, slides: lightboxSlides, onClose: function () { return setOpenLightbox(false); } }))] }));
+                }, children: [_jsxs(SolidDialogHeader, { children: [_jsx(SolidDialogTitle, { children: ((_25 = listViewRowActionData === null || listViewRowActionData === void 0 ? void 0 : listViewRowActionData.rowAction) === null || _25 === void 0 ? void 0 : _25.label) || "Action" }), _jsx(SolidDialogClose, {})] }), _jsx(SolidDialogSeparator, {}), _jsx(SolidDialogBody, { children: _jsx(ListViewRowActionPopup, { context: listViewRowActionData }) })] })), _jsx(SolidConfirmDialog, { open: deleteEntity, onCancel: function () { return setDeleteEntity(false); }, onConfirm: handleDeleteEntity, className: "solid-shadcn-confirm-dialog solid-delete-confirm-dialog", headerClassName: "solid-shadcn-dialog-head", bodyClassName: "solid-shadcn-dialog-body", footerClassName: "solid-shadcn-dialog-actions", separatorClassName: "solid-shadcn-dialog-sep", showSeparator: true, title: "Delete ".concat(entityDisplayName), message: _jsx("p", { className: "solid-shadcn-dialog-text", children: "Are you sure you want to delete this ".concat(entityDisplayName, "?") }), confirmLabel: "Delete", cancelLabel: "Cancel" }), openLightbox && (_jsx(SolidLightbox, { open: openLightbox, slides: lightboxSlides, onClose: function () { return setOpenLightbox(false); } }))] }));
 });
 SolidListView.displayName = "SolidListView";
 //# sourceMappingURL=SolidListView.js.map