placementt-core 1.300.154 → 1.300.155

package/lib/tasksAndTips.d.ts

@@ -1,11 +1,24 @@
-import { CohortData, InstituteData, OrganisationAddress, ProviderData, SchoolData, UserData } from "./typeDefinitions";
+import { CohortData, InstituteData, OrganisationAddress, ProviderData, SchoolData, StudentPlacementData, UserData } from "./typeDefinitions";
 type InstituteTipNames = "createCohort" | "addSchools" | "uploadStaff" | "assignStaffRoles" | "uploadPlacements" | "allowExternalPlacementUpload" | "uploadStaffGuidance" | "uploadStudentGuidance";
 type ProviderTipNames = string;
 type StudentTipNames = string;
 export type InstituteTaskNames = "missingParentEmail" | "expiredInsurance" | "approveAlumniConversation" | "outstandingReminders" | "invalidStaffEmails" | "invalidStudentEmails" | "invalidParentEmails" | "invalidProviderEmails" | "verifyInsurance" | "verifyRiskAssessment" | "verifyDbsCheck" | "inactiveStudents" | "uploadStudents" | "inactiveStaff" | "requiredStage" | "approveExternalPlacement" | "overdueStage";
 export type StudentTaskNames = "completeOnboarding";
 export type ProviderTaskNames = "applicationRequireReview" | "activateStaff" | "requestedVisiblePlacementListings" | "requestedVisibleAddresses" | "completeStudentDocs" | "uploadOnboarding" | "reviewOnboarding" | "completeListing" | "completeAddress" | "registrationRequests" | "placementStarting" | "completeFeedback" | "setUpFeedback";
+type TaskItem = {
+    title?: string;
+    message?: string;
+    link?: string;
+    buttonTitle?: string;
+    dismissible?: boolean;
+    severity?: "error" | "warning" | "success" | "primary" | "info";
+} | {
+    [key: string]: StudentPlacementData;
+};
 export type TaskQueryReturnObject = {
+    [itemName in InstituteTaskNames | InstituteTipNames | StudentTipNames | ProviderTipNames]: TaskItem | TaskItem[];
+} | undefined;
+export type TipQueryReturnObject = {
     itemName?: InstituteTaskNames | InstituteTipNames | StudentTipNames | ProviderTipNames;
     title?: string;
     message?: string;
@@ -21,22 +34,22 @@ export type InstituteTaskObject = {
             organisation: InstituteData & ProviderData;
             cohorts: CohortData | [string, CohortData][];
             schools?: SchoolData | [string, SchoolData][];
-        }) => Promise<TaskQueryReturnObject | TaskQueryReturnObject[]>;
+        }) => Promise<TaskQueryReturnObject>;
     };
 };
 export type StudentTaskObject = {
     [key in StudentTaskNames]: {
-        callback: (user: UserData) => Promise<TaskQueryReturnObject | TaskQueryReturnObject[]>;
+        callback: (user: UserData) => Promise<TaskQueryReturnObject>;
     };
 };
 export type ProviderTaskObject = {
     [key in ProviderTaskNames]: {
-        callback: (user: UserData) => Promise<TaskQueryReturnObject | TaskQueryReturnObject[]>;
+        callback: (user: UserData) => Promise<TaskQueryReturnObject>;
     };
 };
 export declare const getTips: (user: UserData, organisation: InstituteData | ProviderData, addresses?: {
     [key: string]: OrganisationAddress;
-}) => Promise<(TaskQueryReturnObject)[]>;
+}) => Promise<(TipQueryReturnObject)[]>;
 export declare const getTasks: ({ user, organisation, cohort, school }: {
     user: UserData;
     organisation?: InstituteData & ProviderData;

package/lib/tasksAndTips.js

@@ -151,13 +151,13 @@ const instituteTasks = {
                 return;
             const staffCount = (await firebaseQuery.getCount(["users"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("userType", "==", "Staff"), (0, firestore_1.where)("flags", "array-contains", "userEmailFailed")]));
             if (staffCount > 0) {
-                return {
-                    dismissible: false,
-                    severity: "error",
-                    title: `${staffCount} staff have invalid emails.`,
-                    message: `${staffCount} staff accounts have invalid email addresses. Delete and reupload these users.`,
-                    link: "/institutes/organisation/staff/all",
-                };
+                return { invalidStaffEmails: {
+                        dismissible: false,
+                        severity: "error",
+                        title: `${staffCount} staff have invalid emails.`,
+                        message: `${staffCount} staff accounts have invalid email addresses. Delete and reupload these users.`,
+                        link: "/institutes/organisation/staff/all",
+                    } };
             }
             return;
         },
@@ -169,13 +169,13 @@ const instituteTasks = {
                     return;
                 const convos = (await firebaseQuery.getCount(["alumniConversations"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("open", "==", true), (0, firestore_1.where)("delivered", "==", "pending")]));
                 if (convos > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "info",
-                        title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
-                        message: `There are ${convos} message${convos > 1 ? "s" : ""} to alumni for you to review and release.`,
-                        link: "/institutes/network/alumni/conversations",
-                    };
+                    return { approveAlumniConversation: {
+                            dismissible: false,
+                            severity: "info",
+                            title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
+                            message: `There are ${convos} message${convos > 1 ? "s" : ""} to alumni for you to review and release.`,
+                            link: "/institutes/network/alumni/conversations",
+                        } };
                 }
                 return;
             }
@@ -183,13 +183,13 @@ const instituteTasks = {
                 // One school
                 const convos = (await firebaseQuery.getCount(["alumniConversations"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("schoolId", "==", schools.id), (0, firestore_1.where)("open", "==", true), (0, firestore_1.where)("delivered", "==", "pending")]));
                 if (convos > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "info",
-                        title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
-                        message: `There are ${convos} message${convos > 1 ? "s" : ""} to alumni for you to review and release.`,
-                        link: `/institutes/network/alumni/conversations/${schools.id}`,
-                    };
+                    return { approveAlumniConversation: {
+                            dismissible: false,
+                            severity: "info",
+                            title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
+                            message: `There are ${convos} message${convos > 1 ? "s" : ""} to alumni for you to review and release.`,
+                            link: `/institutes/network/alumni/conversations/${schools.id}`,
+                        } };
                 }
                 return;
             }
