@sustaina/shared-ui 1.13.1 → 1.13.2

package/dist/index.mjs

@@ -629,7 +629,19 @@ function makeNewRow(field) {
       value: "",
       value2: "",
       multiTableSearch: field.multiTableSearch,
-      jsonPath: field.jsonPath
+      lookupFieldName: field.lookupFieldName
+    };
+  }
+  if (field.type === "json") {
+    return {
+      id: crypto.randomUUID(),
+      fieldName: field.name,
+      fieldType: field.type,
+      operator: op,
+      value: "",
+      multiTableSearch: field.multiTableSearch,
+      jsonPath: field.jsonPath,
+      lookupFieldName: field.lookupFieldName
     };
   }
   return {
@@ -639,7 +651,7 @@ function makeNewRow(field) {
     operator: op,
     value: "",
     multiTableSearch: field.multiTableSearch,
-    jsonPath: field.jsonPath
+    lookupFieldName: field.lookupFieldName
   };
 }
 function useAdvanceSearch({ fields, limitRows }) {
@@ -681,7 +693,8 @@ function useAdvanceSearch({ fields, limitRows }) {
             value: "",
             value2: "",
             multiTableSearch: r.multiTableSearch,
-            jsonPath: r.jsonPath
+            jsonPath: r.jsonPath,
+            lookupFieldName: r.lookupFieldName
           } : {
             id: r.id,
             fieldName: r.fieldName,
@@ -689,7 +702,8 @@ function useAdvanceSearch({ fields, limitRows }) {
             operator: nextOp,
             value: "",
             multiTableSearch: r.multiTableSearch,
-            jsonPath: r.jsonPath
+            jsonPath: r.jsonPath,
+            lookupFieldName: r.lookupFieldName
           };
         })
       );
@@ -722,6 +736,7 @@ function useAdvanceSearch({ fields, limitRows }) {
               fieldName: r.fieldName,
               fieldType: r.fieldType,
               multiTableSearch: r.multiTableSearch,
+              lookupFieldName: r.lookupFieldName,
               jsonPath: r.jsonPath,
               operator,
               value: "",
@@ -733,6 +748,7 @@ function useAdvanceSearch({ fields, limitRows }) {
             fieldName: r.fieldName,
             fieldType: r.fieldType,
             multiTableSearch: r.multiTableSearch,
+            lookupFieldName: r.lookupFieldName,
             jsonPath: r.jsonPath,
             operator,
             value: ""
@@ -3081,40 +3097,29 @@ var JSONBuilder = class {
 // src/components/advanceSearch/builder/lookup.ts
 var LookupBuilder = class {
   build(row) {
+    if (!Array.isArray(row.value)) {
+      return {};
+    }
+    const lookupField = row.lookupFieldName ?? "id";
     switch (row.operator) {
       case "containsAny":
         return {
-          [row.fieldName]: helper(
-            { hasSome: String(row.value).split(",") },
-            { multiTableSearch: row.multiTableSearch }
-          )
+          OR: row.value.map((v) => ({ [row.fieldName]: { some: { [lookupField]: v } } }))
         };
-      case "containsAll":
+      case "containsOnly":
         return {
-          [row.fieldName]: helper(
-            { hasEvery: String(row.value).split(",") },
-            { multiTableSearch: row.multiTableSearch }
-          )
+          AND: row.value.map((v) => ({ [row.fieldName]: { some: { [lookupField]: v } } }))
         };
-      case "containsOnly":
+      case "containsAll": {
+        const includes = row.value.map((v) => ({ [row.fieldName]: { some: { [lookupField]: v } } }));
+        const excludes = { [row.fieldName]: { none: { [lookupField]: { notIn: row.value } } } };
         return {
-          [row.fieldName]: helper(
-            { equals: String(row.value).split(",") },
-            {
-              multiTableSearch: row.multiTableSearch,
-              insensitive: true
-            }
-          )
+          AND: [...includes, excludes]
         };
+      }
       case "notContains":
         return {
-          [row.fieldName]: helper(
-            { not: { contains: row.value } },
-            {
-              multiTableSearch: row.multiTableSearch,
-              insensitive: true
-            }
-          )
+          NOT: { OR: row.value.map((v) => ({ [row.fieldName]: { some: { [lookupField]: v } } })) }
         };
       default:
         return {};