placementt-core 1.20.211 → 11.10.151

package/src/features/placements/studentPlacements/activePlacement.ts

@@ -1,69 +1,69 @@
-import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { StudentPlacementData } from "../../../typeDefinitions"
-import { orderBy, where } from "firebase/firestore";
-
-type InitialActivePlacementSlice = {
-    status: string
-    values: StudentPlacementData | undefined
-}
-
-const initialState: InitialActivePlacementSlice = {
-    status: "",
-    values: undefined,
-}
-
-export const fetchActivePlacement = createAsyncThunk(
-    "studentPlacements/fetchActivePlacement",
-    async ({userId}: {userId: string}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId), where("completed", "==", false), orderBy("endDate")]);
-            const d = { ...docs as { [key: string]: StudentPlacementData } };
-            return d[Object.keys(d)[0]] || undefined;
-
-        } catch (error) {
-            console.log(error)
-            return undefined
-        }
-    }
-)
-
-export const activePlacementSlice = createSlice({
-    name: "activePlacement",
-    initialState,
-
-    reducers: {
-        setActivePlacement: (state, action) => {
-            state.values = action.payload
-        },
-
-        editActivePlacement: (state, action) => {
-            state.values = {...state.values, ...action.payload}
-        }
-     
-    },
-
-    extraReducers(builder) {
-        builder
-        .addCase(fetchActivePlacement.fulfilled, (state, action) => {
-           state.values = action.payload
-           state.status = "success"
-        })
-
-        .addCase(fetchActivePlacement.pending, (state) => {
-            state.status = "loading"
-         })
-
-         .addCase(fetchActivePlacement.rejected, (state) => {
-            state.status = "error"
-         })
-
-    },
-
-})
-
-
-export const {setActivePlacement, editActivePlacement} = activePlacementSlice.actions
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { StudentPlacementData } from "../../../typeDefinitions"
+import { orderBy, where } from "firebase/firestore";
+
+type InitialActivePlacementSlice = {
+    status: string
+    values: StudentPlacementData | undefined
+}
+
+const initialState: InitialActivePlacementSlice = {
+    status: "",
+    values: undefined,
+}
+
+export const fetchActivePlacement = createAsyncThunk(
+    "studentPlacements/fetchActivePlacement",
+    async ({userId}: {userId: string}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId), where("completed", "==", false), orderBy("endDate")]);
+            const d = { ...docs as { [key: string]: StudentPlacementData } };
+            return d[Object.keys(d)[0]] || undefined;
+
+        } catch (error) {
+            console.log(error)
+            return undefined
+        }
+    }
+)
+
+export const activePlacementSlice = createSlice({
+    name: "activePlacement",
+    initialState,
+
+    reducers: {
+        setActivePlacement: (state, action) => {
+            state.values = action.payload
+        },
+
+        editActivePlacement: (state, action) => {
+            state.values = {...state.values, ...action.payload}
+        }
+     
+    },
+
+    extraReducers(builder) {
+        builder
+        .addCase(fetchActivePlacement.fulfilled, (state, action) => {
+           state.values = action.payload
+           state.status = "success"
+        })
+
+        .addCase(fetchActivePlacement.pending, (state) => {
+            state.status = "loading"
+         })
+
+         .addCase(fetchActivePlacement.rejected, (state) => {
+            state.status = "error"
+         })
+
+    },
+
+})
+
+
+export const {setActivePlacement, editActivePlacement} = activePlacementSlice.actions
+
 export default activePlacementSlice.reducer;

package/src/features/placements/studentPlacements/completedStudentPlacementsSlice.ts

