@sustaina/shared-ui 1.6.2 → 1.6.4

package/dist/index.d.mts

@@ -332,9 +332,11 @@ type NavbarBaseProps = {
     subTitle?: React__default.ReactNode;
     headImageURL?: string;
     headImageURLClassName?: string;
+    tooltipContentClassName?: string;
     tooltipTitle?: string;
     tooltipIcon?: React__default.ReactNode;
     tooltipdescription?: React__default.ReactNode;
+    tooltipDescriptionWrapperClassName?: string;
     mainButtonText?: React__default.ReactNode;
     mainButtonClassName?: string;
     mainButtonDisable?: boolean;
@@ -346,10 +348,10 @@ type NavbarBaseProps = {
     searchButton?: React__default.ReactNode;
     separatorDisable?: boolean;
 };
-type NavbarProps = RequireAtLeastOne<NavbarBaseProps, "title" | "headImageURL">;
-declare const _default: React__default.MemoExoticComponent<({ className, title, subTitle, headImageURL, headImageURLClassName, tooltipTitle, tooltipIcon, tooltipdescription, mainButtonText, mainButtonClassName, mainButtonDisable, subButtonText, subButtonClassName, subButtonDisable, onMainButtonClick, onSubButtonClick, separatorDisable, searchButton }: NavbarProps) => react_jsx_runtime.JSX.Element>;
+type NavbarProps = RequireAtLeastOne<NavbarBaseProps, "title">;
+declare const _default: React__default.MemoExoticComponent<({ className, title, subTitle, headImageURL, headImageURLClassName, tooltipContentClassName, tooltipTitle, tooltipIcon, tooltipdescription, tooltipDescriptionWrapperClassName, mainButtonText, mainButtonClassName, mainButtonDisable, subButtonText, subButtonClassName, subButtonDisable, onMainButtonClick, onSubButtonClick, separatorDisable, searchButton }: NavbarProps) => react_jsx_runtime.JSX.Element>;
 
-type FieldType = "text" | "number" | "date" | "datetime" | "checkbox" | "dropdown" | "lookup";
+type FieldType = "text" | "number" | "date" | "datetime" | "checkbox" | "dropdown" | "lookup" | "uuid";
 type Option = {
     value: string;
     label: string;
@@ -358,6 +360,7 @@ interface FieldSchemaBase<T extends FieldType> {
     name: string;
     type: T;
     label?: string;
+    multiTableSearch?: boolean;
 }
 interface DropdownFieldSchema extends FieldSchemaBase<"dropdown"> {
     options: Option[];
@@ -368,7 +371,8 @@ type DateFieldSchema = FieldSchemaBase<"date">;
 type DateTimeFieldSchema = FieldSchemaBase<"datetime">;
 type CheckboxFieldSchema = FieldSchemaBase<"checkbox">;
 type LookupFieldSchema = FieldSchemaBase<"lookup">;
-type FieldSchema = DropdownFieldSchema | TextFieldSchema | NumberFieldSchema | DateFieldSchema | DateTimeFieldSchema | CheckboxFieldSchema | LookupFieldSchema;
+type UUIDFiledSchema = FieldSchemaBase<"uuid">;
+type FieldSchema = DropdownFieldSchema | TextFieldSchema | NumberFieldSchema | DateFieldSchema | DateTimeFieldSchema | CheckboxFieldSchema | LookupFieldSchema | UUIDFiledSchema;
 interface AdvanceSearchProps {
     fields: FieldSchema[];
     portalId: string;

package/dist/index.d.ts

@@ -332,9 +332,11 @@ type NavbarBaseProps = {
     subTitle?: React__default.ReactNode;
     headImageURL?: string;
     headImageURLClassName?: string;
+    tooltipContentClassName?: string;
     tooltipTitle?: string;
     tooltipIcon?: React__default.ReactNode;
     tooltipdescription?: React__default.ReactNode;
+    tooltipDescriptionWrapperClassName?: string;
     mainButtonText?: React__default.ReactNode;
     mainButtonClassName?: string;
     mainButtonDisable?: boolean;
@@ -346,10 +348,10 @@ type NavbarBaseProps = {
     searchButton?: React__default.ReactNode;
     separatorDisable?: boolean;
 };
-type NavbarProps = RequireAtLeastOne<NavbarBaseProps, "title" | "headImageURL">;
-declare const _default: React__default.MemoExoticComponent<({ className, title, subTitle, headImageURL, headImageURLClassName, tooltipTitle, tooltipIcon, tooltipdescription, mainButtonText, mainButtonClassName, mainButtonDisable, subButtonText, subButtonClassName, subButtonDisable, onMainButtonClick, onSubButtonClick, separatorDisable, searchButton }: NavbarProps) => react_jsx_runtime.JSX.Element>;
+type NavbarProps = RequireAtLeastOne<NavbarBaseProps, "title">;
+declare const _default: React__default.MemoExoticComponent<({ className, title, subTitle, headImageURL, headImageURLClassName, tooltipContentClassName, tooltipTitle, tooltipIcon, tooltipdescription, tooltipDescriptionWrapperClassName, mainButtonText, mainButtonClassName, mainButtonDisable, subButtonText, subButtonClassName, subButtonDisable, onMainButtonClick, onSubButtonClick, separatorDisable, searchButton }: NavbarProps) => react_jsx_runtime.JSX.Element>;
 
-type FieldType = "text" | "number" | "date" | "datetime" | "checkbox" | "dropdown" | "lookup";
+type FieldType = "text" | "number" | "date" | "datetime" | "checkbox" | "dropdown" | "lookup" | "uuid";
 type Option = {
     value: string;
     label: string;
@@ -358,6 +360,7 @@ interface FieldSchemaBase<T extends FieldType> {
     name: string;
     type: T;
     label?: string;
+    multiTableSearch?: boolean;
 }
 interface DropdownFieldSchema extends FieldSchemaBase<"dropdown"> {
     options: Option[];
@@ -368,7 +371,8 @@ type DateFieldSchema = FieldSchemaBase<"date">;
 type DateTimeFieldSchema = FieldSchemaBase<"datetime">;
 type CheckboxFieldSchema = FieldSchemaBase<"checkbox">;
 type LookupFieldSchema = FieldSchemaBase<"lookup">;
-type FieldSchema = DropdownFieldSchema | TextFieldSchema | NumberFieldSchema | DateFieldSchema | DateTimeFieldSchema | CheckboxFieldSchema | LookupFieldSchema;
+type UUIDFiledSchema = FieldSchemaBase<"uuid">;
+type FieldSchema = DropdownFieldSchema | TextFieldSchema | NumberFieldSchema | DateFieldSchema | DateTimeFieldSchema | CheckboxFieldSchema | LookupFieldSchema | UUIDFiledSchema;
 interface AdvanceSearchProps {
     fields: FieldSchema[];
     portalId: string;

package/dist/index.js

@@ -1954,9 +1954,11 @@ var Navbar = ({
   subTitle,
   headImageURL = "",
   headImageURLClassName,
+  tooltipContentClassName = "w-[450px] lg:!w-[630px]",
   tooltipTitle,
   tooltipIcon,
-  tooltipdescription = [],
+  tooltipdescription,
+  tooltipDescriptionWrapperClassName,
   mainButtonText,
   mainButtonClassName,
   mainButtonDisable = false,
@@ -1975,31 +1977,31 @@ var Navbar = ({
     "nav",
     {
       className: cn(
-        "py-5 px-8 w-full h-[5.3rem] bg-sus-primary-1 flex items-center justify-between",
+        "py-3 px-8 w-full h-16 bg-sus-primary-1 flex items-center justify-between",
         className
       ),
       children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2.5", children: [
-          headImageURL !== "" ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: headImageURL, alt: "", className: cn("w-full h-full", headImageURLClassName) }) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-            React4.isValidElement(title) ? title : /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-white text-4xl font-bold", children: title }),
-            React4.isValidElement(subTitle) ? subTitle : /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-white text-xl font-bold", children: subTitle })
+          headImageURL !== "" ? /* @__PURE__ */ jsxRuntime.jsx("img", { src: headImageURL, alt: "", className: cn("w-full h-full", headImageURLClassName) }) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+            React4.isValidElement(title) ? title : /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-white text-xl font-bold", children: title }),
+            React4.isValidElement(subTitle) ? subTitle : /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "text-white text-sm font-semibold", children: subTitle })
           ] }),
-          tooltipTitle && /* @__PURE__ */ jsxRuntime.jsxs(Tooltip2, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(TooltipTrigger2, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("button", { className: "text-white hover:opacity-80 ", children: /* @__PURE__ */ jsxRuntime.jsx(InfoIcon_default, { className: "w-4" }) }) }),
+          tooltipTitle && /* @__PURE__ */ jsxRuntime.jsxs(Tooltip2, { delayDuration: 700, children: [
+            /* @__PURE__ */ jsxRuntime.jsx(TooltipTrigger2, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("button", { className: "text-white hover:opacity-80", children: /* @__PURE__ */ jsxRuntime.jsx(InfoIcon_default, { className: "w-4" }) }) }),
             /* @__PURE__ */ jsxRuntime.jsxs(
               TooltipContent2,
               {
                 forceMount: true,
                 side: isDesktop ? "right" : "bottom",
-                sideOffset: 8,
                 align: "start",
                 avoidCollisions: false,
                 className: cn(
-                  "bg-background text-foreground border border-black md:w-[350px] lg:w-[420px]",
-                  "transition-all duration-150 ease-out origin-top",
+                  "bg-white border border-black p-6",
+                  "transition-all duration-150 ease-out origin-top top-1 left-4",
                   "data-[state=closed]:opacity-0 data-[state=open]:opacity-100",
                   "data-[state=closed]:scale-95 data-[state=open]:scale-100",
-                  { "mt-5": isDesktop }
+                  { "mt-5": isDesktop },
+                  tooltipContentClassName
                 ),
                 children: [
                   /* @__PURE__ */ jsxRuntime.jsxs(
@@ -2007,13 +2009,16 @@ var Navbar = ({
                     {
                       role: "tooltip",
                       "aria-label": tooltipTitle,
-                      className: cn("flex flex-col gap-4 max-w-sm text-sm text-gray-700", className),
+                      className: cn(
+                        "flex flex-col gap-4 text-sm text-black text-pretty",
+                        tooltipDescriptionWrapperClassName
+                      ),
                       children: [
                         tooltipTitle && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3", children: [
                           React4.isValidElement(tooltipIcon) ? tooltipIcon : /* @__PURE__ */ jsxRuntime.jsx(Icon3, { size: 32, "aria-hidden": "true" }),
                           /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "text-xl font-bold", children: tooltipTitle })
                         ] }),
-                        React4.isValidElement(tooltipdescription) ? tooltipdescription : ""
+                        React4.isValidElement(tooltipdescription) && tooltipdescription
                       ]
                     }
                   ),
@@ -2112,6 +2117,7 @@ var ExpandCollapse_default = ExpandCollapse;
 
 // src/components/advanceSearch/operatorMap.ts
 var OPERATOR_MAP = {
+  uuid: ["equals", "notEquals", "gt", "gte", "lt", "lte"],
   text: [
     "contains",
     "equals",
@@ -2141,22 +2147,30 @@ function firstOperatorFor(fields, fieldName) {
   const t3 = getFieldType(fields, fieldName);
   return OPERATOR_MAP[t3][0];
 }
-function makeNewRow(fields) {
-  const first = fields[0];
-  const op = OPERATOR_MAP[first.type][0];
+function makeNewRow(field) {
+  const op = OPERATOR_MAP[field.type][0];
   if (op === "between") {
     return {
       id: crypto.randomUUID(),
-      fieldName: first.name,
+      fieldName: field.name,
+      fieldType: field.type,
       operator: "between",
       value: "",
-      value2: ""
+      value2: "",
+      multiTableSearch: field.multiTableSearch
     };
   }
-  return { id: crypto.randomUUID(), fieldName: first.name, operator: op, value: "" };
+  return {
+    id: crypto.randomUUID(),
+    fieldName: field.name,
+    fieldType: field.type,
+    operator: op,
+    value: "",
+    multiTableSearch: field.multiTableSearch
+  };
 }
 function useAdvanceSearch({ fields, limitRows }) {
-  const [rows, setRows] = React4.useState([makeNewRow(fields)]);
+  const [rows, setRows] = React4.useState([makeNewRow(fields[0])]);
   const updateRows = React4.useCallback((next) => {
     setRows(next);
   }, []);
@@ -2169,7 +2183,7 @@ function useAdvanceSearch({ fields, limitRows }) {
   );
   const addRow = React4.useCallback(() => {
     if (!limitRows || rows.length < limitRows) {
-      updateRows([...rows, makeNewRow(fields)]);
+      updateRows([...rows, makeNewRow(fields[0])]);
     }
   }, [rows, fields, updateRows, limitRows]);
   const removeRow = React4.useCallback(
@@ -2185,22 +2199,29 @@ function useAdvanceSearch({ fields, limitRows }) {
         rows.map((r2) => {
           if (r2.id !== id) return r2;
           const nextOp = firstOperatorFor(fields, r2.fieldName);
-          return nextOp === "between" ? { id: r2.id, fieldName: r2.fieldName, operator: "between", value: "", value2: "" } : { id: r2.id, fieldName: r2.fieldName, operator: nextOp, value: "" };
+          return nextOp === "between" ? {
+            id: r2.id,
+            fieldName: r2.fieldName,
+            fieldType: r2.fieldType,
+            operator: "between",
+            value: "",
+            value2: ""
+          } : { id: r2.id, fieldName: r2.fieldName, fieldType: r2.fieldType, operator: nextOp, value: "" };
         })
       );
     },
     [rows, fields, updateRows]
   );
   const clearAllRow = React4.useCallback(() => {
-    updateRows([makeNewRow(fields)]);
+    updateRows([makeNewRow(fields[0])]);
   }, [fields, updateRows]);
   const changeField = React4.useCallback(
     (id, fieldName) => {
-      const nextOp = firstOperatorFor(fields, fieldName);
       updateRows(
         rows.map((r2) => {
           if (r2.id !== id) return r2;
-          return nextOp === "between" ? { id: r2.id, fieldName, operator: "between", value: "", value2: "" } : { id: r2.id, fieldName, operator: nextOp, value: "" };
+          const newRow = makeNewRow(fields.find((f) => f.name === fieldName) || fields[0]);
+          return { ...newRow, id: r2.id };
         })
       );
     },
@@ -2212,9 +2233,24 @@ function useAdvanceSearch({ fields, limitRows }) {
         rows.map((r2) => {
           if (r2.id !== id) return r2;
           if (operator === "between") {
-            return { id: r2.id, fieldName: r2.fieldName, operator, value: "", value2: "" };
+            return {
+              id: r2.id,
+              fieldName: r2.fieldName,
+              fieldType: r2.fieldType,
+              multiTableSearch: r2.multiTableSearch,
+              operator,
+              value: "",
+              value2: ""
+            };
           }
-          return { id: r2.id, fieldName: r2.fieldName, operator, value: "" };
+          return {
+            id: r2.id,
+            fieldName: r2.fieldName,
+            fieldType: r2.fieldType,
+            multiTableSearch: r2.multiTableSearch,
+            operator,
+            value: ""
+          };
         })
       );
     },
@@ -2239,55 +2275,16 @@ function useAdvanceSearch({ fields, limitRows }) {
     })),
     [fields]
   );
-  const rowToFilter = (row) => {
-    switch (row.operator) {
-      case "between":
-        return {
-          [row.fieldName]: {
-            gte: row.value,
-            lte: row.value2
-          }
-        };
-      case "contains":
-        return { [row.fieldName]: { contains: row.value } };
-      case "beginsWith":
-        return { [row.fieldName]: { startsWith: row.value } };
-      case "endsWith":
-        return { [row.fieldName]: { endsWith: row.value } };
-      case "notEquals":
-        return { [row.fieldName]: { not: row.value } };
-      case "gt":
-        return { [row.fieldName]: { gt: row.value } };
-      case "gte":
-        return { [row.fieldName]: { gte: row.value } };
-      case "lt":
-        return { [row.fieldName]: { lt: row.value } };
-      case "lte":
-        return { [row.fieldName]: { lte: row.value } };
-      case "is":
-        return { [row.fieldName]: row.value };
-      case "isNot":
-        return { [row.fieldName]: { not: row.value } };
-      case "notContains":
-        return { [row.fieldName]: { not: { contains: row.value } } };
-      case "notBeginsWith":
-        return { [row.fieldName]: { not: { startsWith: row.value } } };
-      case "notEndsWith":
-        return { [row.fieldName]: { not: { endsWith: row.value } } };
-      case "containsAny":
-        return { [row.fieldName]: { hasSome: row.value.split(",") } };
-      case "containsAll":
-        return { [row.fieldName]: { hasEvery: row.value.split(",") } };
-      case "containsOnly":
-        return { [row.fieldName]: { equals: row.value.split(",") } };
-      default:
-        return { [row.fieldName]: row.value };
-    }
-  };
-  const buildParam = React4.useMemo(() => {
-    const andConditions = rows.map((r2) => r2.value ? rowToFilter(r2) : null).filter(Boolean);
-    return { AND: andConditions };
-  }, [rows]);
+  const buildFilter = React4.useCallback(
+    (prismaFilter, options) => {
+      return options?.multiTableSearch ? {
+        some: {
+          value: { ...prismaFilter, ...options?.insensitive ? { mode: "insensitive" } : void 0 }
+        }
+      } : prismaFilter;
+    },
+    []
+  );
   return {
     rows,
     addRow,
@@ -2299,7 +2296,7 @@ function useAdvanceSearch({ fields, limitRows }) {
     changeValue,
     operatorsForField,
     fieldOptions,
-    param: buildParam
+    buildFilter
   };
 }
 
@@ -4825,7 +4822,10 @@ var AdvanceSearch = ({
   onSearch,
   onClear
 }) => {
-  const fieldsData = React4.useMemo(() => fields || [], [fields]);
+  const fieldsData = React4.useMemo(() => {
+    if (fields.length === 0) throw new Error("fields cannot be an empty array");
+    return fields || [];
+  }, [fields]);
   const {
     rows,
     addRow,
@@ -4835,7 +4835,8 @@ var AdvanceSearch = ({
     changeField,
     changeOperator,
     operatorsForField,
-    fieldOptions
+    fieldOptions,
+    buildFilter
   } = useAdvanceSearch({ fields: fieldsData, limitRows });
   const form = reactHookForm.useForm({
     mode: "onSubmit",
@@ -4847,66 +4848,181 @@ var AdvanceSearch = ({
     const currentValues = getValues();
     const param = {
       AND: rows.map((r2) => {
-        const val1 = currentValues[`value_${r2.id}`];
+        let val1 = currentValues[`value_${r2.id}`];
         const val2 = currentValues[`value2_${r2.id}`];
         if (r2.operator === "between") {
           if (!val1 || !val2) return null;
+          const start = new Date(val1);
+          start.setHours(0, 0, 0, 0);
+          const end = new Date(val2);
+          end.setHours(23, 59, 59, 59);
           return {
             [r2.fieldName]: {
-              gte: val1,
-              lte: val2
+              gte: start.toISOString(),
+              lt: end.toISOString()
             }
           };
         }
         if (!val1) return null;
+        val1 = r2.fieldType === "number" ? Number(val1) : val1;
         switch (r2.operator) {
           case "contains":
-            return { [r2.fieldName]: { contains: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { contains: val1 },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "beginsWith":
-            return { [r2.fieldName]: { startsWith: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { startsWith: val1 },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "endsWith":
-            return { [r2.fieldName]: { endsWith: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { endsWith: val1 },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "equals":
-            return { [r2.fieldName]: { equals: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { equals: val1 },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "notEquals":
-            return { [r2.fieldName]: { not: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { not: val1 },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "gt":
-            return { [r2.fieldName]: { gt: val1 } };
+            return {
+              [r2.fieldName]: buildFilter({ gt: val1 }, { multiTableSearch: r2.multiTableSearch })
+            };
           case "gte":
-            return { [r2.fieldName]: { gte: val1 } };
+            return {
+              [r2.fieldName]: buildFilter({ gte: val1 }, { multiTableSearch: r2.multiTableSearch })
+            };
           case "lt":
-            return { [r2.fieldName]: { lt: val1 } };
+            return {
+              [r2.fieldName]: buildFilter({ lt: val1 }, { multiTableSearch: r2.multiTableSearch })
+            };
           case "lte":
-            return { [r2.fieldName]: { lte: val1 } };
+            return {
+              [r2.fieldName]: buildFilter({ lte: val1 }, { multiTableSearch: r2.multiTableSearch })
+            };
           case "is":
             return { [r2.fieldName]: val1 };
           case "isNot":
             return { [r2.fieldName]: { not: val1 } };
           case "notContains":
-            return { [r2.fieldName]: { not: { contains: val1 } } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { not: { contains: val1 } },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "notBeginsWith":
-            return { [r2.fieldName]: { not: { startsWith: val1 } } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { not: { startsWith: val1 } },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "notEndsWith":
-            return { [r2.fieldName]: { not: { endsWith: val1 } } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { not: { endsWith: val1 } },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
           case "containsAny":
-            return { [r2.fieldName]: { hasSome: String(val1).split(",") } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { hasSome: String(val1).split(",") },
+                { multiTableSearch: r2.multiTableSearch }
+              )
+            };
           case "containsAll":
-            return { [r2.fieldName]: { hasEvery: String(val1).split(",") } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { hasEvery: String(val1).split(",") },
+                { multiTableSearch: r2.multiTableSearch }
+              )
+            };
           case "containsOnly":
-            return { [r2.fieldName]: { equals: String(val1).split(",") } };
-          case "on":
-            return { [r2.fieldName]: { on: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { equals: String(val1).split(",") },
+                {
+                  multiTableSearch: r2.multiTableSearch,
+                  insensitive: true
+                }
+              )
+            };
+          case "on": {
+            const start = new Date(val1);
+            start.setHours(0, 0, 0, 0);
+            const end = new Date(val1);
+            end.setHours(23, 59, 59, 59);
+            return {
+              [r2.fieldName]: buildFilter(
+                { gte: start.toISOString(), lt: end.toISOString() },
+                { multiTableSearch: r2.multiTableSearch }
+              )
+            };
+          }
           case "after":
-            return { [r2.fieldName]: { after: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { gte: new Date(val1).toISOString() },
+                { multiTableSearch: r2.multiTableSearch }
+              )
+            };
           case "before":
-            return { [r2.fieldName]: { before: val1 } };
+            return {
+              [r2.fieldName]: buildFilter(
+                { lt: new Date(val1).toISOString() },
+                { multiTableSearch: r2.multiTableSearch }
+              )
+            };
         }
       }).filter(Boolean)
     };
     if (onSearch) {
       onSearch(param);
     }
-  }, [getValues, rows, onSearch]);
+  }, [buildFilter, getValues, rows, onSearch]);
   return /* @__PURE__ */ jsxRuntime.jsx(
     ExpandCollapse_default,
     {