@@ -208,7 +208,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return ({ approveAlumniConversation: items.filter((v) => v) });
         },
     },
     invalidStudentEmails: {
@@ -218,13 +218,13 @@ const instituteTasks = {
             if (!Array.isArray(cohorts)) {
                 const studentCount = (await firebaseQuery.getCount(["users"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("userType", "==", "Students"), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("flags", "array-contains", "userEmailFailed")]));
                 if (studentCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "error",
-                        title: `${studentCount} students have invalid emails.`,
-                        message: `${studentCount} student accounts have invalid email addresses. Delete and reupload these users.`,
-                        link: `/institutes/cohorts/${cohorts.id}/students`,
-                    };
+                    return { invalidStudentEmails: {
+                            dismissible: false,
+                            severity: "error",
+                            title: `${studentCount} students have invalid emails.`,
+                            message: `${studentCount} student accounts have invalid email addresses. Delete and reupload these users.`,
+                            link: `/institutes/cohorts/${cohorts.id}/students`,
+                        } };
                 }
                 return;
             }
@@ -241,7 +241,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { invalidStudentEmails: items.filter((v) => v) };
         },
     },
     outstandingReminders: {
@@ -249,13 +249,13 @@ const instituteTasks = {
             if (!Array.isArray(cohorts)) {
                 const reminderCount = (await firebaseQuery.getCount(["reminders"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("uid", "==", user.id), (0, firestore_1.where)("dueDate", "<=", (0, util_2.convertDate)(new Date(), "dbstring")), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("status", "==", "upcoming")]));
                 if (reminderCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `You have ${reminderCount} reminder${reminderCount > 1 ? "s" : ""}.`,
-                        message: `You have ${reminderCount} outstanding placement reminder${reminderCount > 1 ? "s" : ""}. Click to view.`,
-                        link: `/institutes/cohorts/${cohorts.id}/placements`,
-                    };
+                    return { outstandingReminders: {
+                            dismissible: false,
+                            severity: "primary",
+                            title: `You have ${reminderCount} reminder${reminderCount > 1 ? "s" : ""}.`,
+                            message: `You have ${reminderCount} outstanding placement reminder${reminderCount > 1 ? "s" : ""}. Click to view.`,
+                            link: `/institutes/cohorts/${cohorts.id}/placements`,
+                        } };
                 }
                 return;
             }
@@ -272,7 +272,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { outstandingReminders: items.filter((v) => v) };
         },
     },
     invalidParentEmails: {
@@ -282,13 +282,13 @@ const instituteTasks = {
             if (!Array.isArray(cohorts)) {
                 const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("flags", "array-contains", "parentEmailFailed")]));
                 if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "error",
