dce-reactkit 3.2.2-beta.4 → 3.2.2-beta.40

package/src/components/SimpleDateChooser.tsx

@@ -111,13 +111,26 @@ const SimpleDateChooser: React.FC<Props> = (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({

package/src/helpers/genCSV.ts

@@ -5,13 +5,13 @@
  * @returns escaped cell text
  */
 const escapeCellText = (text: string): string => {
-  if (!text.includes(',')) {
+  if (!String(text).includes(',')) {
     // No need to escape
-    return text;
+    return String(text);
   }
 
   // Perform escape
-  return `"${text.replace(/"/g, '""')}`;
+  return `"${String(text).replace(/"/g, '""')}`;
 };
 
 /**
@@ -46,7 +46,24 @@ const genCSV = (
     csv += (
       columns
         .map((column) => {
-          return escapeCellText(datum[column.param]);
+          let contents: string;
+          const cell = datum[column.param];
+          if (
+            typeof cell === 'string'
+            || typeof cell === 'number'
+          ) {
+            contents = String(cell);
+          } else if (
+            typeof cell === 'undefined'
+            || cell === null
+          ) {
+            contents = '';
+          } else if (typeof cell === 'object') {
+            contents = JSON.stringify(cell);
+          } else {
+            contents = '';
+          }
+          return escapeCellText(contents);
         })
         .join(',')
     );

package/src/helpers/genRouteHandler.ts

@@ -500,7 +500,7 @@ const genRouteHandler = (
           isAdmin: !!launchInfo.isAdmin,
           isTTM: !!launchInfo.isTTM,
           courseId: launchInfo.courseId,
-          courseName: launchInfo.courseName,
+          courseName: launchInfo.contextLabel,
           browser,
           device,
           year,
@@ -539,7 +539,7 @@ const genRouteHandler = (
               type: LogType.Action,
               target: (
                 (opts as any).target
-                ?? LogBuiltInMetadata.Target.NoSpecificTarget
+                ?? LogBuiltInMetadata.Target.NoTarget
               ),
               action: (
                 (opts as any).action

package/src/helpers/logClientEvent.tsx

@@ -2,6 +2,7 @@
 import LOG_ROUTE_PATH from '../constants/LOG_ROUTE_PATH';
 import LogBuiltInMetadata from '../types/LogBuiltInMetadata';
 import LogFunction from '../types/LogFunction';
+import LogLevel from '../types/LogLevel';
 
 // Import shared functions
 import visitServerEndpoint from './visitServerEndpoint';
@@ -27,6 +28,10 @@ const logClientEvent: LogFunction = async (opts) => {
         opts.subcontext
         ?? LogBuiltInMetadata.Context.Uncategorized
       ),
+      level: (
+        opts.level
+        ?? LogLevel.Info
+      ),
       tags: JSON.stringify(opts.tags ?? []),
       metadata: JSON.stringify(opts.metadata ?? {}),
       errorMessage: (
@@ -48,7 +53,7 @@ const logClientEvent: LogFunction = async (opts) => {
         (opts as any).action
           ? (
             (opts as any).target
-            ?? LogBuiltInMetadata.Target.NoSpecificTarget
+            ?? LogBuiltInMetadata.Target.NoTarget
           )
           : undefined
       ),

package/src/server/initServer.ts

@@ -240,7 +240,7 @@ const initServer = (
    * @param {number} month the month to query (e.g. 1 = January)
    * @returns {Log[]} list of logs from the given month
    */
-  opts.app.post(
+  opts.app.get(
     `${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/:year/months/:month`,
     genRouteHandler({
       paramTypes: {
@@ -249,10 +249,14 @@ const initServer = (
       },
       handler: async ({ params }) => {
         // Get user info
-        const { userId, isAdmin } = params;
+        const {
+          year,
+          month,
+          userId,
+          isAdmin,
+        } = params;
 
         // Validate user
-        // isAdmin is already checked because path starts with '/admin'
         const canReview = await canReviewLogs(userId, isAdmin);
         if (!canReview) {
           throw new ErrorWithCode(
@@ -262,7 +266,10 @@ const initServer = (
         }
 
         // Query for logs
-        const logs: Log[] = await _logCollection.find({ userId });
+        const logs: Log[] = await _logCollection.find({
+          year,
+          month,
+        });
 
         // Return logs
         return logs;

package/src/types/LogAction.ts

@@ -4,37 +4,37 @@
  */
 enum LogAction {
   // Target was opened by the user (it was not on screen, but now it is)
-  Open = 'open',
+  Open = 'Open',
   // Target was closed by the user (it was on screen, but now it is not)
-  Close = 'close',
+  Close = 'Close',
   // Target was cancelled by the user (it was on closed without saving)
-  Cancel = 'cancel',
+  Cancel = 'Cancel',
   // Target was expanded by the user (it always remains on screen, but size was changed)
-  Expand = 'expand',
+  Expand = 'Expand',
   // Target was collapsed by the user (it always remains on screen, but size was changed)
-  Collapse = 'collapse',
+  Collapse = 'Collapse',
   // Target was viewed by the user (only for items that are not opened or closed, those must use Open/Close actions)
-  View = 'view',
+  View = 'View',
   // Target interrupted the user (popup, dialog, validation message, etc. appeared without user prompting)
-  Interrupt = 'interrupt',
+  Interrupt = 'Interrupt',
   // Target was created by the user (it did not exist before)
-  Create = 'create',
+  Create = 'Create',
   // Target was edited by the user (it existed and was changed)
-  Edit = 'edit',
+  Edit = 'Edit',
   // Target was deleted by the user (it existed and now it doesn't)
-  Delete = 'delete',
+  Delete = 'Delete',
   // Target was added by the user (it already existed and was added to another place)
-  Add = 'add',
+  Add = 'Add',
   // Target was removed by the user (it was removed from something but still exists)
-  Remove = 'remove',
+  Remove = 'Remove',
   // Target was activated by the user (click, check, tap, keypress, etc.)
-  Activate = 'activate',
+  Activate = 'Activate',
   // Target was deactivated by the user (click away, uncheck, tap outside of, tab away, etc.)
-  Deactivate = 'deactivate',
+  Deactivate = 'Deactivate',
   // User showed interest in a target (hover, peek, etc.)
-  Peek = 'peek',
+  Peek = 'Peek',
   // Unknown action
-  Unknown = 'unknown',
+  Unknown = 'Unknown',
 };
 
 export default LogAction;

package/src/types/LogBuiltInMetadata.ts

@@ -5,14 +5,14 @@
 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',
   },
 };