@solidstarters/solid-core-ui 1.1.61 → 1.1.63

package/src/components/core/common/SolidGlobalSearchElement.tsx

@@ -6,9 +6,13 @@ import FilterComponent, { FilterOperator, FilterRule, FilterRuleType } from "@/c
 import { Button } from "primereact/button";
 import { OverlayPanel } from "primereact/overlaypanel";
 import { Divider } from "primereact/divider";
-import { useSearchParams } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import { queryStringToQueryObject } from "../list/SolidListView";
 import { InputText } from "primereact/inputtext";
+import { createSolidEntityApi } from "@/redux/api/solidEntityApi";
+import qs from "qs";
+import { useSelector } from "react-redux";
+import { SolidSaveCustomFilterForm } from "./SolidSaveCustomFilterForm";
 
 const getRandomInt = (min: number, max: number) => {
     return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -17,7 +21,6 @@ const getRandomInt = (min: number, max: number) => {
 
 const transformFiltersToRules = (filter: any, parentRule: number | null = null): FilterRule => {
     const currentId = idCounter++;
-
     if (filter["$or"]) {
         return {
             id: currentId,
@@ -173,6 +176,50 @@ const tranformSearchToFilters = (input: any) => {
     };
 }
 
+export const mergeSearchAndCustomFilters = (transformedFilter: any, newFilter: any, transformedFilterName: string, newFilterName: string) => {
+    const filters: any = {};
+
+    // Add only non-null filters
+    if (transformedFilter && Object.keys(transformedFilter).length > 0) {
+        filters[transformedFilterName] = transformedFilter;
+    }
+    if (newFilter && Object.keys(newFilter).length > 0) {
+        filters[newFilterName] = newFilter;
+    }
+
+    // Return the combined filters object
+    return filters;
+}
+
+
+const SavedFilterList = ({ savedfilter, activeSavedFilter, applySavedFilter, openSavedCustomFilter, setSavedFilterTobeDeleted, setIsDeleteSQDialogVisible }: any) => {
+    return (
+        <div className="flex align-items-center justify-content-between gap-2">
+            <Button text size="small" className="text-base py-1 w-full" severity={Number(activeSavedFilter) == savedfilter.id ? "secondary" : "contrast" } onClick={() => applySavedFilter(savedfilter)}>{savedfilter.name}</Button>
+            <div className="flex align-items-center gap-2">
+                <Button
+                    icon="pi pi-pencil"
+                    style={{ fontSize: 10 }}
+                    severity="secondary"
+                    outlined size="small"
+                    onClick={() => openSavedCustomFilter(savedfilter)}
+                />
+                <Button
+                    icon="pi pi-trash"
+                    style={{ fontSize: 10 }}
+                    severity="secondary"
+                    outlined size="small"
+                    onClick={() => {
+                        setSavedFilterTobeDeleted(savedfilter.id),
+                            setIsDeleteSQDialogVisible(true);
+
+                    }}
+                />
+            </div>
+        </div>
+    )
+}
+
 export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCustomFilter, filters, clearFilter }: any, ref) => {
     const defaultState: FilterRule[] = [
         {
@@ -204,8 +251,10 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
     ];
     const [initialState, setInitialState] = useState(defaultState);
 
-    const searchParams = useSearchParams().toString(); // Converts the query params to a string
+    const searchParams = useSearchParams() // Converts the query params to a string
+    const activeSavedFilter = searchParams?.get("savedQuery");
 
+    const router = useRouter();
 
     const chipsRef = useRef<HTMLDivElement | null | any>(null);
 
@@ -219,6 +268,85 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
     const [searchFilter, setSearchFilter] = useState<any | null>(null);
     const [customFilter, setCustomFilter] = useState<any | null>(null);
     const [hasSearched, setHasSearched] = useState<boolean>(false);
+    const [showSaveFilterPopup, setShowSaveFilterPopup] = useState<boolean>(false);
+    const [currentSavedFilterData, setCurrentSavedFilterData] = useState<any>();
+    const [savedFilterTobeDeleted, setSavedFilterTobeDeleted] = useState<any>();
+    const [isDeleteSQDialogVisible, setIsDeleteSQDialogVisible] = useState<boolean>(false);
+    const [savedFilterQueryString, setSavedFilterQueryString] = useState<string>();
+    const { user } = useSelector((state: any) => state.auth);
+
+
+    const [savedFilters, setSavedFilters] = useState([]);
+
+    const entityApi = createSolidEntityApi("savedFilters");
+    const {
+        useCreateSolidEntityMutation,
+        useDeleteSolidEntityMutation,
+        useGetSolidEntityByIdQuery,
+        useUpdateSolidEntityMutation,
+        useLazyGetSolidEntitiesQuery
+    } = entityApi;
+
+    const [
+        createEntity,
+        { isSuccess: isEntityCreateSuccess, isError: isEntityCreateError, error: entityCreateError },
+    ] = useCreateSolidEntityMutation();
+
+    const [
+        updateEntity,
+        { isSuccess: isEntityUpdateSuceess, isError: isEntityUpdateError, error: entityUpdateError },
+    ] = useUpdateSolidEntityMutation();
+
+    const [
+        deleteEntity,
+        { isSuccess: isEntityDeleteSuceess, isError: isEntityDeleteError, error: entityDeleteError },
+    ] = useDeleteSolidEntityMutation();
+
+    const [triggerGetSolidEntities, { data: solidEntityListViewData, isLoading, error }] = useLazyGetSolidEntitiesQuery();
+
+
+    useEffect(() => {
+
+        const filters = {
+            $or:[
+                {
+                    $and: [
+                        { model: { $in: [viewData?.data?.solidView?.model?.id] } },
+                        { view: { $in: [viewData?.solidView?.id] } },
+                        { user: { $in: [user?.user?.id] } }
+                    ]
+                },
+                {
+                    $and: [
+                        { model: { $in: [viewData?.data?.solidView?.model?.id] } },
+                        { view: { $in: [viewData?.solidView?.id] } },
+                        { isPrivate: { $eq: true } }
+                    ]
+                }
+
+            ]
+            
+        }
+
+        const queryData: any = {
+            offset: 0,
+            limit: 10,
+            filters: filters,
+            populate: ["model", "view", "user"],
+            sort: ["id:desc"],
+        };
+        const queryString = qs.stringify(queryData, { encodeValuesOnly: true });
+        setSavedFilterQueryString(queryString)
+        triggerGetSolidEntities(queryString);
+
+    }, [searchParams])
+
+    useEffect(() => {
+        if (solidEntityListViewData) {
+            setSavedFilters(solidEntityListViewData.records)
+        }
+    }, [solidEntityListViewData])
+
     useImperativeHandle(ref, () => ({
         clearFilter: () => {
             setFilterRules(initialState);
@@ -226,43 +354,112 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
     }));
 
     useEffect(() => {
-        const queryObject = queryStringToQueryObject();
-        if (queryObject) {
-            const searchChips: any = queryObject?.s_filter || null;
-            const customChips = queryObject?.c_filter || null;
-            if (searchChips) {
-                const formattedChips = searchChips?.$and.map((chip: any, key: any) => {
-                    const chipKey = Object.keys(chip)[0]; // Get the key, e.g., "displayName"
-                    const chipValue = chip[chipKey]?.$containsi; // Get the value of "$containsi"
-                    const chipdata = {
-                        columnName: chipKey,
-                        value: chipValue
-                    };
-                    return chipdata
+        let searchChips: any;
+        let customChips: any;
+        let parsedSearchParams = searchParams;
+
+
+        const savedQuery = parsedSearchParams?.get("savedQuery");
+        if (savedQuery && savedFilters.length > 0) {
+            const currentSavedFilterId = Number(savedQuery);
+            const currentSavedFilterData: any = savedFilters.find((savedFilter: any) => savedFilter.id === currentSavedFilterId);
+            setCurrentSavedFilterData(currentSavedFilterData)
+            if (currentSavedFilterData) {
+                const filterJson = JSON.parse(currentSavedFilterData?.filterQueryJson);
+                if (filterJson) {
+                    searchChips = filterJson?.s_filter || null;
+                    customChips = filterJson?.c_filter || null;
                 }
-                );
-                setSearchChips(formattedChips);
             }
-            if (customChips) {
-                setCustomFilter(customChips);
-                const formatedCustomChips: FilterRule = transformFiltersToRules(customChips);
-                console.log("formatedCustomChips", formatedCustomChips);
-                setFilterRules([formatedCustomChips]);
+        } else {
+            const queryObject = queryStringToQueryObject();
+            if (queryObject) {
+                searchChips = queryObject?.s_filter || null;
+                customChips = queryObject?.c_filter || null;
+            }
+        }
+        if (searchChips) {
+            const formattedChips = searchChips?.$and.map((chip: any, key: any) => {
+                const chipKey = Object.keys(chip)[0]; // Get the key, e.g., "displayName"
+                const chipValue = chip[chipKey]?.$containsi; // Get the value of "$containsi"
+                const chipdata = {
+                    columnName: chipKey,
+                    value: chipValue
+                };
+                return chipdata
+            }
+            );
+            setSearchChips(formattedChips);
+            setSearchFilter(searchChips);
+            setHasSearched(true);
+        }
+        if (customChips) {
+            setCustomFilter(customChips);
+            const formatedCustomChips: FilterRule = transformFiltersToRules(customChips);
+            setFilterRules([formatedCustomChips]);
+            setHasSearched(true);
+        }
+    }, [searchParams, savedFilters])
+
+    function findSearchableField(node: any, targetName: string): boolean {
+        if (
+            node?.type === 'field' &&
+            node?.attrs?.name === targetName &&
+            node?.attrs?.isSearchable
+        ) {
+            return true;
+        }
+
+        if (Array.isArray(node?.children)) {
+            return node.children.some((child: any) => findSearchableField(child, targetName));
+        }
+
+        return false;
+    }
+
+
+    function collectLeafFieldTypes(layoutArray: any) {
+        const result: any = [];
+
+        function recurse(node: any) {
+            if (!node || typeof node !== 'object') return;
+
+            // If it's a field and has no children (leaf field node)
+            if (node.type === 'field' && !node.children) {
+                result.push(node);
+            }
 
+            // If it has children, recurse into them
+            if (Array.isArray(node.children)) {
+                node.children.forEach(recurse);
             }
         }
-    }, [searchParams])
+
+        // Input is an array of nodes
+        layoutArray.forEach(recurse);
+
+        return result;
+    }
+
 
 
     useEffect(() => {
         if (viewData?.data?.solidFieldsMetadata) {
-            if (searchParams && (searchParams.includes("list") || searchParams.includes("kanban"))) {
-            }
-            const fieldsData = viewData?.data?.solidFieldsMetadata;
+            let fieldsData = viewData?.data?.solidFieldsMetadata;
             const fieldsList = Object.entries(fieldsData).map(([key, value]: any) => ({ name: value.displayName, value: key, type: value.type }));
             setFields(fieldsList);
             const searchableFieldsList = fieldsList.filter((field: any) => field.type === "longText" || field.type === "shortText");
-            const finalsearchableFieldsList = searchableFieldsList.filter((field: any) => field.value && viewData?.data?.solidView?.layout?.children?.some((child: any) => child?.attrs?.name === field.value && child?.attrs?.isSearchable)).map((field: any) => field.value);
+            let finalsearchableFieldsList: any = [];
+            if (typeof window !== "undefined" && window.location.href.includes("list")) {
+                finalsearchableFieldsList = searchableFieldsList.filter((field: any) => field.value && viewData?.data?.solidView?.layout?.children?.some((child: any) => child?.attrs?.name === field.value && child?.attrs?.isSearchable)).map((field: any) => field.value);
+            }
+
+            if (typeof window !== "undefined" && window.location.href.includes("kanban")) {
+                const result = collectLeafFieldTypes(viewData?.data?.solidView?.layout?.children);
+                finalsearchableFieldsList = searchableFieldsList.filter((field: any) => field.value && result?.some((child: any) => child?.attrs?.name === field.value && child?.attrs?.isSearchable)).map((field: any) => field.value);
+
+            }
+
             setSearchableFields(finalsearchableFieldsList);
         }
     }, [])
@@ -278,15 +475,15 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         }
     }, []);
 
-    useEffect(() => {
-        // Get the last valid filter
-        const validFilters = filters?.$or?.filter((filter: any) => filter !== undefined) || [];
-        if (validFilters.length > 0) {
-            setCustomChip(validFilters.length.toString()); // Store only the number
-        } else {
-            setCustomChip(""); // Reset when no filters are present
-        }
-    }, [filters]);
+    // useEffect(() => {
+    //     // Get the last valid filter
+    //     const validFilters = filters?.$or?.filter((filter: any) => filter !== undefined) || [];
+    //     if (validFilters.length > 0) {
+    //         setCustomChip(validFilters.length.toString()); // Store only the number
+    //     } else {
+    //         setCustomChip(""); // Reset when no filters are present
+    //     }
+    // }, [filters]);
 
     const firstFilterableFieldName = searchableFields[0]; // First searchable field
 
@@ -374,6 +571,67 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         }
     }, [searchChips]);
 
+
+    // Saved Filter related 
+
+    const applySavedFilter = (savedfilter: any) => {
+        // push the savedQuery=1 in url 
+        if (savedfilter?.id) {
+            router.push(`?savedQuery=${savedfilter.id}`);
+        } else {
+            console.error("Saved filter ID is undefined or null.");
+        }
+
+    }
+    const openSavedCustomFilter = (savedfilter: any) => {
+        //Open custom filter popup 
+        router.push(`?savedQuery=${savedfilter.id}`);
+        setShowGlobalSearchElement(true);
+        // dont refetch the data yet
+        const customFilter = JSON.parse(savedfilter.filterQueryJson).c_filter;
+        setCustomFilter(customFilter ? customFilter : null);
+        if (customFilter) {
+            const formatedCustomChips: FilterRule = transformFiltersToRules(customFilter ? customFilter : null);
+            setFilterRules(formatedCustomChips ? [formatedCustomChips] : initialState);
+        }
+    }
+    const deleteSavedFilter = () => {
+        // delte the saved filter with id 
+        deleteEntity(savedFilterTobeDeleted);
+        triggerGetSolidEntities(savedFilterQueryString);
+        setIsDeleteSQDialogVisible(false);
+        let parsedSearchParams = searchParams;
+        const savedQuery = parsedSearchParams?.get("savedQuery");
+        if (savedFilterTobeDeleted === savedQuery) {
+            const urlParams = new URLSearchParams(window.location.search);
+            urlParams.delete("savedQuery");
+            router.push(`?${urlParams.toString()}`);
+        }
+    }
+
+    const handleSaveFilter = async (formValues: any) => {
+        const filterJson = mergeSearchAndCustomFilters(customFilter, searchFilter, "c_filter", "s_filter");
+        setShowSaveFilterPopup(false)
+
+        const formData = new FormData();
+        formData.append("name", formValues.name);
+        formData.append("filterQueryJson", JSON.stringify(filterJson));
+        formData.append("modelId", viewData?.data?.solidView?.model?.id);
+        formData.append("viewId", viewData?.data?.solidView?.id);
+        formData.append("isPrivate", formValues.isPrivate);
+        formData.append("userId", user?.user?.id);
+        if (formValues.id) {
+            await updateEntity({ id: +formValues.id, data: formData }).unwrap();
+            router.push(`?savedQuery=${formValues.id}`);
+
+        } else {
+            const result = await createEntity(formData).unwrap();
+            router.push(`?savedQuery=${result.data.id}`);
+
+        }
+    }
+
+
     const groupedSearchChips = searchChips.reduce((acc, chip) => {
         const key = chip.columnName || firstFilterableFieldName;
         if (!acc[key]) {
@@ -400,7 +658,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                         <path d="M8.66667 15V13.3333H11.3333V15H8.66667ZM6 10.8333V9.16667H14V10.8333H6ZM4 6.66667V5H16V6.66667H4Z"
                             fill="white" />
                     </svg>
-                    <span><strong>{customFilter.$or.length > 0 ? `${customFilter.$or.length}` : customFilter.$and.length}</strong> rules applied</span>
+                    <span><strong>{customFilter?.$or && customFilter?.$or?.length > 0 ? `${customFilter?.$or?.length}` : customFilter.$and.length}</strong> rules applied</span>
                 </div>
 
                 {/* button to clear filter */}
@@ -433,102 +691,146 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                         <i className="pi pi-times ml-1"
                             style={{ cursor: "pointer" }}
                             onClick={() => handleRemoveChipGroup(column)}
-                        >                        </i>
+                        >
+                        </i>
                     </div>
                 </li>
             ))}
         </>
     );
 