-                        title: `${placementCount} placements have invalid parent emails.`,
-                        message: `Your cohort '${cohorts.name}' has placements with invalid parent emails. Click to view these placements.`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress`,
-                    };
+                    return { invalidParentEmails: {
+                            dismissible: false,
+                            severity: "error",
+                            title: `${placementCount} placements have invalid parent emails.`,
+                            message: `Your cohort '${cohorts.name}' has placements with invalid parent emails. Click to view these placements.`,
+                            link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress`,
+                        } };
                 }
                 return;
             }
@@ -306,7 +306,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { invalidParentEmails: items.filter((v) => v) };
         },
     },
     expiredInsurance: {
@@ -316,13 +316,13 @@ const instituteTasks = {
             if (!Array.isArray(cohorts)) {
                 const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("endDate", ">", (0, util_2.convertDate)(new Date(), "dbstring")), (0, firestore_1.where)("flags", "array-contains", "insuranceExpired")]));
                 if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "error",
-                        title: `${placementCount} placements have expired insurance.`,
-                        message: `Your cohort '${cohorts.name}' has placements with expired insurance Click to view these placements.`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress`,
-                    };
+                    return { expiredInsurance: {
+                            dismissible: false,
+                            severity: "error",
+                            title: `${placementCount} placements have expired insurance.`,
+                            message: `Your cohort '${cohorts.name}' has placements with expired insurance Click to view these placements.`,
+                            link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress`,
+                        } };
                 }
                 return;
             }
@@ -340,7 +340,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { expiredInsurance: items.filter((v) => v) };
         },
     },
     invalidProviderEmails: {
@@ -350,13 +350,13 @@ const instituteTasks = {
             if (!Array.isArray(cohorts)) {
                 const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("flags", "array-contains", "providerEmailFailed")]));
                 if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "error",
-                        title: `${placementCount} placements have invalid provider emails.`,
-                        message: `Your cohort '${cohorts.name}' has placements with invalid provider emails. Click to view these placements.`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress`,
-                    };
+                    return { invalidProviderEmails: {
+                            dismissible: false,
+                            severity: "error",
+                            title: `${placementCount} placements have invalid provider emails.`,
+                            message: `Your cohort '${cohorts.name}' has placements with invalid provider emails. Click to view these placements.`,
+                            link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress`,
+                        } };
                 }
                 return;
             }
