Merge pull request #648 from zendesk/akuttruff/CD-3271

feat: adds support for multiple dynamic filters

Author: akuttruff

src/modules/ticket-fields/fields/LookupField.test.tsx

@@ -3,7 +3,7 @@ import type { TicketFieldObject } from "../data-types/TicketFieldObject";
 import { buildAdvancedDynamicFilterParams } from "./LookupField";
 
 describe("buildAdvancedDynamicFilterParams", () => {
-  it('returns correct dynamic filter value and matching field value for operator "matches"', () => {
+  it('returns correct dynamic filter array for operator "matches"', () => {
     const filter: LookupRelationshipFieldFilter = {
       all: [
         {
@@ -40,16 +40,12 @@ describe("buildAdvancedDynamicFilterParams", () => {
       },
     ];
 
-    const [dynamicValue, fieldValue] = buildAdvancedDynamicFilterParams(
-      filter,
-      fields
-    );
+    const result = buildAdvancedDynamicFilterParams(filter, fields);
 
-    expect(dynamicValue).toBe("ticket_fields_12345");
-    expect(fieldValue).toBe("fooValue");
+    expect(result).toEqual([{ key: "ticket_fields_12345", value: "fooValue" }]);
   });
 
-  it('returns correct dynamic filter value and matching field value for operator "not_matches" in any', () => {
+  it('returns correct dynamic filter array for operator "not_matches" in any', () => {
     const filter: LookupRelationshipFieldFilter = {
       all: [{ field: "someField", operator: "is", value: "foo" }],
       any: [
@@ -85,16 +81,12 @@ describe("buildAdvancedDynamicFilterParams", () => {
       },
     ];
 
-    const [dynamicValue, fieldValue] = buildAdvancedDynamicFilterParams(
-      filter,
-      fields
-    );
+    const result = buildAdvancedDynamicFilterParams(filter, fields);
 
-    expect(dynamicValue).toBe("ticket_fields_67890");
-    expect(fieldValue).toBe("barValue");
+    expect(result).toEqual([{ key: "ticket_fields_67890", value: "barValue" }]);
   });
 
-  it("returns [undefined, undefined] when no matching operator found", () => {
+  it("returns an empty array when no matching operator found", () => {
     const filter: LookupRelationshipFieldFilter = {
       all: [{ field: "someField", operator: "is", value: "foo" }],
       any: [{ field: "anotherField", operator: "is", value: "foo" }],
@@ -124,13 +116,9 @@ describe("buildAdvancedDynamicFilterParams", () => {
       },
     ];
 
-    const [dynamicValue, fieldValue] = buildAdvancedDynamicFilterParams(
-      filter,
-      fields
-    );
+    const result = buildAdvancedDynamicFilterParams(filter, fields);
 
-    expect(dynamicValue).toBeUndefined();
-    expect(fieldValue).toBeUndefined();
+    expect(result).toEqual([]);
   });
 
   it("returns [undefined, undefined] when filter is undefined", () => {
@@ -148,12 +136,57 @@ describe("buildAdvancedDynamicFilterParams", () => {
       },
     ];
 
-    const [dynamicValue, fieldValue] = buildAdvancedDynamicFilterParams(
-      undefined,
-      fields
-    );
+    const result = buildAdvancedDynamicFilterParams(undefined, fields);
 
-    expect(dynamicValue).toBeUndefined();
-    expect(fieldValue).toBeUndefined();
+    expect(result).toEqual([]);
+  });
+
+  it("returns multiple filters if more than one matches", () => {
+    const filter: LookupRelationshipFieldFilter = {
+      all: [
+        {
+          field: "someField",
+          operator: "matches",
+          value: "ticket_fields_12345",
+        },
+        {
+          field: "otherField",
+          operator: "matches",
+          value: "ticket_fields_67890",
+        },
+      ],
+      any: [],
+    };
+    const fields: TicketFieldObject[] = [
+      {
+        id: 12345,
+        name: "Test Field 1",
+        value: "fooValue",
+        error: null,
+        label: "Test Field 1",
+        required: false,
+        description: "",
+        type: "text",
+        options: [],
+      },
+      {
+        id: 67890,
+        name: "Test Field 2",
+        value: "barValue",
+        error: null,
+        label: "Test Field 2",
+        required: false,
+        description: "",
+        type: "text",
+        options: [],
+      },
+    ];
+
+    const result = buildAdvancedDynamicFilterParams(filter, fields);
+
+    expect(result).toEqual([
+      { key: "ticket_fields_12345", value: "fooValue" },
+      { key: "ticket_fields_67890", value: "barValue" },
+    ]);
   });
 });

src/modules/ticket-fields/fields/LookupField.tsx

@@ -22,29 +22,27 @@ export function buildAdvancedDynamicFilterParams(
   filter?: LookupRelationshipFieldFilter,
   fields: TicketFieldObject[] = []
 ) {
-  const dynamicFilters = filter
-    ? [
-        ...filter.all.filter(
-          (filter) =>
-            filter.operator === "matches" || filter.operator === "not_matches"
-        ),
-        ...filter.any.filter(
-          (filter) =>
-            filter.operator === "matches" || filter.operator === "not_matches"
-        ),
-      ]
-    : [];
+  if (!filter) return [];
 
-  const parsedFilterId =
-    dynamicFilters && dynamicFilters[0]?.value.split("ticket_fields_")[1];
-
-  const field = fields.find((field) => {
-    const parsedFieldId = field.id.toString();
+  const dynamicFilters = [
+    ...filter.all.filter(
+      (f) => f.operator === "matches" || f.operator === "not_matches"
+    ),
+    ...filter.any.filter(
+      (f) => f.operator === "matches" || f.operator === "not_matches"
+    ),
+  ];
 
-    return parsedFieldId === parsedFilterId;
+  return dynamicFilters.map((f) => {
+    const parsedFilterId = f.value.split("ticket_fields_")[1];
+    const field = fields.find(
+      (field) => field.id.toString() === parsedFilterId
+    );
+    return {
+      key: f.value,
+      value: field?.value ?? null,
+    };
   });
-
-  return [dynamicFilters[0]?.value, field?.value];
 }
 
 export function getCustomObjectKey(targetType: string) {
@@ -139,15 +137,18 @@ export function LookupField({
       searchParams.set("field_id", fieldId.toString());
       searchParams.set("requester_id", userId.toString());
 
-      const [filterValue, fieldValue] = buildAdvancedDynamicFilterParams(
+      const filterPairs = buildAdvancedDynamicFilterParams(
         field.relationship_filter,
         visibleFields
       );
 
-      const fieldValueParam = fieldValue?.toString() || "";
-      const filterValueParam = `filter[dynamic_values][${filterValue}]`;
-
-      if (filterValue) searchParams.set(filterValueParam, fieldValueParam);
+      for (const { key: filterValue, value: fieldValue } of filterPairs) {
+        if (filterValue) {
+          const filterValueParam = `filter[dynamic_values][${filterValue}]`;
+          const fieldValueParam = fieldValue?.toString() || "";
+          searchParams.set(filterValueParam, fieldValueParam);
+        }
+      }
 
       if (organizationId) searchParams.set("organization_id", organizationId);