@sustaina/shared-ui 1.30.2 → 1.31.0

package/dist/index.d.mts

@@ -48,7 +48,9 @@ interface FieldSchemaBase<T extends FieldType> {
 interface DropdownFieldSchema extends FieldSchemaBase<"dropdown"> {
     options: Option[];
 }
-type TextFieldSchema = FieldSchemaBase<"text">;
+interface TextFieldSchema extends FieldSchemaBase<"text"> {
+    allowRegex?: RegExp;
+}
 type NumberFieldSchema = FieldSchemaBase<"number">;
 type DateFieldSchema = FieldSchemaBase<"date">;
 type DateTimeFieldSchema = FieldSchemaBase<"datetime">;
@@ -84,6 +86,7 @@ type RowState = {
     multiTableSearch?: boolean;
     jsonPath?: string[];
     lookupFieldName?: string;
+    allowRegex?: RegExp;
 } | {
     id: string;
     fieldName: string;
@@ -94,6 +97,7 @@ type RowState = {
     multiTableSearch?: boolean;
     jsonPath?: string[];
     lookupFieldName?: string;
+    allowRegex?: RegExp;
 };
 interface Params {
     AND: Record<string, unknown>[];

package/dist/index.d.ts

@@ -48,7 +48,9 @@ interface FieldSchemaBase<T extends FieldType> {
 interface DropdownFieldSchema extends FieldSchemaBase<"dropdown"> {
     options: Option[];
 }
-type TextFieldSchema = FieldSchemaBase<"text">;
+interface TextFieldSchema extends FieldSchemaBase<"text"> {
+    allowRegex?: RegExp;
+}
 type NumberFieldSchema = FieldSchemaBase<"number">;
 type DateFieldSchema = FieldSchemaBase<"date">;
 type DateTimeFieldSchema = FieldSchemaBase<"datetime">;
@@ -84,6 +86,7 @@ type RowState = {
     multiTableSearch?: boolean;
     jsonPath?: string[];
     lookupFieldName?: string;
+    allowRegex?: RegExp;
 } | {
     id: string;
     fieldName: string;
@@ -94,6 +97,7 @@ type RowState = {
     multiTableSearch?: boolean;
     jsonPath?: string[];
     lookupFieldName?: string;
+    allowRegex?: RegExp;
 };
 interface Params {
     AND: Record<string, unknown>[];

package/dist/index.js

@@ -692,7 +692,8 @@ var OPERATOR_MAP = {
   dropdown: ["is", "isNot"],
   lookup: ["containsAny", "containsOnly", "containsAll", "notContains"],
   uuid: ["equals", "notEquals", "gt", "gte", "lt", "lte"],
-  json: ["equals", "notEquals", "containsAny"]
+  json: ["equals", "notEquals"]
+  // removed containsAny from json
 };
 
 // src/components/advanceSearch/hooks/useAdvanceSearch.ts
@@ -739,7 +740,8 @@ function makeNewRow(field) {
     operator: op,
     value: "",
     multiTableSearch: field.multiTableSearch,
-    lookupFieldName: field.lookupFieldName
+    lookupFieldName: field.lookupFieldName,
+    allowRegex: field.type === "text" ? field.allowRegex : void 0
   };
 }
 function useAdvanceSearch({ fields, limitRows }) {
@@ -782,7 +784,8 @@ function useAdvanceSearch({ fields, limitRows }) {
             value2: "",
             multiTableSearch: r.multiTableSearch,
             jsonPath: r.jsonPath,
-            lookupFieldName: r.lookupFieldName
+            lookupFieldName: r.lookupFieldName,
+            allowRegex: r.allowRegex
           } : {
             id: r.id,
             fieldName: r.fieldName,
@@ -791,7 +794,8 @@ function useAdvanceSearch({ fields, limitRows }) {
             value: "",
             multiTableSearch: r.multiTableSearch,
             jsonPath: r.jsonPath,
-            lookupFieldName: r.lookupFieldName
+            lookupFieldName: r.lookupFieldName,
+            allowRegex: r.allowRegex
           };
         })
       );
@@ -839,7 +843,8 @@ function useAdvanceSearch({ fields, limitRows }) {
             lookupFieldName: r.lookupFieldName,
             jsonPath: r.jsonPath,
             operator,
-            value: ""
+            value: "",
+            allowRegex: r.allowRegex
           };
         })
       );
@@ -1429,11 +1434,19 @@ var ConditionTextInput = ({ row, control, onClear }) => /* @__PURE__ */ jsxRunti
         field.onChange("");
         onClear("value");
       };
