Merge pull request #649 from mapswipe/dev

Dev - fix building validation project creation from Tasking Manager ID

Author: Hagellach37

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

@@ -335,6 +335,7 @@ function NewProject(props: Props) {
                     setProjectSubmissionStatus('failed');
                     return;
                 }
+                valuesToCopy.geometry = res.geometry;
             }
 
             const storage = getStorage();

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

@@ -325,7 +325,8 @@ export async function validateAoiOnOhsome(
     featureCollection: GeoJSON.GeoJSON | string | undefined | null,
     filter: string | undefined | null,
 ): (
-    Promise<{ errored: true, error: string } | { errored: false, message: string }>
+    Promise<{ errored: true, error: string }
+    | { errored: false, message: string }>
 ) {
     if (isNotDefined(featureCollection)) {
         return { errored: true, error: 'AOI is not defined' };
@@ -352,12 +353,13 @@ export async function validateAoiOnOhsome(
         return { errored: true, error: 'Could not find the no. of objects in given AOI' };
     }
 
-    const answer = await response.json() as {
+    interface OhsomeResonse {
         result: {
             value: number | null | undefined,
             timestamp: string | null | undefined,
         }[] | undefined;
-    };
+    }
+    const answer = await response.json() as OhsomeResonse;
 
     const count = answer.result?.[0].value;
 
@@ -380,7 +382,7 @@ export async function validateAoiOnOhsome(
 
 async function fetchAoiFromHotTaskingManager(projectId: number | string): (
     Promise<{ errored: true, error: string }
-    | { errored: false, response: GeoJSON.GeoJSON }>
+    | { errored: false, response: GeoJSON.Geometry }>
 ) {
     type Res = GeoJSON.Geometry;
     type Err = { Error: string, SubCode: string };
@@ -414,18 +416,16 @@ async function fetchAoiFromHotTaskingManager(projectId: number | string): (
     }
     return {
         errored: false,
-        response: {
-            type: 'FeatureCollection',
-            features: [{ type: 'Feature', geometry: answer, properties: {} }],
-        },
+        response: answer,
     };
 }
 
 export async function validateProjectIdOnHotTaskingManager(
     projectId: number | string | undefined | null,
     filter: string | undefined | null,
 ): (
-    Promise<{ errored: true, error: string } | { errored: false, message: string }>
+    Promise<{ errored: true, error: string }
+    | { errored: false, message: string, geometry: GeoJSON.Geometry }>
 ) {
     if (isNotDefined(projectId)) {
         return {
@@ -438,6 +438,23 @@ export async function validateProjectIdOnHotTaskingManager(
         return aoi;
     }
 
-    const res = await validateAoiOnOhsome(aoi.response, filter);
-    return res;
+    const res = await validateAoiOnOhsome(
+        {
+            type: 'FeatureCollection' as const,
+            features: [{
+                type: 'Feature' as const,
+                geometry: aoi.response,
+                properties: {},
+            }],
+        },
+        filter,
+    );
+    if (res.errored) {
+        return res;
+    }
+    return {
+        errored: false,
+        message: res.message,
+        geometry: aoi.response,
+    };
 }

manager-dashboard/app/views/UserGroups/UserGroupFormModal/index.tsx

@@ -46,7 +46,7 @@ interface UserGroupFormFields {
 type UserGroupFormSchema = ObjectSchema<UserGroupFormFields>;
 type UserGroupFormSchemaFields = ReturnType<UserGroupFormSchema['fields']>
 
-const MAX_CHARS_NAME = 30;
+const MAX_CHARS_NAME = 40;
 const MAX_CHARS_DESCRIPTION = 100;
 
 const userGroupFormSchema: UserGroupFormSchema = {