@@ -374,7 +374,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { invalidProviderEmails: items.filter((v) => v) };
         },
     },
     requiredStage: {
@@ -382,33 +382,20 @@ const instituteTasks = {
             if (!(0, util_1.getAccess)(user, "signOffPlacements") || user.viewStudents === "none")
                 return;
             if (!Array.isArray(cohorts)) {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("reqUserType", "==", user.userType)]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements require your attention.`,
-                        message: `Your cohort '${cohorts.name}' has placements for you to review. Click to view these placements.`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress&reqUserType=${user.userType}`,
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("reqUserType", "==", user.userType)]));
+                if (Object.keys(placements).length > 0) {
+                    return { requiredStage: placements };
                 }
                 return;
             }
             const items = await Promise.all(cohorts.map(async ([id, cohort]) => {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("reqUserType", "==", user.userType)]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements in '${cohort.name}' require your attention.`,
-                        message: `Your cohort '${cohort.name}' has placements for you to review. Click to view these placements.`,
-                        link: `/institutes/cohorts/${cohort.schoolId ? `${cohort.schoolId}/${id}` : id}/placements?selectedView=allData&id=inProgress&reqUserType=${user.userType}`,
-                        buttonTitle: "Review placements",
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("reqUserType", "==", user.userType)]));
+                if (Object.keys(placements).length > 0) {
+                    return placements;
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { requiredStage: items.filter((v) => v) };
         },
     },
     verifyInsurance: {
@@ -416,33 +403,20 @@ const instituteTasks = {
             if (!(0, util_1.getAccess)(user, "verifyInsurance") || user.viewStudents === "none")
                 return;
             if (!Array.isArray(cohorts)) {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("insurance", "==", "awaitingReview")]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements have insurance that require review.`,
-                        message: `Your cohort '${cohorts.name}' has employer's liability insurance documents that require review`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress&insurance=awaitingReview`,
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("insurance", "==", "awaitingReview")]));
+                if (Object.keys(placements).length > 0) {
+                    return { verifyInsurance: placements };
                 }
                 return;
             }
             const items = await Promise.all(cohorts.map(async ([id, cohort]) => {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("insurance", "==", "awaitingReview")]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements in '${cohort.name}' have insurance that require review.`,
-                        message: `Your cohort '${cohort.name}' has employer's liability insurance documents that require review`,
-                        link: `/institutes/cohorts/${cohort.schoolId ? `${cohort.schoolId}/${id}` : id}/placements?selectedView=allData&id=inProgress&insurance=awaitingReview`,
-                        buttonTitle: "Review placements",
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("insurance", "==", "awaitingReview")]));
+                if (Object.keys(placements).length > 0) {
+                    return placements;
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { verifyInsurance: items.filter((v) => v) };
         },
     },
     verifyDbsCheck: {
@@ -450,33 +424,20 @@ const instituteTasks = {
             if (!(0, util_1.getAccess)(user, "verifyDbsChecks") || user.viewStudents === "none")
                 return;
             if (!Array.isArray(cohorts)) {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("dbsCheck", "==", "awaitingReview")]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements have DBS checks that require review.`,
-                        message: `Your cohort '${cohorts.name}' has DBS checks that require review`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress&dbsCheck=awaitingReview`,
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("dbsCheck", "==", "awaitingReview")]));
+                if (Object.keys(placements).length > 0) {
+                    return { verifyDbsCheck: placements };
                 }
                 return;
             }
             const items = await Promise.all(cohorts.map(async ([id, cohort]) => {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("dbsCheck", "==", "awaitingReview")]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements in '${cohort.name}' have DBS checks that require review.`,
-                        message: `Your cohort '${cohort.name}' has DBS checks that require review`,
-                        link: `/institutes/cohorts/${cohort.schoolId ? `${cohort.schoolId}/${id}` : id}/placements?selectedView=allData&id=inProgress&dbsCheck=awaitingReview`,
-                        buttonTitle: "Review placements",
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("dbsCheck", "==", "awaitingReview")]));
+                if (Object.keys(placements).length > 0) {
+                    return placements;
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { verifyDbsCheck: items.filter((v) => v) };
         },
     },
     verifyRiskAssessment: {
@@ -484,33 +445,20 @@ const instituteTasks = {
             if (!(0, util_1.getAccess)(user, "verifyRiskAssessments") || user.viewStudents === "none")
                 return;
             if (!Array.isArray(cohorts)) {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("riskAssessment", "==", "awaitingReview")]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements have risk assessments that require review.`,
-                        message: `Your cohort '${cohorts.name}' has risk assessents that require review`,
-                        link: `/institutes/cohorts/${cohorts.schoolId ? `${cohorts.schoolId}/${cohorts.id}` : cohorts.id}/placements?selectedView=allData&id=inProgress&riskAssessment=awaitingReview`,
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", cohorts.id), (0, firestore_1.where)("riskAssessment", "==", "awaitingReview")]));
+                if (Object.keys(placements).length > 0) {
+                    return { verifyRiskAssessment: placements };
                 }
                 return;
             }
             const items = await Promise.all(cohorts.map(async ([id, cohort]) => {
-                const placementCount = (await firebaseQuery.getCount(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("riskAssessment", "==", "awaitingReview")]));
-                if (placementCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "primary",
-                        title: `${placementCount} placements in '${cohort.name}' have risk assessments that require review.`,
-                        message: `Your cohort '${cohort.name}' has risk assessments that require review`,
-                        link: `/institutes/cohorts/${cohort.schoolId ? `${cohort.schoolId}/${id}` : id}/placements?selectedView=allData&id=inProgress&riskAssessment=awaitingReview`,
-                        buttonTitle: "Review placements",
-                    };
+                const placements = (await firebaseQuery.getDocsWhere(["placements"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("cohort", "==", id), (0, firestore_1.where)("riskAssessment", "==", "awaitingReview")]));
+                if (Object.keys(placements).length > 0) {
+                    return placements;
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { verifyRiskAssessment: items.filter((v) => v) };
         },
     },
     missingParentEmail: {
@@ -528,13 +476,13 @@ const instituteTasks = {
                 }
                 const studentCount = (await firebaseQuery.getCount(["users"], constraints));
                 if (studentCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "info",
-                        title: `${studentCount} students do not have a parent email.`,
-                        message: `Your cohort '${cohorts.name}' has students without a parent email. To allow proper processing of their placements, add these emails.`,
-                        link: `/institutes/cohorts/${cohorts.id}/students?parentEmail=false`,
-                    };
+                    return { missingParentEmail: {
+                            dismissible: false,
+                            severity: "info",
+                            title: `${studentCount} students do not have a parent email.`,
+                            message: `Your cohort '${cohorts.name}' has students without a parent email. To allow proper processing of their placements, add these emails.`,
+                            link: `/institutes/cohorts/${cohorts.id}/students?parentEmail=false`,
+                        } };
                 }
                 return;
             }
@@ -560,7 +508,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { missingParentEmail: items.filter((v) => v) };
         },
     },
     inactiveStudents: {
@@ -575,13 +523,13 @@ const instituteTasks = {
                 }
                 const studentCount = (await firebaseQuery.getCount(["users"], constraints));
                 if (studentCount > 0) {
-                    return {
-                        dismissible: false,
-                        severity: "info",
-                        title: `${studentCount} students in are inactive.`,
-                        message: `Your cohort '${cohorts.name}' has inactive students. Activate them to enable them to use the platform.`,
-                        link: `/institutes/cohorts/${cohorts.id}/students?status=inactive`,
-                    };
+                    return { inactiveStudents: {
+                            dismissible: false,
+                            severity: "info",
+                            title: `${studentCount} students in are inactive.`,
+                            message: `Your cohort '${cohorts.name}' has inactive students. Activate them to enable them to use the platform.`,
+                            link: `/institutes/cohorts/${cohorts.id}/students?status=inactive`,
+                        } };
                 }
                 return;
             }
