@plusscommunities/pluss-maintenance-web-forms 1.2.5-beta.0 → 1.3.1-beta.0

package/dist/index.js

@@ -7,8 +7,8 @@ import _ from 'lodash';
 import moment from 'moment';
 import { Icon } from '@plusscommunities/pluss-icons';
 import * as PlussCore from '@plusscommunities/pluss-core-web';
-import { PERMISSION_CATEGORIES, IMPORTANCE_LEVELS, Colours as Colours$3 } from '@plusscommunities/pluss-core-web';
-import { Table, Dropdown, DropdownButton } from 'react-bootstrap';
+import { PERMISSION_CATEGORIES, IMPORTANCE_LEVELS, Colours as Colours$4 } from '@plusscommunities/pluss-core-web';
+import { Table, MenuItem, DropdownButton } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import Textarea from 'react-textarea-autosize';
@@ -43,7 +43,7 @@ var values = {
   screenAddJobType: "AddJobTypeForms",
   screenJob: "JobForms",
   screenJobTypes: "JobTypesForms",
-  menuIcon: "file-lines",
+  menuIcon: "form",
   isFontAwesomeIcon: false,
   isSVGIcon: true,
   svgPathGridIcon: "M164,152a4,4,0,0,1-4,4H96a4,4,0,0,1,0-8h64A4,4,0,0,1,164,152Zm-4-36H96a4,4,0,0,0,0,8h64a4,4,0,0,0,0-8Zm52-68V216a12,12,0,0,1-12,12H56a12,12,0,0,1-12-12V48A12,12,0,0,1,56,36H94.08a44,44,0,0,1,67.84,0H200A12,12,0,0,1,212,48ZM92,64v4h72V64a36,36,0,0,0-72,0ZM204,48a4,4,0,0,0-4-4H167.17A43.71,43.71,0,0,1,172,64v8a4,4,0,0,1-4,4H88a4,4,0,0,1-4-4V64a43.71,43.71,0,0,1,4.83-20H56a4,4,0,0,0-4,4V216a4,4,0,0,0,4,4H200a4,4,0,0,0,4-4Z",
@@ -82,7 +82,13 @@ var values = {
   hasHelpButton: true,
   helpGuideURL: "https://www.plusscommunities.com/forms-feature",
   stringConfigJobStatus: "maintenanceJobStatusForms",
-  stringConfigHideSeen: "maintenanceDisableSeenForms"
+  stringConfigHideSeen: "maintenanceDisableSeenForms",
+  // Comment subscription notification preference
+  notificationPreference: {
+    key: "maintenancerequestFormsComments",
+    label: "Forms comments",
+    permission: "maintenanceTrackingForms"
+  }
 };
 
 // import * as PlussCore from '../../pluss-core/src';
@@ -214,7 +220,8 @@ var FeatureConfig = {
   init: environment => {
     FeatureConfig.env = environment;
     PlussCore.Config.init(environment);
-  }
+  },
+  notificationPreference: values.notificationPreference
 };
 
 var JOBS_LOADED = values.actionJobsLoaded;
@@ -224,15 +231,15 @@ var JOBS_TYPES_LOADED = values.actionJobsTypesLoaded;
 var JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
 var JOBS_HIDE_SEEN = values.actionJobsHideSeen;
 
