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

package/dist/index.cjs.js

@@ -6,12 +6,12 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var React = require('react');
 var reactRedux = require('react-redux');
 var reactRouter = require('react-router');
-var _ = require('lodash');
-var moment = require('moment');
-var FontAwesome = require('react-fontawesome');
 var PlussCore = require('@plusscommunities/pluss-core-web');
 var reactBootstrap = require('react-bootstrap');
 var reactRouterDom = require('react-router-dom');
+var FontAwesome = require('react-fontawesome');
+var moment = require('moment');
+var _ = require('lodash');
 var Textarea = require('react-textarea-autosize');
 var freeSolidSvgIcons = require('@fortawesome/free-solid-svg-icons');
 
@@ -37,10 +37,10 @@ function _interopNamespace(e) {
 
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
-var FontAwesome__default = /*#__PURE__*/_interopDefaultLegacy(FontAwesome);
 var PlussCore__namespace = /*#__PURE__*/_interopNamespace(PlussCore);
+var FontAwesome__default = /*#__PURE__*/_interopDefaultLegacy(FontAwesome);
+var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
+var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var Textarea__default = /*#__PURE__*/_interopDefaultLegacy(Textarea);
 
 const values = {
@@ -112,7 +112,13 @@ const values = {
   hasHelpButton: true,
   helpGuideURL: 'https://www.plusscommunities.com/forms-feature',
   stringConfigJobStatus: 'maintenanceJobStatusForms',
-  stringConfigHideSeen: 'maintenanceDisableSeenForms'
+  stringConfigHideSeen: 'maintenanceDisableSeenForms',
+  // Comment subscription notification preference
+  notificationPreference: {
+    key: 'maintenancerequestFormsComments',
+    label: 'Forms comments',
+    permission: 'maintenanceTrackingForms'
+  }
 };
 
 // import * as PlussCore from '../../pluss-core/src';
@@ -235,7 +241,8 @@ const FeatureConfig = {
   init: environment => {
     FeatureConfig.env = environment;
     PlussCore__namespace.Config.init(environment);
-  }
+  },
+  notificationPreference: values.notificationPreference
 };
 
 const JOBS_LOADED = values.actionJobsLoaded;
@@ -245,15 +252,15 @@ 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__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
-  Helper: Helper$6,
+  Helper: Helper$4,
   Session: Session$9
 } = PlussCore__namespace;
