@plusscommunities/pluss-maintenance-web-a 1.1.23 → 1.1.24

package/dist/index.cjs.js

@@ -75,6 +75,8 @@ var values = {
   actionJobsLoaded: 'JOBS_LOADEDA',
   actionJobsRemoved: 'JOBS_REMOVEDA',
   actionJobsTypesLoaded: 'JOBS_TYPES_LOADEDA',
+  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDA',
+  actionJobsHideSeen: 'JOBS_HIDE_UNSEENA',
   actionJobsLoading: 'JOBS_LOADINGA',
   permissionMaintenanceTracking: 'maintenanceTrackingA',
   permissionMaintenanceTypes: 'maintenanceTypesA',
@@ -118,7 +120,9 @@ var values = {
   optionKeyMoreSectionMaintenance: 'maintenanceRequestA',
   hiddenKeyMoreSectionMaintenance: 'maintenanceRequestA',
   forceCustomFields: false,
-  textEntityName: 'Job'
+  textEntityName: 'Job',
+  stringConfigJobStatus: 'maintenanceJobStatusA',
+  stringConfigHideSeen: 'maintenanceDisableSeenA'
 };
 
 // import * as PlussCore from '../../pluss-core/src';
@@ -233,19 +237,21 @@ var FeatureConfig = {
 };
 
 var JOBS_LOADED = values.actionJobsLoaded;
+var JOBS_LOADING = values.actionJobsLoading;
 var JOBS_REMOVED = values.actionJobsRemoved;
 var JOBS_TYPES_LOADED = values.actionJobsTypesLoaded;
-var JOBS_LOADING = values.actionJobsLoading;
+var JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
+var JOBS_HIDE_SEEN = values.actionJobsHideSeen;
 
-function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var Helper$5 = PlussCore__namespace.Helper,
-    Session$8 = PlussCore__namespace.Session;
+    Session$9 = PlussCore__namespace.Session;
 var maintenanceActions = {
   getJobType: function getJobType(site, typeId) {
     var url = Helper$5.getUrl(values.serviceKey, 'getjobtype');
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: url,
       data: {
@@ -256,7 +262,7 @@ var maintenanceActions = {
   },
   getJobTypes: function getJobTypes(site, id) {
     var url = Helper$5.getUrl(values.serviceKey, 'getjobtypes');
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: url,
       data: {
@@ -266,7 +272,7 @@ var maintenanceActions = {
   },
   getJob: function getJob(site, id) {
     var url = Helper$5.getUrl(values.serviceKey, 'getJob');
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: url,
       data: {
@@ -277,7 +283,7 @@ var maintenanceActions = {
   },
   getJobByJobId: function getJobByJobId(site, jobId) {
     var url = Helper$5.getUrl(values.serviceKey, 'getJob');
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: url,
       data: {
@@ -289,7 +295,7 @@ 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] : '';
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'getJobs'),
       data: {
@@ -316,7 +322,7 @@ var maintenanceActions = {
       query.lastKey = JSON.stringify(lastKey);
     }
 
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'GET',
       url: Helper$5.getUrl(values.serviceKey, 'get/requests', query)
     });
@@ -336,14 +342,14 @@ var maintenanceActions = {
     });
   },
   createJob: function createJob(job) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'sendMaintenance'),
-      data: _objectSpread$6({}, job)
+      data: _objectSpread$7({}, job)
     });
   },
   editJob: function editJob(job, site) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'editJob'),
       data: {
@@ -353,7 +359,7 @@ var maintenanceActions = {
     });
   },
   deleteJob: function deleteJob(site, id) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'requests/remove'),
       data: {
@@ -363,7 +369,7 @@ var maintenanceActions = {
     });
   },
   editJobStatus: function editJobStatus(id, status) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'editJobStatus'),
       data: {
@@ -372,8 +378,18 @@ var maintenanceActions = {
       }
     });
   },
+  editJobPriority: function editJobPriority(id, priority) {
+    return Session$9.authedFunction({
+      method: 'POST',
+      url: Helper$5.getUrl(values.serviceKey, 'update/priority'),
+      data: {
+        id: id,
+        priority: priority
+      }
+    });
+  },
   assignJob: function assignJob(jobId, userId) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'update/assign'),
       data: {
@@ -383,40 +399,42 @@ var maintenanceActions = {
     });
   },
   getAssignees: function getAssignees(site) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'GET',
       url: Helper$5.getUrl(values.serviceKey, 'get/assignees', {
         site: site
       })
     });
   },
-  addNote: function addNote(jobId, note, attachments) {
-    return Session$8.authedFunction({
+  addNote: function addNote(jobId, note, attachments, images) {
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         note: note,
         attachments: attachments,
+        images: images,
         action: 'AddNote'
       }
     });
   },
-  editNote: function editNote(jobId, noteId, note, attachments) {
-    return Session$8.authedFunction({
+  editNote: function editNote(jobId, noteId, note, attachments, images) {
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         note: note,
         attachments: attachments,
+        images: images,
         noteId: noteId,
         action: 'EditNote'
       }
     });
   },
   deleteNote: function deleteNote(jobId, noteId) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
       data: {
@@ -436,7 +454,7 @@ var maintenanceActions = {
       hasCustomFields: hasCustomFields,
       customFields: customFields || []
     };
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'createJobType'),
       data: data
