dce-reactkit 3.9.4-beta-logreviewer.3 → 3.9.4-beta-logreviewer.5

package/dist/cjs/index.js

@@ -3561,6 +3561,8 @@ var ActionType$6;
     ActionType["DecrementPageNumber"] = "decrement-page-number";
     // Set has another page
     ActionType["SetHasAnotherPage"] = "set-has-another-page";
+    // Set the number of pages
+    ActionType["SetNumPages"] = "set-num-pages";
 })(ActionType$6 || (ActionType$6 = {}));
 /**
  * Reducer that executes actions
@@ -3585,7 +3587,7 @@ const reducer$7 = (state, action) => {
             return Object.assign(Object.assign({}, state), { expandedFilterDrawer: undefined });
         }
         case ActionType$6.ResetFilters: {
-            return Object.assign(Object.assign({}, state), { dateFilterState: action.initDateFilterState, contextFilterState: action.initContextFilterState, tagFilterState: action.initTagFilterState, actionErrorFilterState: action.initActionErrorFilterState, advancedFilterState: action.initAdvancedFilterState });
+            return Object.assign(Object.assign({}, state), { dateFilterState: action.initDateFilterState, contextFilterState: action.initContextFilterState, tagFilterState: action.initTagFilterState, actionErrorFilterState: action.initActionErrorFilterState, advancedFilterState: action.initAdvancedFilterState, pageNumber: 1 });
         }
         case ActionType$6.UpdateDateFilterState: {
             return Object.assign(Object.assign({}, state), { dateFilterState: action.dateFilterState });
@@ -3611,6 +3613,9 @@ const reducer$7 = (state, action) => {
         case ActionType$6.SetHasAnotherPage: {
             return Object.assign(Object.assign({}, state), { hasAnotherPage: action.hasAnotherPage });
         }
+        case ActionType$6.SetNumPages: {
+            return Object.assign(Object.assign({}, state), { numPages: action.numPages });
+        }
         default: {
             return state;
         }
@@ -3737,28 +3742,22 @@ const LogReviewer = (props) => {
         advancedFilterState: initAdvancedFilterState,
         pageNumber: 1,
         hasAnotherPage: false,
+        numPages: 1,
     };
     // Initialize state
     const [state, dispatch] = React.useReducer(reducer$7, initialState);
     // Destructure common state
-    const { loading, logs, expandedFilterDrawer, dateFilterState, contextFilterState, tagFilterState, actionErrorFilterState, advancedFilterState, pageNumber, hasAnotherPage, } = state;
+    const { loading, logs, expandedFilterDrawer, dateFilterState, contextFilterState, tagFilterState, actionErrorFilterState, advancedFilterState, pageNumber, hasAnotherPage, numPages, } = state;
     /*------------------------------------------------------------------------*/
     /* ------------------------- Component Functions ------------------------ */
     /*------------------------------------------------------------------------*/
     /**
      * Fetch logs from the server based on current filters
      */
