Fix project draft topic save

Author: puranban

manager-dashboard/app/views/NewProject/index.tsx

@@ -85,6 +85,8 @@ import BasicProjectInfoForm from './BasicProjectInfoForm';
 // eslint-disable-next-line postcss-modules/no-unused-class
 import styles from './styles.css';
 
+const PROJECT_ERROR_MESSAGE = 'A project with this name already exists, please use a different project name (Please note that the name comparison is not case sensitive)';
+
 const defaultProjectFormValue: PartialProjectFormType = {
     // projectType: PROJECT_TYPE_BUILD_AREA,
     projectNumber: 1,
@@ -278,68 +280,7 @@ function NewProject(props: Props) {
                 ...valuesToCopy
             } = finalValues;
 
-            try {
-                const db = getDatabase();
-                const projectRef = databaseRef(db, 'v2/projects/');
-                const projectTopicKey = projectTopic?.toLowerCase() as string;
-
-                const prevProjectNameQuery = query(
-                    projectRef,
-                    orderByChild('projectTopicKey'),
-                    equalTo(projectTopicKey),
-                );
-
-                const snapshot = await getValueFromFirebase(prevProjectNameQuery);
-
-                if (snapshot.exists()) {
-                    setError((prevErr) => ({
-                        ...getErrorObject(prevErr),
-                        [nonFieldError]: 'A project with this name already exists, please use a different project name (Please note that the name comparision is not case sensitive)',
-                        projectTopic: 'A project with this name already exists, please use a different project name (Please note that the name comparision is not case sensitive)',
-                    }));
-                    setProjectSubmissionStatus(undefined);
-                    return;
-                }
-
-                const newProjectRef = await pushToDatabase(projectRef);
-                const newKey = newProjectRef.key;
-
-                if (!mountedRef.current) {
-                    return;
-                }
-
-                if (!newKey) {
-                    setError((err) => ({
-                        ...getErrorObject(err),
-                        [nonFieldError]: 'Failed to push new key for the project',
-                    }));
-                    setProjectSubmissionStatus('failed');
-                    return;
-                }
-
-                const uploadData = {
-                    ...finalValues,
-                    projectTopicKey,
-                    createdAt: (new Date()).getTime(),
-                };
-
-                const putProjectRef = databaseRef(db, `v2/projects/${newKey}`);
-                await setToDatabase(putProjectRef, uploadData);
-            } catch (submissionError: unknown) {
-                if (!mountedRef.current) {
-                    return;
-                }
-                // eslint-disable-next-line no-console
-                console.error(submissionError);
-                setError((err) => ({
-                    ...getErrorObject(err),
-                    [nonFieldError]: 'Some error occurred',
-                }));
-            }
-
-            const finalFilter = filter === FILTER_OTHERS
-                ? filterText
-                : filter;
+            const finalFilter = filter === FILTER_OTHERS ? filterText : filter;
 
             if (valuesToCopy.projectType === PROJECT_TYPE_FOOTPRINT && valuesToCopy.inputType === 'aoi_file') {
                 const res = await validateAoiOnOhsome(valuesToCopy.geometry, finalFilter);
@@ -389,6 +330,30 @@ function NewProject(props: Props) {
                 }
 
                 const database = getDatabase();
+                const projectTopicKey = projectTopic?.toLowerCase() as string;
+
+                const projectRef = databaseRef(database, 'v2/projects/');
+                const prevProjectNameQuery = query(
+                    projectRef,
+                    orderByChild('projectTopicKey'),
+                    equalTo(projectTopicKey),
+                );
+
+                const snapshot = await getValueFromFirebase(prevProjectNameQuery);
+                if (!mountedRef.current) {
+                    return;
+                }
+
+                if (snapshot.exists()) {
+                    setError((prevErr) => ({
+                        ...getErrorObject(prevErr),
+                        [nonFieldError]: PROJECT_ERROR_MESSAGE,
+                        projectTopic: 'A project with this name already exists',
+                    }));
+                    setProjectSubmissionStatus(undefined);
+                    return;
+                }
+
                 const projectDraftsRef = databaseRef(database, 'v2/projectDrafts/');
                 const newProjectDraftsRef = await pushToDatabase(projectDraftsRef);
                 if (!mountedRef.current) {
@@ -402,11 +367,14 @@ function NewProject(props: Props) {
 
                     const uploadData = {
                         ...valuesToCopy,
+                        projectTopic,
+                        projectTopicKey,
                         filter: finalFilter,
                         image: downloadUrl,
                         createdBy: userId,
                         teamId: visibility === 'public' ? null : visibility,
                     };
+
                     await setToDatabase(newProjectRef, uploadData);
                     if (!mountedRef.current) {
                         return;

manager-dashboard/app/views/NewProject/utils.ts

@@ -50,6 +50,7 @@ export type CustomOptionsForProject = {
 }[];
 
 export interface ProjectFormType {
+    projectTopicKey: string;
     projectTopic: string;
     projectType: ProjectType;
     projectRegion: string;