@@ -454,14 +472,14 @@ var maintenanceActions = {
       customFields: customFields || []
     };
     if (hasCustomFields && customFields) data.customFields = customFields;
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'editJobType'),
       data: data
     });
   },
   deleteJobType: function deleteJobType(site, id) {
-    return Session$8.authedFunction({
+    return Session$9.authedFunction({
       method: 'POST',
       url: Helper$5.getUrl(values.serviceKey, 'deleteJobType'),
       data: {
@@ -473,7 +491,7 @@ var maintenanceActions = {
 };
 
 var Helper$4 = PlussCore__namespace.Helper,
-    Session$7 = PlussCore__namespace.Session;
+    Session$8 = PlussCore__namespace.Session;
 var reactionActions = {
   addComment: function addComment(entityId, entityType, entityName, site, comment, image, parentId) {
     var data = {
@@ -489,7 +507,7 @@ var reactionActions = {
       data.image = image;
     }
 
-    return Session$7.authedFunction({
+    return Session$8.authedFunction({
       method: 'POST',
       url: Helper$4.getUrl('reactions', 'comments/add'),
       data: data
@@ -514,7 +532,7 @@ var reactionActions = {
       query.minTime = minTime;
     }
 
-    return Session$7.authedFunction({
+    return Session$8.authedFunction({
       method: 'GET',
       url: Helper$4.getUrl('reactions', 'comments/get', query)
     });
@@ -524,6 +542,28 @@ var reactionActions = {
 var Apis$1 = PlussCore__namespace.Apis;
 var analyticsActions = Apis$1.analyticsActions;
 var userActions = Apis$1.userActions;
+var stringActions = Apis$1.stringActions;
+
+var jobStatusOptions = [
+	{
+		text: "Open",
+		order: 0,
+		color: "#d5dde4",
+		category: "Not Actioned"
+	},
+	{
+		text: "In Progress",
+		order: 1,
+		color: "#82d6e5",
+		category: "In Progress"
+	},
+	{
+		text: "Completed",
+		order: 2,
+		color: "#58dba4",
+		category: "Completed"
+	}
+];
 
 var Helper$3 = PlussCore__namespace.Helper;
 var jobsUpdate = function jobsUpdate(site, isdashboard) {
@@ -575,6 +615,54 @@ var jobTypesLoaded = function jobTypesLoaded(events) {
     type: JOBS_TYPES_LOADED,
     payload: events
   };
+};
+var jobStatusesUpdate = function jobStatusesUpdate(site) {
+  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  return function (dispatch) {
+    stringActions.getString(site, values.stringConfigJobStatus).then(function (res) {
+      dispatch({
+        type: JOBS_STATUSES_LOADED,
+        payload: res.data
+      });
+      if (callback) callback(res.data);
+    }).catch(function (_error) {
+      dispatch({
+        type: JOBS_STATUSES_LOADED,
+        payload: jobStatusOptions
+      });
+      if (callback) callback(jobStatusOptions);
+    });
+  };
+};
+var jobStatusesLoaded = function 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;
+  return function (dispatch) {
+    stringActions.getString(site, values.stringConfigHideSeen).then(function (res) {
+      dispatch({
+        type: JOBS_HIDE_SEEN,
+        payload: res.data
+      });
+      if (callback) callback(res.data);
+    }).catch(function (_error) {
+      dispatch({
+        type: JOBS_HIDE_SEEN,
+        payload: false
+      });
+      if (callback) callback(false);
+    });
+  };
+};
+var jobHideSeenLoaded = function jobHideSeenLoaded(hide) {
+  return {
+    type: JOBS_HIDE_SEEN,
+    payload: hide
+  };
 }; // export const removeJobType = (id) => {
 //   return {
 //     type: JOBS_TYPES_REMOVED,
@@ -605,41 +693,56 @@ var jobTypesLoaded = function jobTypesLoaded(events) {
 //   };
 // };
 
-var Unassigned = {
-	text: "Open",
-	order: 0,
-	color: "#d5dde4"
-};
-var Completed = {
-	text: "Completed",
-	order: 2,
-	color: "#58dba4"
+var jobPriorityOptions = [
+	{
+		name: "Low",
+		color: "green",
+		"default": true
+	},
+	{
+		name: "Medium",
+		color: "orange"
+	},
+	{
+		name: "High",
+		color: "red"
+	}
+];
+
+var STATUS_IMCOMPLETE = 'All Incomplete';
+var STATUS_NOT_ACTIONED = 'Not Actioned';
+var STATUS_IN_PROGRESS = 'In Progress';
+var STATUS_COMPLETED = 'Completed';
+
+var getDefaultPriority = function getDefaultPriority() {
+  return jobPriorityOptions.find(function (p) {
+    return p.default;
+  });
 };
-var StatusTypes = {
-	Unassigned: Unassigned,
-	"In Progress": {
-	text: "In Progress",
-	order: 1,
-	color: "#82d6e5"
-},
-	Completed: Completed
+
+var getJobPriority = function getJobPriority(priority) {
+  var priorityOption = null;
+  if (priority) priorityOption = jobPriorityOptions.find(function (p) {
+    return p.name === priority;
+  });
+  return priorityOption || getDefaultPriority();
 };
 
-function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _createSuper$b(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$b(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+function _createSuper$c(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$c(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-function _isNativeReflectConstruct$b() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var Session$6 = PlussCore__namespace.Session,
-    Components$6 = PlussCore__namespace.Components,
+function _isNativeReflectConstruct$c() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var Session$7 = PlussCore__namespace.Session,
+    Components$7 = PlussCore__namespace.Components,
     Analytics$2 = PlussCore__namespace.Analytics;
 
 var JobList = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](JobList, _Component);
 
-  var _super = _createSuper$b(JobList);
+  var _super = _createSuper$c(JobList);
 
   function JobList(props) {
     var _this;
@@ -648,6 +751,20 @@ var JobList = /*#__PURE__*/function (_Component) {
 
     _this = _super.call(this, props);
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "setRequesters", function (jobs) {
+      var requesters = ___default['default'].orderBy(___default['default'].uniqBy(jobs.map(function (j) {
+        return {
+          id: j.userID,
+          displayName: j.userName,
+          profilePic: j.userProfilePic
+        };
+      }), 'id'), 'displayName', 'asc');
+
+      _this.setState({
+        requesters: requesters
+      });
+    });
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getJobs", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
       var auth, res;
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
@@ -663,6 +780,8 @@ var JobList = /*#__PURE__*/function (_Component) {
               res = _context.sent;
 
               if (!___default['default'].isEmpty(res) && res[0].site === auth.site) {
+                _this.setRequesters(res);
+
                 _this.props.jobsLoaded(res);
               }
 
@@ -794,6 +913,14 @@ var JobList = /*#__PURE__*/function (_Component) {
       _this.closeFilter();
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectPriorityFilter", function (filter) {
+      _this.setState({
+        selectedPriorityFilter: filter
+      });
+
+      _this.closeFilter();
+    });
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectStatusFilter", function (filter) {
       _this.setState({
         selectedStatusFilter: filter
@@ -898,6 +1025,33 @@ var JobList = /*#__PURE__*/function (_Component) {
       _this.closeFilter();
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSelectRequester", function (user) {
+      _this.setState({
+        selectedRequester: user
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "removeRequesterFilter", function () {
+      _this.setState({
+        selectedRequesterFilter: null,
+        selectedRequesterFilterText: null
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "saveRequesterFilter", function () {
+      if (!_this.state.selectedRequester) {
+        _this.removeRequesterFilter();
+      } else {
+        _this.setState({
+          selectedRequesterFilter: _this.state.selectedRequester.id,
+          selectedRequesterFilterText: _this.state.selectedRequester.displayName,
+          selectedRequester: null
+        });
+      }
+
+      _this.closeFilter();
+    });
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleSearchChange", function (event) {
       var thisSearchTime = moment__default['default']().valueOf();
 
@@ -930,18 +1084,32 @@ var JobList = /*#__PURE__*/function (_Component) {
         source = ___default['default'].filter(source, function (r) {
           return r.type === _this.state.selectedTypeFilter;
         });
+      } // filter by priority
+
+
+      if (_this.state.selectedPriorityFilter) {
+        var defaultPriority = getDefaultPriority().name;
+        source = ___default['default'].filter(source, function (r) {
+          return r.priority === _this.state.selectedPriorityFilter || _this.state.selectedPriorityFilter === defaultPriority && ___default['default'].isNil(r.priority);
+        });
       } // filter by status
 
 
       if (_this.state.selectedStatusFilter) {
+        var statusTypes = _this.props.statusTypes;
+        var defaultStatus = statusTypes.find(function (s) {
+          return s.category === STATUS_NOT_ACTIONED;
+        });
         source = ___default['default'].filter(source, function (r) {
-          var status = r.status && StatusTypes[r.status] ? r.status : 'Unassigned';
+          var status = statusTypes.find(function (s) {
+            return s.text === r.status;
+          }) || defaultStatus;
 
-          if (_this.state.selectedStatusFilter === 'incomplete') {
-            return status !== 'Completed';
+          if (_this.state.selectedStatusFilter === STATUS_IMCOMPLETE) {
+            return status.category !== STATUS_COMPLETED;
           }
 
-          return status === _this.state.selectedStatusFilter;
+          return status.text === _this.state.selectedStatusFilter;
         });
       }
 
@@ -951,6 +1119,12 @@ var JobList = /*#__PURE__*/function (_Component) {
         });
       }
 
+      if (_this.state.selectedRequesterFilter) {
+        source = ___default['default'].filter(source, function (r) {
+          return r.userID === _this.state.selectedRequesterFilter;
+        });
+      }
+
       if (!___default['default'].isEmpty(_this.state.searchTerm)) {
         source = ___default['default'].filter(source, function (r) {
           if (r.jobId && r.jobId === _this.state.searchTerm) {
@@ -1032,6 +1206,7 @@ var JobList = /*#__PURE__*/function (_Component) {
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getExportSource", function () {
       var customColumns = [];
+      var defaultPriority = getDefaultPriority().name;
 
       var source = _this.getSource().map(function (r) {
         var history = r.history || [];
@@ -1078,12 +1253,14 @@ var JobList = /*#__PURE__*/function (_Component) {
 
         var customFieldValues = _this.getCustomFields(r, customColumns);
 
-        return _objectSpread$5(_objectSpread$5(_objectSpread$5({}, r), customFieldValues), {}, {
+        var priority = r.priority || defaultPriority;
+        return _objectSpread$6(_objectSpread$6(_objectSpread$6({}, r), customFieldValues), {}, {
           notes: notes,
           progressTime: progressTime,
           completedTime: completedTime,
           progressDuration: progressDuration,
-          completedDuration: completedDuration
+          completedDuration: completedDuration,
+          priority: priority
         });
       }); // Compose revised columns list with custom fields
 
@@ -1122,7 +1299,8 @@ var JobList = /*#__PURE__*/function (_Component) {
       sortColumn: 'createdUnix',
       sortDesc: true,
       selectedTimeFilter: Analytics$2.getAnalyticsFilterOptions()[1],
-      assignees: []
+      assignees: [],
+      requesters: []
     };
     _this.exportColumns = [{
       label: 'Select All',
@@ -1139,6 +1317,9 @@ var JobList = /*#__PURE__*/function (_Component) {
     }, {
       label: 'Status',
       key: 'status'
+    }, {
+      label: 'Priority',
+      key: 'priority'
     }, {
       label: 'Title',
       key: 'title'
@@ -1179,11 +1360,12 @@ var JobList = /*#__PURE__*/function (_Component) {
   _createClass__default['default'](JobList, [{
     key: "UNSAFE_componentWillMount",
     value: function UNSAFE_componentWillMount() {
-      Session$6.checkLoggedIn(this);
+      Session$7.checkLoggedIn(this);
     }
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
+      this.props.jobStatusesUpdate(this.props.auth.site);
       this.getJobs();
       this.getAssignees();
     }
@@ -1197,7 +1379,7 @@ var JobList = /*#__PURE__*/function (_Component) {
       }
 
       if (this.state.filterOpen === 'type') {
-        return /*#__PURE__*/React__default['default'].createElement(Components$6.Popup, {
+        return /*#__PURE__*/React__default['default'].createElement(Components$7.Popup, {
           title: "Select ".concat(values.textJobType),
           maxWidth: 600,
           minWidth: 400,
@@ -1208,7 +1390,7 @@ var JobList = /*#__PURE__*/function (_Component) {
         })), function (t) {
           return t.toLowerCase();
         }).map(function (type) {
-          return /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+          return /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
             key: type,
             onClick: function onClick() {
               _this2.selectTypeFilter(type);
@@ -1219,28 +1401,49 @@ var JobList = /*#__PURE__*/function (_Component) {
         }));
       }
 
+      if (this.state.filterOpen === 'priority') {
+        return /*#__PURE__*/React__default['default'].createElement(Components$7.Popup, {
+          title: "Select Priority",
+          maxWidth: 600,
+          minWidth: 400,
+          hasPadding: true,
+          onClose: this.closeFilter
+        }, jobPriorityOptions.map(function (p) {
+          return /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
+            key: p.name,
+            onClick: function onClick() {
+              _this2.selectPriorityFilter(p.name);
+            },
+            text: p.name,
+            className: "marginRight-10"
+          });
+        }));
+      }
+
       if (this.state.filterOpen === 'status') {
-        return /*#__PURE__*/React__default['default'].createElement(Components$6.Popup, {
+        var statusTypes = this.props.statusTypes;
+        return /*#__PURE__*/React__default['default'].createElement(Components$7.Popup, {
           title: "Select Status",
           maxWidth: 600,
           minWidth: 400,
           hasPadding: true,
           onClose: this.closeFilter
-        }, ['incomplete'].concat(_toConsumableArray__default['default'](Object.keys(StatusTypes))).map(function (sKey) {
-          var text = sKey === 'incomplete' ? 'All Incomplete' : StatusTypes[sKey].text;
-          return /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
-            key: sKey,
+        }, [STATUS_IMCOMPLETE].concat(_toConsumableArray__default['default'](statusTypes.map(function (s) {
+          return s.text;
+        }))).map(function (status) {
+          return /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
+            key: status,
             onClick: function onClick() {
-              _this2.selectStatusFilter(sKey);
+              _this2.selectStatusFilter(status);
             },
-            text: text,
-            className: "marginRight-10"
+            text: status,
+            className: "marginRight-10 marginBottom-10"
           });
         }));
       }
 
       if (this.state.filterOpen === 'time') {
-        return /*#__PURE__*/React__default['default'].createElement(Components$6.Popup, {
+        return /*#__PURE__*/React__default['default'].createElement(Components$7.Popup, {
           title: "Select Time",
           maxWidth: 600,
           minWidth: 400,
@@ -1256,7 +1459,7 @@ var JobList = /*#__PURE__*/function (_Component) {
           style: {
             minHeight: 150
           }
-        }, /*#__PURE__*/React__default['default'].createElement(Components$6.AnalyticsFilter, {
+        }, /*#__PURE__*/React__default['default'].createElement(Components$7.AnalyticsFilter, {
           defaultFilter: this.state.selectedTimeFilter,
           filterChanged: this.timeFilterChanged,
           filterDateRangeChanged: this.timeFilterDateRangeChanged
@@ -1267,10 +1470,10 @@ var JobList = /*#__PURE__*/function (_Component) {
         var userContent = null;
 
         if (this.state.selectedAssignee) {
-          userContent = /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Components$6.UserListing, {
+          userContent = /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Components$7.UserListing, {
             key: this.state.selectedAssignee.id,
             user: this.state.selectedAssignee,
-            rightContent: /*#__PURE__*/React__default['default'].createElement(Components$6.SVGIcon, {
+            rightContent: /*#__PURE__*/React__default['default'].createElement(Components$7.SVGIcon, {
               className: "removeIcon",
               icon: "close",
               onClick: function onClick() {
@@ -1280,7 +1483,7 @@ var JobList = /*#__PURE__*/function (_Component) {
             })
           }));
         } else {
-          userContent = /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Components$6.GenericInput, {
+          userContent = /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Components$7.GenericInput, {
             id: "userSearch",
             type: "text" // label="Search"
             ,
@@ -1296,7 +1499,7 @@ var JobList = /*#__PURE__*/function (_Component) {
             if (___default['default'].isEmpty(_this2.state.userSearch)) return true;
             return u.displayName.toUpperCase().indexOf(_this2.state.userSearch.toUpperCase()) > -1;
           }).map(function (user) {
-            return /*#__PURE__*/React__default['default'].createElement(Components$6.UserListing, {
+            return /*#__PURE__*/React__default['default'].createElement(Components$7.UserListing, {
               key: user.id,
               user: user,
               onClick: function onClick() {
@@ -1306,7 +1509,7 @@ var JobList = /*#__PURE__*/function (_Component) {
           }));
         }
 
-        return /*#__PURE__*/React__default['default'].createElement(Components$6.Popup, {
+        return /*#__PURE__*/React__default['default'].createElement(Components$7.Popup, {
           title: "Select User",
           maxWidth: 600,
           minWidth: 400,
@@ -1321,6 +1524,64 @@ var JobList = /*#__PURE__*/function (_Component) {
         }, userContent);
       }
 
+      if (this.state.filterOpen === 'requester') {
+        var _userContent = null;
+
+        if (this.state.selectedRequester) {
+          _userContent = /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Components$7.UserListing, {
+            key: this.state.selectedRequester.id,
+            user: this.state.selectedRequester,
+            rightContent: /*#__PURE__*/React__default['default'].createElement(Components$7.SVGIcon, {
+              className: "removeIcon",
+              icon: "close",
+              onClick: function onClick() {
+                _this2.onSelectRequester();
+              },
+              colour: PlussCore.Colours.COLOUR_DUSK
+            })
+          }));
+        } else {
+          _userContent = /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Components$7.GenericInput, {
+            id: "requesterSearch",
+            type: "text" // label="Search"
+            ,
+            placeholder: "Search name",
+            value: this.state.requesterSearch,
+            onChange: function onChange(e) {
+              return _this2.onHandleChange(e);
+            },
+            alwaysShowLabel: true
+          }), ___default['default'].sortBy(this.state.requesters, function (u) {
+            return u.displayName.toUpperCase();
+          }).filter(function (u) {
+            if (___default['default'].isEmpty(_this2.state.requesterSearch)) return true;
+            return u.displayName.toUpperCase().indexOf(_this2.state.requesterSearch.toUpperCase()) > -1;
+          }).map(function (user) {
+            return /*#__PURE__*/React__default['default'].createElement(Components$7.UserListing, {
+              key: user.id,
+              user: user,
+              onClick: function onClick() {
+                _this2.onSelectRequester(user);
+              }
+            });
+          }));
+        }
+
+        return /*#__PURE__*/React__default['default'].createElement(Components$7.Popup, {
+          title: "Select User",
+          maxWidth: 600,
+          minWidth: 400,
+          hasPadding: true,
+          onClose: this.closeFilter,
+          buttons: [{
+            type: 'primaryAction',
+            onClick: this.saveRequesterFilter,
+            text: 'Select',
+            isActive: true
+          }]
+        }, _userContent);
+      }
+
       return null;
     }
   }, {
@@ -1328,19 +1589,33 @@ var JobList = /*#__PURE__*/function (_Component) {
     value: function renderRequests() {
       var _this3 = this;
 
+      var statusTypes = this.props.statusTypes;
+      var defaultStatus = statusTypes.find(function (s) {
+        return s.category === STATUS_NOT_ACTIONED;
+      });
       return this.getSource().map(function (ev, index) {
         if (!ev) {
           return null;
         }
 
-        var status = ev.status && StatusTypes[ev.status] ? StatusTypes[ev.status] : StatusTypes['Unassigned'];
+        var status = ev.status && statusTypes.find(function (s) {
+          return s.text === ev.status;
+        }) || defaultStatus;
+        var priority = getJobPriority(ev.priority);
         return /*#__PURE__*/React__default['default'].createElement("tr", {
           key: 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, {
           to: "".concat(values.routeRequestDetails, "/").concat(ev.id)
-        }, /*#__PURE__*/React__default['default'].createElement("span", null, ev.title))), /*#__PURE__*/React__default['default'].createElement("td", null, ev.type), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'].utc(ev.createdTime).local().format('D MMM YY')), /*#__PURE__*/React__default['default'].createElement("td", null, ev.room), /*#__PURE__*/React__default['default'].createElement("td", null, ev.Assignee ? /*#__PURE__*/React__default['default'].createElement(Components$6.UserListing, {
+        }, /*#__PURE__*/React__default['default'].createElement("span", null, ev.title))), /*#__PURE__*/React__default['default'].createElement("td", null, ev.type), /*#__PURE__*/React__default['default'].createElement("td", null, moment__default['default'].utc(ev.createdTime).local().format('D MMM YY')), /*#__PURE__*/React__default['default'].createElement("td", null, ev.room), /*#__PURE__*/React__default['default'].createElement("td", null, ev.userName ? /*#__PURE__*/React__default['default'].createElement(Components$7.UserListing, {
+          user: {
+            id: ev.userID,
+            displayName: ev.userName,
+            profilePic: ev.userProfilePic
+          },
+          textClass: "fontSize-13"
+        }) : 'Unknown'), /*#__PURE__*/React__default['default'].createElement("td", null, ev.Assignee ? /*#__PURE__*/React__default['default'].createElement(Components$7.UserListing, {
           user: ev.Assignee,
           textClass: "fontSize-13"
         }) : 'Unassigned'), /*#__PURE__*/React__default['default'].createElement("td", null, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -1351,9 +1626,19 @@ var JobList = /*#__PURE__*/function (_Component) {
             paddingTop: 2,
             paddingBottom: 2,
             color: '#fff',
-            backgroundColor: status.color
+            backgroundColor: status ? status.color : undefined
           }
-        }, status.text)), /*#__PURE__*/React__default['default'].createElement("td", {
+        }, status ? status.text : '')), /*#__PURE__*/React__default['default'].createElement("td", null, /*#__PURE__*/React__default['default'].createElement("div", {
+          style: {
+            textAlign: 'center',
+            borderRadius: 4,
+            width: 100,
+            paddingTop: 2,
+            paddingBottom: 2,
+            color: '#fff',
+            backgroundColor: priority.color
+          }
+        }, priority.name)), /*#__PURE__*/React__default['default'].createElement("td", {
           className: "table-options"
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           style: {
@@ -1369,7 +1654,7 @@ var JobList = /*#__PURE__*/function (_Component) {
             cursor: 'pointer'
           },
           name: "pencil"
-        })), Session$6.validateAccess(_this3.props.auth.site, values.permissionMaintenanceTracking, _this3.props.auth) && /*#__PURE__*/React__default['default'].createElement("a", {
+        })), Session$7.validateAccess(_this3.props.auth.site, values.permissionMaintenanceTracking, _this3.props.auth) && /*#__PURE__*/React__default['default'].createElement("a", {
           onClick: function onClick() {
             return _this3.onRemoveRequest(ev);
           }
@@ -1497,6 +1782,15 @@ var JobList = /*#__PURE__*/function (_Component) {
           _this4.sortByCol('room');
         }
       }, "Address", this.renderSort('room')), /*#__PURE__*/React__default['default'].createElement("th", {
+        className: "".concat(this.sortIsActive('userName')),
+        style: {
+          cursor: 'pointer',
+          width: 150
+        },
+        onClick: function onClick() {
+          _this4.sortByCol('userName');
+        }
+      }, "Submitted By", this.renderSort('userName')), /*#__PURE__*/React__default['default'].createElement("th", {
         className: "".concat(this.sortIsActive('assigned')),
         style: {
           cursor: 'pointer',
@@ -1510,6 +1804,10 @@ var JobList = /*#__PURE__*/function (_Component) {
           width: 120
         }
       }, "Status"), /*#__PURE__*/React__default['default'].createElement("th", {
+        style: {
+          width: 120
+        }
+      }, "Priority"), /*#__PURE__*/React__default['default'].createElement("th", {
         style: {
           width: 50
         }
@@ -1520,37 +1818,51 @@ var JobList = /*#__PURE__*/function (_Component) {
     value: function renderFilters() {
       var _this5 = this;
 
-      var typeFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+      var typeFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: function onClick() {
           _this5.openFilter('type');
         },
         text: values.textJobType
       });
-      var statusFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+      var statusFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: function onClick() {
           _this5.openFilter('status');
         },
         text: "Status"
       });
-      var timeFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+      var priorityFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
+        className: "marginRight-10",
+        onClick: function onClick() {
+          _this5.openFilter('priority');
+        },
+        text: "Priority"
+      });
+      var timeFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: function onClick() {
           _this5.openFilter('time');
         },
         text: "Time"
       });
-      var userFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+      var userFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
         className: "marginRight-10",
         onClick: function onClick() {
           _this5.openFilter('user');
         },
         text: "Assigned To"
       });
+      var requesterFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
+        className: "marginRight-10",
+        onClick: function onClick() {
+          _this5.openFilter('requester');
+        },
+        text: "Submitted By"
+      });
 
       if (this.state.selectedTypeFilter) {
-        typeFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+        typeFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
           className: "marginRight-10",
           onClick: function onClick() {
             _this5.openFilter('type');
@@ -1565,8 +1877,24 @@ var JobList = /*#__PURE__*/function (_Component) {
         });
       }
 
+      if (this.state.selectedPriorityFilter) {
+        priorityFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
+          className: "marginRight-10",
+          onClick: function onClick() {
+            _this5.openFilter('priority');
+          },
+          rightIcon: "close",
+          rightClick: function rightClick(e) {
+            e.stopPropagation();
+
+            _this5.selectPriorityFilter();
+          },
+          text: this.state.selectedPriorityFilter
+        });
+      }
+
       if (this.state.selectedStatusFilter) {
-        statusFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+        statusFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
           className: "marginRight-10",
           onClick: function onClick() {
             _this5.openFilter('status');
@@ -1577,12 +1905,12 @@ var JobList = /*#__PURE__*/function (_Component) {
 
             _this5.selectStatusFilter();
           },
-          text: this.state.selectedStatusFilter === 'incomplete' ? 'All Incomplete' : StatusTypes[this.state.selectedStatusFilter].text
+          text: this.state.selectedStatusFilter
         });
       }
 
       if (this.state.selectedTimeFilterText) {
-        timeFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+        timeFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
           className: "marginRight-10",
           onClick: function onClick() {
             _this5.openFilter('time');
@@ -1598,7 +1926,7 @@ var JobList = /*#__PURE__*/function (_Component) {
       }
 
       if (this.state.selectedUserFilter) {
-        userFilter = /*#__PURE__*/React__default['default'].createElement(Components$6.Tag, {
+        userFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
           className: "marginRight-10",
           onClick: function onClick() {
             _this5.openFilter('user');
@@ -1613,20 +1941,36 @@ var JobList = /*#__PURE__*/function (_Component) {
         });
       }
 
+      if (this.state.selectedRequesterFilter) {
+        requesterFilter = /*#__PURE__*/React__default['default'].createElement(Components$7.Tag, {
+          className: "marginRight-10",
+          onClick: function onClick() {
+            _this5.openFilter('requester');
+          },
+          rightIcon: "close",
+          rightClick: function rightClick(e) {
+            e.stopPropagation();
+
+            _this5.removeRequesterFilter();
+          },
+          text: this.state.selectedRequesterFilterText
+        });
+      }
+
       return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "marginTop-20 flex flex-between flex-center"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "flex flex-center"
-      }, /*#__PURE__*/React__default['default'].createElement(Components$6.Text, {
+      }, /*#__PURE__*/React__default['default'].createElement(Components$7.Text, {
         type: "h5",
         className: "marginRight-20"
-      }, "Filter by"), typeFilter, statusFilter, timeFilter, userFilter), /*#__PURE__*/React__default['default'].createElement(Components$6.Button, {
+      }, "Filter by"), typeFilter, statusFilter, priorityFilter, timeFilter, userFilter, requesterFilter), /*#__PURE__*/React__default['default'].createElement(Components$7.Button, {
         inline: true,
         buttonType: "primaryAction",
         leftIcon: "file-code-o",
         onClick: this.onOpenExportCsv,
         isActive: !___default['default'].isEmpty(this.getSource())
-      }, "Export CSV")), /*#__PURE__*/React__default['default'].createElement(Components$6.GenericInput, {
+      }, "Export CSV")), /*#__PURE__*/React__default['default'].createElement(Components$7.GenericInput, {
         id: "search",
         type: "text",
         placeholder: "Search by ".concat(values.textEntityName, " ID, Address or Title"),
@@ -1651,7 +1995,7 @@ var JobList = /*#__PURE__*/function (_Component) {
           columns = _this$getExportSource.columns,
           source = _this$getExportSource.source;
 
-      return /*#__PURE__*/React__default['default'].createElement(Components$6.ExportCsvPopup, {
+      return /*#__PURE__*/React__default['default'].createElement(Components$7.ExportCsvPopup, {
         onClose: this.onCloseExportCsv,
         columns: columns,
         source: source,
@@ -1672,30 +2016,32 @@ var JobList = /*#__PURE__*/function (_Component) {
   return JobList;
 }(React.Component);
 
-var mapStateToProps$6 = function mapStateToProps(state) {
+var mapStateToProps$7 = function mapStateToProps(state) {
   var auth = state.auth;
   return {
     jobs: state[values.reducerKey].jobs,
     auth: auth,
-    strings: state.strings && state.strings.config || {}
+    strings: state.strings && state.strings.config || {},
+    statusTypes: state[values.reducerKey].jobstatuses
   };
 };
 
-var JobList$1 = reactRedux.connect(mapStateToProps$6, {
+var JobList$1 = reactRedux.connect(mapStateToProps$7, {
   jobsLoaded: jobsLoaded,
-  removeJob: removeJob
+  removeJob: removeJob,
+  jobStatusesUpdate: jobStatusesUpdate
 })(reactRouter.withRouter(JobList));
 
-function _createSuper$a(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$a(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+function _createSuper$b(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$b(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-function _isNativeReflectConstruct$a() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-var Session$5 = PlussCore__namespace.Session,
-    Components$5 = PlussCore__namespace.Components;
+function _isNativeReflectConstruct$b() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var Session$6 = PlussCore__namespace.Session,
+    Components$6 = PlussCore__namespace.Components;
 
 var JobTypes = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](JobTypes, _Component);
 
-  var _super = _createSuper$a(JobTypes);
+  var _super = _createSuper$b(JobTypes);
 
   function JobTypes(props) {
     var _this;
@@ -1821,7 +2167,7 @@ var JobTypes = /*#__PURE__*/function (_Component) {
     key: "componentWillMount",
     value: function componentWillMount() {
       this.updateProps(this.props);
-      Session$5.checkLoggedIn(this, this.props.auth);
+      Session$6.checkLoggedIn(this, this.props.auth);
     }
   }, {
     key: "componentDidMount",
@@ -1868,7 +2214,7 @@ var JobTypes = /*#__PURE__*/function (_Component) {
               display: 'flex',
               alignItems: 'center'
             }
-          }, Session$5.validateAccess(_this2.props.auth.site, values.permissionMaintenanceTypes, _this2.props.auth) && /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
+          }, Session$6.validateAccess(_this2.props.auth.site, values.permissionMaintenanceTypes, _this2.props.auth) && /*#__PURE__*/React__default['default'].createElement(reactRouterDom.Link, {
             to: "".concat(values.routeAddRequestType, "/").concat(ev.id)
           }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
             style: {
@@ -1878,7 +2224,7 @@ var JobTypes = /*#__PURE__*/function (_Component) {
               cursor: 'pointer'
             },
             name: "pencil"
-          })), Session$5.validateAccess(_this2.props.auth.site, values.permissionMaintenanceTypes, _this2.props.auth) && /*#__PURE__*/React__default['default'].createElement("a", {
+          })), Session$6.validateAccess(_this2.props.auth.site, values.permissionMaintenanceTypes, _this2.props.auth) && /*#__PURE__*/React__default['default'].createElement("a", {
             onClick: function onClick() {
               return _this2.onRemoveJobType(ev);
             }
@@ -1965,50 +2311,581 @@ var JobTypes = /*#__PURE__*/function (_Component) {
           maxWidth: 500,
           textAlign: 'center'
         }
-      }, values.textEmptyJobTypesExample));
+      }, values.textEmptyJobTypesExample));
+    }
+  }, {
+    key: "renderContent",
+    value: function renderContent() {
+      if (___default['default'].isEmpty(this.state.jobList)) return this.renderEmpty();
+      return this.renderView();
+    }
+  }, {
+    key: "renderJobTypes",
+    value: function renderJobTypes() {
+      var _this$state = this.state,
+          jobList = _this$state.jobList,
+          loading = _this$state.loading;
+
+      if (jobList.length === 0 && loading) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          style: {
+            minWidth: '100%'
+          }
+        }, /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "padding-60 paddingVertical-40",
+          style: {
+            textAlign: 'center'
+          }
+        }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          style: {
+            fontSize: 30,
+            color: FeatureConfig.env.colourBrandingOff
+          },
+          name: "spinner fa-pulse fa-fw"
+        })));
+      }
+
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        style: {
+          minWidth: '100%'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "marginBottom-32"
+      }, /*#__PURE__*/React__default['default'].createElement(Components$6.AddButton, {
+        onClick: this.props.onNew,
+        text: values.textNewTypeButton
+      })), this.renderContent());
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        style: {
+          minWidth: '100%'
+        }
+      }, /*#__PURE__*/React__default['default'].createElement("div", null, this.renderJobTypes()), /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "hub_tidioPadding"
+      }));
+    }
+  }]);
+
+  return JobTypes;
+}(React.Component);
+
+var mapStateToProps$6 = function mapStateToProps(state) {
+  var auth = state.auth;
+  return {
+    jobtypes: state[values.reducerKey].jobtypes,
+    auth: auth
+  };
+};
+
+var JobTypes$1 = reactRedux.connect(mapStateToProps$6, {
+  jobTypesLoaded: jobTypesLoaded,
+  jobTypesUpdate: jobTypesUpdate
+})(reactRouter.withRouter(JobTypes));
+
+function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _createSuper$a(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$a(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+
+function _isNativeReflectConstruct$a() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var Session$5 = PlussCore__namespace.Session,
+    Components$5 = PlussCore__namespace.Components,
+    Colours$2 = PlussCore__namespace.Colours;
+
+var Configuration = /*#__PURE__*/function (_Component) {
+  _inherits__default['default'](Configuration, _Component);
+
+  var _super = _createSuper$a(Configuration);
+
+  function Configuration(props) {
+    var _this;
+
+    _classCallCheck__default['default'](this, Configuration);
+
+    _this = _super.call(this, props);
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "isStatusValid", function (statusLabel, statusCategory, statusColour) {
+      if (___default['default'].isEmpty(statusLabel)) return false;
+      if (___default['default'].isEmpty(statusCategory)) return false;
+      if (___default['default'].isEmpty(statusColour)) return false;
+      return true;
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onMoveStatus", function (index) {
+      var up = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      if (_this.state.fetchingStatusTypes) return;
+
+      var statusTypes = ___default['default'].cloneDeep(_this.state.statusTypes);
+
+      if (up && index > 0) {
+        // Moving up
+        var _ref = [statusTypes[index], statusTypes[index - 1]];
+        statusTypes[index - 1] = _ref[0];
+        statusTypes[index] = _ref[1];
+      } else if (index < statusTypes.length - 1) {
+        // Moving down
+        var _ref2 = [statusTypes[index + 1], statusTypes[index]];
+        statusTypes[index] = _ref2[0];
+        statusTypes[index + 1] = _ref2[1];
+      } // Reset order
+
+
+      statusTypes.forEach(function (status, index) {
+        return status.order = index;
+      });
+
+      _this.setState({
+        statusTypes: statusTypes
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onEditStatus", function (index) {
+      if (_this.state.fetchingStatusTypes) return;
+      var status = _this.state.statusTypes[index];
+
+      _this.setState({
+        showWarnings: false,
+        showStatusPopup: true,
+        selectedStatusIndex: index,
+        statusLabel: status.text,
+        statusCategory: status.category,
+        statusColour: status.color
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onDeleteStatus", function (index) {
+      if (_this.state.fetchingStatusTypes) return;
+
+      var statusTypes = ___default['default'].cloneDeep(_this.state.statusTypes);
+
+      statusTypes.splice(index, 1);
+
+      _this.setState({
+        statusTypes: statusTypes
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onAddStatus", function () {
+      var defaultStatus = _this.props.statusTypes.find(function (s) {
+        return s.category === STATUS_NOT_ACTIONED;
+      });
+
+      _this.setState({
+        showWarnings: false,
+        showStatusPopup: true,
+        selectedStatusIndex: -1,
+        statusLabel: '',
+        statusCategory: STATUS_NOT_ACTIONED,
+        statusColour: defaultStatus.color
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSaveStatus", function () {
+      var _this$state = _this.state,
+          selectedStatusIndex = _this$state.selectedStatusIndex,
+          statusLabel = _this$state.statusLabel,
+          statusCategory = _this$state.statusCategory,
+          statusColour = _this$state.statusColour;
+
+      var statusTypes = ___default['default'].cloneDeep(_this.state.statusTypes);
+
+      if (selectedStatusIndex < 0) {
+        statusTypes.push({
+          text: statusLabel,
+          order: statusTypes.length,
+          color: statusColour,
+          category: statusCategory
+        });
+      } else {
+        var status = statusTypes[selectedStatusIndex];
+        status.text = statusLabel;
+        status.color = statusColour;
+        status.category = statusCategory;
+      }
+
+      _this.setState({
+        statusTypes: statusTypes,
+        showStatusPopup: false
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHideStatusPopup", function () {
+      if (_this.state.submitting) return;
+
+      _this.setState({
+        showStatusPopup: false
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
+      var stateChange = {};
+      stateChange[event.target.getAttribute('id')] = event.target.value;
+
+      _this.setState(stateChange);
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onToggleDisableSeen", function () {
+      if (_this.state.fetchingHideSeen) return;
+
+      _this.setState({
+        hideSeen: !_this.state.hideSeen
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSaveConfig", function () {
+      if (!_this.validateForm()) return;
+
+      _this.setState({
+        success: false,
+        submitting: true
+      }, /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+        var _this$state2, statusTypes, hideSeen;
+
+        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.prev = 0;
+                _this$state2 = _this.state, statusTypes = _this$state2.statusTypes, hideSeen = _this$state2.hideSeen;
+                _context.next = 4;
+                return stringActions.setString(_this.props.auth.site, values.stringConfigJobStatus, statusTypes);
+
+              case 4:
+                _context.next = 6;
+                return stringActions.setString(_this.props.auth.site, values.stringConfigHideSeen, hideSeen);
+
+              case 6:
+                _this.props.jobStatusesLoaded(statusTypes);
+
+                _this.props.jobHideSeenLoaded(hideSeen);
+
+                _this.setState({
+                  success: true
+                });
+
+                _context.next = 15;
+                break;
+
+              case 11:
+                _context.prev = 11;
+                _context.t0 = _context["catch"](0);
+                console.log('onSaveConfig - error', _context.t0);
+
+                _this.setState({
+                  success: false
+                });
+
+              case 15:
+                _context.prev = 15;
+
+                _this.setState({
+                  submitting: false
+                });
+
+                return _context.finish(15);
+
+              case 18:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, null, [[0, 11, 15, 18]]);
+      })));
+    });
+
+    _this.state = {
+      success: false,
+      submitting: false,
+      selectedStatusIndex: -1,
+      showStatusPopup: false,
+      statusLabel: '',
+      statusCategory: STATUS_NOT_ACTIONED,
+      statusColour: '',
+      fetchingStatusTypes: true,
+      statusTypes: _this.props.statusTypes,
+      fetchingHideSeen: true,
+      hideSeen: _this.props.hideSeen
+    };
+    return _this;
+  }
+
+  _createClass__default['default'](Configuration, [{
+    key: "UNSAFE_componentWillMount",
+    value: function UNSAFE_componentWillMount() {
+      Session$5.checkLoggedIn(this);
+    }
+  }, {
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var _this2 = this;
+
+      if (!Session$5.validateAccess(this.props.auth.site, 'featurePicker', this.props.auth, true)) {
+        this.props.history.push('/mastermenu');
+      } else {
+        this.props.jobStatusesUpdate(this.props.auth.site, function (statusTypes) {
+          return _this2.setState({
+            statusTypes: statusTypes,
+            fetchingStatusTypes: false
+          });
+        });
+        this.props.jobHideSeenUpdate(this.props.auth.site, function (hideSeen) {
+          return _this2.setState({
+            hideSeen: hideSeen,
+            fetchingHideSeen: false
+          });
+        });
+      }
+    }
+  }, {
+    key: "validateForm",
+    value: function validateForm() {
+      var _this3 = this;
+
+      var _this$state3 = this.state,
+          submitting = _this$state3.submitting,
+          statusTypes = _this$state3.statusTypes;
+      if (submitting) return false; // Validate statuses
+
+      var statusesValid = statusTypes.map(function (status) {
+        var text = status.text,
+            category = status.category,
+            color = status.color;
+        return _this3.isStatusValid(text, category, color);
+      });
+      if (!statusesValid.every(function (valid) {
+        return valid;
+      })) return false;
+      return true;
+    }
+  }, {
+    key: "renderStatuses",
+    value: function renderStatuses() {
+      var _this4 = this;
+
+      var statusTypes = this.state.statusTypes;
+      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
+      }, /*#__PURE__*/React__default['default'].createElement("span", {
+        className: "fontMedium fontSize-16 text-bold"
+      }, "Status Category")), statusTypes.map(function (status, index) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          key: "".concat(status.text, "_").concat(index),
+          style: styles$6.statusTypeContainer
+        }, /*#__PURE__*/React__default['default'].createElement("div", {
+          key: status.text,
+          className: "statusLabel",
+          style: _objectSpread$5(_objectSpread$5({}, styles$6.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
+        }, /*#__PURE__*/React__default['default'].createElement("span", {
+          className: "fontMedium fontSize-16 text-dark"
+        }, status.category)), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          style: _objectSpread$5(_objectSpread$5({}, styles$6.statusIcon), {}, {
+            visibility: index === 0 ? 'hidden' : 'visible'
+          }),
+          name: 'arrow-up',
+          onClick: function onClick() {
+            return _this4.onMoveStatus(index, true);
+          }
+        }), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          style: _objectSpread$5(_objectSpread$5({}, styles$6.statusIcon), {}, {
+            visibility: index === statusTypes.length - 1 ? 'hidden' : 'visible'
+          }),
+          name: 'arrow-down',
+          onClick: function onClick() {
+            return _this4.onMoveStatus(index, false);
+          }
+        }), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          style: _objectSpread$5({}, styles$6.statusIcon),
+          name: "pencil",
+          onClick: function onClick() {
+            return _this4.onEditStatus(index);
+          }
+        }), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          style: _objectSpread$5({}, styles$6.statusIcon),
+          name: "minus-circle",
+          onClick: function onClick() {
+            return _this4.onDeleteStatus(index);
+          }
+        }));
+      }), /*#__PURE__*/React__default['default'].createElement("div", {
+        onClick: this.onAddStatus,
+        style: {
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          marginTop: 16
+        }
+      }, /*#__PURE__*/React__default['default'].createElement(Components$5.P60Icon, {
+        className: "addoption_plus",
+        icon: "add",
+        style: {
+          fontSize: 12
+        }
+      }), /*#__PURE__*/React__default['default'].createElement("p", {
+        className: "addoption_text"
+      }, "Add another status")));
     }
   }, {
-    key: "renderContent",
-    value: function renderContent() {
-      if (___default['default'].isEmpty(this.state.jobList)) return this.renderEmpty();
-      return this.renderView();
+    key: "renderOtherOptions",
+    value: function renderOtherOptions() {
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "marginTop-55"
+      }, /*#__PURE__*/React__default['default'].createElement("p", {
+        className: "fontMedium fontSize-36 text-dark"
+      }, "Other options"), /*#__PURE__*/React__default['default'].createElement(Components$5.CheckBox, {
+        label: "Disable whether a request has been \"Seen\" and prevent that from being surfaced to the App user",
+        isActive: this.state.hideSeen,
+        onChange: this.onToggleDisableSeen
+      }));
     }
   }, {
-    key: "renderJobTypes",
-    value: function renderJobTypes() {
-      var _this$state = this.state,
-          jobList = _this$state.jobList,
-          loading = _this$state.loading;
+    key: "renderSubmit",
+    value: function renderSubmit() {
+      if (this.state.submitting) {
+        return /*#__PURE__*/React__default['default'].createElement(Components$5.Button, {
+          buttonType: "secondary"
+        }, "Saving...");
+      }
 
-      if (jobList.length === 0 && loading) {
-        return /*#__PURE__*/React__default['default'].createElement("div", {
-          style: {
-            minWidth: '100%'
-          }
+      return /*#__PURE__*/React__default['default'].createElement(Components$5.Button, {
+        inline: true,
+        buttonType: "primary",
+        onClick: this.onSaveConfig,
+        isActive: this.validateForm()
+      }, "Save");
+    }
+  }, {
+    key: "renderSuccess",
+    value: function renderSuccess() {
+      if (!this.state.success) return null;
+      return /*#__PURE__*/React__default['default'].createElement("span", {
+        style: _objectSpread$5(_objectSpread$5({}, styles$6.savedText), {}, {
+          color: Colours$2.COLOUR_GREEN
+        })
+      }, "Saved");
+    }
+  }, {
+    key: "renderNewStatusPopup",
+    value: function renderNewStatusPopup() {
+      var _ref4,
+          _this5 = this;
+
+      var _this$state4 = this.state,
+          submitting = _this$state4.submitting,
+          showStatusPopup = _this$state4.showStatusPopup,
+          showWarnings = _this$state4.showWarnings,
+          selectedStatusIndex = _this$state4.selectedStatusIndex,
+          statusLabel = _this$state4.statusLabel,
+          statusCategory = _this$state4.statusCategory,
+          statusColour = _this$state4.statusColour;
+      if (!showStatusPopup) return null;
+      var canSave = !submitting && this.isStatusValid(statusLabel, statusCategory, statusColour);
+      return /*#__PURE__*/React__default['default'].createElement(Components$5.Popup, {
+        maxWidth: 800,
+        minWidth: 450,
+        hasPadding: true,
+        buttons: [(_ref4 = {
+          type: 'primaryAction',
+          onClick: this.onSaveStatus,
+          isActive: canSave
+        }, _defineProperty__default['default'](_ref4, "isActive", true), _defineProperty__default['default'](_ref4, "text", submitting ? 'Saving...' : 'Save'), _defineProperty__default['default'](_ref4, "className", 'popupButton'), _ref4), {
+          type: 'outlinedAction',
+          onClick: this.onHideStatusPopup,
+          isActive: !submitting,
+          text: 'Cancel',
+          className: 'popupButton'
+        }],
+        onClose: this.onHideStatusPopup,
+        title: selectedStatusIndex < 0 ? 'New Status' : 'Edit Status'
+      }, /*#__PURE__*/React__default['default'].createElement(Components$5.GenericInput, {
+        id: "statusLabel",
+        type: "text",
+        label: "Label",
+        placeholder: "Status label",
+        value: statusLabel,
+        onChange: this.onHandleChange,
+        isRequired: true,
+        isValid: function isValid() {
+          return !___default['default'].isEmpty(statusLabel);
+        },
+        showError: function showError() {
+          return showWarnings && ___default['default'].isEmpty(statusLabel);
+        },
+        alwaysShowLabel: true,
+        className: "marginBottom-20"
+      }), /*#__PURE__*/React__default['default'].createElement(Components$5.RadioButton, {
+        label: "Status Category",
+        subLabel: /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "marginBottom-16"
         }, /*#__PURE__*/React__default['default'].createElement("div", {
-          className: "padding-60 paddingVertical-40",
-          style: {
-            textAlign: 'center'
+          className: "marginBottom-4"
+        }, 'This is used to categorise statuses for filtering and analytics purposes'), /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "text-bold"
+        }, 'This status is considered')),
+        className: "marginBottom-20",
+        rowStyle: {
+          flexDirection: 'column'
+        },
+        buttonStyle: {
+          marginBottom: 8
+        },
+        isActive: statusCategory || null,
+        options: [{
+          Label: STATUS_NOT_ACTIONED,
+          Value: STATUS_NOT_ACTIONED,
+          onChange: function onChange() {
+            return _this5.setState({
+              statusCategory: STATUS_NOT_ACTIONED
+            });
           }
-        }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
-          style: {
-            fontSize: 30,
-            color: FeatureConfig.env.colourBrandingOff
-          },
-          name: "spinner fa-pulse fa-fw"
-        })));
-      }
-
-      return /*#__PURE__*/React__default['default'].createElement("div", {
-        style: {
-          minWidth: '100%'
+        }, {
+          Label: STATUS_IN_PROGRESS,
+          Value: STATUS_IN_PROGRESS,
+          onChange: function onChange() {
+            return _this5.setState({
+              statusCategory: STATUS_IN_PROGRESS
+            });
+          }
+        }, {
+          Label: STATUS_COMPLETED,
+          Value: STATUS_COMPLETED,
+          onChange: function onChange() {
+            return _this5.setState({
+              statusCategory: STATUS_COMPLETED
+            });
+          }
+        }]
+      }), /*#__PURE__*/React__default['default'].createElement(Components$5.ColourOptions, {
+        options: ['vibrant', 'picker'],
+        defaultTab: "vibrant",
+        value: statusColour,
+        onColourSelected: function onColourSelected(statusColour) {
+          return _this5.setState({
+            statusColour: statusColour
+          });
         }
+      }), /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "marginTop-24"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "marginBottom-32"
-      }, /*#__PURE__*/React__default['default'].createElement(Components$5.AddButton, {
-        onClick: this.props.onNew,
-        text: values.textNewTypeButton
-      })), this.renderContent());
+        className: "fieldLabel marginBottom-4"
+      }, "Preview"), /*#__PURE__*/React__default['default'].createElement(Components$5.Tag, {
+        text: this.state.statusLabel,
+        style: {
+          backgroundColor: statusColour,
+          borderColor: statusColour
+        }
+      })));
     }
   }, {
     key: "render",
@@ -2017,27 +2894,68 @@ var JobTypes = /*#__PURE__*/function (_Component) {
         style: {
           minWidth: '100%'
         }
-      }, /*#__PURE__*/React__default['default'].createElement("div", null, this.renderJobTypes()), /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "hub_tidioPadding"
-      }));
+      }, this.renderStatuses(), this.renderOtherOptions(), /*#__PURE__*/React__default['default'].createElement("div", {
+        style: {
+          paddingTop: 24,
+          paddingBottom: 24
+        }
+      }, this.renderSubmit(), this.renderSuccess()), this.renderNewStatusPopup());
     }
   }]);
 
-  return JobTypes;
+  return Configuration;
 }(React.Component);
 
+var styles$6 = {
+  statusCategoryHeading: {
+    marginLeft: 130,
+    width: 160,
+    textAlign: 'center',
+    marginBottom: 12
+  },
+  statusTypeContainer: {
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 20
+  },
+  statusTextContainer: {
+    width: 130
+  },
+  statusCategoryContainer: {
+    width: 160,
+    textAlign: 'center'
+  },
+  statusIcon: {
+    cursor: 'pointer',
+    fontSize: 20,
+    padding: 5,
+    marginLeft: 10,
+    color: Colours$2.COLOUR_BRANDING_ACTION,
+    visibility: 'visible'
+  },
+  savedText: {
+    fontSize: 14,
+    lineHeight: '33px',
+    marginLeft: 15
+  }
+};
+
 var mapStateToProps$5 = function mapStateToProps(state) {
   var auth = state.auth;
   return {
-    jobtypes: state[values.reducerKey].jobtypes,
-    auth: auth
+    auth: auth,
+    statusTypes: state[values.reducerKey].jobstatuses,
+    hideSeen: state[values.reducerKey].hideSeen
   };
 };
 
-var JobTypes$1 = reactRedux.connect(mapStateToProps$5, {
-  jobTypesLoaded: jobTypesLoaded,
-  jobTypesUpdate: jobTypesUpdate
-})(reactRouter.withRouter(JobTypes));
+var Configuration$1 = reactRedux.connect(mapStateToProps$5, {
+  jobStatusesUpdate: jobStatusesUpdate,
+  jobStatusesLoaded: jobStatusesLoaded,
+  jobHideSeenUpdate: jobHideSeenUpdate,
+  jobHideSeenLoaded: jobHideSeenLoaded
+})(reactRouter.withRouter(Configuration));
 
 function _createSuper$9(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$9(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
@@ -2247,6 +3165,21 @@ var RequestsHub = /*#__PURE__*/function (_Component) {
         });
       }
 
+      if (Session$4.validateAccess(this.props.auth.site, 'featurePicker', this.props.auth)) {
+        sectionItems.push({
+          type: 'navItem',
+          text: 'Feature Configuration',
+          icon: 'settings',
+          isFontAwesome: false,
+          selected: this.state.selectedSection === 'config',
+          onClick: function onClick() {
+            _this2.setState({
+              selectedSection: 'config'
+            });
+          }
+        });
+      }
+
       var helpGuide = null;
       return /*#__PURE__*/React__default['default'].createElement(Components$4.HubSidebar, {
         sections: [{
@@ -2263,6 +3196,8 @@ var RequestsHub = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/React__default['default'].createElement(JobTypes$1, {
           onNew: this.onAddRequestType
         });
+      } else if (this.state.selectedSection === 'config') {
+        return /*#__PURE__*/React__default['default'].createElement(Configuration$1, null);
       }
 
       return /*#__PURE__*/React__default['default'].createElement(JobList$1, {
@@ -2334,6 +3269,7 @@ var Apis = PlussCore__namespace.Apis,
     Session$3 = PlussCore__namespace.Session,
     Colours$1 = PlussCore__namespace.Colours,
     Components$3 = PlussCore__namespace.Components;
+var IMAGE_SIZE_NOTE = 72;
 
 var Job = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](Job, _Component);
@@ -2418,13 +3354,20 @@ var Job = /*#__PURE__*/function (_Component) {
     })));
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getStatusType", function (status) {
-      var statusType = StatusTypes[status] || Object.values(StatusTypes).find(function (s) {
+      var statusTypes = _this.props.statusTypes;
+      var statusType = statusTypes.find(function (s) {
         return s.text === status;
       });
-      if (!statusType) statusType = {
-        text: status,
-        color: '#aaa'
-      };
+
+      if (!statusType) {
+        var defaultStatus = statusTypes.find(function (s) {
+          return s.category === STATUS_NOT_ACTIONED;
+        });
+        statusType = _objectSpread$4(_objectSpread$4({}, defaultStatus), {}, {
+          text: status
+        });
+      }
+
       return statusType;
     });
 
@@ -2467,11 +3410,12 @@ var Job = /*#__PURE__*/function (_Component) {
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "isReadyToSaveNote", function () {
       var _this$state = _this.state,
           noteAttachments = _this$state.noteAttachments,
-          noteInput = _this$state.noteInput;
+          noteInput = _this$state.noteInput,
+          noteImages = _this$state.noteImages;
       if (___default['default'].some(noteAttachments, function (n) {
         return n.Uploading;
       })) return false;
-      return !___default['default'].isEmpty(noteInput) || !___default['default'].isEmpty(noteAttachments);
+      return !___default['default'].isEmpty(noteInput) || !___default['default'].isEmpty(noteAttachments) || !___default['default'].isEmpty(noteImages);
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onOpenAddNote", function () {
@@ -2490,6 +3434,7 @@ var Job = /*#__PURE__*/function (_Component) {
       if (!!_this.state.editingNote) {
         newState.noteInput = '';
         newState.noteAttachments = [];
+        newState.noteImages = [];
       }
 
       _this.setState(newState);
@@ -2677,12 +3622,12 @@ var Job = /*#__PURE__*/function (_Component) {
                   Title: a.Title,
                   Source: a.Source
                 };
-              })) : maintenanceActions.addNote(_this.state.jobId, _this.state.noteInput, _this.state.noteAttachments.map(function (a) {
+              }), _this.state.noteImages) : maintenanceActions.addNote(_this.state.jobId, _this.state.noteInput, _this.state.noteAttachments.map(function (a) {
                 return {
                   Title: a.Title,
                   Source: a.Source
                 };
-              }));
+              }), _this.state.noteImages);
 
             case 6:
               res = _context5.sent;
@@ -2693,6 +3638,7 @@ var Job = /*#__PURE__*/function (_Component) {
                 addNoteOpen: false,
                 noteInput: '',
                 noteAttachments: [],
+                noteImages: [],
                 editingNote: null
               }, function () {
                 _this.props.jobsLoaded([_this.state.job]);
@@ -2742,11 +3688,12 @@ var Job = /*#__PURE__*/function (_Component) {
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onOpenEditNote", function (n) {
       _this.setState({
         noteAttachments: n.Attachments || [],
+        noteImages: n.Images || [],
         noteInput: n.Note || '',
         addNoteOpen: true,
         editingNote: n.Id,
         noteMenuOpen: null
-      });
+      }, _this.checkSetImage);
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "markSeen", function () {
@@ -2852,53 +3799,54 @@ var Job = /*#__PURE__*/function (_Component) {
       _this.setState(stateChange);
     });
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onToggleStatusChanger", function () {
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onTogglePriorityChanger", function () {
       _this.setState({
-        statusChangerOpen: !_this.state.statusChangerOpen
+        priorityChangerOpen: !_this.state.priorityChangerOpen
       });
     });
 
-    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSelectStatus", /*#__PURE__*/function () {
-      var _ref8 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8(status) {
-        var res;
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSelectPriority", /*#__PURE__*/function () {
+      var _ref8 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8(priority) {
+        var res, job;
         return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
                 _this.setState({
                   job: _objectSpread$4(_objectSpread$4({}, _this.state.job), {}, {
-                    status: status
+                    priority: priority
                   }),
-                  statusChangerOpen: false
+                  priorityChangerOpen: false
                 });
 
                 _context8.prev = 1;
                 _context8.next = 4;
-                return maintenanceActions.editJobStatus(_this.state.job.id, status);
+                return maintenanceActions.editJobPriority(_this.state.job.id, priority);
 
               case 4:
                 res = _context8.sent;
+                job = res.data.job;
+
+                _this.props.jobsLoaded([job]);
 
                 _this.setState({
-                  job: res.data.job
-                }, function () {
-                  _this.props.jobsLoaded([_this.state.job]);
+                  job: job
                 });
 
-                _context8.next = 11;
+                _context8.next = 13;
                 break;
 
-              case 8:
-                _context8.prev = 8;
+              case 10:
+                _context8.prev = 10;
                 _context8.t0 = _context8["catch"](1);
-                console.error('onSelectStatus', _context8.t0);
+                console.error('onSelectPriority', _context8.t0);
 
-              case 11:
+              case 13:
               case "end":
                 return _context8.stop();
             }
           }
-        }, _callee8, null, [[1, 8]]);
+        }, _callee8, null, [[1, 10]]);
       }));
 
       return function (_x2) {
@@ -2906,6 +3854,61 @@ var Job = /*#__PURE__*/function (_Component) {
       };
     }());
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onToggleStatusChanger", function () {
+      _this.setState({
+        statusChangerOpen: !_this.state.statusChangerOpen
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onSelectStatus", /*#__PURE__*/function () {
+      var _ref9 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee9(status) {
+        var res, job;
+        return _regeneratorRuntime__default['default'].wrap(function _callee9$(_context9) {
+          while (1) {
+            switch (_context9.prev = _context9.next) {
+              case 0:
+                _this.setState({
+                  job: _objectSpread$4(_objectSpread$4({}, _this.state.job), {}, {
+                    status: status
+                  }),
+                  statusChangerOpen: false
+                });
+
+                _context9.prev = 1;
+                _context9.next = 4;
+                return maintenanceActions.editJobStatus(_this.state.job.id, status);
+
+              case 4:
+                res = _context9.sent;
+                job = res.data.job;
+
+                _this.props.jobsLoaded([job]);
+
+                _this.setState({
+                  job: job
+                });
+
+                _context9.next = 13;
+                break;
+
+              case 10:
+                _context9.prev = 10;
+                _context9.t0 = _context9["catch"](1);
+                console.error('onSelectStatus', _context9.t0);
+
+              case 13:
+              case "end":
+                return _context9.stop();
+            }
+          }
+        }, _callee9, null, [[1, 10]]);
+      }));
+
+      return function (_x3) {
+        return _ref9.apply(this, arguments);
+      };
+    }());
+
     _this.state = {
       jobId: Helper$2.safeReadParams(props, 'jobId') ? props.match.params.jobId : null,
       job: null,
@@ -2914,10 +3917,12 @@ var Job = /*#__PURE__*/function (_Component) {
       comments: [],
       commentInput: '',
       loadingComments: false,
+      priorityChangerOpen: false,
       statusChangerOpen: false,
       addNoteOpen: false,
       noteAttachments: [],
       noteInput: '',
+      noteImages: [],
       assignees: []
     };
     return _this;
@@ -2931,12 +3936,64 @@ var Job = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
+      this.props.jobStatusesUpdate(this.props.auth.site);
+
       if (this.state.jobId) {
         this.getJob();
         this.getComments();
         this.getAssignees();
       }
     }
+  }, {
+    key: "checkSetImage",
+    value: function checkSetImage() {
+      if (this.imageInput && !___default['default'].isEmpty(this.state.noteImages)) {
+        this.imageInput.getWrappedInstance().setValue(this.state.noteImages);
+      } else {
+        setTimeout(this.checkSetImage, 100);
+      }
+    }
+  }, {
+    key: "renderPriorityChanger",
+    value: function renderPriorityChanger() {
+      var _this2 = this;
+
+      if (!this.state.priorityChangerOpen) return null;
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "statusChanger statusChanger-priority"
+      }, jobPriorityOptions.map(function (p) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          key: p.name,
+          className: "statusLabel",
+          onClick: function onClick() {
+            return _this2.onSelectPriority(p.name);
+          },
+          style: {
+            backgroundColor: p.color
+          }
+        }, /*#__PURE__*/React__default['default'].createElement("span", {
+          className: "statusLabel_text"
+        }, p.name));
+      }));
+    }
+  }, {
+    key: "renderPriorityLabel",
+    value: function renderPriorityLabel() {
+      var auth = this.props.auth;
+      if (!Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return null;
+      var job = this.state.job;
+      if (!job) return null;
+      var selectedPriority = getJobPriority(job.priority);
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "statusLabel marginTop-5 pointer",
+        onClick: this.onTogglePriorityChanger,
+        style: {
+          backgroundColor: selectedPriority.color
+        }
+      }, /*#__PURE__*/React__default['default'].createElement("span", {
+        className: "statusLabel_text"
+      }, job.priority || selectedPriority.name), this.renderPriorityChanger());
+    }
   }, {
     key: "renderStatusLabel",
     value: function renderStatusLabel() {
@@ -3000,24 +4057,25 @@ var Job = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderStatusChanger",
     value: function renderStatusChanger() {
-      var _this2 = this;
+      var _this3 = this;
 
       if (!this.state.statusChangerOpen) return null;
+      var statusTypes = this.props.statusTypes;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "statusChanger statusChanger-maintenance"
-      }, Object.keys(StatusTypes).map(function (statusKey) {
+      }, statusTypes.map(function (status) {
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          key: statusKey,
+          key: status.text,
           className: "statusLabel",
           onClick: function onClick() {
-            return _this2.onSelectStatus(statusKey);
+            return _this3.onSelectStatus(status.text);
           },
           style: {
-            backgroundColor: StatusTypes[statusKey].color
+            backgroundColor: status.color
           }
         }, /*#__PURE__*/React__default['default'].createElement("span", {
           className: "statusLabel_text"
-        }, StatusTypes[statusKey].text));
+        }, status.text));
       }));
     }
   }, {
@@ -3031,7 +4089,7 @@ var Job = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderCommentSection",
     value: function renderCommentSection() {
-      var _this3 = this;
+      var _this4 = this;
 
       if (this.state.loadingComments) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3044,7 +4102,7 @@ var Job = /*#__PURE__*/function (_Component) {
       }, "Comments"), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "commentSection"
       }, this.state.comments.map(function (c) {
-        return _this3.renderComment(c);
+        return _this4.renderComment(c);
       })), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "commentReply"
       }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3060,13 +4118,14 @@ var Job = /*#__PURE__*/function (_Component) {
         className: "commentReply_input",
         value: this.state.commentInput,
         onChange: function onChange(e) {
-          return _this3.onHandleChange(e);
+          return _this4.onHandleChange(e);
         }
       }))));
     }
   }, {
     key: "renderImageGrid",
     value: function renderImageGrid(images) {
+      var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
       var imagesToUse = images && images.length > 0 ? images : [];
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "imageGrid"
@@ -3079,7 +4138,9 @@ var Job = /*#__PURE__*/function (_Component) {
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageGrid_image",
           style: {
-            backgroundImage: "url('".concat(Helper$2.get1400(image), "')")
+            backgroundImage: "url('".concat(Helper$2.get1400(image), "')"),
+            width: size,
+            height: size
           }
         }));
       }));
