@plusscommunities/pluss-maintenance-web-forms 1.1.36 → 1.1.37-beta.1

package/dist/index.umd.js

@@ -101,13 +101,7 @@
     hasHelpButton: true,
     helpGuideURL: 'https://www.plusscommunities.com/forms-feature',
     stringConfigJobStatus: 'maintenanceJobStatusForms',
-    stringConfigHideSeen: 'maintenanceDisableSeenForms',
-    // Comment subscription notification preference
-    notificationPreference: {
-      key: 'maintenancerequestFormsComments',
-      label: 'Forms comments',
-      permission: 'maintenanceTrackingForms'
-    }
+    stringConfigHideSeen: 'maintenanceDisableSeenForms'
   };
 
   // import * as PlussCore from '../../pluss-core/src';
@@ -230,8 +224,7 @@
     init: environment => {
       FeatureConfig.env = environment;
       PlussCore__namespace.Config.init(environment);
-    },
-    notificationPreference: values.notificationPreference
+    }
   };
 
   const JOBS_LOADED = values.actionJobsLoaded;
@@ -244,12 +237,12 @@
   function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
   function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   const {
-    Helper: Helper$5,
+    Helper: Helper$6,
     Session: Session$9
   } = PlussCore__namespace;
   const maintenanceActions = {
     getJobType: (site, typeId) => {
-      let url = Helper$5.getUrl(values.serviceKey, 'getjobtype');
+      let url = Helper$6.getUrl(values.serviceKey, 'getjobtype');
       return Session$9.authedFunction({
         method: 'POST',
         url,
@@ -260,7 +253,7 @@
       });
     },
     getJobTypes: (site, id) => {
-      let url = Helper$5.getUrl(values.serviceKey, 'getjobtypes');
+      let url = Helper$6.getUrl(values.serviceKey, 'getjobtypes');
       return Session$9.authedFunction({
         method: 'POST',
         url,
@@ -270,7 +263,7 @@
       });
     },
     getJob: (site, id) => {
-      let url = Helper$5.getUrl(values.serviceKey, 'getJob');
+      let url = Helper$6.getUrl(values.serviceKey, 'getJob');
       return Session$9.authedFunction({
         method: 'POST',
         url,
@@ -281,7 +274,7 @@
       });
     },
     getJobByJobId: (site, jobId) => {
-      let url = Helper$5.getUrl(values.serviceKey, 'getJob');
+      let url = Helper$6.getUrl(values.serviceKey, 'getJob');
       return Session$9.authedFunction({
         method: 'POST',
         url,
@@ -296,7 +289,7 @@
       let type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'getJobs'),
+        url: Helper$6.getUrl(values.serviceKey, 'getJobs'),
         data: {
           site,
           status,
@@ -319,7 +312,7 @@
       }
       return Session$9.authedFunction({
         method: 'GET',
-        url: Helper$5.getUrl(values.serviceKey, 'get/requests', query)
+        url: Helper$6.getUrl(values.serviceKey, 'get/requests', query)
       });
     },
     getJobsRecursive: function (site, status, type, lastKey) {
@@ -337,14 +330,14 @@
     createJob: job => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'sendMaintenance'),
+        url: Helper$6.getUrl(values.serviceKey, 'sendMaintenance'),
         data: _objectSpread$7({}, job)
       });
     },
     editJob: (job, site) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'editJob'),
+        url: Helper$6.getUrl(values.serviceKey, 'editJob'),
         data: {
           job,
           site
@@ -354,7 +347,7 @@
     deleteJob: (site, id) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'requests/remove'),
+        url: Helper$6.getUrl(values.serviceKey, 'requests/remove'),
         data: {
           site,
           id
@@ -364,7 +357,7 @@
     editJobStatus: (id, status) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'editJobStatus'),
+        url: Helper$6.getUrl(values.serviceKey, 'editJobStatus'),
         data: {
           id,
           status
@@ -374,7 +367,7 @@
     editJobPriority: (id, priority) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'update/priority'),
