@sustaina/shared-ui 1.13.1 → 1.13.2

package/dist/index.d.mts

@@ -38,6 +38,7 @@ interface FieldSchemaBase<T extends FieldType> {
     type: T;
     label?: string;
     multiTableSearch?: boolean;
+    lookupFieldName?: string;
 }
 interface DropdownFieldSchema extends FieldSchemaBase<"dropdown"> {
     options: Option[];
@@ -77,6 +78,7 @@ type RowState = {
     value2?: undefined;
     multiTableSearch?: boolean;
     jsonPath?: string[];
+    lookupFieldName?: string;
 } | {
     id: string;
     fieldName: string;
@@ -86,6 +88,7 @@ type RowState = {
     value2: string;
     multiTableSearch?: boolean;
     jsonPath?: string[];
+    lookupFieldName?: string;
 };
 interface Params {
     AND: Record<string, unknown>[];

package/dist/index.d.ts

@@ -38,6 +38,7 @@ interface FieldSchemaBase<T extends FieldType> {
     type: T;
     label?: string;
     multiTableSearch?: boolean;
+    lookupFieldName?: string;
 }
 interface DropdownFieldSchema extends FieldSchemaBase<"dropdown"> {
     options: Option[];
@@ -77,6 +78,7 @@ type RowState = {
     value2?: undefined;
     multiTableSearch?: boolean;
     jsonPath?: string[];
+    lookupFieldName?: string;
 } | {
     id: string;
     fieldName: string;
@@ -86,6 +88,7 @@ type RowState = {
     value2: string;
     multiTableSearch?: boolean;
     jsonPath?: string[];
+    lookupFieldName?: string;
 };
 interface Params {
     AND: Record<string, unknown>[];

package/dist/index.js

@@ -666,7 +666,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 {
@@ -676,7 +688,7 @@ function makeNewRow(field) {
     operator: op,
     value: "",
     multiTableSearch: field.multiTableSearch,
-    jsonPath: field.jsonPath
+    lookupFieldName: field.lookupFieldName
   };
 }
 function useAdvanceSearch({ fields, limitRows }) {
@@ -718,7 +730,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,
@@ -726,7 +739,8 @@ function useAdvanceSearch({ fields, limitRows }) {
             operator: nextOp,
             value: "",
             multiTableSearch: r.multiTableSearch,
-            jsonPath: r.jsonPath
+            jsonPath: r.jsonPath,
+            lookupFieldName: r.lookupFieldName
           };
         })
       );
@@ -759,6 +773,7 @@ function useAdvanceSearch({ fields, limitRows }) {
               fieldName: r.fieldName,
               fieldType: r.fieldType,
               multiTableSearch: r.multiTableSearch,
+              lookupFieldName: r.lookupFieldName,
               jsonPath: r.jsonPath,
               operator,
               value: "",
@@ -770,6 +785,7 @@ function useAdvanceSearch({ fields, limitRows }) {
             fieldName: r.fieldName,
             fieldType: r.fieldType,
             multiTableSearch: r.multiTableSearch,
+            lookupFieldName: r.lookupFieldName,
             jsonPath: r.jsonPath,
             operator,
             value: ""
@@ -3118,40 +3134,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 {};