@@ -3099,7 +4160,7 @@ var Job = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderCustomFields",
     value: function renderCustomFields() {
-      var _this4 = this;
+      var _this5 = this;
 
       var job = this.state.job;
       var customFields = job.customFields;
@@ -3129,7 +4190,7 @@ var Job = /*#__PURE__*/function (_Component) {
             }, field.answer && Array.isArray(field.answer) ? field.answer.join(', ') : '');
 
           case 'image':
-            return _this4.renderImageGrid(field.answer);
+            return _this5.renderImageGrid(field.answer);
 
           default:
             return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3250,12 +4311,12 @@ var Job = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/React__default['default'].createElement("span", {
         className: "statusLabel_text"
-      }, e ? "Marked as ".concat(statusType.text) : "".concat(values.textEntityName, " opened"))));
+      }, e ? "".concat(entryToUse.user.displayName, " marked as ").concat(statusType.text) : "".concat(values.textEntityName, " opened"))));
     }
   }, {
     key: "renderNote",
     value: function renderNote(note, index) {
-      var _this5 = this;
+      var _this6 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "ticketHistoryEntry",
@@ -3278,7 +4339,7 @@ var Job = /*#__PURE__*/function (_Component) {
         icon: "more15",
         className: "maintenanceNote_moreIcon",
         onClick: function onClick() {
-          return _this5.onOpenNoteMenu(index);
+          return _this6.onOpenNoteMenu(index);
         }
       }), /*#__PURE__*/React__default['default'].createElement("p", {
         className: "maintenanceNote_name"
@@ -3287,20 +4348,20 @@ var Job = /*#__PURE__*/function (_Component) {
           key: 'edit',
           text: 'Edit',
           onPress: function onPress() {
-            return _this5.onOpenEditNote(note);
+            return _this6.onOpenEditNote(note);
           }
         }, {
           key: 'delete',
           text: 'Delete',
           onPress: function onPress() {
-            return _this5.onDeleteNote(note);
+            return _this6.onDeleteNote(note);
           }
         }]
       })), /*#__PURE__*/React__default['default'].createElement("p", {
         className: "maintenanceNote_text"
       }, Helper$2.toParagraphed(note.Note)), note.Attachments.map(function (a, i) {
-        return _this5.renderAttachment(a, i);
-      })));
+        return _this6.renderAttachment(a, i);
+      }), note.Images && note.Images.length > 0 ? this.renderImageGrid(note.Images, IMAGE_SIZE_NOTE) : null));
     }
   }, {
     key: "renderAssignment",
@@ -3341,10 +4402,24 @@ var Job = /*#__PURE__*/function (_Component) {
         className: "statusLabel_text"
       }, e.user.displayName, " assigned the ", values.textSingularName, " to ", e.assignedUser ? e.assignedUser.displayName : 'Unassigned')));
     }