+        url: Helper$6.getUrl(values.serviceKey, 'update/priority'),
         data: {
           id,
           priority
@@ -384,7 +377,7 @@
     assignJob: (jobId, userId) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'update/assign'),
+        url: Helper$6.getUrl(values.serviceKey, 'update/assign'),
         data: {
           id: jobId,
           userId
@@ -394,7 +387,7 @@
     getAssignees: site => {
       return Session$9.authedFunction({
         method: 'GET',
-        url: Helper$5.getUrl(values.serviceKey, 'get/assignees', {
+        url: Helper$6.getUrl(values.serviceKey, 'get/assignees', {
           site
         })
       });
@@ -402,7 +395,7 @@
     addNote: (jobId, note, attachments, images) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
+        url: Helper$6.getUrl(values.serviceKey, 'requests/note'),
         data: {
           id: jobId,
           note,
@@ -415,7 +408,7 @@
     editNote: (jobId, noteId, note, attachments, images) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
+        url: Helper$6.getUrl(values.serviceKey, 'requests/note'),
         data: {
           id: jobId,
           note,
@@ -429,7 +422,7 @@
     deleteNote: (jobId, noteId) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
+        url: Helper$6.getUrl(values.serviceKey, 'requests/note'),
         data: {
           id: jobId,
           noteId,
@@ -449,7 +442,7 @@
       };
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'createJobType'),
+        url: Helper$6.getUrl(values.serviceKey, 'createJobType'),
         data
       });
     },
@@ -467,14 +460,14 @@
       if (hasCustomFields && customFields) data.customFields = customFields;
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'editJobType'),
+        url: Helper$6.getUrl(values.serviceKey, 'editJobType'),
         data
       });
     },
     deleteJobType: (site, id) => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'deleteJobType'),
