Fix project name validation

mapswipe · Aug 15, 2024 · a1e3186 · a1e3186
1 parent 037a19f
commit a1e3186
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/firebase/functions/src/index.ts b/firebase/functions/src/index.ts
@@ -355,12 +355,14 @@ exports.addProjectTopicKey = functions.https.onRequest(async (_, res) => {
             res.status(404).send('No projects found');
         }
 
-        if (!isEmptyProject && data) {
+        if (data) {
             const newProjectData: {[key: string]: string} = {};
 
             Object.keys(data).forEach((id) => {
-                if (data[id]?.projectTopic) {
-                    const newProjectTopicKey = formatProjectTopic(data[id].projectTopic);
+                const projectData = data[id];
+
+                if (projectData.name) {
+                    const newProjectTopicKey = formatProjectTopic(projectData.name);
                     newProjectData[`v2/projects/${id}/projectTopicKey`] = newProjectTopicKey;
                 }
             });

diff --git a/manager-dashboard/app/views/NewProject/index.tsx b/manager-dashboard/app/views/NewProject/index.tsx
@@ -275,7 +275,7 @@ function NewProject(props: Props) {
                 visibility,
                 filter,
                 filterText,
-                projectTopic,
+                name,
                 ...valuesToCopy
             } = finalValues;
 
@@ -331,8 +331,8 @@ function NewProject(props: Props) {
                 // NOTE: All the user don't have permission to access draft project
                 // FIXME: The firebase rules need to be changed to perform this on draft project
                 const database = getDatabase();
-                const projectTopicKeyLowercase = (projectTopic?.trim())?.toLowerCase() as string;
-                const projectTopicKey = formatProjectTopic(projectTopicKeyLowercase);
+                // const projectTopicKeyLowercase = (name?.trim())?.toLowerCase() as string;
+                const projectTopicKey = formatProjectTopic(name);
                 const projectRef = databaseRef(database, 'v2/projects/');
 
                 const prevProjectNameQuery = query(
@@ -369,7 +369,7 @@ function NewProject(props: Props) {
 
                     const uploadData = {
                         ...valuesToCopy,
-                        projectTopic,
+                        name,
                         projectTopicKey,
                         filter: finalFilter,
                         image: downloadUrl,