Merge pull request #162 from Vizzuality/fix/project-fields

Fix/project fields

client/src/components/new-dataset/step-description/csv-import.tsx

@@ -26,7 +26,6 @@ import {
   uploadCollaboratorEditSuggestionsCsv,
 } from "@/services/collaborators";
 import { uploadOtherToolsCsv, uploadToolEditSuggestionCsv } from "@/services/other-tools";
-import { toast } from "react-toastify";
 
 export default function CSVImport({
   valueType,

client/src/containers/collaborators/form/index.tsx

@@ -193,8 +193,8 @@ export default function CollaboratorForm() {
       }),
     link: z.string().refine(
       (value) => {
-        // Allow URLs starting with "www." or valid URLs starting with "http" or "https"
-        return /^(https?:\/\/)?(www\.)?[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(\/[^\s]*)?$/.test(value);
+        // This regex requires the URL to start with either http://, https://, or www.
+        return /^(https?:\/\/|www\.)[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(\/[^\s]*)?$/.test(value);
       },
       { message: "Please enter a valid URL" },
     ),

client/src/containers/other-tools/form/index.tsx

@@ -175,7 +175,13 @@ export default function ToolForm() {
 
   const formSchema = z.object({
     name: z.string().min(1, { message: "Please enter tool name" }),
-    link: z.string().url({ message: "Please enter a valid URL" }),
+    link: z.string().refine(
+      (value) => {
+        // This regex requires the URL to start with either http://, https://, or www.
+        return /^(https?:\/\/|www\.)[a-zA-Z0-9-]+\.[a-zA-Z]{2,}(\/[^\s]*)?$/.test(value);
+      },
+      { message: "Please enter a valid URL" },
+    ),
     category: z
       .number()
       .optional()

client/src/containers/projects/form/index.tsx

@@ -302,17 +302,17 @@ export default function ProjectForm() {
         message: "Please select a sdg",
       }),
     ),
-    status: z.string().min(1, {
+    status: z.coerce.number().min(1, {
       message: "Please enter status",
     }),
     funding: z.coerce.number().min(1, {
       message: "Please select type of funding",
     }),
-    organization_type: z.string().min(1, {
+    organization_type: z.coerce.number().min(1, {
       message: "Please enter organization type",
     }),
-    source_country: z.string().min(1, { message: "Please select a country" }),
-    objective: z.string().min(1, { message: "Please enter objective" }),
+    source_country: z.coerce.number().min(1, { message: "Please select a country" }),
+    objective: z.coerce.number().min(1, { message: "Please enter objective" }),
   });
 
   // TO - DO - add category from edit when API gets fixed
@@ -330,11 +330,11 @@ export default function ProjectForm() {
         countries:
           previousData?.countries?.data?.map(({ id }: { id?: number }) => id as number) || [],
         sdgs: previousData?.sdgs?.data?.map(({ id }: { id?: number }) => id as number) || [],
-        status: previousData?.status || "",
+        status: previousData?.status?.data?.id as number,
         funding: previousData?.funding?.data?.id as number,
-        organization_type: previousData?.organization_type || "",
-        source_country: previousData?.source_country || "",
-        objective: previousData?.objective as string,
+        organization_type: previousData?.organization_type?.data?.id as number,
+        source_country: previousData?.source_country?.data?.id as number,
+        objective: previousData?.objective?.data?.id as number,
       },
     }),
   });

client/src/containers/projects/popup.tsx

@@ -24,8 +24,12 @@ const ProjectPopup = () => {
         countries: {
           fields: ["name"],
         },
-        project_status: true,
-        project_type_of_funding: true,
+        status: {
+          fields: ["name"],
+        },
+        funding: {
+          fields: ["name"],
+        },
       },
     },
     {
@@ -39,6 +43,12 @@ const ProjectPopup = () => {
   const pillar = data?.data?.attributes?.pillar;
   const sdgs = data?.data?.attributes?.sdgs;
   const countries = data?.data?.attributes?.countries;
+  const projectStatus = data?.data?.attributes?.status?.data?.attributes?.name;
+  const projectTypeOfFunding = data?.data?.attributes?.funding?.data?.attributes?.name;
+  const organizationType = data?.data?.attributes?.organization_type?.data?.attributes?.name;
+  const sourceCountry = data?.data?.attributes?.source_country?.data?.attributes?.name;
+  const objective = data?.data?.attributes?.objective?.data?.attributes?.name;
+  const info = data?.data?.attributes?.info;
 
   const { format } = Intl.NumberFormat("en-US", {
     style: "currency",
@@ -79,14 +89,6 @@ const ProjectPopup = () => {
             </div>
           )}
 
-          {/* ACCOUNT */}
-          {!!data?.data?.attributes?.account && (
-            <div className="space-y-2.5">
-              <h3 className="text-xxs uppercase text-gray-500">Account</h3>
-              <div className="text-sm">{data?.data?.attributes?.account}</div>
-            </div>
-          )}
-
           {/* AMOUNT */}
           {!!data?.data?.attributes?.amount && (
             <div className="space-y-2.5">
@@ -110,6 +112,7 @@ const ProjectPopup = () => {
               </div>
             </div>
           )}
+
           {/* SDGS */}
           {!!sdgs?.data?.length && (
             <div className="space-y-2.5">
@@ -127,6 +130,62 @@ const ProjectPopup = () => {
               </ul>
             </div>
           )}
+
+          {/* ACCOUNT */}
+          {!!data?.data?.attributes?.account && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Account</h3>
+              <div className="text-sm">{data?.data?.attributes?.account}</div>
+            </div>
+          )}
+
+          {/* STATUS */}
+          {!!projectStatus && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Status</h3>
+              <div className="text-sm">{projectStatus}</div>
+            </div>
+          )}
+
+          {/* Source Country */}
+          {!!sourceCountry && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Source Country</h3>
+              <div className="text-sm">{sourceCountry}</div>
+            </div>
+          )}
+
+          {/* Organization Type */}
+          {!!organizationType && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Organization Type</h3>
+              <div className="text-sm">{organizationType}</div>
+            </div>
+          )}
+
+          {/* INFO */}
+          {!!info && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Info</h3>
+              <div className="text-sm">{info}</div>
+            </div>
+          )}
+
+          {/* Objective */}
+          {!!objective && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Objective</h3>
+              <div className="text-sm">{objective}</div>
+            </div>
+          )}
+
+          {/* TYPE OF FUNDING */}
+          {!!projectTypeOfFunding && (
+            <div className="space-y-2.5">
+              <h3 className="text-xxs uppercase text-gray-500">Type of funding</h3>
+              <div className="text-sm">{projectTypeOfFunding}</div>
+            </div>
+          )}
         </section>
       </div>
     </Popup>

