Merge branch 'master' into kristkvch/PDSC-485-service-items-sidebar

z-kzachradnik · z-kzachradnik · commit 85e2d7f659d9 · 2026-02-25T12:40:05.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## [4.30.1](https://github.com/zendesk/copenhagen_theme/compare/v4.30.0...v4.30.1) (2026-02-24)
+
+
+### Bug Fixes
+
+* hide category lookup field from submit request form ([4d9986f](https://github.com/zendesk/copenhagen_theme/commit/4d9986fc441fe3149335a07c68c607a46fa1dbc3))
+
+# [4.30.0](https://github.com/zendesk/copenhagen_theme/compare/v4.29.3...v4.30.0) (2026-02-23)
+
+
+### Features
+
+* preserve newlines in Approval request decription ([5b49c4d](https://github.com/zendesk/copenhagen_theme/commit/5b49c4d9ec124efb3879d3a0a3cbfafbd9ef0bc5))
+
+## [4.29.3](https://github.com/zendesk/copenhagen_theme/compare/v4.29.2...v4.29.3) (2026-02-19)
+
+
+### Bug Fixes
+
+* service catalog link in ticket comment uses absolute path ([d0640c5](https://github.com/zendesk/copenhagen_theme/commit/d0640c57c47919c7dc1db108d82d048d7408b152))
+
+## [4.29.2](https://github.com/zendesk/copenhagen_theme/compare/v4.29.1...v4.29.2) (2026-02-11)
+
+
+### Bug Fixes
+
+* add additional if clause for subject fields ([cc02488](https://github.com/zendesk/copenhagen_theme/commit/cc02488c4708871a49d0effbaa061a5ca6beed99))
+
 ## [4.29.1](https://github.com/zendesk/copenhagen_theme/compare/v4.29.0...v4.29.1) (2026-02-05)
 
 
diff --git a/assets/approval-requests-bundle.js b/assets/approval-requests-bundle.js
diff --git a/assets/request-list-bundle.js b/assets/request-list-bundle.js
diff --git a/assets/service-catalog-bundle.js b/assets/service-catalog-bundle.js
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Copenhagen",
   "author": "Zendesk",
-  "version": "4.29.1",
+  "version": "4.30.1",
   "api_version": 4,
   "default_locale": "en-us",
   "settings": [
diff --git a/src/modules/approval-requests/ApprovalRequestPage.test.tsx b/src/modules/approval-requests/ApprovalRequestPage.test.tsx
@@ -176,4 +176,48 @@ describe("ApprovalRequestPage", () => {
 
     expect(screen.queryByText(/clarification/i)).not.toBeInTheDocument();
   });
+
+  it("renders the message with newlines preserved", () => {
+    const messageWithNewlines = "Line 1\nLine 2\n\nLine 3";
+    const approvalRequestWithNewlines = {
+      ...mockApprovalRequest,
+      message: messageWithNewlines,
+    };
+
+    mockUseApprovalRequest.mockReturnValue({
+      approvalRequest: approvalRequestWithNewlines,
+      setApprovalRequest: jest.fn(),
+      isLoading: false,
+      errorFetchingApprovalRequest: null,
+    });
+
+    render(<ApprovalRequestPage {...baseProps} userId={1} />);
+
+    const messageElement = screen.getByText(/Line 1.*Line 2.*Line 3/s);
+    expect(messageElement).toBeInTheDocument();
+
+    expect(messageElement.textContent).toBe(messageWithNewlines);
+  });
+
+  it("collapses multiple consecutive newlines in the message to two newlines", () => {
+    const messageWithMultipleNewlines = "Line 1\n\n\n\nLine 2\n\n\nLine 3";
+    const approvalRequestWithNewlines = {
+      ...mockApprovalRequest,
+      message: messageWithMultipleNewlines,
+    };
+
+    mockUseApprovalRequest.mockReturnValue({
+      approvalRequest: approvalRequestWithNewlines,
+      setApprovalRequest: jest.fn(),
+      isLoading: false,
+      errorFetchingApprovalRequest: null,
+    });
+
+    render(<ApprovalRequestPage {...baseProps} userId={1} />);
+
+    const messageElement = screen.getByText(/Line 1.*Line 2.*Line 3/s);
+    expect(messageElement).toBeInTheDocument();
+
+    expect(messageElement.textContent).toBe("Line 1\n\nLine 2\n\nLine 3");
+  });
 });
diff --git a/src/modules/approval-requests/ApprovalRequestPage.tsx b/src/modules/approval-requests/ApprovalRequestPage.tsx
@@ -69,6 +69,10 @@ const ApproverActionsWrapper = styled.div`
   margin-top: ${(props) => props.theme.space.lg};
 `;
 
+const StyledDescription = styled(MD)`
+  white-space: pre-wrap;
+`;
+
 export interface ApprovalRequestPageProps {
   approvalWorkflowInstanceId: string;
   approvalRequestId: string;
@@ -138,6 +142,8 @@ function ApprovalRequestPage({
   const hasClarificationEnabled =
     approvalRequest?.clarification_flow_messages !== undefined;
 
+  const collapsedMessage = approvalRequest.message.replace(/\n{3,}/g, "\n\n");
+
   return (
     <>
       <ApprovalRequestBreadcrumbs
@@ -147,7 +153,7 @@ function ApprovalRequestPage({
       <Container>
         <LeftColumn>
           <XXL isBold>{approvalRequest.subject}</XXL>
-          <MD>{approvalRequest.message}</MD>
+          <StyledDescription>{collapsedMessage}</StyledDescription>
           {approvalRequest.ticket_details && (
             <ApprovalTicketDetails ticket={approvalRequest.ticket_details} />
           )}
diff --git a/src/modules/request-list/components/requests-table/requests-table-row/RequestsTableCell.test.tsx b/src/modules/request-list/components/requests-table/requests-table-row/RequestsTableCell.test.tsx
@@ -244,4 +244,35 @@ describe("RequestsTableCell", () => {
       }
     );
   });
+
+  describe("Subject column", () => {
+    test("renders subject as a clickable link", () => {
+      renderCell({ identifier: "subject" });
+      const link = screen.getByRole("link");
+      expect(link).toHaveAttribute("href", "/hc/requests/123");
+      expect(screen.getAllByText("Test Subject")[0]).toBeInTheDocument();
+    });
+
+    test("renders description when subject is not available", () => {
+      const requestWithoutSubject = {
+        ...mockRequest,
+        subject: "",
+      };
+      renderCell({ identifier: "subject", request: requestWithoutSubject });
+      expect(screen.getAllByText("No Jenny uhuh")[0]).toBeInTheDocument();
+    });
+
+    test("renders subject even when subject ticket field is not in ticketFields", () => {
+      const ticketFieldsWithoutSubject = mockTicketFields.filter(
+        (field) => field.type !== "subject"
+      );
+      renderCell({
+        identifier: "subject",
+        ticketFields: ticketFieldsWithoutSubject,
+      });
+      const link = screen.getByRole("link");
+      expect(link).toHaveAttribute("href", "/hc/requests/123");
+      expect(screen.getAllByText("Test Subject")[0]).toBeInTheDocument();
+    });
+  });
 });
diff --git a/src/modules/request-list/components/requests-table/requests-table-row/RequestsTableCell.tsx b/src/modules/request-list/components/requests-table/requests-table-row/RequestsTableCell.tsx
@@ -188,6 +188,23 @@ The same applies for the description. */
     );
   }
 
+  if (identifier === "subject") {
+    const requestUrl = `/hc/requests/${id}`;
+
+    const navigateToRequestPage = (e: MouseEvent) => {
+      e.preventDefault();
+      location.assign(requestUrl);
+    };
+
+    return (
+      <Table.Cell role="rowheader" data-test-id={`table-cell-${identifier}`}>
+        <Subject href={requestUrl} onClick={navigateToRequestPage}>
+          <TruncatedText>{subject || description}</TruncatedText>
+        </Subject>
+      </Table.Cell>
+    );
+  }
+
   const ticketField = ticketFields.find(
     (field) => String(field.id) === identifier || field.type === identifier
   );
@@ -197,23 +214,6 @@ The same applies for the description. */
   }
 
   switch (ticketField.type) {
-    case "subject": {
-      const requestUrl = `/hc/requests/${id}`;
-
-      const navigateToRequestPage = (e: MouseEvent) => {
-        e.preventDefault();
-        location.assign(requestUrl);
-      };
-
-      return (
-        <Table.Cell role="rowheader" data-test-id={`table-cell-${identifier}`}>
-          <Subject href={requestUrl} onClick={navigateToRequestPage}>
-            <TruncatedText>{subject || description}</TruncatedText>
-          </Subject>
-        </Table.Cell>
-      );
-    }
-
     case "priority":
       return (
         <TruncatedTableCell identifier={identifier}>
diff --git a/src/modules/request-list/hooks/useTicketFields.test.ts b/src/modules/request-list/hooks/useTicketFields.test.ts
@@ -59,3 +59,30 @@ test("handles exceptions", async () => {
     isLoading: true,
   });
 });
+
+test("filters out inactive subject field", async () => {
+  const inactiveSubjectField: TicketField = {
+    id: 30,
+    type: "subject",
+    active: false,
+    title: "Subject",
+    title_in_portal: "Subject",
+    description: "",
+    custom_field_options: [],
+  };
+
+  fetchAllCursorPages.mockReturnValueOnce([
+    activeTicketField,
+    inactiveSubjectField,
+  ]);
+
+  const { result, waitForNextUpdate } = renderHook(() => useTicketFields("dk"));
+
+  await waitForNextUpdate();
+
+  expect(result.current).toEqual({
+    ticketFields: [activeTicketField],
+    error: undefined,
+    isLoading: false,
+  });
+});
diff --git a/src/modules/request-list/hooks/useTicketFields.ts b/src/modules/request-list/hooks/useTicketFields.ts
@@ -33,11 +33,7 @@ export function useTicketFields(locale: string): UseTicketFields {
         () => listTicketFields(locale),
         "ticket_fields"
       );
-      setTicketFields(
-        response.filter(
-          (ticketField) => ticketField.active || ticketField.type == "subject"
-        )
-      );
+      setTicketFields(response.filter((ticketField) => ticketField.active));
 
       setIsLoading(false);
     } catch (error) {
diff --git a/src/modules/service-catalog/components/service-catalog-item/ServiceCatalogItem.tsx b/src/modules/service-catalog/components/service-catalog-item/ServiceCatalogItem.tsx
@@ -165,7 +165,8 @@ export function ServiceCatalogItem({
       requestFieldsWithFormData,
       associatedLookupField,
       baseLocale,
-      attachments
+      attachments,
+      helpCenterPath
     );
 
     if (!response?.ok) {
diff --git a/src/modules/service-catalog/components/service-catalog-item/submitServiceItemRequest.tsx b/src/modules/service-catalog/components/service-catalog-item/submitServiceItemRequest.tsx
@@ -20,7 +20,8 @@ export async function submitServiceItemRequest(
   requestFields: TicketFieldObject[],
   associatedLookupField: TicketFieldObject,
   baseLocale: string,
-  attachments: Attachment[]
+  attachments: Attachment[],
+  helpCenterPath: string
 ) {
   try {
     const currentUser = await getCurrentUser();
@@ -42,7 +43,7 @@ export async function submitServiceItemRequest(
         request: {
           subject: `${serviceCatalogItem.name}`,
           comment: {
-            html_body: `<a href="/hc/en-us/services/${serviceCatalogItem.id}" style="text-decoration: underline" target="_blank" rel="noopener noreferrer">${serviceCatalogItem.name}</a>`,
+            html_body: `<a href="${window.location.origin}${helpCenterPath}/services/${serviceCatalogItem.id}" style="text-decoration: underline" target="_blank" rel="noopener noreferrer">${serviceCatalogItem.name}</a>`,
             uploads: uploadTokens,
           },
           ticket_form_id: serviceCatalogItem.form_id,
diff --git a/src/modules/service-catalog/hooks/useItemFormFields.spec.ts b/src/modules/service-catalog/hooks/useItemFormFields.spec.ts
@@ -488,4 +488,57 @@ describe("useItemFormFields", () => {
     const presentIds = result.current.requestFields.map((f) => f.id);
     expect(presentIds).toEqual([1, 6]);
   });
+
+  it("should filter out category lookup field from requestFields", async () => {
+    const categoryLookupField = {
+      id: 8,
+      type: "lookup",
+      description: "Category",
+      title_in_portal: "Category",
+      editable_in_portal: true,
+      relationship_target_type:
+        "zen:custom_object:standard::service_catalog_category",
+      required_in_portal: false,
+      active: true,
+    };
+
+    const formResponse = {
+      ticket_form: {
+        id: 1,
+        ticket_field_ids: [1, 2, 8],
+        active: true,
+      },
+    };
+
+    const ticketFieldResponse = {
+      ticket_fields: [textField, lookupField, categoryLookupField],
+    };
+
+    (globalThis.fetch as jest.Mock) = jest.fn((url) => {
+      return Promise.resolve({
+        json: () =>
+          Promise.resolve(
+            url.includes("/api/v2/ticket_forms/1")
+              ? formResponse
+              : url.includes(`/api/v2/ticket_fields?locale=${baseLocale}`)
+              ? ticketFieldResponse
+              : {}
+          ),
+        status: 200,
+        ok: true,
+      });
+    });
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useItemFormFields(serviceCatalogItem, baseLocale)
+    );
+
+    await waitForNextUpdate();
+
+    const presentIds = result.current.requestFields.map((f) => f.id);
+    expect(presentIds).toEqual([1]);
+    expect(result.current.associatedLookupField).toEqual(
+      expect.objectContaining({ id: 2, type: "lookup" })
+    );
+  });
 });
diff --git a/src/modules/service-catalog/hooks/useItemFormFields.tsx b/src/modules/service-catalog/hooks/useItemFormFields.tsx
@@ -97,14 +97,23 @@ const formatField = (field: TicketField): TicketFieldObject => {
   };
 };
 
+const HIDDEN_SERVICE_CATALOG_LOOKUP_KEYS = [
+  "standard::service_catalog_item",
+  "standard::service_catalog_category",
+];
+
 const isAssociatedLookupField = (field: TicketField) => {
   const customObjectKey = getCustomObjectKey(
     field.relationship_target_type as string
   );
-  if (customObjectKey === "standard::service_catalog_item") {
-    return true;
-  }
-  return false;
+  return customObjectKey === "standard::service_catalog_item";
+};
+
+const isHiddenServiceCatalogLookup = (field: TicketField) => {
+  const customObjectKey = getCustomObjectKey(
+    field.relationship_target_type as string
+  );
+  return HIDDEN_SERVICE_CATALOG_LOOKUP_KEYS.includes(customObjectKey);
 };
 
 const enrichFieldsWithAssetConfig = (
@@ -183,10 +192,11 @@ const fetchTicketFields = async (
       ) {
         if (
           ticketField.type === "lookup" &&
-          isAssociatedLookupField(ticketField)
+          isHiddenServiceCatalogLookup(ticketField)
         ) {
-          associatedLookupField = ticketField;
-
+          if (isAssociatedLookupField(ticketField)) {
+            associatedLookupField = ticketField;
+          }
           return null;
         }
         return formatField(ticketField);
diff --git a/src/modules/service-catalog/translations/en-us.yml b/src/modules/service-catalog/translations/en-us.yml

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Copenhagen",`
`3`	`3`	`"author": "Zendesk",`
`4`		`- "version": "4.29.1",`
	`4`	`+ "version": "4.30.1",`
`5`	`5`	`"api_version": 4,`
`6`	`6`	`"default_locale": "en-us",`
`7`	`7`	`"settings": [`