@@ -1,98 +1,98 @@
-import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { PlacementState } from "../types";
-import { StudentPlacementData } from "../../../typeDefinitions";
-
-const initialState: PlacementState = {
-    status: "",
-    lastPlacement: undefined,
-    values: {}
-}
-
-
-  export const updateCompletedStudentPlacement = createAsyncThunk(
-    "completedStudentPlacements/updateStudentPlacement",
-    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.update(["placements", placementId], attributes);
-            return {attributes, placementId}
-            
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-
-  export const deleteCompletedStudentPlacement = createAsyncThunk(
-    "completedStudentPlacements/deleteStudentPlacement",
-    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.delete(["placements", placementId]);
-            return placementId
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-  
-
-
-export const completedStudentPlacementsSlice = createSlice({
-    name: "completedStudentPlacements",
-    initialState,
-
-    reducers: {
-        setCompletedStudentPlacements: (state, action) => {
-            state.values = action.payload
-        },
-
-        setCompletedStatus: (state, action) => {
-            state.status = action.payload
-        },
-
-        addCompletedStudentPlacements: (state, action) => {
-            state.values = {...state.values, ...action.payload}
-        },
-
-        setCompletedIsDraft: (state, action) => {
-            const {placementId, draft} = action.payload
-            state.values[placementId].draft = draft
-        },
-
-        addCompletedStudentPlacement: (state, action) => {
-            const {placement, placementId} = action.payload
-            const newPlacements = {...state.values};
-            newPlacements[placementId] = placement;
-            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
-        },
-
-        setLastCompletedPlacement: (state, action) => {
-            state.lastPlacement = action.payload
-        }
-    },
-
-    
-    extraReducers(builder){
-        builder
-        .addCase(updateCompletedStudentPlacement.fulfilled, (state, action) => {
-            const {attributes, placementId} = action.payload
-            if (!placementId) return
-            state.values[placementId] = {...state.values[placementId], ...attributes};
-        })
-
-
-        .addCase(deleteCompletedStudentPlacement.fulfilled, (state, action) => {
-            const placementIdToDelete = action.payload;
-            const newPlacements = { ...state, values: { ...state.values } };
-            delete newPlacements.values[placementIdToDelete];
-            return newPlacements;
-        })
-    }
-})  
-
-
-export const {addCompletedStudentPlacements, addCompletedStudentPlacement, setCompletedStudentPlacements, setLastCompletedPlacement, setCompletedStatus, setCompletedIsDraft} = completedStudentPlacementsSlice.actions
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { PlacementState } from "../types";
+import { StudentPlacementData } from "../../../typeDefinitions";
+
+const initialState: PlacementState = {
+    status: "",
+    lastPlacement: undefined,
+    values: {}
+}
+
+
+  export const updateCompletedStudentPlacement = createAsyncThunk(
+    "completedStudentPlacements/updateStudentPlacement",
+    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.update(["placements", placementId], attributes);
+            return {attributes, placementId}
+            
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+
+  export const deleteCompletedStudentPlacement = createAsyncThunk(
+    "completedStudentPlacements/deleteStudentPlacement",
+    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.delete(["placements", placementId]);
+            return placementId
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+  
+
+
+export const completedStudentPlacementsSlice = createSlice({
+    name: "completedStudentPlacements",
+    initialState,
+
+    reducers: {
+        setCompletedStudentPlacements: (state, action) => {
+            state.values = action.payload
+        },
+
+        setCompletedStatus: (state, action) => {
+            state.status = action.payload
+        },
+
+        addCompletedStudentPlacements: (state, action) => {
+            state.values = {...state.values, ...action.payload}
+        },
+
+        setCompletedIsDraft: (state, action) => {
+            const {placementId, draft} = action.payload
+            state.values[placementId].draft = draft
+        },
+
+        addCompletedStudentPlacement: (state, action) => {
+            const {placement, placementId} = action.payload
+            const newPlacements = {...state.values};
+            newPlacements[placementId] = placement;
+            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
+        },
+
+        setLastCompletedPlacement: (state, action) => {
+            state.lastPlacement = action.payload
+        }
+    },
+
+    
+    extraReducers(builder){
+        builder
+        .addCase(updateCompletedStudentPlacement.fulfilled, (state, action) => {
+            const {attributes, placementId} = action.payload
+            if (!placementId) return
+            state.values[placementId] = {...state.values[placementId], ...attributes};
+        })
+
+
+        .addCase(deleteCompletedStudentPlacement.fulfilled, (state, action) => {
+            const placementIdToDelete = action.payload;
+            const newPlacements = { ...state, values: { ...state.values } };
+            delete newPlacements.values[placementIdToDelete];
+            return newPlacements;
+        })
+    }
+})  
+
+
+export const {addCompletedStudentPlacements, addCompletedStudentPlacement, setCompletedStudentPlacements, setLastCompletedPlacement, setCompletedStatus, setCompletedIsDraft} = completedStudentPlacementsSlice.actions
+
 export default completedStudentPlacementsSlice.reducer;

package/src/features/placements/studentPlacements/upcomingStudentPlacementsSlice.ts

@@ -1,109 +1,109 @@
-import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { PlacementState } from "../types";
-import { StudentPlacementData } from "../../../typeDefinitions";
-
-
-export interface UpcomingPlacementState extends PlacementState {
-    upcoming?: StudentPlacementData;
-}
-
-const initialState: UpcomingPlacementState = {
-    status: "",
-    lastPlacement: undefined,
-    upcoming: undefined,
-    values: {}
-}
-
-
-  export const updateUpcomingStudentPlacement = createAsyncThunk(
-    "upcomingStudentPlacements/updateStudentPlacement",
-    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.update(["placements", placementId], attributes);
-            return {attributes, placementId}
-            
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-
-  export const deleteUpcomingStudentPlacement = createAsyncThunk(
-    "upcomingStudentPlacements/deleteStudentPlacement",
-    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
-        const firebaseQuery = new FirebaseQuery();
-        try {
-            await firebaseQuery.delete(["placements", placementId]);
-            return placementId
-            
-        } catch(error) {
-            return rejectWithValue(error);
-        }
-    }
-  );
-  
-
-
-export const upcomingStudentsPlacementsSlice = createSlice({
-    name: "upcomingStudentsPlacements",
-    initialState,
-
-    reducers: {
-        setUpcomingStudentPlacements: (state, action) => {
-            state.values = action.payload
-        },
-
-        setUpcomingStatus: (state, action) => {
-            state.status = action.payload
-        },
-
-        setUpcoming: (state, action) => {
-            state.upcoming = action.payload
-        },
-
-        setUpcomingIsDraft: (state, action) => {
-            const {placementId, draft} = action.payload
-            state.values[placementId].draft = draft
-        },
-
-        addUpcomingStudentPlacements: (state, action) => {
-            state.values = {...state.values, ...action.payload}
-        },
-
-        addUpcomingStudentPlacement: (state, action) => {
-            const {placement, placementId} = action.payload
-            const newPlacements = {...state.values};
-            newPlacements[placementId] = placement;
-            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
-        },
-
-        setLastUpcomingPlacement: (state, action) => {
-            state.lastPlacement = action.payload
-        }
-    },
-
-    
-    extraReducers(builder){
-        builder
-        .addCase(updateUpcomingStudentPlacement.fulfilled, (state, action) => {
-            const {attributes, placementId} = action.payload
-            if (!placementId) return
-            state.values[placementId] = {...state.values[placementId], ...attributes};
-        })
-
-
-        .addCase(deleteUpcomingStudentPlacement.fulfilled, (state, action) => {
-            const placementIdToDelete = action.payload;
-            const newPlacements = { ...state, values: { ...state.values } };
-            delete newPlacements.values[placementIdToDelete];
-            return newPlacements;
-        })
-    }
-})  
-
-
-export const {addUpcomingStudentPlacements, addUpcomingStudentPlacement, setUpcomingStudentPlacements, setLastUpcomingPlacement, setUpcoming, setUpcomingStatus, setUpcomingIsDraft} = upcomingStudentsPlacementsSlice.actions
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { PlacementState } from "../types";
+import { StudentPlacementData } from "../../../typeDefinitions";
+
+
+export interface UpcomingPlacementState extends PlacementState {
+    upcoming?: StudentPlacementData;
+}
+
+const initialState: UpcomingPlacementState = {
+    status: "",
+    lastPlacement: undefined,
+    upcoming: undefined,
+    values: {}
+}
+
+
+  export const updateUpcomingStudentPlacement = createAsyncThunk(
+    "upcomingStudentPlacements/updateStudentPlacement",
+    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.update(["placements", placementId], attributes);
+            return {attributes, placementId}
+            
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+
+  export const deleteUpcomingStudentPlacement = createAsyncThunk(
+    "upcomingStudentPlacements/deleteStudentPlacement",
+    async ({placementId}:{placementId: string}, { rejectWithValue}) => {
+        const firebaseQuery = new FirebaseQuery();
+        try {
+            await firebaseQuery.delete(["placements", placementId]);
+            return placementId
+            
+        } catch(error) {
+            return rejectWithValue(error);
+        }
+    }
+  );
+  
+
+
+export const upcomingStudentsPlacementsSlice = createSlice({
+    name: "upcomingStudentsPlacements",
+    initialState,
+
+    reducers: {
+        setUpcomingStudentPlacements: (state, action) => {
+            state.values = action.payload
+        },
+
+        setUpcomingStatus: (state, action) => {
+            state.status = action.payload
+        },
+
+        setUpcoming: (state, action) => {
+            state.upcoming = action.payload
+        },
+
+        setUpcomingIsDraft: (state, action) => {
+            const {placementId, draft} = action.payload
+            state.values[placementId].draft = draft
+        },
+
+        addUpcomingStudentPlacements: (state, action) => {
+            state.values = {...state.values, ...action.payload}
+        },
+
+        addUpcomingStudentPlacement: (state, action) => {
+            const {placement, placementId} = action.payload
+            const newPlacements = {...state.values};
+            newPlacements[placementId] = placement;
+            state.values = Object.fromEntries(Object.entries(newPlacements).sort(([, a], [, b]) => b.startDate > a.endDate ? 1 : -1));
+        },
+
+        setLastUpcomingPlacement: (state, action) => {
+            state.lastPlacement = action.payload
+        }
+    },
+
+    
+    extraReducers(builder){
+        builder
+        .addCase(updateUpcomingStudentPlacement.fulfilled, (state, action) => {
+            const {attributes, placementId} = action.payload
+            if (!placementId) return
+            state.values[placementId] = {...state.values[placementId], ...attributes};
+        })
+
+
+        .addCase(deleteUpcomingStudentPlacement.fulfilled, (state, action) => {
+            const placementIdToDelete = action.payload;
+            const newPlacements = { ...state, values: { ...state.values } };
+            delete newPlacements.values[placementIdToDelete];
+            return newPlacements;
+        })
+    }
+})  
+
+
+export const {addUpcomingStudentPlacements, addUpcomingStudentPlacement, setUpcomingStudentPlacements, setLastUpcomingPlacement, setUpcoming, setUpcomingStatus, setUpcomingIsDraft} = upcomingStudentsPlacementsSlice.actions
+
 export default upcomingStudentsPlacementsSlice.reducer;

package/src/features/placements/studentPlacements/useStudentPlacements.tsx

@@ -1,9 +1,9 @@
-import { QueryConstraint } from "firebase/firestore";
-import { useStudentPlacementList } from "../../../hooks";
-import { UserData } from "../../../typeDefinitions";
-
-export function useStudentPlacements({user, uid, queryConstraint}: {user: UserData, uid?: string, queryConstraint?: QueryConstraint[]}){ 
-    const {placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset} = useStudentPlacementList({...{user: user as UserData, uid: uid || user?.id, queryConstraint}})
-
-    return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, resetPlacements: reset}});
-}
+import { QueryConstraint } from "firebase/firestore";
+import { useStudentPlacementList } from "../../../hooks";
+import { UserData } from "../../../typeDefinitions";
+
+export function useStudentPlacements({user, uid, queryConstraint}: {user: UserData, uid?: string, queryConstraint?: QueryConstraint[]}){ 
+    const {placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset} = useStudentPlacementList({...{user: user as UserData, uid: uid || user?.id, queryConstraint}})
+
+    return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, resetPlacements: reset}});
+}

package/src/features/placements/types.ts

@@ -1,11 +1,11 @@
-
-import { DocumentData, QueryDocumentSnapshot } from "firebase/firestore"
-import { StudentPlacementData } from "../../typeDefinitions"
-
-export type PlacementState = {
-    status: string
-    lastPlacement: QueryDocumentSnapshot<DocumentData> | undefined,
-    values: {
-        [key: string]: StudentPlacementData
-    }
+
+import { DocumentData, QueryDocumentSnapshot } from "firebase/firestore"
+import { StudentPlacementData } from "../../typeDefinitions"
+
+export type PlacementState = {
+    status: string
+    lastPlacement: QueryDocumentSnapshot<DocumentData> | undefined,
+    values: {
+        [key: string]: StudentPlacementData
+    }
 }