dce-reactkit 3.2.2-beta.52 → 3.2.2-beta.54

package/package.json

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

package/src/components/LogReviewer.tsx

@@ -765,7 +765,7 @@ const LogReviewer: React.FC<Props> = (props) => {
 
   // Create initial context filter state
   const initContextFilterState: ContextFilterState = {};
-  Object.keys(LogMetadata.Context ?? {}).forEach((context) => {
+  Object.keys(contextMap).forEach((context) => {
     const contextValue = (LogMetadata.Context ?? {})[context];
     if (typeof contextValue === 'string') {
       // Case: no subcontexts, init as checked
@@ -816,16 +816,12 @@ const LogReviewer: React.FC<Props> = (props) => {
     target: {},
     action: {},
   };
-  Object.values(LogMetadata.Target ?? {}).forEach((target) => {
+  Object.values(targetMap).forEach((target) => {
     initActionErrorFilterState.target[target] = true;
   });
   Object.values(LogAction).forEach((action) => {
     initActionErrorFilterState.action[action] = true;
   });
-  // Add built-in targets
-  Object.values(LogBuiltInMetadata.Target).forEach((target) => {
-    initActionErrorFilterState.target[target] = true;
-  });
 
   // Initial state
   const initialState: State = {
@@ -1195,7 +1191,7 @@ const LogReviewer: React.FC<Props> = (props) => {
       } else if (expandedFilterDrawer === FilterDrawer.Context) {
         // Create item picker items
         const builtInPickableItem: PickableItem = {
-          id: '_',
+          id: 'built-in-contexts',
           name: 'Auto-logged',
           isGroup: true,
           children: [],
@@ -1203,7 +1199,7 @@ const LogReviewer: React.FC<Props> = (props) => {
         const pickableItems: PickableItem[] = [];
         Object.keys(contextMap)
           .forEach((context) => {
-            const value = (contextMap)[context];
+            const value = contextMap[context];
             if (typeof value === 'string') {
               // No subcategories
               const item: PickableItem = {
@@ -1222,6 +1218,7 @@ const LogReviewer: React.FC<Props> = (props) => {
                 // Add to pickable items list
                 pickableItems.push(item);
               }
+              return;
             }
 
             // Has subcategories
@@ -1263,8 +1260,7 @@ const LogReviewer: React.FC<Props> = (props) => {
                 if (pickableItem.isGroup) {
                   // Has subcontexts
 
-                  
-                  if (pickableItem.id === '_') {
+                  if (pickableItem.id === 'built-in-contexts') {
                     // Built-in
 
                     // Treat as if these were top-level contexts
@@ -1305,32 +1301,35 @@ const LogReviewer: React.FC<Props> = (props) => {
         filterDrawer = (
           <TabBox title="Tags">
             <div>
-              If any are selected, logs must contain at least one
-              but not necessarily all of the
+              If any tags are selected, logs must contain at least one
+              (but not necessarily all) of the
               selected tags.
             </div>
-            {
-              Object.keys(LogMetadata.Tag ?? {})
-                .map((tag, i) => {
-                  const description = genHumanReadableName(tag);
-                  return (
-                    <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,
-                        });
-                      }}
-                    />
-                  );
-                })
-            }
+            <div className="d-flex gap-1 flex-wrap">
+              {
+                Object.keys(LogMetadata.Tag ?? {})
+                  .map((tag) => {
+                    const description = genHumanReadableName(tag);
+                    return (
+                      <CheckboxButton
+                        key={tag}
+                        id={`LogReviewer-tag-${tag}-checkbox`}
+                        text={description}
+                        ariaLabel={`require that logs be tagged with "${description}" or any other selected tag`}
+                        checked={tagFilterState[tag]}
+                        onChanged={(checked) => {
+                          tagFilterState[tag] = checked;
+                          console.log(tagFilterState);
+                          dispatch({
+                            type: ActionType.UpdateTagFilterState,
+                            tagFilterState,
+                          });
+                        }}
+                      />
+                    );
+                  })
+              }
+            </div>
           </TabBox>
         );
       } else if (expandedFilterDrawer === FilterDrawer.Action) {
@@ -1407,7 +1406,6 @@ const LogReviewer: React.FC<Props> = (props) => {
                                 checked={actionErrorFilterState.action[action]}
                                 onChanged={(checked) => {
                                   actionErrorFilterState.action[action] = checked;
-                                  console.log(actionErrorFilterState, action, checked);
                                   dispatch({
                                     type: ActionType.UpdateActionErrorFilterState,
                                     actionErrorFilterState,
@@ -1437,7 +1435,6 @@ const LogReviewer: React.FC<Props> = (props) => {
                                 noMarginOnRight
                                 onChanged={(checked) => {
                                   actionErrorFilterState.target[target] = checked;
-                                  console.log(actionErrorFilterState, target, checked);
                                   dispatch({
                                     type: ActionType.UpdateActionErrorFilterState,
                                     actionErrorFilterState,
@@ -1513,7 +1510,7 @@ const LogReviewer: React.FC<Props> = (props) => {
         filterDrawer = (
           <>
             {/* User Info */}
-            <TabBox title="User Info">
+            <TabBox title="User">
               {/* First Name */}
               <div className="input-group mb-2">
                 <span className="input-group-text">
@@ -1646,7 +1643,7 @@ const LogReviewer: React.FC<Props> = (props) => {
             </TabBox>
 
             {/* Course Info */}
-            <TabBox title="Course Info">
+            <TabBox title="Course">
               {/* Name */}
               <div className="input-group mb-2">
                 <span className="input-group-text">
@@ -1697,7 +1694,7 @@ const LogReviewer: React.FC<Props> = (props) => {
             </TabBox>
 
             {/* Device Info */}
-            <TabBox title="Device Info">
+            <TabBox title="Device">
               <ButtonInputGroup label="Device Type">
                 <RadioButton
                   text="All Devices"