@@ -604,7 +552,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { inactiveStudents: items.filter((v) => v) };
         },
     },
     uploadStudents: {
@@ -633,7 +581,7 @@ const instituteTasks = {
                 }
                 return;
             }));
-            return items.filter((v) => v);
+            return { uploadStudents: items.filter((v) => v) };
         },
     },
     inactiveStaff: {
@@ -649,11 +597,11 @@ const instituteTasks = {
             };
             const inactiveStaff = await firebaseQuery.getCount(["users"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("userType", "==", "Staff"), (0, firestore_1.where)("status", "==", "inactive")]);
             if (inactiveStaff > 0) {
-                return {
-                    ...returnObj,
-                    title: "Inactive staff",
-                    message: `You have ${inactiveStaff} inactive staff members. You can activate them in the 'Staff' cohorts tab.`,
-                };
+                return { inactiveStaff: {
+                        ...returnObj,
+                        title: "Inactive staff",
+                        message: `You have ${inactiveStaff} inactive staff members. You can activate them in the 'Staff' cohorts tab.`,
+                    } };
             }
             return;
         },
@@ -670,17 +618,10 @@ const instituteTasks = {
                 return;
             if (!Array.isArray(cohorts))
                 return;
-            const externalCount = await firebaseQuery.getCount(["placementListings"], [(0, firestore_1.where)(`savedBy.${user.oId}.exists`, "==", true), (0, firestore_1.where)(`savedBy.${user.oId}.status`, "==", "uploaded"), (0, firestore_1.where)("mapConsent", "==", "institute")]);
-            console.log("EXT", externalCount);
-            if (externalCount > 0) {
-                return {
-                    dismissible: false,
-                    severity: "warning",
-                    title: `${externalCount} external placements require approval`,
-                    message: "Review and approve these placements to add them to your institute placement map",
-                    link: "/institutes/placements",
-                    buttonTitle: "View placements",
-                };
+            const requests = await firebaseQuery.getDocsWhere(["providerContacts"], [(0, firestore_1.where)(`savedBy.${user.oId}.exists`, "==", true), (0, firestore_1.where)(`savedBy.${user.oId}.status`, "==", "uploaded"), (0, firestore_1.where)("mapConsent", "==", "institute")]);
+            console.log("EXT", requests);
+            if (Object.keys(requests).length > 0) {
+                return { approveExternalPlacement: requests };
             }
             return;
         },
@@ -700,7 +641,7 @@ const studentTasks = {
                 link: `/${user.product}/placements/${k}`,
                 buttonTitle: "View onboarding",
             }));