+      const handleChange = (e) => {
+        const val = e.target.value;
+        if (val !== "" && row.allowRegex && !row.allowRegex.test(val)) {
+          return;
+        }
+        field.onChange(val);
+      };
       return /* @__PURE__ */ jsxRuntime.jsxs(FormItem, { className: "relative", children: [
         /* @__PURE__ */ jsxRuntime.jsx(FormControl, { children: /* @__PURE__ */ jsxRuntime.jsx(
           Input,
           {
             ...field,
+            onChange: handleChange,
             value: field.value ?? "",
             autoComplete: "off",
             inputMode: "text",
@@ -2640,12 +2653,16 @@ var LookupSelect = ({
     (option) => {
       upsertOptionLabels([option]);
       addTag(option.value);
-      inputRef.current?.focus();
-      setTimeout(() => {
-        inputRef.current?.scrollIntoView({ behavior: "smooth" });
-      }, 100);
+      if (multiple) {
+        inputRef.current?.focus();
+        setTimeout(() => {
+          inputRef.current?.scrollIntoView({ behavior: "smooth" });
+        }, 100);
+      } else {
+        inputRef.current?.blur();
+      }
     },
-    [addTag, upsertOptionLabels]
+    [addTag, multiple, upsertOptionLabels]
   );
   const handleKeyDown = React4.useCallback(
     (e) => {
@@ -2805,7 +2822,7 @@ var LookupSelect = ({
     }
     return /* @__PURE__ */ jsxRuntime.jsx("div", { ref: assignDropdownContentRef, className: "absolute left-0 right-0 top-full z-10 mt-1", children: dropdownContent });
   };
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative w-full", ref: containerRef, children: [
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative w-full truncate", ref: containerRef, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(
       "div",
       {
@@ -2836,7 +2853,7 @@ var LookupSelect = ({
                 `${tag}-${i}`
               );
             }),
-            !multiple && selectedLabel && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-sm text-gray-700", children: selectedLabel }),
+            !multiple && selectedLabel && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-sm text-gray-700 max-w-full", children: selectedLabel }),
             /* @__PURE__ */ jsxRuntime.jsx(
               "input",
               {
@@ -2850,6 +2867,7 @@ var LookupSelect = ({
                     setIsDropdownOpen(true);
                   }
                 },
+                hidden: !multiple && selectedLabel !== void 0,
                 placeholder: value.length === 0 && resolvedPlaceholder || "",
                 className: "min-w-[120px] flex-1 border-none bg-transparent py-1 text-sm text-gray-600 placeholder:text-gray-400 outline-none",
                 disabled: multiple && limitReached
@@ -2951,7 +2969,6 @@ var ConditionJSONInput = ({
             onClear: handleClear,
             error: Boolean(fieldState.error),
             placeholder: fieldSchema?.placeholder,
-            maxTags: row.operator === "containsAny" ? fieldSchema?.maxTags : 1,
             fetchSuggestions: fieldSchema?.fetchSuggestions,
             suggestionDebounce: fieldSchema?.suggestionDebounce,
             noOptionsMessage: fieldSchema?.noOptionsMessage,
@@ -3164,7 +3181,8 @@ var DatetimeBuilder = class {
         case "after":
           return {
             [row.fieldName]: helper(
-              { gte: dayStart.toISOString() },
+              { gte: dayEnd.toISOString() },
+              // use end of the day time
               { multiTableSearch: row.multiTableSearch }
             )
           };
@@ -3267,12 +3285,12 @@ var JSONBuilder = class {
         return {
           NOT: { [row.fieldName]: { path: row.jsonPath, equals: isArray ? row.value[0] : row.value } }
         };
-      case "containsAny":
-        if (!isArray)
-          return { [row.fieldName]: { path: row.jsonPath, equals: isArray ? row.value[0] : row.value } };
-        return {
-          OR: row.value.map((v) => ({ [row.fieldName]: { path: row.jsonPath, equals: v } }))
-        };
+      // case "containsAny":
+      //   if (!isArray)
+      //     return { [row.fieldName]: { path: row.jsonPath, equals: isArray ? row.value[0] : row.value } };
+      //   return {
+      //     OR: (row.value as any[]).map((v) => ({ [row.fieldName]: { path: row.jsonPath, equals: v } }))
+      //   };
       default:
         return {};
     }
@@ -3545,7 +3563,9 @@ function transformFilterKeys(obj, fieldMap = FILTER_FIELD_MAP) {
 }
 var sanitizeInput = (val) => {
   if (!val) return val;
-  if (typeof val !== "string") return "__INVALID_TYPE__";
+  if (Array.isArray(val)) {
+    return val.map((v) => sanitizeInput(v));
+  }
   if (val.includes("\n") || val.includes("\r") || /[\u2028\u2029]/u.test(val))
     return "__INVALID_NEWLINE__";
   if (/\\\\/.test(val)) return "__INVALID_ESCAPE__";
@@ -3564,6 +3584,9 @@ var numericTypes = ["number", "integer", "decimal"];
 var dateTypes = ["date", "datemonth"];
 var validateByFieldType = (value, fieldType) => {
   if (!value) return { valid: true };
+  if (Array.isArray(value)) {
+    return { valid: true };
+  }
   if (numericTypes.includes(fieldType)) {
     if (!/^\d+(\.\d+)?$/.test(value)) {
       return { valid: false, message: "Please enter a valid number." };
@@ -3636,6 +3659,7 @@ var AdvanceSearch = ({
   );
   const parseRangeValue = React4.useCallback((raw, fieldType) => {
     if (!raw) return void 0;
+    if (Array.isArray(raw)) return void 0;
     const normalized = fieldType === "datemonth" ? `${raw}-01` : raw;
     const parsed = dateFns.parseISO(normalized);
     return dateFns.isValid(parsed) ? parsed : void 0;
@@ -3654,10 +3678,10 @@ var AdvanceSearch = ({
     const processedRows = rows.map((r) => {
       const startField = `value_${r.id}`;
       const endField = `value2_${r.id}`;
-      let v1 = currentValues[startField] ?? "";
-      let v2 = currentValues[endField] ?? "";
+      let v1 = currentValues[startField];
+      let v2 = currentValues[endField];
       const s1 = sanitizeInput(v1);
-      if (s1?.startsWith("__INVALID")) {
+      if (Array.isArray(s1) && s1.some((v) => v?.startsWith("__INVALID")) || typeof s1 === "string" && s1?.startsWith("__INVALID")) {
         hasError = true;
         setError(startField, { type: "validate", message: "Invalid input." });
         return null;
@@ -3671,7 +3695,7 @@ var AdvanceSearch = ({
       }
       if (r.operator === "between") {
         const s2 = sanitizeInput(v2);
-        if (s2?.startsWith("__INVALID")) {
+        if (Array.isArray(s2) && s2.some((v) => v?.startsWith("__INVALID")) || typeof s2 === "string" && s2?.startsWith("__INVALID")) {
           hasError = true;
           setError(endField, { type: "validate", message: "Invalid input." });
           return null;