@solidxai/core-ui 0.1.17 → 0.1.18-beta.1

package/dist/components/core/common/SolidGlobalSearchElement.js

@@ -56,10 +56,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useId, useImperativeHandle, useMemo, useRef, useState } from "react";
+import { useDispatch } from "react-redux";
 import FilterComponent, { FilterOperator, FilterRuleType } from "../../../components/core/common/FilterComponent";
 import { toTitleCase } from "../../../helpers/helpers";
 import { clearFilterObjectFromLocalStorage, getFilterObjectFromLocalStorage, setFilterObjectToLocalStorage, } from "./globalSearchPersistence";
 import { createSolidEntityApi } from "../../../redux/api/solidEntityApi";
+import { showToast } from "../../../redux/features/toastSlice";
 import qs from "qs";
 import { SolidSaveCustomFilterForm } from "./SolidSaveCustomFilterForm";
 import { ERROR_MESSAGES } from "../../../constants/error-messages";
@@ -410,12 +412,17 @@ export var mergeAllDiffFilters = function (customFilter, searchFilter, savedFilt
     return filters;
 };
 var SavedFilterList = function (_a) {
-    var savedfilter = _a.savedfilter, activeSavedFilterReference = _a.activeSavedFilterReference, applySavedFilter = _a.applySavedFilter, openSavedCustomFilter = _a.openSavedCustomFilter, setSavedFilterTobeDeleted = _a.setSavedFilterTobeDeleted, setIsDeleteSQDialogVisible = _a.setIsDeleteSQDialogVisible, isFocused = _a.isFocused, onMouseEnter = _a.onMouseEnter, optionId = _a.optionId;
-    var isActive = (savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.systemKey)
-        ? activeSavedFilterReference === savedfilter.systemKey
-        : String(activeSavedFilterReference) === String(savedfilter.id);
+    var savedfilter = _a.savedfilter, activeSavedFilterReference = _a.activeSavedFilterReference, activeSavedFilterReferences = _a.activeSavedFilterReferences, applySavedFilter = _a.applySavedFilter, openSavedCustomFilter = _a.openSavedCustomFilter, setSavedFilterTobeDeleted = _a.setSavedFilterTobeDeleted, setIsDeleteSQDialogVisible = _a.setIsDeleteSQDialogVisible, isFocused = _a.isFocused, onMouseEnter = _a.onMouseEnter, optionId = _a.optionId;
+    var isActive = activeSavedFilterReferences
+        ? activeSavedFilterReferences.includes((savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.systemKey) ? "system:".concat(savedfilter.systemKey) : "id:".concat(savedfilter.id))
+        : (savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.systemKey)
+            ? activeSavedFilterReference === savedfilter.systemKey
+            : String(activeSavedFilterReference) === String(savedfilter.id);
     return (_jsxs("div", { className: "solid-saved-filter-item", onMouseEnter: onMouseEnter, children: [_jsx("div", { className: "solid-saved-filter-main-wrap", children: _jsx(SolidButton, { variant: "ghost", size: "sm", className: "solid-saved-filter-main w-full ".concat(isActive ? "is-active" : "", " ").concat(isFocused ? "solid-search-overlay-option-active" : ""), id: optionId, role: "option", "aria-selected": isFocused, "aria-label": "".concat(savedfilter.name).concat(isActive ? ", applied" : ""), onMouseDown: function (e) {
                         e.preventDefault();
+                        e.stopPropagation();
+                    }, onClick: function (e) {
+                        e.stopPropagation();
                         applySavedFilter(savedfilter);
                     }, title: savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.description, children: _jsxs("span", { className: "solid-search-overlay-option-content", children: [_jsx("span", { className: "solid-search-overlay-option-icon", "aria-hidden": "true", children: _jsx(Bookmark, { size: 15 }) }), _jsxs("span", { className: "solid-search-overlay-option-copy", children: [_jsx("span", { className: "solid-search-overlay-option-title", children: savedfilter.name }), (savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.description) && (_jsx("span", { className: "solid-search-overlay-option-description", children: savedfilter.description }))] }), isActive && (_jsx("span", { className: "solid-search-overlay-option-check", "aria-hidden": "true", children: _jsx(Check, { size: 14 }) }))] }) }) }), _jsx("div", { className: "solid-saved-filter-actions", children: savedfilter.isSeeded !== true && !savedfilter.systemKey &&
                     _jsxs(_Fragment, { children: [_jsx(SolidButton, { variant: "outline", size: "sm", className: "solid-saved-filter-icon-btn", onMouseDown: function (e) {
@@ -491,7 +498,8 @@ var areFilterStateValuesEqual = function (left, right) {
 };
 export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
     var _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;
-    var viewData = _a.viewData, viewType = _a.viewType, handleApplyCustomFilter = _a.handleApplyCustomFilter, showSaveFilterPopup = _a.showSaveFilterPopup, setShowSaveFilterPopup = _a.setShowSaveFilterPopup, filterPredicates = _a.filterPredicates;
+    var viewData = _a.viewData, viewType = _a.viewType, handleApplyCustomFilter = _a.handleApplyCustomFilter, showSaveFilterPopup = _a.showSaveFilterPopup, setShowSaveFilterPopup = _a.setShowSaveFilterPopup, filterPredicates = _a.filterPredicates, _2 = _a.allowMultipleSavedFilters, allowMultipleSavedFilters = _2 === void 0 ? false : _2;
+    var dispatch = useDispatch();
     var overlayInstanceId = useId();
     var overlayListboxId = "".concat(overlayInstanceId, "-search-options");
     var getOverlayOptionId = function (index) { return "".concat(overlayInstanceId, "-search-option-").concat(index); };
@@ -534,50 +542,52 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
     var defaultGroupingRules = [
         { id: 1, fieldName: null, dateGrouping: null }
     ];
-    var _2 = useState(defaultState), initialState = _2[0], setInitialState = _2[1];
+    var _3 = useState(defaultState), initialState = _3[0], setInitialState = _3[1];
     var searchableEntityLabel = ((_c = (_b = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _b === void 0 ? void 0 : _b.solidView) === null || _c === void 0 ? void 0 : _c.displayName) ||
         ((_f = (_e = (_d = viewData === null || viewData === void 0 ? void 0 : viewData.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) ||
         "records";
     var chipsRef = useRef(null);
     // filterRules is used to maintian the ui of custom filter 
     // customFilter is used to maintian the transformed filter object of custom filter
-    var _3 = useState(initialState), filterRules = _3[0], setFilterRules = _3[1];
-    var _4 = useState(null), customFilter = _4[0], setCustomFilter = _4[1];
-    var _5 = useState([]), fields = _5[0], setFields = _5[1];
-    var _6 = useState([]), searchableFields = _6[0], setSearchableFields = _6[1];
-    var _7 = useState([]), groupableFields = _7[0], setGroupableFields = _7[1];
-    var _8 = useState(defaultGroupingRules), groupingRules = _8[0], setGroupingRules = _8[1];
-    var _9 = useState(defaultAggregationRules), aggregationRules = _9[0], setAggregationRules = _9[1];
+    var _4 = useState(initialState), filterRules = _4[0], setFilterRules = _4[1];
+    var _5 = useState(null), customFilter = _5[0], setCustomFilter = _5[1];
+    var _6 = useState([]), fields = _6[0], setFields = _6[1];
+    var _7 = useState([]), searchableFields = _7[0], setSearchableFields = _7[1];
+    var _8 = useState([]), groupableFields = _8[0], setGroupableFields = _8[1];
+    var _9 = useState(defaultGroupingRules), groupingRules = _9[0], setGroupingRules = _9[1];
+    var _10 = useState(defaultAggregationRules), aggregationRules = _10[0], setAggregationRules = _10[1];
     // used to show the list of predefined searches 
-    var _10 = useState([]), predefinedSearches = _10[0], setPredefinedSearches = _10[1];
+    var _11 = useState([]), predefinedSearches = _11[0], setPredefinedSearches = _11[1];
     // used to open / close the custom fitler popup 
-    var _11 = useState(false), showGlobalSearchElement = _11[0], setShowGlobalSearchElement = _11[1];
+    var _12 = useState(false), showGlobalSearchElement = _12[0], setShowGlobalSearchElement = _12[1];
     // used to open / close the group fitler popup 
-    var _12 = useState(false), showGroupFilterElement = _12[0], setShowGroupFilterElement = _12[1];
+    var _13 = useState(false), showGroupFilterElement = _13[0], setShowGroupFilterElement = _13[1];
     // searchChips maintain the ui to display searched query 
     // searchFilter maintain the transformed filter of the  searched query 
-    var _13 = useState([]), searchChips = _13[0], setSearchChips = _13[1];
-    var _14 = useState(null), searchFilter = _14[0], setSearchFilter = _14[1];
+    var _14 = useState([]), searchChips = _14[0], setSearchChips = _14[1];
+    var _15 = useState(null), searchFilter = _15[0], setSearchFilter = _15[1];
     // predefinedSearchChip maintain the ui to display predefined searches query 
-    var _15 = useState(null), predefinedSearchChip = _15[0], setPredefinedSearchChip = _15[1];
+    var _16 = useState(null), predefinedSearchChip = _16[0], setPredefinedSearchChip = _16[1];
     //  state to maintain the text typed in the search input box
-    var _16 = useState(""), inputValue = _16[0], setInputValue = _16[1];
-    var _17 = useState(-1), focusedIndex = _17[0], setFocusedIndex = _17[1];
+    var _17 = useState(""), inputValue = _17[0], setInputValue = _17[1];
+    var _18 = useState(-1), focusedIndex = _18[0], setFocusedIndex = _18[1];
     // flag to prevent un necessary re renders
-    var _18 = useState(false), hasSearched = _18[0], setHasSearched = _18[1];
+    var _19 = useState(false), hasSearched = _19[0], setHasSearched = _19[1];
     // currentSavedFilterData  is used to save the whole object of saved filter 
-    var _19 = useState(), currentSavedFilterData = _19[0], setCurrentSavedFilterData = _19[1];
-    var _20 = useState(), currentSavedFilterQuery = _20[0], setCurrentSavedFilterQuery = _20[1];
-    var _21 = useState({}), currentSavedFilterVariables = _21[0], setCurrentSavedFilterVariables = _21[1];
-    var _22 = useState(), currentSavedFilterRules = _22[0], setCurrentSavedFilterRules = _22[1];
-    var _23 = useState(false), showSavedFilterComponent = _23[0], setShowSavedFilterComponent = _23[1];
-    var _24 = useState(), savedFilterTobeDeleted = _24[0], setSavedFilterTobeDeleted = _24[1];
-    var _25 = useState(false), isDeleteSQDialogVisible = _25[0], setIsDeleteSQDialogVisible = _25[1];
-    var _26 = useState(), savedFilterQueryString = _26[0], setSavedFilterQueryString = _26[1];
-    var _27 = useState(false), showOverlay = _27[0], setShowOverlay = _27[1];
+    var _20 = useState(), currentSavedFilterData = _20[0], setCurrentSavedFilterData = _20[1];
+    var _21 = useState(), currentSavedFilterQuery = _21[0], setCurrentSavedFilterQuery = _21[1];
+    var _22 = useState({}), currentSavedFilterVariables = _22[0], setCurrentSavedFilterVariables = _22[1];
+    var _23 = useState(), currentSavedFilterRules = _23[0], setCurrentSavedFilterRules = _23[1];
+    var _24 = useState([]), activeSavedFilters = _24[0], setActiveSavedFilters = _24[1];
+    var _25 = useState(null), editingSavedFilterKey = _25[0], setEditingSavedFilterKey = _25[1];
+    var _26 = useState(false), showSavedFilterComponent = _26[0], setShowSavedFilterComponent = _26[1];
+    var _27 = useState(), savedFilterTobeDeleted = _27[0], setSavedFilterTobeDeleted = _27[1];
+    var _28 = useState(false), isDeleteSQDialogVisible = _28[0], setIsDeleteSQDialogVisible = _28[1];
+    var _29 = useState(), savedFilterQueryString = _29[0], setSavedFilterQueryString = _29[1];
+    var _30 = useState(false), showOverlay = _30[0], setShowOverlay = _30[1];
     var overlayRef = useRef(null);
     var searchInputRef = useRef(null);
-    var _28 = useState(false), showChipManager = _28[0], setShowChipManager = _28[1];
+    var _31 = useState(false), showChipManager = _31[0], setShowChipManager = _31[1];
     var chipManagerRef = useRef(null);
     var chipManagerTriggerRef = useRef(null);
     var focusSearchInput = function () {
@@ -598,12 +608,12 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
             }
         }
     }, [focusedIndex, showOverlay]);
-    var _29 = useSession(), session = _29.data, status = _29.status;
+    var _32 = useSession(), session = _32.data, status = _32.status;
     var user = session === null || session === void 0 ? void 0 : session.user;
-    var _30 = useState(0), refreshKey = _30[0], setRefreshKey = _30[1];
-    var _31 = useState(null), predefinedSearchBaseFilter = _31[0], setPredefinedSearchBaseFilter = _31[1];
-    var _32 = useState([]), savedFilters = _32[0], setSavedFilters = _32[1];
-    var _33 = useState(false), savedFiltersLoaded = _33[0], setSavedFiltersLoaded = _33[1];
+    var _33 = useState(0), refreshKey = _33[0], setRefreshKey = _33[1];
+    var _34 = useState(null), predefinedSearchBaseFilter = _34[0], setPredefinedSearchBaseFilter = _34[1];
+    var _35 = useState([]), savedFilters = _35[0], setSavedFilters = _35[1];
+    var _36 = useState(false), savedFiltersLoaded = _36[0], setSavedFiltersLoaded = _36[1];
     var isDraftPublishWorkflowEnabled = ((_j = (_h = (_g = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _g === void 0 ? void 0 : _g.solidView) === null || _h === void 0 ? void 0 : _h.model) === null || _j === void 0 ? void 0 : _j.draftPublishWorkflow) === true;
     var workflowPublishedVersionsSavedFilter = useMemo(function () {
         if (!isDraftPublishWorkflowEnabled)
@@ -633,11 +643,11 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
     }); }, [allAvailableSavedFilters]);
     var entityApi = createSolidEntityApi("savedFilters");
     var useCreateSolidEntityMutation = entityApi.useCreateSolidEntityMutation, useDeleteSolidEntityMutation = entityApi.useDeleteSolidEntityMutation, useGetSolidEntityByIdQuery = entityApi.useGetSolidEntityByIdQuery, useUpdateSolidEntityMutation = entityApi.useUpdateSolidEntityMutation, useLazyGetSolidEntitiesQuery = entityApi.useLazyGetSolidEntitiesQuery;
-    var _34 = useCreateSolidEntityMutation(), createEntity = _34[0], _35 = _34[1], isEntityCreateSuccess = _35.isSuccess, isEntityCreateError = _35.isError, entityCreateError = _35.error;
-    var _36 = useUpdateSolidEntityMutation(), updateEntity = _36[0], _37 = _36[1], isEntityUpdateSuceess = _37.isSuccess, isEntityUpdateError = _37.isError, entityUpdateError = _37.error;
-    var _38 = useDeleteSolidEntityMutation(), deleteEntity = _38[0], _39 = _38[1], isEntityDeleteSuceess = _39.isSuccess, isEntityDeleteError = _39.isError, entityDeleteError = _39.error;
-    var _40 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _40[0], _41 = _40[1], solidEntityListViewData = _41.data, isSavedFilterLoading = _41.isLoading, error = _41.error;
-    var _42 = useState(0), savedFilterFetchDataRefreshKey = _42[0], setSavedFilterFetchDataRefreshKey = _42[1];
+    var _37 = useCreateSolidEntityMutation(), createEntity = _37[0], _38 = _37[1], isEntityCreateSuccess = _38.isSuccess, isEntityCreateError = _38.isError, entityCreateError = _38.error;
+    var _39 = useUpdateSolidEntityMutation(), updateEntity = _39[0], _40 = _39[1], isEntityUpdateSuceess = _40.isSuccess, isEntityUpdateError = _40.isError, entityUpdateError = _40.error;
+    var _41 = useDeleteSolidEntityMutation(), deleteEntity = _41[0], _42 = _41[1], isEntityDeleteSuceess = _42.isSuccess, isEntityDeleteError = _42.isError, entityDeleteError = _42.error;
+    var _43 = useLazyGetSolidEntitiesQuery(), triggerGetSolidEntities = _43[0], _44 = _43[1], solidEntityListViewData = _44.data, isSavedFilterLoading = _44.isLoading, error = _44.error;
+    var _45 = useState(0), savedFilterFetchDataRefreshKey = _45[0], setSavedFilterFetchDataRefreshKey = _45[1];
     useEffect(function () {
         var fn = function () { return __awaiter(void 0, void 0, void 0, function () {
             var filters, queryData, queryString, savedFilter;
@@ -696,9 +706,29 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
         (_p = (_o = (_m = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _m === void 0 ? void 0 : _m.solidView) === null || _o === void 0 ? void 0 : _o.model) === null || _p === void 0 ? void 0 : _p.id,
         user === null || user === void 0 ? void 0 : user.id
     ]);
+    var getSavedFilterKey = function (savedFilter) {
+        return (savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.systemKey) ? "system:".concat(savedFilter.systemKey) : "id:".concat(savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.id);
+    };
+    var getPersistedSavedFilterItems = function (queryObject) {
+        if (!allowMultipleSavedFilters)
+            return [];
+        if (Array.isArray(queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_items)) {
+            return queryObject.saved_filter_items;
+        }
+        if (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_predicate) {
+            return [{
+                    id: queryObject.saved_filter_id,
+                    systemKey: queryObject.saved_filter_system_key,
+                    name: queryObject.saved_filter_name || "Saved Filter",
+                    predicate: queryObject.saved_filter_predicate,
+                    variables: queryObject.saved_filter_variables || {},
+                }];
+        }
+        return [];
+    };
     // Updates search, custom filter, grouping, aggregation, and UI state from a single shared filter source.
     var syncFilterUiStateFromSharedSource = useCallback(function (queryObject) { return __awaiter(void 0, void 0, void 0, function () {
-        var nextSearchFilter, nextSearchChips, nextCustomFilter, nextPredefinedBaseFilter, nextPredefinedSearchChip, nextSavedFilter, nextSavedFilterVariables, nextSavedFilterData, rules, hydratedRules_1, hasGroupingRules, nextGroupingRules, layoutGroupBy, nextAggregationRules;
+        var nextSearchFilter, nextSearchChips, nextCustomFilter, nextPredefinedBaseFilter, nextPredefinedSearchChip, persistedSavedFilterItems, nextSavedFilterItems, nextSavedFilter, nextSavedFilterVariables, nextSavedFilterData, rules, hydratedRules_1, hasGroupingRules, nextGroupingRules, layoutGroupBy, nextAggregationRules;
         var _a, _b, _c, _d, _e, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
@@ -712,24 +742,48 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                     nextPredefinedSearchChip = nextPredefinedBaseFilter && (queryObject === null || queryObject === void 0 ? void 0 : queryObject.predefined_search_chip)
                         ? queryObject.predefined_search_chip
                         : null;
-                    nextSavedFilter = (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_predicate) || null;
+                    persistedSavedFilterItems = getPersistedSavedFilterItems(queryObject);
+                    nextSavedFilterItems = allowMultipleSavedFilters
+                        ? persistedSavedFilterItems.map(function (item) {
+                            var savedFilter = availableSavedFilters.find(function (candidate) {
+                                return (item === null || item === void 0 ? void 0 : item.systemKey)
+                                    ? (candidate === null || candidate === void 0 ? void 0 : candidate.systemKey) === item.systemKey
+                                    : String(candidate === null || candidate === void 0 ? void 0 : candidate.id) === String(item === null || item === void 0 ? void 0 : item.id);
+                            });
+                            return {
+                                data: savedFilter || {
+                                    id: item === null || item === void 0 ? void 0 : item.id,
+                                    systemKey: item === null || item === void 0 ? void 0 : item.systemKey,
+                                    name: (item === null || item === void 0 ? void 0 : item.name) || "Saved Filter",
+                                    filterQueryJson: JSON.stringify((item === null || item === void 0 ? void 0 : item.predicate) || {}),
+                                },
+                                query: (item === null || item === void 0 ? void 0 : item.predicate) || {},
+                                variables: (item === null || item === void 0 ? void 0 : item.variables) || {},
+                            };
+                        })
+                        : [];
+                    nextSavedFilter = allowMultipleSavedFilters
+                        ? (nextSavedFilterItems.length > 0 ? { $or: nextSavedFilterItems.map(function (item) { return item.query; }) } : null)
+                        : (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_predicate) || null;
                     nextSavedFilterVariables = (_a = queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_variables) !== null && _a !== void 0 ? _a : {};
-                    nextSavedFilterData = nextSavedFilter
-                        ? availableSavedFilters.find(function (savedFilter) {
-                            if (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_system_key) {
-                                return (savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.systemKey) === queryObject.saved_filter_system_key;
-                            }
-                            if (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_id) {
-                                return String(savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.id) === String(queryObject.saved_filter_id);
+                    nextSavedFilterData = allowMultipleSavedFilters
+                        ? (nextSavedFilterItems.length > 0 ? nextSavedFilterItems[nextSavedFilterItems.length - 1].data : null)
+                        : nextSavedFilter
+                            ? availableSavedFilters.find(function (savedFilter) {
+                                if (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_system_key) {
+                                    return (savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.systemKey) === queryObject.saved_filter_system_key;
+                                }
+                                if (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_id) {
+                                    return String(savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.id) === String(queryObject.saved_filter_id);
+                                }
+                                return false;
+                            }) || {
+                                id: queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_id,
+                                systemKey: queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_system_key,
+                                name: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_name) || 'Saved Filter',
+                                filterQueryJson: JSON.stringify(nextSavedFilter),
                             }
-                            return false;
-                        }) || {
-                            id: queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_id,
-                            systemKey: queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_system_key,
-                            name: (queryObject === null || queryObject === void 0 ? void 0 : queryObject.saved_filter_name) || 'Saved Filter',
-                            filterQueryJson: JSON.stringify(nextSavedFilter),
-                        }
-                        : null;
+                            : null;
                     setSearchFilter(function (prev) { return areFilterStateValuesEqual(prev, nextSearchFilter) ? prev : nextSearchFilter; });
                     setSearchChips(function (prev) { return areFilterStateValuesEqual(prev, nextSearchChips) ? prev : nextSearchChips; });
                     setCustomFilter(function (prev) { return areFilterStateValuesEqual(prev, nextCustomFilter) ? prev : nextCustomFilter; });
@@ -738,6 +792,7 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                     setCurrentSavedFilterData(function (prev) { return areFilterStateValuesEqual(prev, nextSavedFilterData) ? prev : nextSavedFilterData; });
                     setCurrentSavedFilterQuery(function (prev) { return areFilterStateValuesEqual(prev, nextSavedFilter) ? prev : nextSavedFilter; });
                     setCurrentSavedFilterVariables(function (prev) { return areFilterStateValuesEqual(prev, nextSavedFilterVariables) ? prev : nextSavedFilterVariables; });
+                    setActiveSavedFilters(function (prev) { return areFilterStateValuesEqual(prev, nextSavedFilterItems) ? prev : nextSavedFilterItems; });
                     if (!(nextCustomFilter && (viewData === null || viewData === void 0 ? void 0 : viewData.data))) return [3 /*break*/, 2];
                     rules = transformFiltersToRules(nextCustomFilter);
                     return [4 /*yield*/, hydrateRelationRules([rules], viewData)];
@@ -775,7 +830,7 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                     return [2 /*return*/];
             }
         });
-    }); }, [availableSavedFilters, initialState, viewData]);
+    }); }, [allowMultipleSavedFilters, availableSavedFilters, initialState, viewData]);
     var resetAppliedFilters = function (_a) {
         var _b = _a === void 0 ? {} : _a, _c = _b.preserveGrouping, preserveGrouping = _c === void 0 ? false : _c;
         setSearchChips([]);
@@ -788,6 +843,8 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
         setCurrentSavedFilterQuery(null);
         setCurrentSavedFilterVariables({});
         setCurrentSavedFilterRules(null);
+        setActiveSavedFilters([]);
+        setEditingSavedFilterKey(null);
         if (!preserveGrouping) {
             setGroupingRules(defaultGroupingRules);
             setAggregationRules(defaultAggregationRules);
@@ -1094,6 +1151,14 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
         //     };
         // }
         setCurrentSavedFilterQuery(finalCustomFilter);
+        if (allowMultipleSavedFilters && editingSavedFilterKey) {
+            var nextItems = activeSavedFilters.map(function (item) {
+                return getSavedFilterKey(item.data) === editingSavedFilterKey
+                    ? __assign(__assign({}, item), { query: finalCustomFilter }) : item;
+            });
+            setActiveSavedFilters(nextItems);
+            persistActiveSavedFilters(nextItems);
+        }
         setShowSavedFilterComponent(false);
         setHasSearched(true);
         setRefreshKey(function (prev) { return prev + 1; });
@@ -1128,7 +1193,9 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
             };
             var finalSearchFilter = tranformSearchToFilters(formattedChips);
             setSearchFilter(finalSearchFilter);
-            var finalSavedFilter = currentSavedFilterQuery;
+            var finalSavedFilter = allowMultipleSavedFilters
+                ? (activeSavedFilters.length > 0 ? { $or: activeSavedFilters.map(function (item) { return item.query; }) } : null)
+                : currentSavedFilterQuery;
             var finalPredefinedFilter = predefinedSearchBaseFilter;
             var finalCustomFilter = customFilter;
             var finalFilter = mergeAllDiffFilters(finalCustomFilter, finalSearchFilter, finalSavedFilter, finalPredefinedFilter, groupingRules, aggregationRules);
@@ -1136,20 +1203,37 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                 finalPredefinedFilter && predefinedSearchChip
                     ? predefinedSearchChip
                     : null;
-            if (finalSavedFilter && Object.keys(finalSavedFilter).length > 0) {
+            if (allowMultipleSavedFilters && activeSavedFilters.length > 0) {
+                var resolvedItems = activeSavedFilters.map(function (item) { return resolveSavedFilterVariables(item.query, user === null || user === void 0 ? void 0 : user.id, item.variables || {}); });
+                if (resolvedItems.some(function (item) { return item.missingVariables.length > 0; }))
+                    return;
+                finalFilter.resolved_saved_filter_predicate = { $or: resolvedItems.map(function (item) { return item.value; }) };
+                finalFilter.saved_filter_variables = {};
+                finalFilter.saved_filter_items = activeSavedFilters.map(function (item) {
+                    var _a, _b, _c, _d, _e, _f;
+                    return ({
+                        id: (_b = (_a = item.data) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null,
+                        systemKey: (_d = (_c = item.data) === null || _c === void 0 ? void 0 : _c.systemKey) !== null && _d !== void 0 ? _d : null,
+                        name: (_f = (_e = item.data) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : null,
+                        predicate: item.query,
+                        variables: item.variables || {},
+                    });
+                });
+            }
+            else if (finalSavedFilter && Object.keys(finalSavedFilter).length > 0) {
                 var resolved = resolveSavedFilterVariables(finalSavedFilter, user === null || user === void 0 ? void 0 : user.id, currentSavedFilterVariables);
                 if (resolved.missingVariables.length > 0)
                     return;
                 finalFilter.resolved_saved_filter_predicate = resolved.value;
                 finalFilter.saved_filter_variables = currentSavedFilterVariables;
             }
-            if (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id) {
+            if (!allowMultipleSavedFilters && (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id)) {
                 finalFilter.saved_filter_id = currentSavedFilterData.id;
             }
-            if (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.systemKey) {
+            if (!allowMultipleSavedFilters && (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.systemKey)) {
                 finalFilter.saved_filter_system_key = currentSavedFilterData.systemKey;
             }
-            if (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.name) {
+            if (!allowMultipleSavedFilters && (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.name)) {
                 finalFilter.saved_filter_name = currentSavedFilterData.name;
             }
             handleApplyCustomFilter(finalFilter, true);
@@ -1179,15 +1263,18 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                     //     const formatedCustomChips: FilterRule = transformFiltersToRules(customFilter ? customFilter : null);
                     //     setFilterRules(formatedCustomChips ? [formatedCustomChips] : initialState);
                     // }
-                    setSearchChips([]);
-                    setSearchFilter(null);
-                    setFilterRules(initialState);
-                    setCustomFilter(null);
-                    setPredefinedSearchChip(null);
-                    setPredefinedSearchBaseFilter(null);
+                    if (!allowMultipleSavedFilters) {
+                        setSearchChips([]);
+                        setSearchFilter(null);
+                        setFilterRules(initialState);
+                        setCustomFilter(null);
+                        setPredefinedSearchChip(null);
+                        setPredefinedSearchBaseFilter(null);
+                    }
                     if (!(savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.id)) return [3 /*break*/, 3];
                     savedfilterId_1 = savedfilter.id;
                     setShowOverlay(false);
+                    setEditingSavedFilterKey(getSavedFilterKey(savedfilter));
                     currentSavedFilterData_1 = availableSavedFilters.find(function (savedFilter) { return savedFilter.id === savedfilterId_1; });
                     setCurrentSavedFilterData(currentSavedFilterData_1);
                     if (!currentSavedFilterData_1) return [3 /*break*/, 2];
@@ -1210,8 +1297,28 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
             }
         });
     }); };
+    var persistActiveSavedFilters = function (items) {
+        var _a, _b, _c, _d, _e, _f;
+        var first = items[0];
+        var persistedFilter = __assign(__assign({}, (getFilterObjectFromLocalStorage() || {})), { saved_filter_items: items.map(function (item) {
+                var _a, _b, _c, _d, _e, _f;
+                return ({
+                    id: (_b = (_a = item.data) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null,
+                    systemKey: (_d = (_c = item.data) === null || _c === void 0 ? void 0 : _c.systemKey) !== null && _d !== void 0 ? _d : null,
+                    name: (_f = (_e = item.data) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : null,
+                    predicate: item.query,
+                    variables: item.variables || {},
+                });
+            }), saved_filter_predicate: items.length > 0 ? (items.length === 1 ? first.query : { $or: items.map(function (item) { return item.query; }) }) : null, saved_filter_variables: items.length === 1 ? (first.variables || {}) : {}, saved_filter_id: items.length === 1 ? (_b = (_a = first.data) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null : null, saved_filter_system_key: items.length === 1 ? (_d = (_c = first.data) === null || _c === void 0 ? void 0 : _c.systemKey) !== null && _d !== void 0 ? _d : null : null, saved_filter_name: items.length === 1 ? (_f = (_e = first.data) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : null : null });
+        delete persistedFilter.finalFullFilter;
+        setFilterObjectToLocalStorage(persistedFilter);
+    };
     var persistActiveSavedFilter = function (savedFilter, filterJson, variables) {
         var _a, _b, _c;
+        if (allowMultipleSavedFilters) {
+            persistActiveSavedFilters([{ data: savedFilter, query: filterJson, variables: variables }]);
+            return;
+        }
         var persistedFilter = __assign(__assign({}, (getFilterObjectFromLocalStorage() || {})), { custom_filter_predicate: null, search_predicate: null, predefined_search_predicate: null, predefined_search_chip: null, saved_filter_predicate: filterJson, saved_filter_variables: variables, saved_filter_id: (_a = savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.id) !== null && _a !== void 0 ? _a : null, saved_filter_system_key: (_b = savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.systemKey) !== null && _b !== void 0 ? _b : null, saved_filter_name: (_c = savedFilter === null || savedFilter === void 0 ? void 0 : savedFilter.name) !== null && _c !== void 0 ? _c : null });
         delete persistedFilter.finalFullFilter;
         setFilterObjectToLocalStorage(persistedFilter);
@@ -1222,65 +1329,111 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
         setCurrentSavedFilterVariables({});
         setCurrentSavedFilterRules(null);
         setShowSavedFilterComponent(false);
-        var persistedFilter = __assign(__assign({}, (getFilterObjectFromLocalStorage() || {})), { saved_filter_predicate: null, saved_filter_variables: {}, saved_filter_id: null, saved_filter_system_key: null, saved_filter_name: null });
+        var persistedFilter = __assign(__assign({}, (getFilterObjectFromLocalStorage() || {})), { saved_filter_items: [], saved_filter_predicate: null, saved_filter_variables: {}, saved_filter_id: null, saved_filter_system_key: null, saved_filter_name: null });
         delete persistedFilter.finalFullFilter;
         setFilterObjectToLocalStorage(persistedFilter);
         setHasSearched(true);
         setRefreshKey(function (prev) { return prev + 1; });
     };
     var deleteSavedFilter = function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: 
-                // delte the saved filter with id 
-                return [4 /*yield*/, deleteEntity(savedFilterTobeDeleted)];
+        var nextItems, error_1, errorMessage;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    _c.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, deleteEntity(savedFilterTobeDeleted).unwrap()];
                 case 1:
-                    // delte the saved filter with id 
-                    _a.sent();
-                    if (String(savedFilterTobeDeleted) === String(currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id)) {
-                        clearActiveSavedFilter();
+                    _c.sent();
+                    dispatch(showToast({
+                        severity: "success",
+                        summary: ERROR_MESSAGES.DELETED,
+                        detail: ERROR_MESSAGES.ENTITY_DELETE,
+                    }));
+                    if (allowMultipleSavedFilters) {
+                        nextItems = activeSavedFilters.filter(function (item) { var _a; return String((_a = item.data) === null || _a === void 0 ? void 0 : _a.id) !== String(savedFilterTobeDeleted); });
+                        setActiveSavedFilters(nextItems);
+                        if (String(savedFilterTobeDeleted) === String(currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id)) {
+                            setCurrentSavedFilterData(null);
+                            setCurrentSavedFilterQuery(null);
+                            setCurrentSavedFilterVariables({});
+                        }
+                        persistActiveSavedFilters(nextItems);
+                        setHasSearched(true);
+                        setRefreshKey(function (prev) { return prev + 1; });
+                    }
+                    else if (String(savedFilterTobeDeleted) === String(currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id)) {
+                        removeSavedFilter();
                     }
                     setIsDeleteSQDialogVisible(false);
                     setTimeout(function () {
                         setSavedFilterFetchDataRefreshKey(function (prev) { return prev + 1; });
                     }, 500);
-                    return [2 /*return*/];
+                    return [3 /*break*/, 3];
+                case 2:
+                    error_1 = _c.sent();
+                    errorMessage = ((_a = error_1 === null || error_1 === void 0 ? void 0 : error_1.data) === null || _a === void 0 ? void 0 : _a.message) || ((_b = error_1 === null || error_1 === void 0 ? void 0 : error_1.data) === null || _b === void 0 ? void 0 : _b.error) || (error_1 === null || error_1 === void 0 ? void 0 : error_1.message) || ERROR_MESSAGES.SOMETHING_WRONG;
+                    dispatch(showToast({
+                        severity: "error",
+                        summary: ERROR_MESSAGES.DELETE_FAIELD,
+                        detail: errorMessage,
+                    }));
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/];
             }
         });
     }); };
     var handleSaveFilter = function (formValues) { return __awaiter(void 0, void 0, void 0, function () {
-        var filterJson, formData, savedFilterRecord_1, filterJson, formData, result, savedFilterRecord_2, error_1;
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
+        var filterJson_1, formData, savedFilterRecord_1, nextItems, filterJson, formData, result, savedFilterRecord_2, nextItems, error_2, errorMessage;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        return __generator(this, function (_o) {
+            switch (_o.label) {
                 case 0:
                     setShowSaveFilterPopup(false);
-                    _l.label = 1;
+                    _o.label = 1;
                 case 1:
-                    _l.trys.push([1, 6, , 7]);
+                    _o.trys.push([1, 6, , 7]);
                     if (!formValues.id) return [3 /*break*/, 3];
-                    filterJson = currentSavedFilterQuery;
+                    filterJson_1 = currentSavedFilterQuery;
                     formData = new FormData();
                     formData.append("name", formValues.name);
-                    formData.append("filterQueryJson", JSON.stringify(filterJson, null, 2));
+                    formData.append("filterQueryJson", JSON.stringify(filterJson_1, null, 2));
                     formData.append("modelId", (_c = (_b = (_a = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _a === void 0 ? void 0 : _a.solidView) === null || _b === void 0 ? void 0 : _b.model) === null || _c === void 0 ? void 0 : _c.id);
                     formData.append("viewId", (_e = (_d = viewData === null || viewData === void 0 ? void 0 : viewData.data) === null || _d === void 0 ? void 0 : _d.solidView) === null || _e === void 0 ? void 0 : _e.id);
                     formData.append("isPrivate", formValues.isPrivate);
                     formData.append("userId", user === null || user === void 0 ? void 0 : user.id);
                     return [4 /*yield*/, updateEntity({ id: +formValues.id, data: formData }).unwrap()];
                 case 2:
-                    _l.sent();
-                    setSearchChips([]);
-                    setSearchFilter(null);
-                    setFilterRules(initialState);
-                    setCustomFilter(null);
-                    setPredefinedSearchChip(null);
-                    setPredefinedSearchBaseFilter(null);
-                    savedFilterRecord_1 = { id: formValues.id, name: formValues.name, isPrivate: formValues.isPrivate, filterQueryJson: JSON.stringify(filterJson, null, 2) };
+                    _o.sent();
+                    dispatch(showToast({
+                        severity: "success",
+                        summary: ERROR_MESSAGES.SAVED_FILTER_UPDATED,
+                        detail: ERROR_MESSAGES.SAVED_FILTER_UPDATED_SUCCESSFULLY,
+                    }));
+                    if (!allowMultipleSavedFilters) {
+                        setSearchChips([]);
+                        setSearchFilter(null);
+                        setFilterRules(initialState);
+                        setCustomFilter(null);
+                        setPredefinedSearchChip(null);
+                        setPredefinedSearchBaseFilter(null);
+                    }
+                    savedFilterRecord_1 = { id: formValues.id, name: formValues.name, isPrivate: formValues.isPrivate, filterQueryJson: JSON.stringify(filterJson_1, null, 2) };
                     setSavedFilters(function (prev) { return prev.map(function (f) { return String(f === null || f === void 0 ? void 0 : f.id) === String(formValues.id) ? __assign(__assign({}, f), savedFilterRecord_1) : f; }); });
                     setCurrentSavedFilterData(savedFilterRecord_1);
-                    setCurrentSavedFilterQuery(filterJson);
-                    persistActiveSavedFilter(savedFilterRecord_1, filterJson, currentSavedFilterVariables);
+                    setCurrentSavedFilterQuery(filterJson_1);
+                    if (allowMultipleSavedFilters) {
+                        nextItems = activeSavedFilters.map(function (item) {
+                            return getSavedFilterKey(item.data) === getSavedFilterKey(savedFilterRecord_1)
+                                ? { data: savedFilterRecord_1, query: filterJson_1, variables: currentSavedFilterVariables }
+                                : item;
+                        });
+                        setActiveSavedFilters(nextItems);
+                        persistActiveSavedFilters(nextItems);
+                    }
+                    else {
+                        persistActiveSavedFilter(savedFilterRecord_1, filterJson_1, currentSavedFilterVariables);
+                    }
                     setHasSearched(true);
                     setRefreshKey(function (prev) { return prev + 1; });
                     return [3 /*break*/, 5];
@@ -1295,7 +1448,12 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                     formData.append("userId", user === null || user === void 0 ? void 0 : user.id);
                     return [4 /*yield*/, createEntity(formData).unwrap()];
                 case 4:
-                    result = _l.sent();
+                    result = _o.sent();
+                    dispatch(showToast({
+                        severity: "success",
+                        summary: ERROR_MESSAGES.SAVED_FILTER_CREATED,
+                        detail: ERROR_MESSAGES.SAVED_FILTER_CREATED_SUCCESSFULLY,
+                    }));
                     setSearchChips([]);
                     setSearchFilter(null);
                     setFilterRules(initialState);
@@ -1307,13 +1465,26 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                     setCurrentSavedFilterData(savedFilterRecord_2);
                     setCurrentSavedFilterQuery(filterJson);
                     setCurrentSavedFilterVariables({});
-                    persistActiveSavedFilter(savedFilterRecord_2, filterJson, {});
+                    if (allowMultipleSavedFilters) {
+                        nextItems = [{ data: savedFilterRecord_2, query: filterJson, variables: {} }];
+                        setActiveSavedFilters(nextItems);
+                        persistActiveSavedFilters(nextItems);
+                    }
+                    else {
+                        persistActiveSavedFilter(savedFilterRecord_2, filterJson, {});
+                    }
                     setHasSearched(true);
                     setRefreshKey(function (prev) { return prev + 1; });
-                    _l.label = 5;
+                    _o.label = 5;
                 case 5: return [3 /*break*/, 7];
                 case 6:
-                    error_1 = _l.sent();
+                    error_2 = _o.sent();
+                    errorMessage = ((_l = error_2 === null || error_2 === void 0 ? void 0 : error_2.data) === null || _l === void 0 ? void 0 : _l.message) || ((_m = error_2 === null || error_2 === void 0 ? void 0 : error_2.data) === null || _m === void 0 ? void 0 : _m.error) || (error_2 === null || error_2 === void 0 ? void 0 : error_2.message) || ERROR_MESSAGES.SOMETHING_WRONG;
+                    dispatch(showToast({
+                        severity: "error",
+                        summary: ERROR_MESSAGES.ERROR,
+                        detail: errorMessage,
+                    }));
                     return [3 /*break*/, 7];
                 case 7: return [2 /*return*/];
             }
@@ -1378,6 +1549,27 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
             console.error("Unable to apply saved filter '".concat(savedfilter === null || savedfilter === void 0 ? void 0 : savedfilter.name, "': missing variables ").concat(resolved.missingVariables.join(", ")));
             return false;
         }
+        if (allowMultipleSavedFilters) {
+            var key_1 = getSavedFilterKey(savedfilter);
+            var nextItem_1 = { data: savedfilter, query: filterJson, variables: variables };
+            var existingItem = activeSavedFilters.find(function (item) { return getSavedFilterKey(item.data) === key_1; });
+            if (existingItem && areFilterStateValuesEqual(existingItem.query, filterJson) && areFilterStateValuesEqual(existingItem.variables, variables)) {
+                return true;
+            }
+            var nextItems = existingItem
+                ? activeSavedFilters.map(function (item) { return getSavedFilterKey(item.data) === key_1 ? nextItem_1 : item; })
+                : __spreadArray(__spreadArray([], activeSavedFilters, true), [nextItem_1], false);
+            setActiveSavedFilters(nextItems);
+            setCurrentSavedFilterData(savedfilter);
+            setCurrentSavedFilterQuery(filterJson);
+            setCurrentSavedFilterVariables(variables);
+            setEditingSavedFilterKey(null);
+            persistActiveSavedFilters(nextItems);
+            setShowOverlay(false);
+            setHasSearched(true);
+            setRefreshKey(function (prev) { return prev + 1; });
+            return true;
+        }
         // Applying the already-active filter must be a no-op. This is important
         // for lifecycle extensions: applying a filter causes a new list load,
         // which invokes onBeforeListDataLoad/onListLoad again.
@@ -1409,6 +1601,19 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
         return true;
     };
     var removeSavedFilter = function () {
+        if (allowMultipleSavedFilters) {
+            var key_2 = getSavedFilterKey(currentSavedFilterData);
+            var nextItems = activeSavedFilters.filter(function (item) { return getSavedFilterKey(item.data) !== key_2; });
+            setActiveSavedFilters(nextItems);
+            setCurrentSavedFilterData(null);
+            setCurrentSavedFilterQuery(null);
+            setCurrentSavedFilterVariables({});
+            setEditingSavedFilterKey(null);
+            persistActiveSavedFilters(nextItems);
+            setHasSearched(true);
+            setRefreshKey(function (prev) { return prev + 1; });
+            return;
+        }
         clearActiveSavedFilter();
     };
     var SavedFiltersChip = function () {
@@ -1463,14 +1668,30 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
     var customRuleCount = (_x = (_v = (_u = customFilter === null || customFilter === void 0 ? void 0 : customFilter.$or) === null || _u === void 0 ? void 0 : _u.length) !== null && _v !== void 0 ? _v : (_w = customFilter === null || customFilter === void 0 ? void 0 : customFilter.$and) === null || _w === void 0 ? void 0 : _w.length) !== null && _x !== void 0 ? _x : Object.keys(customFilter || {}).length;
     var managedChipItems = useMemo(function () {
         var items = [];
-        if (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.name) {
-            items.push({
-                id: "saved-filter",
-                type: "saved",
-                label: "Saved: ".concat(currentSavedFilterData.name),
-                onRemove: function () { return removeSavedFilter(); },
-            });
-        }
+        var savedItems = allowMultipleSavedFilters
+            ? activeSavedFilters
+            : ((currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.name) ? [{ data: currentSavedFilterData }] : []);
+        savedItems.forEach(function (item) {
+            var _a;
+            if ((_a = item.data) === null || _a === void 0 ? void 0 : _a.name) {
+                items.push(__assign({ id: "saved-filter:".concat(getSavedFilterKey(item.data)), type: "saved", label: "Saved: ".concat(item.data.name), onRemove: function () {
+                        if (!allowMultipleSavedFilters) {
+                            removeSavedFilter();
+                            return;
+                        }
+                        var nextItems = activeSavedFilters.filter(function (active) { return getSavedFilterKey(active.data) !== getSavedFilterKey(item.data); });
+                        setActiveSavedFilters(nextItems);
+                        if (getSavedFilterKey(currentSavedFilterData) === getSavedFilterKey(item.data)) {
+                            setCurrentSavedFilterData(null);
+                            setCurrentSavedFilterQuery(null);
+                            setCurrentSavedFilterVariables({});
+                        }
+                        persistActiveSavedFilters(nextItems);
+                        setHasSearched(true);
+                        setRefreshKey(function (prev) { return prev + 1; });
+                    } }, (allowMultipleSavedFilters ? { onOpen: function () { return openSavedCustomFilter(item.data); } } : {})));
+            }
+        });
         if ((predefinedSearchChip === null || predefinedSearchChip === void 0 ? void 0 : predefinedSearchChip.name) && (predefinedSearchChip === null || predefinedSearchChip === void 0 ? void 0 : predefinedSearchChip.value)) {
             items.push({
                 id: "predefined-search",
@@ -1511,6 +1732,8 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
         return items;
     }, [
         currentSavedFilterData,
+        activeSavedFilters,
+        allowMultipleSavedFilters,
         predefinedSearchChip,
         customFilter,
         customRuleCount,
@@ -1707,7 +1930,6 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
     var removePredefinedSearchChip = function () {
         setPredefinedSearchChip(null);
         setPredefinedSearchBaseFilter(null);
-        setCustomFilter(null);
         setHasSearched(true);
         setRefreshKey(function (prev) { return prev + 1; });
     };
@@ -1736,12 +1958,18 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                                                             var optionIndex = overlayOptions.findIndex(function (option) { return option.id === "predefined:".concat(predefinedSearch.name || index); });
                                                             return (_jsx(SolidButton, { id: getOverlayOptionId(optionIndex), role: "option", "aria-selected": focusedIndex === optionIndex, variant: "ghost", size: "sm", className: "text-color solid-search-overlay-option ".concat(focusedIndex === optionIndex ? "solid-search-overlay-option-active" : ""), onMouseDown: function (e) {
                                                                     e.preventDefault();
+                                                                    e.stopPropagation();
+                                                                }, onClick: function (e) {
+                                                                    e.stopPropagation();
                                                                     handlePredefinedSearch(predefinedSearch);
                                                                 }, onMouseEnter: function () { return setFocusedIndex(optionIndex); }, children: _jsxs("span", { className: "solid-search-overlay-option-content", children: [_jsx("span", { className: "solid-search-overlay-option-icon", "aria-hidden": "true", children: _jsx(Sparkles, { size: 15 }) }), _jsxs("span", { className: "solid-search-overlay-option-copy", children: [_jsx("span", { className: "solid-search-overlay-option-title", children: predefinedSearch.name }), _jsxs("span", { className: "solid-search-overlay-option-description", children: ["Search for \u201C", inputValue, "\u201D", predefinedSearch.description ? " \u2014 ".concat(predefinedSearch.description) : ""] })] })] }) }, index));
                                                         })] }), _jsx("hr", { className: "solid-search-overlay-section-separator" })] })), _jsxs("div", { className: "solid-search-overlay-section solid-search-overlay-section--search", children: [_jsxs("h6", { className: "my-1 solid-search-overlay-heading solid-search-overlay-section-title solid-search-overlay-heading-with-icon", children: [_jsx(Search, { size: 13 }), _jsx("span", { children: "Search individual fields" }), _jsx("span", { className: "solid-search-overlay-section-count", children: searchableFields.length })] }), searchableFields.length > 0 ? (searchableFields.map(function (value, index) {
                                                     var optionIndex = overlayOptions.findIndex(function (option) { return option.id === "field:".concat(value.fieldName); });
                                                     return (_jsx(SolidButton, { id: getOverlayOptionId(optionIndex), role: "option", "aria-selected": focusedIndex === optionIndex, variant: "ghost", size: "sm", className: "text-color solid-search-overlay-option ".concat(focusedIndex === optionIndex ? "solid-search-overlay-option-active" : ""), onMouseDown: function (e) {
                                                             e.preventDefault();
+                                                            e.stopPropagation();
+                                                        }, onClick: function (e) {
+                                                            e.stopPropagation();
                                                             var currentValue = inputValue === null || inputValue === void 0 ? void 0 : inputValue.trim();
                                                             if (currentValue) {
                                                                 var values = currentValue.split(",").map(function (v) { return v.trim(); }).filter(function (v) { return v !== ""; });
@@ -1763,7 +1991,7 @@ export var SolidGlobalSearchElement = forwardRef(function (_a, ref) {
                                     _jsx(_Fragment, { children: _jsx("div", { className: "solid-search-overlay-empty", children: _jsxs("div", { className: "solid-search-overlay-panel-callout", children: [_jsx("div", { className: "solid-search-overlay-panel-callout-icon", children: _jsx(Search, { size: 13 }) }), _jsxs("div", { className: "solid-search-overlay-panel-callout-copy", children: [_jsx("div", { className: "solid-search-overlay-empty-title", children: "Start typing to search" }), _jsxs("div", { className: "solid-search-overlay-empty-subtitle", children: ["Enter a value to see suggested searches and searchable ", searchableEntityLabel, " fields."] })] })] }) }) }), selectableSavedFilters.length > 0 &&
                                     _jsxs(_Fragment, { children: [_jsx("hr", { className: "solid-search-overlay-section-separator" }), _jsxs("div", { className: "solid-search-overlay-section solid-search-overlay-section--saved", children: [_jsxs("div", { className: "solid-search-overlay-panel-callout solid-search-overlay-panel-callout-compact items-center", children: [_jsx("div", { className: "solid-search-overlay-panel-callout-icon", children: _jsx(Bookmark, { size: 13 }) }), _jsx("div", { className: "solid-search-overlay-panel-callout-copy", children: _jsxs("p", { className: "solid-search-overlay-heading solid-search-overlay-section-title", children: [_jsx("span", { children: "Saved filters" }), _jsx("span", { className: "solid-search-overlay-section-count", children: selectableSavedFilters.length })] }) })] }), _jsx("div", { className: "solid-search-overlay-saved-list", children: selectableSavedFilters.map(function (savedfilter, index) {
                                                             var _a;
-                                                            return (_jsx(SavedFilterList, { savedfilter: savedfilter, activeSavedFilterReference: (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.systemKey) || (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id), applySavedFilter: applySavedFilter, openSavedCustomFilter: openSavedCustomFilter, setSavedFilterTobeDeleted: setSavedFilterTobeDeleted, setIsDeleteSQDialogVisible: setIsDeleteSQDialogVisible, isFocused: ((_a = overlayOptions[focusedIndex]) === null || _a === void 0 ? void 0 : _a.id) === "saved:".concat(savedfilter.id), onMouseEnter: function () {
+                                                            return (_jsx(SavedFilterList, { savedfilter: savedfilter, activeSavedFilterReference: (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.systemKey) || (currentSavedFilterData === null || currentSavedFilterData === void 0 ? void 0 : currentSavedFilterData.id), activeSavedFilterReferences: allowMultipleSavedFilters ? activeSavedFilters.map(function (item) { return getSavedFilterKey(item.data); }) : undefined, applySavedFilter: applySavedFilter, openSavedCustomFilter: openSavedCustomFilter, setSavedFilterTobeDeleted: setSavedFilterTobeDeleted, setIsDeleteSQDialogVisible: setIsDeleteSQDialogVisible, isFocused: ((_a = overlayOptions[focusedIndex]) === null || _a === void 0 ? void 0 : _a.id) === "saved:".concat(savedfilter.id), onMouseEnter: function () {
                                                                     var optIndex = overlayOptions.findIndex(function (o) { return o.id === "saved:".concat(savedfilter.id); });
                                                                     if (optIndex !== -1)
                                                                         setFocusedIndex(optIndex);