@plusscommunities/pluss-maintenance-web-forms 1.1.37-beta.2 → 1.1.37-beta.4

package/dist/index.cjs.js

@@ -245,8 +245,8 @@ const JOBS_TYPES_LOADED = values.actionJobsTypesLoaded;
 const JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
 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; }
+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__default["default"](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; }
 const {
   Helper: Helper$6,
   Session: Session$9
@@ -342,7 +342,7 @@ const maintenanceActions = {
     return Session$9.authedFunction({
       method: 'POST',
       url: Helper$6.getUrl(values.serviceKey, 'sendMaintenance'),
-      data: _objectSpread$7({}, job)
+      data: _objectSpread$8({}, job)
     });
   },
   editJob: (job, site) => {
@@ -740,8 +740,8 @@ const 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__default["default"](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__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 {
   Session: Session$7,
   Components: Components$7,
@@ -1107,7 +1107,7 @@ class JobList extends React.Component {
         });
         const customFieldValues = this.getCustomFields(r, customColumns);
         const 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,
@@ -2040,12 +2040,12 @@ var JobTypes$1 = reactRedux.connect(mapStateToProps$6, {
   jobTypesUpdate
 })(reactRouter.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__default["default"](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__default["default"](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; }
 const {
   Session: Session$5,
   Components: Components$5,
-  Colours: Colours$2
+  Colours: Colours$3
 } = PlussCore__namespace;
 class Configuration extends React.Component {
   constructor(props) {
@@ -2246,7 +2246,7 @@ class Configuration extends React.Component {
       }, /*#__PURE__*/React__default["default"].createElement("div", {
         key: status.text,
         className: "statusLabel",
-        style: _objectSpread$5(_objectSpread$5({}, styles$6.statusTextContainer), {}, {
+        style: _objectSpread$6(_objectSpread$6({}, styles$6.statusTextContainer), {}, {
           backgroundColor: status.color
         })
       }, /*#__PURE__*/React__default["default"].createElement("span", {
@@ -2256,23 +2256,23 @@ class Configuration extends React.Component {
       }, /*#__PURE__*/React__default["default"].createElement("span", {
         className: "fontMedium fontSize-16 text-dark"
       }, status.category)), /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        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__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        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__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        style: _objectSpread$5({}, styles$6.statusIcon),
+        style: _objectSpread$6({}, styles$6.statusIcon),
         name: "pencil",
         onClick: () => this.onEditStatus(index)
       }), /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        style: _objectSpread$5({}, styles$6.statusIcon),
+        style: _objectSpread$6({}, styles$6.statusIcon),
         name: "minus-circle",
         onClick: () => this.onDeleteStatus(index)
       }));
@@ -2321,8 +2321,8 @@ class Configuration extends React.Component {
   renderSuccess() {
     if (!this.state.success) return null;
     return /*#__PURE__*/React__default["default"].createElement("span", {
-      style: _objectSpread$5(_objectSpread$5({}, styles$6.savedText), {}, {
-        color: Colours$2.COLOUR_GREEN
+      style: _objectSpread$6(_objectSpread$6({}, styles$6.savedText), {}, {
+        color: Colours$3.COLOUR_GREEN
       })
     }, "Saved");
   }
@@ -2463,7 +2463,7 @@ const styles$6 = {
     fontSize: 20,
     padding: 5,
     marginLeft: 10,
-    color: Colours$2.COLOUR_BRANDING_ACTION,
+    color: Colours$3.COLOUR_BRANDING_ACTION,
     visibility: 'visible'
   },
   savedText: {
@@ -2721,13 +2721,13 @@ var RequestsHub$1 = reactRedux.connect(mapStateToProps$4, {
   jobsLoaded
 })(reactRouter.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__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; }
+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__default["default"](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; }
 const {
   Apis: Apis$1,
   Helper: Helper$3,
   Session: Session$3,
-  Colours: Colours$1,
+  Colours: Colours$2,
   Components: Components$3
 } = PlussCore__namespace;
 const IMAGE_SIZE_NOTE = 72;
@@ -2809,7 +2809,7 @@ class Job extends React.Component {
       let statusType = statusTypes.find(s => s.text === status);
       if (!statusType) {
         const defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
-        statusType = _objectSpread$4(_objectSpread$4({}, defaultStatus), {}, {
+        statusType = _objectSpread$5(_objectSpread$5({}, defaultStatus), {}, {
           text: status
         });
       }
@@ -2999,7 +2999,7 @@ class Job extends React.Component {
       }
       maintenanceActions.deleteNote(this.state.jobId, n.Id);
       const newNotes = ___default["default"].filter(this.state.job.Notes, note => note.Id !== n.Id);
-      const newJob = _objectSpread$4({}, this.state.job);
+      const newJob = _objectSpread$5({}, this.state.job);
       newJob.Notes = newNotes;
       this.setState({
         job: newJob,
@@ -3083,7 +3083,7 @@ class Job extends React.Component {
     });
     _defineProperty__default["default"](this, "onSelectPriority", async priority => {
       this.setState({
-        job: _objectSpread$4(_objectSpread$4({}, this.state.job), {}, {
+        job: _objectSpread$5(_objectSpread$5({}, this.state.job), {}, {
           priority
         }),
         priorityChangerOpen: false
@@ -3108,7 +3108,7 @@ class Job extends React.Component {
     });
     _defineProperty__default["default"](this, "onSelectStatus", async status => {
       this.setState({
-        job: _objectSpread$4(_objectSpread$4({}, this.state.job), {}, {
+        job: _objectSpread$5(_objectSpread$5({}, this.state.job), {}, {
           status: status
         }),
         statusChangerOpen: false
@@ -3527,7 +3527,7 @@ class Job extends React.Component {
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "maintenanceNote_top"
     }, this.props.auth && this.props.auth.user && this.props.auth.user.Id === note.User.id && /*#__PURE__*/React__default["default"].createElement(Components$3.SVGIcon, {
-      colour: Colours$1.COLOUR_DUSK_LIGHT,
+      colour: Colours$2.COLOUR_DUSK_LIGHT,
       icon: "more15",
       className: "maintenanceNote_moreIcon",
       onClick: () => this.onOpenNoteMenu(index)
@@ -3578,7 +3578,7 @@ class Job extends React.Component {
     }, moment__default["default"].utc(e.timestamp).local().format("D MMM YYYY h:mma")), /*#__PURE__*/React__default["default"].createElement("div", {
       className: "statusLabel statusLabel-large statusLabel-full",
       style: {
-        backgroundColor: Colours$1.COLOUR_DUSK
+        backgroundColor: Colours$2.COLOUR_DUSK
       }
     }, /*#__PURE__*/React__default["default"].createElement("span", {
       className: "statusLabel_text"
@@ -3586,7 +3586,7 @@ class Job extends React.Component {
   }
   renderExternalSyncEntry(e, i) {
     const isSuccess = e.EntryType === "ExternalIDSet";
-    const backgroundColor = isSuccess ? Colours$1.COLOUR_GREEN : Colours$1.COLOUR_RED; // Green for success, red for failure
+    const backgroundColor = isSuccess ? Colours$2.COLOUR_GREEN : Colours$2.COLOUR_RED; // Green for success, red for failure
 
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: "ticketHistoryEntry",
@@ -3646,7 +3646,7 @@ class Job extends React.Component {
       return /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
         style: {
           fontSize: 20,
-          color: Colours$1.COLOUR_DUSK_LIGHT,
+          color: Colours$2.COLOUR_DUSK_LIGHT,
           marginLeft: 8
         },
         name: "spinner fa-pulse fa-fw"
@@ -3656,7 +3656,7 @@ class Job extends React.Component {
       className: "statusLabel pointer",
       onClick: this.onRetrySync,
       style: {
-        backgroundColor: Colours$1.COLOUR_RED,
+        backgroundColor: Colours$2.COLOUR_RED,
         marginLeft: 8
       }
     }, /*#__PURE__*/React__default["default"].createElement("span", {
@@ -3677,7 +3677,7 @@ class Job extends React.Component {
         className: "userStatusIcon",
         name: "times-circle",
         style: {
-          color: Colours$1.COLOUR_RED
+          color: Colours$2.COLOUR_RED
         }
       }), " ", retrySyncError);
     }
@@ -3690,7 +3690,7 @@ class Job extends React.Component {
         className: "userStatusIcon",
         name: "check-circle",
         style: {
-          color: Colours$1.COLOUR_GREEN
+          color: Colours$2.COLOUR_GREEN
         }
       }), " ", "Sync retry initiated. Check back shortly for results.");
     }
@@ -3703,7 +3703,7 @@ class Job extends React.Component {
         className: "userStatusIcon",
         name: "times-circle",
         style: {
-          color: Colours$1.COLOUR_RED
+          color: Colours$2.COLOUR_RED
         }
       }), " ", "External sync failed. Use the retry button to attempt again.");
     }
@@ -3747,11 +3747,11 @@ class Job extends React.Component {
     } = this.state;
     if (!job || !job.history) return null;
     const source = ___default["default"].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"
       });
@@ -3900,7 +3900,7 @@ class Job extends React.Component {
           onClick: () => {
             this.onSelectAssignee();
           },
-          colour: Colours$1.COLOUR_DUSK
+          colour: Colours$2.COLOUR_DUSK
         })
       }));
     } else {
@@ -3974,14 +3974,14 @@ var Job$1 = reactRedux.connect(mapStateToProps$3, {
   jobStatusesUpdate
 })(reactRouter.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__default["default"](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__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 {
   Actions,
   Components: Components$2,
   Helper: Helper$2,
   Session: Session$2,
-  Colours,
+  Colours: Colours$1,
   Apis
 } = PlussCore__namespace;
 class AddJob extends React.Component {
@@ -4000,7 +4000,7 @@ class AddJob extends React.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,
@@ -4248,7 +4248,7 @@ class AddJob extends React.Component {
       event.target.value = "";
     });
     _defineProperty__default["default"](this, "onToggleDatePicker", qId => {
-      const showDate = _objectSpread$3({}, this.state.showDate);
+      const showDate = _objectSpread$4({}, this.state.showDate);
       showDate[qId] = !showDate[qId];
       this.setState({
         showDate
@@ -4729,7 +4729,7 @@ class AddJob extends React.Component {
           alwaysShowLabel: true,
           readOnly: true,
           rightContent: !___default["default"].isEmpty(field.answer) && /*#__PURE__*/React__default["default"].createElement(Components$2.SVGIcon, {
-            colour: Colours.COLOUR_DUSK_LIGHT,
+            colour: Colours$1.COLOUR_DUSK_LIGHT,
             icon: "close",
             className: "timepicker_clear",
             onClick: () => this.onChangeDateAnswer(fieldId, undefined, false)
@@ -4762,7 +4762,7 @@ class AddJob extends React.Component {
             }
           }),
           rightContent: !___default["default"].isEmpty(field.answer) && /*#__PURE__*/React__default["default"].createElement(Components$2.SVGIcon, {
-            colour: Colours.COLOUR_DUSK_LIGHT,
+            colour: Colours$1.COLOUR_DUSK_LIGHT,
             icon: "close",
             className: "timepicker_clear",
             onClick: () => this.onChangeTimeAnswer(fieldId, undefined)
@@ -5771,11 +5771,14 @@ var AddJobType$1 = reactRedux.connect(mapStateToProps$1, {
   jobTypesUpdate
 })(reactRouter.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__default["default"](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; }
 const {
   Analytics: Analytics$1,
   Session,
   Components,
-  Helper
+  Helper,
+  Colours
 } = PlussCore__namespace;
 const getInitialState = () => ({
   requests: 0,
@@ -5846,72 +5849,85 @@ const AnalyticsHub = _ref => {
     getData();
   }, [startTime, endTime, userType, userCategory, selectedSites]);
   const getData = async () => {
-    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, {
+    try {
+      setFailedSites([]);
+      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
-        });
-        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
+        }), 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
         };
-      });
-      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);
+        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
+        }));
+      }
     }
   };
   const isReadyToOpenCSV = () => {
@@ -5942,14 +5958,14 @@ const AnalyticsHub = _ref => {
       return null;
     }
     const source = getExportSource();
-    const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, '-')).join('_');
+    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(comparisonMode ? '_comparison' : '').concat(filterSuffix ? "_".concat(filterSuffix) : '', "_").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", {
@@ -5969,9 +5985,10 @@ const AnalyticsHub = _ref => {
   }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
     type: "help",
     style: {
-      color: '#c02743'
+      color: Colours.COLOUR_RED,
+      marginTop: 8
     }
-  }, "Data unavailable for: ", failedSites.join(', ')), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "analyticsSection dashboardSection_content"
   }, (() => {
     const chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");