-const maintenanceActions = {
+const maintenanceActions$1 = {
   getJobType: (site, typeId) => {
-    let url = Helper$6.getUrl(values.serviceKey, 'getjobtype');
+    let url = Helper$4.getUrl(values.serviceKey, 'getjobtype');
     return Session$9.authedFunction({
       method: 'POST',
       url,
@@ -264,7 +271,7 @@ const maintenanceActions = {
     });
   },
   getJobTypes: (site, id) => {
-    let url = Helper$6.getUrl(values.serviceKey, 'getjobtypes');
+    let url = Helper$4.getUrl(values.serviceKey, 'getjobtypes');
     return Session$9.authedFunction({
       method: 'POST',
       url,
@@ -274,7 +281,7 @@ const maintenanceActions = {
     });
   },
   getJob: (site, id) => {
-    let url = Helper$6.getUrl(values.serviceKey, 'getJob');
+    let url = Helper$4.getUrl(values.serviceKey, 'getJob');
     return Session$9.authedFunction({
       method: 'POST',
       url,
@@ -285,7 +292,7 @@ const maintenanceActions = {
     });
   },
   getJobByJobId: (site, jobId) => {
-    let url = Helper$6.getUrl(values.serviceKey, 'getJob');
+    let url = Helper$4.getUrl(values.serviceKey, 'getJob');
     return Session$9.authedFunction({
       method: 'POST',
       url,
@@ -300,7 +307,7 @@ const maintenanceActions = {
     let type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'getJobs'),
+      url: Helper$4.getUrl(values.serviceKey, 'getJobs'),
       data: {
         site,
         status,
@@ -308,7 +315,7 @@ const maintenanceActions = {
       }
     });
   },
-  getJobs2: (site, status, type, lastKey) => {
+  getJobs2: (site, status, type, priority, assignee, startTime, endTime, search, lastKey) => {
     const query = {
       site
     };
@@ -318,37 +325,57 @@ const maintenanceActions = {
     if (type) {
       query.type = type;
     }
+    if (priority) {
+      query.priority = priority;
+    }
+    if (assignee) {
+      query.assignee = assignee;
+    }
+    if (startTime) {
+      query.startTime = startTime;
+    }
+    if (endTime) {
+      query.endTime = endTime;
+    }
+    if (search) {
+      query.search = search;
+    }
     if (lastKey) {
       query.lastKey = JSON.stringify(lastKey);
     }
     return Session$9.authedFunction({
       method: 'GET',
-      url: Helper$6.getUrl(values.serviceKey, 'get/requests', query)
+      url: Helper$4.getUrl(values.serviceKey, 'get/requests', query)
     });
   },
+  /**
+   * @deprecated Use getJobs2 with pagination instead.
+   * This method recursively fetches ALL pages which can be slow for large datasets.
+   * Only use for CSV export where all data is needed.
+   */
   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 => {
+    return new Promise((resolve, reject) => {
+      maintenanceActions$1.getJobs2(site, status, type, undefined, undefined, undefined, undefined, undefined, lastKey).then(jobRes => {
         const newJobs = [...jobs, ...jobRes.data.Items];
         if (!jobRes.data.LastKey) {
           return resolve(newJobs);
         }
-        return resolve(maintenanceActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
-      });
+        maintenanceActions$1.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs).then(resolve).catch(reject);
+      }).catch(reject);
     });
   },
   createJob: job => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'sendMaintenance'),
-      data: _objectSpread$8({}, job)
+      url: Helper$4.getUrl(values.serviceKey, 'sendMaintenance'),
+      data: _objectSpread$7({}, job)
     });
   },
   editJob: (job, site) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'editJob'),
+      url: Helper$4.getUrl(values.serviceKey, 'editJob'),
       data: {
         job,
         site
@@ -358,7 +385,7 @@ const maintenanceActions = {
   deleteJob: (site, id) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'requests/remove'),
+      url: Helper$4.getUrl(values.serviceKey, 'requests/remove'),
       data: {
         site,
         id
@@ -368,7 +395,7 @@ const maintenanceActions = {
   editJobStatus: (id, status) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'editJobStatus'),
+      url: Helper$4.getUrl(values.serviceKey, 'editJobStatus'),
       data: {
         id,
         status
@@ -378,7 +405,7 @@ const maintenanceActions = {
   editJobPriority: (id, priority) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'update/priority'),
+      url: Helper$4.getUrl(values.serviceKey, 'update/priority'),
       data: {
         id,
         priority
@@ -388,7 +415,7 @@ const maintenanceActions = {
   assignJob: (jobId, userId) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'update/assign'),
+      url: Helper$4.getUrl(values.serviceKey, 'update/assign'),
       data: {
         id: jobId,
         userId
@@ -398,7 +425,7 @@ const maintenanceActions = {
   getAssignees: site => {
     return Session$9.authedFunction({
       method: 'GET',
-      url: Helper$6.getUrl(values.serviceKey, 'get/assignees', {
+      url: Helper$4.getUrl(values.serviceKey, 'get/assignees', {
         site
       })
     });
@@ -406,7 +433,7 @@ const maintenanceActions = {
   addNote: (jobId, note, attachments, images) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'requests/note'),
+      url: Helper$4.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         note,
@@ -419,7 +446,7 @@ const maintenanceActions = {
   editNote: (jobId, noteId, note, attachments, images) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'requests/note'),
+      url: Helper$4.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         note,
@@ -433,7 +460,7 @@ const maintenanceActions = {
   deleteNote: (jobId, noteId) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'requests/note'),
+      url: Helper$4.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         noteId,
@@ -453,7 +480,7 @@ const maintenanceActions = {
     };
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'createJobType'),
+      url: Helper$4.getUrl(values.serviceKey, 'createJobType'),
       data
     });
   },
@@ -471,14 +498,14 @@ const maintenanceActions = {
     if (hasCustomFields && customFields) data.customFields = customFields;
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'editJobType'),
+      url: Helper$4.getUrl(values.serviceKey, 'editJobType'),
       data
     });
   },
   deleteJobType: (site, id) => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'deleteJobType'),
+      url: Helper$4.getUrl(values.serviceKey, 'deleteJobType'),
       data: {
         site,
         id
@@ -488,7 +515,7 @@ const maintenanceActions = {
   getExternalSync: jobId => {
     return Session$9.authedFunction({
       method: 'GET',
-      url: Helper$6.getUrl(values.serviceKey, 'get/externalsync', {
+      url: Helper$4.getUrl(values.serviceKey, 'get/externalsync', {
         id: jobId
       })
     });
@@ -496,7 +523,7 @@ const maintenanceActions = {
   retrySync: jobId => {
     return Session$9.authedFunction({
       method: 'POST',
-      url: Helper$6.getUrl(values.serviceKey, 'update/retrysync'),
+      url: Helper$4.getUrl(values.serviceKey, 'update/retrysync'),
       data: {
         id: jobId
       }
@@ -505,7 +532,7 @@ const maintenanceActions = {
 };
 
 const {
-  Helper: Helper$5,
+  Helper: Helper$3,
   Session: Session$8
 } = PlussCore__namespace;
 const reactionActions = {
@@ -523,7 +550,7 @@ const reactionActions = {
     }
     return Session$8.authedFunction({
       method: 'POST',
-      url: Helper$5.getUrl('reactions', 'comments/add'),
+      url: Helper$3.getUrl('reactions', 'comments/add'),
       data
     });
   },
@@ -546,7 +573,7 @@ const reactionActions = {
     }
     return Session$8.authedFunction({
       method: 'GET',
-      url: Helper$5.getUrl('reactions', 'comments/get', query)
+      url: Helper$3.getUrl('reactions', 'comments/get', query)
     });
   }
 };
@@ -579,30 +606,6 @@ var jobStatusOptions = [
 	}
 ];
 
-const {
-  Helper: Helper$4
-} = PlussCore__namespace;
-const jobsUpdate = (site, isdashboard) => {
-  return dispatch => {
-    if (isdashboard) dispatch({
-      type: JOBS_LOADING
-    });
-    maintenanceActions.getJobsRecursive(site).then(res => {
-      const currentSite = Helper$4.readStorageWithCookie('site');
-      if (!___default["default"].isEmpty(res) && res[0].site === currentSite) {
-        dispatch({
-          type: JOBS_LOADED,
-          payload: res
-        });
-      } else {
-        dispatch({
-          type: JOBS_LOADED,
-          payload: []
-        });
-      }
-    });
-  };
-};
 const jobsLoaded = events => {
   return {
     type: JOBS_LOADED,
@@ -740,8 +743,8 @@ const getJobPriority = 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__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Session: Session$7,
   Components: Components$7,
@@ -749,7 +752,155 @@ const {
 } = PlussCore__namespace;
 class JobList extends React.Component {
   constructor(props) {
+    var _this;
     super(props);
+    _this = this;
+    _defineProperty__default["default"](this, "getAssignees", async () => {
+      try {
+        const res = await maintenanceActions$1.getAssignees(this.props.auth.site);
+        this.setState({
+          assignees: res.data.Users
+        });
+      } catch (error) {
+        console.error('getAssignees', error);
+      }
+    });
+    /**
+     * Build server-side filter params from current filter state.
+     * Translates UI filter selections into API query parameters.
+     */
+    _defineProperty__default["default"](this, "buildFilterParams", () => {
+      const {
+        selectedStatusFilter,
+        selectedTypeFilter,
+        selectedPriorityFilter,
+        selectedUserFilter,
+        selectedTimeFilterStart,
+        selectedTimeFilterEnd,
+        searchTerm
+      } = this.state;
+      const {
+        statusTypes
+      } = this.props;
+      const params = {};
+
+      // Status filter: translate "All Incomplete" into the actual incomplete statuses
+      if (selectedStatusFilter) {
+        if (selectedStatusFilter === STATUS_IMCOMPLETE) {
+          // Exclude completed statuses - pass all non-completed status texts
+          const incompleteStatuses = statusTypes.filter(s => s.category !== STATUS_COMPLETED).map(s => s.text);
+          if (incompleteStatuses.length > 0) {
+            params.status = incompleteStatuses.join(',');
+          }
+        } else {
+          params.status = selectedStatusFilter;
+        }
+      }
+      if (selectedTypeFilter) {
+        params.type = selectedTypeFilter;
+      }
+      if (selectedPriorityFilter) {
+        params.priority = selectedPriorityFilter;
+      }
+      if (selectedUserFilter) {
+        params.assignee = selectedUserFilter;
+      }
+      if (selectedTimeFilterStart) {
+        params.startTime = selectedTimeFilterStart;
+      }
+      if (selectedTimeFilterEnd) {
+        params.endTime = selectedTimeFilterEnd;
+      }
+      if (searchTerm) {
+        params.search = searchTerm;
+      }
+      return params;
+    });
+    /**
+     * Monotonically increasing ID used to ignore stale fetch results.
+     * When a filter changes, fetchJobs() increments this counter. Any
+     * in-flight fetch checks the counter before applying results —
+     * if it doesn't match, the results are discarded.
+     */
+    _defineProperty__default["default"](this, "_fetchId", 0);
+    /**
+     * Fetch a single page from the server using the given lastKey.
+     */
+    _defineProperty__default["default"](this, "fetchPage", async function () {
+      let lastKey = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+      const {
+        auth
+      } = _this.props;
+      const filters = _this.buildFilterParams();
+      return maintenanceActions$1.getJobs2(auth.site, filters.status, filters.type, filters.priority, filters.assignee, filters.startTime, filters.endTime, filters.search, lastKey);
+    });
+    /**
+     * Fetch the first page and render immediately.
+     */
+    _defineProperty__default["default"](this, "fetchJobs", async () => {
+      const fetchId = ++this._fetchId;
+      this.setState({
+        loading: true,
+        loadingMore: false
+      }, async () => {
+        try {
+          const res = await this.fetchPage(null);
+          if (this._fetchId !== fetchId) return;
+          const items = res.data.Items || [];
+          const lastKey = res.data.LastKey || null;
+          this.setState({
+            jobs: items,
+            lastKey,
+            hasMore: !!lastKey,
+            loading: false
+          });
+          this.props.jobsLoaded(items);
+          this.setRequesters(items);
+        } catch (error) {
+          if (this._fetchId !== fetchId) return;
+          console.error('fetchJobs', error);
+          this.setState({
+            loading: false
+          });
+        }
+      });
+    });
+    /**
+     * Load the next batch of jobs when the user clicks "Load More".
+     */
+    _defineProperty__default["default"](this, "loadMore", async () => {
+      const fetchId = ++this._fetchId;
+      const {
+        lastKey,
+        jobs
+      } = this.state;
+      this.setState({
+        loadingMore: true
+      }, async () => {
+        try {
+          const res = await this.fetchPage(lastKey);
+          if (this._fetchId !== fetchId) return;
+          const items = res.data.Items || [];
+          const newLastKey = res.data.LastKey || null;
+          const updatedJobs = [...jobs, ...items];
+          this.setState({
+            jobs: updatedJobs,
+            lastKey: newLastKey,
+            hasMore: !!newLastKey,
+            loadingMore: false
+          });
+          if (items.length > 0) {
+            this.props.jobsLoaded(items);
+          }
+        } catch (error) {
+          if (this._fetchId !== fetchId) return;
+          console.error('loadMore', error);
+          this.setState({
+            loadingMore: false
+          });
+        }
+      });
+    });
     _defineProperty__default["default"](this, "setRequesters", jobs => {
       const requesters = ___default["default"].orderBy(___default["default"].uniqBy(jobs.map(j => ({
         id: j.userID,
@@ -760,30 +911,6 @@ class JobList extends React.Component {
         requesters
       });
     });
-    _defineProperty__default["default"](this, "getJobs", async () => {
-      const {
-        auth
-      } = this.props;
-      try {
-        const res = await maintenanceActions.getJobsRecursive(auth.site);
-        if (!___default["default"].isEmpty(res) && res[0].site === auth.site) {
-          this.setRequesters(res);
-          this.props.jobsLoaded(res);
-        }
-      } catch (error) {
-        console.error('getJobs', error);
-      }
-    });
-    _defineProperty__default["default"](this, "getAssignees", async () => {
-      try {
-        const res = await maintenanceActions.getAssignees(this.props.auth.site);
-        this.setState({
-          assignees: res.data.Users
-        });
-      } catch (error) {
-        console.error('getAssignees', error);
-      }
-    });
     _defineProperty__default["default"](this, "sortByCol", col => {
       const {
         sortColumn,
@@ -803,9 +930,12 @@ class JobList extends React.Component {
     _defineProperty__default["default"](this, "onRemoveRequest", async request => {
       if (window.confirm(values.textAreYouSureYouWantToDelete)) {
         this.props.removeJob(request.id);
+        // Remove from local state immediately
+        this.setState(prevState => ({
+          jobs: prevState.jobs.filter(j => j.id !== request.id)
+        }));
         try {
-          await maintenanceActions.deleteJob(this.props.auth.site, request.id);
-          this.getJobs();
+          await maintenanceActions$1.deleteJob(this.props.auth.site, request.id);
         } catch (error) {
           console.log('onRemoveRequest', error);
           alert('Something went wrong with the request. Please try again.');
@@ -824,20 +954,20 @@ class JobList extends React.Component {
     });
     _defineProperty__default["default"](this, "selectTypeFilter", filter => {
       this.setState({
-        selectedTypeFilter: filter
-      });
+        selectedTypeFilter: filter || null
+      }, () => this.fetchJobs());
       this.closeFilter();
     });
     _defineProperty__default["default"](this, "selectPriorityFilter", filter => {
       this.setState({
-        selectedPriorityFilter: filter
-      });
+        selectedPriorityFilter: filter || null
+      }, () => this.fetchJobs());
       this.closeFilter();
     });
     _defineProperty__default["default"](this, "selectStatusFilter", filter => {
       this.setState({
-        selectedStatusFilter: filter
-      });
+        selectedStatusFilter: filter || null
+      }, () => this.fetchJobs());
       this.closeFilter();
     });
     _defineProperty__default["default"](this, "timeFilterChanged", selectedTimeFilter => {
@@ -881,7 +1011,7 @@ class JobList extends React.Component {
         selectedTimeFilterStart: startTime,
         selectedTimeFilterEnd: endTime,
         selectedTimeFilterText: text
-      });
+      }, () => this.fetchJobs());
       this.closeFilter();
     });
     _defineProperty__default["default"](this, "removeTimeFilter", () => {
@@ -889,7 +1019,7 @@ class JobList extends React.Component {
         selectedTimeFilterStart: null,
         selectedTimeFilterEnd: null,
         selectedTimeFilterText: null
-      });
+      }, () => this.fetchJobs());
     });
     _defineProperty__default["default"](this, "onHandleChange", event => {
       var stateChange = {};
@@ -905,7 +1035,7 @@ class JobList extends React.Component {
       this.setState({
         selectedUserFilter: null,
         selectedUserFilterText: null
-      });
+      }, () => this.fetchJobs());
     });
     _defineProperty__default["default"](this, "saveUserFilter", () => {
       if (!this.state.selectedAssignee) {
@@ -915,7 +1045,7 @@ class JobList extends React.Component {
           selectedUserFilter: this.state.selectedAssignee.id,
           selectedUserFilterText: this.state.selectedAssignee.displayName,
           selectedAssignee: null
-        });
+        }, () => this.fetchJobs());
       }
       this.closeFilter();
     });
@@ -928,7 +1058,7 @@ class JobList extends React.Component {
       this.setState({
         selectedRequesterFilter: null,
         selectedRequesterFilterText: null
-      });
+      }, () => this.fetchJobs());
     });
     _defineProperty__default["default"](this, "saveRequesterFilter", () => {
       if (!this.state.selectedRequester) {
@@ -938,7 +1068,7 @@ class JobList extends React.Component {
           selectedRequesterFilter: this.state.selectedRequester.id,
           selectedRequesterFilterText: this.state.selectedRequester.displayName,
           selectedRequester: null
-        });
+        }, () => this.fetchJobs());
       }
       this.closeFilter();
     });
@@ -949,85 +1079,47 @@ class JobList extends React.Component {
         lastSearch: thisSearchTime
       });
       setTimeout(() => {
-        // delayed setter to avoid filtering on every keypress
+        // delayed setter to avoid searching on every keypress
         if (this.state.lastSearch === thisSearchTime) {
           this.setState({
             searchTerm: this.state.search
-          });
+          }, () => this.fetchJobs());
         }
       }, 500);
     });
