From f167aac60d577a0868bac7cb0602ca97b4f85da2 Mon Sep 17 00:00:00 2001 From: Victor Lyuboslavsky <2685025+getvictor@users.noreply.github.com> Date: Wed, 17 Dec 2025 17:17:32 -0600 Subject: [PATCH] Changed subject name placeholder (#37435) **Related issue:** Resolves #36689 Changed certificate template placeholder to: ``` CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME, O=Your Organization ``` --------- Co-authored-by: jacobshandling <61553566+jacobshandling@users.noreply.github.com> --- .../AddCertificateModal/AddCertificateModal.tests.tsx | 6 +++--- .../components/AddCertificateModal/AddCertificateModal.tsx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tests.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tests.tsx index 7f6e265d19..afde057f8f 100644 --- a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tests.tsx +++ b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tests.tsx @@ -74,7 +74,7 @@ describe("AddCertModal", () => { expect(screen.getByText("Certificate authority (CA)")).toBeInTheDocument(); expect( screen.getByPlaceholderText( - "/CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME/O=Your Organization" + "CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME, O=Your Organization" ) ).toBeInTheDocument(); expect(screen.getByText("Create")).toBeInTheDocument(); @@ -210,7 +210,7 @@ describe("AddCertModal", () => { await user.type(nameInput, "Valid Name"); const subjectNameInput = screen.getByPlaceholderText( - "/CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME/O=Your Organization" + "CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME, O=Your Organization" ); await user.type(subjectNameInput, "/CN=test/O=Org"); @@ -273,7 +273,7 @@ describe("AddCertModal", () => { await user.type(nameInput, "Valid Name"); const subjectNameInput = screen.getByPlaceholderText( - "/CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME/O=Your Organization" + "CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME, O=Your Organization" ); await user.type(subjectNameInput, "/CN=test/O=Org"); diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx index 06936f7fc0..3d8351064b 100644 --- a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx +++ b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx @@ -170,9 +170,9 @@ const AddCertModal = ({ value={formData.subjectName} onChange={onInputChange} error={formValidation.subjectName?.message} - helpText='Separate subject fields by a "/". For example: /CN=john@example.com/O=Acme Inc.' + helpText='Separate subject fields by ", ". For example: CN=john@example.com, O=Acme Inc.' parseTarget - placeholder="/CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME/O=Your Organization" + placeholder="CN=$FLEET_VAR_HOST_END_USER_IDP_USERNAME, O=Your Organization" />