dce-reactkit 3.2.2-beta.2 → 3.2.2-beta.20

package/dist/cjs/index.js

@@ -519,17 +519,29 @@ const LOG_ROUTE_PATH = `${ROUTE_PATH_PREFIX}/log`;
 const LogBuiltInMetadata = {
     // Contexts
     Context: {
-        Uncategorized: 'n/a',
-        ServerRenderedErrorPage: '_server-rendered-error-page',
-        ServerEndpointError: '_server-endpoint-error',
-        ClientFatalError: '_client-fatal-error',
+        Uncategorized: 'Uncategorized',
+        ServerRenderedErrorPage: 'ServerRenderedErrorPage',
+        ServerEndpointError: 'ServerEndpointError',
+        ClientFatalError: 'ClientFatalError',
     },
     // Targets
     Target: {
-        NoSpecificTarget: 'n/a',
+        NoTarget: 'NoTarget',
     },
 };
 
+/**
+ * Allowed log levels
+ * @author Gabe Abrams
+ */
+var LogLevel;
+(function (LogLevel) {
+    LogLevel["Warn"] = "Warn";
+    LogLevel["Info"] = "Info";
+    LogLevel["Debug"] = "Debug";
+})(LogLevel || (LogLevel = {}));
+var LogLevel$1 = LogLevel;
+
 // Keep track of whether or not session expiry has already been handled
 let sessionAlreadyExpired = false;
 /*------------------------------------------------------------------------*/