-            return items;
+            return { completeOnboarding: items };
         },
     }
 };
@@ -1099,14 +1040,13 @@ const getTasks = async ({ user, organisation, cohort, school }) => {
 };
 exports.getTasks = getTasks;
 const getStudentTasks = async (user, organisation, cohort) => {
-    const processedTasks = await Object.entries(studentTasks).reduce(async (acc, [itemName, item]) => {
+    const processedTasks = await Object.entries(studentTasks).reduce(async (accPromise, [itemName, item]) => {
+        const acc = await accPromise; // Wait for the previous accumulator value
         const queryResult = await item.callback(user);
         if (!queryResult)
-            return await acc;
-        const queryResultArray = Array.isArray(queryResult) ? queryResult : [queryResult];
-        const results = queryResultArray.map((r) => ({ itemName: itemName, ...r }));
-        (await acc).push(...results);
-        return await acc;
+            return acc; // If no result, return the accumulator as is
+        // Merge the query result with the current accumulator
+        return { ...acc, ...queryResult };
     }, Promise.resolve([]));
     return processedTasks;
 };
@@ -1173,18 +1113,16 @@ const getInstituteTasks = async ({ user, organisation, cohort, school }) => {
         fCohort = await getCohortsOrSchoolsIfNotProvided("cohorts", fSchool);
     }
     console.log("FCOHORTS FOR TASKS", fCohort);
-    const processedTasks = await Object.entries(instituteTasks).reduce(async (acc, [itemName, item]) => {
+    const processedTasks = await Object.entries(instituteTasks).reduce(async (accPromise, [itemName, item]) => {
         if (!fCohort) {
             console.log("No cohorts to retrieve tasks for");
             return ([]);
         }
+        const acc = await accPromise;
         const queryResult = await item.callback({ user, organisation, cohorts: fCohort, schools: fSchool });
         if (!queryResult)
-            return await acc;
-        const queryResultArray = Array.isArray(queryResult) ? queryResult : [queryResult];
-        const results = queryResultArray.map((r) => ({ itemName: itemName, ...r }));
-        (await acc).push(...results);
-        return await acc;
+            return acc;
+        return { ...acc, ...queryResult }; // Merge the query result into the accumulator object        
     }, Promise.resolve([]));
     return processedTasks;
 };