+    /**
+     * Get the source array for rendering.
+     * With server-side filtering, this is simply the local jobs array
+     * sorted by the user's selected sort column.
+     * The requester filter still applies client-side since the backend
+     * doesn't have a requester/userID filter param.
+     */
     _defineProperty__default["default"](this, "getSource", () => {
-      let source = this.props.source;
+      let source = this.state.jobs;
 
-      // filter by time
-      if (this.state.selectedTimeFilterStart && this.state.selectedTimeFilterEnd) {
-        source = ___default["default"].filter(source, r => {
-          return r.createdUnix >= this.state.selectedTimeFilterStart && r.createdUnix <= this.state.selectedTimeFilterEnd;
-        });
-      }
-
-      // filter by type
-      if (this.state.selectedTypeFilter) {
-        source = ___default["default"].filter(source, r => {
-          return r.type === this.state.selectedTypeFilter;
-        });
-      }
+      // Filter out deleted items
+      source = ___default["default"].filter(source, ev => ev != null && !ev.Deleted);
 
-      // filter by priority
-      if (this.state.selectedPriorityFilter) {
-        const defaultPriority = getDefaultPriority().name;
-        source = ___default["default"].filter(source, r => {
-          return r.priority === this.state.selectedPriorityFilter || this.state.selectedPriorityFilter === defaultPriority && ___default["default"].isNil(r.priority);
-        });
-      }
-
-      // filter by status
-      if (this.state.selectedStatusFilter) {
-        const {
-          statusTypes
-        } = this.props;
-        const defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
-        source = ___default["default"].filter(source, r => {
-          const status = statusTypes.find(s => s.text === r.status) || defaultStatus;
-          if (this.state.selectedStatusFilter === STATUS_IMCOMPLETE) {
-            return status.category !== STATUS_COMPLETED;
-          }
-          return status.text === this.state.selectedStatusFilter;
-        });
-      }
-      if (this.state.selectedUserFilter) {
-        source = ___default["default"].filter(source, r => {
-          return r.AssigneeId === this.state.selectedUserFilter;
-        });
-      }
+      // Requester filter still client-side (no backend param for userID filtering)
       if (this.state.selectedRequesterFilter) {
         source = ___default["default"].filter(source, r => {
           return r.userID === this.state.selectedRequesterFilter;
         });
       }
-      if (!___default["default"].isEmpty(this.state.searchTerm)) {
-        source = ___default["default"].filter(source, r => {
-          if (r.jobId && r.jobId === this.state.searchTerm) {
-            return true;
-          }
-          if (r.room && r.room.toLowerCase().indexOf(this.state.searchTerm.toLowerCase()) > -1) {
-            return true;
-          }
-          if (r.title && r.title.toLowerCase().indexOf(this.state.searchTerm.toLowerCase()) > -1) {
-            return true;
+
+      // Skip sorting while auto-fill is appending results to avoid jumpiness.
+      // Sort is re-applied when the user clicks a column header or when
+      // auto-fill completes.
+      if (!this.state.loadingMore) {
+        source = ___default["default"].sortBy(source, event => {
+          if (this.state.sortColumn === 'assigned') {
+            return event.Assignee ? event.Assignee.displayName : 'Unassigned';
           }
-          return false;
+          if (this.state.sortColumn !== 'createdUnix') return event[this.state.sortColumn];
+          return event.createdUnix;
         });
+        if (this.state.sortDesc) source.reverse();
       }
-      source = ___default["default"].sortBy(source, event => {
-        if (this.state.sortColumn === 'assigned') {
-          return event.Assignee ? event.Assignee.displayName : 'Unassigned';
-        }
-        if (this.state.sortColumn !== 'createdUnix') return event[this.state.sortColumn];
-        return event.createdUnix;
-      });
-      if (this.state.sortDesc) source.reverse();
       return source;
     });
     _defineProperty__default["default"](this, "getCustomFieldValue", field => {
@@ -1107,7 +1199,7 @@ class JobList extends React.Component {
         });
         const customFieldValues = this.getCustomFields(r, customColumns);
         const priority = r.priority || defaultPriority;
-        return _objectSpread$7(_objectSpread$7(_objectSpread$7({}, r), customFieldValues), {}, {
+        return _objectSpread$6(_objectSpread$6(_objectSpread$6({}, r), customFieldValues), {}, {
           notes,
           progressTime,
           completedTime,
@@ -1139,13 +1231,60 @@ class JobList extends React.Component {
         exportCsvOpen: false
       });
     });
+    _defineProperty__default["default"](this, "hasActiveFilters", () => {
+      const {
+        selectedTypeFilter,
+        selectedPriorityFilter,
+        selectedStatusFilter,
+        selectedTimeFilterStart,
+        selectedUserFilter,
+        selectedRequesterFilter,
+        searchTerm
+      } = this.state;
+      return !!(selectedTypeFilter || selectedPriorityFilter || selectedStatusFilter || selectedTimeFilterStart || selectedUserFilter || selectedRequesterFilter || searchTerm);
+    });
+    _defineProperty__default["default"](this, "clearAllFilters", () => {
+      this.setState({
+        selectedTypeFilter: null,
+        selectedPriorityFilter: null,
+        selectedStatusFilter: null,
+        selectedTimeFilterStart: null,
+        selectedTimeFilterEnd: null,
+        selectedTimeFilterText: null,
+        selectedUserFilter: null,
+        selectedUserFilterText: null,
+        selectedRequesterFilter: null,
+        selectedRequesterFilterText: null,
+        search: '',
+        searchTerm: ''
+      }, () => this.fetchJobs());
+    });
     this.state = {
-      showCompleted: false,
       sortColumn: 'createdUnix',
       sortDesc: true,
       selectedTimeFilter: Analytics$2.getAnalyticsFilterOptions()[1],
       assignees: [],
-      requesters: []
+      requesters: [],
+      // Server-side pagination state
+      jobs: [],
+      lastKey: null,
+      hasMore: false,
+      loading: false,
+      loadingMore: false,
+      // Filters (applied to server-side queries)
+      selectedTypeFilter: null,
+      selectedPriorityFilter: null,
+      selectedStatusFilter: null,
+      selectedTimeFilterStart: null,
+      selectedTimeFilterEnd: null,
+      selectedTimeFilterText: null,
+      selectedUserFilter: null,
+      selectedUserFilterText: null,
+      selectedRequesterFilter: null,
+      selectedRequesterFilterText: null,
+      search: '',
+      searchTerm: '',
+      lastSearch: null
     };
     this.exportColumns = [{
       label: 'Select All',
@@ -1205,7 +1344,7 @@ class JobList extends React.Component {
   }
   componentDidMount() {
     this.props.jobStatusesUpdate(this.props.auth.site);
-    this.getJobs();
+    this.fetchJobs();
     this.getAssignees();
   }
   renderFilterPopup() {
@@ -1219,7 +1358,7 @@ class JobList extends React.Component {
         minWidth: 400,
         hasPadding: true,
         onClose: this.closeFilter
-      }, ___default["default"].sortBy(___default["default"].uniq(this.props.source.map(r => r.type)), t => t.toLowerCase()).map(type => {
+      }, ___default["default"].sortBy(___default["default"].uniq(this.state.jobs.map(r => r.type)), t => t.toLowerCase()).map(type => {
         return /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
           key: type,
           onClick: () => {
@@ -1410,7 +1549,7 @@ class JobList extends React.Component {
       const status = ev.status && statusTypes.find(s => s.text === ev.status) || defaultStatus;
       const priority = getJobPriority(ev.priority);
       return /*#__PURE__*/React__default["default"].createElement("tr", {
-        key: index
+        key: ev.id || index
       }, /*#__PURE__*/React__default["default"].createElement("td", null, ev.jobId), /*#__PURE__*/React__default["default"].createElement("td", {
         className: "table-TitleColumn"
       }, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
@@ -1491,8 +1630,28 @@ class JobList extends React.Component {
     if (col !== this.state.sortColumn) return '';
     return ' table--columnActive';
   }
+  renderLoading() {
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "flex flex-center-row",
+      style: {
+        padding: 40
+      }
+    }, /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
+      style: {
+        fontSize: 32,
+        color: PlussCore.Colours.COLOUR_DUSK_LIGHT
+      },
+      name: "spinner fa-pulse fa-fw"
+    }), /*#__PURE__*/React__default["default"].createElement("span", {
+      className: "marginLeft-16 fontRegular fontSize-14",
+      style: {
+        color: PlussCore.Colours.TEXT_MID
+      }
+    }, "Loading ", values.textTitleRequests, "\u2026"));
+  }
   renderEmpty() {
     const title = this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleRequests;
+    const hasFilters = this.hasActiveFilters();
     return /*#__PURE__*/React__default["default"].createElement("div", {
       style: {
         display: 'flex',
@@ -1504,7 +1663,22 @@ class JobList extends React.Component {
       }
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "emptyState"
-    }), /*#__PURE__*/React__default["default"].createElement("div", {
+    }), hasFilters ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "marginTop-32",
+      style: {
+        maxWidth: 500,
+        textAlign: 'center'
+      }
+    }, /*#__PURE__*/React__default["default"].createElement("span", {
+      className: "fontRegular fontSize-13"
+    }, "No ", title.toLowerCase(), " match your current filters.")), /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "marginTop-16"
+    }, /*#__PURE__*/React__default["default"].createElement(Components$7.Button, {
+      inline: true,
+      buttonType: "tertiary",
+      onClick: this.clearAllFilters,
+      isActive: true
+    }, "Clear All Filters"))) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "marginTop-32",
       style: {
         maxWidth: 500,
@@ -1520,11 +1694,66 @@ class JobList extends React.Component {
         maxWidth: 500,
         textAlign: 'center'
       }
-    }, values.textEmptyExample));
+    }, values.textEmptyExample)));
+  }
+  renderLoadMore() {
+    const {
+      hasMore,
+      loadingMore
+    } = this.state;
+    if (!hasMore && !loadingMore) return null;
+
+    // During background auto-fill, show a subtle spinner without a button
+    if (loadingMore) {
+      return /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "flex flex-center-row",
+        style: {
+          padding: '16px 0'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
+        name: "spinner fa-pulse fa-fw",
+        style: {
+          fontSize: 16,
+          color: PlussCore.Colours.TEXT_MID,
+          marginRight: 8
+        }
+      }), /*#__PURE__*/React__default["default"].createElement("span", {
+        className: "fontRegular fontSize-13",
+        style: {
+          color: PlussCore.Colours.TEXT_MID
+        }
+      }, "Loading more results\u2026"));
+    }
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      style: {
+        margin: '24px 0 40px 0',
+        position: 'relative',
+        top: -16
+      }
+    }, /*#__PURE__*/React__default["default"].createElement(Components$7.Button, {
+      buttonType: "primary",
+      onClick: this.loadMore,
+      isActive: true,
+      style: {
+        width: '100%'
+      }
+    }, "Load More Results", /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
+      name: "plus",
+      style: {
+        marginLeft: 8
+      }
+    })));
   }
   renderContent() {
-    if (___default["default"].isEmpty(this.props.source)) return this.renderEmpty();
-    return /*#__PURE__*/React__default["default"].createElement(reactBootstrap.Table, {
+    const {
+      loading,
+      loadingMore,
+      jobs
+    } = this.state;
+    if (loading) return this.renderLoading();
+    if (___default["default"].isEmpty(jobs) && !loadingMore) return this.renderEmpty();
+    if (___default["default"].isEmpty(jobs)) return this.renderLoading();
+    return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(reactBootstrap.Table, {
       className: "plussTable",
       striped: true,
       bordered: true,
@@ -1607,7 +1836,7 @@ class JobList extends React.Component {
       style: {
         width: 50
       }
-    }))), /*#__PURE__*/React__default["default"].createElement("tbody", null, this.renderRequests()));
+    }))), /*#__PURE__*/React__default["default"].createElement("tbody", null, this.renderRequests())), this.renderLoadMore());
   }
   renderFilters() {
     let typeFilter = /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
@@ -1656,13 +1885,9 @@ class JobList extends React.Component {
       typeFilter = /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('type');
-        },
-        rightIcon: "close",
-        rightClick: e => {
-          e.stopPropagation();
           this.selectTypeFilter();
         },
+        rightIcon: "close",
         text: this.state.selectedTypeFilter
       });
     }