client/src/services/collaborators/index.ts

@@ -53,9 +53,10 @@ export function uploadCollaboratorsCsv(
       },
       ...options,
     })
-    .then(({ data }) => {
-      console.info("Collaborators uploaded successfully:", data);
+    .then((response) => {
+      console.info("Collaborators uploaded successfully:", response.data);
       toast.success("Collaborators uploaded successfully");
+      return response;
     })
     .catch((err) => {
       toast.error(err.response.data.error.message);
@@ -82,9 +83,10 @@ export function uploadCollaboratorEditSuggestionsCsv(
       },
       ...options,
     })
-    .then(({ data }) => {
-      console.info("Collaborators suggestions uploaded successfully:", data);
+    .then((response) => {
+      console.info("Collaborators suggestions uploaded successfully:", response.data);
       toast.success("Collaborators suggestions uploaded successfully");
+      return response;
     })
     .catch((err) => {
       toast.error(err.response.data.error.message);

client/src/services/other-tools/index.ts

@@ -54,9 +54,10 @@ export function uploadOtherToolsCsv(
       },
       ...options,
     })
-    .then(({ data }) => {
-      console.info("Tools uploaded successfully:", data);
+    .then((response) => {
+      console.info("Tools uploaded successfully:", response.data);
       toast.success("Tools uploaded successfully");
+      return response;
     })
     .catch((err) => {
       toast.error(err.response.data.error.message);
@@ -83,9 +84,10 @@ export function uploadToolEditSuggestionCsv(
       },
       ...options,
     })
-    .then(({ data }) => {
-      console.info("Tools suggestions uploaded successfully:", data);
+    .then((response) => {
+      console.info("Tools suggestions uploaded successfully:", response.data);
       toast.success("Tools suggestions uploaded successfully");
+      return response;
     })
     .catch((err) => {
       toast.error(err.response.data.error.message);

client/src/services/projects/index.ts

@@ -82,9 +82,10 @@ export function uploadProjectsSuggestionCsv(
       },
       ...options,
     })
-    .then(({ data }) => {
-      console.info("Projects suggestions uploaded successfully:", data);
+    .then((response) => {
+      console.info("Projects suggestions uploaded successfully:", response.data);
       toast.success("Projects suggestions uploaded successfully");
+      return response;
     })
     .catch((err) => {
       toast.error(err.response.data.error.message);