dce-reactkit 3.9.4-beta-logreviewer.8 → 3.9.4-beta-logreviewer.9

package/dist/cjs/index.js

@@ -3372,8 +3372,10 @@ const Pagination = ({ currentPage, numPages, loading = false, onPageChanged, })
                     React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faArrowLeft }),
                     ' ',
                     "Prev")),
-            currentPage > 3 && (React__default["default"].createElement("li", { className: "page-item" },
-                React__default["default"].createElement("button", { type: "button", className: "page-link", onClick: () => { return onPageChanged(1); }, disabled: loading }, "1"))),
+            currentPage > 3
+                && pages[0] !== 1
+                && (React__default["default"].createElement("li", { className: "page-item" },
+                    React__default["default"].createElement("button", { type: "button", className: "page-link", onClick: () => { return onPageChanged(1); }, disabled: loading }, "1"))),
             currentPage > 4 && (React__default["default"].createElement("li", { className: "page-item disabled" },
                 React__default["default"].createElement("span", { className: "page-link" }, "..."))),
             pages.map((pageNum) => {
@@ -3382,8 +3384,10 @@ const Pagination = ({ currentPage, numPages, loading = false, onPageChanged, })
             }),
             currentPage < numPages - 3 && (React__default["default"].createElement("li", { className: "page-item disabled" },
                 React__default["default"].createElement("span", { className: "page-link" }, "..."))),
-            currentPage < numPages - 2 && (React__default["default"].createElement("li", { className: "page-item" },
-                React__default["default"].createElement("button", { type: "button", className: "page-link", onClick: () => { return onPageChanged(numPages); }, disabled: loading }, numPages))),
+            currentPage < numPages - 2
+                && pages[pages.length - 1] !== numPages
+                && (React__default["default"].createElement("li", { className: "page-item" },
+                    React__default["default"].createElement("button", { type: "button", className: "page-link", onClick: () => { return onPageChanged(numPages); }, disabled: loading }, numPages))),
             React__default["default"].createElement("li", { className: `page-item ${(currentPage >= numPages || loading) ? 'disabled' : ''}` },
                 React__default["default"].createElement("button", { type: "button", className: "page-link", onClick: () => { return onPageChanged(currentPage + 1); }, disabled: currentPage >= numPages || loading },
                     "Next",
@@ -3894,7 +3898,7 @@ const LogReviewer = (props) => {
         else {
             // Case: subcontexts exist
             initContextFilterState[context] = {};
-            Object.values(contextMap[context]).forEach((subcontext) => {
+            Object.keys(contextMap[context]).forEach((subcontext) => {
                 // Skip self ("_")
                 if (subcontext === '_') {
                     return;
@@ -4114,6 +4118,14 @@ 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: () => {
+                    // Save active filters
+                    activeFiltersRef.current = {
+                        dateFilterState: JSON.parse(JSON.stringify(initDateFilterState)),
+                        contextFilterState: JSON.parse(JSON.stringify(initContextFilterState)),
+                        tagFilterState: JSON.parse(JSON.stringify(initTagFilterState)),
+                        actionErrorFilterState: JSON.parse(JSON.stringify(initActionErrorFilterState)),
+                        advancedFilterState: JSON.parse(JSON.stringify(initAdvancedFilterState)),
+                    };
                     fetchLogs({
                         filters: {
                             dateFilterState: initDateFilterState,
@@ -14109,39 +14121,28 @@ const initServer = (opts) => {
             };
             /* ------------ Context Filter ------------ */
             // Process context filters to include selected contexts and subcontexts
-            const selectedContexts = [];
-            const selectedSubcontexts = [];
-            // Process each context filter
+            const contextConditions = [];
             Object.keys(contextFilterState).forEach((context) => {
                 const value = contextFilterState[context];
                 if (typeof value === 'boolean') {
                     if (value) {
-                        selectedContexts.push(context);
+                        // The entire context is selected
+                        contextConditions.push({ context });
                     }
                 }
                 else {
-                    // At least one subcontext is selected
-                    const atLeastOneSubcontextSelected = (Object.values(value)
-                        .some((subcontextValue) => {
-                        return subcontextValue;
-                    }));
-                    if (atLeastOneSubcontextSelected) {
-                        selectedContexts.push(context);
+                    // The context has subcontexts
+                    const subcontexts = Object.keys(value).filter((subcontext) => { return value[subcontext]; });
+                    if (subcontexts.length > 0) {
+                        contextConditions.push({
+                            context,
+                            subcontext: { $in: subcontexts },
+                        });
                     }
-                    // Add all selected subcontexts
-                    Object.keys(value).forEach((subcontext) => {
-                        if (value[subcontext]) {
-                            selectedSubcontexts.push(subcontext);
-                        }
-                    });
                 }
             });
-            // Add context and subcontext conditions to the query if any are selected
-            if (selectedContexts.length > 0) {
-                query.context = { $in: selectedContexts };
-            }
-            if (selectedSubcontexts.length > 0) {
-                query.subcontext = { $in: selectedSubcontexts };
+            if (contextConditions.length > 0) {
+                query.$or = contextConditions;
             }
             /* -------------- Tag Filter -------------- */
             const selectedTags = Object.keys(tagFilterState).filter((tag) => { return tagFilterState[tag]; });