dce-reactkit 3.9.4-beta-prompt.2 → 3.9.4-beta-logreviewer.2

package/src/components/Modal/index.tsx

@@ -49,9 +49,6 @@ const modalTypeToModalButtonTypes: {
   [ModalType.Okay]: [
     ModalButtonType.Okay,
   ],
-  [ModalType.Cancel]: [
-    ModalButtonType.Cancel,
-  ],
   [ModalType.OkayCancel]: [
     ModalButtonType.Okay,
     ModalButtonType.Cancel,

package/src/index.ts

@@ -1,7 +1,6 @@
 // Import components
 import AppWrapper, {
   alert,
-  prompt,
   confirm,
   showFatalError,
   addFatalErrorHandler,
@@ -149,7 +148,6 @@ export {
   Dropdown,
   // Global functions
   alert,
-  prompt,
   confirm,
   showFatalError,
   // Errors

package/src/server/initServer.ts

@@ -234,26 +234,24 @@ const initServer = (
   );
 
   /**
-   * 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
-   */
+ * Get filtered logs based on provided filters
+ * @author Gabe Abrams, Yuen Ler Chow
+ * @returns {Log[]} list of logs that match the filters
+ */
   opts.app.get(
-    `${LOG_REVIEW_ROUTE_PATH_PREFIX}/years/:year/months/:month`,
+    `${LOG_REVIEW_ROUTE_PATH_PREFIX}/logs`,
     genRouteHandler({
       paramTypes: {
-        year: ParamType.Int,
-        month: ParamType.Int,
+        pageNumber: ParamType.Int,
+        filters: ParamType.JSON,
       },
       handler: async ({ params }) => {
-        // Get user info
+      // Get user info
         const {
-          year,
-          month,
+          pageNumber,
           userId,
           isAdmin,
+          filters,
         } = params;
 
         // Validate user
@@ -265,14 +263,149 @@ const initServer = (
           );
         }
 
+        // Build MongoDB query based on filters
+        const query: any = {};
+
+        /* -------------- Date Filter ------------- */
+        const { startDate, endDate } = filters.dateFilterState;
+        const startTimestamp = new Date(startDate.year, startDate.month - 1, startDate.day).getTime();
+        const endTimestamp = new Date(endDate.year, endDate.month - 1, endDate.day + 1).getTime() - 1;
+
+        query.timestamp = {
+          $gte: startTimestamp,
+          $lte: endTimestamp,
+        };
+
+        /* ------------ Context Filter ------------ */
+        const { contextFilterState } = filters;
+        const contextConditions: any[] = [];
+
+        Object.keys(contextFilterState).forEach((context) => {
+          const value = contextFilterState[context];
+          if (typeof value === 'boolean') {
+            if (value) {
+              // The entire context is selected
+              contextConditions.push({ context });
+            }
+          } else {
+            // The context has subcontexts
+            const subcontexts = Object.keys(value).filter((subcontext) => { return value[subcontext]; });
+            if (subcontexts.length > 0) {
+              contextConditions.push({
+                context,
+                subcontext: { $in: subcontexts },
+              });
+            }
+          }
+        });
+
+        if (contextConditions.length > 0) {
+          query.$or = contextConditions;
+        }
+
+        /* -------------- Tag Filter -------------- */
+        const { tagFilterState } = filters;
+        const selectedTags = Object.keys(tagFilterState).filter((tag) => { return tagFilterState[tag]; });
+        if (selectedTags.length > 0) {
+          query.tags = { $in: selectedTags };
+        }
+
+        /* --------- Action/Error Filter ---------- */
+        const { actionErrorFilterState } = filters;
+
+        if (actionErrorFilterState.type) {
+          query.type = actionErrorFilterState.type;
+        }
+
+        if (actionErrorFilterState.type === 'error' && actionErrorFilterState.errorMessage) {
+          query.errorMessage = { $regex: actionErrorFilterState.errorMessage, $options: 'i' };
+        }
+
+        if (actionErrorFilterState.type === 'error' && actionErrorFilterState.errorCode) {
+          query.errorCode = { $regex: actionErrorFilterState.errorCode, $options: 'i' };
+        }
+
+        if (actionErrorFilterState.type === 'action') {
+          const selectedTargets = Object.keys(actionErrorFilterState.target).filter(
+            (target) => { return actionErrorFilterState.target[target]; },
+          );
+          const selectedActions = Object.keys(actionErrorFilterState.action).filter(
+            (action) => { return actionErrorFilterState.action[action]; },
+          );
+          if (selectedTargets.length > 0) {
+            query.target = { $in: selectedTargets };
+          }
+          if (selectedActions.length > 0) {
+            query.action = { $in: selectedActions };
+          }
+        }
+
+        /* ------------ Advanced Filter ----------- */
+        const { advancedFilterState } = filters;
+
+        if (advancedFilterState.userFirstName) {
+          query.userFirstName = { $regex: advancedFilterState.userFirstName, $options: 'i' };
+        }
+
+        if (advancedFilterState.userLastName) {
+          query.userLastName = { $regex: advancedFilterState.userLastName, $options: 'i' };
+        }
+
+        if (advancedFilterState.userEmail) {
+          query.userEmail = { $regex: advancedFilterState.userEmail, $options: 'i' };
+        }
+
+        if (advancedFilterState.userId) {
+          query.userId = parseInt(advancedFilterState.userId, 10);
+        }
+
+        const roles = [];
+        if (advancedFilterState.includeLearners) {
+          roles.push({ isLearner: true });
+        }
+        if (advancedFilterState.includeTTMs) {
+          roles.push({ isTTM: true });
+        }
+        if (advancedFilterState.includeAdmins) {
+          roles.push({ isAdmin: true });
+        }
+        if (roles.length > 0) {
+          query.$and = [{ $or: roles }];
+        }
+
+        if (advancedFilterState.courseId) {
+          query.courseId = parseInt(advancedFilterState.courseId, 10);
+        }
+
+        if (advancedFilterState.courseName) {
+          query.courseName = { $regex: advancedFilterState.courseName, $options: 'i' };
+        }
+
+        if (advancedFilterState.isMobile !== undefined) {
+          query['device.isMobile'] = advancedFilterState.isMobile;
+        }
+
+        if (advancedFilterState.source) {
+          query.source = advancedFilterState.source;
+        }
+
+        if (advancedFilterState.routePath) {
+          query.routePath = { $regex: advancedFilterState.routePath, $options: 'i' };
+        }
+
+        if (advancedFilterState.routeTemplate) {
+          query.routeTemplate = { $regex: advancedFilterState.routeTemplate, $options: 'i' };
+        }
+
         // Query for logs
-        const logs: Log[] = await _logCollection.find({
-          year,
-          month,
+        const response = await _logCollection.findPaged({
+          query,
+          perPage: 50,
+          pageNumber,
         });
 
-        // Return logs
-        return logs;
+        // Return response
+        return response;
       },
     }),
   );

package/src/types/ModalType.tsx

@@ -4,7 +4,6 @@
  */
 enum ModalType {
   Okay = 'okay', // [Okay]
-  Cancel = 'cancel', // [Cancel]
   OkayCancel = 'okay-cancel', // [Okay] [Cancel]
   YesNo = 'yes-no', // [Yes] [No]
   YesNoCancel = 'yes-no-cancel', // [Yes] [No] [Cancel]