reviewer editions

Vizzuality · Oct 2, 2024 · 645d46b · 645d46b
1 parent 4434845
commit 645d46b
Show file tree

Hide file tree

Showing 32 changed files with 3,886 additions and 2,876 deletions.
diff --git a/client/src/containers/collaborators/form/index.tsx b/client/src/containers/collaborators/form/index.tsx
@@ -247,6 +247,12 @@ export default function CollaboratorForm() {
                     disconnect: [],
                   },
                 }),
+                ...(ME_DATA.id && {
+                  reviewed_by: {
+                    connect: [ME_DATA.id],
+                    disconnect: [],
+                  },
+                }),
               },
             },
           });
@@ -263,6 +269,12 @@ export default function CollaboratorForm() {
               }),
             ...values,
             image: imageId,
+            ...(ME_DATA.id && {
+              reviewed_by: {
+                connect: [ME_DATA.id],
+                disconnect: [],
+              },
+            }),
           },
           data?.apiToken,
         )
@@ -281,6 +293,12 @@ export default function CollaboratorForm() {
                     connect: [+id],
                     disconnect: [],
                   },
+                  ...(ME_DATA.id && {
+                    reviewed_by: {
+                      connect: [ME_DATA.id],
+                      disconnect: [],
+                    },
+                  }),
                 },
               },
             });

diff --git a/client/src/containers/datasets/changes-to-approve/index.tsx b/client/src/containers/datasets/changes-to-approve/index.tsx
@@ -231,7 +231,6 @@ export default function FormToApprove() {
     } as Data;
   }, [datasetData, datasetValuesData, previousDataSource?.data?.attributes?.value_type]);
 
-
   const PENDING_TO_APPROVE_DATA = useMemo(() => {
     datasetDataPendingToApprove?.data?.attributes || ({} as DatasetEditSuggestion);
 
@@ -278,7 +277,6 @@ export default function FormToApprove() {
 
   const [formValues, setFormValues] = useState<Data>(PENDING_TO_APPROVE_DATA);
 
-
   const formSchema = z.object({
     message: z.string().min(1, { message: "Please provide a reason for the rejection" }),
   });
@@ -370,8 +368,15 @@ export default function FormToApprove() {
             dataset_edit_suggestion_ids: parsedData?.dataset_edit_suggestions?.data.map(
               (d: { id: number }) => d?.id,
             ),
+            ...(ME_DATA.id && {
+              reviewed_by: {
+                connect: [ME_DATA.id],
+                disconnect: [],
+              },
+            }),
           },
           session?.apiToken,
+
           // to do review data + change sug status
         )
           .then((data) => {

diff --git a/client/src/containers/datasets/edit/index.tsx b/client/src/containers/datasets/edit/index.tsx
@@ -257,6 +257,10 @@ export default function EditDatasetForm() {
               }),
             ...parsedData,
             category_ids: [data.settings.category],
+            reviewed_by: {
+              connect: [ME_DATA?.id],
+              disconnect: [],
+            },
           },
           session?.apiToken,
           // to do review data + change sug status
@@ -277,6 +281,11 @@ export default function EditDatasetForm() {
                     data: {
                       ...data.data,
                     },
+                    // @ts-expect-error TO-DO - fix types
+                    reviewed_by: {
+                      connect: [ME_DATA.id],
+                      disconnect: [],
+                    },
                   },
                 },
               });

