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

package/dist/index.cjs.js

@@ -112,13 +112,7 @@ const values = {
   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';
@@ -241,8 +235,7 @@ const FeatureConfig = {
   init: environment => {
     FeatureConfig.env = environment;
     PlussCore__namespace.Config.init(environment);
-  },
-  notificationPreference: values.notificationPreference
+  }
 };
 
 const JOBS_LOADED = values.actionJobsLoaded;
@@ -255,12 +248,12 @@ const 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__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,
@@ -271,7 +264,7 @@ const maintenanceActions = {
     });
   },
   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,
@@ -281,7 +274,7 @@ const maintenanceActions = {
     });
   },
   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,
@@ -292,7 +285,7 @@ const maintenanceActions = {
     });
   },
   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,
@@ -307,7 +300,7 @@ const maintenanceActions = {
     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,
@@ -330,7 +323,7 @@ const 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 (site, status, type, lastKey) {
@@ -348,14 +341,14 @@ const maintenanceActions = {
   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
@@ -365,7 +358,7 @@ const 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
@@ -375,7 +368,7 @@ const 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
@@ -385,7 +378,7 @@ const 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
@@ -395,7 +388,7 @@ const 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
@@ -405,7 +398,7 @@ const 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
       })
     });
@@ -413,7 +406,7 @@ const 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,
@@ -426,7 +419,7 @@ const 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,
@@ -440,7 +433,7 @@ const 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,
@@ -460,7 +453,7 @@ const maintenanceActions = {
     };
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'createJobType'),
+      url: Helper$6.getUrl(values.serviceKey, 'createJobType'),
       data
     });
   },
@@ -478,14 +471,14 @@ const 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
@@ -495,7 +488,7 @@ const 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
       })
     });
@@ -503,7 +496,7 @@ const 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
       }
@@ -512,7 +505,7 @@ const maintenanceActions = {
 };
 
 const {
-  Helper: Helper$4,
+  Helper: Helper$5,
   Session: Session$8
 } = PlussCore__namespace;
 const reactionActions = {
@@ -530,7 +523,7 @@ const reactionActions = {
     }
     return Session$8.authedFunction({
       method: 'POST',
-      url: Helper$4.getUrl('reactions', 'comments/add'),
+      url: Helper$5.getUrl('reactions', 'comments/add'),
       data
     });
   },
@@ -553,7 +546,7 @@ const reactionActions = {
     }
     return Session$8.authedFunction({
       method: 'GET',
-      url: Helper$4.getUrl('reactions', 'comments/get', query)
+      url: Helper$5.getUrl('reactions', 'comments/get', query)
     });
   }
 };
@@ -587,7 +580,7 @@ var jobStatusOptions = [
 ];
 
 const {
-  Helper: Helper$3
+  Helper: Helper$4
 } = PlussCore__namespace;
 const jobsUpdate = (site, isdashboard) => {
   return dispatch => {
@@ -595,7 +588,7 @@ const jobsUpdate = (site, isdashboard) => {
       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,
@@ -2732,7 +2725,7 @@ function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 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
@@ -3134,7 +3127,7 @@ class Job extends React.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,
@@ -3337,7 +3330,7 @@ class Job extends React.Component {
       }, /*#__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
         }
@@ -3552,7 +3545,7 @@ class Job extends React.Component {
       }]
     })), /*#__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 {
@@ -3986,7 +3979,7 @@ function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t
 const {
   Actions,
   Components: Components$2,
-  Helper: Helper$1,
+  Helper: Helper$2,
   Session: Session$2,
   Colours,
   Apis
@@ -4344,7 +4337,7 @@ class AddJob extends React.Component {
         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":
@@ -4365,7 +4358,7 @@ class AddJob extends React.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,
@@ -4717,7 +4710,7 @@ class AddJob extends React.Component {
         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":
@@ -4972,7 +4965,7 @@ const 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 = reactRedux.connect(mapStateToProps$2, {
@@ -4984,7 +4977,7 @@ var AddJob$1 = reactRedux.connect(mapStateToProps$2, {
 const {
   Components: Components$1,
   Session: Session$1,
-  Helper
+  Helper: Helper$1
 } = PlussCore__namespace;
 const DEFAULT_FIELD = {
   type: 'text',
@@ -5027,7 +5020,7 @@ class AddJobType extends React.Component {
       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 {
@@ -5229,7 +5222,7 @@ class AddJobType extends React.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: '',
@@ -5781,7 +5774,8 @@ var AddJobType$1 = reactRedux.connect(mapStateToProps$1, {
 const {
   Analytics: Analytics$1,
   Session,
-  Components
+  Components,
+  Helper
 } = PlussCore__namespace;
 const getInitialState = () => ({
   requests: 0,
@@ -5801,10 +5795,21 @@ const AnalyticsHub = _ref => {
     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;
@@ -5816,50 +5821,120 @@ const AnalyticsHub = _ref => {
     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
@@ -5870,13 +5945,14 @@ const AnalyticsHub = _ref => {
       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", {
@@ -5893,33 +5969,68 @@ const AnalyticsHub = _ref => {
     },
     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 {