dce-reactkit 3.2.2-beta.46 → 3.2.2-beta.48

package/dist/cjs/index.js

@@ -3131,34 +3131,34 @@ const LogReviewer = (props) => {
     /*------------------------------------------------------------------------*/
     /*                                  Setup                                 */
     /*------------------------------------------------------------------------*/
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f;
     /* -------------- 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 (
-        // Context exists
-        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;
-        }
+    // Create complete map of contexts
+    const contextMap = {};
+    [
+        ((_a = LogMetadata.Context) !== null && _a !== void 0 ? _a : {}),
+        LogBuiltInMetadata.Context,
+    ].forEach((partialContextMap) => {
+        Object.keys(partialContextMap).forEach((context) => {
+            // Add context
+            contextMap[context] = context;
+            // If context has children, add an "uncategorized" subcontext
+            if (typeof contextMap[context] !== 'string') {
+                contextMap[context][LogBuiltInMetadata.Context.Uncategorized] = (LogBuiltInMetadata.Context.Uncategorized);
+            }
+        });
     });
-    // > 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;
-        }
+    // Create complete map of targets
+    const targetMap = {};
+    [
+        ((_b = LogMetadata.Target) !== null && _b !== void 0 ? _b : {}),
+        LogBuiltInMetadata.Target,
+    ].forEach((partialTargetMap) => {
+        Object.keys(partialTargetMap).forEach((target) => {
+            targetMap[target] = target;
+        });
     });
     /* -------------- State ------------- */
     // Create initial date filter state
@@ -3179,7 +3179,7 @@ const LogReviewer = (props) => {
     };
     // Create initial context filter state
     const initContextFilterState = {};
-    Object.keys((_d = LogMetadata.Context) !== null && _d !== void 0 ? _d : {}).forEach((context) => {
+    Object.keys((_c = LogMetadata.Context) !== null && _c !== void 0 ? _c : {}).forEach((context) => {
         var _a, _b;
         const contextValue = ((_a = LogMetadata.Context) !== null && _a !== void 0 ? _a : {})[context];
         if (typeof contextValue === 'string') {
@@ -3201,7 +3201,7 @@ const LogReviewer = (props) => {
     });
     // Create initial tag filter state
     const initTagFilterState = {};
-    Object.keys((_e = LogMetadata.Tag) !== null && _e !== void 0 ? _e : {}).forEach((tag) => {
+    Object.keys((_d = LogMetadata.Tag) !== null && _d !== void 0 ? _d : {}).forEach((tag) => {
         initTagFilterState[tag] = false;
     });
     // Create advanced filter state
@@ -3228,7 +3228,7 @@ const LogReviewer = (props) => {
         target: {},
         action: {},
     };
-    Object.values((_f = LogMetadata.Target) !== null && _f !== void 0 ? _f : {}).forEach((target) => {
+    Object.values((_e = LogMetadata.Target) !== null && _e !== void 0 ? _e : {}).forEach((target) => {
         initActionErrorFilterState.target[target] = true;
     });
     Object.values(LogAction$1).forEach((action) => {
@@ -3422,7 +3422,7 @@ const LogReviewer = (props) => {
                             initDateFilterState,
                             initTagFilterState,
                         });
-                    } }, "Reset All"))));
+                    } }, "Reset"))));
         // Filter drawer
         let filterDrawer;
         if (expandedFilterDrawer) {
@@ -3450,10 +3450,16 @@ const LogReviewer = (props) => {
             }
             else if (expandedFilterDrawer === FilterDrawer.Context) {
                 // Create item picker items
-                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];
+                const builtInPickableItem = {
+                    id: '_',
+                    name: 'Auto-logged',
+                    isGroup: true,
+                    children: [],
+                };
+                const pickableItems = [];
+                Object.keys(contextMap)
+                    .forEach((context) => {
+                    const value = (contextMap)[context];
                     if (typeof value === 'string') {
                         // No subcategories
                         const item = {
@@ -3462,13 +3468,24 @@ const LogReviewer = (props) => {
                             isGroup: false,
                             checked: !!contextFilterState[context],
                         };
-                        return item;
+                        // Add built-in items to its own folder
+                        const isBuiltIn = context in LogBuiltInMetadata.Context;
+                        if (isBuiltIn) {
+                            // Add to built-in pickable item
+                            builtInPickableItem.children.push(item);
+                        }
+                        else {
+                            // Add to pickable items list
+                            pickableItems.push(item);
+                        }
                     }
                     // Has subcategories
                     const children = (Object.keys(value)
+                        // Remove parent name
                         .filter((subcontext) => {
                         return subcontext !== '_';
                     })
+                        // Create child pickable items
                         .map((subcontext) => {
                         return {
                             id: subcontext,
@@ -3483,19 +3500,32 @@ const LogReviewer = (props) => {
                         isGroup: true,
                         children,
                     };
-                    return item;
-                }));
+                    pickableItems.push(item);
+                });
+                // Add built-in contexts to end ofl ist
+                pickableItems.push(builtInPickableItem);
                 // Create filter UI
                 filterDrawer = (React__default["default"].createElement(ItemPicker, { title: "Context", items: pickableItems, onChanged: (updatedItems) => {
                         // Update our state
                         updatedItems.forEach((pickableItem) => {
                             if (pickableItem.isGroup) {
                                 // Has subcontexts
-                                pickableItem.children.forEach((subcontextItem) => {
-                                    if (!subcontextItem.isGroup) {
-                                        contextFilterState[pickableItem.id][subcontextItem.id] = (subcontextItem.checked);
-                                    }
-                                });
+                                if (pickableItem.id === '_') {
+                                    // Built-in
+                                    // Treat as if these were top-level contexts
+                                    pickableItem.children.forEach((subcontextItem) => {
+                                        contextFilterState[subcontextItem.id] = ('checked' in subcontextItem
+                                            && subcontextItem.checked);
+                                    });
+                                }
+                                else {
+                                    // Not built-in
+                                    pickableItem.children.forEach((subcontextItem) => {
+                                        if (!subcontextItem.isGroup) {
+                                            contextFilterState[pickableItem.id][subcontextItem.id] = (subcontextItem.checked);
+                                        }
+                                    });
+                                }
                             }
                             else {
                                 // No subcontexts
@@ -3510,17 +3540,19 @@ const LogReviewer = (props) => {
             }
             else if (expandedFilterDrawer === FilterDrawer.Tag) {
                 // Create filter UI
-                filterDrawer = (React__default["default"].createElement(TabBox, { title: "Tags" }, Object.keys((_h = LogMetadata.Tag) !== null && _h !== void 0 ? _h : {})
-                    .map((tag, i) => {
-                    const description = genHumanReadableName(tag);
-                    return (React__default["default"].createElement(CheckboxButton, { id: `LogReviewer-tag-${tag}-checkbox`, text: description, ariaLabel: `require that logs be tagged with "${description}" or any other selected tag`, noMarginOnRight: i === Object.keys(tagFilterState).length - 1, checked: tagFilterState[tag], onChanged: (checked) => {
-                            tagFilterState[tag] = checked;
-                            dispatch({
-                                type: ActionType.UpdateTagFilterState,
-                                tagFilterState,
-                            });
-                        } }));
-                })));
+                filterDrawer = (React__default["default"].createElement(TabBox, { title: "Tags" },
+                    React__default["default"].createElement("div", null, "If any are selected, logs must contain at least one but not necessarily all of the selected tags."),
+                    Object.keys((_f = LogMetadata.Tag) !== null && _f !== void 0 ? _f : {})
+                        .map((tag, i) => {
+                        const description = genHumanReadableName(tag);
+                        return (React__default["default"].createElement(CheckboxButton, { id: `LogReviewer-tag-${tag}-checkbox`, text: description, ariaLabel: `require that logs be tagged with "${description}" or any other selected tag`, noMarginOnRight: i === Object.keys(tagFilterState).length - 1, checked: tagFilterState[tag], onChanged: (checked) => {
+                                tagFilterState[tag] = checked;
+                                dispatch({
+                                    type: ActionType.UpdateTagFilterState,
+                                    tagFilterState,
+                                });
+                            } }));
+                    })));
             }
             else if (expandedFilterDrawer === FilterDrawer.Action) {
                 // Create filter UI
@@ -3549,23 +3581,22 @@ 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", className: "mb-2" }, Object.keys(LogAction$1)
-                            .map((action, i) => {
-                            const description = genHumanReadableName(action);
-                            return (React__default["default"].createElement(CheckboxButton, { key: action, id: `LogReviewer-action-${action}-checkbox`, text: description, ariaLabel: `include logs with action type "${description}" in results`, noMarginOnRight: i === Object.keys(LogAction$1).length - 1, checked: actionErrorFilterState.action[action], onChanged: (checked) => {
-                                    actionErrorFilterState.action[action] = checked;
-                                    console.log(actionErrorFilterState, action, checked);
-                                    dispatch({
-                                        type: ActionType.UpdateActionErrorFilterState,
-                                        actionErrorFilterState,
-                                    });
-                                } }));
-                        })),
+                        React__default["default"].createElement(ButtonInputGroup, { label: "Action", className: "mb-2" },
+                            React__default["default"].createElement("div", { className: "grid gap-1" }, Object.keys(LogAction$1)
+                                .map((action) => {
+                                const description = genHumanReadableName(action);
+                                return (React__default["default"].createElement(CheckboxButton, { key: action, id: `LogReviewer-action-${action}-checkbox`, text: description, ariaLabel: `include logs with action type "${description}" in results`, noMarginOnRight: true, checked: actionErrorFilterState.action[action], onChanged: (checked) => {
+                                        actionErrorFilterState.action[action] = checked;
+                                        console.log(actionErrorFilterState, action, checked);
+                                        dispatch({
+                                            type: ActionType.UpdateActionErrorFilterState,
+                                            actionErrorFilterState,
+                                        });
+                                    } }));
+                            }))),
                         React__default["default"].createElement(ButtonInputGroup, { label: "Target" },
-                            (Object.keys((_j = LogMetadata.Target) !== null && _j !== void 0 ? _j : {}).length === 0) && (React__default["default"].createElement("div", null, "This app does not have any targets yet.")),
-                            Object.keys((_k = LogMetadata.Target) !== null && _k !== void 0 ? _k : {})
-                                .map((target, i) => {
-                                var _a;
+                            React__default["default"].createElement("div", { className: "grid gap-1" }, Object.keys(targetMap)
+                                .map((target) => {
                                 const description = genHumanReadableName(target);
                                 return (React__default["default"].createElement(CheckboxButton, { key: target, id: `LogReviewer-target-${target}-checkbox`, text: description, ariaLabel: `include logs with target "${description}" in results`, checked: actionErrorFilterState.target[target], onChanged: (checked) => {
                                         actionErrorFilterState.target[target] = checked;
@@ -3574,13 +3605,13 @@ const LogReviewer = (props) => {
                                             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" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "Error Message"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for error message", value: actionErrorFilterState.errorMessage, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for error message", value: actionErrorFilterState.errorMessage, placeholder: "e.g. undefined is not a function", onChange: (e) => {
                                     actionErrorFilterState.errorMessage = e.target.value;
                                     dispatch({
                                         type: ActionType.UpdateActionErrorFilterState,
@@ -3589,7 +3620,7 @@ const LogReviewer = (props) => {
                                 } })),
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "Error Code"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for error code", value: actionErrorFilterState.errorCode, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for error code", value: actionErrorFilterState.errorCode, placeholder: "e.g. GC22", onChange: (e) => {
                                     actionErrorFilterState.errorCode = ((e.target.value)
                                         .trim()
                                         .toUpperCase());
@@ -3605,7 +3636,7 @@ const LogReviewer = (props) => {
                     React__default["default"].createElement(TabBox, { title: "User Info" },
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "User First Name"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user first name", value: advancedFilterState.userFirstName, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user first name", value: advancedFilterState.userFirstName, placeholder: "e.g. Divardo", onChange: (e) => {
                                     advancedFilterState.userFirstName = e.target.value;
                                     dispatch({
                                         type: ActionType.UpdateAdvancedFilterState,
@@ -3614,7 +3645,7 @@ const LogReviewer = (props) => {
                                 } })),
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "User Last Name"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user last name", value: advancedFilterState.userLastName, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user last name", value: advancedFilterState.userLastName, placeholder: "e.g. Calicci", onChange: (e) => {
                                     advancedFilterState.userLastName = e.target.value;
                                     dispatch({
                                         type: ActionType.UpdateAdvancedFilterState,
@@ -3623,7 +3654,7 @@ const LogReviewer = (props) => {
                                 } })),
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "User Email"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user email", value: advancedFilterState.userEmail, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user email", value: advancedFilterState.userEmail, placeholder: "e.g. calicci@fas.harvard.edu", onChange: (e) => {
                                     advancedFilterState.userEmail = ((e.target.value)
                                         .trim());
                                     dispatch({
@@ -3633,7 +3664,7 @@ const LogReviewer = (props) => {
                                 } })),
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "User Canvas Id"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for user canvas id", value: advancedFilterState.userId, onChange: (e) => {
+                            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)) {
@@ -3670,7 +3701,7 @@ const LogReviewer = (props) => {
                     React__default["default"].createElement(TabBox, { title: "Course Info" },
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "Course Name"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for course name", value: advancedFilterState.courseName, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for course name", value: advancedFilterState.courseName, placeholder: "e.g. GLC 200", onChange: (e) => {
                                     advancedFilterState.courseName = e.target.value;
                                     dispatch({
                                         type: ActionType.UpdateAdvancedFilterState,
@@ -3679,7 +3710,7 @@ const LogReviewer = (props) => {
                                 } })),
                         React__default["default"].createElement("div", { className: "input-group mb-2" },
                             React__default["default"].createElement("span", { className: "input-group-text" }, "Course Canvas Id"),
-                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for course canvas id", value: advancedFilterState.courseId, onChange: (e) => {
+                            React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for course canvas id", value: advancedFilterState.courseId, placeholder: "e.g. 15948", onChange: (e) => {
                                     const { value } = e.target;
                                     // Only update if value contains only numbers  
                                     if (/^\d+$/.test(value)) {
@@ -3740,7 +3771,7 @@ const LogReviewer = (props) => {
                         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) => {
+                                React__default["default"].createElement("input", { type: "text", className: "form-control", "aria-label": "query for server route path", value: advancedFilterState.routePath, placeholder: "e.g. /api/ttm/courses/12345", onChange: (e) => {
                                         advancedFilterState.courseName = ((e.target.value)
                                             .trim());
                                         dispatch({