@plusscommunities/pluss-maintenance-web-feedback 1.3.1-beta.0 → 1.3.3-beta.0

package/dist/index.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { Component, useState, useEffect } from 'react';
 import { connect } from 'react-redux';
@@ -8,12 +7,12 @@ 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$4 } from '@plusscommunities/pluss-core-web';
-import { Table, MenuItem, DropdownButton } from 'react-bootstrap';
+import { Table } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import Textarea from 'react-textarea-autosize';
 
-var values = {
+const values = {
   featureKey: "maintenanceFeedback",
   aliases: ["maintenanceTrackingFeedback", "maintenanceTypesFeedback", "maintenancerequestFeedback"],
   serviceKey: "maintenanceFeedback",
@@ -86,7 +85,7 @@ var values = {
 };
 
 // import * as PlussCore from '../../pluss-core/src';
-var FeatureConfig = {
+const FeatureConfig = {
   key: values.featureKey,
   aliases: values.aliases,
   singularName: values.textSingularName,
@@ -218,22 +217,22 @@ var FeatureConfig = {
   notificationPreference: values.notificationPreference
 };
 
-var JOBS_LOADED = values.actionJobsLoaded;
-var JOBS_LOADING = values.actionJobsLoading;
-var JOBS_REMOVED = values.actionJobsRemoved;
-var JOBS_TYPES_LOADED = values.actionJobsTypesLoaded;
-var JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
-var JOBS_HIDE_SEEN = values.actionJobsHideSeen;
+const JOBS_LOADED = values.actionJobsLoaded;
+const JOBS_LOADING = values.actionJobsLoading;
+const JOBS_REMOVED = values.actionJobsRemoved;
+const JOBS_TYPES_LOADED = values.actionJobsTypesLoaded;
+const JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
+const JOBS_HIDE_SEEN = values.actionJobsHideSeen;
 
 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 {
+const {
   Helper: Helper$6,
   Session: Session$9
 } = PlussCore;
-var maintenanceActions = {
+const maintenanceActions = {
   getJobType: (site, typeId) => {
-    var url = Helper$6.getUrl(values.serviceKey, "getjobtype");
+    let url = Helper$6.getUrl(values.serviceKey, "getjobtype");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -244,7 +243,7 @@ var maintenanceActions = {
     });
   },
   getJobTypes: (site, id) => {
-    var url = Helper$6.getUrl(values.serviceKey, "getjobtypes");
+    let url = Helper$6.getUrl(values.serviceKey, "getjobtypes");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -254,7 +253,7 @@ var maintenanceActions = {
     });
   },
   getJob: (site, id) => {
-    var url = Helper$6.getUrl(values.serviceKey, "getJob");
+    let url = Helper$6.getUrl(values.serviceKey, "getJob");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -265,7 +264,7 @@ var maintenanceActions = {
     });
   },
   getJobByJobId: (site, jobId) => {
-    var url = Helper$6.getUrl(values.serviceKey, "getJob");
+    let url = Helper$6.getUrl(values.serviceKey, "getJob");
     return Session$9.authedFunction({
       method: "POST",
       url,
@@ -275,9 +274,9 @@ var maintenanceActions = {
       }
     });
   },
-  getJobs: function getJobs(site) {
-    var status = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
-    var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
+  getJobs: function (site) {
+    let status = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+    let type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
     return Session$9.authedFunction({
       method: "POST",
       url: Helper$6.getUrl(values.serviceKey, "getJobs"),
@@ -289,7 +288,7 @@ var maintenanceActions = {
     });
   },
   getJobs2: (site, status, type, lastKey) => {
-    var query = {
+    const query = {
       site
     };
     if (status) {
@@ -306,11 +305,11 @@ var maintenanceActions = {
       url: Helper$6.getUrl(values.serviceKey, "get/requests", query)
     });
   },
-  getJobsRecursive: function getJobsRecursive(site, status, type, lastKey) {
-    var jobs = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  getJobsRecursive: function (site, status, type, lastKey) {
+    let jobs = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
     return new Promise(resolve => {
       maintenanceActions.getJobs2(site, status, type, lastKey).then(jobRes => {
-        var newJobs = [...jobs, ...jobRes.data.Items];
+        const newJobs = [...jobs, ...jobRes.data.Items];
         if (!jobRes.data.LastKey) {
           return resolve(newJobs);
         }
@@ -422,7 +421,7 @@ var maintenanceActions = {
     });
   },
   addJobType: (site, name, email, description, level, hasCustomFields, customFields) => {
-    var data = {
+    const data = {
       site,
       name,
       email,
@@ -438,7 +437,7 @@ var maintenanceActions = {
     });
   },
   editJobType: (site, id, name, email, description, level, hasCustomFields, customFields) => {
-    var data = {
+    const data = {
       site,
       id,
       name,
@@ -484,13 +483,13 @@ var maintenanceActions = {
   }
 };
 
-var {
+const {
   Helper: Helper$5,
   Session: Session$8
 } = PlussCore;
-var reactionActions = {
+const reactionActions = {
   addComment: (entityId, entityType, entityName, site, comment, image, parentId) => {
-    var data = {
+    const data = {
       entityId,
       entityType,
       entityName,
@@ -517,7 +516,7 @@ var reactionActions = {
   //   });
   // },
   getComments: (entityId, entityType, minTime) => {
-    var query = {
+    const query = {
       entityId,
       entityType
     };
@@ -531,12 +530,12 @@ var reactionActions = {
   }
 };
 
-var {
+const {
   Apis: Apis$2
 } = PlussCore;
-var analyticsActions = Apis$2.analyticsActions;
-var userActions = Apis$2.userActions;
-var stringActions = Apis$2.stringActions;
+const analyticsActions = Apis$2.analyticsActions;
+const userActions = Apis$2.userActions;
+const stringActions = Apis$2.stringActions;
 
 var jobStatusOptions = [
 	{
@@ -559,16 +558,16 @@ var jobStatusOptions = [
 	}
 ];
 
-var {
+const {
   Helper: Helper$4
 } = PlussCore;
-var jobsUpdate = (site, isdashboard) => {
+const jobsUpdate = (site, isdashboard) => {
   return dispatch => {
     if (isdashboard) dispatch({
       type: JOBS_LOADING
     });
     maintenanceActions.getJobsRecursive(site).then(res => {
-      var currentSite = Helper$4.readStorageWithCookie("site");
+      const currentSite = Helper$4.readStorageWithCookie("site");
       if (!_.isEmpty(res) && res[0].site === currentSite) {
         dispatch({
           type: JOBS_LOADED,
@@ -583,19 +582,19 @@ var jobsUpdate = (site, isdashboard) => {
     });
   };
 };
-var jobsLoaded = events => {
+const jobsLoaded = events => {
   return {
     type: JOBS_LOADED,
     payload: events
   };
 };
-var removeJob = id => {
+const removeJob = id => {
   return {
     type: JOBS_REMOVED,
     payload: id
   };
 };
-var jobTypesUpdate = site => {
+const jobTypesUpdate = site => {
   return dispatch => {
     maintenanceActions.getJobTypes(site).then(res => {
       dispatch({
@@ -605,14 +604,14 @@ var jobTypesUpdate = site => {
     });
   };
 };
-var jobTypesLoaded = events => {
+const jobTypesLoaded = events => {
   return {
     type: JOBS_TYPES_LOADED,
     payload: events
   };
 };
-var jobStatusesUpdate = function jobStatusesUpdate(site) {
-  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+const jobStatusesUpdate = function (site) {
+  let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   return dispatch => {
     stringActions.getString(site, values.stringConfigJobStatus).then(res => {
       dispatch({
@@ -629,14 +628,14 @@ var jobStatusesUpdate = function jobStatusesUpdate(site) {
     });
   };
 };
-var jobStatusesLoaded = statuses => {
+const jobStatusesLoaded = statuses => {
   return {
     type: JOBS_STATUSES_LOADED,
     payload: statuses
   };
 };
-var jobHideSeenUpdate = function jobHideSeenUpdate(site) {
-  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+const jobHideSeenUpdate = function (site) {
+  let callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   return dispatch => {
     stringActions.getString(site, values.stringConfigHideSeen).then(res => {
       dispatch({
@@ -653,7 +652,7 @@ var jobHideSeenUpdate = function jobHideSeenUpdate(site) {
     });
   };
 };
-var jobHideSeenLoaded = hide => {
+const jobHideSeenLoaded = hide => {
   return {
     type: JOBS_HIDE_SEEN,
     payload: hide
@@ -709,31 +708,29 @@ var jobPriorityOptions = [
 	}
 ];
 
-var STATUS_IMCOMPLETE = "All Incomplete";
-var STATUS_NOT_ACTIONED = "Not Actioned";
-var STATUS_IN_PROGRESS = "In Progress";
-var STATUS_COMPLETED = "Completed";
-var getDefaultPriority = () => jobPriorityOptions.find(p => p.default);
-var getJobPriority = priority => {
-  var priorityOption = null;
+const STATUS_IMCOMPLETE = "All Incomplete";
+const STATUS_NOT_ACTIONED = "Not Actioned";
+const STATUS_IN_PROGRESS = "In Progress";
+const STATUS_COMPLETED = "Completed";
+const getDefaultPriority = () => jobPriorityOptions.find(p => p.default);
+const getJobPriority = priority => {
+  let priorityOption = null;
   if (priority) priorityOption = jobPriorityOptions.find(p => p.name === priority);
   return priorityOption || getDefaultPriority();
 };
 
 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 {
+const {
   Session: Session$7,
   Components: Components$7,
   Analytics: Analytics$2
 } = PlussCore;
 class JobList extends Component {
   constructor(props) {
-    var _this;
     super(props);
-    _this = this;
     _defineProperty(this, "setRequesters", jobs => {
-      var requesters = _.orderBy(_.uniqBy(jobs.map(j => ({
+      const requesters = _.orderBy(_.uniqBy(jobs.map(j => ({
         id: j.userID,
         displayName: j.userName,
         profilePic: j.userProfilePic
@@ -742,32 +739,32 @@ class JobList extends Component {
         requesters
       });
     });
-    _defineProperty(this, "getJobs", /*#__PURE__*/_asyncToGenerator(function* () {
-      var {
+    _defineProperty(this, "getJobs", async () => {
+      const {
         auth
-      } = _this.props;
+      } = this.props;
       try {
-        var res = yield maintenanceActions.getJobsRecursive(auth.site);
+        const res = await maintenanceActions.getJobsRecursive(auth.site);
         if (!_.isEmpty(res) && res[0].site === auth.site) {
-          _this.setRequesters(res);
-          _this.props.jobsLoaded(res);
+          this.setRequesters(res);
+          this.props.jobsLoaded(res);
         }
       } catch (error) {
         console.error("getJobs", error);
       }
-    }));
-    _defineProperty(this, "getAssignees", /*#__PURE__*/_asyncToGenerator(function* () {
+    });
+    _defineProperty(this, "getAssignees", async () => {
       try {
-        var res = yield maintenanceActions.getAssignees(_this.props.auth.site);
-        _this.setState({
+        const res = await maintenanceActions.getAssignees(this.props.auth.site);
+        this.setState({
           assignees: res.data.Users
         });
       } catch (error) {
         console.error("getAssignees", error);
       }
-    }));
+    });
     _defineProperty(this, "sortByCol", col => {
-      var {
+      const {
         sortColumn,
         sortDesc
       } = this.state;
@@ -782,23 +779,18 @@ class JobList extends Component {
         });
       }
     });
-    _defineProperty(this, "onRemoveRequest", /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator(function* (request) {
-        if (window.confirm(values.textAreYouSureYouWantToDelete)) {
-          _this.props.removeJob(request.id);
-          try {
-            yield maintenanceActions.deleteJob(_this.props.auth.site, request.id);
-            _this.getJobs();
-          } catch (error) {
-            console.log("onRemoveRequest", error);
-            alert("Something went wrong with the request. Please try again.");
-          }
+    _defineProperty(this, "onRemoveRequest", async request => {
+      if (window.confirm(values.textAreYouSureYouWantToDelete)) {
+        this.props.removeJob(request.id);
+        try {
+          await maintenanceActions.deleteJob(this.props.auth.site, request.id);
+          this.getJobs();
+        } catch (error) {
+          console.log("onRemoveRequest", error);
+          alert("Something went wrong with the request. Please try again.");
         }
-      });
-      return function (_x) {
-        return _ref3.apply(this, arguments);
-      };
-    }());
+      }
+    });
     _defineProperty(this, "openFilter", filter => {
       this.setState({
         filterOpen: filter
@@ -851,15 +843,15 @@ class JobList extends Component {
       if (!this.isValidTimeFilter()) {
         return;
       }
-      var startTime = 0;
-      var endTime = moment().endOf("d").valueOf();
-      var text = "";
+      let startTime = 0;
+      let endTime = moment().endOf("d").valueOf();
+      let text = "";
       if (this.state.selectedTimeFilter.dayCount > 0) {
         startTime = moment().add(-this.state.selectedTimeFilter.dayCount, "d").startOf("d").valueOf();
         text = this.state.selectedTimeFilter.text;
       } else {
-        var startDate = moment(this.state.timeFilterStart).startOf("d");
-        var endDate = moment(this.state.timeFilterEnd).endOf("d");
+        const startDate = moment(this.state.timeFilterStart).startOf("d");
+        const endDate = moment(this.state.timeFilterEnd).endOf("d");
         startTime = startDate.valueOf();
         endTime = endDate.valueOf();
         text = "".concat(startDate.format("DD/MM/YYYY"), "  to  ").concat(endDate.format("DD/MM/YYYY"));
@@ -930,7 +922,7 @@ class JobList extends Component {
       this.closeFilter();
     });
     _defineProperty(this, "onHandleSearchChange", event => {
-      var thisSearchTime = moment().valueOf();
+      const thisSearchTime = moment().valueOf();
       this.setState({
         search: event.target.value,
         lastSearch: thisSearchTime
@@ -945,7 +937,7 @@ class JobList extends Component {
       }, 500);
     });
     _defineProperty(this, "getSource", () => {
-      var source = this.props.source;
+      let source = this.props.source;
 
       // filter by time
       if (this.state.selectedTimeFilterStart && this.state.selectedTimeFilterEnd) {
@@ -963,7 +955,7 @@ class JobList extends Component {
 
       // filter by priority
       if (this.state.selectedPriorityFilter) {
-        var defaultPriority = getDefaultPriority().name;
+        const defaultPriority = getDefaultPriority().name;
         source = _.filter(source, r => {
           return r.priority === this.state.selectedPriorityFilter || this.state.selectedPriorityFilter === defaultPriority && _.isNil(r.priority);
         });
@@ -971,12 +963,12 @@ class JobList extends Component {
 
       // filter by status
       if (this.state.selectedStatusFilter) {
-        var {
+        const {
           statusTypes
         } = this.props;
-        var defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
+        const defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
         source = _.filter(source, r => {
-          var status = statusTypes.find(s => s.text === r.status) || defaultStatus;
+          const status = statusTypes.find(s => s.text === r.status) || defaultStatus;
           if (this.state.selectedStatusFilter === STATUS_IMCOMPLETE) {
             return status.category !== STATUS_COMPLETED;
           }
@@ -1032,18 +1024,18 @@ class JobList extends Component {
       }
     });
     _defineProperty(this, "getCustomFields", (job, customColumns) => {
-      var {
+      const {
         customFields,
         type
       } = job;
-      var customValues = {};
+      const customValues = {};
       if (customFields && Array.isArray(customFields)) {
         customFields.forEach(field => {
           // Exclude un-exportable fields
           if (["image", "document", "staticTitle", "staticText"].includes(field.type)) return;
-          var fieldKey = "".concat(_.camelCase(type), ".").concat(_.camelCase(field.label));
+          const fieldKey = "".concat(_.camelCase(type), ".").concat(_.camelCase(field.label));
           // Build custom columns
-          var exists = customColumns.find(c => c.key === fieldKey);
+          const exists = customColumns.find(c => c.key === fieldKey);
           if (!exists) {
             customColumns.push({
               label: field.label,
@@ -1057,20 +1049,20 @@ class JobList extends Component {
       return customValues;
     });
     _defineProperty(this, "getExportSource", () => {
-      var customColumns = [];
-      var defaultPriority = getDefaultPriority().name;
-      var source = this.getSource().map(r => {
-        var history = r.history || [];
-        var progressEntry = _.find(history, e => {
+      const customColumns = [];
+      const defaultPriority = getDefaultPriority().name;
+      const source = this.getSource().map(r => {
+        const history = r.history || [];
+        const progressEntry = _.find(history, e => {
           return e.status !== "Unassigned";
         });
-        var completedEntry = _.find(history, e => {
+        const completedEntry = _.find(history, e => {
           return e.status === "Completed";
         });
-        var progressTime = null;
-        var completedTime = null;
-        var progressDuration = null;
-        var completedDuration = null;
+        let progressTime = null;
+        let completedTime = null;
+        let progressDuration = null;
+        let completedDuration = null;
         if (progressEntry) {
           progressTime = moment.utc(progressEntry.timestamp).format();
           progressDuration = moment.utc(progressEntry.timestamp).unix() - moment.utc(r.createdTime).unix();
@@ -1079,7 +1071,7 @@ class JobList extends Component {
           completedTime = moment.utc(completedEntry.timestamp).format();
           completedDuration = moment.utc(completedEntry.timestamp).unix() - moment.utc(r.createdTime).unix();
         }
-        var notes = "";
+        let notes = "";
         (r.Notes || []).forEach((note, index) => {
           if (index > 0) {
             notes += "\n\n";
@@ -1092,8 +1084,8 @@ class JobList extends Component {
           }
           notes += note.Note;
         });
-        var customFieldValues = this.getCustomFields(r, customColumns);
-        var priority = r.priority || defaultPriority;
+        const customFieldValues = this.getCustomFields(r, customColumns);
+        const priority = r.priority || defaultPriority;
         return _objectSpread$7(_objectSpread$7(_objectSpread$7({}, r), customFieldValues), {}, {
           notes,
           progressTime,
@@ -1105,8 +1097,8 @@ class JobList extends Component {
       });
 
       // Compose revised columns list with custom fields
-      var index = this.exportColumns.findIndex(c => c.key === "notes");
-      var columns = [...this.exportColumns.slice(0, index), ...customColumns, ...this.exportColumns.slice(index)];
+      const index = this.exportColumns.findIndex(c => c.key === "notes");
+      const columns = [...this.exportColumns.slice(0, index), ...customColumns, ...this.exportColumns.slice(index)];
       return {
         columns,
         source
@@ -1236,7 +1228,7 @@ class JobList extends Component {
       });
     }
     if (this.state.filterOpen === "status") {
-      var {
+      const {
         statusTypes
       } = this.props;
       return /*#__PURE__*/jsx(Components$7.Popup, {
@@ -1282,7 +1274,7 @@ class JobList extends Component {
       });
     }
     if (this.state.filterOpen === "user") {
-      var userContent = null;
+      let userContent = null;
       if (this.state.selectedAssignee) {
         userContent = /*#__PURE__*/jsx("div", {
           children: /*#__PURE__*/jsx(Components$7.UserListing, {
@@ -1337,9 +1329,9 @@ class JobList extends Component {
       });
     }
     if (this.state.filterOpen === "requester") {
-      var _userContent = null;
+      let userContent = null;
       if (this.state.selectedRequester) {
-        _userContent = /*#__PURE__*/jsx("div", {
+        userContent = /*#__PURE__*/jsx("div", {
           children: /*#__PURE__*/jsx(Components$7.UserListing, {
             user: this.state.selectedRequester,
             rightContent: /*#__PURE__*/jsx(Icon, {
@@ -1353,7 +1345,7 @@ class JobList extends Component {
           }, this.state.selectedRequester.id)
         });
       } else {
-        _userContent = /*#__PURE__*/jsxs("div", {
+        userContent = /*#__PURE__*/jsxs("div", {
           children: [/*#__PURE__*/jsx(Components$7.GenericInput, {
             id: "requesterSearch",
             type: "text"
@@ -1388,22 +1380,22 @@ class JobList extends Component {
           text: "Select",
           isActive: true
         }],
-        children: _userContent
+        children: userContent
       });
     }
     return null;
   }
   renderRequests() {
-    var {
+    const {
       statusTypes
     } = this.props;
-    var defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
+    const defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
     return this.getSource().map((ev, index) => {
       if (!ev) {
         return null;
       }
-      var status = ev.status && statusTypes.find(s => s.text === ev.status) || defaultStatus;
-      var priority = getJobPriority(ev.priority);
+      const status = ev.status && statusTypes.find(s => s.text === ev.status) || defaultStatus;
+      const priority = getJobPriority(ev.priority);
       return /*#__PURE__*/jsxs("tr", {
         children: [/*#__PURE__*/jsx("td", {
           children: ev.jobId
@@ -1496,7 +1488,7 @@ class JobList extends Component {
     });
   }
   renderSort(col) {
-    var {
+    const {
       sortColumn,
       sortDesc
     } = this.state;
@@ -1513,7 +1505,7 @@ class JobList extends Component {
     return " table--columnActive";
   }
   renderEmpty() {
-    var title = this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleRequests;
+    const title = this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleRequests;
     return /*#__PURE__*/jsxs("div", {
       style: {
         display: "flex",
@@ -1652,42 +1644,42 @@ class JobList extends Component {
     });
   }
   renderFilters() {
-    var typeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
+    let typeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
         this.openFilter("type");
       },
       text: values.textJobType
     });
-    var statusFilter = /*#__PURE__*/jsx(Components$7.Tag, {
+    let statusFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
         this.openFilter("status");
       },
       text: "Status"
     });
-    var priorityFilter = /*#__PURE__*/jsx(Components$7.Tag, {
+    let priorityFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
         this.openFilter("priority");
       },
       text: "Priority"
     });
-    var timeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
+    let timeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
         this.openFilter("time");
       },
       text: "Time"
     });
-    var userFilter = /*#__PURE__*/jsx(Components$7.Tag, {
+    let userFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
         this.openFilter("user");
       },
       text: "Assigned To"
     });
-    var requesterFilter = /*#__PURE__*/jsx(Components$7.Tag, {
+    let requesterFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
         this.openFilter("requester");
@@ -1813,7 +1805,7 @@ class JobList extends Component {
     if (!this.state.exportCsvOpen) {
       return null;
     }
-    var {
+    const {
       columns,
       source
     } = this.getExportSource();
@@ -1833,8 +1825,8 @@ class JobList extends Component {
     });
   }
 }
-var mapStateToProps$7 = state => {
-  var {
+const mapStateToProps$7 = state => {
+  const {
     auth
   } = state;
   return {
@@ -1850,27 +1842,25 @@ var JobList$1 = connect(mapStateToProps$7, {
   jobStatusesUpdate
 })(withRouter(JobList));
 
-var {
+const {
   Session: Session$6,
   Components: Components$6
 } = PlussCore;
 class JobTypes extends Component {
   constructor(props) {
-    var _this;
     super(props);
-    _this = this;
-    _defineProperty(this, "getJobTypes", /*#__PURE__*/_asyncToGenerator(function* () {
+    _defineProperty(this, "getJobTypes", async () => {
       try {
-        var res = yield maintenanceActions.getJobTypes(_this.props.auth.site);
-        if (res.data != null) _this.props.jobTypesLoaded(res.data);
+        const res = await maintenanceActions.getJobTypes(this.props.auth.site);
+        if (res.data != null) this.props.jobTypesLoaded(res.data);
       } catch (error) {
         console.error("getJobTypes", error);
       } finally {
-        _this.setState({
+        this.setState({
           loading: false
         });
       }
-    }));
+    });
     _defineProperty(this, "sortByCol", col => {
       if (this.state.sortColumn === col) {
         this.setState({
@@ -1883,28 +1873,23 @@ class JobTypes extends Component {
         });
       }
     });
-    _defineProperty(this, "onRemoveJobType", /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (ev) {
-        if (!window.confirm("Are you sure you want to delete ".concat(ev.typeName, "?"))) return;
-        try {
-          yield maintenanceActions.deleteJobType(_this.props.auth.site, ev.id);
-          var index = _.findIndex(_this.state.jobList, job => {
-            return job != null && job.id === ev.id;
-          });
-          if (index > -1) {
-            var newJobTypes = [..._this.state.jobList];
-            newJobTypes[index].Deleted = true;
-            _this.props.jobTypesLoaded(newJobTypes);
-          }
-        } catch (error) {
-          console.error("onRemoveJobType", error);
-          alert("Something went wrong with the request. Please try again.");
+    _defineProperty(this, "onRemoveJobType", async ev => {
+      if (!window.confirm("Are you sure you want to delete ".concat(ev.typeName, "?"))) return;
+      try {
+        await maintenanceActions.deleteJobType(this.props.auth.site, ev.id);
+        const index = _.findIndex(this.state.jobList, job => {
+          return job != null && job.id === ev.id;
+        });
+        if (index > -1) {
+          const newJobTypes = [...this.state.jobList];
+          newJobTypes[index].Deleted = true;
+          this.props.jobTypesLoaded(newJobTypes);
         }
-      });
-      return function (_x) {
-        return _ref2.apply(this, arguments);
-      };
-    }());
+      } catch (error) {
+        console.error("onRemoveJobType", error);
+        alert("Something went wrong with the request. Please try again.");
+      }
+    });
     this.state = {
       jobList: [],
       sortColumn: "name",
@@ -1928,7 +1913,7 @@ class JobTypes extends Component {
     });
   }
   renderList() {
-    var source = _.sortBy(this.state.jobList, this.state.sortColumn);
+    let source = _.sortBy(this.state.jobList, this.state.sortColumn);
     if (this.state.sortDesc) source.reverse();
     source = _.filter(source, ev => {
       if (!ev) return false;
@@ -2063,7 +2048,7 @@ class JobTypes extends Component {
     return this.renderView();
   }
   renderJobTypes() {
-    var {
+    const {
       jobList,
       loading
     } = this.state;
@@ -2115,8 +2100,8 @@ class JobTypes extends Component {
     });
   }
 }
-var mapStateToProps$6 = state => {
-  var {
+const mapStateToProps$6 = state => {
+  const {
     auth
   } = state;
   return {
@@ -2131,7 +2116,7 @@ var JobTypes$1 = connect(mapStateToProps$6, {
 
 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 {
+const {
   Session: Session$5,
   Components: Components$5,
   Colours: Colours$3
@@ -2148,9 +2133,9 @@ class Configuration extends Component {
       return true;
     });
     _defineProperty(this, "onMoveStatus", function (index) {
-      var up = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      let up = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       if (_this.state.fetchingStatusTypes) return;
-      var statusTypes = _.cloneDeep(_this.state.statusTypes);
+      const statusTypes = _.cloneDeep(_this.state.statusTypes);
       if (up && index > 0) {
         // Moving up
         [statusTypes[index - 1], statusTypes[index]] = [statusTypes[index], statusTypes[index - 1]];
@@ -2166,7 +2151,7 @@ class Configuration extends Component {
     });
     _defineProperty(this, "onEditStatus", index => {
       if (this.state.fetchingStatusTypes) return;
-      var status = this.state.statusTypes[index];
+      const status = this.state.statusTypes[index];
       this.setState({
         showWarnings: false,
         showStatusPopup: true,
@@ -2178,14 +2163,14 @@ class Configuration extends Component {
     });
     _defineProperty(this, "onDeleteStatus", index => {
       if (this.state.fetchingStatusTypes) return;
-      var statusTypes = _.cloneDeep(this.state.statusTypes);
+      const statusTypes = _.cloneDeep(this.state.statusTypes);
       statusTypes.splice(index, 1);
       this.setState({
         statusTypes
       });
     });
     _defineProperty(this, "onAddStatus", () => {
-      var defaultStatus = this.props.statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
+      const defaultStatus = this.props.statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
       this.setState({
         showWarnings: false,
         showStatusPopup: true,
@@ -2196,13 +2181,13 @@ class Configuration extends Component {
       });
     });
     _defineProperty(this, "onSaveStatus", () => {
-      var {
+      const {
         selectedStatusIndex,
         statusLabel,
         statusCategory,
         statusColour
       } = this.state;
-      var statusTypes = _.cloneDeep(this.state.statusTypes);
+      const statusTypes = _.cloneDeep(this.state.statusTypes);
       if (selectedStatusIndex < 0) {
         statusTypes.push({
           text: statusLabel,
@@ -2211,7 +2196,7 @@ class Configuration extends Component {
           category: statusCategory
         });
       } else {
-        var status = statusTypes[selectedStatusIndex];
+        const status = statusTypes[selectedStatusIndex];
         status.text = statusLabel;
         status.color = statusColour;
         status.category = statusCategory;
@@ -2243,30 +2228,30 @@ class Configuration extends Component {
       this.setState({
         success: false,
         submitting: true
-      }, /*#__PURE__*/_asyncToGenerator(function* () {
+      }, async () => {
         try {
-          var {
+          const {
             statusTypes,
             hideSeen
-          } = _this.state;
-          yield stringActions.setString(_this.props.auth.site, values.stringConfigJobStatus, statusTypes);
-          yield stringActions.setString(_this.props.auth.site, values.stringConfigHideSeen, hideSeen);
-          _this.props.jobStatusesLoaded(statusTypes);
-          _this.props.jobHideSeenLoaded(hideSeen);
-          _this.setState({
+          } = this.state;
+          await stringActions.setString(this.props.auth.site, values.stringConfigJobStatus, statusTypes);
+          await stringActions.setString(this.props.auth.site, values.stringConfigHideSeen, hideSeen);
+          this.props.jobStatusesLoaded(statusTypes);
+          this.props.jobHideSeenLoaded(hideSeen);
+          this.setState({
             success: true
           });
         } catch (error) {
           console.log("onSaveConfig - error", error);
-          _this.setState({
+          this.setState({
             success: false
           });
         } finally {
-          _this.setState({
+          this.setState({
             submitting: false
           });
         }
-      }));
+      });
     });
     this.state = {
       success: false,
@@ -2300,15 +2285,15 @@ class Configuration extends Component {
     }
   }
   validateForm() {
-    var {
+    const {
       submitting,
       statusTypes
     } = this.state;
     if (submitting) return false;
 
     // Validate statuses
-    var statusesValid = statusTypes.map(status => {
-      var {
+    const statusesValid = statusTypes.map(status => {
+      const {
         text,
         category,
         color
@@ -2319,7 +2304,7 @@ class Configuration extends Component {
     return true;
   }
   renderStatuses() {
-    var {
+    const {
       statusTypes
     } = this.state;
     return /*#__PURE__*/jsxs("div", {
@@ -2431,7 +2416,7 @@ class Configuration extends Component {
     });
   }
   renderNewStatusPopup() {
-    var {
+    const {
       submitting,
       showStatusPopup,
       showWarnings,
@@ -2441,7 +2426,7 @@ class Configuration extends Component {
       statusColour
     } = this.state;
     if (!showStatusPopup) return null;
-    var canSave = !submitting && this.isStatusValid(statusLabel, statusCategory, statusColour);
+    const canSave = !submitting && this.isStatusValid(statusLabel, statusCategory, statusColour);
     return /*#__PURE__*/jsxs(Components$5.Popup, {
       maxWidth: 800,
       minWidth: 450,
@@ -2550,7 +2535,7 @@ class Configuration extends Component {
     });
   }
 }
-var styles$6 = {
+const styles$6 = {
   statusCategoryHeading: {
     marginLeft: 130,
     width: 160,
@@ -2584,8 +2569,8 @@ var styles$6 = {
     marginLeft: 15
   }
 };
-var mapStateToProps$5 = state => {
-  var {
+const mapStateToProps$5 = state => {
+  const {
     auth
   } = state;
   return {
@@ -2601,27 +2586,25 @@ var Configuration$1 = connect(mapStateToProps$5, {
   jobHideSeenLoaded
 })(withRouter(Configuration));
 
-var {
+const {
   Components: Components$4,
   Session: Session$4,
   Urls
 } = PlussCore;
 class RequestsHub extends Component {
   constructor(props) {
-    var _this;
     super(props);
-    _this = this;
     _defineProperty(this, "setData", () => {
-      var allList = [];
+      const allList = [];
       this.state.allList.forEach(ev => {
         if (ev != null && !ev.Deleted) allList.push(ev);
       });
-      var upcoming = _.filter(allList, ev => {
+      const upcoming = _.filter(allList, ev => {
         if (!ev) return false;
         if (ev.status && ev.status === "Completed") return false;
         return true;
       });
-      var completed = _.filter(allList, ev => {
+      const completed = _.filter(allList, ev => {
         if (!ev) return false;
         if (ev.status && ev.status === "Completed") return true;
         return false;
@@ -2635,30 +2618,30 @@ class RequestsHub extends Component {
       });
     });
     _defineProperty(this, "getData", () => {
-      var {
+      const {
         auth
       } = this.props;
       this.setState({
         loadingAll: true
-      }, /*#__PURE__*/_asyncToGenerator(function* () {
+      }, async () => {
         try {
-          var res = yield maintenanceActions.getJobsRecursive(auth.site);
-          _this.setState({
+          const res = await maintenanceActions.getJobsRecursive(auth.site);
+          this.setState({
             loadingAll: false
           });
           if (!_.isEmpty(res) && res[0].site === auth.site) {
-            _this.props.jobsLoaded(res);
+            this.props.jobsLoaded(res);
           }
         } catch (error) {
           console.error("getData", error);
-          _this.setState({
+          this.setState({
             loadingAll: false
           });
         }
-      }));
+      });
     });
     _defineProperty(this, "onAddNew", () => {
-      var {
+      const {
         auth
       } = this.props;
       if (Session$4.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) {
@@ -2666,7 +2649,7 @@ class RequestsHub extends Component {
       }
     });
     _defineProperty(this, "onAddRequestType", () => {
-      var {
+      const {
         auth
       } = this.props;
       if (Session$4.validateAccess(auth.site, values.permissionMaintenanceTypes, auth)) {
@@ -2674,7 +2657,7 @@ class RequestsHub extends Component {
       }
     });
     _defineProperty(this, "canAddNew", isClass => {
-      var {
+      const {
         auth
       } = this.props;
       if (Session$4.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return isClass ? "" : true;
@@ -2718,7 +2701,7 @@ class RequestsHub extends Component {
     }, this.setData);
   }
   renderLeftBar() {
-    var sectionItems = [];
+    const sectionItems = [];
     if (this.canAddNew()) {
       sectionItems.push({
         type: "newButton",
@@ -2766,7 +2749,7 @@ class RequestsHub extends Component {
         }
       });
     }
-    var helpGuide = {
+    const helpGuide = {
       text: "Help with ".concat(values.textTitleRequests),
       url: Urls.HelpGuide.Maintenance
     } ;
@@ -2803,7 +2786,7 @@ class RequestsHub extends Component {
     });
   }
 }
-var styles$5 = {
+const styles$5 = {
   sideBarTitleSection: {
     lineHeight: "40px",
     marginTop: 30,
@@ -2826,8 +2809,8 @@ var styles$5 = {
     color: FeatureConfig.env.colourBrandingOff
   }
 };
-var mapStateToProps$4 = state => {
-  var {
+const mapStateToProps$4 = state => {
+  const {
     auth
   } = state;
   return {
@@ -2842,48 +2825,46 @@ var RequestsHub$1 = connect(mapStateToProps$4, {
 
 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 {
+const {
   Apis: Apis$1,
   Helper: Helper$3,
   Session: Session$3,
   Colours: Colours$2,
   Components: Components$3
 } = PlussCore;
-var IMAGE_SIZE_NOTE = 72;
+const IMAGE_SIZE_NOTE = 72;
 class Job extends Component {
   constructor(props) {
-    var _this;
     super(props);
-    _this = this;
-    _defineProperty(this, "getJob", /*#__PURE__*/_asyncToGenerator(function* () {
+    _defineProperty(this, "getJob", async () => {
       try {
-        var res = yield maintenanceActions.getJob(_this.props.auth.site, _this.state.jobId);
-        _this.setState({
+        const res = await maintenanceActions.getJob(this.props.auth.site, this.state.jobId);
+        this.setState({
           updating: false
         });
         res.data.location = res.data.site;
-        _this.setJob(res.data);
+        this.setJob(res.data);
       } catch (error) {
         console.error("getJob", error);
       }
-    }));
-    _defineProperty(this, "getAssignees", /*#__PURE__*/_asyncToGenerator(function* () {
+    });
+    _defineProperty(this, "getAssignees", async () => {
       try {
-        var res = yield maintenanceActions.getAssignees(_this.props.auth.site);
-        _this.setState({
+        const res = await maintenanceActions.getAssignees(this.props.auth.site);
+        this.setState({
           assignees: res.data.Users
         });
       } catch (error) {
         console.error("getAssignees", error);
       }
-    }));
-    _defineProperty(this, "getExternalSync", /*#__PURE__*/_asyncToGenerator(function* () {
+    });
+    _defineProperty(this, "getExternalSync", async () => {
       try {
-        _this.setState({
+        this.setState({
           loadingExternalSync: true
         });
-        var res = yield maintenanceActions.getExternalSync(_this.state.jobId);
-        _this.setState({
+        const res = await maintenanceActions.getExternalSync(this.state.jobId);
+        this.setState({
           externalSync: res.data,
           loadingExternalSync: false
         });
@@ -2892,44 +2873,44 @@ class Job extends Component {
         if (error && error.response && error.response.status !== 404) {
           console.error("getExternalSync", error);
         }
-        _this.setState({
+        this.setState({
           loadingExternalSync: false
         });
       }
-    }));
-    _defineProperty(this, "onRetrySync", /*#__PURE__*/_asyncToGenerator(function* () {
-      var {
+    });
+    _defineProperty(this, "onRetrySync", async () => {
+      const {
         job
-      } = _this.state;
-      if (!job || _this.state.retryingSync) return;
-      _this.setState({
+      } = this.state;
+      if (!job || this.state.retryingSync) return;
+      this.setState({
         retryingSync: true,
         retrySyncError: null
       });
       try {
-        yield maintenanceActions.retrySync(job.id);
+        await maintenanceActions.retrySync(job.id);
         // Refresh job data to get updated history
-        yield _this.getJob();
-        _this.setState({
+        await this.getJob();
+        this.setState({
           retryingSync: false,
           retrySyncInitiated: true
         });
       } catch (error) {
         console.error("onRetrySync", error);
-        var errorMessage = error && error.response && error.response.data && error.response.data.error || "Failed to retry sync. Please try again.";
-        _this.setState({
+        const errorMessage = error && error.response && error.response.data && error.response.data.error || "Failed to retry sync. Please try again.";
+        this.setState({
           retryingSync: false,
           retrySyncError: errorMessage
         });
       }
-    }));
+    });
     _defineProperty(this, "getStatusType", status => {
-      var {
+      const {
         statusTypes
       } = this.props;
-      var statusType = statusTypes.find(s => s.text === status);
+      let statusType = statusTypes.find(s => s.text === status);
       if (!statusType) {
-        var defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
+        const defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
         statusType = _objectSpread$5(_objectSpread$5({}, defaultStatus), {}, {
           text: status
         });
@@ -2951,7 +2932,7 @@ class Job extends Component {
           isEmpty: true
         }];
       }
-      var needToMarkSeen = false;
+      let needToMarkSeen = false;
       if (!job.seen) {
         job.seen = true;
         needToMarkSeen = true;
@@ -2965,7 +2946,7 @@ class Job extends Component {
     });
     _defineProperty(this, "editJob", () => {});
     _defineProperty(this, "isReadyToSaveNote", () => {
-      var {
+      const {
         noteAttachments,
         noteInput,
         noteImages
@@ -2980,7 +2961,7 @@ class Job extends Component {
       });
     });
     _defineProperty(this, "onCloseAddNote", () => {
-      var newState = {
+      const newState = {
         addNoteOpen: false,
         editingNote: null
       };
@@ -3003,10 +2984,10 @@ class Job extends Component {
       }
     });
     _defineProperty(this, "onHandlePDFFileChange", event => {
-      var file = event.target.files[0];
+      const file = event.target.files[0];
       if (!file || this.state.uploadingNoteAttachment) return;
-      var noteAttachments = [...this.state.noteAttachments];
-      var newAttachment = {
+      const noteAttachments = [...this.state.noteAttachments];
+      const newAttachment = {
         Uploading: true,
         Title: file.name
       };
@@ -3030,9 +3011,9 @@ class Job extends Component {
       event.target.value = "";
     });
     _defineProperty(this, "onRemoveAttachment", a => {
-      var index = this.state.noteAttachments.indexOf(a);
+      const index = this.state.noteAttachments.indexOf(a);
       if (index > -1) {
-        var newAttachments = [...this.state.noteAttachments];
+        const newAttachments = [...this.state.noteAttachments];
         newAttachments.splice(index, 1);
         this.setState({
           noteAttachments: newAttachments
@@ -3054,54 +3035,49 @@ class Job extends Component {
         selectedAssignee: user
       });
     });
-    _defineProperty(this, "onConfirmAssignee", /*#__PURE__*/_asyncToGenerator(function* () {
-      _this.setState({
+    _defineProperty(this, "onConfirmAssignee", async () => {
+      this.setState({
         confirmingAssignee: true
       });
       try {
-        if (_this.state.selectedAssignee) {
-          yield _this.onAssignUser(_this.state.selectedAssignee.id);
+        if (this.state.selectedAssignee) {
+          await this.onAssignUser(this.state.selectedAssignee.id);
         }
-        _this.onCloseSelectAssignee();
+        this.onCloseSelectAssignee();
       } catch (error) {
         console.error("onConfirmAssignee", error);
       }
-      _this.setState({
+      this.setState({
         confirmingAssignee: false
       });
-    }));
+    });
     // Method to handle user assignment
-    _defineProperty(this, "onAssignUser", /*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator(function* (userId) {
-        try {
-          var res = yield maintenanceActions.assignJob(_this.state.jobId, userId);
-          _this.getJob();
-        } catch (err) {
-          console.error("onAssignUser", err);
-        }
-      });
-      return function (_x) {
-        return _ref6.apply(this, arguments);
-      };
-    }());
-    _defineProperty(this, "onConfirmAddNote", /*#__PURE__*/_asyncToGenerator(function* () {
-      if (!_this.isReadyToSaveNote()) return;
+    _defineProperty(this, "onAssignUser", async userId => {
+      try {
+        const res = await maintenanceActions.assignJob(this.state.jobId, userId);
+        this.getJob();
+      } catch (err) {
+        console.error("onAssignUser", err);
+      }
+    });
+    _defineProperty(this, "onConfirmAddNote", async () => {
+      if (!this.isReadyToSaveNote()) return;
       try {
-        _this.setState({
+        this.setState({
           submittingNote: true
         });
-        var res = yield _this.state.editingNote ? maintenanceActions.editNote(_this.state.jobId, _this.state.editingNote, _this.state.noteInput, _this.state.noteAttachments.map(a => {
+        const res = await (this.state.editingNote ? maintenanceActions.editNote(this.state.jobId, this.state.editingNote, this.state.noteInput, this.state.noteAttachments.map(a => {
           return {
             Title: a.Title,
             Source: a.Source
           };
-        }), _this.state.noteImages) : maintenanceActions.addNote(_this.state.jobId, _this.state.noteInput, _this.state.noteAttachments.map(a => {
+        }), this.state.noteImages) : maintenanceActions.addNote(this.state.jobId, this.state.noteInput, this.state.noteAttachments.map(a => {
           return {
             Title: a.Title,
             Source: a.Source
           };
-        }), _this.state.noteImages);
-        _this.setState({
+        }), this.state.noteImages));
+        this.setState({
           job: res.data.job,
           submittingNote: false,
           addNoteOpen: false,
@@ -3110,12 +3086,12 @@ class Job extends Component {
           noteImages: [],
           editingNote: null
         }, () => {
-          _this.props.jobsLoaded([_this.state.job]);
+          this.props.jobsLoaded([this.state.job]);
         });
       } catch (err) {
         console.error("onConfirmAddNote", err);
       }
-    }));
+    });
     _defineProperty(this, "onDeleteNote", n => {
       if (!window.confirm(values.textAreYouSureYouWantToDeleteNote)) {
         this.setState({
@@ -3124,8 +3100,8 @@ class Job extends Component {
         return;
       }
       maintenanceActions.deleteNote(this.state.jobId, n.Id);
-      var newNotes = _.filter(this.state.job.Notes, note => note.Id !== n.Id);
-      var newJob = _objectSpread$5({}, this.state.job);
+      const newNotes = _.filter(this.state.job.Notes, note => note.Id !== n.Id);
+      const newJob = _objectSpread$5({}, this.state.job);
       newJob.Notes = newNotes;
       this.setState({
         job: newJob,
@@ -3143,10 +3119,10 @@ class Job extends Component {
       }, this.checkSetImage);
     });
     _defineProperty(this, "markSeen", () => {
-      var {
+      const {
         job
       } = this.state;
-      var {
+      const {
         auth
       } = this.props;
       // Must have maintenance permission and not the requester
@@ -3154,22 +3130,22 @@ class Job extends Component {
       if (auth.user.Id === job.userID) return;
       this.setState({
         updating: true
-      }, /*#__PURE__*/_asyncToGenerator(function* () {
+      }, async () => {
         try {
-          var update = {
+          const update = {
             id: job.id,
             seen: true,
             status: job.status || "Unassigned"
           };
-          yield maintenanceActions.editJob(update, auth.site);
+          await maintenanceActions.editJob(update, auth.site);
         } catch (error) {
-          _this.setState({
+          this.setState({
             updating: false
           });
           console.log("markSeen error", error);
           alert("Something went wrong with the request. Please try again.");
         }
-      }));
+      });
     });
     _defineProperty(this, "getComments", () => {
       reactionActions.getComments(this.state.jobId, values.commentKey, 0).then(res => {
@@ -3178,25 +3154,25 @@ class Job extends Component {
         });
       });
     });
-    _defineProperty(this, "onAddComment", /*#__PURE__*/_asyncToGenerator(function* () {
-      var {
+    _defineProperty(this, "onAddComment", async () => {
+      const {
         commentInput,
         jobId,
         job,
         comments
-      } = _this.state;
+      } = this.state;
       try {
-        _this.setState({
+        this.setState({
           commentInput: ""
         });
-        var res = yield reactionActions.addComment(jobId, values.commentKey, job.title, job.site, commentInput);
-        _this.setState({
+        const res = await reactionActions.addComment(jobId, values.commentKey, job.title, job.site, commentInput);
+        this.setState({
           comments: [...comments, res.data]
         });
       } catch (error) {
         console.error("onAddComment", error);
       }
-    }));
+    });
     _defineProperty(this, "onHandleChange", event => {
       var stateChange = {};
       stateChange[event.target.getAttribute("id")] = event.target.value;
@@ -3207,61 +3183,51 @@ class Job extends Component {
         priorityChangerOpen: !this.state.priorityChangerOpen
       });
     });
-    _defineProperty(this, "onSelectPriority", /*#__PURE__*/function () {
-      var _ref0 = _asyncToGenerator(function* (priority) {
-        _this.setState({
-          job: _objectSpread$5(_objectSpread$5({}, _this.state.job), {}, {
-            priority
-          }),
-          priorityChangerOpen: false
-        });
-        try {
-          var res = yield maintenanceActions.editJobPriority(_this.state.job.id, priority);
-          var {
-            job
-          } = res.data;
-          _this.props.jobsLoaded([job]);
-          _this.setState({
-            job
-          });
-        } catch (error) {
-          console.error("onSelectPriority", error);
-        }
+    _defineProperty(this, "onSelectPriority", async priority => {
+      this.setState({
+        job: _objectSpread$5(_objectSpread$5({}, this.state.job), {}, {
+          priority
+        }),
+        priorityChangerOpen: false
       });
-      return function (_x2) {
-        return _ref0.apply(this, arguments);
-      };
-    }());
+      try {
+        const res = await maintenanceActions.editJobPriority(this.state.job.id, priority);
+        const {
+          job
+        } = res.data;
+        this.props.jobsLoaded([job]);
+        this.setState({
+          job
+        });
+      } catch (error) {
+        console.error("onSelectPriority", error);
+      }
+    });
     _defineProperty(this, "onToggleStatusChanger", () => {
       this.setState({
         statusChangerOpen: !this.state.statusChangerOpen
       });
     });
-    _defineProperty(this, "onSelectStatus", /*#__PURE__*/function () {
-      var _ref1 = _asyncToGenerator(function* (status) {
-        _this.setState({
-          job: _objectSpread$5(_objectSpread$5({}, _this.state.job), {}, {
-            status: status
-          }),
-          statusChangerOpen: false
-        });
-        try {
-          var res = yield maintenanceActions.editJobStatus(_this.state.job.id, status);
-          var {
-            job
-          } = res.data;
-          _this.props.jobsLoaded([job]);
-          _this.setState({
-            job
-          });
-        } catch (error) {
-          console.error("onSelectStatus", error);
-        }
+    _defineProperty(this, "onSelectStatus", async status => {
+      this.setState({
+        job: _objectSpread$5(_objectSpread$5({}, this.state.job), {}, {
+          status: status
+        }),
+        statusChangerOpen: false
       });
-      return function (_x3) {
-        return _ref1.apply(this, arguments);
-      };
-    }());
+      try {
+        const res = await maintenanceActions.editJobStatus(this.state.job.id, status);
+        const {
+          job
+        } = res.data;
+        this.props.jobsLoaded([job]);
+        this.setState({
+          job
+        });
+      } catch (error) {
+        console.error("onSelectStatus", error);
+      }
+    });
     this.state = {
       jobId: Helper$3.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
       job: null,
@@ -3323,15 +3289,15 @@ class Job extends Component {
     });
   }
   renderPriorityLabel() {
-    var {
+    const {
       auth
     } = this.props;
     if (!Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return null;
-    var {
+    const {
       job
     } = this.state;
     if (!job) return null;
-    var selectedPriority = getJobPriority(job.priority);
+    const selectedPriority = getJobPriority(job.priority);
     return /*#__PURE__*/jsxs("div", {
       className: "statusLabel marginTop-5 pointer",
       onClick: this.onTogglePriorityChanger,
@@ -3346,8 +3312,8 @@ class Job extends Component {
   }
   renderStatusLabel() {
     if (!this.state.job.status) return null;
-    var statusType = this.getStatusType(this.state.job.status);
-    var {
+    const statusType = this.getStatusType(this.state.job.status);
+    const {
       auth
     } = this.props;
     if (Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) {
@@ -3375,7 +3341,7 @@ class Job extends Component {
     });
   }
   renderNotesButton() {
-    var {
+    const {
       auth
     } = this.props;
     if (!Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return null;
@@ -3393,7 +3359,7 @@ class Job extends Component {
     });
   }
   renderAssignButton() {
-    var {
+    const {
       auth
     } = this.props;
     if (!Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return null;
@@ -3412,7 +3378,7 @@ class Job extends Component {
   }
   renderStatusChanger() {
     if (!this.state.statusChangerOpen) return null;
-    var {
+    const {
       statusTypes
     } = this.props;
     return /*#__PURE__*/jsx("div", {
@@ -3472,8 +3438,8 @@ class Job extends Component {
     });
   }
   renderImageGrid(images) {
-    var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-    var imagesToUse = images && images.length > 0 ? images : [];
+    let size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+    const imagesToUse = images && images.length > 0 ? images : [];
     return /*#__PURE__*/jsx("div", {
       className: "imageGrid",
       children: imagesToUse.map((image, i) => {
@@ -3494,7 +3460,7 @@ class Job extends Component {
     });
   }
   renderDocumentGrid(documents) {
-    var documentsToUse = documents && documents.length > 0 ? documents : [];
+    const documentsToUse = documents && documents.length > 0 ? documents : [];
     return /*#__PURE__*/jsx("div", {
       className: "documentGrid",
       children: documentsToUse.map((doc, index) => /*#__PURE__*/jsx(Components$3.Attachment, {
@@ -3506,7 +3472,7 @@ class Job extends Component {
   }
   renderImages() {
     if (_.isEmpty(this.state.job.image) && _.isEmpty(this.state.job.images)) return null;
-    var imagesToUse = _.isEmpty(this.state.job.image) ? this.state.job.images : [this.state.job.image];
+    const imagesToUse = _.isEmpty(this.state.job.image) ? this.state.job.images : [this.state.job.image];
     return /*#__PURE__*/jsxs("div", {
       className: "padding-60 paddingVertical-40 bottomDivideBorder",
       children: [/*#__PURE__*/jsx(Components$3.Text, {
@@ -3517,15 +3483,15 @@ class Job extends Component {
     });
   }
   renderCustomFields() {
-    var {
+    const {
       job
     } = this.state;
-    var {
+    const {
       customFields
     } = job;
-    var labelClass = "fieldLabel";
-    var answerClass = "fontRegular fontSize-16 text-dark marginTop-5";
-    var renderAnswer = field => {
+    const labelClass = "fieldLabel";
+    const answerClass = "fontRegular fontSize-16 text-dark marginTop-5";
+    const renderAnswer = field => {
       switch (field.type) {
         case "date":
           return /*#__PURE__*/jsx("div", {
@@ -3575,10 +3541,10 @@ class Job extends Component {
   }
   renderInner() {
     if (this.state.job == null) return null;
-    var {
+    const {
       customFields
     } = this.state.job;
-    var hasCustomFields = customFields && customFields.length > 0;
+    const hasCustomFields = customFields && customFields.length > 0;
     return /*#__PURE__*/jsxs("div", {
       iconStyle: {
         paddingBottom: 40
@@ -3679,10 +3645,10 @@ class Job extends Component {
     });
   }
   renderHistoryEntry(e, i) {
-    var {
+    const {
       job
     } = this.state;
-    var entryToUse = e || {
+    const entryToUse = e || {
       timestamp: job.createdTime,
       status: "Unassigned",
       user: {
@@ -3691,7 +3657,7 @@ class Job extends Component {
         profilePic: job.userProfilePic
       }
     };
-    var statusType = this.getStatusType(entryToUse.status);
+    const statusType = this.getStatusType(entryToUse.status);
     return /*#__PURE__*/jsxs("div", {
       className: "ticketHistoryEntry",
       children: [/*#__PURE__*/jsx("p", {
@@ -3755,7 +3721,7 @@ class Job extends Component {
     }, index);
   }
   renderAssignment() {
-    var {
+    const {
       job
     } = this.state;
     if (!job) return null;
@@ -3803,8 +3769,8 @@ class Job extends Component {
     }, i);
   }
   renderExternalSyncEntry(e, i) {
-    var isSuccess = e.EntryType === "ExternalIDSet";
-    var backgroundColor = isSuccess ? Colours$2.COLOUR_GREEN : Colours$2.COLOUR_RED; // Green for success, red for failure
+    const isSuccess = e.EntryType === "ExternalIDSet";
+    const backgroundColor = isSuccess ? Colours$2.COLOUR_GREEN : Colours$2.COLOUR_RED; // Green for success, red for failure
 
     return /*#__PURE__*/jsxs("div", {
       className: "ticketHistoryEntry",
@@ -3824,7 +3790,7 @@ class Job extends Component {
     }, i);
   }
   renderPriority() {
-    var {
+    const {
       auth
     } = this.props;
     if (!Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return null;
@@ -3841,20 +3807,20 @@ class Job extends Component {
     });
   }
   hasSyncFailureWithoutSuccess() {
-    var {
+    const {
       job
     } = this.state;
     if (!job || !job.history) return false;
-    var history = job.history || [];
-    var hasSuccess = history.some(entry => entry.EntryType === "ExternalIDSet");
-    var hasFailure = history.some(entry => entry.EntryType === "ExternalIDSetFailed");
+    const history = job.history || [];
+    const hasSuccess = history.some(entry => entry.EntryType === "ExternalIDSet");
+    const hasFailure = history.some(entry => entry.EntryType === "ExternalIDSetFailed");
     return hasFailure && !hasSuccess;
   }
   renderRetrySyncButton() {
-    var {
+    const {
       auth
     } = this.props;
-    var {
+    const {
       retryingSync,
       retrySyncInitiated
     } = this.state;
@@ -3892,7 +3858,7 @@ class Job extends Component {
     });
   }
   renderExternalSyncStatus() {
-    var {
+    const {
       retrySyncError,
       retrySyncInitiated
     } = this.state;
@@ -3941,14 +3907,14 @@ class Job extends Component {
     return null;
   }
   renderExternalSync() {
-    var {
+    const {
       externalSync,
       loadingExternalSync
     } = this.state;
 
     // Check if we should show this section at all
-    var hasExternalSyncData = externalSync && !loadingExternalSync;
-    var hasSyncFailure = this.hasSyncFailureWithoutSuccess();
+    const hasExternalSyncData = externalSync && !loadingExternalSync;
+    const hasSyncFailure = this.hasSyncFailureWithoutSuccess();
 
     // Show section if we have sync data OR if there's a failure that can be retried
     if (!hasExternalSyncData && !hasSyncFailure) return null;
@@ -3988,11 +3954,11 @@ class Job extends Component {
     });
   }
   renderOverview() {
-    var {
+    const {
       job
     } = this.state;
     if (!job || !job.history) return null;
-    var source = _.sortBy([...job.history.map(e => {
+    const source = _.sortBy([...job.history.map(e => {
       return _objectSpread$5(_objectSpread$5({}, e), {}, {
         EntryType: e.EntryType || "status"
       });
@@ -4130,8 +4096,8 @@ class Job extends Component {
           children: "Add Attachment"
         })]
       }), /*#__PURE__*/jsx(Components$3.ImageInput, {
-        ref: _ref10 => {
-          this.imageInput = _ref10;
+        ref: ref => {
+          this.imageInput = ref;
         },
         multiple: true,
         refreshCallback: images => {
@@ -4143,7 +4109,7 @@ class Job extends Component {
     });
   }
   renderUsers() {
-    var content = null;
+    let content = null;
     if (this.state.confirmingAssignee) {
       content = /*#__PURE__*/jsx("div", {
         className: "flex flex-center-row",
@@ -4237,8 +4203,8 @@ class Job extends Component {
     });
   }
 }
-var mapStateToProps$3 = state => {
-  var {
+const mapStateToProps$3 = state => {
+  const {
     auth
   } = state;
   return {
@@ -4253,7 +4219,7 @@ var Job$1 = connect(mapStateToProps$3, {
 
 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 {
+const {
   Actions,
   Components: Components$2,
   Helper: Helper$2,
@@ -4266,18 +4232,18 @@ class AddJob extends Component {
     var _this;
     super(props);
     _this = this;
-    _defineProperty(this, "getJob", /*#__PURE__*/_asyncToGenerator(function* () {
+    _defineProperty(this, "getJob", async () => {
       try {
-        var res = yield maintenanceActions.getJob(_this.props.auth.site, _this.state.jobId);
+        const res = await maintenanceActions.getJob(this.props.auth.site, this.state.jobId);
         res.data.location = res.data.site;
-        var {
+        const {
           userID,
           userName,
           userProfilePic,
           type,
           customFields
         } = res.data;
-        _this.setState(_objectSpread$4(_objectSpread$4({}, res.data), {}, {
+        this.setState(_objectSpread$4(_objectSpread$4({}, res.data), {}, {
           prevType: type,
           prevCustomFileds: customFields,
           type,
@@ -4288,39 +4254,39 @@ class AddJob extends Component {
             profilePic: userProfilePic
           }
         }));
-        _this.checkSetImages(_this.imageInput, res.data.images);
+        this.checkSetImages(this.imageInput, res.data.images);
         if (customFields) {
           customFields.forEach((field, index) => {
             if (field.type === "image" && field.answer) {
-              _this.checkSetImages(_this.customImageInputs[index], field.answer);
+              this.checkSetImages(this.customImageInputs[index], field.answer);
             }
           });
         }
       } catch (error) {
         console.error("getJob", error);
       }
-    }));
-    _defineProperty(this, "getJobTypes", /*#__PURE__*/_asyncToGenerator(function* () {
+    });
+    _defineProperty(this, "getJobTypes", async () => {
       try {
-        var res = yield maintenanceActions.getJobTypes(_this.props.auth.site);
-        _this.setState({
+        const res = await maintenanceActions.getJobTypes(this.props.auth.site);
+        this.setState({
           types: res.data
         });
-        _this.getDefaultJob();
+        this.getDefaultJob();
       } catch (error) {
         console.error("getJobTypes", error);
       }
-    }));
-    _defineProperty(this, "getUsers", /*#__PURE__*/_asyncToGenerator(function* () {
+    });
+    _defineProperty(this, "getUsers", async () => {
       try {
-        var res = yield userActions.fetchUsers(_this.props.auth.site);
+        const res = await userActions.fetchUsers(this.props.auth.site);
         if (res.userFetchFail) return;
         if (res.data != null && !_.isEmpty(res.data.results.Items)) {
-          var items = res.data.results.Items;
-          if (_this.props.optionOnlyForResidents) {
+          let items = res.data.results.Items;
+          if (this.props.optionOnlyForResidents) {
             items = _.filter(items, u => u.category === "resident");
           }
-          _this.setState({
+          this.setState({
             users: _.sortBy(items, u => {
               return (u.displayName || "").toLowerCase();
             })
@@ -4329,15 +4295,15 @@ class AddJob extends Component {
       } catch (error) {
         console.error("getUsers", error);
       }
-    }));
+    });
     _defineProperty(this, "getDefaultJob", () => {
-      var {
+      const {
         types,
         jobId
       } = this.state;
       if (jobId == null) {
         if (types.length !== 0) {
-          var defaultType = types[0];
+          const defaultType = types[0];
           this.setState({
             type: defaultType.typeName,
             customFields: defaultType.hasCustomFields && defaultType.customFields.length > 0 ? defaultType.customFields : []
@@ -4350,15 +4316,15 @@ class AddJob extends Component {
       }
     });
     _defineProperty(this, "onSelectType", (key, e) => {
-      var {
+      const {
         types,
         prevType,
         prevCustomFileds
       } = this.state;
-      var selectedType = types.find(t => t.typeName === key);
+      const selectedType = types.find(t => t.typeName === key);
       // If selected type had previously saved custom fields, use the previous version
-      var hasPrevCustomFields = prevType === selectedType.typeName && prevCustomFileds && prevCustomFileds.length > 0;
-      var update = {
+      const hasPrevCustomFields = prevType === selectedType.typeName && prevCustomFileds && prevCustomFileds.length > 0;
+      const update = {
         type: selectedType.typeName,
         customFields: hasPrevCustomFields ? prevCustomFileds : selectedType.hasCustomFields ? selectedType.customFields : []
       };
@@ -4383,7 +4349,7 @@ class AddJob extends Component {
       });
     });
     _defineProperty(this, "onSelectUser", user => {
-      var update = {
+      const update = {
         selectedUser: user,
         userID: user.userId,
         userName: user.displayName,
@@ -4401,7 +4367,7 @@ class AddJob extends Component {
       // Fetch in background to avoid blocking UI
       userActions.fetchUser(this.props.auth.site, user.userId).then(response => {
         if (response.data && response.data.user) {
-          var contactUpdate = {};
+          const contactUpdate = {};
           // Auto-populate phone and room from user profile
           if (response.data.user.phoneNumber) {
             contactUpdate.phone = response.data.user.phoneNumber;
@@ -4421,7 +4387,7 @@ class AddJob extends Component {
       });
     });
     _defineProperty(this, "onUnselectUser", () => {
-      var update = {
+      const update = {
         selectedUser: null,
         userID: "",
         userName: "",
@@ -4434,78 +4400,78 @@ class AddJob extends Component {
       this.setState(update);
     });
     _defineProperty(this, "onChangeAnswer", (qId, answer) => {
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = answer;
       if (field.isTitle) update.title = field.answer;
       this.setState(update);
     });
     _defineProperty(this, "onChangeToggleAnswer", (qId, answer) => {
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = field.answer === answer ? undefined : answer;
       if (field.isTitle) update.title = field.answer;
       this.setState(update);
     });
     _defineProperty(this, "onChangeCheckboxAnswer", (qId, answer) => {
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = _.xor(field.answer || [], [answer]);
       if (field.isTitle) update.title = field.answer.join(", ");
       this.setState(update);
     });
     _defineProperty(this, "onChangeDateAnswer", function (qId, answer) {
-      var togglePicker = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      var update = {
+      let togglePicker = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+      const update = {
         customFields: _.cloneDeep(_this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = answer;
       if (field.isTitle) update.title = moment(field.answer, "YYYY-MM-DD").format("DD-MMM-YYYY");
       _this.setState(update);
       if (togglePicker) _this.onToggleDatePicker(qId);
     });
     _defineProperty(this, "onChangeTimeAnswer", (qId, answer) => {
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = answer;
       if (field.isTitle) update.title = moment(field.answer, "HH:mm").format("h:mm a");
       this.setState(update);
     });
     _defineProperty(this, "onChangeImageAnswer", (qId, answer) => {
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = answer;
       this.setState(update);
     });
     _defineProperty(this, "onRemoveDocumentAnswer", (qId, document) => {
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
+      const field = update.customFields[qId];
       field.answer = _.filter(field.answer, d => d.url !== document.url);
       this.setState(update);
     });
     _defineProperty(this, "onHandlePDFFileChange", (event, qId) => {
-      var file = event.target.files[0];
+      const file = event.target.files[0];
       if (!file) return;
-      var update = {
+      const update = {
         customFields: _.cloneDeep(this.state.customFields)
       };
-      var field = update.customFields[qId];
-      var attachments = field.answer || [];
-      var [name, ext] = file.name.split(".");
-      var newAttachment = {
+      const field = update.customFields[qId];
+      const attachments = field.answer || [];
+      const [name, ext] = file.name.split(".");
+      const newAttachment = {
         uploading: true,
         name,
         ext: ext.toLowerCase()
@@ -4525,7 +4491,7 @@ class AddJob extends Component {
       event.target.value = "";
     });
     _defineProperty(this, "onToggleDatePicker", qId => {
-      var showDate = _objectSpread$4({}, this.state.showDate);
+      const showDate = _objectSpread$4({}, this.state.showDate);
       showDate[qId] = !showDate[qId];
       this.setState({
         showDate
@@ -4545,7 +4511,7 @@ class AddJob extends Component {
       this.setState({
         updating: true
       });
-      var job = {
+      const job = {
         id: this.state.id,
         userID: this.state.userID,
         userName: this.state.userName,
@@ -4591,13 +4557,13 @@ class AddJob extends Component {
       }
     });
     _defineProperty(this, "isFieldValid", field => {
-      var {
+      const {
         mandatory,
         type,
         answer
       } = field;
       if (["staticTitle", "staticText"].includes(type)) return true;
-      var checkMandatory = () => {
+      const checkMandatory = () => {
         if (!mandatory) return true;
         switch (type) {
           case "yn":
@@ -4610,7 +4576,7 @@ class AddJob extends Component {
             return !_.isNil(answer) && !_.isEmpty(answer);
         }
       };
-      var checkFormat = () => {
+      const checkFormat = () => {
         if (_.isNil(answer) || _.isEmpty(answer)) return true;
         switch (type) {
           case "email":
@@ -4623,12 +4589,12 @@ class AddJob extends Component {
             return true;
         }
       };
-      var valid = checkMandatory() && checkFormat();
+      const valid = checkMandatory() && checkFormat();
       return valid;
     });
     _defineProperty(this, "getFieldContainerClass", function () {
-      var isValid = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      var showError = _this.state.showWarnings && !isValid;
+      let isValid = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      const showError = _this.state.showWarnings && !isValid;
       return "genericInputContainer ".concat(isValid ? "genericInput-valid" : "", " ").concat(showError ? "genericInput-error" : "").trim();
     });
     this.imageInput = null;
@@ -4687,25 +4653,18 @@ class AddJob extends Component {
       }, 100);
     }
   }
-  renderTypeOptions() {
-    var {
-      types,
-      type
+  getTypeOptions() {
+    const {
+      types
     } = this.state;
-    return types.map(ev => {
-      if (ev != null) {
-        return /*#__PURE__*/jsx(MenuItem, {
-          eventKey: ev.typeName,
-          active: type === ev.typeName,
-          children: ev.typeName
-        }, ev.typeName);
-      }
-      return null;
-    });
+    return types.filter(Boolean).map(ev => ({
+      Key: ev.typeName,
+      Title: ev.typeName
+    }));
   }
   renderSuccess() {
     if (!this.state.success) return null;
-    var title = this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleRequests;
+    const title = this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleRequests;
     return /*#__PURE__*/jsx(Components$2.SuccessPopup, {
       text: "".concat(values.textEntityName, " has been ").concat(this.state.id != null ? "edited" : "added"),
       buttons: [{
@@ -4718,12 +4677,12 @@ class AddJob extends Component {
     });
   }
   validateCustomFields() {
-    var {
+    const {
       customFields
     } = this.state;
     if (!customFields || customFields.length === 0) return true;
     return customFields.every(field => {
-      var isValid = this.isFieldValid(field);
+      const isValid = this.isFieldValid(field);
       return isValid;
     });
   }
@@ -4763,11 +4722,11 @@ class AddJob extends Component {
     });
   }
   renderSelectUser() {
-    var {
+    const {
       showWarnings,
       selectedUser
     } = this.state;
-    var isValid = !_.isNil(selectedUser);
+    const isValid = !_.isNil(selectedUser);
     return /*#__PURE__*/jsxs("div", {
       className: this.getFieldContainerClass(isValid),
       children: [/*#__PURE__*/jsxs("div", {
@@ -4837,8 +4796,8 @@ class AddJob extends Component {
           className: "marginBottom-4",
           children: "Images"
         }), /*#__PURE__*/jsx(Components$2.ImageInput, {
-          ref: _ref4 => {
-            this.imageInput = _ref4;
+          ref: ref => {
+            this.imageInput = ref;
           },
           multiple: true,
           refreshCallback: images => {
@@ -5077,14 +5036,14 @@ class AddJob extends Component {
               className: "marginBottom-4",
               children: field.label
             }), /*#__PURE__*/jsx(Components$2.ImageInput, {
-              ref: _ref5 => this.customImageInputs[fieldId] = _ref5,
+              ref: ref => this.customImageInputs[fieldId] = ref,
               multiple: true,
               refreshCallback: images => this.onChangeImageAnswer(fieldId, images)
             })]
           })]
         }, fieldId);
       case "document":
-        var documents = field.answer || [];
+        const documents = field.answer || [];
         return /*#__PURE__*/jsxs("div", {
           className: this.getFieldContainerClass(this.isFieldValid(field)),
           style: styles$4.fieldContainer,
@@ -5129,7 +5088,7 @@ class AddJob extends Component {
     }
   }
   renderCustomFields() {
-    var {
+    const {
       customFields
     } = this.state;
     if (!customFields || customFields.length === 0) return null;
@@ -5140,7 +5099,7 @@ class AddJob extends Component {
     });
   }
   renderMain() {
-    var {
+    const {
       customFields
     } = this.state;
     return /*#__PURE__*/jsx("div", {
@@ -5178,29 +5137,20 @@ class AddJob extends Component {
           showError: () => {
             return this.state.showWarnings && _.isEmpty(this.state.room);
           }
-        }), /*#__PURE__*/jsxs("div", {
-          iconStyle: {
+        }), /*#__PURE__*/jsx(Components$2.DropdownInput, {
+          label: values.textJobType,
+          value: this.state.type,
+          options: this.getTypeOptions(),
+          onSelect: this.onSelectType,
+          style: {
             marginBottom: 15
-          },
-          children: [/*#__PURE__*/jsx(Components$2.Text, {
-            type: "formLabel",
-            children: values.textJobType
-          }), /*#__PURE__*/jsx(DropdownButton, {
-            style: {
-              minWidth: 80
-            },
-            bsStyle: "default",
-            title: this.state.type,
-            id: "typeSelect",
-            onSelect: this.onSelectType,
-            children: this.renderTypeOptions()
-          })]
+          }
         }), !_.isEmpty(customFields) || values.forceCustomFields ? this.renderCustomFields() : this.renderDefaultFields()]
       })
     });
   }
   renderUserFilterPopup() {
-    var {
+    const {
       userFilterOpen,
       userSearch,
       users
@@ -5240,7 +5190,7 @@ class AddJob extends Component {
     });
   }
   render() {
-    var {
+    const {
       success
     } = this.state;
     return /*#__PURE__*/jsxs(Components$2.OverlayPage, {
@@ -5258,7 +5208,7 @@ class AddJob extends Component {
     });
   }
 }
-var styles$4 = {
+const styles$4 = {
   userLabelContainer: {
     display: "flex",
     flexDirection: "row",
@@ -5272,8 +5222,8 @@ var styles$4 = {
     alignItems: "center"
   }
 };
-var mapStateToProps$2 = state => {
-  var {
+const mapStateToProps$2 = state => {
+  const {
     auth
   } = state;
   return {
@@ -5288,12 +5238,12 @@ var AddJob$1 = connect(mapStateToProps$2, {
   addRecentlyCreated: Actions.addRecentlyCreated
 })(withRouter(AddJob));
 
-var {
+const {
   Components: Components$1,
   Session: Session$1,
   Helper: Helper$1
 } = PlussCore;
-var DEFAULT_FIELD = {
+const DEFAULT_FIELD = {
   type: "text",
   label: "",
   mandatory: false,
@@ -5302,13 +5252,11 @@ var DEFAULT_FIELD = {
 };
 class AddJobType extends Component {
   constructor(props) {
-    var _this;
     super(props);
-    _this = this;
-    _defineProperty(this, "getJobType", /*#__PURE__*/_asyncToGenerator(function* () {
+    _defineProperty(this, "getJobType", async () => {
       try {
-        var res = yield maintenanceActions.getJobType(_this.props.auth.site, _this.state.jobTypeId);
-        var {
+        const res = await maintenanceActions.getJobType(this.props.auth.site, this.state.jobTypeId);
+        const {
           typeName,
           email,
           description,
@@ -5316,7 +5264,7 @@ class AddJobType extends Component {
           hasCustomFields,
           customFields
         } = res.data;
-        _this.setState({
+        this.setState({
           jobTypeName: typeName,
           jobTypeEmail: email,
           jobTypeDescription: description,
@@ -5327,19 +5275,19 @@ class AddJobType extends Component {
       } catch (error) {
         console.error("getJobType", error);
       }
-    }));
+    });
     _defineProperty(this, "getFieldTypeTitle", type => {
-      var fieldType = this.fieldTypes.find(f => f.Key === type);
+      const fieldType = this.fieldTypes.find(f => f.Key === type);
       return fieldType ? fieldType.Title : "";
     });
     _defineProperty(this, "validateEmail", () => {
-      var {
+      const {
         jobTypeEmail
       } = this.state;
       return !_.isEmpty(jobTypeEmail) && Helper$1.isEmail(jobTypeEmail);
     });
     _defineProperty(this, "isJobTypeValid", () => {
-      var {
+      const {
         jobTypeName,
         jobTypeDescription
       } = this.state;
@@ -5355,7 +5303,7 @@ class AddJobType extends Component {
       this.setState(stateChange);
     });
     _defineProperty(this, "onFieldTypeChanged", (fieldIndex, key) => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       if (customFields[fieldIndex].type === key) return;
       customFields[fieldIndex] = _.cloneDeep(DEFAULT_FIELD);
       customFields[fieldIndex].type = key;
@@ -5364,21 +5312,21 @@ class AddJobType extends Component {
       });
     });
     _defineProperty(this, "onFieldLabelChanged", (fieldIndex, event) => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields[fieldIndex].label = event.target.value;
       this.setState({
         customFields
       });
     });
     _defineProperty(this, "onFieldPlaceHolderChanged", (fieldIndex, event) => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields[fieldIndex].placeHolder = event.target.value;
       this.setState({
         customFields
       });
     });
     _defineProperty(this, "onFieldMandatoryChanged", fieldIndex => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields[fieldIndex].mandatory = !customFields[fieldIndex].mandatory;
       if (!customFields[fieldIndex].mandatory) {
         // If a field is not mandatory, it cannot be a title field
@@ -5389,7 +5337,7 @@ class AddJobType extends Component {
       });
     });
     _defineProperty(this, "onFieldIsTitleChanged", fieldIndex => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields[fieldIndex].isTitle = !customFields[fieldIndex].isTitle;
       if (customFields[fieldIndex].isTitle) {
         // If a field is title field, force mandatory
@@ -5400,33 +5348,33 @@ class AddJobType extends Component {
       });
     });
     _defineProperty(this, "onFieldOptionChanged", (fieldIndex, optionIndex, event) => {
-      var customFields = [...this.state.customFields];
-      var prevValue = customFields[fieldIndex].values[optionIndex];
+      const customFields = [...this.state.customFields];
+      const prevValue = customFields[fieldIndex].values[optionIndex];
       customFields[fieldIndex].values[optionIndex] = event.target.value;
       // Change corresponding validation if exists
-      var validations = customFields[fieldIndex].validation;
-      var validation = validations ? validations.find(val => val.value === prevValue) : null;
+      const validations = customFields[fieldIndex].validation;
+      let validation = validations ? validations.find(val => val.value === prevValue) : null;
       if (validation) validation.value = event.target.value;
       this.setState({
         customFields
       });
     });
     _defineProperty(this, "onAddNewOption", fieldIndex => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields[fieldIndex].values.push("");
       this.setState({
         customFields
       });
     });
     _defineProperty(this, "onRemoveOption", (fieldIndex, optionIndex) => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields[fieldIndex].values.splice(optionIndex, 1);
       this.setState({
         customFields
       });
     });
     _defineProperty(this, "onAddNewField", () => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       customFields.push(_.cloneDeep(DEFAULT_FIELD));
       this.setState({
         customFields
@@ -5434,17 +5382,17 @@ class AddJobType extends Component {
     });
     _defineProperty(this, "onMoveFieldPrev", fieldIndex => {
       if (fieldIndex === 0) return;
-      var customFields = [...this.state.customFields];
-      var item = customFields.splice(fieldIndex, 1)[0];
+      const customFields = [...this.state.customFields];
+      const item = customFields.splice(fieldIndex, 1)[0];
       customFields.splice(fieldIndex - 1, 0, item);
       this.setState({
         customFields
       });
     });
     _defineProperty(this, "onMoveFieldNext", fieldIndex => {
-      var customFields = [...this.state.customFields];
+      const customFields = [...this.state.customFields];
       if (fieldIndex > customFields.length - 1) return;
-      var item = customFields.splice(fieldIndex, 1)[0];
+      const item = customFields.splice(fieldIndex, 1)[0];
       customFields.splice(fieldIndex + 1, 0, item);
       this.setState({
         customFields
@@ -5454,10 +5402,10 @@ class AddJobType extends Component {
       window.history.back();
     });
     _defineProperty(this, "onSave", () => {
-      var {
+      const {
         site
       } = this.props.auth;
-      var {
+      const {
         submitting,
         jobTypeId,
         jobTypeName,
@@ -5476,26 +5424,26 @@ class AddJobType extends Component {
       }
       this.setState({
         submitting: true
-      }, /*#__PURE__*/_asyncToGenerator(function* () {
+      }, async () => {
         try {
           if (jobTypeId) {
-            yield maintenanceActions.editJobType(site, jobTypeId, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
+            await maintenanceActions.editJobType(site, jobTypeId, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
           } else {
-            yield maintenanceActions.addJobType(site, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
+            await maintenanceActions.addJobType(site, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
           }
-          _this.props.jobTypesUpdate(site);
-          _this.setState({
+          this.props.jobTypesUpdate(site);
+          this.setState({
             submitting: false,
             success: true
           });
         } catch (error) {
           console.error("onSave", error);
-          _this.setState({
+          this.setState({
             submitting: false
           });
           alert("Something went wrong with the request. Please try again.");
         }
-      }));
+      });
     });
     this.fieldTypes = [{
       Title: "Text Input",
@@ -5556,7 +5504,7 @@ class AddJobType extends Component {
     if (this.state.jobTypeId) this.getJobType();
   }
   validateCustomFields() {
-    var {
+    const {
       submitting,
       hasCustomFields,
       customFields
@@ -5564,13 +5512,13 @@ class AddJobType extends Component {
     if (submitting) return false;
 
     // Validate custom fields
-    var warnings = [];
+    const warnings = [];
     if (hasCustomFields) {
-      var missingLabel = false;
-      var hasMandatoryField = false;
-      var titleFieldCount = 0;
+      let missingLabel = false;
+      let hasMandatoryField = false;
+      let titleFieldCount = 0;
       customFields.forEach(field => {
-        var {
+        const {
           type,
           label,
           values,
@@ -5602,7 +5550,7 @@ class AddJobType extends Component {
     return warnings.length === 0;
   }
   onRemoveField(fieldIndex) {
-    var customFields = [...this.state.customFields];
+    const customFields = [...this.state.customFields];
     if (customFields.length < 2) return;
     customFields.splice(fieldIndex, 1);
     this.setState({
@@ -5610,7 +5558,7 @@ class AddJobType extends Component {
     });
   }
   renderBaseForm() {
-    var {
+    const {
       success,
       jobTypeId,
       showWarnings,
@@ -5809,7 +5757,7 @@ class AddJobType extends Component {
     });
   }
   renderFieldMultiple(field, fieldIndex) {
-    var {
+    const {
       customFields
     } = this.state;
     return /*#__PURE__*/jsxs("div", {
@@ -5880,7 +5828,7 @@ class AddJobType extends Component {
     });
   }
   renderFieldCheckbox(field, fieldIndex) {
-    var {
+    const {
       customFields
     } = this.state;
     return /*#__PURE__*/jsxs("div", {
@@ -5975,10 +5923,10 @@ class AddJobType extends Component {
     });
   }
   renderField(field, fieldIndex) {
-    var {
+    const {
       customFields
     } = this.state;
-    var renderFieldContent = () => {
+    const renderFieldContent = () => {
       switch (field.type) {
         case "text":
         case "email":
@@ -6062,7 +6010,7 @@ class AddJobType extends Component {
     }, fieldIndex);
   }
   renderCustomForm() {
-    var {
+    const {
       success,
       hasCustomFields,
       customFields
@@ -6097,7 +6045,7 @@ class AddJobType extends Component {
     });
   }
   renderWarnings() {
-    var {
+    const {
       showWarnings,
       warnings
     } = this.state;
@@ -6119,7 +6067,7 @@ class AddJobType extends Component {
     });
   }
   renderSuccess() {
-    var {
+    const {
       success,
       jobTypeId
     } = this.state;
@@ -6160,7 +6108,7 @@ class AddJobType extends Component {
     });
   }
   render() {
-    var {
+    const {
       success
     } = this.state;
     return /*#__PURE__*/jsxs(Components$1.OverlayPage, {
@@ -6179,8 +6127,8 @@ class AddJobType extends Component {
     });
   }
 }
-var mapStateToProps$1 = state => {
-  var {
+const mapStateToProps$1 = state => {
+  const {
     auth
   } = state;
   return {
@@ -6194,14 +6142,14 @@ var AddJobType$1 = connect(mapStateToProps$1, {
 
 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 {
+const {
   Analytics: Analytics$1,
   Session,
   Components,
   Helper,
   Colours
 } = PlussCore;
-var getInitialState = () => ({
+const getInitialState = () => ({
   requests: 0,
   prevRequests: 0,
   completedRequests: 0,
@@ -6212,8 +6160,8 @@ var getInitialState = () => ({
 });
 
 // AnalyticsHub Component
-var AnalyticsHub = _ref => {
-  var {
+const AnalyticsHub = _ref => {
+  let {
     startTime,
     endTime,
     auth,
@@ -6224,27 +6172,27 @@ var AnalyticsHub = _ref => {
     userCategory,
     selectedSites
   } = _ref;
-  var [analyticsData, setAnalyticsData] = useState(getInitialState());
-  var [isExportOpen, setIsExportOpen] = useState(false);
-  var [failedSites, setFailedSites] = useState([]);
-  var [comparisonData, setComparisonData] = useState({
+  const [analyticsData, setAnalyticsData] = useState(getInitialState());
+  const [isExportOpen, setIsExportOpen] = useState(false);
+  const [failedSites, setFailedSites] = useState([]);
+  const [comparisonData, setComparisonData] = useState({
     requests: [],
     completedRequests: [],
     comments: [],
     isLoading: true
   });
-  var comparisonMode = selectedSites && selectedSites.length > 1;
-  var hasAccess = Session.validateAccess(auth.site, values.permissionMaintenanceTracking, auth);
+  const comparisonMode = selectedSites && selectedSites.length > 1;
+  const hasAccess = Session.validateAccess(auth.site, values.permissionMaintenanceTracking, auth);
   if (!hasAccess) {
     return null;
   }
-  var featureTitle = (key => {
+  const featureTitle = (key => {
     if (!strings || !strings.sideNav || !strings.sideNav[key]) {
       return values.textMenuTitle;
     }
     return strings.sideNav[key];
   })();
-  var exportColumns = [{
+  const exportColumns = [{
     label: "Select All",
     key: ""
   }, ...(comparisonMode ? [{
@@ -6269,104 +6217,94 @@ var AnalyticsHub = _ref => {
   useEffect(() => {
     getData();
   }, [startTime, endTime, userType, userCategory, selectedSites]);
-  var getData = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(function* () {
-      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, {
+  const getData = async () => {
+    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
-          })]);
-          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
+          });
+          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
           };
-          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 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);
       }
-    });
-    return function getData() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  var isReadyToOpenCSV = () => {
+    } 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 = () => {
     return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
   };
-  var getExportSource = () => {
+  const getExportSource = () => {
     if (comparisonMode) {
-      var sites = comparisonData.requests || [];
+      const sites = comparisonData.requests || [];
       return sites.map((site, i) => ({
         site: site.name,
         startDate: moment(startTime + 1).format("D-MM-YYYY"),
@@ -6384,12 +6322,12 @@ var AnalyticsHub = _ref => {
       comments: analyticsData.comments
     }];
   };
-  var csvPopup = () => {
+  const csvPopup = () => {
     if (!isExportOpen) {
       return null;
     }
-    var source = getExportSource();
-    var filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, "-")).join("_");
+    const source = getExportSource();
+    const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, "-")).join("_");
     return /*#__PURE__*/jsx(Components.ExportCsvPopup, {
       onClose: () => {
         setIsExportOpen(false);
@@ -6427,7 +6365,7 @@ var AnalyticsHub = _ref => {
     }), /*#__PURE__*/jsx("div", {
       className: "analyticsSection dashboardSection_content",
       children: (() => {
-        var chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");
+        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__*/jsxs("div", {
             style: {
@@ -6487,8 +6425,8 @@ var AnalyticsHub = _ref => {
     })]
   });
 };
-var mapStateToProps = state => {
-  var {
+const mapStateToProps = state => {
+  const {
     auth
   } = state;
   return {
@@ -6496,11 +6434,11 @@ var mapStateToProps = state => {
     strings: state.strings && state.strings.config || {}
   };
 };
-var toExport = connect(mapStateToProps, {})(AnalyticsHub);
+const toExport = connect(mapStateToProps, {})(AnalyticsHub);
 
 function ownKeys$2(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$2(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$2(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$2(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var INITIAL_STATE = {
+const INITIAL_STATE = {
   jobs: [],
   jobtypes: [],
   jobstatuses: jobStatusOptions,
@@ -6508,15 +6446,15 @@ var INITIAL_STATE = {
   hideSeen: false
 };
 var MaintenanceReducer = (function () {
-  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INITIAL_STATE;
-  var action = arguments.length > 1 ? arguments[1] : undefined;
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INITIAL_STATE;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
   switch (action.type) {
     case JOBS_LOADING:
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
         loading: true
       });
     case JOBS_LOADED:
-      var result = _.unionWith(action.payload, state.jobs, (v1, v2) => {
+      const result = _.unionWith(action.payload, state.jobs, (v1, v2) => {
         return v1 != null && v2 != null && v1.id === v2.id;
       });
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
@@ -6526,11 +6464,11 @@ var MaintenanceReducer = (function () {
         loading: false
       });
     case JOBS_REMOVED:
-      var index = _.findIndex(state.jobs, event => {
+      const index = _.findIndex(state.jobs, event => {
         return event != null && event.id === action.payload;
       });
       if (index > -1) {
-        var newJobs = [...state.jobs];
+        const newJobs = [...state.jobs];
         newJobs.splice(index, 1);
         return _objectSpread$2(_objectSpread$2({}, state), {}, {
           jobs: newJobs
@@ -6538,14 +6476,14 @@ var MaintenanceReducer = (function () {
       }
       return state;
     case JOBS_TYPES_LOADED:
-      var jobtypes = _.unionWith(action.payload, state.jobtypes, (v1, v2) => {
+      const jobtypes = _.unionWith(action.payload, state.jobtypes, (v1, v2) => {
         return v1 != null && v2 != null && v1.id === v2.id;
       });
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
         jobtypes
       });
     case JOBS_STATUSES_LOADED:
-      var jobstatuses = _.orderBy(action.payload, "order", "asc");
+      const jobstatuses = _.orderBy(action.payload, "order", "asc");
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
         jobstatuses
       });
@@ -6560,7 +6498,7 @@ var MaintenanceReducer = (function () {
 
 class ActivityText extends Component {
   render() {
-    var {
+    const {
       data,
       classes,
       clickableClasses,
@@ -6636,7 +6574,7 @@ var img$3 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAxwAAAGGCAYAAADxZYcEA
 
 class ViewWidget extends Component {
   render() {
-    var src = img$3;
+    let src = img$3;
     return /*#__PURE__*/jsx("img", {
       style: styles$3.image,
       src: src,
@@ -6644,7 +6582,7 @@ class ViewWidget extends Component {
     });
   }
 }
-var styles$3 = {
+const styles$3 = {
   image: {
     width: 80
   }
@@ -6654,7 +6592,7 @@ var img$2 = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAmAAAASICAYAAAC0rHMFA
 
 class ViewFull extends Component {
   render() {
-    var src = img$2;
+    let src = img$2;
     return /*#__PURE__*/jsx("img", {
       style: styles$2.image,
       src: src,
@@ -6662,7 +6600,7 @@ class ViewFull extends Component {
     });
   }
 }
-var styles$2 = {
+const styles$2 = {
   image: {
     width: "100%",
     height: "100%",
@@ -6676,12 +6614,12 @@ function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 class PreviewWidget extends Component {
   render() {
-    var {
+    const {
       backgroundColor,
       widgetTitle,
       titleClassName
     } = this.props;
-    var src = img$1;
+    let src = img$1;
     return /*#__PURE__*/jsxs("div", {
       style: styles$1.container,
       children: [/*#__PURE__*/jsx("img", {
@@ -6698,7 +6636,7 @@ class PreviewWidget extends Component {
     });
   }
 }
-var styles$1 = {
+const styles$1 = {
   container: {
     position: "relative"
   },
@@ -6713,12 +6651,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 class PreviewFull extends Component {
   render() {
-    var {
+    const {
       backgroundColor,
       widgetTitle,
       titleClassName
     } = this.props;
-    var src = img;
+    let src = img;
     return /*#__PURE__*/jsxs("div", {
       style: styles.container,
       children: [/*#__PURE__*/jsx("p", {
@@ -6734,7 +6672,7 @@ class PreviewFull extends Component {
     });
   }
 }
-var styles = {
+const styles = {
   container: {
     position: "relative"
   },
@@ -6743,11 +6681,11 @@ var styles = {
   }
 };
 
-var SVG_PATH = values.svgPathGridIcon;
-var SVG_VIEWBOX = values.svgPathGridIconViewBox ;
+const SVG_PATH = values.svgPathGridIcon;
+const SVG_VIEWBOX = values.svgPathGridIconViewBox ;
 class PreviewGrid extends Component {
   render() {
-    var {
+    const {
       colour
     } = this.props;
     if (Array.isArray(SVG_PATH)) {
@@ -6774,20 +6712,20 @@ class PreviewGrid extends Component {
   }
 }
 
-var Reducers = (() => {
-  var reducers = {};
+const Reducers = (() => {
+  const reducers = {};
   reducers[values.reducerKey] = MaintenanceReducer;
   return reducers;
 })();
-var Screens = (() => {
-  var screens = {};
+const Screens = (() => {
+  const screens = {};
   screens[values.screenRequestsHub] = RequestsHub$1;
   screens[values.screenJob] = Job$1;
   screens[values.screenAddJob] = AddJob$1;
   screens[values.screenAddJobType] = AddJobType$1;
   return screens;
 })();
-var Analytics = [toExport];
+const Analytics = [toExport];
 
 export { ActivityText, Analytics, FeatureConfig as Config, PreviewFull, PreviewGrid, PreviewWidget, Reducers, Screens, ViewFull, ViewWidget };
 //# sourceMappingURL=index.js.map