caught bug in validateURL logic that did not meet figma specs for val…

…id or invalid URL
Recidiviz · May 10, 2024 · 5b36339 · 5b36339
1 parent 730cadd
commit 5b36339
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/common/utils/helperUtils.ts b/common/utils/helperUtils.ts
@@ -281,7 +281,7 @@ export const validateEmail = (email: string | undefined) => {
 };
 
 export const validateAgencyURL = (url: string) => {
-  const urlRegex = /^(?:https?|ftp):\/\/[\w.-]+\.[a-zA-Z]{2,}(?:\/\S*)?$/;
+  const urlRegex = /^(?:https?|ftp):\/\/(?:[\w.-]+\.)+[a-zA-Z]{2,}(?:\/\S*)?$/;
   return urlRegex.test(url);
 };
 

diff --git a/publisher/src/components/Settings/AgencySettingsURL.tsx b/publisher/src/components/Settings/AgencySettingsURL.tsx
@@ -62,19 +62,19 @@ const AgencySettingsUrl: React.FC<{
     { message: string } | undefined
   >(undefined);
   const handleSaveClick = () => {
-    if (!validateAgencyURL(urlText)) {
-      setIsURLValid(false);
-      setErrorMsg({ message: "Invalid Email" });
+    if (validateAgencyURL(urlText) || urlText === "") {
+      const updatedSettings = updateAgencySettings(
+        "HOMEPAGE_URL",
+        urlText,
+        parseInt(agencyId)
+      );
+      setErrorMsg(undefined);
+      saveAgencySettings(updatedSettings, agencyId);
+      removeEditMode();
       return;
     }
-    const updatedSettings = updateAgencySettings(
-      "HOMEPAGE_URL",
-      urlText,
-      parseInt(agencyId)
-    );
-    setErrorMsg(undefined);
-    saveAgencySettings(updatedSettings, agencyId);
-    removeEditMode();
+    setIsURLValid(false);
+    setErrorMsg({ message: "Invalid Email" });
   };
   const handleCancelClick = () => {
     if (homepageUrlSetting === urlText) {