feat: select academic year of imports

Author: ksambhi

collection/app/(app)/CSVImport.tsx

@@ -21,7 +21,7 @@ import { Dropzone } from "@mantine/dropzone";
 import "@mantine/dropzone/styles.css";
 import { useForm } from "@mantine/form";
 import { useDisclosure } from "@mantine/hooks";
-import { RootItem } from "@prisma/client";
+import { AcademicYear, RootItem } from "@prisma/client";
 import React, { useState, useTransition } from "react";
 import {
     FaCircleCheck,
@@ -34,11 +34,19 @@ import {
 import useSWR from "swr";
 
 interface CSVImportFormProp {
-    /** Undefiend treated as loading UI */
     productsByAcademicYear: Record<string, RootItem[]>;
+    /** Current academic year */
+    academicYear: string;
+    /** Valid academic years */
+    validAcademicYears: string[];
 }
 
-const CSVImportForm: React.FC<CSVImportFormProp> = ({ productsByAcademicYear }) => {
+// TODO: Pass in academic years explicitly, default to current year
+const CSVImportForm: React.FC<CSVImportFormProp> = ({
+    productsByAcademicYear,
+    academicYear,
+    validAcademicYears,
+}) => {
     const [isPending, startTransition] = useTransition();
     const [formState, setFormState] = useState<StatusReturn>({
         status: "pending",
@@ -49,7 +57,7 @@ const CSVImportForm: React.FC<CSVImportFormProp> = ({ productsByAcademicYear })
             productId:
                 productsByAcademicYear[Object.keys(productsByAcademicYear)[0]][0].id.toString(10),
             csv: [],
-            academicYear: Object.keys(productsByAcademicYear)[0],
+            academicYear: academicYear,
         },
         validate: {
             productId: (value: string) => {
@@ -120,7 +128,7 @@ const CSVImportForm: React.FC<CSVImportFormProp> = ({ productsByAcademicYear })
                     name="academicYear"
                     key={form.key("academicYear")}
                     description="Import into this academic year"
-                    data={Object.keys(productsByAcademicYear)}
+                    data={validAcademicYears}
                     required
                     {...form.getInputProps("academicYear")}
                 />
@@ -219,7 +227,13 @@ const fetcher = async (...args: Parameters<typeof fetch>) => {
     return res.json();
 };
 
-export const CSVImport = () => {
+export const CSVImport = ({
+    academicYears,
+    currentAcademicYear,
+}: {
+    academicYears: string[];
+    currentAcademicYear: string;
+}) => {
     const [opened, { open, close }] = useDisclosure(false);
 
     const { data } = useSWR<Record<string, RootItem[]>>("/api/products", fetcher);
@@ -244,7 +258,11 @@ export const CSVImport = () => {
                             </Center>
                         </Stack>
                     ) : (
-                        <CSVImportForm productsByAcademicYear={data} />
+                        <CSVImportForm
+                            academicYear={currentAcademicYear}
+                            validAcademicYears={academicYears}
+                            productsByAcademicYear={data}
+                        />
                     )}
                 </Stack>
             </Modal>

collection/app/(app)/PageActions.tsx

@@ -1,16 +1,17 @@
 import { AcademicYear } from "@docsoc/eactivities";
 import { Paper, MultiSelect, Group } from "@mantine/core";
 import { UseFormReturnType } from "@mantine/form";
-import React, { Suspense } from "react";
 
 import { CSVImport } from "./CSVImport";
 
 export const PageActions = ({
     formHook,
     academicYears,
+    currentAcademicYear,
 }: {
     formHook: UseFormReturnType<{ academicYears: AcademicYear[]; shortcode: string }>;
     academicYears: string[];
+    currentAcademicYear: string;
 }) => {
     return (
         <Paper p="lg" withBorder>
@@ -22,7 +23,10 @@ export const PageActions = ({
                     data={academicYears}
                     {...formHook.getInputProps("academicYears")}
                 />
-                <CSVImport />
+                <CSVImport
+                    academicYears={academicYears}
+                    currentAcademicYear={currentAcademicYear}
+                />
             </Group>
         </Paper>
     );

collection/app/(app)/UserSearch.tsx

@@ -108,7 +108,11 @@ export const UserSearch: React.FC<UserSearchProps> = ({
     return (
         <Container w="70%">
             <Stack gap="lg">
-                <PageActions academicYears={validAcaemicYears} formHook={form} />
+                <PageActions
+                    currentAcademicYear={currentAcademicYear}
+                    academicYears={validAcaemicYears}
+                    formHook={form}
+                />
                 <Center>
                     <Stack w="90%" justify="centre" align="centre">
                         <form