+        url: Helper$6.getUrl(values.serviceKey, 'deleteJobType'),
         data: {
           site,
           id
@@ -484,7 +477,7 @@
     getExternalSync: jobId => {
       return Session$9.authedFunction({
         method: 'GET',
-        url: Helper$5.getUrl(values.serviceKey, 'get/externalsync', {
+        url: Helper$6.getUrl(values.serviceKey, 'get/externalsync', {
           id: jobId
         })
       });
@@ -492,7 +485,7 @@
     retrySync: jobId => {
       return Session$9.authedFunction({
         method: 'POST',
-        url: Helper$5.getUrl(values.serviceKey, 'update/retrysync'),
+        url: Helper$6.getUrl(values.serviceKey, 'update/retrysync'),
         data: {
           id: jobId
         }
@@ -501,7 +494,7 @@
   };
 
   const {
-    Helper: Helper$4,
+    Helper: Helper$5,
     Session: Session$8
   } = PlussCore__namespace;
   const reactionActions = {
@@ -519,7 +512,7 @@
       }
       return Session$8.authedFunction({
         method: 'POST',
-        url: Helper$4.getUrl('reactions', 'comments/add'),
+        url: Helper$5.getUrl('reactions', 'comments/add'),
         data
       });
     },
@@ -542,7 +535,7 @@
       }
       return Session$8.authedFunction({
         method: 'GET',
-        url: Helper$4.getUrl('reactions', 'comments/get', query)
+        url: Helper$5.getUrl('reactions', 'comments/get', query)
       });
     }
   };
@@ -576,7 +569,7 @@
   ];
 
   const {
-    Helper: Helper$3
+    Helper: Helper$4
   } = PlussCore__namespace;
   const jobsUpdate = (site, isdashboard) => {
     return dispatch => {
@@ -584,7 +577,7 @@
         type: JOBS_LOADING
       });
       maintenanceActions.getJobsRecursive(site).then(res => {
-        const currentSite = Helper$3.readStorageWithCookie('site');
+        const currentSite = Helper$4.readStorageWithCookie('site');
         if (!___default["default"].isEmpty(res) && res[0].site === currentSite) {
           dispatch({
             type: JOBS_LOADED,
@@ -2721,7 +2714,7 @@
   function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
   const {
     Apis: Apis$1,
-    Helper: Helper$2,
+    Helper: Helper$3,
     Session: Session$3,
     Colours: Colours$1,
     Components: Components$3
@@ -3123,7 +3116,7 @@
         }
       });
       this.state = {
-        jobId: Helper$2.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
+        jobId: Helper$3.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
         job: null,
         showingSelector: false,
         updating: false,
@@ -3326,7 +3319,7 @@
         }, /*#__PURE__*/React__default["default"].createElement("div", {
           className: "imageGrid_image",
           style: {
-            backgroundImage: "url('".concat(Helper$2.get1400(image), "')"),
+            backgroundImage: "url('".concat(Helper$3.get1400(image), "')"),
             width: size,
             height: size
           }
@@ -3541,7 +3534,7 @@
         }]
       })), /*#__PURE__*/React__default["default"].createElement("p", {
         className: "maintenanceNote_text"
-      }, Helper$2.toParagraphed(note.Note)), note.Attachments.map((a, i) => this.renderAttachment(a, i)), note.Images && note.Images.length > 0 ? this.renderImageGrid(note.Images, IMAGE_SIZE_NOTE) : null));
+      }, Helper$3.toParagraphed(note.Note)), note.Attachments.map((a, i) => this.renderAttachment(a, i)), note.Images && note.Images.length > 0 ? this.renderImageGrid(note.Images, IMAGE_SIZE_NOTE) : null));
     }
     renderAssignment() {
       const {
@@ -3975,7 +3968,7 @@
   const {
     Actions,
     Components: Components$2,
-    Helper: Helper$1,
+    Helper: Helper$2,
     Session: Session$2,
     Colours,
     Apis
@@ -4333,7 +4326,7 @@
           if (___default["default"].isNil(answer) || ___default["default"].isEmpty(answer)) return true;
           switch (type) {
             case "email":
-              return Helper$1.isEmail(answer);
+              return Helper$2.isEmail(answer);
             case "date":
               return moment__default["default"](answer, "YYYY-MM-DD", true).isValid();
             case "time":
@@ -4354,7 +4347,7 @@
       this.customImageInputs = {};
       this.customDocumentInputs = {};
       this.state = {
-        jobId: Helper$1.safeReadParams(this.props, "jobId") ? this.props.match.params.jobId : null,
+        jobId: Helper$2.safeReadParams(this.props, "jobId") ? this.props.match.params.jobId : null,
         job: null,
         showingSelector: false,
         updating: false,
@@ -4706,7 +4699,7 @@
           return /*#__PURE__*/React__default["default"].createElement("p", {
             className: "visitorSignIn_text-staticText",
             key: fieldId
-          }, Helper$1.toParagraphed(field.label, {
+          }, Helper$2.toParagraphed(field.label, {
             marginTop: 10
           }));
         case "date":
@@ -4961,7 +4954,7 @@
     return {
       auth,
       strings: state.strings && state.strings.config || {},
-      optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents)
+      optionOnlyForResidents: Helper$2.getSiteSettingFromState(state, values.optionOnlyForResidents)
     };
   };
   var AddJob$1 = reactRedux.connect(mapStateToProps$2, {
@@ -4973,7 +4966,7 @@
   const {
     Components: Components$1,
     Session: Session$1,
-    Helper
+    Helper: Helper$1
   } = PlussCore__namespace;
   const DEFAULT_FIELD = {
     type: 'text',
@@ -5016,7 +5009,7 @@
         const {
           jobTypeEmail
         } = this.state;
-        return !___default["default"].isEmpty(jobTypeEmail) && Helper.isEmail(jobTypeEmail);
+        return !___default["default"].isEmpty(jobTypeEmail) && Helper$1.isEmail(jobTypeEmail);
       });
       _defineProperty__default["default"](this, "isJobTypeValid", () => {
         const {
@@ -5218,7 +5211,7 @@
       }];
       this.state = {
         loading: false,
-        jobTypeId: Helper.safeReadParams(this.props, 'jobTypeId') ? this.props.match.params.jobTypeId : null,
+        jobTypeId: Helper$1.safeReadParams(this.props, 'jobTypeId') ? this.props.match.params.jobTypeId : null,
         jobTypeName: '',
         jobTypeEmail: '',
         jobTypeDescription: '',
@@ -5770,7 +5763,8 @@
   const {
     Analytics: Analytics$1,
     Session,
-    Components
+    Components,
+    Helper
   } = PlussCore__namespace;
   const getInitialState = () => ({
     requests: 0,
@@ -5790,10 +5784,21 @@
       auth,
       prevText,
       dayCount,
-      strings
+      strings,
+      userType,
+      userCategory,
+      selectedSites
     } = _ref;
     const [analyticsData, setAnalyticsData] = React.useState(getInitialState());
     const [isExportOpen, setIsExportOpen] = React.useState(false);
+    const [failedSites, setFailedSites] = React.useState([]);
+    const [comparisonData, setComparisonData] = React.useState({
+      requests: [],
+      completedRequests: [],
+      comments: [],
+      isLoading: true
+    });
+    const comparisonMode = selectedSites && selectedSites.length > 1;
     const hasAccess = Session.validateAccess(auth.site, values.permissionMaintenanceTracking, auth);
     if (!hasAccess) {
       return null;
@@ -5805,50 +5810,120 @@
       return strings.sideNav[key];
     })();
     const exportColumns = [{
-      label: 'Select All',
-      key: ''
-    }, {
-      label: 'Start Date',
-      key: 'startDate'
+      label: "Select All",
+      key: ""
+    }, ...(comparisonMode ? [{
+      label: "Site",
+      key: "site"
+    }] : []), {
+      label: "Start Date",
+      key: "startDate"
     }, {
-      label: 'End Date',
-      key: 'endDate'
+      label: "End Date",
+      key: "endDate"
     }, {
       label: "".concat(values.textSingularName, "s"),
-      key: 'requests'
+      key: "requests"
     }, {
       label: "Completed ".concat(values.textSingularName, "s"),
-      key: 'completedRequests'
+      key: "completedRequests"
     }, {
-      label: 'Comments',
-      key: 'comments'
+      label: "Comments",
+      key: "comments"
     }];
     React.useEffect(() => {
       getData();
-    }, [startTime, endTime]);
+    }, [startTime, endTime, userType, userCategory, selectedSites]);
     const getData = async () => {
-      setAnalyticsData(getInitialState());
-      // Load analytics data here using startTime and endTime
-      const timeDifference = endTime - startTime;
-      const [currentStatsResponse, prevStatsResponse] = await Promise.all([analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime, endTime, true), analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime - timeDifference, startTime, true)]);
-      const data = {
-        requests: Analytics$1.countActivities(currentStatsResponse.data, 'Request', 'total'),
-        prevRequests: Analytics$1.countActivities(prevStatsResponse.data, 'Request', 'total'),
-        completedRequests: Analytics$1.countActivities(currentStatsResponse.data, 'RequestCompleted', 'unique'),
-        prevCompletedRequests: Analytics$1.countActivities(prevStatsResponse.data, 'RequestCompleted', 'unique'),
-        comments: Analytics$1.countActivities(currentStatsResponse.data, 'Comment', 'total'),
-        prevComments: Analytics$1.countActivities(prevStatsResponse.data, 'Comment', 'total'),
-        isLoading: false
-      };
-      setAnalyticsData(data);
+      if (comparisonMode) {
+        setComparisonData({
+          requests: [],
+          completedRequests: [],
+          comments: [],
+          isLoading: true
+        });
+        const multiSiteResultsObj = await Analytics$1.fetchMultiSiteData(selectedSites, async site => {
+          const {
+            data
+          } = await analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
+            userType,
+            userCategory
+          });
+          return data;
+        });
+        const roles = auth.user.Roles;
+        const failed = Object.entries(multiSiteResultsObj).filter(_ref2 => {
+          let [, data] = _ref2;
+          return data === null;
+        }).map(_ref3 => {
+          let [site] = _ref3;
+          return Helper.getSiteNameFromRoles(site, roles);
+        });
+        setFailedSites(failed);
+        const multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref4 => {
+          let [, data] = _ref4;
+          return data !== null;
+        }).map(_ref5 => {
+          let [site, data] = _ref5;
+          return {
+            site,
+            data
+          };
+        });
+        const buildComparison = (activityKey, countType) => multiSiteResults.map(result => ({
+          name: Helper.getSiteNameFromRoles(result.site, roles),
+          value: Analytics$1.countActivities(result.data, activityKey, countType)
+        }));
+        setComparisonData({
+          requests: buildComparison("Request", "total"),
+          completedRequests: buildComparison("RequestCompleted", "unique"),
+          comments: buildComparison("Comment", "total"),
+          isLoading: false
+        });
+      } else {
+        setAnalyticsData(getInitialState());
+        const site = selectedSites && selectedSites.length === 1 ? selectedSites[0] : auth.site;
+        const timeDifference = endTime - startTime;
+        const [currentStatsResponse, prevStatsResponse] = await Promise.all([analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
+          userType,
+          userCategory
+        }), analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime - timeDifference, startTime, true, {
+          userType,
+          userCategory
+        })]);
+        const data = {
+          requests: Analytics$1.countActivities(currentStatsResponse.data, "Request", "total"),
+          prevRequests: Analytics$1.countActivities(prevStatsResponse.data, "Request", "total"),
+          completedRequests: Analytics$1.countActivities(currentStatsResponse.data, "RequestCompleted", "unique"),
+          prevCompletedRequests: Analytics$1.countActivities(prevStatsResponse.data, "RequestCompleted", "unique"),
+          comments: Analytics$1.countActivities(currentStatsResponse.data, "Comment", "total"),
+          prevComments: Analytics$1.countActivities(prevStatsResponse.data, "Comment", "total"),
+          isLoading: false
+        };
+        setAnalyticsData(data);
+      }
     };
     const isReadyToOpenCSV = () => {
-      return !analyticsData.isLoading;
+      return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
     };
     const getExportSource = () => {
+      if (comparisonMode) {
+        const sites = comparisonData.requests || [];
+        return sites.map((site, i) => {
+          var _comparisonData$compl, _comparisonData$comme;
+          return {
+            site: site.name,
+            startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
+            endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
+            requests: site.value,
+            completedRequests: ((_comparisonData$compl = comparisonData.completedRequests[i]) === null || _comparisonData$compl === void 0 ? void 0 : _comparisonData$compl.value) || 0,
+            comments: ((_comparisonData$comme = comparisonData.comments[i]) === null || _comparisonData$comme === void 0 ? void 0 : _comparisonData$comme.value) || 0
+          };
+        });
+      }
       return [{
-        startDate: moment__default["default"](startTime + 1).format('D-MM-YYYY'),
-        endDate: moment__default["default"](endTime).format('D-MM-YYYY'),
+        startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
+        endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
         requests: analyticsData.requests,
         completedRequests: analyticsData.completedRequests,
         comments: analyticsData.comments
@@ -5859,13 +5934,14 @@
         return null;
       }
       const source = getExportSource();
+      const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, '-')).join('_');
       return /*#__PURE__*/React__default["default"].createElement(Components.ExportCsvPopup, {
         onClose: () => {
           setIsExportOpen(false);
         },
         columns: exportColumns,
         source: source,
-        filename: "".concat(values.analyticsKey, "analytics_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
+        filename: "".concat(values.analyticsKey, "analytics").concat(comparisonMode ? '_comparison' : '').concat(filterSuffix ? "_".concat(filterSuffix) : '', "_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
       });
     };
     return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -5882,33 +5958,68 @@
       },
       isActive: isReadyToOpenCSV(),
       leftIcon: "file-code-o"
