@sustaina/shared-ui 1.24.0 → 1.25.0

package/dist/index.mjs

@@ -4,7 +4,6 @@ import { twMerge } from 'tailwind-merge';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React4 from 'react';
 import React4__default, { forwardRef, useRef, useMemo, useCallback, isValidElement, useState, useEffect, useLayoutEffect, createElement } from 'react';
-import { format, isValid, parseISO, isAfter, compareAsc, parse } from 'date-fns';
 import { CircleX, CircleHelp, Undo, Redo, Bold, Italic, Underline, Strikethrough, Code, Pilcrow, Heading1, Heading2, Heading3, List as List$1, ListOrdered, Quote, CodeSquare, Link, Link2Off, Image as Image$1, AlignLeft, AlignCenter, AlignRight, XIcon, ChevronRight, CheckIcon, Triangle, CalendarIcon, X, Search, ChevronUp, ChevronDown, Minimize2, Maximize2, Plus, ChevronLeft, CircleUserRound, PanelLeftIcon, Bug, GripVertical, Info, CircleMinus, Minus } from 'lucide-react';
 import { createPortal } from 'react-dom';
 import * as SelectPrimitive from '@radix-ui/react-select';
@@ -12,6 +11,7 @@ import { useForm, FormProvider, Controller, useFormContext, useFormState, useFie
 import { Slot } from '@radix-ui/react-slot';
 import * as LabelPrimitive from '@radix-ui/react-label';
 import { cva } from 'class-variance-authority';
+import { format, isValid, parseISO, isAfter, compareAsc, parse } from 'date-fns';
 import * as PopoverPrimitive from '@radix-ui/react-popover';
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
@@ -3421,6 +3421,66 @@ function getBuilder(fieldType) {
       return new JSONBuilder();
   }
 }