@@ -648,7 +660,7 @@ const visitServerEndpoint = (opts) => __awaiter(void 0, void 0, void 0, function
  * @author Gabe Abrams
  */
 const logClientEvent = (opts) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     return visitServerEndpoint({
         path: LOG_ROUTE_PATH,
         method: 'POST',
@@ -657,8 +669,9 @@ const logClientEvent = (opts) => __awaiter(void 0, void 0, void 0, function* ()
                 ? opts.context
                 : ((_b = ((_a = opts.context) !== null && _a !== void 0 ? _a : {})._) !== null && _b !== void 0 ? _b : LogBuiltInMetadata.Context.Uncategorized)),
             subcontext: ((_c = opts.subcontext) !== null && _c !== void 0 ? _c : LogBuiltInMetadata.Context.Uncategorized),
-            tags: JSON.stringify((_d = opts.tags) !== null && _d !== void 0 ? _d : []),
-            metadata: JSON.stringify((_e = opts.metadata) !== null && _e !== void 0 ? _e : {}),
+            level: ((_d = opts.level) !== null && _d !== void 0 ? _d : LogLevel$1.Info),
+            tags: JSON.stringify((_e = opts.tags) !== null && _e !== void 0 ? _e : []),
+            metadata: JSON.stringify((_f = opts.metadata) !== null && _f !== void 0 ? _f : {}),
             errorMessage: (opts.error
                 ? opts.error.message
                 : undefined),
@@ -669,7 +682,7 @@ const logClientEvent = (opts) => __awaiter(void 0, void 0, void 0, function* ()
                 ? opts.error.stack
                 : undefined),
             target: (opts.action
-                ? ((_f = opts.target) !== null && _f !== void 0 ? _f : LogBuiltInMetadata.Target.NoSpecificTarget)
+                ? ((_g = opts.target) !== null && _g !== void 0 ? _g : LogBuiltInMetadata.Target.NoTarget)
                 : undefined),
             action: (opts.action
                 ? opts.action
@@ -1175,14 +1188,14 @@ const ButtonInputGroup = (props) => {
     /*------------------------------------------------------------------------*/
     /* -------------- Props ------------- */
     // Destructure all props
-    const { label, minLabelWidth, children, } = props;
+    const { label, minLabelWidth, children, className, } = props;
     /*------------------------------------------------------------------------*/
     /*                                 Render                                 */
     /*------------------------------------------------------------------------*/
     /*----------------------------------------*/
     /*                 Main UI                */
     /*----------------------------------------*/
-    return (React__default["default"].createElement("div", { className: "input-group" },
+    return (React__default["default"].createElement("div", { className: `input-group ${className !== null && className !== void 0 ? className : ''}` },
         React__default["default"].createElement("div", { className: "input-group-prepend d-flex w-100" },
             React__default["default"].createElement("span", { className: "input-group-text", style: {
                     minWidth: (minLabelWidth !== null && minLabelWidth !== void 0 ? minLabelWidth : undefined),
@@ -1352,12 +1365,25 @@ const SimpleDateChooser = (props) => {
         // Figure out which days are allowed
         const days = [];
         const numDaysInMonth = (new Date(year, month, 0)).getDate();
-        const firstDay = (month === today.month
-            ? today.day // Current month: start at current date
-            : 1 // Future month: start at beginning of month
-        );
-        for (let day = firstDay; day <= numDaysInMonth; day++) {
-            days.push(day);
+        if (chooseFromPast) {
+            // Past selection
+            const numDaysToAdd = ((month === today.month)
+                ? today.day // Current month, only add up to today
+                : numDaysInMonth // Past month, add all days
+            );
+            for (let day = 1; day <= numDaysToAdd; day++) {
+                days.push(day);
+            }
+        }
+        else {
+            // Future selection: add all remaining days of the month
+            const firstDay = (month === today.month
+                ? today.day // Current month: start at current date
+                : 1 // Future month: start at beginning of month
+            );
+            for (let day = firstDay; day <= numDaysInMonth; day++) {
+                days.push(day);
+            }
         }
         choices.push({
             choiceName: `${monthName} ${year}`,
@@ -2057,7 +2083,7 @@ const ItemPicker = (props) => {
     /*------------------------------------------------------------------------*/
     /* -------------- Props ------------- */
     // Destructure all props
-    const { title, items, onChanged, } = props;
+    const { title, items, onChanged, noBottomMargin, } = props;
     /*------------------------------------------------------------------------*/
     /*                           Component Functions                          */
     /*------------------------------------------------------------------------*/
@@ -2067,7 +2093,7 @@ const ItemPicker = (props) => {
     /*----------------------------------------*/
     /*                 Main UI                */
     /*----------------------------------------*/
-    return (React__default["default"].createElement(TabBox, { title: title },
+    return (React__default["default"].createElement(TabBox, { title: title, noBottomMargin: noBottomMargin },
         React__default["default"].createElement("div", { style: { overflowX: 'auto' } },
             React__default["default"].createElement(NestableItemList, { items: items, onChanged: onChanged }))));
 };
@@ -2384,9 +2410,9 @@ const IntelliTable = (props) => {
         // Create the cell UI
         return (React__default["default"].createElement("th", { key: column.param, scope: "col", id: `IntelliTable-${id}-header-${column.param}` },
             React__default["default"].createElement("div", { className: "d-flex align-items-center justify-content-center flex-row h-100" },
-                React__default["default"].createElement("h4", { className: "m-0" }, column.title),
+                React__default["default"].createElement("span", { className: "text-nowrap" }, column.title),
                 React__default["default"].createElement("div", null,
-                    React__default["default"].createElement("button", { type: "button", className: "btn btn-light", "aria-label": sortButtonAriaLabel, onClick: () => {
+                    React__default["default"].createElement("button", { type: "button", className: "btn btn-light btn-sm ms-1", "aria-label": sortButtonAriaLabel, onClick: () => {
                             dispatch({
                                 type: ActionType$1.ToggleSortColumn,
                                 param: column.param,
@@ -2534,7 +2560,7 @@ const IntelliTable = (props) => {
             React__default["default"].createElement("h3", { className: "m-0" }, title),
             React__default["default"].createElement("div", { className: "flex-grow-1 text-end" },
                 React__default["default"].createElement(CSVDownloadButton, { "aria-label": `download data as csv for ${title}`, id: `IntelliTable-${id}-download-as-csv`, filename: `${title}.csv`, csv: csv }),
-                React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary", "aria-label": `show panel for customizing which columns show in table ${title}`, id: `IntelliTable-${id}-show-column-customization-modal`, onClick: () => {
+                React__default["default"].createElement("button", { type: "button", className: "btn btn-secondary ms-2", "aria-label": `show panel for customizing which columns show in table ${title}`, id: `IntelliTable-${id}-show-column-customization-modal`, onClick: () => {
                         dispatch({
                             type: ActionType$1.ToggleColVisCusModalVisibility,
                         });
@@ -2598,6 +2624,11 @@ const style = `
     border: 0.05rem solid black;
     border-radius: 0.5rem;
     overflow: hidden;
+    padding: 0.7rem;
+
+    /* Solid background */
+    background-color: white;
+    color: black;
 
     /* Place contents in flex column */
     flex-direction: column;
@@ -2624,6 +2655,27 @@ const style = `
     /* Vertical scroll */
     overflow-y: auto;
   }
+
+  .LogReviewer-header-close-button {
+    border: 0 !important;
+    background-color: transparent !important;
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+    padding-right: 1em !important;
+    margin: 0 !important;
+    color: #444 !important;
+
+    right: 0 !important;
+    position: absolute !important;
+  }
+  .LogReviewer-header-close-button:hover {
+    border: 0 !important;
+    background-color: transparent !important;
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+    margin: 0 !important;
+    color: #000 !important;
+  }
 `;
 /*------------------------------------------------------------------------*/
 /*                            Static Functions                            */
@@ -2643,7 +2695,7 @@ const genHumanReadableName = (machineReadableName) => {
             // Uppercase! Add a space before
             humanReadableName += ' ';
         }
-        humanReadableName += chars;
+        humanReadableName += char;
     });
     // Trim and return
     return humanReadableName.trim();
@@ -2705,7 +2757,19 @@ const reducer = (state, action) => {
             return Object.assign(Object.assign({}, state), { contextFilterState: action.contextFilterState });
         }
         case ActionType.UpdateTagFilterState: {
-            return Object.assign(Object.assign({}, state), { tagFilterState: action.tagFilterState });
+            const { tagFilterState } = action;
+            // Select all if every tag is deselected
+            const numTagsSelected = (Object.values(tagFilterState)
+                .filter((isSelected) => {
+                return isSelected;
+            })
+                .length);
+            if (numTagsSelected === 0) {
+                Object.keys(tagFilterState).forEach((tag) => {
+                    tagFilterState[tag] = true;
+                });
+            }
+            return Object.assign(Object.assign({}, state), { tagFilterState });
         }
         case ActionType.UpdateActionErrorFilterState: {
             return Object.assign(Object.assign({}, state), { actionErrorFilterState: action.actionErrorFilterState });
@@ -2725,10 +2789,33 @@ const LogReviewer = (props) => {
     /*------------------------------------------------------------------------*/
     /*                                  Setup                                 */
     /*------------------------------------------------------------------------*/
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     /* -------------- Props ------------- */
     // Destructure props
     const { LogMetadata, onClose, } = props;
+    // Add built-in LogMetadata
+    // > Add "uncategorized" subcontext to each context
+    Object.keys((_a = LogMetadata.Context) !== null && _a !== void 0 ? _a : {}).forEach((context) => {
+        if (LogMetadata.Context
+            // Context has children already
+            && typeof LogMetadata.Context[context] !== 'string') {
+            LogMetadata.Context[context][LogBuiltInMetadata.Context.Uncategorized] = (LogBuiltInMetadata.Context.Uncategorized);
+        }
+    });
+    // > Add built-in contexts
+    LogMetadata.Context = ((_b = LogMetadata.Context) !== null && _b !== void 0 ? _b : {});
+    Object.keys(LogBuiltInMetadata.Context).forEach((context) => {
+        if (LogMetadata.Context) {
+            LogMetadata.Context[context] = context;
+        }
+    });
+    // > Add built-in targets
+    LogMetadata.Target = ((_c = LogMetadata.Target) !== null && _c !== void 0 ? _c : {});
+    Object.keys(LogBuiltInMetadata.Target).forEach((target) => {
+        if (LogMetadata.Target) {
+            LogMetadata.Target[target] = target;
+        }
+    });
     /* -------------- State ------------- */
     // Create initial date filter state
     const today = getTimeInfoInET();
@@ -2748,7 +2835,7 @@ const LogReviewer = (props) => {
     };
     // Create initial context filter state
     const initContextFilterState = {};
-    Object.keys((_a = LogMetadata.Context) !== null && _a !== void 0 ? _a : {}).forEach((context) => {
+    Object.keys((_d = LogMetadata.Context) !== null && _d !== void 0 ? _d : {}).forEach((context) => {
         var _a, _b;
         const contextValue = ((_a = LogMetadata.Context) !== null && _a !== void 0 ? _a : {})[context];
         if (typeof contextValue === 'string') {
@@ -2766,7 +2853,7 @@ const LogReviewer = (props) => {
     });
     // Create initial tag filter state
     const initTagFilterState = {};
-    Object.values((_b = LogMetadata.Tag) !== null && _b !== void 0 ? _b : {}).forEach((tagValue) => {
+    Object.values((_e = LogMetadata.Tag) !== null && _e !== void 0 ? _e : {}).forEach((tagValue) => {
         initTagFilterState[tagValue] = true;
     });
     // Create advanced filter state
@@ -2793,12 +2880,16 @@ const LogReviewer = (props) => {
         target: {},
         action: {},
     };
-    Object.values((_c = LogMetadata.Target) !== null && _c !== void 0 ? _c : {}).forEach((target) => {
+    Object.values((_f = LogMetadata.Target) !== null && _f !== void 0 ? _f : {}).forEach((target) => {
         initActionErrorFilterState.target[target] = true;
     });
     Object.values(LogAction$1).forEach((action) => {
         initActionErrorFilterState.action[action] = true;
     });
+    // Add built-in targets
+    Object.values(LogBuiltInMetadata.Target).forEach((target) => {
+        initActionErrorFilterState.target[target] = true;
+    });
     // Initial state
     const initialState = {
         loading: true,
@@ -2832,15 +2923,18 @@ const LogReviewer = (props) => {
         let month = newDateFilterState.startDate.month;
         while (
         // Earlier year
-        (year <= newDateFilterState.endDate.year)
+        (year < newDateFilterState.endDate.year)
             // Current year but included month
             || (year === newDateFilterState.endDate.year
                 && month <= newDateFilterState.endDate.month)) {
-            // Add to list
-            toLoad.push({
-                year,
-                month,
-            });
+            // Add to list if not already loaded
+            if (!logMap[year]
+                || !logMap[year][month]) {
+                toLoad.push({
+                    year,
+                    month,
+                });
+            }
             // Increment
             month += 1;
             if (month > 12) {
@@ -2864,6 +2958,7 @@ const LogReviewer = (props) => {
         });
         // Check which year/month combos we need to load
         const toLoad = listMonthsToLoad(newDateFilterState);
+        console.log('Filter update:', newDateFilterState, toLoad, logMap);
         // If nothing to load, finished
         if (toLoad.length === 0) {
             return;
@@ -2928,10 +3023,10 @@ const LogReviewer = (props) => {
         /*                 Filters                */
         /*----------------------------------------*/
         // Filter toggle
-        const filterToggles = (React__default["default"].createElement("div", { className: "LogReviewer-filter-toggles d-flex align-items-center justify-content-center" },
+        const filterToggles = (React__default["default"].createElement("div", { className: "LogReviewer-filter-toggles" },
             React__default["default"].createElement("h3", { className: "m-0" }, "Filters:"),
-            React__default["default"].createElement("div", { className: "LogReviewer-filter-toggle-buttons" },
-                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-date-filter-drawer", className: `btn btn-${FilterDrawer.Date === expandedFilterDrawer} me-2`, "aria-label": "toggle date filter drawer", onClick: () => {
+            React__default["default"].createElement("div", { className: "LogReviewer-filter-toggle-buttons alert alert-secondary p-2 m-0" },
+                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-date-filter-drawer", className: `btn btn-${FilterDrawer.Date === expandedFilterDrawer ? 'warning' : 'light'} me-2`, "aria-label": "toggle date filter drawer", onClick: () => {
                         dispatch({
                             type: ActionType.ToggleFilterDrawer,
                             filterDrawer: FilterDrawer.Date,
@@ -2939,7 +3034,7 @@ const LogReviewer = (props) => {
                     } },
                     React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faCalendar, className: "me-2" }),
                     "Date"),
-                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-context-filter-drawer", className: `btn btn-${FilterDrawer.Context === expandedFilterDrawer} me-2`, "aria-label": "toggle context filter drawer", onClick: () => {
+                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-context-filter-drawer", className: `btn btn-${FilterDrawer.Context === expandedFilterDrawer ? 'warning' : 'light'} me-2`, "aria-label": "toggle context filter drawer", onClick: () => {
                         dispatch({
                             type: ActionType.ToggleFilterDrawer,
                             filterDrawer: FilterDrawer.Context,
@@ -2947,15 +3042,15 @@ const LogReviewer = (props) => {
                     } },
                     React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faCircle, className: "me-2" }),
                     "Context"),
-                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-tag-filter-drawer", className: `btn btn-${FilterDrawer.Tag === expandedFilterDrawer} me-2`, "aria-label": "toggle tag filter drawer", onClick: () => {
+                (LogMetadata.Tag && Object.keys(LogMetadata.Tag).length > 0) && (React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-tag-filter-drawer", className: `btn btn-${FilterDrawer.Tag === expandedFilterDrawer ? 'warning' : 'light'} me-2`, "aria-label": "toggle tag filter drawer", onClick: () => {
                         dispatch({
                             type: ActionType.ToggleFilterDrawer,
                             filterDrawer: FilterDrawer.Tag,
                         });
                     } },
                     React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faTag, className: "me-2" }),
-                    "Tag"),
-                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-action-filter-drawer", className: `btn btn-${FilterDrawer.Action === expandedFilterDrawer} me-2`, "aria-label": "toggle action and error filter drawer", onClick: () => {
+                    "Tag")),
+                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-action-filter-drawer", className: `btn btn-${FilterDrawer.Action === expandedFilterDrawer ? 'warning' : 'light'} me-2`, "aria-label": "toggle action and error filter drawer", onClick: () => {
                         dispatch({
                             type: ActionType.ToggleFilterDrawer,
                             filterDrawer: FilterDrawer.Action,
@@ -2963,7 +3058,7 @@ const LogReviewer = (props) => {
                     } },
                     React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faHammer, className: "me-2" }),
                     "Action"),
-                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-advanced-filter-drawer", className: `btn btn-${FilterDrawer.Advanced === expandedFilterDrawer}`, "aria-label": "toggle advanced filter drawer", onClick: () => {
+                React__default["default"].createElement("button", { type: "button", id: "LogReviewer-toggle-advanced-filter-drawer", className: `btn btn-${FilterDrawer.Advanced === expandedFilterDrawer ? 'warning' : 'light'}`, "aria-label": "toggle advanced filter drawer", onClick: () => {
                         dispatch({
                             type: ActionType.ToggleFilterDrawer,
                             filterDrawer: FilterDrawer.Advanced,
@@ -2976,25 +3071,29 @@ const LogReviewer = (props) => {
         if (expandedFilterDrawer) {
             if (expandedFilterDrawer === FilterDrawer.Date) {
                 filterDrawer = (React__default["default"].createElement(TabBox, { title: "Date" },
-                    React__default["default"].createElement(SimpleDateChooser, { ariaLabel: "filter start date", name: "filter-start-date", year: dateFilterState.startDate.year, month: dateFilterState.startDate.month, day: dateFilterState.startDate.day, onChange: (month, day, year) => {
-                            dispatch({
-                                type: ActionType.UpdateDateFilterState,
-                                dateFilterState: Object.assign(Object.assign({}, dateFilterState), { startDate: { month, day, year } }),
-                            });
+                    React__default["default"].createElement(SimpleDateChooser, { ariaLabel: "filter start date", name: "filter-start-date", year: dateFilterState.startDate.year, month: dateFilterState.startDate.month, day: dateFilterState.startDate.day, chooseFromPast: true, numMonthsToShow: 12, onChange: (month, day, year) => {
+                            dateFilterState.startDate = { month, day, year };
+                            handleDateRangeUpdated(dateFilterState);
                         } }),
                     ' ',
                     "to",
                     ' ',
-                    React__default["default"].createElement(SimpleDateChooser, { ariaLabel: "filter end date", name: "filter-end-date", year: dateFilterState.endDate.year, month: dateFilterState.endDate.month, day: dateFilterState.endDate.day, onChange: (month, day, year) => {
-                            dispatch({
-                                type: ActionType.UpdateDateFilterState,
-                                dateFilterState: Object.assign(Object.assign({}, dateFilterState), { endDate: { month, day, year } }),
-                            });
+                    React__default["default"].createElement(SimpleDateChooser, { ariaLabel: "filter end date", name: "filter-end-date", year: dateFilterState.endDate.year, month: dateFilterState.endDate.month, day: dateFilterState.endDate.day, chooseFromPast: true, numMonthsToShow: 12, onChange: (month, day, year) => {
+                            if (year < dateFilterState.startDate.year
+                                || (year === dateFilterState.startDate.year
+                                    && month < dateFilterState.startDate.month)
+                                || (year === dateFilterState.startDate.year
+                                    && month === dateFilterState.startDate.month
+                                    && day < dateFilterState.startDate.day)) {
+                                return alert$1('Invalid Start Date', 'The start date cannot be before the end date.');
+                            }
+                            dateFilterState.endDate = { month, day, year };
+                            handleDateRangeUpdated(dateFilterState);
                         } })));
             }
             else if (expandedFilterDrawer === FilterDrawer.Context) {
                 // Create item picker items
-                const pickableItems = (Object.keys((_d = LogMetadata.Context) !== null && _d !== void 0 ? _d : {})
+                const pickableItems = (Object.keys((_g = LogMetadata.Context) !== null && _g !== void 0 ? _g : {})
                     .map((context) => {
                     var _a;
                     const value = ((_a = LogMetadata.Context) !== null && _a !== void 0 ? _a : {})[context];
@@ -3023,7 +3122,7 @@ const LogReviewer = (props) => {
                     }));
                     const item = {
                         id: context,
-                        name: context,
+                        name: genHumanReadableName(context),
                         isGroup: true,
                         children,
                     };
@@ -3031,6 +3130,8 @@ const LogReviewer = (props) => {
                 }));
                 // Create filter UI
                 filterDrawer = (React__default["default"].createElement(ItemPicker, { title: "Context", items: pickableItems, onChanged: (updatedItems) => {
+                        console.log('Items before:', pickableItems);
+                        console.log('Updated Items:', updatedItems);
                         // Update our state
                         updatedItems.forEach((pickableItem) => {
                             if (pickableItem.isGroup) {
@@ -3087,7 +3188,7 @@ const LogReviewer = (props) => {
                             }, ariaLabel: "only show error logs", selected: actionErrorFilterState.type === LogType$1.Error, noMarginOnRight: true })),
                     (actionErrorFilterState.type === undefined
                         || actionErrorFilterState.type === LogType$1.Action) && (React__default["default"].createElement(TabBox, { title: "Action Log Details" },
-                        React__default["default"].createElement(ButtonInputGroup, { label: "Action" }, Object.keys(LogAction$1)
+                        React__default["default"].createElement(ButtonInputGroup, { label: "Action", className: "mb-2" }, Object.keys(LogAction$1)
                             .map((action, i) => {
                             const description = genHumanReadableName(action);
                             return (React__default["default"].createElement(CheckboxButton, { id: `LogReviewer-action-${action}-checkbox`, text: description, ariaLabel: `include logs with action type "${description}" in results`, noMarginOnRight: i === Object.keys(LogAction$1).length - 1, onChanged: (checked) => {
@@ -3098,18 +3199,20 @@ const LogReviewer = (props) => {
                                     });
                                 } }));
                         })),
-                        React__default["default"].createElement(ButtonInputGroup, { label: "Target" }, Object.keys((_e = LogMetadata.Target) !== null && _e !== void 0 ? _e : {})
-                            .map((target, i) => {
-                            var _a;
-                            const description = genHumanReadableName(target);
-                            return (React__default["default"].createElement(CheckboxButton, { id: `LogReviewer-target-${target}-checkbox`, text: description, ariaLabel: `include logs with target "${description}" in results`, onChanged: (checked) => {
-                                    actionErrorFilterState.target[target] = checked;
-                                    dispatch({
-                                        type: ActionType.UpdateActionErrorFilterState,
-                                        actionErrorFilterState,
-                                    });
-                                }, noMarginOnRight: i === Object.keys((_a = LogMetadata.Target) !== null && _a !== void 0 ? _a : {}).length - 1 }));
-                        })))),
+                        React__default["default"].createElement(ButtonInputGroup, { label: "Target" },
+                            (Object.keys((_h = LogMetadata.Target) !== null && _h !== void 0 ? _h : {}).length === 0) && (React__default["default"].createElement("div", null, "This app does not have any targets yet.")),
+                            Object.keys((_j = LogMetadata.Target) !== null && _j !== void 0 ? _j : {})
+                                .map((target, i) => {
+                                var _a;
+                                const description = genHumanReadableName(target);
+                                return (React__default["default"].createElement(CheckboxButton, { id: `LogReviewer-target-${target}-checkbox`, text: description, ariaLabel: `include logs with target "${description}" in results`, onChanged: (checked) => {
+                                        actionErrorFilterState.target[target] = checked;
+                                        dispatch({
+                                            type: ActionType.UpdateActionErrorFilterState,
+                                            actionErrorFilterState,
+                                        });
+                                    }, noMarginOnRight: i === Object.keys((_a = LogMetadata.Target) !== null && _a !== void 0 ? _a : {}).length - 1 }));
+                            })))),
                     (actionErrorFilterState.type === undefined
                         || actionErrorFilterState.type === LogType$1.Error) && (React__default["default"].createElement(TabBox, { title: "Error Log Details" },
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
@@ -3271,26 +3374,27 @@ const LogReviewer = (props) => {
                                         advancedFilterState,
                                     });
                                 }, noMarginOnRight: true })),
-                        React__default["default"].createElement("div", { className: "input-group mb-2" },
-                            React__default["default"].createElement("span", { className: "input-group-text" }, "Server Route Path"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for server route path", placeholder: "e.g. /api/ttm/courses/12345", value: advancedFilterState.routePath, onChange: (e) => {
-                                    advancedFilterState.courseName = ((e.target.value)
-                                        .trim());
-                                    dispatch({
-                                        type: ActionType.UpdateAdvancedFilterState,
-                                        advancedFilterState,
-                                    });
-                                } })),
-                        React__default["default"].createElement("div", { className: "input-group mb-2" },
-                            React__default["default"].createElement("span", { className: "input-group-text" }, "Server Route Template"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for server route template", value: advancedFilterState.routeTemplate, placeholder: "e.g. /api/ttm/courses/:courseId", onChange: (e) => {
-                                    advancedFilterState.courseName = ((e.target.value)
-                                        .trim());
-                                    dispatch({
-                                        type: ActionType.UpdateAdvancedFilterState,
-                                        advancedFilterState,
-                                    });
-                                } })))));
+                        advancedFilterState.source !== LogSource$1.Client && (React__default["default"].createElement("div", { className: "mt-2" },
+                            React__default["default"].createElement("div", { className: "input-group mb-2" },
+                                React__default["default"].createElement("span", { className: "input-group-text" }, "Server Route Path"),
+                                React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for server route path", placeholder: "e.g. /api/ttm/courses/12345", value: advancedFilterState.routePath, onChange: (e) => {
+                                        advancedFilterState.courseName = ((e.target.value)
+                                            .trim());
+                                        dispatch({
+                                            type: ActionType.UpdateAdvancedFilterState,
+                                            advancedFilterState,
+                                        });
+                                    } })),
+                            React__default["default"].createElement("div", { className: "input-group mb-2" },
+                                React__default["default"].createElement("span", { className: "input-group-text" }, "Server Route Template"),
+                                React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for server route template", value: advancedFilterState.routeTemplate, placeholder: "e.g. /api/ttm/courses/:courseId", onChange: (e) => {
+                                        advancedFilterState.courseName = ((e.target.value)
+                                            .trim());
+                                        dispatch({
+                                            type: ActionType.UpdateAdvancedFilterState,
+                                            advancedFilterState,
+                                        });
+                                    } })))))));
             }
         }
         // Filters UI
@@ -3301,10 +3405,11 @@ const LogReviewer = (props) => {
         // > Perform filters
         const logs = [];
         Object.keys(logMap).forEach((year) => {
-            Object.keys(logMap).forEach((month) => {
+            Object.keys(logMap[year]).forEach((month) => {
                 logMap[year][month].forEach((log) => {
-                    /* ----------- Date Filter ---------- */
                     var _a;
+                    /* ----------- Date Filter ---------- */
+                    console.log('Log:', log);
                     // Before start date
                     if (
                     // Previous year
@@ -3316,6 +3421,7 @@ const LogReviewer = (props) => {
                         || ((log.year === dateFilterState.startDate.year)
                             && (log.month === dateFilterState.startDate.month)
                             && (log.day < dateFilterState.startDate.day))) {
+                        console.log('RULED OUT: START');
                         return;
                     }
                     // After end date
@@ -3329,6 +3435,7 @@ const LogReviewer = (props) => {
                         || ((log.year === dateFilterState.endDate.year)
                             && (log.month === dateFilterState.endDate.month)
                             && (log.day > dateFilterState.endDate.day))) {
+                        console.log('RULED OUT: END');
                         return;
                     }
                     /* --------- Context Filter --------- */
@@ -3341,29 +3448,30 @@ const LogReviewer = (props) => {
                             .every((isSelected) => {
                             return !isSelected;
                         }))) {
+                        console.log('RULED OUT: CONTEXT');
                         return;
                     }
                     // Subcontext doesn't match
                     if (
-                    // Log has a subcontext
-                    log.subcontext
+                    // Log context is not "uncategorized" (no point in further filters)
+                    log.context !== LogBuiltInMetadata.Context.Uncategorized
+                        // Log has a subcontext
+                        && log.subcontext
                         // Context has subcontexts
                         && (contextFilterState[log.context]
                             && contextFilterState[log.context] !== false
                             && contextFilterState[log.context] !== true)
                         // Subcontext is not selected
                         && !contextFilterState[log.context][log.subcontext]) {
+                        console.log('RULED OUT: SUBCONTEXT');
                         return;
                     }
                     /* -------------- Tags -------------- */
                     // No tags match
-                    if (
-                    // Log has at least one tag
-                    log.tags.length > 0
-                        // No tags match
-                        && (log.tags.every((tag) => {
-                            return !tagFilterState[tag];
-                        }))) {
+                    if (log.tags.every((tag) => {
+                        return !tagFilterState[tag];
+                    })) {
+                        console.log('RULED OUT: TAGS');
                         return;
                     }
                     /* ------- Actions and Errors ------- */
@@ -3373,6 +3481,7 @@ const LogReviewer = (props) => {
                     actionErrorFilterState.type !== undefined
                         // Log type doesn't match
                         && actionErrorFilterState.type !== log.type) {
+                        console.log('RULED OUT: TYPE');
                         return;
                     }
                     // Filter errors
@@ -3385,6 +3494,7 @@ const LogReviewer = (props) => {
                             && actionErrorFilterState.errorMessage.trim().length > 0
                             // Message doesn't match
                             && log.errorMessage.toLowerCase().includes(actionErrorFilterState.errorMessage.trim().toLowerCase())) {
+                            console.log('RULED OUT: ERROR MESSAGE');
                             return;
                         }
                         // Code doesn't match
@@ -3395,6 +3505,7 @@ const LogReviewer = (props) => {
                             && actionErrorFilterState.errorCode.trim().length > 0
                             // Code doesn't match
                             && log.errorCode.toUpperCase().includes(actionErrorFilterState.errorCode.trim().toUpperCase())) {
+                            console.log('RULED OUT: ERROR CODE');
                             return;
                         }
                     }
@@ -3406,6 +3517,7 @@ const LogReviewer = (props) => {
                         log.target
                             // Target isn't selected
                             && !actionErrorFilterState.target[log.target]) {
+                            console.log('RULED OUT: TARGET');
                             return;
                         }
                         // Action
@@ -3414,6 +3526,7 @@ const LogReviewer = (props) => {
                         log.action
                             // Action isn't selected
                             && !actionErrorFilterState.action[log.action]) {
+                            console.log('RULED OUT: ACTION');
                             return;
                         }
                     }
@@ -3424,6 +3537,7 @@ const LogReviewer = (props) => {
                     log.userFirstName
                         // First name query doesn't match
                         && !log.userFirstName.toLowerCase().includes(advancedFilterState.userFirstName.toLowerCase().trim())) {
+                        console.log('RULED OUT: FIRST');
                         return;
                     }
                     // Last name doesn't match
@@ -3432,6 +3546,7 @@ const LogReviewer = (props) => {
                     log.userLastName
                         // Last name query doesn't match
                         && !log.userLastName.toLowerCase().includes(advancedFilterState.userLastName.toLowerCase().trim())) {
+                        console.log('RULED OUT: LAST');
                         return;
                     }
                     // Email doesn't match
@@ -3440,6 +3555,7 @@ const LogReviewer = (props) => {
                     log.userEmail
                         // Email query doesn't match
                         && !log.userEmail.toLowerCase().includes(advancedFilterState.userEmail.toLowerCase().trim())) {
+                        console.log('RULED OUT: EMAIL');
                         return;
                     }
                     // User id doesn't match
@@ -3448,6 +3564,7 @@ const LogReviewer = (props) => {
                     log.userId
                         // User id doesn't match
                         && !String(log.userId).includes(advancedFilterState.userId.trim())) {
+                        console.log('RULED OUT: USER ID');
                         return;
                     }
                     // Learner not allowed
@@ -3456,6 +3573,7 @@ const LogReviewer = (props) => {
                     log.isLearner
                         // Learners aren't included
                         && !advancedFilterState.includeLearners) {
+                        console.log('RULED OUT: LEARNER');
                         return;
                     }
                     // TTM not allowed
@@ -3464,6 +3582,7 @@ const LogReviewer = (props) => {
                     log.isTTM
                         // TTMs aren't included
                         && !advancedFilterState.includeTTMs) {
+                        console.log('RULED OUT: TTM');
                         return;
                     }
                     // Admin not allowed
@@ -3472,6 +3591,7 @@ const LogReviewer = (props) => {
                     log.isAdmin
                         // Admins aren't included
                         && !advancedFilterState.includeAdmins) {
+                        console.log('RULED OUT: ADMIN');
                         return;
                     }
                     // Course Id doesn't match
@@ -3480,6 +3600,7 @@ const LogReviewer = (props) => {
                     log.courseId
                         // Course Id doesn't match
                         && !String(log.courseId).includes(advancedFilterState.courseId.trim())) {
+                        console.log('RULED OUT: COURSE ID');
                         return;
                     }
                     // Course name doesn't match
@@ -3488,6 +3609,7 @@ const LogReviewer = (props) => {
                     log.courseName
                         // Course name doesn't match
                         && !String(log.courseName).includes(advancedFilterState.courseName.trim())) {
+                        console.log('RULED OUT: COURSE NAME');
                         return;
                     }
                     // Mobile filter doesn't match
@@ -3498,6 +3620,7 @@ const LogReviewer = (props) => {
                         && log.device
                         // Mobile filter doesn't match
                         && (advancedFilterState.isMobile === log.device.isMobile)) {
+                        console.log('RULED OUT: MOBILE');
                         return;
                     }
                     // Log source doesn't match
@@ -3508,6 +3631,7 @@ const LogReviewer = (props) => {
                         && log.source
                         // Source filter doesn't match
                         && (advancedFilterState.source !== log.source)) {
+                        console.log('RULED OUT: SOURCE');
                         return;
                     }
                     // Route path doesn't match (Only for server source)
@@ -3518,6 +3642,7 @@ const LogReviewer = (props) => {
                         && (advancedFilterState.routePath.trim().length)
                         // Route path doesn't match
                         && !(log.routePath.includes(advancedFilterState.routePath.trim()))) {
+                        console.log('RULED OUT: PATH');
                         return;
                     }
                     // Route template doesn't match (Only for server source)
@@ -3528,6 +3653,7 @@ const LogReviewer = (props) => {
                         && (advancedFilterState.routeTemplate.trim().length)
                         // Route template doesn't match
                         && !(log.routeTemplate.includes(advancedFilterState.routeTemplate.trim()))) {
+                        console.log('RULED OUT: TEMPLATE');
                         return;
                     }
                     /* -------------- Done -------------- */
@@ -3727,11 +3853,17 @@ const LogReviewer = (props) => {
             },
         ];
         // Create intelliTable
-        const dataTable = (React__default["default"].createElement(IntelliTable, { title: "Matching Logs", id: "logs", data: logs, columns: columns }));
+        const dataTable = (logs.length === 0
+            ? (React__default["default"].createElement(React__default["default"].Fragment, null,
+                React__default["default"].createElement("h3", { className: "m-0" }, "Matching Logs:"),
+                React__default["default"].createElement("div", { className: "alert alert-warning text-center" },
+                    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."))))
+            : (React__default["default"].createElement(IntelliTable, { title: "Matching Logs:", id: "logs", data: logs, columns: columns })));
         // Main body
         body = (React__default["default"].createElement(React__default["default"].Fragment, null,
             filters,
-            dataTable));
+            React__default["default"].createElement("div", { className: "mt-2" }, dataTable)));
     }
     /* ---------- Wrap in Modal --------- */
     return (React__default["default"].createElement("div", { className: "LogReviewer-outer-container" },
@@ -3739,14 +3871,10 @@ const LogReviewer = (props) => {
         React__default["default"].createElement("div", { className: "LogReviewer-inner-container" },
             React__default["default"].createElement("div", { className: "LogReviewer-header" },
                 React__default["default"].createElement("div", { className: "LogReviewer-header-title" },
-                    React__default["default"].createElement("h1", { className: "m-0" }, "Log Review Dashboard")),
-                React__default["default"].createElement("button", { type: "button", className: "LogReviewer-header-close-button btn btn-lg", "aria-label": "close log reviewer panel", onClick: onClose, style: {
-                        border: 0,
-                        backgroundColor: 'transparent',
-                        padding: 0,
-                        margin: 0,
-                    } },
-                    React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faTimes }))),
+                    React__default["default"].createElement("h3", { className: "text-center m-0" }, "Log Review Dashboard")),
+                React__default["default"].createElement("div", { style: { width: 0 } },
+                    React__default["default"].createElement("button", { type: "button", className: "LogReviewer-header-close-button btn btn-dark btn-lg pe-0", "aria-label": "close log reviewer panel", onClick: onClose },
+                        React__default["default"].createElement(reactFontawesome.FontAwesomeIcon, { icon: freeSolidSvgIcons.faTimes })))),
             React__default["default"].createElement("div", { className: "LogReviewer-contents" }, body))));
 };
 
@@ -3892,7 +4020,7 @@ const padZerosLeft = (num, numDigits) => {
  *   access to log review
  * @author Gabe Abrams
  */
-const LOG_REVIEW_STATUS_ROUTE = `/admin${ROUTE_PATH_PREFIX}/logs/access`;
+const LOG_REVIEW_STATUS_ROUTE = `${ROUTE_PATH_PREFIX}/logs/access_allowed`;
 
 // Stored copy of caccl functions
 let _cacclGetLaunchInfo;
@@ -3934,7 +4062,7 @@ const internalGetLogCollection = () => {
  * @param opts.getLaunchInfo CACCL LTI's get launch info function
  * @param [opts.logCollection] mongo collection from dce-mango to use for
  *   storing logs. If none is included, logs are written to the console
- * @param [opts.logReviewAdmins=all admins] info on which admins can review
+ * @param [opts.logReviewAdmins=all] info on which admins can review
  *   logs from the client. If not included, all Canvas admins are allowed to
  *   review logs. If null, no Canvas admins are allowed to review logs.
  *   If an array of Canvas userIds (numbers), only Canvas admins with those
@@ -4017,71 +4145,81 @@ const initServer = (opts) => {
     /*----------------------------------------*/
     /*              Log Reviewer              */
     /*----------------------------------------*/
-    if (opts.logReviewAdmins !== null) {
-        /**
-         * Check if a given user is allowed to review logs
-         * @author Gabe Abrams
-         * @param userId the id of the user
-         * @returns true if the user can review logs
-         */
-        const canReviewLogs = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                // Array of userIds
-                if (Array.isArray(opts.logReviewAdmins)) {
-                    return opts.logReviewAdmins.some((allowedId) => {
-                        return (userId === allowedId);
-                    });
-                }
-                // Must be a collection
-                const matches = yield opts.logReviewAdmins.find({ userId });
-                // Make sure at least one entry matches
-                return matches.length > 0;
+    /**
+     * Check if a given user is allowed to review logs
+     * @author Gabe Abrams
+     * @param userId the id of the user
+     * @param isAdmin if true, the user is an admin
+     * @returns true if the user can review logs
+     */
+    const canReviewLogs = (userId, isAdmin) => __awaiter(void 0, void 0, void 0, function* () {
+        // Immediately deny access if user is not an admin
+        if (!isAdmin) {
+            return false;
+        }
+        // If all admins are allowed, we're done
+        if (!opts.logReviewAdmins) {
+            return true;
+        }
+        // Do a dynamic check
+        try {
+            // Array of userIds
+            if (Array.isArray(opts.logReviewAdmins)) {
+                return opts.logReviewAdmins.some((allowedId) => {
+                    return (userId === allowedId);
+                });
             }
-            catch (err) {
-                // If an error occurred, simply return false
-                return false;
+            // Must be a collection
+            const matches = yield opts.logReviewAdmins.find({ userId });
+            // Make sure at least one entry matches
+            return matches.length > 0;
+        }
+        catch (err) {
+            // If an error occurred, simply return false
+            return false;
+        }
+    });
+    /**
+     * Check if the current user has access to logs
+     * @author Gabe Abrams
+     * @returns {boolean} true if user has access
+     */
+    opts.app.get(LOG_REVIEW_STATUS_ROUTE, genRouteHandler({
+        handler: ({ params }) => __awaiter(void 0, void 0, void 0, function* () {
+            const { userId, isAdmin } = params;
+            const canReview = yield canReviewLogs(userId, isAdmin);
+            return canReview;
+        }),
+    }));
+    /**
+     * Get all logs for a certain month
+     * @author Gabe Abrams
+     * @param {number} year the year to query (e.g. 2022)
+     * @param {number} month the month to query (e.g. 1 = January)
+     * @returns {Log[]} list of logs from the given month
+     */
+    opts.app.get(`${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/:year/months/:month`, genRouteHandler({
+        paramTypes: {
+            year: ParamType$1.Int,
+            month: ParamType$1.Int,
+        },
+        handler: ({ params }) => __awaiter(void 0, void 0, void 0, function* () {
+            // Get user info
+            const { year, month, userId, isAdmin, } = params;
+            // Validate user
+            const canReview = yield canReviewLogs(userId, isAdmin);
+            if (!canReview) {
+                throw new ErrorWithCode('You cannot access this resource because you do not have the appropriate permissions.', ReactKitErrorCode$1.NotAllowedToReviewLogs);
             }
-        });
-        /**
-         * Check if the current user has access to logs
-         * @author Gabe Abrams
-         * @returns {boolean} true if user has access
-         */
-        opts.app.get(LOG_REVIEW_STATUS_ROUTE, genRouteHandler({
-            handler: ({ params }) => __awaiter(void 0, void 0, void 0, function* () {
-                const { userId } = params;
-                const canReview = yield canReviewLogs(userId);
-                return canReview;
-            }),
-        }));
-        /**
-         * Get all logs for a certain month
-         * @author Gabe Abrams
-         * @param {number} year the year to query (e.g. 2022)
-         * @param {number} month the month to query (e.g. 1 = January)
-         * @returns {Log[]} list of logs from the given month
-         */
-        opts.app.post(`${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/:year/months/:month`, genRouteHandler({
-            paramTypes: {
-                year: ParamType$1.Int,
-                month: ParamType$1.Int,
-            },
-            handler: ({ params }) => __awaiter(void 0, void 0, void 0, function* () {
-                // Get user info
-                const { userId } = params;
-                // Validate user
-                // isAdmin is already checked because path starts with '/admin'
-                const canReview = yield canReviewLogs(userId);
-                if (!canReview) {
-                    throw new ErrorWithCode('You cannot access this resource because you do not have the appropriate permissions.', ReactKitErrorCode$1.NotAllowedToReviewLogs);
-                }
-                // Query for logs
-                const logs = yield _logCollection.find({ userId });
-                // Return logs
-                return logs;
-            }),
-        }));
-    }
+            // Query for logs
+            const logs = yield _logCollection.find({
+                year,
+                month,
+            });
+            // Return logs
+            return logs;
+        }),
+    }));
 };
 
 // Import shared types
@@ -4381,18 +4519,6 @@ const parseUserAgent = (userAgent) => {
     };
 };
 
-/**
- * Allowed log levels
- * @author Gabe Abrams
- */
-var LogLevel;
-(function (LogLevel) {
-    LogLevel["Warn"] = "Warn";
-    LogLevel["Info"] = "Info";
-    LogLevel["Debug"] = "Debug";
-})(LogLevel || (LogLevel = {}));
-var LogLevel$1 = LogLevel;
-
 /**
  * Generate an express API route handler
  * @author Gabe Abrams
@@ -4765,7 +4891,7 @@ const genRouteHandler = (opts) => {
                     }
                     : {
                         type: LogType$1.Action,
-                        target: ((_m = opts.target) !== null && _m !== void 0 ? _m : LogBuiltInMetadata.Target.NoSpecificTarget),
+                        target: ((_m = opts.target) !== null && _m !== void 0 ? _m : LogBuiltInMetadata.Target.NoTarget),
                         action: ((_o = opts.action) !== null && _o !== void 0 ? _o : LogAction$1.Unknown),
                     });
                 // Source-specific info
@@ -5132,6 +5258,31 @@ const initLogCollection = (Collection) => {
     });
 };
 
+// Cache user's ability
+let canReview = undefined;
+/**
+ * Check if the current user can review logs
+ * @author Gabe Abrams
+ * @returns true if current user can review logs
+ */
+const canReviewLogs = () => __awaiter(void 0, void 0, void 0, function* () {
+    // If cached, use that value
+    if (canReview !== undefined) {
+        return canReview;
+    }
+    // Ask on server
+    try {
+        canReview = !!(yield visitServerEndpoint({
+            path: LOG_REVIEW_STATUS_ROUTE,
+            method: 'GET',
+        }));
+    }
+    catch (err) {
+        canReview = false;
+    }
+    return canReview;
+});
+
 /**
  * Days of the week
  * @author Gabe Abrams
@@ -5184,6 +5335,7 @@ exports.Variant = Variant$1;
 exports.abbreviate = abbreviate;
 exports.alert = alert$1;
 exports.avg = avg;
+exports.canReviewLogs = canReviewLogs;
 exports.ceilToNumDecimals = ceilToNumDecimals;
 exports.confirm = confirm;
 exports.floorToNumDecimals = floorToNumDecimals;