dce-reactkit 3.9.4-beta-logreviewer.4 → 3.9.4-beta-logreviewer.6

package/dist/cjs/index.js

@@ -3555,12 +3555,12 @@ var ActionType$6;
     ActionType["UpdateActionErrorFilterState"] = "update-action-error-filter-state";
     // Update the advanced filter state
     ActionType["UpdateAdvancedFilterState"] = "update-advanced-filter-state";
-    // Increment the page number
-    ActionType["IncrementPageNumber"] = "increment-page-number";
-    // Decrement the page number
-    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";
+    // Set page number
+    ActionType["SetPageNumber"] = "set-page-number";
 })(ActionType$6 || (ActionType$6 = {}));
 /**
  * Reducer that executes actions
@@ -3571,10 +3571,10 @@ var ActionType$6;
 const reducer$7 = (state, action) => {
     switch (action.type) {
         case ActionType$6.StartLoading: {
-            return Object.assign(Object.assign({}, state), { loading: true });
+            return Object.assign(Object.assign({}, state), { loading: true, showSpinner: action.filtersChanged });
         }
         case ActionType$6.FinishLoading: {
-            return Object.assign(Object.assign({}, state), { loading: false, logs: action.logs });
+            return Object.assign(Object.assign({}, state), { loading: false, showSpinner: false, logs: action.logs });
         }
         case ActionType$6.ToggleFilterDrawer: {
             return Object.assign(Object.assign({}, state), { expandedFilterDrawer: (state.expandedFilterDrawer === action.filterDrawer
@@ -3585,7 +3585,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, numTimesFiltersReset: state.numTimesFiltersReset + 1 });
+            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 });
@@ -3602,15 +3602,15 @@ const reducer$7 = (state, action) => {
         case ActionType$6.UpdateAdvancedFilterState: {
             return Object.assign(Object.assign({}, state), { advancedFilterState: action.advancedFilterState });
         }
-        case ActionType$6.IncrementPageNumber: {
-            return Object.assign(Object.assign({}, state), { pageNumber: state.pageNumber + 1 });
-        }
-        case ActionType$6.DecrementPageNumber: {
-            return Object.assign(Object.assign({}, state), { pageNumber: state.pageNumber - 1 });
-        }
         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 });
+        }
+        case ActionType$6.SetPageNumber: {
+            return Object.assign(Object.assign({}, state), { pageNumber: action.pageNumber });
+        }
         default: {
             return state;
         }
@@ -3728,6 +3728,7 @@ const LogReviewer = (props) => {
     // Initial state
     const initialState = {
         loading: true,
+        showSpinner: true,
         logs: [],
         expandedFilterDrawer: undefined,
         dateFilterState: initDateFilterState,
@@ -3737,29 +3738,25 @@ const LogReviewer = (props) => {
         advancedFilterState: initAdvancedFilterState,
         pageNumber: 1,
         hasAnotherPage: false,
-        numTimesFiltersReset: 0,
+        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, numTimesFiltersReset, } = state;
+    const { loading, showSpinner, 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* () {
-        dispatch({ type: ActionType$6.StartLoading });
+    const fetchLogs = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+        const { filters, pageNum, filtersChanged, } = opts;
+        dispatch({
+            type: ActionType$6.StartLoading,
+            filtersChanged,
+        });
         try {
-            // Prepare filter parameters
-            const filters = {
-                dateFilterState,
-                contextFilterState,
-                tagFilterState,
-                actionErrorFilterState,
-                advancedFilterState,
-            };
             // Send filters to the server
             let fetchedLogs = [];
             // Get logs from server
@@ -3767,8 +3764,9 @@ const LogReviewer = (props) => {
                 path: LOG_REVIEW_GET_LOGS_ROUTE,
                 method: 'GET',
                 params: {
-                    pageNumber,
+                    pageNumber: pageNum,
                     filters,
+                    countDocuments: filtersChanged,
                 },
             });
             fetchedLogs = fetchedLogs.concat(response.items);
@@ -3776,11 +3774,22 @@ const LogReviewer = (props) => {
                 type: ActionType$6.SetHasAnotherPage,
                 hasAnotherPage: response.hasAnotherPage,
             });
+            if (filtersChanged && response.numPages) {
+                dispatch({
+                    type: ActionType$6.SetNumPages,
+                    numPages: response.numPages,
+                });
+            }
             // Update logs in state
             dispatch({
                 type: ActionType$6.FinishLoading,
                 logs: fetchedLogs,
             });
+            // Update page number
+            dispatch({
+                type: ActionType$6.SetPageNumber,
+                pageNumber: pageNum,
+            });
         }
         catch (err) {
             return showFatalError(err);
@@ -3789,14 +3798,20 @@ const LogReviewer = (props) => {
     /*------------------------------------------------------------------------*/
     /* ------------------------- Lifecycle Functions ------------------------ */
     /*------------------------------------------------------------------------*/
