fix: project identifier validation (#1643)

* fix: project identifier validation * feat: alphanumric identifier validation * chore: code refactor * refactor: project identifier change function --------- Co-authored-by: Aaryan Khandelwal <aaryankhandu123@gmail.com>
makeplane · Jul 25, 2023 · ad410d1 · ad410d1
1 parent 9b531ac
commit ad410d1
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/apps/app/components/project/create-project-modal.tsx b/apps/app/components/project/create-project-modal.tsx
@@ -75,7 +75,7 @@ const IsGuestCondition: React.FC<{
 };
 
 export const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen, user }) => {
-  const [isChangeIdentifierRequired, setIsChangeIdentifierRequired] = useState(true);
+  const [isChangeInIdentifierRequired, setIsChangeInIdentifierRequired] = useState(true);
 
   const { setToastAlert } = useToast();
 
@@ -98,18 +98,9 @@ export const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen, user })
     reValidateMode: "onChange",
   });
 
-  const projectName = watch("name");
-  const projectIdentifier = watch("identifier");
-
-  useEffect(() => {
-    if (projectName && isChangeIdentifierRequired)
-      setValue("identifier", projectName.replace(/ /g, "").toUpperCase().substring(0, 3));
-  }, [projectName, projectIdentifier, setValue, isChangeIdentifierRequired]);
-
-  useEffect(() => () => setIsChangeIdentifierRequired(true), [isOpen]);
-
   const handleClose = () => {
     setIsOpen(false);
+    setIsChangeInIdentifierRequired(true);
     reset(defaultValues);
   };
 
@@ -147,6 +138,29 @@ export const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen, user })
       });
   };
 
+  const changeIdentifierOnNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (!isChangeInIdentifierRequired) return;
+
+    if (e.target.value === "") setValue("identifier", "");
+    else
+      setValue(
+        "identifier",
+        e.target.value
+          .replace(/[^a-zA-Z0-9]/g, "")
+          .toUpperCase()
+          .substring(0, 5)
+      );
+  };
+
+  const handleIdentifierChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const { value } = e.target;
+
+    const alphanumericValue = value.replace(/[^a-zA-Z0-9]/g, "");
+
+    setValue("identifier", alphanumericValue.toUpperCase());
+    setIsChangeInIdentifierRequired(false);
+  };
+
   const options = workspaceMembers?.map((member) => ({
     value: member.member.id,
     query:
@@ -265,6 +279,7 @@ export const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen, user })
                           name="name"
                           type="name"
                           placeholder="Project Title"
+                          onChange={changeIdentifierOnNameChange}
                           error={errors.name}
                           register={register}
                           validations={{
@@ -287,11 +302,12 @@ export const CreateProjectModal: React.FC<Props> = ({ isOpen, setIsOpen, user })
                           placeholder="Identifier"
                           error={errors.identifier}
                           register={register}
-                          onChange={() => setIsChangeIdentifierRequired(false)}
+                          onChange={handleIdentifierChange}
                           validations={{
                             required: "Identifier is required",
                             validate: (value) =>
-                              /^[A-Z]+$/.test(value) || "Identifier must be in uppercase.",
+                              /^[A-Z0-9]+$/.test(value.toUpperCase()) ||
+                              "Identifier must be in uppercase.",
                             minLength: {
                               value: 1,
                               message: "Identifier must at least be of 1 character",

diff --git a/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx b/apps/app/pages/[workspaceSlug]/projects/[projectId]/settings/index.tsx
@@ -145,6 +145,15 @@ const GeneralSettings: NextPage = () => {
     else await updateProject(payload);
   };
 
+  const handleIdentifierChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const { value } = event.target;
+
+    const alphanumericValue = value.replace(/[^a-zA-Z0-9]/g, "");
+    const formattedValue = alphanumericValue.toUpperCase();
+
+    setValue("identifier", formattedValue);
+  };
+
   const currentNetwork = NETWORK_CHOICES.find((n) => n.key === projectDetails?.network);
 
   return (
@@ -303,10 +312,11 @@ const GeneralSettings: NextPage = () => {
                   error={errors.identifier}
                   register={register}
                   placeholder="Enter identifier"
+                  onChange={handleIdentifierChange}
                   validations={{
                     required: "Identifier is required",
                     validate: (value) =>
-                      /^[A-Z]+$/.test(value) || "Identifier must be uppercase text.",
+                      /^[A-Z0-9]+$/.test(value.toUpperCase()) || "Identifier must be in uppercase.",
                     minLength: {
                       value: 1,
                       message: "Identifier must at least be of 1 character",