@solidstarters/solid-core-ui 1.1.46 → 1.1.49

package/dist/resources/globals.css

@@ -1564,9 +1564,9 @@ li.header-li-px {
   border: 8px;
   padding: 5px;
   height: 100%;
-  min-width:fit-content;
+  min-width: fit-content;
   width: 100%;
-  max-width:fit-content;
+  max-width: fit-content;
 }
 
 .kaban-heading-area {
@@ -1729,6 +1729,9 @@ li.header-li-px {
   margin-top: 10px;
 }
 
+.solid-file-vieww-wrapper {
+  margin-top: 10px;
+}
 
 .solid-dynamic-stepper {
   overflow: hidden;
@@ -2217,9 +2220,6 @@ li.header-li-px {
   align-items: center;
   justify-content: center;
 } */
-.solid-auth-theme-wrapper.center {
-  background-image: url(../resources/images/auth/solid-login-light.png);
-}
 
 .auth-container {
   min-width: 525px;
@@ -2953,4 +2953,14 @@ flex-shrink: 0; */
 
 .kanban-column-cogwheel.p-button.p-button-secondary.p-button-text:not(:disabled):hover {
   background: transparent;
+}
+
+.view-widget-chip.p-chip {
+  background-color: #f9f9f9 !important;
+  padding: 4px 10px !important;
+}
+
+.view-widget-chip.p-chip .p-chip-text {
+  margin-top: 0 !important;
+  margin-bottom: 0 !important;
 }

package/dist/resources/themes/solid-light-purple/theme.css

@@ -6094,6 +6094,10 @@
     padding: 54px;
   } */
 
+  .solid-auth-theme-wrapper.center {
+    background-image: url('./solid-login-light.png');
+  }
+
   .auth-container {
     border: 1px solid #E0E0E0;
     background: rgba(255, 255, 255, 0.10);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core-ui",
-  "version": "1.1.46",
+  "version": "1.1.49",
   "scripts": {
     "prebuild": "npm run copy-styles",
     "build": "tsc && tsc-alias",

package/src/components/common/SolidThemeProvider.tsx

@@ -10,13 +10,13 @@ export const SolidThemeProvider = () => {
     const [theme, setTheme] = useState("solid-light-purple");
 
     useEffect(() => {
-        if (pathname.includes("/auth")) {
+        if (pathname.includes("/auth/")) {
             trigger("");
         }
     }, [pathname, trigger]);
 
     useEffect(() => {
-        if (pathname.includes("/auth") && solidSettingsData?.data?.authPagesTheme) {
+        if (pathname.includes("/auth/") && solidSettingsData?.data?.authPagesTheme) {
             const selectedTheme =
                 solidSettingsData.data.authPagesTheme === "dark" ? "solid-dark-purple" : "solid-light-purple";
             setTheme(selectedTheme);

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

@@ -99,9 +99,9 @@ const FilterRuleComponent = ({ viewData, fields, rule, onChange, onAddRule, onAd
           <div className='col-4'>
             <Dropdown
               key={rule.id}
-              value={fieldName.value}
+              value={fieldName.name}
               onChange={e => {
-                setFieldName({ name: e.value, value: e.value })
+                setFieldName({ name: e.value })
                 onChange(rule.id, 'fieldName', e.value)
               }}
               options={fields}
@@ -351,27 +351,56 @@ const FilterComponent = ({ viewData, fields, filterRules, setFilterRules, transf
   //   setFilterRules(prev => deleteRecursively(prev, id));
   // };
 
+
+  const removeEmptyGroups = (rule) => { 
+    if (rule.type === "rule_group" && rule.children.length === 0) {
+      return null;
+    }
+
+    rule.children = rule.children
+      .map(removeEmptyGroups) // Recursively process children
+      .filter(child => child !== null); // Remove null values
+
+    return rule;
+  };
+
+
   const handleDeleteRule = (id) => {
-    const deleteRecursively = (rules, id) => {
-      return rules
-        .filter(rule => rule.id !== id) // Remove the target rule
+    if(filterRules[0].children.length === 1 && filterRules[0].children[0].id === id ){
+      return
+    }
+    const deleteRecursively = (rules, id, isRoot = false) => {
+      const mappedData = rules
         .map(rule => {
+          if (rule.id === id) {
+            return null; // Remove the target rule
+          }
+
           if (rule.children) {
             const updatedChildren = deleteRecursively(rule.children, id);
-            // If the rule had only one child and it's now empty, remove the parent
-            if (rule.children.length === 1 && updatedChildren.length === 0) {
-              return null;
+
+            // If this rule had children and now has none, keep it but set children to []
+            if (rule.children.length > 0 && updatedChildren.length === 0) {
+              return { ...rule, children: [] };
             }
+
             return { ...rule, children: updatedChildren };
           }
+
           return rule;
         })
-        .filter(Boolean); // Remove null values
+        .filter(rule => rule !== null); // Remove null values
+
+      return mappedData
     };
 
-    setFilterRules(prev => deleteRecursively(prev, id));
+    setFilterRules(prevRules => [removeEmptyGroups(deleteRecursively(prevRules, id, true)[0])]);
   };
 
+
+
+
+
   // const handlePrintState = () => {
   //   // setPrintedState(JSON.stringify(filterRules, null, 2)); // Pretty format the state
   //   transformFilterRules(filterRules)

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

@@ -2,19 +2,70 @@
 
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
 import { Dialog } from "primereact/dialog";
-import { TabPanel, TabView } from "primereact/tabview";
-import { SolidSearchBox } from "./SolidSearchBox";
 import FilterComponent, { FilterOperator, FilterRule, FilterRuleType } from "@/components/core/common/FilterComponent";
 import { Button } from "primereact/button";
-import { InputText } from "primereact/inputtext";
 import { OverlayPanel } from "primereact/overlaypanel";
 import { Divider } from "primereact/divider";
-import { Chips } from "primereact/chips";
+import { useSearchParams } from "next/navigation";
+import { queryStringToQueryObject } from "../list/SolidListView";
+import { InputText } from "primereact/inputtext";
 
 const getRandomInt = (min: number, max: number) => {
     return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 
+
+const transformFiltersToRules = (filter: any, parentRule: number | null = null): FilterRule => {
+    const currentId = idCounter++;
+
+    if (filter["$or"]) {
+        return {
+            id: currentId,
+            type: FilterRuleType.RULE_GROUP,
+            matchOperator: FilterOperator.OR,
+            parentRule,
+            children: filter["$or"].map((subFilter: any) => transformFiltersToRules(subFilter, currentId))
+        };
+    }
+
+    if (filter["$and"]) {
+        return {
+            id: currentId,
+            type: FilterRuleType.RULE_GROUP,
+            matchOperator: FilterOperator.AND,
+            parentRule,
+            children: filter["$and"].map((subFilter: any) => transformFiltersToRules(subFilter, currentId))
+        };
+    }
+
+    // Handle single rule condition
+    for (const key in filter) {
+        const condition = filter[key];
+
+        for (const matchMode in condition) {
+            return {
+                id: currentId,
+                type: FilterRuleType.RULE,
+                fieldName: key,
+                //@ts-ignore
+                matchMode,
+                value: [condition[matchMode]],
+                parentRule,
+                children: []
+            };
+        }
+    }
+
+    throw new Error("Invalid filter structure");
+}
+
+
+
+
+let idCounter = 1;
+const generateId = () => Date.now() + Math.floor(Math.random() * 1000);
+
+
 const transformRulesToFilters = (input: any) => {
 
     // Helper function to process individual rules
@@ -102,8 +153,28 @@ const transformRulesToFilters = (input: any) => {
 
 }
 
+const tranformSearchToFilters = (input: any) => {
+
+    if (!input || !input.$and) return input; // Return as-is if invalid
+
+    return {
+        $and: input.$and.map((condition: any) => {
+            const { fieldName, matchMode, value } = condition;
+
+            // Ensure value is a single string (if it's an array with one element, extract it)
+            const formattedValue = Array.isArray(value) && value.length === 1 ? value[0] : value;
+
+            return {
+                [fieldName]: {
+                    [matchMode]: formattedValue
+                }
+            };
+        })
+    };
+}
+
 export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCustomFilter, filters, clearFilter }: any, ref) => {
-    const initialState: FilterRule[] = [
+    const defaultState: FilterRule[] = [
         {
             id: 1,
             type: FilterRuleType.RULE_GROUP,
@@ -131,28 +202,66 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
             ]
         }
     ];
+    const [initialState, setInitialState] = useState(defaultState);
+
+    const searchParams = useSearchParams().toString(); // Converts the query params to a string
+
+    console.log("searchParams", searchParams);
 
     const op = useRef<OverlayPanel>(null);
-    const chipsRef = useRef<HTMLDivElement | null>(null);
+    const chipsRef = useRef<HTMLDivElement | null | any>(null);
 
     const [filterRules, setFilterRules] = useState<FilterRule[]>(initialState);
     const [fields, setFields] = useState<any[]>([]);
+    const [searchableFields, setSearchableFields] = useState<any[]>([]);
     const [showGlobalSearchElement, setShowGlobalSearchElement] = useState<boolean>(false);
     const [customChip, setCustomChip] = useState("");
     const [searchChips, setSearchChips] = useState<{ columnName?: string; value: string }[]>([]);
     const [inputValue, setInputValue] = useState<string | null>("");
-
+    const [searchFilter, setSearchFilter] = useState<any | null>(null);
+    const [customFilter, setCustomFilter] = useState<any | null>(null);
     useImperativeHandle(ref, () => ({
         clearFilter: () => {
             setFilterRules(initialState);
         }
     }));
 
+    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
+                }
+                );
+                setSearchChips(formattedChips);
+            }
+            if (customChips) {
+                const formatedCustomChips: FilterRule = transformFiltersToRules(customChips);
+                console.log("formatedCustomChips", formatedCustomChips);
+                setFilterRules([formatedCustomChips]);
+
+            }
+        }
+    }, [searchParams])
+
+
     useEffect(() => {
         if (viewData?.data?.solidFieldsMetadata) {
-            const fieldsData = viewData?.data?.solidFieldsMetadata
-            const fieldsList = Object.entries(fieldsData).map(([key, value]: any) => ({ name: value.displayName, value: key }));
-            setFields(fieldsList)
+            const 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);
+            setSearchableFields(finalsearchableFieldsList);
         }
     }, [])
 
@@ -160,7 +269,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         if (chipsRef.current) {
             const inputElement = chipsRef.current.querySelector("input");
             if (inputElement) {
-                inputElement.addEventListener("input", (e) => {
+                inputElement.addEventListener("input", (e: any) => {
                     setInputValue((e.target as HTMLInputElement).value);
                 });
             }
@@ -177,68 +286,72 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         }
     }, [filters]);
 
-    const handleChipChange = (e: any) => {
-        setInputValue(e.target.value);
-        if (op.current && e.target) {
-            op.current.show;
-        }
-        if (e.value && e.value.length > 0) {
-            const newChip = e.value[e.value.length - 1];
-            if (!searchChips.some(chip => chip.value === newChip.value)) {
-                setSearchChips([...searchChips, newChip]);
-            }
-        }
-    };
-
-    const firstFilterableFieldName = viewData?.data?.solidView?.layout?.children?.find(
-        (value: any) => value?.attrs?.filterable
-    )?.attrs?.name;
+    const firstFilterableFieldName = searchableFields[0]; // First searchable field
 
     const handleAddChip = (columnName?: string) => {
         if (inputValue?.trim()) {
-            const newChip = { columnName: columnName || firstFilterableFieldName, value: inputValue.trim() };
-
-            setSearchChips((prevChips) => [...prevChips, newChip]);
-            setInputValue(""); // Clear input value
+            const newChip = {
+                columnName: columnName || firstFilterableFieldName,
+                value: inputValue.trim(),
+            };
+            setSearchChips((prev) => [...prev, newChip]);
+            setInputValue("");
+            op.current?.hide();
         }
-    }
+    };
 
-    const handleKeyDown = (e: any) => {
+    const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
         if (e.key === "Enter" && inputValue?.trim()) {
             handleAddChip();
-            setInputValue(null);
-            e.preventDefault(); // Prevent form submission or unexpected behavior
+            e.preventDefault();
+        } else if (e.key === "Backspace" && inputValue === "") {
+            setSearchChips((prev) => prev.slice(0, -1));
         }
+
+
     };
 
+    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 transformFilterRules = (filterRules: any) => {
         const transformedFilter = transformRulesToFilters(filterRules[0]);
+        console.log("transformedFilter from custom filter", transformedFilter);
+        setCustomFilter(transformedFilter);
         if (transformedFilter) {
-            handleApplyCustomFilter(transformedFilter)
+            const finalFilter = mergeSearchAndCustomFilters(transformedFilter, searchFilter, "c_filter", "s_filter");
+            handleApplyCustomFilter(finalFilter)
         }
         setShowGlobalSearchElement(false)
     }
 
     useEffect(() => {
         const formattedChips = {
-            id: 1,
-            matchOperator: "and",
-            parentRule: null,
-            type: "rule_group",
-            children: searchChips.map((chip) => ({
-                children: [],
+            $and: searchChips.map((chip) => ({
                 fieldName: chip.columnName,
-                id: Date.now() + getRandomInt(1, 500),
                 matchMode: "$containsi",
-                parentRule: 1,
-                type: "rule",
                 value: [chip.value]
             }))
         };
-        if (formattedChips.children.length > 0) {
-            const transformedFilter = transformRulesToFilters(formattedChips);
-            handleApplyCustomFilter(transformedFilter);
-        }
+        // if (formattedChips.$and.length > 0) {
+        const transformedFilter = tranformSearchToFilters(formattedChips);
+        setSearchFilter(transformedFilter);
+        const finalFilter = mergeSearchAndCustomFilters(transformedFilter, customFilter, "s_filter", "c_filter");
+        handleApplyCustomFilter(finalFilter);
+        // }
     }, [searchChips]);
 
     const groupedSearchChips = searchChips.reduce((acc, chip) => {
@@ -250,114 +363,94 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
         return acc;
     }, {} as Record<string, string[]>);
 
-    const chipsToDisplay = [
-        ...(customChip ? [customChip] : []),
-        ...Object.entries(groupedSearchChips).map(([columnName, values]) => `<div class="custom-chip-column">${columnName}</div> <div class="custom-chip-value">${values.join("<span class='custom-chip-or'> or</span> ")}</div>`)
-    ];
-
-
-    // useEffect(() => {
-    //     console.log("Input Value", customChip, "Input Value", searchChips, "Input Value", inputValue);
-    // }, [chipsToDisplay])
-
-    const customChipTemplate = (item: any) => {
-        if (item === customChip) {
-            return (
+    const CustomChip = () => (
+        <li>
+            <div className="custom-filter-chip-type">
                 <div className="flex align-items-center gap-2 text-base">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none" onClick={() => setShowGlobalSearchElement(true)} >
+                    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none"
+                        onClick={() => setShowGlobalSearchElement(true)}>
                         <rect width="20" height="20" rx="4" fill="#722ED1" />
-                        <path d="M8.66667 15V13.3333H11.3333V15H8.66667ZM6 10.8333V9.16667H14V10.8333H6ZM4 6.66667V5H16V6.66667H4Z" fill="white" />
+                        <path d="M8.66667 15V13.3333H11.3333V15H8.66667ZM6 10.8333V9.16667H14V10.8333H6ZM4 6.66667V5H16V6.66667H4Z"
+                            fill="white" />
                     </svg>
-                    <span><strong>{customChip}</strong> rule{customChip === "1" ? '' : 's'} applied</span>
+                    <span><strong>{customChip}</strong> rules applied</span>
                 </div>
-            );
-        }
-        return <div className="flex align-items-center gap-2 text-base" dangerouslySetInnerHTML={{ __html: item }}></div>;
-    };
+            </div>
+        </li>
+    );
+
+
+    const SearchChip = () => (
+        <>
+            {Object.entries(groupedSearchChips).map(([column, values]) => (
+                <li key={column}>
+                    <div className="search-filter-chip-type">
+                        <div>{column}</div>
+                        {values.map((value, index) => (
+                            <span key={index} className="custom-chip-value mx-1">{value}</span>
+                        ))}
+                    </div>
+                </li>
+            ))}
+        </>
+    );
 
-    const handleRemoveChip = (removedChipValue: any) => {
-        console.log("Removing chip:", removedChipValue);
 
-        setSearchChips((prevChips) => {
-            const updatedChips = prevChips.filter((chip) => chip.value !== removedChipValue);
-            console.log("Updated searchChips after removal:", updatedChips);
-            return updatedChips;
-        });
 
-        // Prevent clearing customChip if it is different from the removed chip
-        if (customChip === removedChipValue) {
-            console.log("Clearing custom chip:", customChip);
-            setCustomChip("");
-        }
-    };
 
     return (
         <div className="flex justify-content-center solid-custom-filter-wrapper">
-            <div className="p-inputgroup flex-1 custom-input-group"
-                ref={chipsRef}
-                onClick={(e) => {
-                    e.preventDefault();
-                    if (op.current && e.target) {
-                        op.current.toggle(e);
-                    }
-                }}
-            >
-                <Chips
-                    value={chipsToDisplay}
-                    onChange={(e: any) => {
-                        // Compare previous and new values to detect removal
-                        if (e.value.length < searchChips.length) {
-                            const removedChip = searchChips.find(chip => !e.value.includes(chip.value));
-                            if (removedChip) {
-                                handleRemoveChip(removedChip.value);
-                            }
-                        } else {
-                            setSearchChips(e.value.map((val: any) => ({ columnName: firstFilterableFieldName, value: val })));
-                        }
-                    }}
-                    onRemove={(event) => {
-                        setSearchChips((prevChips) => prevChips.filter((chip) => chip.value !== event.value));
-                        if (searchChips.length === 1) {
-                            setCustomChip("");
-                            clearFilter();
-                        }
-                    }}
-                    itemTemplate={customChipTemplate}
-                    onKeyDown={handleKeyDown}
-                    className="custom-filter-chip"
-                    placeholder="Search..."
-                    removeIcon='pi pi-times'
-                    removable
-                />
-                <Button
-                    icon="pi pi-search"
-                    style={{ fontSize: 10 }}
-                    severity="secondary"
-                    outlined size="small"
-                    onClick={() => setShowGlobalSearchElement(true)}
-                // onClick={(e) => {
-                //     if (op.current && e.target) {
-                //         op.current.toggle(e);
-                //     }
-                // }}
-                />
+            <div className="solid-global-search-element">
+                <ul className="">
+                    {customChip && <CustomChip />}
+                    <SearchChip />
+                    <li ref={chipsRef}>
+                        <div className="relative">
+                            <InputText
+                                value={inputValue || ""}
+                                placeholder="Search..."
+                                onChange={(e) => {
+                                    setInputValue(e.target.value);
+                                    if (e.target.value.trim() !== "") {
+                                        //@ts-ignore
+                                        op.current?.show(e.currentTarget);
+                                    } else {
+                                        op.current?.hide();
+                                    }
+                                }}
+                                onFocus={(e: any) => {
+                                        //@ts-ignore
+                                    if (inputValue?.trim()) op.current?.show(e.currentTarget);
+                                }}
+                                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>
             <OverlayPanel ref={op} className="solid-custom-overlay" style={{ minWidth: 405 }}>
                 {inputValue ? (
                     <>
                         <div className="custom-filter-search-options px-2 py-2 flex flex-column">
-                            {viewData?.data?.solidView?.layout?.children
-                                .filter((value: any) => value?.attrs?.filterable) // Only keep filterable fields
-                                .map((value: any, index: any) => (
+                            {
+                                searchableFields.map((value: any, index: any) => (
                                     <Button
                                         key={index}
                                         className="p-2 flex gap-1 text-color"
-                                        onClick={() => handleAddChip(value?.attrs?.name)}
+                                        onClick={() => handleAddChip(value)}
                                         text
                                         severity="secondary"
                                         size="small"
                                     >
-                                        Search <strong>{value?.attrs?.name}</strong> for :
+                                        Search <strong>{value}</strong> for :
                                         <span className="font-bold" style={{ color: '#000' }}>{inputValue}</span>
                                     </Button>
                                 ))