placementt-core 1.20.197 → 11.0.533

package/src/features/dropdown/useDropdown.tsx

@@ -1,53 +1,53 @@
-import {useState, useEffect} from "react"
-import FirebaseQuery from "../../firebase/firebaseQuery";
-import {countryList} from "../../constants"; 
-
-
-export interface DropdownProps {
-    defaultValue?: string;
-    required?: boolean;
-    id?: string;
-    disabled?: boolean,
-    onValueChange?: (value: string) => void;
-    value?: string;
-    mode?: "default" | "modal"
-    name?: string;
-    search?: boolean | false
-    data?: {key?: number, label: string, value: string}[]
-    path?: string;
-    label: string;
-    size?: "small" | "medium" | "large";
-    style?: any;
-    errorText?: string;
-  }
-  
-export function useDropdown(props: DropdownProps){
-    const [value, setValue] = useState<string>(
-        props.defaultValue || props?.name === "country" ? countryList[0] : ""
-    );
-
-    const firebaseQuery = new FirebaseQuery();
-
-    const [data, setData] = useState<{key?: number, label: string, value: string}[]|undefined>(props.data);
-
-    useEffect(() => {
-        // Get items from database if none are given as children.
-        if (!props.path) {
-            return;
-        }
-
-        firebaseQuery.getDocsWhere(props.path).then((collectionResult: any) => {
-            const items = Object.keys(collectionResult).map((key) => {
-                const item = collectionResult[key];
-                return {
-                    label: item.name,
-                    value: key,
-                };
-            });
-            setData(items);
-            setValue(props.defaultValue || "");
-        });
-    }, []);
-
-    return ({...{value, setValue, data, setData}})
+import {useState, useEffect} from "react"
+import FirebaseQuery from "../../firebase/firebaseQuery";
+import {countryList} from "../../constants"; 
+
+
+export interface DropdownProps {
+    defaultValue?: string;
+    required?: boolean;
+    id?: string;
+    disabled?: boolean,
+    onValueChange?: (value: string) => void;
+    value?: string;
+    mode?: "default" | "modal"
+    name?: string;
+    search?: boolean | false
+    data?: {key?: number, label: string, value: string}[]
+    path?: string;
+    label: string;
+    size?: "small" | "medium" | "large";
+    style?: any;
+    errorText?: string;
+  }
+  
+export function useDropdown(props: DropdownProps){
+    const [value, setValue] = useState<string>(
+        props.defaultValue || props?.name === "country" ? countryList[0] : ""
+    );
+
+    const firebaseQuery = new FirebaseQuery();
+
+    const [data, setData] = useState<{key?: number, label: string, value: string}[]|undefined>(props.data);
+
+    useEffect(() => {
+        // Get items from database if none are given as children.
+        if (!props.path) {
+            return;
+        }
+
+        firebaseQuery.getDocsWhere(props.path).then((collectionResult: any) => {
+            const items = Object.keys(collectionResult).map((key) => {
+                const item = collectionResult[key];
+                return {
+                    label: item.name,
+                    value: key,
+                };
+            });
+            setData(items);
+            setValue(props.defaultValue || "");
+        });
+    }, []);
+
+    return ({...{value, setValue, data, setData}})
 }

package/src/features/global/downtime/useDowntime.tsx

@@ -1,19 +1,20 @@
-import {where} from "firebase/firestore";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import {useEffect, useState} from "react";
-import { UserData } from "../../../typeDefinitions";
-
-export function useDowntime({user}: {user: UserData}){
-    const [downtime, setDowntime] = useState<{title: string, body: string}|false>();
-    const firebaseQuery = new FirebaseQuery();
-
-    useEffect(() => {
-        firebaseQuery.getDocsWhere("downtime", [where("products", "array-contains", user?.product), where("active", "==", true)]).then((docs) => {
-            const downtimeDocs = { ...docs as {[key: string]: {title: string, body: string}}};
-            setDowntime(downtimeDocs[Object.keys(downtimeDocs)[0]] || false);
-        })
-    }, [user])
-
-    return ({...{downtime, setDowntime}})
-    
+import {where} from "firebase/firestore";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import {useEffect, useState} from "react";
+import { UserData } from "../../../typeDefinitions";
+
+export function useDowntime({user}: {user: UserData}){
+    const [downtime, setDowntime] = useState<{title: string, body: string}|false>();
+    const firebaseQuery = new FirebaseQuery();
+
+    useEffect(() => {
+        if (!user?.product) return;
+        firebaseQuery.getDocsWhere("downtime", [where("products", "array-contains", user?.product), where("active", "==", true)]).then((docs) => {
+            const downtimeDocs = { ...docs as {[key: string]: {title: string, body: string}}};
+            setDowntime(downtimeDocs[Object.keys(downtimeDocs)[0]] || false);
+        })
+    }, [user])
+
+    return ({...{downtime, setDowntime}})
+    
 }

package/src/features/global/users/useUserFunctions.tsx

@@ -1,133 +1,133 @@
-import { useState, useEffect } from 'react'
-import { dateToString, convertDate } from '../../../firebase/util'
-import { executeCallable } from '../../../firebase/firebase'
-import { UserData, StudentPlacementData } from '../../../typeDefinitions'
-import { arrayUnion } from 'firebase/firestore'
-import FirebaseQuery from '../../../firebase/firebaseQuery'
-
-export function useUserFunctions({user}: {user: UserData}) {
-const firebaseQuery = new FirebaseQuery()
-
-  const update = async (attributes: any) => {
-    if (!user) return
-    firebaseQuery.update(["users", user.id], {attributes})
-   // dispatch(updateUser({userId: user.id, attributes: attributes}))
-  }
-
-  return ({...{update}});
-}
-
-export function useActivationCode({user}: {user: UserData}){
-  const [code, setCode] = useState<string>("");
-  const [newCodeSent,  setNewCodeSent] = useState<boolean|undefined>(false);
-  const [timer, setTimer] = useState<number>(30);
-  const firebaseQuery = new FirebaseQuery()
-
-  useEffect(() => {
-      setInterval(() => {
-          setTimer((t) => t > 0 ? t-1 : t);
-      }, 1000)
-  }, [])
-
-  const submitCode = async (skip?: boolean) => {
-      if (!user) return;
-
-      if (skip || (parseInt(code) === user.activationCode)) {
-          firebaseQuery.update(["users", user.id], {activated: dateToString(new Date()), status: "active"})
-          //dispatch(updateUser({userId: user.id, attributes: {activated: dateToString(new Date()), status: "active"}}))
-      }
-  }
-
-  const resendCode = async () => {
-      setNewCodeSent(undefined)
-      await executeCallable("registration-resendCode", {});
-      setNewCodeSent(true);
-      setTimer(30)
-  }
-
-  return ({...{code, setCode, submitCode, resendCode, newCodeSent, timer}})
-  
-}
-
-export function useContactProviderConsent({user}: {user: UserData}){
-    const [active, setActive] = useState<boolean>(false);
-    const firebaseQuery = new FirebaseQuery()
-
-    const consent = async (consent: boolean) => {
-        if (!user) return
-
-        try {
-            await firebaseQuery.update(["users", user.id], {
-            contactProviderConsent: consent,
-                 contactProviderConsenDate: (new Date()).toISOString()
-            })
-            // dispatch(updateUser({userId: user.id, attributes: {
-            //     contactProviderConsent: consent, 
-            //     contactProviderConsentDate: (new Date()).toISOString()}
-            // }))
-
-            setActive(false);
-        }
-
-        catch(error) {
-            console.log(error)
-        }
-    }
-    return ({...{active, setActive, consent}})
-    
-}
-
-
-export function useGuidance({user}: {user: UserData}){
-    const firebaseQuery = new FirebaseQuery()
-
-  const updateUserTutorials = () => {
-      if (!user) return
-      try {
-          firebaseQuery.update(["users", user.id], {dismissedTutorials: arrayUnion("studentIntro")});
-         // dispatch(updateUser({userId: user.id, attributes: {dismissedTutorials: arrayUnion("studentIntro")}}))
-      }
-
-      catch (error) {
-          console.log(error)
-      }
-  }
-
-  return ({...{updateUserTutorials}})
-}
-
-export function useStudents(user: UserData | null){
-    const firebaseQuery = new FirebaseQuery()
-
-  useEffect(() => {
-      if (!user?.id) return;
-    firebaseQuery.update(["users", user?.id], {lastAccessed: convertDate(new Date(), "dbstring")})
-      //dispatch(updateUser({userId: user.id, attributes: {lastAccessed: convertDate(new Date(), "dbstring")}}))
-
-      if (!user?.phone && user?.status === "inactive") {
-         firebaseQuery.update(["users", user.id], {status: "active"})
-         // dispatch(updateUser({userId: user.id, attributes: {status: "active"}}))
-      };
-  }, []);
-
-
-}
-
-export function useStudentData(placement: StudentPlacementData, student: UserData){
-  const firebaseQuery = new FirebaseQuery();
-  const [studentData, setStudentData] = useState<UserData | undefined>();
-
-  
-  useEffect(() => {
-      const getStudentData = async () => {
-          return student ? student : (await firebaseQuery.getDocData(["users", placement.uid])) as UserData;
-      };
-      getStudentData().then((data) => {
-          setStudentData(data);
-      });
-  }, []);
-
-
-return ({...{studentData}})
-
+import { useState, useEffect } from 'react'
+import { dateToString, convertDate } from '../../../firebase/util'
+import { executeCallable } from '../../../firebase/firebase'
+import { UserData, StudentPlacementData } from '../../../typeDefinitions'
+import { arrayUnion } from 'firebase/firestore'
+import FirebaseQuery from '../../../firebase/firebaseQuery'
+
+export function useUserFunctions({user}: {user: UserData}) {
+const firebaseQuery = new FirebaseQuery()
+
+  const update = async (attributes: any) => {
+    if (!user) return
+    firebaseQuery.update(["users", user.id], {attributes})
+   // dispatch(updateUser({userId: user.id, attributes: attributes}))
+  }
+
+  return ({...{update}});
+}
+
+export function useActivationCode({user}: {user: UserData}){
+  const [code, setCode] = useState<string>("");
+  const [newCodeSent,  setNewCodeSent] = useState<boolean|undefined>(false);
+  const [timer, setTimer] = useState<number>(30);
+  const firebaseQuery = new FirebaseQuery()
+
+  useEffect(() => {
+      setInterval(() => {
+          setTimer((t) => t > 0 ? t-1 : t);
+      }, 1000)
+  }, [])
+
+  const submitCode = async (skip?: boolean) => {
+      if (!user) return;
+
+      if (skip || (parseInt(code) === user.activationCode)) {
+          firebaseQuery.update(["users", user.id], {activated: dateToString(new Date()), status: "active"})
+          //dispatch(updateUser({userId: user.id, attributes: {activated: dateToString(new Date()), status: "active"}}))
+      }
+  }
+
+  const resendCode = async () => {
+      setNewCodeSent(undefined)
+      await executeCallable("registration-resendCode", {});
+      setNewCodeSent(true);
+      setTimer(30)
+  }
+
+  return ({...{code, setCode, submitCode, resendCode, newCodeSent, timer}})
+  
+}
+
+export function useContactProviderConsent({user}: {user: UserData}){
+    const [active, setActive] = useState<boolean>(false);
+    const firebaseQuery = new FirebaseQuery()
+
+    const consent = async (consent: boolean) => {
+        if (!user) return
+
+        try {
+            await firebaseQuery.update(["users", user.id], {
+            contactProviderConsent: consent,
+                 contactProviderConsenDate: (new Date()).toISOString()
+            })
+            // dispatch(updateUser({userId: user.id, attributes: {
+            //     contactProviderConsent: consent, 
+            //     contactProviderConsentDate: (new Date()).toISOString()}
+            // }))
+
+            setActive(false);
+        }
+
+        catch(error) {
+            console.log(error)
+        }
+    }
+    return ({...{active, setActive, consent}})
+    
+}
+
+
+export function useGuidance({user}: {user: UserData}){
+    const firebaseQuery = new FirebaseQuery()
+
+  const updateUserTutorials = () => {
+      if (!user) return
+      try {
+          firebaseQuery.update(["users", user.id], {dismissedTutorials: arrayUnion("studentIntro")});
+         // dispatch(updateUser({userId: user.id, attributes: {dismissedTutorials: arrayUnion("studentIntro")}}))
+      }
+
+      catch (error) {
+          console.log(error)
+      }
+  }
+
+  return ({...{updateUserTutorials}})
+}
+
+export function useStudents(user: UserData | null){
+    const firebaseQuery = new FirebaseQuery()
+
+  useEffect(() => {
+      if (!user?.id) return;
+    firebaseQuery.update(["users", user?.id], {lastAccessed: convertDate(new Date(), "dbstring")})
+      //dispatch(updateUser({userId: user.id, attributes: {lastAccessed: convertDate(new Date(), "dbstring")}}))
+
+      if (!user?.phone && user?.status === "inactive") {
+         firebaseQuery.update(["users", user.id], {status: "active"})
+         // dispatch(updateUser({userId: user.id, attributes: {status: "active"}}))
+      };
+  }, []);
+
+
+}
+
+export function useStudentData(placement: StudentPlacementData, student: UserData){
+  const firebaseQuery = new FirebaseQuery();
+  const [studentData, setStudentData] = useState<UserData | undefined>();
+
+  
+  useEffect(() => {
+      const getStudentData = async () => {
+          return student ? student : (await firebaseQuery.getDocData(["users", placement.uid])) as UserData;
+      };
+      getStudentData().then((data) => {
+          setStudentData(data);
+      });
+  }, []);
+
+
+return ({...{studentData}})
+
 }

package/src/features/jobs/jobsSlice.ts

@@ -1,66 +1,66 @@
-import {createSlice} from "@reduxjs/toolkit";
-
-export type Job = {
-   id: string
-   description: string
-   finished: string
-   logs: Array<string>
-   oId: string
-   outputMsg: string
-   product: string
-   started: string
-   status: string
-   title: string
-   updated: string
-   viewedBy: Array<string>
-  };
-
-
-type InitialJobState = {
-    values: {
-        [jobId: string]: Job
-    }
-}
-
-const initialState: InitialJobState = {
-    values: {},
-};
-
-
-export const JobsSlice = createSlice({
-    name: "jobs",
-    initialState,
-
-    reducers: {
-        setJobs: (state, action) => {
-            state.values = action.payload;
-        },
-
-        addJob: (state, action) => {
-            const {job, jobId} = action.payload;
-            console.log("j", job);
-
-            const newJobs = {...state.values};
-            newJobs[jobId] = job;
-
-            state.values = Object.fromEntries(Object.entries(newJobs).sort(([, a], [, b]) => b.started > a.started ? 1 : -1));
-        },
-
-        setMarkRead: (state, action) => {
-            console.log("Mark read", action.payload.data);
-            state.values[action.payload.jobId].viewedBy.push(action.payload.userId);
-        },
-
-        setJobStatus: (state, action) => {
-            state.values[action.payload.jobId].status = action.payload.status;
-            state.values[action.payload.jobId].updated = (new Date()).toISOString();
-        },
-
-
-    },
-
-});
-
-export const {setJobs, addJob, setMarkRead, setJobStatus} = JobsSlice.actions;
-
+import {createSlice} from "@reduxjs/toolkit";
+
+export type Job = {
+   id: string
+   description: string
+   finished: string
+   logs: Array<string>
+   oId: string
+   outputMsg: string
+   product: string
+   started: string
+   status: string
+   title: string
+   updated: string
+   viewedBy: Array<string>
+  };
+
+
+type InitialJobState = {
+    values: {
+        [jobId: string]: Job
+    }
+}
+
+const initialState: InitialJobState = {
+    values: {},
+};
+
+
+export const JobsSlice = createSlice({
+    name: "jobs",
+    initialState,
+
+    reducers: {
+        setJobs: (state, action) => {
+            state.values = action.payload;
+        },
+
+        addJob: (state, action) => {
+            const {job, jobId} = action.payload;
+            console.log("j", job);
+
+            const newJobs = {...state.values};
+            newJobs[jobId] = job;
+
+            state.values = Object.fromEntries(Object.entries(newJobs).sort(([, a], [, b]) => b.started > a.started ? 1 : -1));
+        },
+
+        setMarkRead: (state, action) => {
+            console.log("Mark read", action.payload.data);
+            state.values[action.payload.jobId].viewedBy.push(action.payload.userId);
+        },
+
+        setJobStatus: (state, action) => {
+            state.values[action.payload.jobId].status = action.payload.status;
+            state.values[action.payload.jobId].updated = (new Date()).toISOString();
+        },
+
+
+    },
+
+});
+
+export const {setJobs, addJob, setMarkRead, setJobStatus} = JobsSlice.actions;
+
 export default JobsSlice.reducer;

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

@@ -1,64 +1,64 @@
-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
-        }
-    },
-
-    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} = activePlacementSlice.actions
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import FirebaseQuery from "../../../firebase/firebaseQuery";
+import { StudentPlacementData } from "../../../typeDefinitions"
+import { 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)]);
+            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
+        }
+    },
+
+    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} = activePlacementSlice.actions
+
 export default activePlacementSlice.reducer;