+  }, {
+    key: "renderPriority",
+    value: function renderPriority() {
+      var auth = this.props.auth;
+      if (!Session$3.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return null;
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "padding-32 paddingVertical-40 bottomDivideBorder relative"
+      }, /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "newTopBar clearfix flex flex-reverse"
+      }, this.renderPriorityLabel(), /*#__PURE__*/React__default['default'].createElement(Components$3.Text, {
+        type: "formTitleSmall",
+        className: "flex-1"
+      }, "Priority")));
+    }
   }, {
     key: "renderOverview",
     value: function renderOverview() {
-      var _this6 = this;
+      var _this7 = this;
 
       var job = this.state.job;
       if (!job || !job.history) return null;
@@ -3370,13 +4445,13 @@ var Job = /*#__PURE__*/function (_Component) {
       }, "Status History")), this.renderHistoryEntry(null, -1), ___default['default'].map(source, function (e, i) {
         switch (e.EntryType) {
           case 'status':
-            return _this6.renderHistoryEntry(e, i);
+            return _this7.renderHistoryEntry(e, i);
 
           case 'note':
-            return _this6.renderNote(e, i);
+            return _this7.renderNote(e, i);
 
           case 'assignment':
-            return _this6.renderAssignmentEntry(e, i);
+            return _this7.renderAssignmentEntry(e, i);
         }
       }));
     }
