placementt-core 1.400.1113 → 1.400.1114

package/lib/hooks.d.ts

@@ -245,7 +245,7 @@ type NewUserPaginatorParams = {
     view: "list" | "table";
     filters?: FilterObject;
     institute: InstituteData;
-    userType: "Staff" | "Students";
+    userType: "Staff" | "Students" | "Leavers";
     initialSort?: string;
     trustSchoolsIDs?: string[];
 };

package/lib/hooks.js

@@ -2235,7 +2235,10 @@ function useUserUploadHandler({ product, oId, event, eventId, userType, user, on
     const [emptyCellsWarning, setEmptyCellsWarning] = (0, react_1.useState)(false);
     const [alert, setAlert] = (0, react_1.useState)();
     const { execute } = (0, firebase_1.useExecuteCallableJob)({ user: user });
-    const requiredFields = ["forename", "surname", "email"];
+    // Students also need a year group: Destinations, Development and the careers
+    // calendar are all set up per year group, and a CSV is the only way a school
+    // without Wonde gets one onto its students.
+    const requiredFields = ["forename", "surname", "email", ...(userType === "Students" ? [constants_1.STUDENT_YEAR_FIELD] : [])];
     const checkData = (userData) => {
         setAlert(undefined);
         userData = userData.filter((u) => Object.entries(u).some(([, v]) => v));
@@ -2268,15 +2271,14 @@ function useUserUploadHandler({ product, oId, event, eventId, userType, user, on
                 setAlert({ msg: "Data cannot be uploaded in unnamed columns.", severity: "error" });
                 return false;
             }
-            for (const field in user) {
-                if (!user[field]) {
-                    if (requiredFields.includes(field)) {
-                        setAlert({ msg: "All users must contain " + requiredFields.join(", "), severity: "error" });
-                        emptyRequiredCell = true;
-                    }
-                    emptyOptionalCell = true;
-                }
+            // Checked against the list rather than the row's keys, so a required
+            // column missing from the upload altogether fails too.
+            if (requiredFields.some((field) => !user[field])) {
+                setAlert({ msg: "All users must contain " + requiredFields.map((f) => f === constants_1.STUDENT_YEAR_FIELD ? "year group" : f).join(", "), severity: "error" });
+                emptyRequiredCell = true;
             }
+            if (Object.values(user).some((v) => !v))
+                emptyOptionalCell = true;
             // Add more test cases
         }
         if (emptyRequiredCell) {