Merge pull request #759 from zendesk/navkumar/CRYSTAL-888-brand-lurf-filter

fix: pass ticket_brand_id in LURF autocomplete request

Author: zendesk-navkumar

assets/ticket-fields-bundle.js

@@ -143,6 +143,7 @@ export const RequestFormField = ({
               ? (organizationField?.value as string)
               : defaultOrganizationId
           }
+          brandId={brandId}
           visibleFields={visibleFields}
           onChange={(value) => handleChange(field, value)}
           buildLookupFieldOptions={buildLookupFieldOptions}

src/modules/ticket-fields/RequestFormField.tsx

@@ -141,6 +141,74 @@ describe("buildAdvancedDynamicFilterParams", () => {
     expect(result).toEqual([]);
   });
 
+  it("returns ticket_brand_id filter with null value when no matching field exists", () => {
+    const filter: LookupRelationshipFieldFilter = {
+      all: [
+        {
+          field: "custom_object.testco.custom_fields.brandlurf",
+          operator: "matches",
+          value: "ticket_brand_id",
+        },
+      ],
+      any: [],
+    };
+    const fields: TicketFieldObject[] = [
+      {
+        id: 12345,
+        name: "Test Field 1",
+        value: "fooValue",
+        error: null,
+        label: "Test Field 1",
+        required: false,
+        description: "",
+        type: "text",
+        options: [],
+      },
+    ];
+
+    const result = buildAdvancedDynamicFilterParams(filter, fields);
+
+    expect(result).toEqual([{ key: "ticket_brand_id", value: null }]);
+  });
+
+  it("returns ticket_brand_id alongside ticket_fields filters", () => {
+    const filter: LookupRelationshipFieldFilter = {
+      all: [
+        {
+          field: "someField",
+          operator: "matches",
+          value: "ticket_fields_12345",
+        },
+        {
+          field: "brandField",
+          operator: "matches",
+          value: "ticket_brand_id",
+        },
+      ],
+      any: [],
+    };
+    const fields: TicketFieldObject[] = [
+      {
+        id: 12345,
+        name: "Test Field 1",
+        value: "fooValue",
+        error: null,
+        label: "Test Field 1",
+        required: false,
+        description: "",
+        type: "text",
+        options: [],
+      },
+    ];
+
+    const result = buildAdvancedDynamicFilterParams(filter, fields);
+
+    expect(result).toEqual([
+      { key: "ticket_fields_12345", value: "fooValue" },
+      { key: "ticket_brand_id", value: null },
+    ]);
+  });
+
   it("returns multiple filters if more than one matches", () => {
     const filter: LookupRelationshipFieldFilter = {
       all: [

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

@@ -52,6 +52,7 @@ export interface LookupFieldProps {
   field: TicketFieldObject;
   userId: number;
   organizationId: string | null;
+  brandId?: number;
   onChange: (value: string) => void;
   visibleFields: TicketFieldObject[];
   buildLookupFieldOptions?: (
@@ -65,6 +66,7 @@ export function LookupField({
   field,
   userId,
   organizationId,
+  brandId,
   onChange,
   visibleFields,
   buildLookupFieldOptions,
@@ -144,11 +146,21 @@ export function LookupField({
       );
 
       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 (!filterValue) continue;
+
+        if (filterValue === "ticket_brand_id") {
+          if (brandId) {
+            searchParams.set(
+              "filter[dynamic_values][ticket_brand_id]",
+              brandId.toString()
+            );
+          }
+          continue;
         }
+
+        const filterValueParam = `filter[dynamic_values][${filterValue}]`;
+        const fieldValueParam = fieldValue?.toString() || "";
+        searchParams.set(filterValueParam, fieldValueParam);
       }
 
       if (organizationId) searchParams.set("organization_id", organizationId);
@@ -194,6 +206,7 @@ export function LookupField({
       }
     },
     [
+      brandId,
       customObjectKey,
       field,
       fieldId,