dce-reactkit 3.2.2-beta.16 → 3.2.2-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.2.2-beta.16",
+  "version": "3.2.2-beta.18",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/components/LogReviewer.tsx

@@ -34,6 +34,7 @@ import LogType from '../types/LogType';
 import LogAction from '../types/LogAction';
 import ParamType from '../types/ParamType';
 import IntelliTableColumn from '../types/IntelliTableColumn';
+import LogBuiltInMetadata from '../types/LogBuiltInMetadata';
 
 // Import shared components
 import SimpleDateChooser from './SimpleDateChooser';
@@ -256,6 +257,17 @@ const style = `
   }
 `;
 
+/*------------------------------------------------------------------------*/
+/*                                Constants                               */
+/*------------------------------------------------------------------------*/
+
+const builtInContextToName = {
+  [LogBuiltInMetadata.Context.Uncategorized]: 'Uncategorized',
+  [LogBuiltInMetadata.Context.ServerRenderedErrorPage]: 'Server Rendered Error Page',
+  [LogBuiltInMetadata.Context.ServerEndpointError]: 'Server Endpoint Error',
+  [LogBuiltInMetadata.Context.ClientFatalError]: 'Client Fatal Error',
+};
+
 /*------------------------------------------------------------------------*/
 /*                            Static Functions                            */
 /*------------------------------------------------------------------------*/
@@ -548,8 +560,12 @@ const LogReviewer: React.FC<Props> = (props) => {
         const subcontextValue = contextValue[subcontext];
         (initContextFilterState[contextValue._] as { [k: string]: boolean })[subcontextValue] = true;
       });
+      // Add uncategorized subcontext
+      (initContextFilterState[contextValue._] as { [k: string]: boolean })[LogBuiltInMetadata.Context.Uncategorized] = true;
     }
   });
+  // Add uncategorized context
+  initContextFilterState[LogBuiltInMetadata.Context.Uncategorized] = true;
 
   // Create initial tag filter state
   const initTagFilterState: TagFilterState = {};
@@ -966,7 +982,10 @@ const LogReviewer: React.FC<Props> = (props) => {
               );
               const item: PickableItem = {
                 id: context,
-                name: context,
+                name: (
+                  builtInContextToName[context]
+                  ?? genHumanReadableName(context)
+                ),
                 isGroup: true,
                 children,
               };
@@ -980,6 +999,8 @@ const LogReviewer: React.FC<Props> = (props) => {
             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) {
@@ -1601,8 +1622,10 @@ const LogReviewer: React.FC<Props> = (props) => {
 
           // Subcontext doesn't match
           if (
+            // Log context is not "uncategorized" (no point in further filters)
+            log.context !== LogBuiltInMetadata.Context.Uncategorized
             // Log has a subcontext
-            log.subcontext
+            && log.subcontext
             // Context has subcontexts
             && (
               contextFilterState[log.context]