-    }, "Export CSV")), /*#__PURE__*/React__default["default"].createElement("div", {
+    }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
+      type: "help",
+      style: {
+        color: '#c02743'
+      }
+    }, "Data unavailable for: ", failedSites.join(', ')), /*#__PURE__*/React__default["default"].createElement("div", {
       className: "analyticsSection dashboardSection_content"
-    }, /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
-      title: "".concat(featureTitle, " Requests"),
-      icon: freeSolidSvgIcons.faWrench,
-      value: analyticsData.requests,
-      previousValue: analyticsData.prevRequests,
-      prevText: prevText,
-      viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount),
-      isLoading: analyticsData.isLoading
-    }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
-      title: "Completed ".concat(featureTitle, " Requests"),
-      icon: freeSolidSvgIcons.faCircleCheck,
-      value: analyticsData.completedRequests,
-      previousValue: analyticsData.prevCompletedRequests,
-      prevText: prevText,
-      viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount),
-      isLoading: analyticsData.isLoading
-    }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
-      title: "".concat(featureTitle, " Comments"),
-      icon: freeSolidSvgIcons.faComment,
-      value: analyticsData.comments,
-      previousValue: analyticsData.prevComments,
-      prevText: prevText,
-      viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount),
-      isLoading: analyticsData.isLoading
-    })));
+    }, (() => {
+      const chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");
+      if (comparisonMode) {
+        return /*#__PURE__*/React__default["default"].createElement("div", {
+          style: {
+            display: "flex",
+            flexDirection: "column",
+            gap: 16
+          }
+        }, /*#__PURE__*/React__default["default"].createElement(Components.ComparisonStatBox, {
+          title: "".concat(featureTitle, " Requests"),
+          data: comparisonData.requests,
+          prevText: prevText,
+          viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+          isLoading: comparisonData.isLoading
+        }), /*#__PURE__*/React__default["default"].createElement(Components.ComparisonStatBox, {
+          title: "Completed ".concat(featureTitle, " Requests"),
+          data: comparisonData.completedRequests,
+          prevText: prevText,
+          viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount).concat(chartSuffix),
+          isLoading: comparisonData.isLoading
+        }), /*#__PURE__*/React__default["default"].createElement(Components.ComparisonStatBox, {
+          title: "".concat(featureTitle, " Comments"),
+          data: comparisonData.comments,
+          prevText: prevText,
+          viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+          isLoading: comparisonData.isLoading
+        }));
+      }
+      return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
+        title: "".concat(featureTitle, " Requests"),
+        icon: freeSolidSvgIcons.faWrench,
+        value: analyticsData.requests,
+        previousValue: analyticsData.prevRequests,
+        prevText: prevText,
+        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+        isLoading: analyticsData.isLoading
+      }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
+        title: "Completed ".concat(featureTitle, " Requests"),
+        icon: freeSolidSvgIcons.faCircleCheck,
+        value: analyticsData.completedRequests,
+        previousValue: analyticsData.prevCompletedRequests,
+        prevText: prevText,
+        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount).concat(chartSuffix),
+        isLoading: analyticsData.isLoading
+      }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
+        title: "".concat(featureTitle, " Comments"),
+        icon: freeSolidSvgIcons.faComment,
+        value: analyticsData.comments,
+        previousValue: analyticsData.prevComments,
+        prevText: prevText,
+        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+        isLoading: analyticsData.isLoading
+      }));
+    })()));
   };
   const mapStateToProps = state => {
     const {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plusscommunities/pluss-maintenance-web-forms",
-	"version": "1.1.36",
+	"version": "1.1.37-beta.1",
 	"description": "Extension package to enable maintenance on Pluss Communities Platform",
 	"main": "dist/index.cjs.js",
 	"scripts": {