-    /**
-     * Fetch logs whenever page number changes or filters are reset
-     */
+    // Fetch logs on mount
     React.useEffect(() => {
-        fetchLogs();
-    }, [
-        pageNumber, numTimesFiltersReset,
-    ]);
+        fetchLogs({
+            filters: {
+                dateFilterState,
+                contextFilterState,
+                tagFilterState,
+                actionErrorFilterState,
+                advancedFilterState,
+            },
+            pageNum: 1,
+            filtersChanged: true,
+        });
+    }, []);
     /*------------------------------------------------------------------------*/
     /* ------------------------------- Render ------------------------------- */
     /*------------------------------------------------------------------------*/
@@ -3806,7 +3821,7 @@ const LogReviewer = (props) => {
     // Body that will be filled with the contents of the panel
     let body;
     /* ------------- Loading ------------ */
-    if (loading) {
+    if (showSpinner) {
         body = (React__default["default"].createElement("div", { className: "text-center p-5" },
             React__default["default"].createElement(LoadingSpinner, null)));
     }
@@ -3815,9 +3830,17 @@ const LogReviewer = (props) => {
     /* ------------ Pagination -------------- */
     /*----------------------------------------*/
     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: () => {
-                dispatch({
-                    type: ActionType$6.DecrementPageNumber,
+        React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary me-2", disabled: pageNumber <= 1 || loading, onClick: () => {
+                fetchLogs({
+                    filters: {
+                        dateFilterState,
+                        contextFilterState,
+                        tagFilterState,
+                        actionErrorFilterState,
+                        advancedFilterState,
+                    },
+                    pageNum: pageNumber - 1,
+                    filtersChanged: false,
                 });
             } },
             React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faArrowLeft, className: "me-2" }),
@@ -3825,10 +3848,22 @@ const LogReviewer = (props) => {
         React__default["default"].createElement("span", { className: "mx-3" },
             "Page",
             ' ',
-            pageNumber),
-        React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary ms-2", disabled: !hasAnotherPage, onClick: () => {
-                dispatch({
-                    type: ActionType$6.IncrementPageNumber,
+            pageNumber,
+            ' ',
+            "of",
+            ' ',
+            numPages),
+        React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary ms-2", disabled: !hasAnotherPage || loading, onClick: () => {
+                fetchLogs({
+                    filters: {
+                        dateFilterState,
+                        contextFilterState,
+                        tagFilterState,
+                        actionErrorFilterState,
+                        advancedFilterState,
+                    },
+                    pageNum: pageNumber + 1,
+                    filtersChanged: false,
                 });
             } },
             "Next Page",
@@ -3881,6 +3916,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,
+                        filtersChanged: true,
+                    });
                     dispatch({
                         type: ActionType$6.ResetFilters,
                         initActionErrorFilterState,
@@ -3900,7 +3946,17 @@ const LogReviewer = (props) => {
                     dispatch({
                         type: ActionType$6.HideFilterDrawer,
                     });
-                    fetchLogs();
+                    fetchLogs({
+                        filters: {
+                            dateFilterState,
+                            contextFilterState,
+                            tagFilterState,
+                            actionErrorFilterState,
+                            advancedFilterState,
+                        },
+                        pageNum: 1,
+                        filtersChanged: true,
+                    });
                 } },
                 React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faSearch }),
                 ' ',
@@ -4281,14 +4337,16 @@ const LogReviewer = (props) => {
         filterToggles,
         filterDrawer && (React__default["default"].createElement(Drawer, { customBackgroundColor: "#eee" }, filterDrawer))));
     // Main body
-    body = (React__default["default"].createElement(React__default["default"].Fragment, null,
-        filters,
-        React__default["default"].createElement("div", { className: "mt-2" },
-            React__default["default"].createElement(IntelliTable, { title: "Matching Logs:", csvName: `Logs from ${getHumanReadableDate()}`, id: "logs", data: logs, columns: columns }),
-            logs.length === 0 && (React__default["default"].createElement("div", { className: "alert alert-warning text-center mt-2" },
-                React__default["default"].createElement("h4", { className: "m-1" }, "No Logs to Show"),
-                React__default["default"].createElement("div", null, "Either your filters are too strict or no matching logs have been created yet."))),
-            paginationControls)));
+    if (!showSpinner) {
+        body = (React__default["default"].createElement(React__default["default"].Fragment, null,
+            filters,
+            React__default["default"].createElement("div", { className: "mt-2" },
+                React__default["default"].createElement(IntelliTable, { title: "Matching Logs:", csvName: `Logs from ${getHumanReadableDate()}`, id: "logs", data: logs, columns: columns }),
+                logs.length === 0 && (React__default["default"].createElement("div", { className: "alert alert-warning text-center mt-2" },
+                    React__default["default"].createElement("h4", { className: "m-1" }, "No Logs to Show"),
+                    React__default["default"].createElement("div", null, "Either your filters are too strict or no matching logs have been created yet."))),
+                paginationControls)));
+    }
     /* ---------- Wrap in Modal --------- */
     return (React__default["default"].createElement("div", { className: "LogReviewer-outer-container" },
         React__default["default"].createElement("style", null, style$2),
@@ -13810,10 +13868,11 @@ const initServer = (opts) => {
         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);
@@ -13980,6 +14039,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;
         }),