Fix mentors page

code4romania · Sep 25, 2023 · 2b36be9 · 2b36be9 · vercel · Sep 25, 2023
1 parent 5a465e1
commit 2b36be9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/client/src/pages/Home/UsersTable.tsx b/client/src/pages/Home/UsersTable.tsx
@@ -6,7 +6,6 @@ import React, {
   useState,
 } from "react";
 import { Link } from "react-router-dom";
-import { useForm } from "react-hook-form";
 import { downloadExcel } from "react-export-table-to-excel";
 import Input from "@/components/Input";
 import { useGetUsersQuery } from "@/redux/api/userApi";
@@ -36,14 +35,14 @@ const UsersTable = () => {
     "ULTIMA EVALUARE",
   ];
 
-  const body = filtered.map(({ ongName, createdAt, reports }) => ({
+  const body = filtered.map(({ ongName, createdAt, reports, program }) => ({
     ongName,
     createdAt: new Date(createdAt).toLocaleString("ro-RO", {
       month: "short",
       day: "numeric",
       year: "numeric",
     }),
-    program: "-",
+    program: program || "-",
     lastEvaluationDate: reports?.length
       ? new Date(reports[reports?.length - 1].createdAt).toLocaleString(
           "ro-RO",

diff --git a/client/src/pages/Mentors/index.tsx b/client/src/pages/Mentors/index.tsx
@@ -30,9 +30,9 @@ const Mentors = () => {
             ]}
             body={mentors.map((mentor) => [
               `${mentor.firstName} ${mentor.lastName}`,
-              `${mentor.dimensions.map((dimension) => dimension.name)}`,
+              `${mentor.dimensions?.map((dimension) => dimension.name)}`,
               "Disponibil",
-              `${mentor.program.name}`,
+              `${mentor?.program?.name}`,
               `${
                 (mentor.mentorActivities &&
                   mentor.mentorActivities[mentor.mentorActivities?.length - 1]

diff --git a/client/src/pages/mentor/EditProfile/index.tsx b/client/src/pages/mentor/EditProfile/index.tsx
@@ -38,9 +38,9 @@ const EditProfile = () => {
   const [updateMentorProfile, { isSuccess, isError, error, data }] =
     useUpdateUserMutation();
   const { data: programs, isLoading: isLoadingPrograms } =
-    useGetProgramsQuery();
+    useGetProgramsQuery(null);
   const { data: dimensions, isLoading: isLoadingDimensions } =
-    useGetDimensionsQuery();
+    useGetDimensionsQuery(null);
 
   const methods = useForm<MentorProfileInput>({
     resolver: zodResolver(mentorProfileSchema),
@@ -52,24 +52,14 @@ const EditProfile = () => {
     },
   });
 
-  console.log("programs", programs);
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
 
   useEffect(() => {
     if (error?.data?.error?.message) {
-      if (
-        error?.data?.error?.details?.errors?.length > 0 &&
-        error?.data.error.details.errors.find(({ path }) =>
-          path.includes("ongIdentificationNumber")
-        )
-      ) {
-        toast.error("Organizație deja înregistrată în platformă");
-      } else {
-        toast.error(error.data.error.message);
-      }
+      toast.error(error.data.error.message);
     }
-  }, [error?.data?.error?.message, error?.data?.error?.details?.errors]);
+  }, [error?.data?.error?.message]);
 
   useEffect(() => {
     if (isSuccess) {
@@ -78,7 +68,6 @@ const EditProfile = () => {
   }, [isSuccess, dispatch]);
 
   const onSubmitHandler: SubmitHandler<MentorProfileInput> = async (data) => {
-    console.log("data", data);
     updateMentorProfile({
       id: user?.id,
       ...data,

diff --git a/client/src/redux/api/types.ts b/client/src/redux/api/types.ts
@@ -50,6 +50,10 @@ export interface User {
   reports: Report[];
   domains?: Domain[];
   role?: Role;
+  //   Mentor
+  available: boolean;
+  program: Program;
+  dimensions: Dimension[];
 }
 
 export interface Question {

diff --git a/client/src/redux/api/userApi.ts b/client/src/redux/api/userApi.ts
@@ -57,7 +57,7 @@ export const userApi = createApi({
     getUsers: builder.query<User[], null>({
       query() {
         return {
-          url: `users?filters[role][type][$eq]=authenticated&populate[0]=role&populate[1]=domains&populate[2]=reports&sort=createdAt%3Adesc`,
+          url: `users?filters[role][type][$eq]=authenticated&populate[0]=role&populate[1]=domains&populate[2]=reports&populate[3]=program&sort=createdAt%3Adesc`,
         };
       },
       transformResponse: (result: User[]) =>
@@ -79,7 +79,7 @@ export const userApi = createApi({
     getMentors: builder.query<User[], null>({
       query() {
         return {
-          url: `users?filters[role][type][$eq]=mentor&populate[0]=role&populate[1]=domains&populate[2]=programs&populate[3]=dimensions&sort=createdAt%3Adesc`,
+          url: `users?filters[role][type][$eq]=mentor&populate[0]=role&populate[1]=domains&populate[2]=program&populate[3]=dimensions&sort=createdAt%3Adesc`,
         };
       },
     }),