+var FILTER_FIELD_MAP = {
+  timezone: "timezoneId",
+  decimalSeparator: "decimalSeparatorId",
+  country: "countryId",
+  currency: "currencyId"
+};
+function transformFilterKeys(obj, fieldMap = FILTER_FIELD_MAP) {
+  if (Array.isArray(obj)) {
+    return obj.map((item) => transformFilterKeys(item, fieldMap));
+  }
+  if (obj && typeof obj === "object") {
+    const newObj = {};
+    for (const key in obj) {
+      const mappedKey = fieldMap[key] ?? key;
+      newObj[mappedKey] = transformFilterKeys(obj[key], fieldMap);
+    }
+    return newObj;
+  }
+  return obj;
+}
+var sanitizeInput = (val) => {
+  if (!val) return val;
+  if (typeof val !== "string") return "__INVALID_TYPE__";
+  if (val.includes("\n") || val.includes("\r") || /[\u2028\u2029]/u.test(val))
+    return "__INVALID_NEWLINE__";
+  if (/\\\\/.test(val)) return "__INVALID_ESCAPE__";
+  if (/\\(n|t|r|b|f|u[0-9a-fA-F]{4})/.test(val)) return "__INVALID_ESCAPE__";
+  if (/\p{Cf}/u.test(val)) return "__INVALID_UNICODE_WHITESPACE__";
+  if (/[\u00A0\u1680\u180E\u202F\u205F\u3000]/u.test(val)) return "__INVALID_UNICODE_WHITESPACE__";
+  const trimmed = val.trim();
+  if (/^\{.*\}$/s.test(trimmed) || /^\[.*\]$/s.test(trimmed)) return "__INVALID_JSON_LITERAL__";
+  if (/\\\{/.test(val) || /\\\}/.test(val)) return "__INVALID_JSON_ESCAPE__";
+  if (/[%_*~^]/.test(trimmed)) return "__INVALID_WILDCARD__";
+  if (/[%><={}\\[\]"']/u.test(trimmed)) return "__INVALID_CHAR__";
+  if (/\p{Cc}/u.test(val)) return "__INVALID_CONTROL_CHAR__";
+  return trimmed.replace(/\s+/g, " ");
+};
+var numericTypes = ["number", "integer", "decimal"];
+var dateTypes = ["date", "datemonth"];
+var validateByFieldType = (value, fieldType) => {
+  if (!value) return { valid: true };
+  if (numericTypes.includes(fieldType)) {
+    if (!/^\d+(\.\d+)?$/.test(value)) {
+      return { valid: false, message: "Please enter a valid number." };
+    }
+  }
+  if (fieldType === "boolean") {
+    if (!["true", "false"].includes(value.toLowerCase())) {
+      return { valid: false, message: "Please enter a boolean value (true/false)." };
+    }
+  }
+  if (dateTypes.includes(fieldType)) {
+    const normalized = fieldType === "datemonth" ? `${value}-01` : value;
+    const parsed = parseISO(normalized);
+    if (!isValid(parsed)) {
+      return { valid: false, message: "Invalid date format." };
+    }
+  }
+  return { valid: true };
+};
 var AdvanceSearch = ({
   fields,
   portalId,
@@ -3428,7 +3488,8 @@ var AdvanceSearch = ({
   limitRows = 4,
   onSearch,
   onClear,
-  shortDateFormat
+  shortDateFormat,
+  filterFieldMap = FILTER_FIELD_MAP
 }) => {
   const fieldsData = useMemo(() => {
     if (fields.length === 0) throw new Error("fields cannot be an empty array");
@@ -3480,72 +3541,75 @@ var AdvanceSearch = ({
   const onSubmit = useCallback(() => {
     const operatorValidation = {};
     rows.forEach((r) => {
-      const availableOperators = operatorsForField(r.fieldName);
-      if (!availableOperators.length || !availableOperators.includes(r.operator)) {
+      const ops = operatorsForField(r.fieldName);
+      if (!ops.length || !ops.includes(r.operator))
         operatorValidation[r.id] = "Please select an operator.";
-      }
     });
     setOperatorErrors(operatorValidation);
-    if (Object.keys(operatorValidation).length > 0) {
-      return;
-    }
+    if (Object.keys(operatorValidation).length > 0) return;
     const currentValues = getValues();
-    let hasRangeError = false;
-    const rawRows = rows.map((r) => {
-      const startFieldName = `value_${r.id}`;
-      const startValue = currentValues[startFieldName] ?? "";
+    let hasError = false;
+    const processedRows = rows.map((r) => {
+      const startField = `value_${r.id}`;
+      const endField = `value2_${r.id}`;
+      let v1 = currentValues[startField] ?? "";
+      let v2 = currentValues[endField] ?? "";
+      const s1 = sanitizeInput(v1);
+      if (s1?.startsWith("__INVALID")) {
+        hasError = true;
+        setError(startField, { type: "validate", message: "Invalid input." });
+        return null;
+      }
+      v1 = s1 || "";
+      const valid1 = validateByFieldType(v1, r.fieldType);
+      if (!valid1.valid) {
+        hasError = true;
+        setError(startField, { type: "validate", message: valid1.message });
+        return null;
+      }
       if (r.operator === "between") {
-        const endFieldName = `value2_${r.id}`;
-        const endValue = currentValues[endFieldName] ?? "";
-        if (startValue && endValue) {
-          const startDate = parseRangeValue(startValue, r.fieldType);
-          const endDate = parseRangeValue(endValue, r.fieldType);
-          if (startDate && endDate && isAfter(startDate, endDate)) {
-            hasRangeError = true;
-            setError(startFieldName, {
-              type: "validate",
-              message: "Start value must be before end value."
-            });
-            setError(endFieldName, {
-              type: "validate",
-              message: "End value must be after start value."
-            });
-          } else {
-            clearErrors([startFieldName, endFieldName]);
+        const s2 = sanitizeInput(v2);
+        if (s2?.startsWith("__INVALID")) {
+          hasError = true;
+          setError(endField, { type: "validate", message: "Invalid input." });
+          return null;
+        }
+        v2 = s2 || "";
+        const valid2 = validateByFieldType(v2, r.fieldType);
+        if (!valid2.valid) {
+          hasError = true;
+          setError(endField, { type: "validate", message: valid2.message });
+          return null;
+        }
+        if (v1 && v2 && ["date", "datemonth"].includes(r.fieldType)) {
+          const d1 = parseRangeValue(v1, r.fieldType);
+          const d2 = parseRangeValue(v2, r.fieldType);
+          if (d1 && d2 && isAfter(d1, d2)) {
+            hasError = true;
+            setError(startField, { type: "validate", message: "Start value must be before end value." });
+            setError(endField, { type: "validate", message: "End value must be after start value." });
+            return null;
           }
         }
-        return {
-          ...r,
-          value: startValue ?? "",
-          value2: endValue ?? ""
-        };
+        return { ...r, value: v1, value2: v2 };
       }
-      return {
-        ...r,
-        value: startValue ?? ""
-      };
+      return { ...r, value: v1 };
     });
-    if (hasRangeError) {
-      return;
-    }
+    if (hasError) return;
+    const cleanedRows = processedRows.filter(Boolean);
     const param = {
-      AND: rawRows.map((r) => {
-        const builder = getBuilder(r.fieldType);
-        return builder.build(r);
-      }).filter(Boolean)
+      AND: cleanedRows.map((r) => getBuilder(r.fieldType).build(r)).filter(Boolean)
     };
-    if (onSearch) {
-      onSearch(param);
-    }
+    if (onSearch) onSearch(transformFilterKeys(param, filterFieldMap));
   }, [
-    clearErrors,
-    getValues,
-    onSearch,
+    rows,
     operatorsForField,
+    getValues,
     parseRangeValue,
-    rows,
     setError,
-    setOperatorErrors
+    setOperatorErrors,
+    filterFieldMap,
+    onSearch
   ]);
   return /* @__PURE__ */ jsx(
     ExpandCollapse_default,
@@ -3583,9 +3647,7 @@ var AdvanceSearch = ({
               unregister(`value_${row.id}`);
               unregister(`value2_${row.id}`);
             },
-            onClearValue: (which) => {
-              clearValue(row.id, which);
-            },
+            onClearValue: (which) => clearValue(row.id, which),
             disableAdd: limitRows !== void 0 && rows.length >= limitRows
           },
           row.id
@@ -3610,7 +3672,7 @@ var AdvanceSearch = ({
             Button,
             {
               type: "submit",
-              className: "w-full bg-[#379a2a] text-white hover:bg-[#2f7c21] md:w-auto md:min-w-[120px]",
+              className: "w-full bg-sus-green-2 text-white hover:bg-[#2f7c21] md:w-auto md:min-w-[120px]",
               "data-testid": "advsearch-btn-search",
               children: "Search"
             }
@@ -6547,8 +6609,8 @@ var GridSettingsModal = ({
     }
   }, [isOpen, currentColumns, form]);
   const addColumn = async () => {
-    const isValid5 = await trigger("columns");
-    if (isValid5) {
+    const isValid6 = await trigger("columns");
+    if (isValid6) {
       append({ id: "" });
       requestAnimationFrame(() => {
         const container = scrollRef.current;