@solidxai/core-ui 0.1.9-beta.3 → 0.1.9-beta.5

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

@@ -187,6 +187,7 @@ export var SolidListView = forwardRef(function (params, ref) {
     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 suppressNextFilterPaginationResetRef = useRef(false);
     var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
     var handleCustomButtonClick = useHandleListCustomButtonClick();
     var editBaseUrl = useMemo(function () { return normalizeSolidListTreeKanbanActionPath(pathname, editButtonUrl || "form"); }, [editButtonUrl, pathname]);
@@ -424,6 +425,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,
@@ -668,8 +670,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 +703,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 +725,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