diff --git a/client/src/containers/datasets/new/index.tsx b/client/src/containers/datasets/new/index.tsx
@@ -100,7 +100,18 @@ export default function NewDatasetForm() {
       if (ME_DATA?.role?.type === "admin") {
         const { value_type } = data.settings;
         const parsedData = getDataParsed(value_type, data);
-        updateOrCreateDataset(parsedData, session?.apiToken as string)
+        updateOrCreateDataset(
+          {
+            ...parsedData,
+            ...(ME_DATA.id && {
+              reviewed_by: {
+                connect: [ME_DATA.id],
+                disconnect: [],
+              },
+            }),
+          },
+          session?.apiToken as string,
+        )
           .then(() => {
             console.info("Success creating dataset:", data);
             toast.success("Success creating dataset");

diff --git a/client/src/containers/datasets/pending-changes-admin/approved-changes-row/index.tsx b/client/src/containers/datasets/pending-changes-admin/approved-changes-row/index.tsx
@@ -27,6 +27,14 @@ export default function ApprovedContributorsRow(data: ApprovedProps) {
           {data.review_status}
         </span>
       </TableCell>
+      <div
+        className="flex w-full whitespace-nowrap"
+        title={data?.reviewed_by?.data?.attributes?.email}
+      >
+        {data?.reviewed_by?.data?.attributes?.username
+          ? data?.reviewed_by?.data?.attributes?.username
+          : "-"}
+      </div>
       <TableCell>
         <div className="flex w-full whitespace-nowrap">
           {data.updatedAt && data.createdAt && formatDate(data.updatedAt)}

diff --git a/client/src/containers/datasets/pending-changes-admin/index.tsx b/client/src/containers/datasets/pending-changes-admin/index.tsx
@@ -96,6 +96,7 @@ export default function PendingChangesAdmin() {
             <TableHead className="w-[100px]">name</TableHead>
             <TableHead>Author</TableHead>
             <TableHead>State</TableHead>
+            <TableHead>Reviewer</TableHead>
             <TableHead>Date</TableHead>
           </TableRow>
         </TableHeader>

diff --git a/client/src/containers/datasets/pending-changes-admin/pending-declined-changes-row/index.tsx b/client/src/containers/datasets/pending-changes-admin/pending-declined-changes-row/index.tsx
@@ -20,6 +20,7 @@ type PendingChangesCell =
   | extendedProjectData;
 
 export default function PendingDeclinedChangesContributorRow(data: PendingChangesCell) {
+  console.log(data);
   return (
     <TableRow key={data.createdAt}>
       <TableCell className="whitespace-nowrap font-medium">
@@ -49,6 +50,15 @@ export default function PendingDeclinedChangesContributorRow(data: PendingChange
           </span>
         </Link>
       </TableCell>
+      <TableCell>
+        <Link
+          href={`/dashboard/${data.route}/${data.id}`}
+          className="flex w-full whitespace-nowrap"
+          title={data?.reviewed_by?.data?.attributes?.email}
+        >
+          {data.review_status === "pending" ? "-" : data?.reviewed_by?.data?.attributes?.username}
+        </Link>
+      </TableCell>
       <TableCell>
         <Link
           href={`/dashboard/${data.route}/${data.id}`}

diff --git a/client/src/containers/datasets/pending-changes-contributor/approved-changes-row/index.tsx b/client/src/containers/datasets/pending-changes-contributor/approved-changes-row/index.tsx
@@ -30,6 +30,14 @@ export default function ApprovedContributorsRow(data: ApprovedProps) {
           {data.review_status}
         </span>
       </TableCell>
+      <TableCell>
+        <div
+          className="flex w-full whitespace-nowrap"
+          title={data?.reviewed_by?.data?.attributes?.email}
+        >
+          {data.review_status === "pending" ? "-" : data?.reviewed_by?.data?.attributes?.username}
+        </div>
+      </TableCell>
       <TableCell>
         <div className="flex w-full whitespace-nowrap">
           {data.updatedAt && data.createdAt && formatDate(data.updatedAt)}

diff --git a/client/src/containers/datasets/pending-changes-contributor/index.tsx b/client/src/containers/datasets/pending-changes-contributor/index.tsx
@@ -77,6 +77,7 @@ export default function PendingChangesContributor() {
             <TableHead className="w-[100px] whitespace-nowrap">Change type</TableHead>
             <TableHead>Name</TableHead>
             <TableHead>State</TableHead>
+            <TableHead>Reviewer</TableHead>
             <TableHead>Date</TableHead>
           </TableRow>
         </TableHeader>

diff --git a/...rc/containers/datasets/pending-changes-contributor/pending-declined-changes-row/index.tsx b/...rc/containers/datasets/pending-changes-contributor/pending-declined-changes-row/index.tsx
@@ -20,6 +20,7 @@ type PendingChangesCell =
   | extendedProjectData;
 
 export default function PendingDeclinedChangesContributorRow(data: PendingChangesCell) {
+  console.log(data);
   return (
     <TableRow key={data.createdAt}>
       <TableCell className="whitespace-nowrap font-medium">
@@ -44,6 +45,24 @@ export default function PendingDeclinedChangesContributorRow(data: PendingChange
           </span>
         </Link>
       </TableCell>
+      <TableCell>
+        <Link
+          href={`/dashboard/${data.route}/${data.id}`}
+          className="flex w-full whitespace-nowrap"
+          title={data?.reviewed_by?.data?.attributes?.email}
+        >
+          {data.review_status === "pending" ? "-" : data?.reviewed_by?.data?.attributes?.username}
+        </Link>
+      </TableCell>
+      <TableCell>
+        <Link
+          href={`/dashboard/${data.route}/${data.id}`}
+          className="flex w-full whitespace-nowrap"
+          title={data?.reviewed_by?.data?.attributes?.email}
+        >
+          {data.review_status === "pending" ? "-" : data?.reviewed_by?.data?.attributes?.username}
+        </Link>
+      </TableCell>
       <TableCell>
         <Link
           href={`/dashboard/${data.route}/${data.id}`}

diff --git a/client/src/containers/other-tools/form/index.tsx b/client/src/containers/other-tools/form/index.tsx
@@ -261,6 +261,10 @@ export default function ToolForm() {
                 }),
               ...values,
               other_tools_category: values.category,
+              reviewed_by: {
+                connect: [ME_DATA.id],
+                disconnect: [],
+              },
             },
             data?.apiToken,
           )
@@ -297,6 +301,12 @@ export default function ToolForm() {
                           connect: [+id],
                         },
                       }),
+                      ...(ME_DATA.id && {
+                        reviewed_by: {
+                          connect: [ME_DATA.id],
+                          disconnect: [],
+                        },
+                      }),
                     },
                   },
                 });

diff --git a/client/src/containers/projects/form/index.tsx b/client/src/containers/projects/form/index.tsx
@@ -421,6 +421,12 @@ export default function ProjectForm() {
                 id: 366,
               }),
             ...values,
+            ...(ME_DATA.id && {
+              reviewed_by: {
+                connect: [ME_DATA.id],
+                disconnect: [],
+              },
+            }),
           },
           data?.apiToken,
           // to do review data + change sug status
@@ -453,6 +459,12 @@ export default function ProjectForm() {
                       },
                     }),
                     review_status: "approved",
+                    ...(ME_DATA.id && {
+                      reviewed_by: {
+                        connect: [ME_DATA.id],
+                        disconnect: [],
+                      },
+                    }),
                   },
                 },
               });

diff --git a/client/src/containers/welcome-message/index.tsx b/client/src/containers/welcome-message/index.tsx
@@ -18,7 +18,6 @@ import { useGetWelcomeMessage } from "@/types/generated/welcome-message";
 
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent } from "@/components/ui/dialog";
-import isEmpty from "lodash-es/isEmpty";
 
 export default function WelcomeMessage() {
   const videoRef = useRef<ReactPlayer>(null);