@solidxai/core-ui 0.1.9-beta.2 → 0.1.9-beta.20

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

@@ -60,7 +60,7 @@ import { SolidDataTable as DataTable, Column } from "./SolidDataTable";
 import qs from "qs";
 import { createSolidEntityApi } from "../../../redux/api/solidEntityApi";
 import { useGetSolidViewLayoutQuery } from "../../../redux/api/solidViewApi";
-import { SolidListViewColumn } from "./SolidListViewColumn";
+import { SolidListViewColumn, isFieldSortable } from "./SolidListViewColumn";
 import { SolidCreateButton } from "../common/SolidCreateButton";
 import { SolidGlobalSearchElement } from "../common/SolidGlobalSearchElement";
 import { useLazyCheckIfPermissionExistsQuery } from "../../../redux/api/userApi";
@@ -77,22 +77,22 @@ import { SolidLightbox } from "../../shad-cn-ui/SolidLightbox";
 import { SolidListViewConfigure } from "./SolidListViewConfigure";
 import { SolidEmptyListViewPlaceholder } from "./SolidEmptyListViewPlaceholder";
 import { useHandleListCustomButtonClick } from "../../../components/common/useHandleListCustomButtonClick";
+import { isButtonVisibleInCurrentEnv } from "../../../helpers/buttonEnvironment";
 import { hasAnyRole } from "../../../helpers/rolesHelper";
 import { SolidListViewHeaderButton } from "./SolidListViewHeaderButton";
+import { resolveButtonPresentation } from "../../../helpers/buttonPresentation";
 import { useDispatch, useSelector } from "react-redux";
 import styles from "./SolidListViewWrapper.module.css";
 import { getExtensionFunction } from "../../../helpers/registry";
 import { useSession } from "../../../hooks/useSession";
 import { ERROR_MESSAGES } from "../../../constants/error-messages";
-// import { SolidAiMainWrapper } from "../solid-ai/SolidAiMainWrapper"; // moved to SolidX Studio panel
-import { showNavbar, toggleNavbar } from "../../../redux/features/navbarSlice";
 import { normalizeSolidListTreeKanbanActionPath } from "../../../helpers/routePaths";
 import { getMediaTypeFromUrl } from "../../../helpers/mediaType";
 import { SolidListViewRowActionsMenu } from "./SolidListViewRowActionsMenu";
 import { SolidHeaderRequestStatus } from "../../common/SolidHeaderRequestStatus";
 import { SolidButton, SolidConfirmDialog, SolidDialog, SolidDialogBody, SolidDialogClose, SolidDialogFooter, SolidDialogHeader, SolidDialogSeparator, SolidDialogTitle, } from "../../shad-cn-ui";
 import { FilterMatchMode } from "../filter/filterMatchMode";