@@ -1670,13 +1895,9 @@ class JobList extends React.Component {
       priorityFilter = /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('priority');
-        },
-        rightIcon: "close",
-        rightClick: e => {
-          e.stopPropagation();
           this.selectPriorityFilter();
         },
+        rightIcon: "close",
         text: this.state.selectedPriorityFilter
       });
     }
@@ -1684,13 +1905,9 @@ class JobList extends React.Component {
       statusFilter = /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('status');
-        },
-        rightIcon: "close",
-        rightClick: e => {
-          e.stopPropagation();
           this.selectStatusFilter();
         },
+        rightIcon: "close",
         text: this.state.selectedStatusFilter
       });
     }
@@ -1712,13 +1929,9 @@ class JobList extends React.Component {
       userFilter = /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('user');
-        },
-        rightIcon: "close",
-        rightClick: e => {
-          e.stopPropagation();
           this.removeUserFilter();
         },
+        rightIcon: "close",
         text: this.state.selectedUserFilterText
       });
     }
@@ -1726,13 +1939,9 @@ class JobList extends React.Component {
       requesterFilter = /*#__PURE__*/React__default["default"].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('requester');
-        },
-        rightIcon: "close",
-        rightClick: e => {
-          e.stopPropagation();
           this.removeRequesterFilter();
         },
+        rightIcon: "close",
         text: this.state.selectedRequesterFilterText
       });
     }