@@ -3422,7 +4497,7 @@ var Job = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAddNotePopup",
     value: function renderAddNotePopup() {
-      var _this7 = this;
+      var _this8 = this;
 
       if (!this.state.addNoteOpen) return null;
 
@@ -3462,7 +4537,7 @@ var Job = /*#__PURE__*/function (_Component) {
         value: this.state.noteInput,
         placeholder: "Enter note",
         onChange: function onChange(e) {
-          return _this7.onHandleChange(e);
+          return _this8.onHandleChange(e);
         },
         inputStyle: {
           width: 400
@@ -3470,34 +4545,44 @@ var Job = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/React__default['default'].createElement(Components$3.Text, {
         type: "h5"
       }, "Attachments"), this.state.noteAttachments.map(function (a, i) {
-        return _this7.renderAttachment(a, i, _this7.onRemoveAttachment);
+        return _this8.renderAttachment(a, i, _this8.onRemoveAttachment);
       }), /*#__PURE__*/React__default['default'].createElement("input", {
         ref: function ref(input) {
-          return _this7.attachmentInput = input;
+          return _this8.attachmentInput = input;
         },
         id: "attachmentInput",
         type: "file",
         className: "fileInput",
         onChange: function onChange(e) {
-          return _this7.onHandlePDFFileChange(e);
+          return _this8.onHandlePDFFileChange(e);
         },
         accept: "application/pdf"
       }), /*#__PURE__*/React__default['default'].createElement("div", {
-        className: "iconTextButton",
+        className: "iconTextButton marginBottom-16",
         onClick: function onClick() {
-          _this7.attachmentInput.click();
+          _this8.attachmentInput.click();
         }
       }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
         className: "iconTextButton_icon",
         name: "paperclip"
       }), /*#__PURE__*/React__default['default'].createElement("p", {
         className: "iconTextButton_text"
-      }, "Add Attachment")));
+      }, "Add Attachment")), /*#__PURE__*/React__default['default'].createElement(Components$3.ImageInput, {
+        ref: function ref(_ref10) {
+          _this8.imageInput = _ref10;
+        },
+        multiple: true,
+        refreshCallback: function refreshCallback(images) {
+          _this8.setState({
+            noteImages: images
+          });
+        }
+      }));
     }
   }, {
     key: "renderUsers",
     value: function renderUsers() {
-      var _this8 = this;
+      var _this9 = this;
 
       var content = null;
 
@@ -3516,7 +4601,7 @@ var Job = /*#__PURE__*/function (_Component) {
             className: "removeIcon",
             icon: "close",
             onClick: function onClick() {
-              _this8.onSelectAssignee();
+              _this9.onSelectAssignee();
             },
             colour: Colours$1.COLOUR_DUSK
           })
@@ -3529,20 +4614,20 @@ var Job = /*#__PURE__*/function (_Component) {
           placeholder: "Search name",
           value: this.state.userSearch,
           onChange: function onChange(e) {
-            return _this8.onHandleChange(e);
+            return _this9.onHandleChange(e);
           },
           alwaysShowLabel: true
         }), ___default['default'].sortBy(this.state.assignees, function (u) {
           return u.displayName.toUpperCase();
         }).filter(function (u) {
-          if (___default['default'].isEmpty(_this8.state.userSearch)) return true;
-          return u.displayName.toUpperCase().indexOf(_this8.state.userSearch.toUpperCase()) > -1;
+          if (___default['default'].isEmpty(_this9.state.userSearch)) return true;
+          return u.displayName.toUpperCase().indexOf(_this9.state.userSearch.toUpperCase()) > -1;
         }).map(function (user) {
           return /*#__PURE__*/React__default['default'].createElement(Components$3.UserListing, {
             key: user.id,
             user: user,
             onClick: function onClick() {
-              _this8.onSelectAssignee(user);
+              _this9.onSelectAssignee(user);
             }
           });
         }));
