From a0df4441abe8beccf40c446cf6d5a5fc238d6276 Mon Sep 17 00:00:00 2001 From: Frank Netscher Date: Tue, 9 Dec 2025 15:28:57 -0600 Subject: [PATCH 1/2] Updating regex validator on keywords to include trailing spaces and hypens. --- .../DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx | 2 +- .../DataFilesModals/DataFilesProjectEditDescriptionModal.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx index 1d0633b76..49df79e96 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx @@ -102,7 +102,7 @@ const DataFilesAddProjectModal = () => { otherwise: (schema) => schema.notRequired(), }), keywords: Yup.string().matches( - /^\w+(\s*,\s*\w+)*$/, + /^\s*[\w-]+(\s*,\s*[\w-]+)*\s*$/, 'Please separate keywords with commas.' ), }); diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx index 508bfbfab..f388ad072 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx @@ -84,7 +84,7 @@ const DataFilesProjectEditDescriptionModal = () => { otherwise: (schema) => schema.notRequired(), }), keywords: Yup.string().matches( - /^\w+(\s*,\s*\w+)*$/, + /^\s*[\w-]+(\s*,\s*[\w-]+)*\s*$/, 'Please separate keywords with commas.' ), }); From 36b9df3cde6df6273233f15256d493903a34d32b Mon Sep 17 00:00:00 2001 From: Frank Netscher Date: Thu, 11 Dec 2025 14:41:13 -0600 Subject: [PATCH 2/2] Added a trim() function to remove whitespace at the beginning and end of keywords. --- .../DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx | 2 +- .../DataFilesModals/DataFilesProjectEditDescriptionModal.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx index 49df79e96..c6811fc62 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesAddProjectModal.jsx @@ -66,7 +66,7 @@ const DataFilesAddProjectModal = () => { payload: { title, description, - keywords, + keywords: keywords.trim(), members: members.map((member) => ({ username: member.user.username, access: member.access, diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx index f388ad072..6216e543b 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx @@ -60,7 +60,7 @@ const DataFilesProjectEditDescriptionModal = () => { data: { title: values.title, description: values.description || '', - keywords: values.keywords || '', + keywords: values.keywords.trim() || '', }, }, });