diff --git a/client/src/components/new-dataset/step-description/csv-import.tsx b/client/src/components/new-dataset/step-description/csv-import.tsx
index 66fa9d47..746bf8f2 100644
--- a/client/src/components/new-dataset/step-description/csv-import.tsx
+++ b/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,
diff --git a/client/src/containers/collaborators/form/index.tsx b/client/src/containers/collaborators/form/index.tsx
index fbf5f492..6b45c140 100644
--- a/client/src/containers/collaborators/form/index.tsx
+++ b/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" },
),
diff --git a/client/src/containers/other-tools/form/index.tsx b/client/src/containers/other-tools/form/index.tsx
index 85f4f423..6b32b826 100644
--- a/client/src/containers/other-tools/form/index.tsx
+++ b/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()
diff --git a/client/src/containers/projects/form/index.tsx b/client/src/containers/projects/form/index.tsx
index 5f8b8175..b0f4a032 100644
--- a/client/src/containers/projects/form/index.tsx
+++ b/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,
},
}),
});
diff --git a/client/src/containers/projects/popup.tsx b/client/src/containers/projects/popup.tsx
index b2c17205..5b7c7763 100644
--- a/client/src/containers/projects/popup.tsx
+++ b/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 = () => {
)}
- {/* ACCOUNT */}
- {!!data?.data?.attributes?.account && (
-
-
Account
-
{data?.data?.attributes?.account}
-
@@ -110,6 +112,7 @@ const ProjectPopup = () => {
)}
+
{/* SDGS */}
{!!sdgs?.data?.length && (
@@ -127,6 +130,62 @@ const ProjectPopup = () => {
)}
+
+ {/* ACCOUNT */}
+ {!!data?.data?.attributes?.account && (
+
+
Account
+
{data?.data?.attributes?.account}
+
+
Status
+
{projectStatus}
+
+
Source Country
+
{sourceCountry}
+
+
Organization Type
+
{organizationType}
+
+
Objective
+
{objective}
+
+
Type of funding
+
{projectTypeOfFunding}
+