@@ -3583,7 +4668,7 @@ var Job = /*#__PURE__*/function (_Component) {
         className: "pageSectionWrapper--fixedPopupSize"
       }, this.renderInner()), /*#__PURE__*/React__default['default'].createElement(Components$3.OverlayPageSection, {
         className: "pageSectionWrapper--newPopupSide pageSectionWrapper--newPopupSide-fixedWidth"
-      }, this.renderAssignment(), this.renderOverview())), /*#__PURE__*/React__default['default'].createElement(Components$3.OverlayPageBottomButtons, null, this.renderButtons()));
+      }, this.renderAssignment(), this.renderPriority(), this.renderOverview())), /*#__PURE__*/React__default['default'].createElement(Components$3.OverlayPageBottomButtons, null, this.renderButtons()));
     }
   }]);
 
@@ -3593,12 +4678,14 @@ var Job = /*#__PURE__*/function (_Component) {
 var mapStateToProps$3 = function mapStateToProps(state) {
   var auth = state.auth;
   return {
-    auth: auth
+    auth: auth,
+    statusTypes: state[values.reducerKey].jobstatuses
   };
 };
 
 var Job$1 = reactRedux.connect(mapStateToProps$3, {
-  jobsLoaded: jobsLoaded
+  jobsLoaded: jobsLoaded,
+  jobStatusesUpdate: jobStatusesUpdate
 })(reactRouter.withRouter(Job));
 
 function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -5983,8 +7070,9 @@ function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) {
 var INITIAL_STATE = {
   jobs: [],
   jobtypes: [],
-  loading: false // tickets: [],
-
+  jobstatuses: jobStatusOptions,
+  loading: false,
+  hideSeen: false
 };
 var MaintenanceReducer = (function () {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INITIAL_STATE;
@@ -6027,33 +7115,25 @@ var MaintenanceReducer = (function () {
       return state;
 
     case JOBS_TYPES_LOADED:
-      var resultSub = ___default['default'].unionWith(action.payload, state.jobtypes, function (v1, v2) {
+      var jobtypes = ___default['default'].unionWith(action.payload, state.jobtypes, function (v1, v2) {
         return v1 != null && v2 != null && v1.id === v2.id;
       });
 
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
-        jobtypes: resultSub
+        jobtypes: jobtypes
+      });
+
+    case JOBS_STATUSES_LOADED:
+      var jobstatuses = ___default['default'].orderBy(action.payload, 'order', 'asc');
+
+      return _objectSpread$2(_objectSpread$2({}, state), {}, {
+        jobstatuses: jobstatuses
+      });
+
+    case JOBS_HIDE_SEEN:
+      return _objectSpread$2(_objectSpread$2({}, state), {}, {
+        hideSeen: action.payload
       });
-    // case JOBS_TYPES_REMOVED:
-    //   const indexSub = _.findIndex(state.jobtypes, (event) => {
-    //     return event != null && event.id === action.payload;
-    //   });
-    //   if (indexSub > -1) {
-    //     const newEventsSub = [...state.jobtypes];
-    //     newEventsSub.splice(indexSub, 1);
-    //     return { ...state, jobtypes: newEventsSub };
-    //   }
-    //   return state;
-    // case TICKETS_LOADED:
-    //   const ticketResult = _.unionWith(action.payload, state.tickets, (v1, v2) => {
-    //     return v1 != null && v2 != null && v1.Id === v2.Id;
-    //   });
-    //   return {
-    //     ...state,
-    //     tickets: ticketResult,
-    //   };
-    // case JOBS_PURGE:
-    //   return INITIAL_STATE;
 
     default:
       return state;