-    console.log("custom chip", customFilter);
 
     const [showOverlay, setShowOverlay] = useState(false);
 
-
     return (
-        <div className="flex justify-content-center solid-custom-filter-wrapper relative">
-            <div className="solid-global-search-element">
-                <ul className="">
-                    {customFilter && <CustomChip />}
-                    <SearchChip />
-                    <li ref={chipsRef}>
-                        <div className="relative">
-                            <InputText
-                                value={inputValue || ""}
-                                placeholder="Search..."
-                                onChange={(e) => {
-                                    setInputValue(e.target.value);
-                                    setShowOverlay(true);
-                                }}
-                                onFocus={() => {
-                                    if (inputValue?.trim()) setShowOverlay(true);
-                                }}
-                                onBlur={() => {
-                                    // Delay so you can click buttons inside overlay
-                                    setTimeout(() => setShowOverlay(false), 150);
-                                }}
-
-                                onKeyDown={handleKeyDown}
-                            />
-                            <Button
-                                icon="pi pi-search"
-                                style={{ fontSize: 10 }}
-                                severity="secondary"
-                                outlined size="small"
-                                onClick={() => setShowGlobalSearchElement(true)}
-                                className="custom-filter-button"
-                            />
-                        </div>
-                    </li>
-                </ul>
-            </div>
-            {showOverlay && inputValue?.trim() && (
-                <div className="absolute w-full z-5 bg-white border-round border-1 border-300 shadow-2" style={{ top: 35 }}>
-                    {inputValue ? (
-                        <>
-                            <div className="custom-filter-search-options px-2 py-2 flex flex-column">
-                                {
-                                    searchableFields.map((value: any, index: any) => (
-                                        <Button
-                                            key={index}
-                                            className="p-2 flex gap-1 text-color"
-                                            onClick={() => handleAddChip(value)}
-                                            text
-                                            severity="secondary"
-                                            size="small"
-                                        >
-                                            Search <strong>{value}</strong> for :
-                                            <span className="font-bold" style={{ color: '#000' }}>{inputValue}</span>
-                                        </Button>
-                                    ))
-                                }
+        <>
+            <div className="flex justify-content-center solid-custom-filter-wrapper relative">
+                <div className="solid-global-search-element">
+                    <ul className="">
+                        {customFilter && <CustomChip />}
+                        <SearchChip />
+                        <li ref={chipsRef}>
+                            <div className="relative">
+                                <InputText
+                                    value={inputValue || ""}
+                                    placeholder="Search..."
+                                    onChange={(e) => {
+                                        setInputValue(e.target.value);
+                                        setShowOverlay(true);
+                                    }}
+                                    onFocus={() => {
+                                        if (inputValue?.trim()) setShowOverlay(true);
+                                    }}
+                                    onBlur={() => {
+                                        // Delay so you can click buttons inside overlay
+                                        setTimeout(() => setShowOverlay(false), 150);
+                                    }}
+
+                                    onKeyDown={handleKeyDown}
+                                />
+                                <Button
+                                    icon="pi pi-search"
+                                    style={{ fontSize: 10 }}
+                                    severity="secondary"
+                                    outlined size="small"
+                                    onClick={() => setShowOverlay(true)}
+                                    className="custom-filter-button"
+                                />
                             </div>
-                            <Divider className="m-0" />
-                        </>
-                    ) :
-                        <>
-                            <div className="p-3 text-base">Search Here...</div>
-                            <Divider className="m-0" />
-                        </>
-                    }
-                    <div className="px-2 py-1">
-                        <Button text size="small" label="Custom Filter" iconPos="left" icon='pi pi-plus' onClick={() => setShowGlobalSearchElement(true)} className="font-bold" />
-                    </div>
+                        </li>
+                    </ul>
                 </div>
-            )
-            }
-            <Dialog header={false} className="solid-global-search-filter" showHeader={false} visible={showGlobalSearchElement} style={{ width: '65vw' }} onHide={() => { if (!showGlobalSearchElement) return; setShowGlobalSearchElement(false); }}>
-                <div className="flex align-items-center justify-content-between px-3">
-                    <h5 className="solid-custom-title m-0">Add Custom Filter</h5>
-                    <Button icon="pi pi-times" rounded text aria-label="Cancel" type="reset" size="small" onClick={() => setShowGlobalSearchElement(false)} />
-                </div>
-                <Divider className="m-0" />
-                <div className="p-4">
-                    {fields.length > 0 &&
-                        <FilterComponent viewData={viewData} fields={fields} filterRules={filterRules} setFilterRules={setFilterRules} transformFilterRules={transformFilterRules} closeDialog={() => setShowGlobalSearchElement(false)}></FilterComponent>
-                    }
-                </div>
-            </Dialog>
-        </div>
+
+                {showOverlay && (
+                    <div className="absolute w-full z-5 bg-white border-round border-1 border-300 shadow-2" style={{ top: 35 }}>
+                        {inputValue ? (
+                            <>
+                                <div className="custom-filter-search-options px-2 py-2 flex flex-column">
+                                    {
+                                        searchableFields.map((value: any, index: any) => (
+                                            <Button
+                                                key={index}
+                                                className="p-2 flex gap-1 text-color"
+                                                onClick={() => handleAddChip(value)}
+                                                text
+                                                severity="secondary"
+                                                size="small"
+                                            >
+                                                Search <strong>{value}</strong> for :
+                                                <span className="font-bold" style={{ color: '#000' }}>{inputValue}</span>
+                                            </Button>
+                                        ))
+                                    }
+                                </div>
+                                <Divider className="m-0" />
+                            </>
+                        ) :
+                            <>
+                                <div className="p-3 text-base">Search Here...</div>
+                                <Divider className="m-0" />
+                            </>
+                        }
+                        {savedFilters.length > 0 &&
+                            <>
+                                <div className="p-3">
+                                    <p className="font-medium">Saved Filters</p>
+                                    <div className="flex flex-column gap-2">
+                                        {savedFilters.map((savedfilter: any) =>
+                                            <SavedFilterList savedfilter={savedfilter} activeSavedFilter={activeSavedFilter} applySavedFilter={applySavedFilter} openSavedCustomFilter={openSavedCustomFilter} setSavedFilterTobeDeleted={setSavedFilterTobeDeleted} setIsDeleteSQDialogVisible={setIsDeleteSQDialogVisible}></SavedFilterList>
+                                        )}
+                                    </div>
+                                </div>
+                                <Divider className="m-0" />
+                            </>
+                        }
+                        <div className="px-2 py-1">
+                            <Button text size="small" label="Custom Filter" iconPos="left" icon='pi pi-plus' onClick={() => setShowGlobalSearchElement(true)} className="font-bold" />
+                        </div>
+                    </div>
+                )
+                }
+                <Dialog header={false} className="solid-global-search-filter" showHeader={false} visible={showGlobalSearchElement} style={{ width: '65vw' }} onHide={() => { if (!showGlobalSearchElement) return; setShowGlobalSearchElement(false); }}>
+                    <div className="flex align-items-center justify-content-between px-3">
+                        <h5 className="solid-custom-title m-0">Add Custom Filter</h5>
+                        <Button icon="pi pi-times" rounded text aria-label="Cancel" type="reset" size="small" onClick={() => setShowGlobalSearchElement(false)} />
+                    </div>
+                    <Divider className="m-0" />
+                    <div className="p-4">
+                        {fields.length > 0 &&
+                            <FilterComponent viewData={viewData} fields={fields} filterRules={filterRules} setFilterRules={setFilterRules} transformFilterRules={transformFilterRules} closeDialog={() => setShowGlobalSearchElement(false)}></FilterComponent>
+                        }
+                    </div>
+                </Dialog>
+                <Dialog header="Add Custom Filter" visible={showSaveFilterPopup} style={{ width: 500 }} onHide={() => { if (!showSaveFilterPopup) return; setShowSaveFilterPopup(false); }}>
+                    <SolidSaveCustomFilterForm currentSavedFilterData={currentSavedFilterData} handleSaveFilter={handleSaveFilter} closeDialog={setShowSaveFilterPopup}></SolidSaveCustomFilterForm>
+                </Dialog>
+
+                <Dialog
+                    visible={isDeleteSQDialogVisible}
+                    header="Confirm Delete"
+                    modal
+                    footer={() => (
+                        <div className="flex justify-content-center">
+                            <Button label="Yes" icon="pi pi-check" className='small-button' severity="danger" autoFocus onClick={deleteSavedFilter} />
+                            <Button label="No" icon="pi pi-times" className='small-button' onClick={() => setIsDeleteSQDialogVisible(false)} />
+                        </div>
+                    )}
+                    onHide={() => setIsDeleteSQDialogVisible(false)}
+                >
+                    <p>Are you sure you want to delete the {currentSavedFilterData?.name} saved query?</p>
+                </Dialog>
+            </div>
+            <div>
+                <Button
+                    icon="pi pi-save"
+                    style={{ fontSize: 10 }}
+                    severity="secondary"
+                    outlined size="small"
+                    onClick={() => {
+                        setShowSaveFilterPopup(true)
+                    }}
+                />
+            </div>
+        </>
     )
 });