-    const fetchLogs = () => __awaiter(void 0, void 0, void 0, function* () {
+    const fetchLogs = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+        const { filters, pageNum, countDocuments, } = opts;
         dispatch({ type: ActionType$6.StartLoading });
         try {
-            // Prepare filter parameters
-            const filters = {
-                dateFilterState,
-                contextFilterState,
-                tagFilterState,
-                actionErrorFilterState,
-                advancedFilterState,
-            };
             // Send filters to the server
             let fetchedLogs = [];
             // Get logs from server
@@ -3766,8 +3765,9 @@ const LogReviewer = (props) => {
                 path: LOG_REVIEW_GET_LOGS_ROUTE,
                 method: 'GET',
                 params: {
-                    pageNumber,
+                    pageNumber: pageNum,
                     filters,
+                    countDocuments,
                 },
             });
             fetchedLogs = fetchedLogs.concat(response.items);
@@ -3775,6 +3775,12 @@ const LogReviewer = (props) => {
                 type: ActionType$6.SetHasAnotherPage,
                 hasAnotherPage: response.hasAnotherPage,
             });
+            if (countDocuments && response.numPages) {
+                dispatch({
+                    type: ActionType$6.SetNumPages,
+                    numPages: response.numPages,
+                });
+            }
             // Update logs in state
             dispatch({
                 type: ActionType$6.FinishLoading,
@@ -3786,17 +3792,6 @@ const LogReviewer = (props) => {
         }
     });
     /*------------------------------------------------------------------------*/
-    /* ------------------------- Lifecycle Functions ------------------------ */
-    /*------------------------------------------------------------------------*/
-    /**
-     * Fetch logs whenever page number changes
-     */
-    React.useEffect(() => {
-        fetchLogs();
-    }, [
-        pageNumber,
-    ]);
-    /*------------------------------------------------------------------------*/
     /* ------------------------------- Render ------------------------------- */
     /*------------------------------------------------------------------------*/
     /*----------------------------------------*/
@@ -3815,6 +3810,17 @@ const LogReviewer = (props) => {
     /*----------------------------------------*/
     const paginationControls = logs.length > 0 && (React__default["default"].createElement("div", { className: "text-center mt-3" },
         React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary me-2", disabled: pageNumber <= 1, onClick: () => {
+                fetchLogs({
+                    filters: {
+                        dateFilterState,
+                        contextFilterState,
+                        tagFilterState,
+                        actionErrorFilterState,
+                        advancedFilterState,
+                    },
+                    pageNum: pageNumber - 1,
+                    countDocuments: false,
+                });
                 dispatch({
                     type: ActionType$6.DecrementPageNumber,
                 });
@@ -3824,8 +3830,23 @@ const LogReviewer = (props) => {
         React__default["default"].createElement("span", { className: "mx-3" },
             "Page",
             ' ',
-            pageNumber),
+            pageNumber,
+            ' ',
+            "of",
+            ' ',
+            numPages),
         React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary ms-2", disabled: !hasAnotherPage, onClick: () => {
+                fetchLogs({
+                    filters: {
+                        dateFilterState,
+                        contextFilterState,
+                        tagFilterState,
+                        actionErrorFilterState,
+                        advancedFilterState,
+                    },
+                    pageNum: pageNumber + 1,
+                    countDocuments: false,
+                });
                 dispatch({
                     type: ActionType$6.IncrementPageNumber,
                 });
@@ -3880,6 +3901,17 @@ const LogReviewer = (props) => {
                 React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faList, className: "me-2" }),
                 "Advanced"),
             React__default["default"].createElement("button", { type: "button", id: "LogReviewer-reset-filters-button", className: "btn btn-light", "aria-label": "reset filters", onClick: () => {
+                    fetchLogs({
+                        filters: {
+                            dateFilterState: initDateFilterState,
+                            contextFilterState: initContextFilterState,
+                            tagFilterState: initTagFilterState,
+                            actionErrorFilterState: initActionErrorFilterState,
+                            advancedFilterState: initAdvancedFilterState,
+                        },
+                        pageNum: 1,
+                        countDocuments: true,
+                    });
                     dispatch({
                         type: ActionType$6.ResetFilters,
                         initActionErrorFilterState,
@@ -3888,6 +3920,9 @@ const LogReviewer = (props) => {
                         initDateFilterState,
                         initTagFilterState,
                     });
+                    dispatch({
+                        type: ActionType$6.HideFilterDrawer,
+                    });
                 } },
                 React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faTimes }),
                 ' ',
@@ -3896,7 +3931,17 @@ const LogReviewer = (props) => {
                     dispatch({
                         type: ActionType$6.HideFilterDrawer,
                     });
-                    fetchLogs();
+                    fetchLogs({
+                        filters: {
+                            dateFilterState,
+                            contextFilterState,
+                            tagFilterState,
+                            actionErrorFilterState,
+                            advancedFilterState,
+                        },
+                        pageNum: 1,
+                        countDocuments: true,
+                    });
                 } },
                 React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faSearch }),
                 ' ',
@@ -4148,7 +4193,7 @@ const LogReviewer = (props) => {
                         React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user canvas id", value: advancedFilterState.userId, placeholder: "e.g. 104985", onChange: (e) => {
                                 const { value } = e.target;
                                 // Only update if value contains only numbers
-                                if (/^\d+$/.test(value)) {
+                                if (/^\d+$/.test(value) || value === '') {
                                     advancedFilterState.userId = ((e.target.value)
                                         .trim());
                                 }
@@ -13802,14 +13847,15 @@ const initServer = (opts) => {
    * @param filters the filters to apply to the logs
    * @returns {Log[]} list of logs that match the filters
    */
-    opts.app.get(`${LOG_REVIEW_GET_LOGS_ROUTE}`, genRouteHandler({
+    opts.app.get(LOG_REVIEW_GET_LOGS_ROUTE, genRouteHandler({
         paramTypes: {
             pageNumber: ParamType$1.Int,
             filters: ParamType$1.JSON,
+            countDocuments: ParamType$1.Boolean,
         },
         handler: ({ params }) => __awaiter(void 0, void 0, void 0, function* () {
             // Get user info
-            const { pageNumber, userId, isAdmin, filters, } = params;
+            const { pageNumber, userId, isAdmin, filters, countDocuments, } = params;
             const { dateFilterState, contextFilterState, tagFilterState, actionErrorFilterState, advancedFilterState, } = filters;
             // Validate user
             const canReview = yield canReviewLogs(userId, isAdmin);
@@ -13976,6 +14022,10 @@ const initServer = (opts) => {
                 perPage: 50,
                 pageNumber,
             });
+            // Count documents if requested
+            if (countDocuments) {
+                response.numPages = Math.ceil((yield _logCollection.count(query)) / 50);
+            }
             // Return response
             return response;
         }),