-import { LayoutGrid, Pencil, Plus, RefreshCw, RotateCcw, Search, SquarePen, Trash2 } from "lucide-react";
+import { Pencil, Plus, RefreshCw, RotateCcw, Search, Trash2 } from "lucide-react";
 // import { ERROR_MESSAGES } from "../../../constants/error-messages";
 var getRandomInt = function (min, max) {
     return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -148,7 +148,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, _23;
+    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 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,37 +158,42 @@ export var SolidListView = forwardRef(function (params, ref) {
     var router = useRouter();
     var searchParams = useSearchParams();
     var localeName = searchParams.get("locale");
-    var _24 = useState(null), solidListViewMetaData = _24[0], setSolidListViewMetaData = _24[1];
-    var _25 = useState(null), solidListViewLayout = _25[0], setSolidListViewLayout = _25[1];
-    var _26 = useState(false), isDraftPublishWorkflowEnabled = _26[0], setIsDraftPublishWorkflowEnabled = _26[1];
+    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];
     // Filter query realted states
-    var _27 = useState(null), filters = _27[0], setFilters = _27[1];
-    var _28 = useState(0), totalRecords = _28[0], setTotalRecords = _28[1];
-    var _29 = useState(0), first = _29[0], setFirst = _29[1];
-    var _30 = 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 = _30[0], setRows = _30[1];
-    var _31 = useState("id"), sortField = _31[0], setSortField = _31[1];
-    var _32 = useState(-1), sortOrder = _32[0], setSortOrder = _32[1];
-    var _33 = useState([]), toPopulate = _33[0], setToPopulate = _33[1];
-    var _34 = useState([]), toPopulateMedia = _34[0], setToPopulateMedia = _34[1];
-    var _35 = useState([]), actionsAllowed = _35[0], setActionsAllowed = _35[1];
+    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];
     // All list view state.
-    var _36 = useState([]), listViewData = _36[0], setListViewData = _36[1];
-    var _37 = useState([]), selectedRecords = _37[0], setSelectedRecords = _37[1];
-    var _38 = useState([]), selectedRecoverRecords = _38[0], setSelectedRecoverRecords = _38[1];
-    var _39 = useState(true), loading = _39[0], setLoading = _39[1];
-    var _40 = useState(false), isDialogVisible = _40[0], setDialogVisible = _40[1];
-    var _41 = useState(false), isRecoverDialogVisible = _41[0], setRecoverDialogVisible = _41[1];
-    var _42 = useState(), createButtonUrl = _42[0], setCreateButtonUrl = _42[1];
-    var _43 = useState(), editButtonUrl = _43[0], setEditButtonUrl = _43[1];
-    var _44 = useState({}), createActionQueryParams = _44[0], setCreateActionQueryParams = _44[1];
-    var _45 = useState({}), editActionQueryParams = _45[0], setEditActionQueryParams = _45[1];
-    var _46 = useState(false), showArchived = _46[0], setShowArchived = _46[1];
-    var _47 = useState(false), queryDataLoaded = _47[0], setQueryDataLoaded = _47[1];
-    var _48 = useState(null), filterPredicates = _48[0], setFilterPredicates = _48[1];
-    var _49 = useState(false), showSaveFilterPopup = _49[0], setShowSaveFilterPopup = _49[1];
-    var _50 = useState(false), showGlobalSearchElement = _50[0], setShowGlobalSearchElement = _50[1];
+    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 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]);
     var editBaseUrl = useMemo(function () { return normalizeSolidListTreeKanbanActionPath(pathname, editButtonUrl || "form"); }, [editButtonUrl, pathname]);
     useEffect(function () {
         var fetchPermissions = function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -247,7 +252,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;
@@ -374,15 +379,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, 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, 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) {
@@ -414,9 +419,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;
@@ -424,6 +429,7 @@ export var SolidListView = forwardRef(function (params, ref) {
         if (solidListViewMetaData && solidListViewLayout) {
             var queryObject = getFilterObjectFromLocalStorage();
             if (queryObject) {
+                suppressNextFilterPaginationResetRef.current = true;
                 var queryData = {
                     offset: queryObject.offset || 0,
                     limit: queryObject.limit || 25,
@@ -619,11 +625,16 @@ export var SolidListView = forwardRef(function (params, ref) {
                     currentSortOrder = latestSortOrderRef.current;
                     if (currentSortField && (currentSortOrder === 1 || currentSortOrder === -1)) {
                         meta = solidFieldsMetadata === null || solidFieldsMetadata === void 0 ? void 0 : solidFieldsMetadata[currentSortField];
-                        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((_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);
+                        if (!isFieldSortable(meta)) {
+                            queryData.sort = ["id:desc"];
+                        }
+                        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((_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")];
                         }
-                        queryData.sort = ["".concat(resolvedField, ":").concat(currentSortOrder === 1 ? "asc" : "desc")];
                     }
                     else {
                         queryData.sort = ["id:desc"];
@@ -668,8 +679,9 @@ export var SolidListView = forwardRef(function (params, ref) {
                     return [3 /*break*/, 4];
                 case 4:
                     queryString = qs.stringify(queryData, { encodeValuesOnly: true });
-                    if (latestFilterPredicatesRef.current && latestFilterPredicatesRef.current.persistFilter) {
+                    if (latestFilterPredicatesRef.current) {
                         fileterTobeStored = structuredClone(queryData);
+                        fileterTobeStored.finalFullFilter = fileterTobeStored.filters;
                         delete fileterTobeStored.filters;
                         fileterTobeStored.custom_filter_predicate = latestFilterPredicatesRef.current.custom_filter_predicate || null;
                         fileterTobeStored.search_predicate = latestFilterPredicatesRef.current.search_predicate || null;
@@ -700,6 +712,20 @@ export var SolidListView = forwardRef(function (params, ref) {
             queryfilter.$and.push(filterPredicates.predefined_search_predicate);
         }
         var updatedFilter = queryfilter;
+        var previousPredicates = latestFilterPredicatesRef.current;
+        var nextPredicatesComparable = {
+            custom_filter_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.custom_filter_predicate) || null,
+            search_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.search_predicate) || null,
+            saved_filter_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.saved_filter_predicate) || null,
+            predefined_search_predicate: (filterPredicates === null || filterPredicates === void 0 ? void 0 : filterPredicates.predefined_search_predicate) || null,
+        };
+        var previousPredicatesComparable = {
+            custom_filter_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.custom_filter_predicate) || null,
+            search_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.search_predicate) || null,
+            saved_filter_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.saved_filter_predicate) || null,
+            predefined_search_predicate: (previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.predefined_search_predicate) || null,
+        };
+        var hasPredicateChanged = JSON.stringify(previousPredicatesComparable) !== JSON.stringify(nextPredicatesComparable);
         // Update refs IMMEDIATELY (synchronously)
         latestFiltersRef.current = updatedFilter;
         var updatedFilterPredicates = structuredClone(filterPredicates);
@@ -708,7 +734,54 @@ export var SolidListView = forwardRef(function (params, ref) {
         // Then update state
         setFilters(updatedFilter);
         setFilterPredicates(updatedFilterPredicates);
-        setFirst(0);
+        var hasMeaningfulFilterValueLocal = 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 hasMeaningfulFilterValueLocal(item); });
+            if (typeof value === "object")
+                return hasAppliedFiltersLocal(value);
+            return false;
+        };
+        var hasAppliedFiltersLocal = function (filterObject) {
+            if (!filterObject || typeof filterObject !== "object")
+                return false;
+            if (Array.isArray(filterObject)) {
+                return filterObject.some(function (item) { return hasAppliedFiltersLocal(item) || hasMeaningfulFilterValueLocal(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 hasMeaningfulFilterValueLocal(val);
+                if ((key === "$and" || key === "$or") && Array.isArray(val)) {
+                    return val.some(function (item) { return hasAppliedFiltersLocal(item) || hasMeaningfulFilterValueLocal(item); });
+                }
+                if (typeof val === "object")
+                    return hasAppliedFiltersLocal(val);
+                return hasMeaningfulFilterValueLocal(val);
+            });
+        };
+        var hasCurrentMeaningfulPredicates = hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.custom_filter_predicate) ||
+            hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.search_predicate) ||
+            hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.saved_filter_predicate) ||
+            hasAppliedFiltersLocal(updatedFilterPredicates === null || updatedFilterPredicates === void 0 ? void 0 : updatedFilterPredicates.predefined_search_predicate);
+        var hasPreviousMeaningfulPredicates = hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.custom_filter_predicate) ||
+            hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.search_predicate) ||
+            hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.saved_filter_predicate) ||
+            hasAppliedFiltersLocal(previousPredicates === null || previousPredicates === void 0 ? void 0 : previousPredicates.predefined_search_predicate);
+        var shouldResetPagination = hasPredicateChanged && (hasCurrentMeaningfulPredicates || hasPreviousMeaningfulPredicates);
+        if (suppressNextFilterPaginationResetRef.current) {
+            suppressNextFilterPaginationResetRef.current = false;
+        }
+        else if (shouldResetPagination) {
+            setFirst(0);
+        }
         // Force synchronous state updates
     };
     // clear Filter
@@ -779,9 +852,9 @@ export var SolidListView = forwardRef(function (params, ref) {
         loading,
         listViewData,
     ]);
-    var _65 = useState(), selectedSolidViewData = _65[0], setSelectedSolidViewData = _65[1];
+    var _64 = useState(), selectedSolidViewData = _64[0], setSelectedSolidViewData = _64[1];
     var selectedDataRef = useRef();
-    var _66 = useState(false), deleteEntity = _66[0], setDeleteEntity = _66[1];
+    var _65 = useState(false), deleteEntity = _65[0], setDeleteEntity = _65[1];
     // Recover functions
     var recoverById = function (id) {
         triggerRecoverSolidEntitiesById(id);
@@ -854,9 +927,9 @@ export var SolidListView = forwardRef(function (params, ref) {
         setSelectedRecords([]);
         setSelectedRecoverRecords([]);
     };
-    var entityDisplayName = ((_f = (_e = (_d = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _d === void 0 ? void 0 : _d.solidView) === null || _e === void 0 ? void 0 : _e.model) === null || _f === void 0 ? void 0 : _f.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 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];
     // Render columns dynamically based on metadata
     var renderColumnsDynamically = function (solidListViewMetaData, solidListViewLayout) {
         var _a;
@@ -887,6 +960,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                         column: column,
                         setLightboxUrls: setLightboxUrls,
                         setOpenLightbox: setOpenLightbox,
+                        embeded: params.embeded
                     });
                 }
                 else {
@@ -900,6 +974,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                     column: column,
                     setLightboxUrls: setLightboxUrls,
                     setOpenLightbox: setOpenLightbox,
+                    embeded: params.embeded
                 });
             }
         });
@@ -1053,46 +1128,46 @@ export var SolidListView = forwardRef(function (params, ref) {
             .filter(function (slide) { return !!slide; })
         : [];
     var hasEditInContextMenu = actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'update'))) &&
-        ((_g = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _g === void 0 ? void 0 : _g.edit) !== false &&
-        ((_h = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _h === void 0 ? void 0 : _h.showDefaultEditButton) !== false &&
-        ((_j = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _j === void 0 ? void 0 : _j.showRowEditInContextMenu) !== false &&
-        !(isDraftPublishWorkflowEnabled && ((_k = selectedDataRef.current) === null || _k === void 0 ? void 0 : _k.publishedAt));
+        ((_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'))) &&
-        ((_l = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _l === void 0 ? void 0 : _l.delete) !== false &&
-        ((_m = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _m === void 0 ? void 0 : _m.showRowDeleteInContextMenu) !== false &&
-        !(isDraftPublishWorkflowEnabled && ((_o = selectedDataRef.current) === null || _o === void 0 ? void 0 : _o.publishedAt));
-    var hasCustomContextMenuButtons = (_q = (_p = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _p === void 0 ? void 0 : _p.rowButtons) === null || _q === void 0 ? void 0 : _q.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; });
+        ((_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 &&
+        !(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 hasAnyContextMenuActions = hasEditInContextMenu || hasDeleteInContextMenu || hasCustomContextMenuButtons;
-    var toggleBothSidebars = function () {
-        if (visibleNavbar) {
-            dispatch(toggleNavbar()); // close both
-        }
-        else {
-            dispatch(showNavbar()); // open both
-        }
-    };
-    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 h-full flex flex-column flex-grow-1 ".concat(styles.ListContentWrapper), children: _jsxs("div", { className: "solid-list-surface flex flex-column flex-1 min-h-0", children: [solidListViewInitialMetaData &&
-                            _jsxs("div", { className: "page-header solid-list-toolbar flex-column lg:flex-row", children: [_jsxs("div", { className: "flex justify-content-between w-full", children: [_jsxs("div", { className: "flex gap-3 align-items-center w-full solid-list-toolbar-left", children: [_jsxs("div", { className: 'flex align-items-center gap-2', children: [params.embeded !== true &&
-                                                                _jsx("div", { className: "apps-icon block md:hidden cursor-pointer", onClick: toggleBothSidebars, children: _jsx(LayoutGrid, { size: 18 }) }), _jsx("p", { className: "m-0 view-title solid-text-wrapper", children: ((_t = (_s = (_r = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _r === void 0 ? void 0 : _r.solidView) === null || _s === void 0 ? void 0 : _s.action) === null || _t === void 0 ? void 0 : _t.displayName) || ((_v = (_u = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _u === void 0 ? void 0 : _u.solidView) === null || _v === void 0 ? void 0 : _v.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 align-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: "hidden lg:flex align-items-center solid-header-buttons-wrapper", children: (_y = (_x = (_w = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _w === void 0 ? void 0 : _w.headerButtons) === null || _x === void 0 ? void 0 : _x.filter(function (rb) { return rb.attrs.actionInContextMenu != true; })) === null || _y === void 0 ? void 0 : _y.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'))) &&
-                                                        ((_z = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _z === void 0 ? void 0 : _z.create) !== false &&
+    // const toggleBothSidebars = () => {
+    //   if (visibleNavbar) {
+    //     dispatch(toggleNavbar());   // close both
+    //   } else {
+    //     dispatch(showNavbar());     // open both
+    //   }
+    // };
+    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-column flex-grow-1 ".concat(styles.ListContentWrapper), children: _jsxs("div", { className: "solid-list-surface flex flex-column flex-1 min-h-0", children: [solidListViewInitialMetaData &&
+                            _jsxs("div", { className: "page-header solid-list-toolbar flex-column lg:flex-row", children: [_jsxs("div", { className: "flex justify-content-between w-full", children: [_jsxs("div", { className: "flex gap-3 align-items-center w-full solid-list-toolbar-left", children: [_jsx("div", { className: 'flex align-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 align-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: "hidden lg:flex align-items-center solid-header-buttons-wrapper", 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 &&
                                                         params.embeded !== true &&
-                                                        ((_2 = (_1 = (_0 = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _0 === void 0 ? void 0 : _0.solidView) === null || _1 === void 0 ? void 0 : _1.layout) === null || _2 === void 0 ? void 0 : _2.attrs.showDefaultAddButton) !== false && (_jsx(SolidCreateButton, { createButtonUrl: createButtonUrl, createActionQueryParams: createActionQueryParams, solidListViewLayout: solidListViewLayout, responsiveIconOnly: true })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'create'))) &&
-                                                        ((_3 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _3 === void 0 ? void 0 : _3.create) !== false &&
+                                                        ((_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 &&
                                                         params.embeded == true &&
                                                         params.inlineCreate == true &&
-                                                        searchParams.get("viewMode") !== "view" && (_jsx(SolidButton, { type: "button", icon: (_4 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _4 === void 0 ? void 0 : _4.addButtonIcon, leftIcon: !((_5 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _5 === void 0 ? void 0 : _5.addButtonIcon) ? _jsx(Plus, { size: 14 }) : undefined, className: "".concat((_6 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _6 === void 0 ? void 0 : _6.addButtonClassName), size: "small", onClick: function () { return params.handleAddClickForEmbeddedView("new"); }, children: ((_7 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _7 === void 0 ? void 0 : _7.addButtonTitle) ? (_8 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _8 === void 0 ? void 0 : _8.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: (_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 () {
                                                             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 &&
-                                                        ((_9 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _9 === void 0 ? void 0 : _9.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, viewportHeight: params.embeded === true ? undefined : "calc(100dvh - 128px)", rowClassName: function (rowData) {
+                                                        ((_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, 
+                                    // 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: (_10 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _10 === void 0 ? void 0 : _10.pageSizeOptions, dataKey: "id", emptyMessage: ((_13 = (_12 = (_11 = solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data) === null || _11 === void 0 ? void 0 : _11.solidView) === null || _12 === void 0 ? void 0 : _12.model) === null || _13 === void 0 ? void 0 : _13.description) ||
+                                    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) ||
                                         "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: (_15 = (_14 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _14 === void 0 ? void 0 : _14.removableSort) !== null && _15 !== void 0 ? _15 : 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: (_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) {
                                         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)
@@ -1119,8 +1194,8 @@ export var SolidListView = forwardRef(function (params, ref) {
                                             }
                                             router.push("".concat(editBaseUrl, "/").concat(rowData === null || rowData === void 0 ? void 0 : rowData.id, "?viewMode=view&").concat(new URLSearchParams(editActionQueryParams).toString()));
                                         }
-                                    }, children: [params.embeded === true ? null : (_jsx(Column, { selectionMode: "multiple", headerStyle: { width: "3em" } })), solidListViewMetaData && solidListViewLayout && renderColumnsDynamically(solidListViewMetaData, solidListViewLayout), ((_16 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _16 === void 0 ? void 0 : _16.rowButtons) &&
-                                            ((_17 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _17 === void 0 ? void 0 : _17.rowButtons.filter(function (rb) {
+                                    }, 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) {
                                                 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;
@@ -1128,26 +1203,30 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                 var isAllowed = roles.length === 0 ||
                                                     hasAnyRole(user === null || user === void 0 ? void 0 : user.roles, roles);
                                                 var isVisible = ((_b = rb === null || rb === void 0 ? void 0 : rb.attrs) === null || _b === void 0 ? void 0 : _b.visible) !== false;
-                                                return !isInContextMenu && isAllowed && isVisible;
+                                                var isVisibleInCurrentEnv = isButtonVisibleInCurrentEnv(rb === null || rb === void 0 ? void 0 : rb.attrs);
+                                                return !isInContextMenu && isAllowed && isVisible && isVisibleInCurrentEnv;
                                             }).map(function (button, index) {
                                                 return (_jsx(Column, { header: button.attrs.label, body: function (rowData) {
-                                                        var _a, _b, _c, _d;
-                                                        return (_jsx(SolidButton, { type: "button", icon: (_a = button === null || button === void 0 ? void 0 : button.attrs) === null || _a === void 0 ? void 0 : _a.icon, leftIcon: !((_b = button === null || button === void 0 ? void 0 : button.attrs) === null || _b === void 0 ? void 0 : _b.icon) ? _jsx(SquarePen, { size: 14 }) : undefined, className: "solid-inline-row-button w-full text-left gap-2 ".concat(((_c = button === null || button === void 0 ? void 0 : button.attrs) === null || _c === void 0 ? void 0 : _c.className)
-                                                                ? (_d = button === null || button === void 0 ? void 0 : button.attrs) === null || _d === void 0 ? void 0 : _d.className
-                                                                : ""), size: "small", variant: "ghost", onClick: function () {
-                                                                var event = {
-                                                                    params: params,
-                                                                    rowData: rowData,
-                                                                    solidListViewMetaData: solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data,
-                                                                };
-                                                                handleCustomButtonClick(button.attrs, event);
-                                                            }, children: button.attrs.showLabel !== false
-                                                                ? button.attrs.label
-                                                                : "" }));
+                                                        return ((function () {
+                                                            var _a, _b, _c;
+                                                            var presentation = resolveButtonPresentation(button === null || button === void 0 ? void 0 : button.attrs);
+                                                            if (!presentation.showIcon && !presentation.showLabel)
+                                                                return null;
+                                                            return (_jsx(SolidButton, { type: "button", icon: presentation.icon, iconPos: presentation.iconPos, label: presentation.label, tooltip: presentation.tooltip, "aria-label": presentation.isIconOnly ? ((_c = (_a = presentation.tooltip) !== null && _a !== void 0 ? _a : (_b = button === null || button === void 0 ? void 0 : button.attrs) === null || _b === void 0 ? void 0 : _b.action) !== null && _c !== void 0 ? _c : "Action") : undefined, className: "solid-inline-row-button w-full text-left gap-2 ".concat(presentation.buttonClassName
+                                                                    ? presentation.buttonClassName
+                                                                    : ""), size: "small", variant: "ghost", onClick: function () {
+                                                                    var event = {
+                                                                        params: params,
+                                                                        rowData: rowData,
+                                                                        solidListViewMetaData: solidListViewMetaData === null || solidListViewMetaData === void 0 ? void 0 : solidListViewMetaData.data,
+                                                                    };
+                                                                    handleCustomButtonClick(button.attrs, event);
+                                                                } }));
+                                                        })());
                                                     } }, index));
                                             })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'update'))) &&
-                                            ((_18 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _18 === void 0 ? void 0 : _18.edit) !== false &&
-                                            ((_19 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _19 === void 0 ? void 0 : _19.showRowEditInContextMenu) ===
+                                            ((_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) ===
                                                 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 () {
@@ -1166,10 +1245,10 @@ export var SolidListView = forwardRef(function (params, ref) {
                                                             }
                                                         } })) }));
                                             } })), actionsAllowed.includes("".concat(permissionExpression(params.modelName, 'delete'))) &&
-                                            ((_20 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _20 === void 0 ? void 0 : _20.delete) !== false &&
+                                            ((_19 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _19 === void 0 ? void 0 : _19.delete) !== false &&
                                             (params.embeded ||
-                                                (((_21 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _21 === void 0 ? void 0 : _21.showRowDeleteInContextMenu) !== undefined &&
-                                                    ((_22 = solidListViewLayout === null || solidListViewLayout === void 0 ? void 0 : solidListViewLayout.attrs) === null || _22 === void 0 ? void 0 : _22.showRowDeleteInContextMenu) !== true))
+                                                (((_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))
                                             &&
                                                 (_jsx(Column, { header: "Delete", body: function (rowData) {
                                                         var shouldHideEditOrDeleteButton = isDraftPublishWorkflowEnabled && (rowData === null || rowData === void 0 ? void 0 : rowData.publishedAt);
@@ -1215,7 +1294,7 @@ export var SolidListView = forwardRef(function (params, ref) {
                     if (!open) {
                         closeListViewRowActionPopup();
                     }
-                }, children: [_jsxs(SolidDialogHeader, { children: [_jsx(SolidDialogTitle, { children: ((_23 = listViewRowActionData === null || listViewRowActionData === void 0 ? void 0 : listViewRowActionData.rowAction) === null || _23 === void 0 ? void 0 : _23.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: ((_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); } }))] }));
 });
 SolidListView.displayName = "SolidListView";
 //# sourceMappingURL=SolidListView.js.map