placementt-core 1.400.644 → 1.400.646
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { QueryConstraint } from "firebase/firestore";
|
|
2
2
|
import { SetStateAction } from "react";
|
|
3
|
-
import { InstituteData, PlacementListing, ProviderData, UserData } from "../typeDefinitions";
|
|
3
|
+
import { InstituteData, PlacementListing, Products, ProviderData, UserData } from "../typeDefinitions";
|
|
4
4
|
export declare const getStaffRolesForStudent: (studentFields: string[], product: string, userObject: UserData) => Promise<{}>;
|
|
5
|
-
export declare const searchUsers: ({ userType, name, user, oId, lim, constraints }: {
|
|
5
|
+
export declare const searchUsers: ({ userType, name, product, user, oId, lim, constraints }: {
|
|
6
6
|
userType: "Staff" | "Students";
|
|
7
7
|
oId?: string;
|
|
8
8
|
name: string;
|
|
9
9
|
user: UserData;
|
|
10
|
+
product?: Products;
|
|
10
11
|
lim?: any;
|
|
11
12
|
constraints?: QueryConstraint[];
|
|
12
13
|
}) => Promise<{
|
|
@@ -25,7 +25,7 @@ const getStaffRolesForStudent = async (studentFields, product, userObject) => {
|
|
|
25
25
|
return { ...roleWithFilters, ...roleWithStudent };
|
|
26
26
|
};
|
|
27
27
|
exports.getStaffRolesForStudent = getStaffRolesForStudent;
|
|
28
|
-
const searchUsers = async ({ userType, name, user, oId, lim = 5, constraints = [] }) => {
|
|
28
|
+
const searchUsers = async ({ userType, name, product, user, oId, lim = 5, constraints = [] }) => {
|
|
29
29
|
if (name.length < 3) {
|
|
30
30
|
return {};
|
|
31
31
|
}
|
|
@@ -33,14 +33,14 @@ const searchUsers = async ({ userType, name, user, oId, lim = 5, constraints = [
|
|
|
33
33
|
const sortedNameList = (0, util_1.sortByReverseStringLength)(name.split(" "));
|
|
34
34
|
const unfilteredUsersByForename = await firebaseQuery.getDocsWhere("users", [(0, firestore_1.where)("userType", "==", userType),
|
|
35
35
|
(0, firestore_1.where)("oId", "==", oId || user.oId),
|
|
36
|
-
(0, firestore_1.where)("product", "==", user.product),
|
|
36
|
+
(0, firestore_1.where)("product", "==", product || user.product),
|
|
37
37
|
(0, firestore_1.where)("status", "==", "active"),
|
|
38
38
|
...constraints,
|
|
39
39
|
(0, firestore_1.where)("details.forename", ">=", sortedNameList[0]),
|
|
40
40
|
(0, firestore_1.where)("details.forename", "<=", sortedNameList[0] + "\uf8ff"),
|
|
41
41
|
(0, firestore_1.limit)(lim)]);
|
|
42
42
|
const unfilteredUsersBySurname = await firebaseQuery.getDocsWhere("users", [(0, firestore_1.where)("userType", "==", userType),
|
|
43
|
-
(0, firestore_1.where)("product", "==", user.product),
|
|
43
|
+
(0, firestore_1.where)("product", "==", product || user.product),
|
|
44
44
|
(0, firestore_1.where)("oId", "==", oId || user.oId),
|
|
45
45
|
(0, firestore_1.where)("status", "==", "active"),
|
|
46
46
|
...constraints,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readDatabase.js","sourceRoot":"","sources":["../../src/firebase/readDatabase.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAsG;AACtG,8CAAgF;AAGhF,qDAA6C;AAC7C,oEAA4C;AAC5C,iCAA4D;AAE5D,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAC;AAEnC,MAAM,uBAAuB,GAAG,KAAK,EAAE,aAAsB,EAAE,OAAc,EAAE,UAAmB,EAAE,EAAE;IACzG,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,YAAY,CACpD,CAAC,YAAY,CAAC,EACd,IAAA,iBAAK,EAAC,kBAAkB,EAAE,gBAAgB,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAEhE,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACpE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACxD,OAAO,GAAG,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,YAAY,CAC1C,CAAC,YAAY,CAAC,EACd,IAAA,iBAAK,EAAC,kBAAkB,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAgC,CAAC,CAAC,CAA4B,CAAC;QAE7H,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,GAAG,GAAG,EAAC,GAAG,GAAG,EAAE,GAAG,KAAK,EAAC,CAAC;QAC7B,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAExB,OAAO,EAAC,GAAG,eAAe,EAAE,GAAG,eAAe,EAAC,CAAC;AACpD,CAAC,CAAC;AApBW,QAAA,uBAAuB,2BAoBlC;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,GAAC,CAAC,EAAE,WAAW,GAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"readDatabase.js","sourceRoot":"","sources":["../../src/firebase/readDatabase.tsx"],"names":[],"mappings":";;;;;;AAAA,kDAAsG;AACtG,8CAAgF;AAGhF,qDAA6C;AAC7C,oEAA4C;AAC5C,iCAA4D;AAE5D,MAAM,aAAa,GAAG,IAAI,uBAAa,EAAE,CAAC;AAEnC,MAAM,uBAAuB,GAAG,KAAK,EAAE,aAAsB,EAAE,OAAc,EAAE,UAAmB,EAAE,EAAE;IACzG,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,YAAY,CACpD,CAAC,YAAY,CAAC,EACd,IAAA,iBAAK,EAAC,kBAAkB,EAAE,gBAAgB,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IAEhE,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACpE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACxD,OAAO,GAAG,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,YAAY,CAC1C,CAAC,YAAY,CAAC,EACd,IAAA,iBAAK,EAAC,kBAAkB,KAAK,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,KAAgC,CAAC,CAAC,CAA4B,CAAC;QAE7H,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,GAAG,GAAG,EAAC,GAAG,GAAG,EAAE,GAAG,KAAK,EAAC,CAAC;QAC7B,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAExB,OAAO,EAAC,GAAG,eAAe,EAAE,GAAG,eAAe,EAAC,CAAC;AACpD,CAAC,CAAC;AApBW,QAAA,uBAAuB,2BAoBlC;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,GAAC,CAAC,EAAE,WAAW,GAAC,EAAE,EAAmI,EAAE,EAAE;IAC/N,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACd,CAAC;IACD,kGAAkG;IAClG,MAAM,cAAc,GAAG,IAAA,gCAAyB,EAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAElE,MAAM,yBAAyB,GAAG,MAAM,aAAa,CAAC,YAAY,CAC9D,OAAO,EACP,CAAC,IAAA,iBAAK,EAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC9B,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;QACnC,IAAA,iBAAK,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/C,IAAA,iBAAK,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC/B,GAAG,WAAW;QACd,IAAA,iBAAK,EAAC,kBAAkB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;QAClD,IAAA,iBAAK,EAAC,kBAAkB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAE,QAAQ,CAAC;QAC5D,IAAA,iBAAK,EAAC,GAAG,CAAC,CAAC,CAA6B,CAAC;IACjD,MAAM,wBAAwB,GAAG,MAAM,aAAa,CAAC,YAAY,CAC7D,OAAO,EACP,CAAC,IAAA,iBAAK,EAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC9B,IAAA,iBAAK,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC;QAC/C,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;QACnC,IAAA,iBAAK,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC;QAC/B,GAAG,WAAW;QACd,IAAA,iBAAK,EAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;QACjD,IAAA,iBAAK,EAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAE,QAAQ,CAAC;QAC3D,IAAA,iBAAK,EAAC,GAAG,CAAC,CAAC,CAA6B,CAAC;IAEjD,IAAI,WAAW,GAAG,EAAC,GAAG,yBAAyB,EAAE,GAAG,wBAAwB,EAAC,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,CAAC;IACvB,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5B,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpK,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACvB,CAAC,CAAC;AAnCW,QAAA,WAAW,eAmCtB;AAOK,MAAM,OAAO,GAAG,KAAK,EAAE,GAAW,EAAE,QAA6B,EAAE,EAAE;IACxE,IAAI,OAAO,GAAe,EAAE,CAAC;IAC7B,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,WAAW,GAAG,EAAE,CAAC;IAErB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE7B,aAAa,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,IAAc,EAAE,EAAE;QACpE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YAC/C,gFAAgF;YAChF,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,MAAK,IAAI,CAAC,SAAS,EAAE,CAAC;gBACxC,SAAS,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAA0B,CAAC;QAE5C,sCAAsC;QACtC,uFAAuF;QACvF,mDAAmD;QACnD,oGAAoG;QACpG,yGAAyG;QACzG,QAAQ;QACR,IAAI;QACJ,IAAI,CAAC,WAAW,GAAG,WAA6B,CAAC;QAEjD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,gFAAgF;YAChF,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,IAAI,CAAC,MAAM,EAAE,CAAC;gBAClC,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1E,CAAC;QACL,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAwB,CAAC;QAE3C,OAAO,GAAG,IAAI,CAAC;QACf,QAAQ,CAAC,IAAI,CAAC,CAAA;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAtCW,QAAA,OAAO,WAsClB;AAEK,MAAM,gBAAgB,GAAG,KAAK,EAAE,IAAc,EAAE,QAA6B,EAAE,EAAE;IACpF,MAAM,mBAAmB,GAAG,CAAC,aAAgD,EAAE,IAAiB,EAAE,EAAE;QAChG,QAAQ,CAAC,CAAC,GAAsC,EAAE,EAAE;YAChD,MAAM,yBAAyB,GAAG;gBAC9B,GAAG,GAAG;gBACN,GAAG,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC;qBACxB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAC,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,CACrD;aACJ,CAAC;YACF,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC7I,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAIF,MAAM,iBAAiB,GAAc,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,MAAM,CAAC,EAAE,IAAA,iBAAK,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB;IACtI,aAAa,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9E,mBAAmB,CAAC,CAAuC,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,kBAA6B,CAAC;QAElC,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;YAC7B,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,EAAE,CAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,MAAM,CAAC,EAAE,IAAA,iBAAK,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB;QAChI,CAAC;aAAM,CAAC;YACJ,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,EAAE,CAAC,IAAA,iBAAK,EAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAA,mBAAO,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB;QAC3L,CAAC;QACD,aAAa,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YAChF,mBAAmB,CAAC,CAAuC,EAAE,KAAK,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACP,CAAC;IACD,kIAAkI;IAElI,gFAAgF;AACpF,CAAC,CAAC;AApCW,QAAA,gBAAgB,oBAoC3B;AAGK,MAAM,QAAQ,GAAG,KAAK,EAAE,IAAqB,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,MAAM,IAAA,iBAAO,EAAC,IAAA,aAAG,EAAC,wBAAO,EAAE,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE9D,OAAO,CAAC,MAAM,CAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAA6B,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC3F,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAc,EAAC,IAAI,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAC,CAAC;QAG1C,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAwC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC,CAAC;AAbW,QAAA,QAAQ,YAanB;AAGK,MAAM,cAAc,GAAG,KAAK,EAAE,IAAqB,EAAE,KAAe,EAAE,EAAE;IAC3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,GAAuB,EAAE,IAAY,EAAE,EAAE;QACpF,MAAM,QAAQ,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9G,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAElC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAuB,EAAE,EAAE;YACjC,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACf,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,EAAU,EAAE,QAA8B,EAAE,YAAY,GAAC,IAAI,EAAE,EAAE;IAC/F,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,GAAI,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAmB,CAAC;QACjG,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAkB,CAAC,CAAC,CAAC,SAAS,CAAA;QAC/J,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,aAAa,CAAC,gBAAgB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,IAAc,EAAE,EAAE;QACnE,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,CAAkB,CAAC,CAAC,CAAC,SAAS,CAAA;QAC/J,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,OAAO;AACX,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB;AAEF;;;;;;;IAOI;AAEG,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAW,EAAE,QAA4B,EAAE,EAAE;IAChF,OAAO,aAAa,CAAC,gBAAgB,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;AACzE,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,eAAe,GAAG,KAAK,EAAE,IAAc,EAAE,MAAkD,EAAE,EAAE;IACxG,OAAO,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;AAC5E,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEK,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAC,CAAC,GAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAC,KAAK,EAA+E,EAAE,EAAE;IAClJ,OAAO,MAAM,aAAa,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAA,gBAAS,EAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACxK,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,MAAM,uBAAuB,GAAG,KAAK,EAAE,WAAkB,EAAE,WAAkB,EAAE,EAAE;IACpF,MAAM,CAAC,GAAG,IAAA,iBAAK,EAAC,IAAA,sBAAU,EAAC,mBAAE,EAAE,YAAY,CAAC,EAAE,IAAA,iBAAK,EAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,IAAA,iBAAK,EAAC,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IAEtH,OAAO,CAAC,MAAM,IAAA,mBAAO,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACnC,CAAC,CAAC;AAJW,QAAA,uBAAuB,2BAIlC;AAEK,MAAM,wBAAwB,GAAG,KAAK,EAAE,iBAA2B,EAAE,EAAE;IAC1E,MAAM,UAAU,GAAI,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;QAC5E,OAAO,CAAC,SAAS,EAAE,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAqB,CAAC,CAAC;IAChI,CAAC,CAAC,CAAuC,CAAC;IAE1C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAiC,CAAC;AACtF,CAAC,CAAA;AANY,QAAA,wBAAwB,4BAMpC"}
|
package/lib/typeDefinitions.d.ts
CHANGED
|
@@ -808,8 +808,8 @@ export type InstituteData = {
|
|
|
808
808
|
};
|
|
809
809
|
privacyPolicy: Timestamp;
|
|
810
810
|
demo?: boolean;
|
|
811
|
-
onboarding?: boolean;
|
|
812
811
|
emailTemplates?: {
|
|
812
|
+
onboarding: boolean;
|
|
813
813
|
employerDatabaseInvite?: string;
|
|
814
814
|
};
|
|
815
815
|
acceptingParents?: boolean;
|
|
@@ -2253,6 +2253,7 @@ export type Communication = {
|
|
|
2253
2253
|
completedOn?: string;
|
|
2254
2254
|
linkedCommId?: string;
|
|
2255
2255
|
parentCommId?: string;
|
|
2256
|
+
uid?: string;
|
|
2256
2257
|
};
|
|
2257
2258
|
export type CommSchemaItem = {
|
|
2258
2259
|
name: string;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {collection, getDocs, limit, orderBy, query, QueryConstraint, where} from "firebase/firestore";
|
|
2
2
|
import {getDownloadURL, listAll, ref, StorageReference} from "firebase/storage";
|
|
3
3
|
import {SetStateAction} from "react";
|
|
4
|
-
import {BillingPackage, CohortData, InstituteData, NotificationObject, PlacementListing, ProviderData, UserData, UserGroupData} from "../typeDefinitions";
|
|
4
|
+
import {BillingPackage, CohortData, InstituteData, NotificationObject, PlacementListing, Products, ProviderData, UserData, UserGroupData} from "../typeDefinitions";
|
|
5
5
|
import {db, storage} from "./firebaseConfig";
|
|
6
6
|
import FirebaseQuery from "./firebaseQuery";
|
|
7
7
|
import {pathToArr, sortByReverseStringLength} from "./util";
|
|
@@ -30,7 +30,7 @@ export const getStaffRolesForStudent = async (studentFields:string[], product:st
|
|
|
30
30
|
return {...roleWithFilters, ...roleWithStudent};
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
-
export const searchUsers = async ({userType, name, user, oId, lim=5, constraints=[]}:{userType:"Staff"|"Students", oId?: string, name:string, user:UserData, lim?, constraints?:QueryConstraint[]}) => {
|
|
33
|
+
export const searchUsers = async ({userType, name, product, user, oId, lim=5, constraints=[]}:{userType:"Staff"|"Students", oId?: string, name:string, user:UserData, product?: Products, lim?, constraints?:QueryConstraint[]}) => {
|
|
34
34
|
if (name.length < 3) {
|
|
35
35
|
return {};
|
|
36
36
|
}
|
|
@@ -41,7 +41,7 @@ export const searchUsers = async ({userType, name, user, oId, lim=5, constraints
|
|
|
41
41
|
"users",
|
|
42
42
|
[where("userType", "==", userType),
|
|
43
43
|
where("oId", "==", oId || user.oId),
|
|
44
|
-
where("product", "==", user.product),
|
|
44
|
+
where("product", "==", product || user.product),
|
|
45
45
|
where("status", "==", "active"),
|
|
46
46
|
...constraints,
|
|
47
47
|
where("details.forename", ">=", sortedNameList[0]),
|
|
@@ -50,7 +50,7 @@ export const searchUsers = async ({userType, name, user, oId, lim=5, constraints
|
|
|
50
50
|
const unfilteredUsersBySurname = await firebaseQuery.getDocsWhere(
|
|
51
51
|
"users",
|
|
52
52
|
[where("userType", "==", userType),
|
|
53
|
-
where("product", "==", user.product),
|
|
53
|
+
where("product", "==", product || user.product),
|
|
54
54
|
where("oId", "==", oId || user.oId),
|
|
55
55
|
where("status", "==", "active"),
|
|
56
56
|
...constraints,
|
package/src/typeDefinitions.ts
CHANGED
|
@@ -809,8 +809,8 @@ export type InstituteData = {
|
|
|
809
809
|
},
|
|
810
810
|
privacyPolicy: Timestamp,
|
|
811
811
|
demo?: boolean,
|
|
812
|
-
onboarding?: boolean,
|
|
813
812
|
emailTemplates?: {
|
|
813
|
+
onboarding: boolean,
|
|
814
814
|
employerDatabaseInvite?: string,
|
|
815
815
|
},
|
|
816
816
|
acceptingParents?: boolean,
|
|
@@ -2217,6 +2217,7 @@ export type Communication = {
|
|
|
2217
2217
|
completedOn?: string // ISO date
|
|
2218
2218
|
linkedCommId?: string,
|
|
2219
2219
|
parentCommId?: string,
|
|
2220
|
+
uid?: string
|
|
2220
2221
|
};
|
|
2221
2222
|
|
|
2222
2223
|
export type CommSchemaItem = {
|