placementt-core 1.20.217 → 11.0.803

package/lib/hooks.js

@@ -137,7 +137,6 @@ function useOldInstitutePlacementList({ id, user, cohort, queryConstraint, ql =
     const [startPlacementAfter, setStartPlacementAfter] = (0, react_1.useState)(); // uid, pId
     const algoliaClient = (0, algoliasearch_1.default)(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
     const placementsIndex = algoliaClient.initIndex("placements");
-    const usersIndex = algoliaClient.initIndex("users");
     (0, react_1.useEffect)(() => {
         if (user.product !== "institutes" || user.userType !== "Staff") {
             setOId(undefined);
@@ -153,30 +152,6 @@ function useOldInstitutePlacementList({ id, user, cohort, queryConstraint, ql =
         }
         const searchPlacements = async () => {
             let placementsFound = {};
-            let userSearchString = `userType:Students AND status:active AND oId:${user.oId} AND product:${user.product}`;
-            if (cohort) {
-                userSearchString = userSearchString + ` AND cohort:${cohort}`;
-            }
-            if (user.product === "institutes" && user.userType === "Staff") {
-                const searchStudentHits = await usersIndex.search(query, {
-                    filters: userSearchString
-                });
-                if (searchStudentHits) {
-                    console.log("FOUND", searchStudentHits.hits.length, "students");
-                    await Promise.all(searchStudentHits.hits.map(async (hit) => {
-                        console.log("STUDENT", hit.objectID);
-                        const constraints = [...(cohort ? [(0, firestore_1.where)("cohort", "==", cohort)] : [])];
-                        if (inProgress !== undefined) {
-                            constraints.push(inProgress ? (0, firestore_1.where)("inProgress", "==", true) : (0, firestore_1.where)("completed", "==", true));
-                        }
-                        const fPlacements = await (0, readDatabase_1.getPlacementsWhere)({ w: constraints, uid: hit.objectID, oId: hit.oId });
-                        console.log("PLACEMENTS", fPlacements);
-                        Object.entries(fPlacements).forEach(([k, v]) => {
-                            placementsFound[k] = { ...v, student: hit };
-                        });
-                    }));
-                }
-            }
             let placementSearchString = `oId:${user.oId} AND ` + (inProgress !== undefined ? (inProgress ? "inProgress:true" : "completed:true") : "");
             if (cohort) {
                 placementSearchString = placementSearchString + ` AND cohort:${cohort}`;
@@ -267,24 +242,59 @@ function useOldInstitutePlacementList({ id, user, cohort, queryConstraint, ql =
     };
     return ({ ...{ placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset, changeQueryConstraints } });
 }
-function useNewInstitutePlacementList({ id, user, view, cohort, queryConstraints, ql = DEFAULTQUERYLIMIT, inProgress }) {
+function useNewInstitutePlacementList({ id, user, filters, view, cohort, queryConstraints, ql = DEFAULTQUERYLIMIT, inProgress }) {
     const [query, setQuery] = (0, react_1.useState)();
+    const sorts = {
+        ["Student Forename - Asc"]: {
+            value: "studentForename",
+            direction: "asc",
+        },
+        ["Student Forename - Desc"]: {
+            value: "studentForename",
+            direction: "desc",
+        },
+        ["Student Surname - Asc"]: {
+            value: "studentSurname",
+            direction: "asc",
+        },
+        ["Student Surname - Desc"]: {
+            value: "studentSurname",
+            direction: "desc",
+        },
+        ["Student Email - Asc"]: {
+            value: "studentEmail",
+            direction: "asc",
+        },
+        ["Student Email - Desc"]: {
+            value: "studentEmaile",
+            direction: "desc",
+        },
+        ["Provider email - Asc"]: {
+            value: "providerEmail",
+            direction: "asc",
+        },
+        ["Provider email - Desc"]: {
+            value: "providerEmail",
+            direction: "desc",
+        }
+    };
     const additionalProcessing = async (k, placement) => {
-        const student = await (0, readDatabase_1.getUserById)(placement.uid).catch(() => false);
-        if (!student)
-            return;
         if (user.viewStudents === "some") {
             if (!(user.studentFilter && user.studentFilterValues))
                 return false;
+            const student = await (0, readDatabase_1.getUserById)(placement.uid).catch(() => false);
+            if (!student)
+                return;
             if (!user.studentFilterValues.includes(student.details[user.studentFilter])) {
                 return false;
             }
         }
-        return { ...placement, student: student, id: k };
+        return { ...placement, id: k };
     };
-    const { tableData, pageUp, pageDown, setFilters, page, loading, updateSearch } = useDataViewerPaginator({ view, queryLimit: ql, data: query, additionalEntryProcessing: additionalProcessing, onSearch: async (s) => await algoliaPlacementSearch(user, s, cohort, inProgress) });
+    const { tableData, pageUp, pageDown, setFilters, page, setView, loading, updateSearch, updateSort, sort } = useDataViewerPaginator({ view, filters, sorts, queryLimit: ql, data: query, additionalEntryProcessing: additionalProcessing, onSearch: async (s, sort, page, filters, limit) => await algoliaPlacementSearch(user, s, sort, page, filters, limit, cohort, inProgress) });
     (0, react_1.useEffect)(() => {
         var _a;
+        // Sets the query of for the DataViewerPaginator
         if (user.product !== "institutes" || user.userType !== "Staff") {
             setQuery(undefined);
             return;
@@ -302,56 +312,56 @@ function useNewInstitutePlacementList({ id, user, view, cohort, queryConstraints
         }
         setQuery(undefined);
     }, [user, queryConstraints, cohort]);
-    return { tableData, page, loading, updateSearch, setFilters, pageUp, pageDown };
+    return { tableData, page, loading, updateSearch, setFilters, setView, pageUp, pageDown, sorts, updateSort, sort };
 }
-const algoliaPlacementSearch = async (user, query, cohort, inProgress) => {
+const algoliaPlacementSearch = async (user, query, sort, page, filters, limit, cohort, inProgress) => {
     const algoliaClient = (0, algoliasearch_1.default)(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
-    const placementsIndex = algoliaClient.initIndex("placements");
-    const usersIndex = algoliaClient.initIndex("users");
-    let placementsFound = {};
-    let userSearchString = `userType:Students AND status:active AND oId:${user.oId} AND product:${user.product}`;
-    if (cohort) {
-        userSearchString = userSearchString + ` AND cohort:${cohort}`;
-    }
-    if (user.product === "institutes" && user.userType === "Staff") {
-        const searchStudentHits = await usersIndex.search(query, {
-            filters: userSearchString
-        });
-        if (searchStudentHits) {
-            console.log("FOUND", searchStudentHits.hits.length, "students");
-            await Promise.all(searchStudentHits.hits.map(async (hit) => {
-                console.log("STUDENT", hit.objectID);
-                const constraints = [...(cohort ? [(0, firestore_1.where)("cohort", "==", cohort)] : [])];
-                if (inProgress !== undefined) {
-                    constraints.push(inProgress ? (0, firestore_1.where)("inProgress", "==", true) : (0, firestore_1.where)("completed", "==", true));
-                }
-                const fPlacements = await (0, readDatabase_1.getPlacementsWhere)({ w: constraints, uid: hit.objectID, oId: hit.oId });
-                console.log("PLACEMENTS", fPlacements);
-                Object.entries(fPlacements).forEach(([k, v]) => {
-                    placementsFound[k] = { ...v, student: hit };
-                });
-            }));
-        }
-    }
+    const placementsIndex = algoliaClient.initIndex(sort ? Object.values(sort[1]).join("_") : "placements");
+    // const usersIndex = algoliaClient.initIndex("users");
+    // let userSearchString = `userType:Students AND status:active AND oId:${user.oId} AND product:${user.product}`
+    // if (cohort) {
+    //     userSearchString = userSearchString + ` AND cohort:${cohort}`;
+    // }
+    // if (user.product === "institutes" && user.userType === "Staff") {
+    //     const searchStudentHits = await usersIndex.search<UserData>(query, {
+    //         filters: userSearchString,
+    //         hitsPerPage: limit,
+    //         page: page
+    //     });
+    //     if (searchStudentHits) {
+    //         console.log("FOUND", searchStudentHits.hits.length, "students");
+    //         await Promise.all(searchStudentHits.hits.map(async (hit) => {
+    //             console.log("STUDENT", hit.objectID);
+    //             const constraints = [...(cohort ? [where("cohort", "==", cohort)] : [])]
+    //             if (inProgress !== undefined) {
+    //                 constraints.push(inProgress ? where("inProgress", "==", true) : where("completed", "==", true));
+    //             }
+    //             const fPlacements = await getPlacementsWhere({w: constraints, uid: hit.objectID, oId: hit.oId}) as {[key: string]: StudentPlacementData};
+    //             console.log("PLACEMENTS", fPlacements)
+    //             Object.entries(fPlacements).forEach(([k, v]) => {
+    //                 placementsFound[k] = {...v, student: hit};
+    //             })
+    //         }))
+    //     }
+    // }
     let placementSearchString = `oId:${user.oId} AND ` + (inProgress !== undefined ? (inProgress ? "inProgress:true" : "completed:true") : "");
     if (cohort) {
         placementSearchString = placementSearchString + ` AND cohort:${cohort}`;
     }
-    const searchPlacementHits = await placementsIndex.search(query, {
-        filters: placementSearchString
+    filters && Object.entries(filters).filter(([, filter]) => filter.value).map(([id, filter]) => {
+        placementSearchString = placementSearchString + ` AND ${id}:${filter.value}`;
     });
+    const options = {
+        filters: placementSearchString,
+        hitsPerPage: limit,
+        page: page ? page - 1 : undefined,
+    };
+    const searchPlacementHits = await placementsIndex.search(query || "", options);
+    console.log(searchPlacementHits.hits);
     const i = (searchPlacementHits ? (await Promise.all(searchPlacementHits.hits.map(async (hit) => {
-        const student = hit.uid === user.id ?
-            user : (await (0, readDatabase_1.getUserById)(hit.uid)
-            .catch(() => false));
-        if (!student)
-            return;
-        console.log("STUDENNT", hit.objectID, student);
-        const finalData = { ...hit, student: student };
-        return [hit.objectID, finalData];
+        return [hit.objectID, hit];
     }))) : []).filter((e) => e !== undefined);
-    console.log("FOUND", i.length, "placement");
-    return { ...Object.fromEntries(i), ...placementsFound };
+    return Object.fromEntries(i);
 };
 function useVeryOldInstitutePlacementList({ user, cohort, queryConstraint, ql = DEFAULTQUERYLIMIT }) {
     const [loadMoreIcon, setLoadMoreIcon] = (0, react_1.useState)(true);
@@ -842,7 +852,7 @@ function usePlacementListingPaginator({ data, user }) {
         setQueryAnchor({ ...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0] });
         const finalData = Object.fromEntries(await Promise.all(Object.entries(itemList).map(async ([k, v]) => {
             const placement = await firebaseQuery.getDocData(["placementListings", v.placementId || ""]);
-            const address = await firebaseQuery.getDocData(["addresses", placement.addressId || ""]);
+            const address = await firebaseQuery.getDocData(["addresses", placement.addressId || ""]).catch(() => ({ ["address-line1"]: "Unknown address" }));
             const provider = await firebaseQuery.getDocData(["providers", placement.providerId || ""]).catch(() => ({ name: "Unknown" }));
             const status = provider.name !== "Unknown" ? getPlacementStatus(provider, placement, v) : "Deleted";
             return [k, { ...address, ...provider, ...placement, email: placement.providerEmail, status: status, savedPlacement: v }];
@@ -880,10 +890,11 @@ function usePlacementListingPaginator({ data, user }) {
     }, [page]);
     return ({ ...{ tableData, setPage, setFilters, page } });
 }
-function useCohortUserPaginator({ user, cohort, data, search, userType }) {
+function useCohortUserPaginator({ user, cohort, data, search, userType, sort }) {
     const [tableData, setTableData] = (0, react_1.useState)({});
-    const [queryAnchor, setQueryAnchor] = (0, react_1.useState)({ startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0 });
+    const [queryAnchor, setQueryAnchor] = (0, react_1.useState)({ startDoc: undefined, endDoc: undefined, startQueryPos: 0, endQueryPos: 0 });
     const [filters, setFilters] = (0, react_1.useState)();
+    const [sortResultsBy, setSortResultsBy] = (0, react_1.useState)(sort);
     const [prevEntryIds, setPrevEntryIds] = (0, react_1.useState)({});
     const [page, setPage] = (0, react_1.useState)([1, 0]);
     const [dataListenerUnsubscribe, setDataListenerUnsubscribe] = (0, react_1.useState)();
@@ -891,6 +902,14 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
     const [prevSearch, setPrevSearch] = (0, react_1.useState)();
     const algoliaClient = (0, algoliasearch_1.default)(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
     const usersIndex = algoliaClient.initIndex("users");
+    const sortOptions = {
+        ["Forename - Asc"]: ["details.forename", "asc"],
+        ["Forename - Desc"]: ["details.forename", "desc"],
+        ["Surname - Asc"]: ["details.surname", "desc"],
+        ["Surname - Desc"]: ["details.surname", "asc"],
+        ["Email - Asc"]: ["email", "asc"],
+        ["Email - Desc"]: ["email", "desc"],
+    };
     (0, react_1.useEffect)(() => {
         var _a;
         if (user.userType !== "Staff") {
@@ -976,10 +995,15 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
             });
             console.log("Add order by", addOrderBy);
             if (addOrderBy) {
-                fConstraints.push((0, firestore_1.orderBy)((0, firestore_1.documentId)()));
+                if (sortResultsBy) {
+                    fConstraints.push((0, firestore_1.orderBy)(sortOptions[sortResultsBy][0], sortOptions[sortResultsBy][1]));
+                }
+                else {
+                    fConstraints.push((0, firestore_1.orderBy)((0, firestore_1.documentId)()));
+                }
             }
             if (page[0] > page[1] && !cursorDirection) { // Going up
-                currentQueryAnchor.endKey && fConstraints.push((0, firestore_1.startAfter)(currentQueryAnchor.endKey));
+                currentQueryAnchor.endDoc && fConstraints.push((0, firestore_1.startAfter)(currentQueryAnchor.endDoc));
                 fConstraints.push((0, firestore_1.limit)(10));
                 if (!loadMoreFromQuery) {
                     currentQueryAnchor = { ...currentQueryAnchor, startQueryPos: currentQueryAnchor.endQueryPos };
@@ -990,11 +1014,11 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
                     currentQueryAnchor = { ...currentQueryAnchor, endQueryPos: currentQueryAnchor.startQueryPos };
                 }
                 fConstraints.push((0, firestore_1.limitToLast)(10));
-                if (currentQueryAnchor.startKey) {
-                    currentQueryAnchor.startKey && fConstraints.push((0, firestore_1.endBefore)(currentQueryAnchor.startKey));
+                if (currentQueryAnchor.startDoc) {
+                    currentQueryAnchor.startDoc && fConstraints.push((0, firestore_1.endBefore)(currentQueryAnchor.startDoc));
                 }
                 else {
-                    currentQueryAnchor.startKey && fConstraints.push((0, firestore_1.endAt)(currentQueryAnchor.startKey));
+                    currentQueryAnchor.startDoc && fConstraints.push((0, firestore_1.endAt)(currentQueryAnchor.startDoc));
                 }
             }
             else {
@@ -1033,9 +1057,7 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
                 console.log("Removing ", doc.id, ": E=", prevEntries[doc.id], ", G=", position);
                 return;
             }
-            const item = doc.data();
-            item.id = doc.id;
-            queryResults[doc.id] = item;
+            queryResults[doc.id] = doc;
             index = index + 1;
             if (prevEntries[doc.id])
                 return;
@@ -1057,7 +1079,7 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
             }
         }
         if (Object.keys(itemList).length < 10 && queryData.size === 10) {
-            return getDataFromQuery(itemList, { ...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0] }, undefined, prevEntries, true);
+            return getDataFromQuery(itemList, { ...currentQueryAnchor, startDoc: Object.values(itemList)[0], endDoc: Object.values(itemList).slice(-1)[0] }, undefined, prevEntries, true);
         }
         if (queryData.size === 0 &&
             Object.keys(itemList).length === 0 &&
@@ -1083,8 +1105,8 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
             setDataListenerUnsubscribe(() => itemUpdateSnapshot);
         };
         listenForUpdates();
-        setQueryAnchor({ ...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0] });
-        setTableData(itemList);
+        setQueryAnchor({ ...currentQueryAnchor, startDoc: Object.values(itemList)[0], endDoc: Object.values(itemList).slice(-1)[0] });
+        setTableData(Object.fromEntries(Object.entries(itemList).map(([k, v]) => [k, { id: k, ...v.data() }])));
     };
     const searchUsers = async () => {
         if (!search)
@@ -1121,10 +1143,10 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
         setPage([1, 0]);
         console.log("Set page");
         setTableData({});
-        setQueryAnchor({ startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0 });
+        setQueryAnchor({ startQueryPos: 0, endQueryPos: 0 });
         setPrevEntryIds({});
         dataListenerUnsubscribe && dataListenerUnsubscribe();
-    }, [filters, search]);
+    }, [filters, search, sortResultsBy]);
     // Fetch new data when queries or page change
     (0, react_1.useEffect)(() => {
         if (search) {
@@ -1135,7 +1157,8 @@ function useCohortUserPaginator({ user, cohort, data, search, userType }) {
         getDataFromQuery();
         dataListenerUnsubscribe && dataListenerUnsubscribe();
     }, [page, queries, prevSearch]);
-    return ({ ...{ tableData, setPage, page, setFilters } });
+    const setSort = (s) => setSortResultsBy(s);
+    return ({ ...{ tableData, setPage, page, setFilters, setSort, sortOptions: Object.keys(sortOptions), sortBy: sortResultsBy } });
 }
 function useAdmissionsPaginator({ data }) {
     const [tableData, setTableData] = (0, react_1.useState)({});
@@ -3203,15 +3226,17 @@ function useLoadApplications({ user, applicationType, listingId, queryConstraint
     };
     return { applications, type, setType, onScrollBottom, loading, changeQueryConstraints };
 }
-function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, formatItems, snapshot, filters: initialFilters, onSearch, data }) {
+function useDataViewerPaginator({ view: initialView, sorts, queryLimit, additionalEntryProcessing, formatItems, snapshot, filters: initialFilters, onSearch, data }) {
     const [tableData, setTableData] = (0, react_1.useState)(Array.isArray(data) ? Object.fromEntries(Object.entries(data).slice(0, queryLimit)) : {});
     const [page, setPage] = (0, react_1.useState)([1, 0]);
+    const [view, setView] = (0, react_1.useState)(initialView);
     const [filters, setFilters] = (0, react_1.useState)(initialFilters);
     const [queryAnchor, setQueryAnchor] = (0, react_1.useState)({ startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0 });
     const [prevEntryIds, setPrevEntryIds] = (0, react_1.useState)({});
     const [dataListenerUnsubscribe, setDataListenerUnsubscribe] = (0, react_1.useState)();
     const [loading, setLoading] = (0, react_1.useState)(true);
     const [searchString, setSearchString] = (0, react_1.useState)();
+    const [sort, setSort] = (0, react_1.useState)();
     const processedData = async (k, v) => additionalEntryProcessing ? await additionalEntryProcessing(k, v) : v;
     const setTableDataFromDefinedData = async () => {
         if (!data || Array.isArray(data))
@@ -3254,22 +3279,34 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
         }
     };
     const getDataFromQuery = async (itemList = {}, currentQueryAnchor = queryAnchor, cursorDirection, prevEntries = prevEntryIds, loadMoreFromQuery = false) => {
-        console.log("Fetching data");
+        if (!filters)
+            return;
         setLoading(true);
         if (!Array.isArray(data)) {
             setTableDataFromDefinedData();
             return;
         }
-        if (onSearch && searchString) {
+        if (!queryLimit)
+            throw new Error("Firestore queries must have a limit defined.");
+        if (onSearch && (searchString || sort)) {
             if (typeof onSearch === "boolean")
                 throw new Error("When using Firestore queries, an onSearch function should be passed to retrieve data externally. Additional processing is however completed in this hook.");
-            const data = await onSearch(searchString, page[0], queryLimit);
+            const data = await onSearch(searchString, sort, page[0], filters, queryLimit);
             const dataWithAdditionalProcessing = await Promise.all(Object.entries(data).map(async ([k, v]) => [k, await processedData(k, v)]));
-            setTableData(Object.fromEntries(dataWithAdditionalProcessing));
+            setTableData((old) => {
+                if (view === "table") {
+                    return { ...Object.fromEntries(dataWithAdditionalProcessing) };
+                }
+                return { ...old, ...Object.fromEntries(dataWithAdditionalProcessing) };
+            });
+            if (dataWithAdditionalProcessing.length < queryLimit) {
+                setLoading("loaded");
+            }
+            else {
+                setLoading(false);
+            }
             return;
         }
-        if (!queryLimit)
-            throw new Error("Firestore queries must have a limit defined.");
         let cursorPos;
         if (page[0] > page[1]) {
             cursorPos = currentQueryAnchor.endQueryPos;
@@ -3278,7 +3315,6 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
             cursorPos = currentQueryAnchor.startQueryPos;
         }
         const querySchema = data[cursorPos];
-        console.log("QUERY SCHEMA", querySchema);
         const createQuery = (queryData) => {
             const constraints = [];
             queryData.where && queryData.where.forEach((w) => {
@@ -3318,7 +3354,6 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
             }
             return constraints;
         };
-        console.log("Building query");
         const constraints = createQuery(querySchema);
         const q = (0, firestore_1.query)((0, firestore_1.collection)(firebaseConfig_1.db, ...querySchema.path), ...(constraints));
         console.log("Fetching docs", constraints);
@@ -3378,23 +3413,19 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
             else {
                 itemList = { ...itemList, ...queryResults };
             }
-            console.log("ITEM LIST", itemList);
             // Updating state with the new data and query anchors
             setPrevEntryIds(prevEntries);
             if (querySnapshot.size < queryLimit && Object.keys(itemList).length < queryLimit) {
                 // If we have ran out of entries, increase or decrease the index.
                 if (page[0] > page[1] && cursorPos + 1 < data.length) {
-                    console.log("Increase query index");
                     return getDataFromQuery(itemList, { ...currentQueryAnchor, endQueryPos: currentQueryAnchor.endQueryPos + 1 }, "increase", prevEntries);
                 }
                 else if (page[0] < page[1] && cursorPos > 0) {
-                    console.log("Decrease query index");
                     return getDataFromQuery(itemList, { ...currentQueryAnchor, startQueryPos: currentQueryAnchor.startQueryPos - 1 }, "decrease", prevEntries);
                 }
             }
             if (Object.keys(itemList).length < queryLimit && querySnapshot.size === queryLimit) {
                 console.log("Shorter than ten");
-                // if(loadMoreFromQuery){return}
                 return getDataFromQuery(itemList, { ...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0] }, undefined, prevEntries, true);
             }
             if (querySnapshot.size === 0 &&
@@ -3411,7 +3442,6 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
             else {
                 setLoading(false);
             }
-            console.log({ ...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0] });
             setQueryAnchor({ ...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0] });
             setTableData((old) => {
                 if (view === "table") {
@@ -3422,6 +3452,7 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
         }
     };
     const reset = () => {
+        console.log("Resetting after filters?");
         setPage([1, 0]);
         setTableData({});
         setQueryAnchor({ startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0 });
@@ -3430,17 +3461,17 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
         setDataListenerUnsubscribe(undefined);
     };
     (0, react_1.useEffect)(() => {
+        console.log("Filters updates", filters);
         if (!filters)
             return;
-        console.log("Data filters", filters);
+        console.log("Resetting cus filters");
         reset();
     }, [filters]);
     (0, react_1.useEffect)(() => {
         reset();
-    }, [view, searchString, data]);
+    }, [view, searchString, data, sort]);
     // Fetch new data when queries or page change
     (0, react_1.useEffect)(() => {
-        console.log("SETTING TABLE DATA");
         getDataFromQuery();
         dataListenerUnsubscribe && Object.values(dataListenerUnsubscribe).map((u) => u());
     }, [page]);
@@ -3450,7 +3481,12 @@ function useDataViewerPaginator({ view, queryLimit, additionalEntryProcessing, f
     const pageDown = () => {
         setPage((p) => ([p[0] - 1, p[0]]));
     };
-    return ({ ...{ tableData, pageUp, pageDown, setFilters, page: page[0], loading, updateSearch: setSearchString } });
+    const updateSort = (sortLabel) => {
+        if (!sorts || !sorts[sortLabel])
+            return;
+        setSort([sortLabel, sorts[sortLabel]]);
+    };
+    return ({ ...{ tableData, pageUp, pageDown, setFilters, page: page[0], sorts, loading, sort, updateSort: updateSort, setView, updateSearch: setSearchString } });
 }
 ;
 //# sourceMappingURL=hooks.js.map