@@ -1810,7 +2019,7 @@ class JobTypes extends React.Component {
     super(props);
     _defineProperty__default["default"](this, "getJobTypes", async () => {
       try {
-        const res = await maintenanceActions.getJobTypes(this.props.auth.site);
+        const res = await maintenanceActions$1.getJobTypes(this.props.auth.site);
         if (res.data != null) this.props.jobTypesLoaded(res.data);
       } catch (error) {
         console.error('getJobTypes', error);
@@ -1835,7 +2044,7 @@ class JobTypes extends React.Component {
     _defineProperty__default["default"](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);
+        await maintenanceActions$1.deleteJobType(this.props.auth.site, ev.id);
         const index = ___default["default"].findIndex(this.state.jobList, job => {
           return job != null && job.id === ev.id;
         });
@@ -2040,12 +2249,12 @@ var JobTypes$1 = reactRedux.connect(mapStateToProps$6, {
   jobTypesUpdate
 })(reactRouter.withRouter(JobTypes));
 
-function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Session: Session$5,
   Components: Components$5,
-  Colours: Colours$3
+  Colours: Colours$2
 } = PlussCore__namespace;
 class Configuration extends React.Component {
   constructor(props) {
@@ -2236,43 +2445,43 @@ class Configuration extends React.Component {
     return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement("p", {
       className: "fontMedium fontSize-36 text-dark"
     }, "Statuses"), /*#__PURE__*/React__default["default"].createElement("div", {
-      style: styles$6.statusCategoryHeading
+      style: styles$5.statusCategoryHeading
     }, /*#__PURE__*/React__default["default"].createElement("span", {
       className: "fontMedium fontSize-16 text-bold"
     }, "Status Category")), statusTypes.map((status, index) => {
       return /*#__PURE__*/React__default["default"].createElement("div", {
         key: "".concat(status.text, "_").concat(index),
-        style: styles$6.statusTypeContainer
+        style: styles$5.statusTypeContainer
       }, /*#__PURE__*/React__default["default"].createElement("div", {
         key: status.text,
         className: "statusLabel",
-        style: _objectSpread$6(_objectSpread$6({}, styles$6.statusTextContainer), {}, {
+        style: _objectSpread$5(_objectSpread$5({}, styles$5.statusTextContainer), {}, {
           backgroundColor: status.color
         })
       }, /*#__PURE__*/React__default["default"].createElement("span", {
         className: "statusLabel_text"
       }, status.text)), /*#__PURE__*/React__default["default"].createElement("div", {
-        style: styles$6.statusCategoryContainer
+        style: styles$5.statusCategoryContainer
       }, /*#__PURE__*/React__default["default"].createElement("span", {
         className: "fontMedium fontSize-16 text-dark"
       }, status.category)), /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        style: _objectSpread$6(_objectSpread$6({}, styles$6.statusIcon), {}, {
+        style: _objectSpread$5(_objectSpread$5({}, styles$5.statusIcon), {}, {
           visibility: index === 0 ? 'hidden' : 'visible'
         }),
         name: 'arrow-up',
         onClick: () => this.onMoveStatus(index, true)
       }), /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        style: _objectSpread$6(_objectSpread$6({}, styles$6.statusIcon), {}, {
+        style: _objectSpread$5(_objectSpread$5({}, styles$5.statusIcon), {}, {
           visibility: index === statusTypes.length - 1 ? 'hidden' : 'visible'
         }),
         name: 'arrow-down',
         onClick: () => this.onMoveStatus(index, false)
       }), /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        style: _objectSpread$6({}, styles$6.statusIcon),
+        style: _objectSpread$5({}, styles$5.statusIcon),
         name: "pencil",
         onClick: () => this.onEditStatus(index)
       }), /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-        style: _objectSpread$6({}, styles$6.statusIcon),
+        style: _objectSpread$5({}, styles$5.statusIcon),
         name: "minus-circle",
         onClick: () => this.onDeleteStatus(index)
       }));
@@ -2321,8 +2530,8 @@ class Configuration extends React.Component {
   renderSuccess() {
     if (!this.state.success) return null;
     return /*#__PURE__*/React__default["default"].createElement("span", {
-      style: _objectSpread$6(_objectSpread$6({}, styles$6.savedText), {}, {
-        color: Colours$3.COLOUR_GREEN
+      style: _objectSpread$5(_objectSpread$5({}, styles$5.savedText), {}, {
+        color: Colours$2.COLOUR_GREEN
       })
     }, "Saved");
   }
@@ -2438,7 +2647,7 @@ class Configuration extends React.Component {
     }, this.renderSubmit(), this.renderSuccess()), this.renderNewStatusPopup());
   }
 }
-const styles$6 = {
+const styles$5 = {
   statusCategoryHeading: {
     marginLeft: 130,
     width: 160,
@@ -2463,7 +2672,7 @@ const styles$6 = {
     fontSize: 20,
     padding: 5,
     marginLeft: 10,
-    color: Colours$3.COLOUR_BRANDING_ACTION,
+    color: Colours$2.COLOUR_BRANDING_ACTION,
     visibility: 'visible'
   },
   savedText: {
@@ -2497,52 +2706,6 @@ const {
 class RequestsHub extends React.Component {
   constructor(props) {
     super(props);
-    _defineProperty__default["default"](this, "setData", () => {
-      const allList = [];
-      this.state.allList.forEach(ev => {
-        if (ev != null && !ev.Deleted) allList.push(ev);
-      });
-      const upcoming = ___default["default"].filter(allList, ev => {
-        if (!ev) return false;
-        if (ev.status && ev.status === 'Completed') return false;
-        return true;
-      });
-      const completed = ___default["default"].filter(allList, ev => {
-        if (!ev) return false;
-        if (ev.status && ev.status === 'Completed') return true;
-        return false;
-      });
-
-      // console.log('setData', upcoming, completed);
-      this.setState({
-        allList,
-        upcoming,
-        completed
-      });
-    });
-    _defineProperty__default["default"](this, "getData", () => {
-      const {
-        auth
-      } = this.props;
-      this.setState({
-        loadingAll: true
-      }, async () => {
-        try {
-          const res = await maintenanceActions.getJobsRecursive(auth.site);
-          this.setState({
-            loadingAll: false
-          });
-          if (!___default["default"].isEmpty(res) && res[0].site === auth.site) {
-            this.props.jobsLoaded(res);
-          }
-        } catch (error) {
-          console.error('getData', error);
-          this.setState({
-            loadingAll: false
-          });
-        }
-      });
-    });
     _defineProperty__default["default"](this, "onAddNew", () => {
       const {
         auth
@@ -2569,38 +2732,10 @@ class RequestsHub extends React.Component {
     _defineProperty__default["default"](this, "getSideBarSectionColour", id => this.state.selectedSection === id ? {
       backgroundColor: '#fff'
     } : {});
-    _defineProperty__default["default"](this, "renderStats", (stat, loading) => loading ? /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
-      style: styles$5.spinner,
-      name: "spinner fa-pulse fa-fw"
-    }) : stat);
     this.state = {
-      selectedSection: 'all',
-      location: '',
-      loadingAll: false,
-      loadingSubmissions: false,
-      submissionEntries: [],
-      allList: [],
-      completed: [],
-      upcoming: [],
-      now: moment__default["default"].utc(),
-      onlyFuture: true,
-      search: ''
+      selectedSection: 'all'
     };
   }
-  UNSAFE_componentWillMount() {
-    this.updateProps(this.props);
-  }
-  componentDidMount() {
-    this.getData();
-  }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!___default["default"].isEqual(this.props.jobs, nextProps.jobs)) this.updateProps(nextProps);
-  }
-  updateProps(props) {
-    this.setState({
-      allList: props.jobs
-    }, this.setData);
-  }
   renderLeftBar() {
     const sectionItems = [];
     if (this.canAddNew()) {
@@ -2670,9 +2805,7 @@ class RequestsHub extends React.Component {
     } else if (this.state.selectedSection === 'config') {
       return /*#__PURE__*/React__default["default"].createElement(Configuration$1, null);
     }
-    return /*#__PURE__*/React__default["default"].createElement(JobList$1, {
-      source: this.state.allList
-    });
+    return /*#__PURE__*/React__default["default"].createElement(JobList$1, null);
   }
   render() {
     return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -2684,50 +2817,24 @@ class RequestsHub extends React.Component {
     }, this.renderRight())));
   }
 }
-const styles$5 = {
-  sideBarTitleSection: {
-    lineHeight: '40px',
-    marginTop: 30,
-    marginBottom: 30,
-    paddingLeft: 24,
-    paddingRight: 24
-  },
-  sideBarSection: {
-    weight: '100%',
-    minWidth: 200,
-    padding: 32,
-    paddingLeft: 24,
-    cursor: 'pointer',
-    display: 'flex',
-    flexDirection: 'column',
-    justifyContent: 'center'
-  },
-  spinner: {
-    fontSize: 32,
-    color: FeatureConfig.env.colourBrandingOff
-  }
-};
 const mapStateToProps$4 = state => {
   const {
     auth
   } = state;
   return {
-    jobs: state[values.reducerKey].jobs,
     auth,
     strings: state.strings && state.strings.config || {}
   };
 };
-var RequestsHub$1 = reactRedux.connect(mapStateToProps$4, {
-  jobsLoaded
-})(reactRouter.withRouter(RequestsHub));
+var RequestsHub$1 = reactRedux.connect(mapStateToProps$4)(reactRouter.withRouter(RequestsHub));
 
-function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Apis: Apis$1,
-  Helper: Helper$3,
+  Helper: Helper$2,
   Session: Session$3,
-  Colours: Colours$2,
+  Colours: Colours$1,
   Components: Components$3
 } = PlussCore__namespace;
 const IMAGE_SIZE_NOTE = 72;
@@ -2736,7 +2843,7 @@ class Job extends React.Component {
     super(props);
     _defineProperty__default["default"](this, "getJob", async () => {
       try {
-        const res = await maintenanceActions.getJob(this.props.auth.site, this.state.jobId);
+        const res = await maintenanceActions$1.getJob(this.props.auth.site, this.state.jobId);
         this.setState({
           updating: false
         });
@@ -2748,7 +2855,7 @@ class Job extends React.Component {
     });
     _defineProperty__default["default"](this, "getAssignees", async () => {
       try {
-        const res = await maintenanceActions.getAssignees(this.props.auth.site);
+        const res = await maintenanceActions$1.getAssignees(this.props.auth.site);
         this.setState({
           assignees: res.data.Users
         });
@@ -2761,7 +2868,7 @@ class Job extends React.Component {
         this.setState({
           loadingExternalSync: true
         });
-        const res = await maintenanceActions.getExternalSync(this.state.jobId);
+        const res = await maintenanceActions$1.getExternalSync(this.state.jobId);
         this.setState({
           externalSync: res.data,
           loadingExternalSync: false
@@ -2786,7 +2893,7 @@ class Job extends React.Component {
         retrySyncError: null
       });
       try {
-        await maintenanceActions.retrySync(job.id);
+        await maintenanceActions$1.retrySync(job.id);
         // Refresh job data to get updated history
         await this.getJob();
         this.setState({
@@ -2809,7 +2916,7 @@ class Job extends React.Component {
       let statusType = statusTypes.find(s => s.text === status);
       if (!statusType) {
         const defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
-        statusType = _objectSpread$5(_objectSpread$5({}, defaultStatus), {}, {
+        statusType = _objectSpread$4(_objectSpread$4({}, defaultStatus), {}, {
           text: status
         });
       }
@@ -2952,7 +3059,7 @@ class Job extends React.Component {
     // Method to handle user assignment
     _defineProperty__default["default"](this, "onAssignUser", async userId => {
       try {
-        const res = await maintenanceActions.assignJob(this.state.jobId, userId);
+        const res = await maintenanceActions$1.assignJob(this.state.jobId, userId);
         this.getJob();
       } catch (err) {
         console.error("onAssignUser", err);
@@ -2964,12 +3071,12 @@ class Job extends React.Component {
         this.setState({
           submittingNote: true
         });
-        const res = await (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$1.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$1.addNote(this.state.jobId, this.state.noteInput, this.state.noteAttachments.map(a => {
           return {
             Title: a.Title,
             Source: a.Source
@@ -2997,9 +3104,9 @@ class Job extends React.Component {
         });
         return;
       }
-      maintenanceActions.deleteNote(this.state.jobId, n.Id);
+      maintenanceActions$1.deleteNote(this.state.jobId, n.Id);
       const newNotes = ___default["default"].filter(this.state.job.Notes, note => note.Id !== n.Id);
-      const newJob = _objectSpread$5({}, this.state.job);
+      const newJob = _objectSpread$4({}, this.state.job);
       newJob.Notes = newNotes;
       this.setState({
         job: newJob,
@@ -3035,7 +3142,7 @@ class Job extends React.Component {
             seen: true,
             status: job.status || "Unassigned"
           };
-          await maintenanceActions.editJob(update, auth.site);
+          await maintenanceActions$1.editJob(update, auth.site);
         } catch (error) {
           this.setState({
             updating: false
@@ -3083,13 +3190,13 @@ class Job extends React.Component {
     });
     _defineProperty__default["default"](this, "onSelectPriority", async priority => {
       this.setState({
-        job: _objectSpread$5(_objectSpread$5({}, this.state.job), {}, {
+        job: _objectSpread$4(_objectSpread$4({}, this.state.job), {}, {
           priority
         }),
         priorityChangerOpen: false
       });
       try {
-        const res = await maintenanceActions.editJobPriority(this.state.job.id, priority);
+        const res = await maintenanceActions$1.editJobPriority(this.state.job.id, priority);
         const {
           job
         } = res.data;
@@ -3108,13 +3215,13 @@ class Job extends React.Component {
     });
     _defineProperty__default["default"](this, "onSelectStatus", async status => {
       this.setState({
-        job: _objectSpread$5(_objectSpread$5({}, this.state.job), {}, {
+        job: _objectSpread$4(_objectSpread$4({}, this.state.job), {}, {
           status: status
         }),
         statusChangerOpen: false
       });
       try {
-        const res = await maintenanceActions.editJobStatus(this.state.job.id, status);
+        const res = await maintenanceActions$1.editJobStatus(this.state.job.id, status);
         const {
           job
         } = res.data;
@@ -3127,7 +3234,7 @@ class Job extends React.Component {
       }
     });
     this.state = {
-      jobId: Helper$3.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
+      jobId: Helper$2.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
       job: null,
       showingSelector: false,
       updating: false,
@@ -3330,7 +3437,7 @@ class Job extends React.Component {
       }, /*#__PURE__*/React__default["default"].createElement("div", {
         className: "imageGrid_image",
         style: {
-          backgroundImage: "url('".concat(Helper$3.get1400(image), "')"),
+          backgroundImage: "url('".concat(Helper$2.get1400(image), "')"),
           width: size,
           height: size
         }
@@ -3527,7 +3634,7 @@ class Job extends React.Component {
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "maintenanceNote_top"
     }, this.props.auth && this.props.auth.user && this.props.auth.user.Id === note.User.id && /*#__PURE__*/React__default["default"].createElement(Components$3.SVGIcon, {
-      colour: Colours$2.COLOUR_DUSK_LIGHT,
+      colour: Colours$1.COLOUR_DUSK_LIGHT,
       icon: "more15",
       className: "maintenanceNote_moreIcon",
       onClick: () => this.onOpenNoteMenu(index)
@@ -3545,7 +3652,7 @@ class Job extends React.Component {
       }]
     })), /*#__PURE__*/React__default["default"].createElement("p", {
       className: "maintenanceNote_text"
-    }, Helper$3.toParagraphed(note.Note)), note.Attachments.map((a, i) => this.renderAttachment(a, i)), note.Images && note.Images.length > 0 ? this.renderImageGrid(note.Images, IMAGE_SIZE_NOTE) : null));
+    }, Helper$2.toParagraphed(note.Note)), note.Attachments.map((a, i) => this.renderAttachment(a, i)), note.Images && note.Images.length > 0 ? this.renderImageGrid(note.Images, IMAGE_SIZE_NOTE) : null));
   }
   renderAssignment() {
     const {
@@ -3578,7 +3685,7 @@ class Job extends React.Component {
     }, moment__default["default"].utc(e.timestamp).local().format("D MMM YYYY h:mma")), /*#__PURE__*/React__default["default"].createElement("div", {
       className: "statusLabel statusLabel-large statusLabel-full",
       style: {
-        backgroundColor: Colours$2.COLOUR_DUSK
+        backgroundColor: Colours$1.COLOUR_DUSK
       }
     }, /*#__PURE__*/React__default["default"].createElement("span", {
       className: "statusLabel_text"
@@ -3586,7 +3693,7 @@ class Job extends React.Component {
   }
   renderExternalSyncEntry(e, i) {
     const isSuccess = e.EntryType === "ExternalIDSet";
-    const backgroundColor = isSuccess ? Colours$2.COLOUR_GREEN : Colours$2.COLOUR_RED; // Green for success, red for failure
+    const backgroundColor = isSuccess ? Colours$1.COLOUR_GREEN : Colours$1.COLOUR_RED; // Green for success, red for failure
 
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: "ticketHistoryEntry",
@@ -3646,7 +3753,7 @@ class Job extends React.Component {
       return /*#__PURE__*/React__default["default"].createElement(FontAwesome__default["default"], {
         style: {
           fontSize: 20,
-          color: Colours$2.COLOUR_DUSK_LIGHT,
+          color: Colours$1.COLOUR_DUSK_LIGHT,
           marginLeft: 8
         },
         name: "spinner fa-pulse fa-fw"
@@ -3656,7 +3763,7 @@ class Job extends React.Component {
       className: "statusLabel pointer",
       onClick: this.onRetrySync,
       style: {
-        backgroundColor: Colours$2.COLOUR_RED,
+        backgroundColor: Colours$1.COLOUR_RED,
         marginLeft: 8
       }
     }, /*#__PURE__*/React__default["default"].createElement("span", {
@@ -3677,7 +3784,7 @@ class Job extends React.Component {
         className: "userStatusIcon",
         name: "times-circle",
         style: {
-          color: Colours$2.COLOUR_RED
+          color: Colours$1.COLOUR_RED
         }
       }), " ", retrySyncError);
     }
@@ -3690,7 +3797,7 @@ class Job extends React.Component {
         className: "userStatusIcon",
         name: "check-circle",
         style: {
-          color: Colours$2.COLOUR_GREEN
+          color: Colours$1.COLOUR_GREEN
         }
       }), " ", "Sync retry initiated. Check back shortly for results.");
     }
@@ -3703,7 +3810,7 @@ class Job extends React.Component {
         className: "userStatusIcon",
         name: "times-circle",
         style: {
-          color: Colours$2.COLOUR_RED
+          color: Colours$1.COLOUR_RED
         }
       }), " ", "External sync failed. Use the retry button to attempt again.");
     }
@@ -3747,11 +3854,11 @@ class Job extends React.Component {
     } = this.state;
     if (!job || !job.history) return null;
     const source = ___default["default"].sortBy([...job.history.map(e => {
-      return _objectSpread$5(_objectSpread$5({}, e), {}, {
+      return _objectSpread$4(_objectSpread$4({}, e), {}, {
         EntryType: e.EntryType || "status"
       });
     }), ...(job.Notes || []).map(e => {
-      return _objectSpread$5(_objectSpread$5({}, e), {}, {
+      return _objectSpread$4(_objectSpread$4({}, e), {}, {
         timestamp: e.Timestamp,
         EntryType: "note"
       });
@@ -3900,7 +4007,7 @@ class Job extends React.Component {
           onClick: () => {
             this.onSelectAssignee();
           },
-          colour: Colours$2.COLOUR_DUSK
+          colour: Colours$1.COLOUR_DUSK
         })
       }));
     } else {
@@ -3974,14 +4081,14 @@ var Job$1 = reactRedux.connect(mapStateToProps$3, {
   jobStatusesUpdate
 })(reactRouter.withRouter(Job));
 
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Actions,
   Components: Components$2,
-  Helper: Helper$2,
+  Helper: Helper$1,
   Session: Session$2,
-  Colours: Colours$1,
+  Colours,
   Apis
 } = PlussCore__namespace;
 class AddJob extends React.Component {
@@ -3991,7 +4098,7 @@ class AddJob extends React.Component {
     _this = this;
     _defineProperty__default["default"](this, "getJob", async () => {
       try {
-        const res = await maintenanceActions.getJob(this.props.auth.site, this.state.jobId);
+        const res = await maintenanceActions$1.getJob(this.props.auth.site, this.state.jobId);
         res.data.location = res.data.site;
         const {
           userID,
@@ -4000,7 +4107,7 @@ class AddJob extends React.Component {
           type,
           customFields
         } = res.data;
-        this.setState(_objectSpread$4(_objectSpread$4({}, res.data), {}, {
+        this.setState(_objectSpread$3(_objectSpread$3({}, res.data), {}, {
           prevType: type,
           prevCustomFileds: customFields,
           type,
@@ -4025,7 +4132,7 @@ class AddJob extends React.Component {
     });
     _defineProperty__default["default"](this, "getJobTypes", async () => {
       try {
-        const res = await maintenanceActions.getJobTypes(this.props.auth.site);
+        const res = await maintenanceActions$1.getJobTypes(this.props.auth.site);
         this.setState({
           types: res.data
         });
@@ -4248,7 +4355,7 @@ class AddJob extends React.Component {
       event.target.value = "";
     });
     _defineProperty__default["default"](this, "onToggleDatePicker", qId => {
-      const showDate = _objectSpread$4({}, this.state.showDate);
+      const showDate = _objectSpread$3({}, this.state.showDate);
       showDate[qId] = !showDate[qId];
       this.setState({
         showDate
@@ -4285,7 +4392,7 @@ class AddJob extends React.Component {
         customFields: this.state.customFields
       };
       if (this.state.id != null) {
-        maintenanceActions.editJob(job, this.props.auth.site).then(res => {
+        maintenanceActions$1.editJob(job, this.props.auth.site).then(res => {
           this.setState({
             success: true,
             updating: false
@@ -4299,12 +4406,12 @@ class AddJob extends React.Component {
         });
       } else {
         // Create New Job
-        maintenanceActions.createJob(job).then(res => {
+        maintenanceActions$1.createJob(job).then(res => {
           this.setState({
             success: true,
             updating: false
           });
-          this.props.jobsUpdate(this.props.auth.site);
+          // JobList fetches fresh data on mount — no action needed here
         }).catch(res => {
           this.setState({
             updating: false
@@ -4337,7 +4444,7 @@ class AddJob extends React.Component {
         if (___default["default"].isNil(answer) || ___default["default"].isEmpty(answer)) return true;
         switch (type) {
           case "email":
-            return Helper$2.isEmail(answer);
+            return Helper$1.isEmail(answer);
           case "date":
             return moment__default["default"](answer, "YYYY-MM-DD", true).isValid();
           case "time":
@@ -4358,7 +4465,7 @@ class AddJob extends React.Component {
     this.customImageInputs = {};
     this.customDocumentInputs = {};
     this.state = {
-      jobId: Helper$2.safeReadParams(this.props, "jobId") ? this.props.match.params.jobId : null,
+      jobId: Helper$1.safeReadParams(this.props, "jobId") ? this.props.match.params.jobId : null,
       job: null,
       showingSelector: false,
       updating: false,
@@ -4710,7 +4817,7 @@ class AddJob extends React.Component {
         return /*#__PURE__*/React__default["default"].createElement("p", {
           className: "visitorSignIn_text-staticText",
           key: fieldId
-        }, Helper$2.toParagraphed(field.label, {
+        }, Helper$1.toParagraphed(field.label, {
           marginTop: 10
         }));
       case "date":
@@ -4729,7 +4836,7 @@ class AddJob extends React.Component {
           alwaysShowLabel: true,
           readOnly: true,
           rightContent: !___default["default"].isEmpty(field.answer) && /*#__PURE__*/React__default["default"].createElement(Components$2.SVGIcon, {
-            colour: Colours$1.COLOUR_DUSK_LIGHT,
+            colour: Colours.COLOUR_DUSK_LIGHT,
             icon: "close",
             className: "timepicker_clear",
             onClick: () => this.onChangeDateAnswer(fieldId, undefined, false)
@@ -4762,7 +4869,7 @@ class AddJob extends React.Component {
             }
           }),
           rightContent: !___default["default"].isEmpty(field.answer) && /*#__PURE__*/React__default["default"].createElement(Components$2.SVGIcon, {
-            colour: Colours$1.COLOUR_DUSK_LIGHT,
+            colour: Colours.COLOUR_DUSK_LIGHT,
             icon: "close",
             className: "timepicker_clear",
             onClick: () => this.onChangeTimeAnswer(fieldId, undefined)
@@ -4965,11 +5072,10 @@ const mapStateToProps$2 = state => {
   return {
     auth,
     strings: state.strings && state.strings.config || {},
-    optionOnlyForResidents: Helper$2.getSiteSettingFromState(state, values.optionOnlyForResidents)
+    optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents)
   };
 };
 var AddJob$1 = reactRedux.connect(mapStateToProps$2, {
-  jobsUpdate,
   jobsLoaded,
   addRecentlyCreated: Actions.addRecentlyCreated
 })(reactRouter.withRouter(AddJob));
@@ -4977,7 +5083,7 @@ var AddJob$1 = reactRedux.connect(mapStateToProps$2, {
 const {
   Components: Components$1,
   Session: Session$1,
-  Helper: Helper$1
+  Helper
 } = PlussCore__namespace;
 const DEFAULT_FIELD = {
   type: 'text',
@@ -4991,7 +5097,7 @@ class AddJobType extends React.Component {
     super(props);
     _defineProperty__default["default"](this, "getJobType", async () => {
       try {
-        const res = await maintenanceActions.getJobType(this.props.auth.site, this.state.jobTypeId);
+        const res = await maintenanceActions$1.getJobType(this.props.auth.site, this.state.jobTypeId);
         const {
           typeName,
           email,
@@ -5020,7 +5126,7 @@ class AddJobType extends React.Component {
       const {
         jobTypeEmail
       } = this.state;
-      return !___default["default"].isEmpty(jobTypeEmail) && Helper$1.isEmail(jobTypeEmail);
+      return !___default["default"].isEmpty(jobTypeEmail) && Helper.isEmail(jobTypeEmail);
     });
     _defineProperty__default["default"](this, "isJobTypeValid", () => {
       const {
@@ -5163,9 +5269,9 @@ class AddJobType extends React.Component {
       }, async () => {
         try {
           if (jobTypeId) {
-            await maintenanceActions.editJobType(site, jobTypeId, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
+            await maintenanceActions$1.editJobType(site, jobTypeId, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
           } else {
-            await maintenanceActions.addJobType(site, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
+            await maintenanceActions$1.addJobType(site, jobTypeName, jobTypeEmail, jobTypeDescription, jobTypeLevel, hasCustomFields, customFields);
           }
           this.props.jobTypesUpdate(site);
           this.setState({
@@ -5222,7 +5328,7 @@ class AddJobType extends React.Component {
     }];
     this.state = {
       loading: false,
-      jobTypeId: Helper$1.safeReadParams(this.props, 'jobTypeId') ? this.props.match.params.jobTypeId : null,
+      jobTypeId: Helper.safeReadParams(this.props, 'jobTypeId') ? this.props.match.params.jobTypeId : null,
       jobTypeName: '',
       jobTypeEmail: '',
       jobTypeDescription: '',
@@ -5771,14 +5877,10 @@ var AddJobType$1 = reactRedux.connect(mapStateToProps$1, {
   jobTypesUpdate
 })(reactRouter.withRouter(AddJobType));
 
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 const {
   Analytics: Analytics$1,
   Session,
-  Components,
-  Helper,
-  Colours
+  Components
 } = PlussCore__namespace;
 const getInitialState = () => ({
   requests: 0,
@@ -5798,21 +5900,10 @@ const AnalyticsHub = _ref => {
     auth,
     prevText,
     dayCount,
-    strings,
-    userType,
-    userCategory,
-    selectedSites
+    strings
   } = _ref;
   const [analyticsData, setAnalyticsData] = React.useState(getInitialState());
   const [isExportOpen, setIsExportOpen] = React.useState(false);
-  const [failedSites, setFailedSites] = React.useState([]);
-  const [comparisonData, setComparisonData] = React.useState({
-    requests: [],
-    completedRequests: [],
-    comments: [],
-    isLoading: true
-  });
-  const comparisonMode = selectedSites && selectedSites.length > 1;
   const hasAccess = Session.validateAccess(auth.site, values.permissionMaintenanceTracking, auth);
   if (!hasAccess) {
     return null;
@@ -5824,130 +5915,50 @@ const AnalyticsHub = _ref => {
     return strings.sideNav[key];
   })();
   const exportColumns = [{
-    label: "Select All",
-    key: ""
-  }, ...(comparisonMode ? [{
-    label: "Site",
-    key: "site"
-  }] : []), {
-    label: "Start Date",
-    key: "startDate"
+    label: 'Select All',
+    key: ''
+  }, {
+    label: 'Start Date',
+    key: 'startDate'
   }, {
-    label: "End Date",
-    key: "endDate"
+    label: 'End Date',
+    key: 'endDate'
   }, {
     label: "".concat(values.textSingularName, "s"),
-    key: "requests"
+    key: 'requests'
   }, {
     label: "Completed ".concat(values.textSingularName, "s"),
-    key: "completedRequests"
+    key: 'completedRequests'
   }, {
-    label: "Comments",
-    key: "comments"
+    label: 'Comments',
+    key: 'comments'
   }];
   React.useEffect(() => {
     getData();
-  }, [startTime, endTime, userType, userCategory, selectedSites]);
+  }, [startTime, endTime]);
   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
-          });
-          return data;
-        });
-        const roles = auth.user.Roles;
-        const failed = Object.entries(multiSiteResultsObj).filter(_ref2 => {
-          let [, data] = _ref2;
-          return data === null;
-        }).map(_ref3 => {
-          let [site] = _ref3;
-          return Helper.getSiteNameFromRoles(site, roles);
-        });
-        setFailedSites(failed);
-        const multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref4 => {
-          let [, data] = _ref4;
-          return data !== null;
-        }).map(_ref5 => {
-          let [site, data] = _ref5;
-          return {
-            site,
-            data
-          };
-        });
-        const buildComparison = (activityKey, countType) => multiSiteResults.map(result => ({
-          name: Helper.getSiteNameFromRoles(result.site, roles),
-          value: Analytics$1.countActivities(result.data, activityKey, countType)
-        }));
-        setComparisonData({
-          requests: buildComparison("Request", "total"),
-          completedRequests: buildComparison("RequestCompleted", "unique"),
-          comments: buildComparison("Comment", "total"),
-          isLoading: false
-        });
-      } else {
-        setAnalyticsData(getInitialState());
-        const site = selectedSites && selectedSites.length === 1 ? selectedSites[0] : auth.site;
-        const timeDifference = endTime - startTime;
-        const [currentStatsResponse, prevStatsResponse] = await Promise.all([analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
-          userType,
-          userCategory
-        }), analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime - timeDifference, startTime, true, {
-          userType,
-          userCategory
-        })]);
-        const data = {
-          requests: Analytics$1.countActivities(currentStatsResponse.data, "Request", "total"),
-          prevRequests: Analytics$1.countActivities(prevStatsResponse.data, "Request", "total"),
-          completedRequests: Analytics$1.countActivities(currentStatsResponse.data, "RequestCompleted", "unique"),
-          prevCompletedRequests: Analytics$1.countActivities(prevStatsResponse.data, "RequestCompleted", "unique"),
-          comments: Analytics$1.countActivities(currentStatsResponse.data, "Comment", "total"),
-          prevComments: Analytics$1.countActivities(prevStatsResponse.data, "Comment", "total"),
-          isLoading: false
-        };
-        setAnalyticsData(data);
-      }
-    } catch (err) {
-      if (comparisonMode) {
-        setComparisonData(prev => _objectSpread$3(_objectSpread$3({}, prev), {}, {
-          isLoading: false
-        }));
-      } else {
-        setAnalyticsData(prev => _objectSpread$3(_objectSpread$3({}, prev), {}, {
-          isLoading: false
-        }));
-      }
-    }
+    setAnalyticsData(getInitialState());
+    // Load analytics data here using startTime and endTime
+    const timeDifference = endTime - startTime;
+    const [currentStatsResponse, prevStatsResponse] = await Promise.all([analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime, endTime, true), analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime - timeDifference, startTime, true)]);
+    const data = {
+      requests: Analytics$1.countActivities(currentStatsResponse.data, 'Request', 'total'),
+      prevRequests: Analytics$1.countActivities(prevStatsResponse.data, 'Request', 'total'),
+      completedRequests: Analytics$1.countActivities(currentStatsResponse.data, 'RequestCompleted', 'unique'),
+      prevCompletedRequests: Analytics$1.countActivities(prevStatsResponse.data, 'RequestCompleted', 'unique'),
+      comments: Analytics$1.countActivities(currentStatsResponse.data, 'Comment', 'total'),
+      prevComments: Analytics$1.countActivities(prevStatsResponse.data, 'Comment', 'total'),
+      isLoading: false
+    };
+    setAnalyticsData(data);
   };
   const isReadyToOpenCSV = () => {
-    return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
+    return !analyticsData.isLoading;
   };
   const getExportSource = () => {
-    if (comparisonMode) {
-      const sites = comparisonData.requests || [];
-      return sites.map((site, i) => ({
-        site: site.name,
-        startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
-        endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
-        requests: site.value,
-        completedRequests: comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value || 0,
-        comments: comparisonData.comments[i] && comparisonData.comments[i].value || 0
-      }));
-    }
     return [{
-      startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
-      endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
+      startDate: moment__default["default"](startTime + 1).format('D-MM-YYYY'),
+      endDate: moment__default["default"](endTime).format('D-MM-YYYY'),
       requests: analyticsData.requests,
       completedRequests: analyticsData.completedRequests,
       comments: analyticsData.comments
@@ -5958,14 +5969,13 @@ const AnalyticsHub = _ref => {
       return null;
     }
     const source = getExportSource();
-    const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, "-")).join("_");
     return /*#__PURE__*/React__default["default"].createElement(Components.ExportCsvPopup, {
       onClose: () => {
         setIsExportOpen(false);
       },
       columns: exportColumns,
       source: source,
-      filename: "".concat(values.analyticsKey, "analytics").concat(comparisonMode ? "_comparison" : "").concat(filterSuffix ? "_".concat(filterSuffix) : "", "_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
+      filename: "".concat(values.analyticsKey, "analytics_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
     });
   };
   return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -5982,69 +5992,33 @@ const AnalyticsHub = _ref => {
     },
     isActive: isReadyToOpenCSV(),
     leftIcon: "file-code-o"
-  }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
-    type: "help",
-    style: {
-      color: Colours.COLOUR_RED,
-      marginTop: 8
-    }
-  }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, "Export CSV")), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "analyticsSection dashboardSection_content"
-  }, (() => {
-    const chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");
-    if (comparisonMode) {
-      return /*#__PURE__*/React__default["default"].createElement("div", {
-        style: {
-          display: "flex",
-          flexDirection: "column",
-          gap: 16
-        }
-      }, /*#__PURE__*/React__default["default"].createElement(Components.ComparisonStatBox, {
-        title: "".concat(featureTitle, " Requests"),
-        data: comparisonData.requests,
-        prevText: prevText,
-        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
-        isLoading: comparisonData.isLoading
-      }), /*#__PURE__*/React__default["default"].createElement(Components.ComparisonStatBox, {
-        title: "Completed ".concat(featureTitle, " Requests"),
-        data: comparisonData.completedRequests,
-        prevText: prevText,
-        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount).concat(chartSuffix),
-        isLoading: comparisonData.isLoading
-      }), /*#__PURE__*/React__default["default"].createElement(Components.ComparisonStatBox, {
-        title: "".concat(featureTitle, " Comments"),
-        data: comparisonData.comments,
-        prevText: prevText,
-        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
-        isLoading: comparisonData.isLoading
-      }));
-    }
-    return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
-      title: "".concat(featureTitle, " Requests"),
-      icon: freeSolidSvgIcons.faWrench,
-      value: analyticsData.requests,
-      previousValue: analyticsData.prevRequests,
-      prevText: prevText,
-      viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
-      isLoading: analyticsData.isLoading
-    }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
-      title: "Completed ".concat(featureTitle, " Requests"),
-      icon: freeSolidSvgIcons.faCircleCheck,
-      value: analyticsData.completedRequests,
-      previousValue: analyticsData.prevCompletedRequests,
-      prevText: prevText,
-      viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount).concat(chartSuffix),
-      isLoading: analyticsData.isLoading
-    }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
-      title: "".concat(featureTitle, " Comments"),
-      icon: freeSolidSvgIcons.faComment,
-      value: analyticsData.comments,
-      previousValue: analyticsData.prevComments,
-      prevText: prevText,
-      viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
-      isLoading: analyticsData.isLoading
-    }));
-  })()));
+  }, /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
+    title: "".concat(featureTitle, " Requests"),
+    icon: freeSolidSvgIcons.faWrench,
+    value: analyticsData.requests,
+    previousValue: analyticsData.prevRequests,
+    prevText: prevText,
+    viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount),
+    isLoading: analyticsData.isLoading
+  }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
+    title: "Completed ".concat(featureTitle, " Requests"),
+    icon: freeSolidSvgIcons.faCircleCheck,
+    value: analyticsData.completedRequests,
+    previousValue: analyticsData.prevCompletedRequests,
+    prevText: prevText,
+    viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount),
+    isLoading: analyticsData.isLoading
+  }), /*#__PURE__*/React__default["default"].createElement(Components.StatBox, {
+    title: "".concat(featureTitle, " Comments"),
+    icon: freeSolidSvgIcons.faComment,
+    value: analyticsData.comments,
+    previousValue: analyticsData.prevComments,
+    prevText: prevText,
+    viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount),
+    isLoading: analyticsData.isLoading
+  })));
 };
 const mapStateToProps = state => {
   const {