-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(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; }
+function ownKeys$8(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$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
-  Helper: Helper$5,
+  Helper: Helper$6,
   Session: Session$9
 } = PlussCore;
 var maintenanceActions = {
   getJobType: (site, typeId) => {
-    var url = Helper$5.getUrl(values.serviceKey, "getjobtype");
+    var url = Helper$6.getUrl(values.serviceKey, "getjobtype");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -243,7 +250,7 @@ var maintenanceActions = {
     });
   },
   getJobTypes: (site, id) => {
-    var url = Helper$5.getUrl(values.serviceKey, "getjobtypes");
+    var url = Helper$6.getUrl(values.serviceKey, "getjobtypes");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -253,7 +260,7 @@ var maintenanceActions = {
     });
   },
   getJob: (site, id) => {
-    var url = Helper$5.getUrl(values.serviceKey, "getJob");
+    var url = Helper$6.getUrl(values.serviceKey, "getJob");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -264,7 +271,7 @@ var maintenanceActions = {
     });
   },
   getJobByJobId: (site, jobId) => {
-    var url = Helper$5.getUrl(values.serviceKey, "getJob");
+    var url = Helper$6.getUrl(values.serviceKey, "getJob");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -279,7 +286,7 @@ var maintenanceActions = {
     var 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,
@@ -302,7 +309,7 @@ var maintenanceActions = {
     }
     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 getJobsRecursive(site, status, type, lastKey) {
@@ -320,14 +327,14 @@ var maintenanceActions = {
   createJob: job => {
     return Session$9.authedFunction({
       method: "POST",
-      url: Helper$5.getUrl(values.serviceKey, "sendMaintenance"),
-      data: _objectSpread$7({}, job)
+      url: Helper$6.getUrl(values.serviceKey, "sendMaintenance"),
+      data: _objectSpread$8({}, 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
@@ -337,7 +344,7 @@ var maintenanceActions = {
   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
@@ -347,7 +354,7 @@ var maintenanceActions = {
   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
@@ -357,7 +364,7 @@ var maintenanceActions = {
   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
@@ -367,7 +374,7 @@ var maintenanceActions = {
   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
@@ -377,7 +384,7 @@ var maintenanceActions = {
   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
       })
     });
@@ -385,7 +392,7 @@ var maintenanceActions = {
   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,
@@ -398,7 +405,7 @@ var maintenanceActions = {
   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,
@@ -412,7 +419,7 @@ var maintenanceActions = {
   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,
@@ -432,7 +439,7 @@ var maintenanceActions = {
     };
     return Session$9.authedFunction({
       method: "POST",
-      url: Helper$5.getUrl(values.serviceKey, "createJobType"),
+      url: Helper$6.getUrl(values.serviceKey, "createJobType"),
       data
     });
   },
@@ -450,14 +457,14 @@ var maintenanceActions = {
     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
@@ -467,7 +474,7 @@ var maintenanceActions = {
   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
       })
     });
@@ -475,7 +482,7 @@ var maintenanceActions = {
   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
       }
@@ -484,7 +491,7 @@ var maintenanceActions = {
 };
 
 var {
-  Helper: Helper$4,
+  Helper: Helper$5,
   Session: Session$8
 } = PlussCore;
 var reactionActions = {
@@ -502,7 +509,7 @@ var reactionActions = {
     }
     return Session$8.authedFunction({
       method: "POST",
-      url: Helper$4.getUrl("reactions", "comments/add"),
+      url: Helper$5.getUrl("reactions", "comments/add"),
       data
     });
   },
@@ -525,7 +532,7 @@ var reactionActions = {
     }
     return Session$8.authedFunction({
       method: "GET",
-      url: Helper$4.getUrl("reactions", "comments/get", query)
+      url: Helper$5.getUrl("reactions", "comments/get", query)
     });
   }
 };
@@ -559,7 +566,7 @@ var jobStatusOptions = [
 ];
 
 var {
-  Helper: Helper$3
+  Helper: Helper$4
 } = PlussCore;
 var jobsUpdate = (site, isdashboard) => {
   return dispatch => {
@@ -567,7 +574,7 @@ var jobsUpdate = (site, isdashboard) => {
       type: JOBS_LOADING
     });
     maintenanceActions.getJobsRecursive(site).then(res => {
-      var currentSite = Helper$3.readStorageWithCookie("site");
+      var currentSite = Helper$4.readStorageWithCookie("site");
       if (!_.isEmpty(res) && res[0].site === currentSite) {
         dispatch({
           type: JOBS_LOADED,
@@ -719,8 +726,8 @@ var getJobPriority = priority => {
   return priorityOption || getDefaultPriority();
 };
 
-function ownKeys$6(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$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(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; }
 var {
   Session: Session$7,
   Components: Components$7,
@@ -1093,7 +1100,7 @@ class JobList extends Component {
         });
         var customFieldValues = this.getCustomFields(r, customColumns);
         var priority = r.priority || defaultPriority;
-        return _objectSpread$6(_objectSpread$6(_objectSpread$6({}, r), customFieldValues), {}, {
+        return _objectSpread$7(_objectSpread$7(_objectSpread$7({}, r), customFieldValues), {}, {
           notes,
           progressTime,
           completedTime,
@@ -1269,7 +1276,7 @@ class JobList extends Component {
           isActive: this.isValidTimeFilter()
         }],
         children: /*#__PURE__*/jsx("div", {
-          style: {
+          iconStyle: {
             minHeight: 150
           },
           children: /*#__PURE__*/jsx(Components$7.AnalyticsFilter, {
@@ -1292,7 +1299,7 @@ class JobList extends Component {
               onClick: () => {
                 this.onSelectAssignee();
               },
-              colour: Colours$3.COLOUR_DUSK
+              colour: Colours$4.COLOUR_DUSK
             })
           }, this.state.selectedAssignee.id)
         });
@@ -1347,7 +1354,7 @@ class JobList extends Component {
               onClick: () => {
                 this.onSelectRequester();
               },
-              colour: Colours$3.COLOUR_DUSK
+              colour: Colours$4.COLOUR_DUSK
             })
           }, this.state.selectedRequester.id)
         });
@@ -1463,7 +1470,7 @@ class JobList extends Component {
         }), /*#__PURE__*/jsx("td", {
           className: "table-options",
           children: /*#__PURE__*/jsxs("div", {
-            style: {
+            iconStyle: {
               display: "flex",
               alignItems: "center"
             },
@@ -1630,17 +1637,17 @@ class JobList extends Component {
             },
             children: ["Assigned To", this.renderSort("assigned")]
           }), /*#__PURE__*/jsx("th", {
-            style: {
+            iconStyle: {
               width: 120
             },
             children: "Status"
           }), /*#__PURE__*/jsx("th", {
-            style: {
+            iconStyle: {
               width: 120
             },
             children: "Priority"
           }), /*#__PURE__*/jsx("th", {
-            style: {
+            iconStyle: {
               width: 50
             }
           })]
@@ -1825,7 +1832,7 @@ class JobList extends Component {
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
-      style: {
+      iconStyle: {
         minWidth: "100%"
       },
       children: [this.renderFilterPopup(), this.renderCSVPopup(), this.renderFilters(), this.renderContent()]
@@ -1950,7 +1957,7 @@ class JobTypes extends Component {
           }), /*#__PURE__*/jsx("td", {
             className: "table-options",
             children: /*#__PURE__*/jsxs("div", {
-              style: {
+              iconStyle: {
                 display: "flex",
                 alignItems: "center"
               },
@@ -2015,7 +2022,7 @@ class JobTypes extends Component {
             onClick: () => this.sortByCol("email"),
             children: "Email"
           }), /*#__PURE__*/jsx("th", {
-            style: {
+            iconStyle: {
               width: 70
             }
           })]
@@ -2068,7 +2075,7 @@ class JobTypes extends Component {
     } = this.state;
     if (jobList.length === 0 && loading) {
       return /*#__PURE__*/jsx("div", {
-        style: {
+        iconStyle: {
           minWidth: "100%"
         },
         children: /*#__PURE__*/jsx("div", {
@@ -2077,7 +2084,7 @@ class JobTypes extends Component {
             textAlign: "center"
           },
           children: /*#__PURE__*/jsx(Icon, {
-            style: {
+            iconStyle: {
               fontSize: 30,
               color: FeatureConfig.env.colourBrandingOff
             },
@@ -2089,7 +2096,7 @@ class JobTypes extends Component {
       });
     }
     return /*#__PURE__*/jsxs("div", {
-      style: {
+      iconStyle: {
         minWidth: "100%"
       },
       children: [/*#__PURE__*/jsx("div", {
@@ -2103,7 +2110,7 @@ class JobTypes extends Component {
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
-      style: {
+      iconStyle: {
         minWidth: "100%"
       },
       children: [/*#__PURE__*/jsx("div", {
@@ -2128,12 +2135,12 @@ var JobTypes$1 = connect(mapStateToProps$6, {
   jobTypesUpdate
 })(withRouter(JobTypes));
 
-function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$6(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$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Session: Session$5,
   Components: Components$5,
-  Colours: Colours$2
+  Colours: Colours$3
 } = PlussCore;
 class Configuration extends Component {
   constructor(props) {
@@ -2336,7 +2343,7 @@ class Configuration extends Component {
           style: styles$6.statusTypeContainer,
           children: [/*#__PURE__*/jsx("div", {
             className: "statusLabel",
-            style: _objectSpread$5(_objectSpread$5({}, styles$6.statusTextContainer), {}, {
+            style: _objectSpread$6(_objectSpread$6({}, styles$6.statusTextContainer), {}, {
               backgroundColor: status.color
             }),
             children: /*#__PURE__*/jsx("span", {
@@ -2350,23 +2357,23 @@ class Configuration extends Component {
               children: status.category
             })
           }), /*#__PURE__*/jsx(Icon, {
-            style: _objectSpread$5(_objectSpread$5({}, styles$6.statusIcon), {}, {
+            style: _objectSpread$6(_objectSpread$6({}, styles$6.statusIcon), {}, {
               visibility: index === 0 ? "hidden" : "visible"
             }),
             name: "arrow-up",
             onClick: () => this.onMoveStatus(index, true)
           }), /*#__PURE__*/jsx(Icon, {
-            style: _objectSpread$5(_objectSpread$5({}, styles$6.statusIcon), {}, {
+            style: _objectSpread$6(_objectSpread$6({}, styles$6.statusIcon), {}, {
               visibility: index === statusTypes.length - 1 ? "hidden" : "visible"
             }),
             name: "arrow-down",
             onClick: () => this.onMoveStatus(index, false)
           }), /*#__PURE__*/jsx(Icon, {
-            style: _objectSpread$5({}, styles$6.statusIcon),
+            style: _objectSpread$6({}, styles$6.statusIcon),
             icon: "pencil",
             onClick: () => this.onEditStatus(index)
           }), /*#__PURE__*/jsx(Icon, {
-            style: _objectSpread$5({}, styles$6.statusIcon),
+            style: _objectSpread$6({}, styles$6.statusIcon),
             icon: "circle-minus",
             onClick: () => this.onDeleteStatus(index)
           })]
@@ -2423,8 +2430,8 @@ class Configuration extends Component {
   renderSuccess() {
     if (!this.state.success) return null;
     return /*#__PURE__*/jsx("span", {
-      style: _objectSpread$5(_objectSpread$5({}, styles$6.savedText), {}, {
-        color: Colours$2.COLOUR_GREEN
+      iconStyle: _objectSpread$6(_objectSpread$6({}, styles$6.savedText), {}, {
+        color: Colours$3.COLOUR_GREEN
       }),
       children: "Saved"
     });
@@ -2536,11 +2543,11 @@ class Configuration extends Component {
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
-      style: {
+      iconStyle: {
         minWidth: "100%"
       },
       children: [this.renderStatuses(), this.renderOtherOptions(), /*#__PURE__*/jsxs("div", {
-        style: {
+        iconStyle: {
           paddingTop: 24,
           paddingBottom: 24
         },
@@ -2574,7 +2581,7 @@ var styles$6 = {
     fontSize: 20,
     padding: 5,
     marginLeft: 10,
-    color: Colours$2.COLOUR_BRANDING_ACTION,
+    color: Colours$3.COLOUR_BRANDING_ACTION,
     visibility: "visible"
   },
   savedText: {
@@ -2755,7 +2762,7 @@ class RequestsHub extends Component {
       sectionItems.push({
         type: "navItem",
         text: "Feature Configuration",
-        icon: "gear",
+        icon: "settings",
         isFontAwesome: false,
         selected: this.state.selectedSection === "config",
         onClick: () => {
@@ -2839,13 +2846,13 @@ var RequestsHub$1 = connect(mapStateToProps$4, {
   jobsLoaded
 })(withRouter(RequestsHub));
 
-function ownKeys$4(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$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(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; }
+function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Apis: Apis$1,
-  Helper: Helper$2,
+  Helper: Helper$3,
   Session: Session$3,
-  Colours: Colours$1,
+  Colours: Colours$2,
   Components: Components$3
 } = PlussCore;
 var IMAGE_SIZE_NOTE = 72;
@@ -2929,7 +2936,7 @@ class Job extends Component {
       var statusType = statusTypes.find(s => s.text === status);
       if (!statusType) {
         var defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
-        statusType = _objectSpread$4(_objectSpread$4({}, defaultStatus), {}, {
+        statusType = _objectSpread$5(_objectSpread$5({}, defaultStatus), {}, {
           text: status
         });
       }
@@ -3124,7 +3131,7 @@ class Job extends Component {
       }
       maintenanceActions.deleteNote(this.state.jobId, n.Id);
       var newNotes = _.filter(this.state.job.Notes, note => note.Id !== n.Id);
-      var newJob = _objectSpread$4({}, this.state.job);
+      var newJob = _objectSpread$5({}, this.state.job);
       newJob.Notes = newNotes;
       this.setState({
         job: newJob,
@@ -3209,7 +3216,7 @@ class Job extends Component {
     _defineProperty(this, "onSelectPriority", /*#__PURE__*/function () {
       var _ref0 = _asyncToGenerator(function* (priority) {
         _this.setState({
-          job: _objectSpread$4(_objectSpread$4({}, _this.state.job), {}, {
+          job: _objectSpread$5(_objectSpread$5({}, _this.state.job), {}, {
             priority
           }),
           priorityChangerOpen: false
@@ -3239,7 +3246,7 @@ class Job extends Component {
     _defineProperty(this, "onSelectStatus", /*#__PURE__*/function () {
       var _ref1 = _asyncToGenerator(function* (status) {
         _this.setState({
-          job: _objectSpread$4(_objectSpread$4({}, _this.state.job), {}, {
+          job: _objectSpread$5(_objectSpread$5({}, _this.state.job), {}, {
             status: status
           }),
           statusChangerOpen: false
@@ -3262,7 +3269,7 @@ class Job extends Component {
       };
     }());
     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,
@@ -3483,7 +3490,7 @@ class Job extends Component {
           children: /*#__PURE__*/jsx("div", {
             className: "imageGrid_image",
             style: {
-              backgroundImage: "url('".concat(Helper$2.get1400(image), "')"),
+              backgroundImage: "url('".concat(Helper$3.get1400(image), "')"),
               width: size,
               height: size
             }
@@ -3579,7 +3586,7 @@ class Job extends Component {
     } = this.state.job;
     var hasCustomFields = customFields && customFields.length > 0;
     return /*#__PURE__*/jsxs("div", {
-      style: {
+      iconStyle: {
         paddingBottom: 40
       },
       children: [/*#__PURE__*/jsxs("div", {
@@ -3728,7 +3735,7 @@ class Job extends Component {
         children: [/*#__PURE__*/jsxs("div", {
           className: "maintenanceNote_top",
           children: [this.props.auth && this.props.auth.user && this.props.auth.user.Id === note.User.id && /*#__PURE__*/jsx(Icon, {
-            colour: Colours$1.COLOUR_DUSK_LIGHT,
+            colour: Colours$2.COLOUR_DUSK_LIGHT,
             icon: "ellipsis-vertical",
             className: "maintenanceNote_moreIcon",
             onClick: () => this.onOpenNoteMenu(index)
@@ -3748,7 +3755,7 @@ class Job extends Component {
           })]
         }), /*#__PURE__*/jsx("p", {
           className: "maintenanceNote_text",
-          children: Helper$2.toParagraphed(note.Note)
+          children: 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]
       })]
     }, index);
@@ -3792,7 +3799,7 @@ class Job extends Component {
       }), /*#__PURE__*/jsx("div", {
         className: "statusLabel statusLabel-large statusLabel-full",
         style: {
-          backgroundColor: Colours$1.COLOUR_DUSK
+          backgroundColor: Colours$2.COLOUR_DUSK
         },
         children: /*#__PURE__*/jsxs("span", {
           className: "statusLabel_text",
@@ -3803,7 +3810,7 @@ class Job extends Component {
   }
   renderExternalSyncEntry(e, i) {
     var isSuccess = e.EntryType === "ExternalIDSet";
-    var backgroundColor = isSuccess ? Colours$1.COLOUR_GREEN : Colours$1.COLOUR_RED; // Green for success, red for failure
+    var backgroundColor = isSuccess ? Colours$2.COLOUR_GREEN : Colours$2.COLOUR_RED; // Green for success, red for failure
 
     return /*#__PURE__*/jsxs("div", {
       className: "ticketHistoryEntry",
@@ -3869,7 +3876,7 @@ class Job extends Component {
       return /*#__PURE__*/jsx(Icon, {
         style: {
           fontSize: 20,
-          color: Colours$1.COLOUR_DUSK_LIGHT,
+          color: Colours$2.COLOUR_DUSK_LIGHT,
           marginLeft: 8
         },
         icon: "spinner",
@@ -3881,7 +3888,7 @@ class Job extends Component {
       className: "statusLabel pointer",
       onClick: this.onRetrySync,
       style: {
-        backgroundColor: Colours$1.COLOUR_RED,
+        backgroundColor: Colours$2.COLOUR_RED,
         marginLeft: 8
       },
       children: /*#__PURE__*/jsx("span", {
@@ -3904,7 +3911,7 @@ class Job extends Component {
           className: "userStatusIcon",
           icon: "circle-xmark",
           style: {
-            color: Colours$1.COLOUR_RED
+            color: Colours$2.COLOUR_RED
           }
         }), " ", retrySyncError]
       });
@@ -3918,7 +3925,7 @@ class Job extends Component {
           className: "userStatusIcon",
           icon: "circle-check",
           style: {
-            color: Colours$1.COLOUR_GREEN
+            color: Colours$2.COLOUR_GREEN
           }
         }), " ", "Sync retry initiated. Check back shortly for results."]
       });
@@ -3932,7 +3939,7 @@ class Job extends Component {
           className: "userStatusIcon",
           icon: "circle-xmark",
           style: {
-            color: Colours$1.COLOUR_RED
+            color: Colours$2.COLOUR_RED
           }
         }), " ", "External sync failed. Use the retry button to attempt again."]
       });
@@ -3992,11 +3999,11 @@ class Job extends Component {
     } = this.state;
     if (!job || !job.history) return null;
     var source = _.sortBy([...job.history.map(e => {
-      return _objectSpread$4(_objectSpread$4({}, e), {}, {
+      return _objectSpread$5(_objectSpread$5({}, e), {}, {
         EntryType: e.EntryType || "status"
       });
     }), ...(job.Notes || []).map(e => {
-      return _objectSpread$4(_objectSpread$4({}, e), {}, {
+      return _objectSpread$5(_objectSpread$5({}, e), {}, {
         timestamp: e.Timestamp,
         EntryType: "note"
       });
@@ -4163,7 +4170,7 @@ class Job extends Component {
             onClick: () => {
               this.onSelectAssignee();
             },
-            colour: Colours$1.COLOUR_DUSK
+            colour: Colours$2.COLOUR_DUSK
           })
         }, this.state.selectedAssignee.id)
       });
@@ -4250,14 +4257,14 @@ var Job$1 = connect(mapStateToProps$3, {
   jobStatusesUpdate
 })(withRouter(Job));
 
-function ownKeys$3(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$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(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$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(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; }
 var {
   Actions,
   Components: Components$2,
-  Helper: Helper$1,
+  Helper: Helper$2,
   Session: Session$2,
-  Colours,
+  Colours: Colours$1,
   Apis
 } = PlussCore;
 class AddJob extends Component {
@@ -4276,7 +4283,7 @@ class AddJob extends Component {
           type,
           customFields
         } = res.data;
-        _this.setState(_objectSpread$3(_objectSpread$3({}, res.data), {}, {
+        _this.setState(_objectSpread$4(_objectSpread$4({}, res.data), {}, {
           prevType: type,
           prevCustomFileds: customFields,
           type,
@@ -4524,7 +4531,7 @@ class AddJob extends Component {
       event.target.value = "";
     });
     _defineProperty(this, "onToggleDatePicker", qId => {
-      var showDate = _objectSpread$3({}, this.state.showDate);
+      var showDate = _objectSpread$4({}, this.state.showDate);
       showDate[qId] = !showDate[qId];
       this.setState({
         showDate
@@ -4613,7 +4620,7 @@ class AddJob extends Component {
         if (_.isNil(answer) || _.isEmpty(answer)) return true;
         switch (type) {
           case "email":
-            return Helper$1.isEmail(answer);
+            return Helper$2.isEmail(answer);
           case "date":
             return moment(answer, "YYYY-MM-DD", true).isValid();
           case "time":
@@ -4634,7 +4641,7 @@ class AddJob extends Component {
     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,
@@ -4693,9 +4700,9 @@ class AddJob extends Component {
     } = this.state;
     return types.map(ev => {
       if (ev != null) {
-        return /*#__PURE__*/jsx(Dropdown.Item, {
+        return /*#__PURE__*/jsx(MenuItem, {
           eventKey: ev.typeName,
-          ive: type === ev.typeName,
+          active: type === ev.typeName,
           children: ev.typeName
         }, ev.typeName);
       }
@@ -4951,7 +4958,7 @@ class AddJob extends Component {
             className: "inputRequired "
           }) : null, /*#__PURE__*/jsxs("div", {
             className: "visitorSignIn_question",
-            style: {
+            iconStyle: {
               flex: 1
             },
             children: [/*#__PURE__*/jsx("div", {
@@ -5001,7 +5008,7 @@ class AddJob extends Component {
       case "staticText":
         return /*#__PURE__*/jsx("p", {
           className: "visitorSignIn_text-staticText",
-          children: Helper$1.toParagraphed(field.label, {
+          children: Helper$2.toParagraphed(field.label, {
             marginTop: 10
           })
         }, fieldId);
@@ -5020,7 +5027,7 @@ class AddJob extends Component {
             alwaysShowLabel: true,
             readOnly: true,
             rightContent: !_.isEmpty(field.answer) && /*#__PURE__*/jsx(Icon, {
-              colour: Colours.COLOUR_DUSK_LIGHT,
+              colour: Colours$1.COLOUR_DUSK_LIGHT,
               icon: "xmark",
               className: "timepicker_clear",
               onClick: () => this.onChangeDateAnswer(fieldId, undefined, false)
@@ -5053,7 +5060,7 @@ class AddJob extends Component {
               }
             }),
             rightContent: !_.isEmpty(field.answer) && /*#__PURE__*/jsx(Icon, {
-              colour: Colours.COLOUR_DUSK_LIGHT,
+              colour: Colours$1.COLOUR_DUSK_LIGHT,
               icon: "xmark",
               className: "timepicker_clear",
               onClick: () => this.onChangeTimeAnswer(fieldId, undefined)
@@ -5068,7 +5075,7 @@ class AddJob extends Component {
             className: "inputRequired "
           }) : null, /*#__PURE__*/jsxs("div", {
             className: "visitorSignIn_question",
-            style: {
+            iconStyle: {
               flex: 1
             },
             children: [/*#__PURE__*/jsx(Components$2.Text, {
@@ -5091,7 +5098,7 @@ class AddJob extends Component {
             className: "inputRequired "
           }) : null, /*#__PURE__*/jsxs("div", {
             className: "visitorSignIn_question",
-            style: {
+            iconStyle: {
               flex: 1
             },
             children: [/*#__PURE__*/jsx(Components$2.Text, {
@@ -5143,7 +5150,7 @@ class AddJob extends Component {
       customFields
     } = this.state;
     return /*#__PURE__*/jsx("div", {
-      style: {
+      iconStyle: {
         marginBottom: 15
       },
       children: /*#__PURE__*/jsxs("div", {
@@ -5178,7 +5185,7 @@ class AddJob extends Component {
             return this.state.showWarnings && _.isEmpty(this.state.room);
           }
         }), /*#__PURE__*/jsxs("div", {
-          style: {
+          iconStyle: {
             marginBottom: 15
           },
           children: [/*#__PURE__*/jsx(Components$2.Text, {
@@ -5278,7 +5285,7 @@ var mapStateToProps$2 = state => {
   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 = connect(mapStateToProps$2, {
@@ -5290,7 +5297,7 @@ var AddJob$1 = connect(mapStateToProps$2, {
 var {
   Components: Components$1,
   Session: Session$1,
-  Helper
+  Helper: Helper$1
 } = PlussCore;
 var DEFAULT_FIELD = {
   type: "text",
@@ -5335,7 +5342,7 @@ class AddJobType extends Component {
       var {
         jobTypeEmail
       } = this.state;
-      return !_.isEmpty(jobTypeEmail) && Helper.isEmail(jobTypeEmail);
+      return !_.isEmpty(jobTypeEmail) && Helper$1.isEmail(jobTypeEmail);
     });
     _defineProperty(this, "isJobTypeValid", () => {
       var {
@@ -5537,7 +5544,7 @@ class AddJobType extends Component {
     }];
     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: "",
@@ -6057,7 +6064,7 @@ class AddJobType extends Component {
         type: "bodyLarge",
         className: "marginBottom-24 paddingLeft-40",
         style: {
-          color: Colours$3.COLOUR_LIGHTGREY
+          color: Colours$4.COLOUR_LIGHTGREY
         },
         children: "By default, the form submission title will be the name of the person submitting the form. You can choose to select a different field to use as the title for the form submission."
       }), /*#__PURE__*/jsxs("div", {
@@ -6088,10 +6095,10 @@ class AddJobType extends Component {
     return /*#__PURE__*/jsxs("div", {
       className: "padding-60 paddingVertical-8 text-bodyLarge",
       style: {
-        color: Colours$3.COLOUR_RED
+        color: Colours$4.COLOUR_RED
       },
       children: ["To save the form", /*#__PURE__*/jsx("ul", {
-        style: {
+        iconStyle: {
           padding: 0,
           paddingLeft: 16
         },
@@ -6175,10 +6182,14 @@ var AddJobType$1 = connect(mapStateToProps$1, {
   jobTypesUpdate
 })(withRouter(AddJobType));
 
+function ownKeys$3(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$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Analytics: Analytics$1,
   Session,
-  Components
+  Components,
+  Helper,
+  Colours
 } = PlussCore;
 var getInitialState = () => ({
   requests: 0,
@@ -6198,10 +6209,21 @@ var AnalyticsHub = _ref => {
     auth,
     prevText,
     dayCount,
-    strings
+    strings,
+    userType,
+    userCategory,
+    selectedSites
   } = _ref;
   var [analyticsData, setAnalyticsData] = useState(getInitialState());
   var [isExportOpen, setIsExportOpen] = useState(false);
+  var [failedSites, setFailedSites] = useState([]);
+  var [comparisonData, setComparisonData] = useState({
+    requests: [],
+    completedRequests: [],
+    comments: [],
+    isLoading: true
+  });
+  var comparisonMode = selectedSites && selectedSites.length > 1;
   var hasAccess = Session.validateAccess(auth.site, values.permissionMaintenanceTracking, auth);
   if (!hasAccess) {
     return null;
@@ -6215,7 +6237,10 @@ var AnalyticsHub = _ref => {
   var exportColumns = [{
     label: "Select All",
     key: ""
-  }, {
+  }, ...(comparisonMode ? [{
+    label: "Site",
+    key: "site"
+  }] : []), {
     label: "Start Date",
     key: "startDate"
   }, {
@@ -6233,32 +6258,114 @@ var AnalyticsHub = _ref => {
   }];
   useEffect(() => {
     getData();
-  }, [startTime, endTime]);
+  }, [startTime, endTime, userType, userCategory, selectedSites]);
   var getData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(function* () {
-      setAnalyticsData(getInitialState());
-      // Load analytics data here using startTime and endTime
-      var timeDifference = endTime - startTime;
-      var [currentStatsResponse, prevStatsResponse] = yield Promise.all([analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime, endTime, true), analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime - timeDifference, startTime, true)]);
-      var 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);
+      try {
+        setFailedSites([]);
+        if (comparisonMode) {
+          setComparisonData({
+            requests: [],
+            completedRequests: [],
+            comments: [],
+            isLoading: true
+          });
+          var multiSiteResultsObj = yield Analytics$1.fetchMultiSiteData(selectedSites, /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(function* (site) {
+              var {
+                data
+              } = yield analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
+                userType,
+                userCategory
+              });
+              return data;
+            });
+            return function (_x) {
+              return _ref3.apply(this, arguments);
+            };
+          }());
+          var roles = auth.user.Roles;
+          var failed = Object.entries(multiSiteResultsObj).filter(_ref4 => {
+            var [, data] = _ref4;
+            return data === null;
+          }).map(_ref5 => {
+            var [site] = _ref5;
+            return Helper.getSiteNameFromRoles(site, roles);
+          });
+          setFailedSites(failed);
+          var multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref6 => {
+            var [, data] = _ref6;
+            return data !== null;
+          }).map(_ref7 => {
+            var [site, data] = _ref7;
+            return {
+              site,
+              data
+            };
+          });
+          var 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());
+          var site = selectedSites && selectedSites.length === 1 ? selectedSites[0] : auth.site;
+          var timeDifference = endTime - startTime;
+          var [currentStatsResponse, prevStatsResponse] = yield Promise.all([analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
+            userType,
+            userCategory
+          }), analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime - timeDifference, startTime, true, {
+            userType,
+            userCategory
+          })]);
+          var 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);
+        }
+      } catch (err) {
+        if (comparisonMode) {
+          setComparisonData(prev => _objectSpread$3(_objectSpread$3({}, prev), {}, {
+            isLoading: false
+          }));
+        } else {
+          setAnalyticsData(prev => _objectSpread$3(_objectSpread$3({}, prev), {}, {
+            isLoading: false
+          }));
+        }
+      }
     });
     return function getData() {
       return _ref2.apply(this, arguments);
     };
   }();
   var isReadyToOpenCSV = () => {
-    return !analyticsData.isLoading;
+    return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
   };
   var getExportSource = () => {
+    if (comparisonMode) {
+      var sites = comparisonData.requests || [];
+      return sites.map((site, i) => ({
+        site: site.name,
+        startDate: moment(startTime + 1).format("D-MM-YYYY"),
+        endDate: moment(endTime).format("D-MM-YYYY"),
+        requests: site.value,
+        completedRequests: comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value || 0,
+        comments: comparisonData.comments[i] && comparisonData.comments[i].value || 0
+      }));
+    }
     return [{
       startDate: moment(startTime + 1).format("D-MM-YYYY"),
       endDate: moment(endTime).format("D-MM-YYYY"),
@@ -6272,13 +6379,14 @@ var AnalyticsHub = _ref => {
       return null;
     }
     var source = getExportSource();
+    var filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, "-")).join("_");
     return /*#__PURE__*/jsx(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__*/jsxs("div", {
@@ -6299,33 +6407,73 @@ var AnalyticsHub = _ref => {
         leftIcon: "file-code",
         children: "Export CSV"
       })]
-    }), /*#__PURE__*/jsxs("div", {
+    }), failedSites.length > 0 && /*#__PURE__*/jsxs(Components.Text, {
+      type: "help",
+      style: {
+        color: Colours.COLOUR_RED,
+        marginTop: 8
+      },
+      children: ["Data unavailable for: ", failedSites.join(", ")]
+    }), /*#__PURE__*/jsx("div", {
       className: "analyticsSection dashboardSection_content",
-      children: [/*#__PURE__*/jsx(Components.StatBox, {
-        title: "".concat(featureTitle, " Requests"),
-        icon: "wrench",
-        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__*/jsx(Components.StatBox, {
-        title: "Completed ".concat(featureTitle, " Requests"),
-        icon: "circle-check",
-        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__*/jsx(Components.StatBox, {
-        title: "".concat(featureTitle, " Comments"),
-        icon: "comment",
-        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
-      })]
+      children: (() => {
+        var chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");
+        if (comparisonMode) {
+          return /*#__PURE__*/jsxs("div", {
+            style: {
+              display: "flex",
+              flexDirection: "column",
+              gap: 16
+            },
+            children: [/*#__PURE__*/jsx(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__*/jsx(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__*/jsx(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__*/jsxs(Fragment, {
+          children: [/*#__PURE__*/jsx(Components.StatBox, {
+            title: "".concat(featureTitle, " Requests"),
+            icon: "wrench",
+            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__*/jsx(Components.StatBox, {
+            title: "Completed ".concat(featureTitle, " Requests"),
+            icon: "circle-check",
+            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__*/jsx(Components.StatBox, {
+            title: "".concat(featureTitle, " Comments"),
+            icon: "comment",
+            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
+          })]
+        });
+      })()
     })]
   });
 };