npm - @plusscommunities/pluss-maintenance-web - Versions diffs - 1.2.4-beta.2 → 1.3.0-beta.0 - Mend

@plusscommunities/pluss-maintenance-web 1.2.4-beta.2 → 1.3.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -1,128 +1,93 @@
+import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { Component, useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
 import _ from 'lodash';
 import moment from 'moment';
-import FontAwesome from 'react-fontawesome';
+import { Icon } from '@plusscommunities/pluss-icons';
 import * as PlussCore from '@plusscommunities/pluss-core-web';
-import { Colours as Colours$3 } from '@plusscommunities/pluss-core-web';
-import { Table, DropdownItem, DropdownButton } from 'react-bootstrap';
+import { PERMISSION_CATEGORIES, IMPORTANCE_LEVELS, Colours as Colours$4 } from '@plusscommunities/pluss-core-web';
+import { Table, MenuItem, DropdownButton } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import Textarea from 'react-textarea-autosize';
-import { faWrench, faCircleCheck, faComment } from '@fortawesome/free-solid-svg-icons';
-function _typeof(o) {
-  "@babel/helpers - typeof";
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
-function toPrimitive(t, r) {
-  if ("object" != _typeof(t) || !t) return t;
-  var e = t[Symbol.toPrimitive];
-  if (void 0 !== e) {
-    var i = e.call(t, r || "default");
-    if ("object" != _typeof(i)) return i;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return ("string" === r ? String : Number)(t);
-}
-function toPropertyKey(t) {
-  var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : i + "";
-}
-function _defineProperty(e, r, t) {
-  return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
-    value: t,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[r] = t, e;
-}
 var values = {
-  featureKey: 'maintenance',
-  aliases: ['maintenanceTracking', 'maintenanceTypes', 'maintenancerequest'],
-  serviceKey: 'maintenance',
-  reducerKey: 'maintenance',
-  analyticsKey: 'maintenancerequest',
-  commentKey: 'maintenancerequest',
-  actionJobsLoaded: 'JOBS_LOADED',
-  actionJobsAdded: 'JOBS_ADDED',
-  actionJobsRemoved: 'JOBS_REMOVED',
-  actionJobsTypesLoaded: 'JOBS_TYPES_LOADED',
-  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADED',
-  actionJobsHideSeen: 'JOBS_HIDE_SEEN',
-  actionJobsLoading: 'JOBS_LOADING',
-  permissionMaintenanceTracking: 'maintenanceTracking',
-  permissionMaintenanceTypes: 'maintenanceTypes',
-  permissionMaintenanceAssignment: 'maintenanceAssignment',
-  activityMaintenanceJobStatusChanged: 'MaintenanceJobStatusChanged',
-  activityAddMaintenanceJob: 'AddMaintenanceJob',
-  activityEditMaintenanceJob: 'EditMaintenanceJob',
-  activityDeleteMaintenanceJob: 'DeleteMaintenanceJob',
-  routeRequestsHub: '/requestsHub',
-  routeAddRequest: '/requestsHub/job',
-  routeAddRequestType: '/requestsHub/requestType',
-  routeRequestDetails: '/requestsHub/jobDetails',
-  routeRequestTypes: '/requestTypes',
-  screenRequestsHub: 'RequestsHub',
-  screenAddJob: 'AddJob',
-  screenAddJobType: 'AddJobType',
-  screenJob: 'Job',
-  screenJobTypes: 'JobTypes',
-  menuIcon: 'maintenance',
+  featureKey: "maintenance",
+  aliases: ["maintenanceTracking", "maintenanceTypes", "maintenancerequest"],
+  serviceKey: "maintenance",
+  reducerKey: "maintenance",
+  analyticsKey: "maintenancerequest",
+  commentKey: "maintenancerequest",
+  actionJobsLoaded: "JOBS_LOADED",
+  actionJobsRemoved: "JOBS_REMOVED",
+  actionJobsTypesLoaded: "JOBS_TYPES_LOADED",
+  actionJobsStatusesLoaded: "JOBS_STATUSES_LOADED",
+  actionJobsHideSeen: "JOBS_HIDE_SEEN",
+  actionJobsLoading: "JOBS_LOADING",
+  permissionMaintenanceTracking: "maintenanceTracking",
+  permissionMaintenanceTypes: "maintenanceTypes",
+  permissionMaintenanceAssignment: "maintenanceAssignment",
+  activityMaintenanceJobStatusChanged: "MaintenanceJobStatusChanged",
+  activityAddMaintenanceJob: "AddMaintenanceJob",
+  activityEditMaintenanceJob: "EditMaintenanceJob",
+  activityDeleteMaintenanceJob: "DeleteMaintenanceJob",
+  routeRequestsHub: "/requestsHub",
+  routeAddRequest: "/requestsHub/job",
+  routeAddRequestType: "/requestsHub/requestType",
+  routeRequestDetails: "/requestsHub/jobDetails",
+  routeRequestTypes: "/requestTypes",
+  screenRequestsHub: "RequestsHub",
+  screenAddJob: "AddJob",
+  screenAddJobType: "AddJobType",
+  screenJob: "Job",
+  screenJobTypes: "JobTypes",
+  menuIcon: "maintenance",
   isFontAwesomeIcon: false,
   isSVGIcon: false,
-  svgPathGridIcon: 'M22.7072 2.33998C20.5868 2.30886 18.2156 3.43862 16.824 4.83022C15.1138 6.54042 15.1486 8.34584 15.7894 10.5065L13.2058 13.0901L7.7566 7.64089C7.75294 7.60976 7.75477 7.5768 7.74927 7.54567L7.48926 6.30605C7.43799 6.06435 7.28968 5.84645 7.08277 5.71279L3.77589 3.56313C3.40601 3.32509 2.91163 3.37636 2.60035 3.68764L1.81116 4.47682C1.50171 4.7881 1.44861 5.28066 1.68848 5.6487L3.80152 8.91713C3.93336 9.12221 4.13843 9.26686 4.3783 9.32179L5.66004 9.61659C5.69483 9.62392 5.72962 9.62209 5.76441 9.62575L11.2155 15.0786L8.03309 18.2647C6.23316 18.0907 4.52112 18.8396 3.417 20.2971C2.0254 22.1373 2.05836 24.7814 3.49756 26.5886C4.41858 27.7459 5.78821 28.4563 7.25123 28.5405C7.34827 28.546 7.44532 28.5479 7.54236 28.5479C8.9065 28.5479 10.2212 28.0059 11.1898 27.0372C12.2866 25.9404 12.8195 24.4445 12.6711 22.9027L14.7311 20.8446C14.8391 21.2035 15.0259 21.5386 15.2987 21.8114L21.5939 28.1102C22.0516 28.5662 22.6522 28.7932 23.2528 28.7932C23.8534 28.7932 24.454 28.5662 24.9099 28.1102L26.2356 26.7827C27.1493 25.869 27.1493 24.3822 26.2356 23.4685L19.9368 17.1697C19.6658 16.8987 19.3307 16.7138 18.9718 16.6039L20.4275 15.1464C22.5881 15.7854 24.3954 15.822 26.1056 14.1118C27.814 12.4035 29.1323 9.21559 28.3834 6.83522C28.3358 6.67958 28.2076 6.55873 28.0483 6.52028C27.889 6.48183 27.7206 6.52944 27.6052 6.64479L24.681 9.56899C24.5638 9.68801 24.3899 9.73561 24.2288 9.68984L23.7161 9.55251C22.5863 9.25038 21.6964 8.36049 21.3943 7.23256L21.257 6.71987C21.213 6.55873 21.2606 6.38478 21.3796 6.2676L24.3093 3.33608C24.4247 3.22072 24.4705 3.05409 24.4338 2.89479C24.3936 2.73549 24.2764 2.60732 24.1189 2.55788C23.6721 2.41506 23.1961 2.34731 22.7072 2.33998ZM22.6669 3.28115C22.7877 3.28298 22.9067 3.28664 23.0239 3.29579L20.7168 5.60292C20.3616 5.95815 20.2242 6.47817 20.3543 6.96157L20.4916 7.47609C20.8798 8.92629 22.0223 10.0689 23.4744 10.4589L23.9871 10.5962C24.4705 10.7262 24.9905 10.5871 25.3439 10.2318L27.6437 7.93202C27.7883 9.80702 26.7318 12.1599 25.4446 13.4472C23.9834 14.9083 22.5021 14.8168 20.4367 14.1686C20.27 14.1173 20.0888 14.1613 19.9661 14.284L11.849 22.401C11.7446 22.5054 11.6952 22.6519 11.7172 22.7984C11.9039 24.1277 11.47 25.4314 10.527 26.3744C9.67737 27.224 8.5055 27.6708 7.30433 27.6049C6.08851 27.5353 4.9972 26.9677 4.22999 26.0045C3.05445 24.5287 3.02698 22.3662 4.16407 20.8648C4.98438 19.7826 6.20936 19.1765 7.52588 19.1765C7.7273 19.1765 7.93238 19.1912 8.13746 19.2186C8.28211 19.2388 8.43043 19.1912 8.53296 19.0868L16.65 10.9716C16.7745 10.8471 16.8203 10.6658 16.7672 10.4973C16.119 8.43373 16.0275 6.95424 17.4887 5.49306C18.7008 4.2809 20.8541 3.27931 22.6669 3.28115ZM3.26319 4.35048L6.57191 6.49831L6.83191 7.73793L5.86695 8.70107L4.58704 8.4081L2.474 5.13967L3.26319 4.35048ZM7.34095 8.55275L12.543 13.7529L11.8801 14.4158L6.67994 9.21559L7.0077 8.88967L7.34095 8.55275ZM18.4811 8.66994C18.3621 8.66994 18.243 8.71572 18.1497 8.80727C17.9666 8.99037 17.9666 9.287 18.1497 9.47011L21.4657 12.7843C21.5573 12.8759 21.6763 12.9216 21.7971 12.9216C21.9161 12.9216 22.037 12.8759 22.1267 12.7843C22.3117 12.6012 22.3117 12.3046 22.1267 12.1215L18.8143 8.80727C18.721 8.71572 18.6019 8.66994 18.4811 8.66994ZM17.1554 12.647C17.0364 12.647 16.9155 12.6928 16.824 12.7843C16.6409 12.9674 16.6409 13.2641 16.824 13.4472L17.4887 14.11C17.5802 14.2016 17.6992 14.2473 17.8201 14.2473C17.9409 14.2473 18.0599 14.2016 18.1515 14.11C18.3346 13.9269 18.3346 13.6303 18.1515 13.4472L17.4887 12.7843C17.3953 12.6928 17.2763 12.647 17.1554 12.647ZM15.4983 14.3041C15.3793 14.3041 15.2603 14.3499 15.1687 14.4433C14.9838 14.6264 14.9838 14.9212 15.1687 15.1043L15.8297 15.7689C15.9213 15.8587 16.0421 15.9063 16.163 15.9063C16.282 15.9063 16.4028 15.8587 16.4944 15.7689C16.6775 15.584 16.6775 15.2892 16.4944 15.1043L15.8297 14.4433C15.7382 14.3499 15.6191 14.3041 15.4983 14.3041ZM13.843 15.9612C13.7222 15.9612 13.6032 16.007 13.5116 16.0985C13.3267 16.2816 13.3267 16.5783 13.5116 16.7632L14.1726 17.4242C14.2642 17.5158 14.385 17.5634 14.504 17.5634C14.6249 17.5634 14.7457 17.5158 14.8373 17.4242C15.0204 17.2429 15.0204 16.9463 14.8373 16.7632L14.1726 16.0985C14.0811 16.007 13.962 15.9612 13.843 15.9612ZM18.4426 17.4444C18.7539 17.4755 19.0487 17.6073 19.2758 17.8344L25.5728 24.1314C26.1221 24.6807 26.1221 25.5706 25.5728 26.1199L24.2452 27.4456C23.6978 27.9949 22.806 27.9949 22.2586 27.4456L15.9597 21.1467C15.6594 20.8465 15.5258 20.4216 15.5734 20.0023L18.1277 17.4462C18.2339 17.4352 18.3383 17.4334 18.4426 17.4444ZM12.1859 17.6201C12.0651 17.6201 11.9461 17.6641 11.8527 17.7556C11.6696 17.9406 11.6696 18.2354 11.8527 18.4203L12.5173 19.0813C12.6071 19.1729 12.7279 19.2186 12.8469 19.2186C12.9678 19.2186 13.0886 19.1729 13.1784 19.0813C13.3633 18.8982 13.3633 18.6034 13.1784 18.4203L12.5173 17.7556C12.424 17.6641 12.3049 17.6201 12.1859 17.6201ZM10.527 19.2772C10.408 19.2772 10.2889 19.323 10.1956 19.4146C10.0125 19.5977 10.0125 19.8925 10.1956 20.0756L10.8584 20.7403C10.95 20.83 11.069 20.8757 11.1898 20.8757C11.3107 20.8757 11.4297 20.83 11.5212 20.7403C11.7044 20.5553 11.7044 20.2605 11.5212 20.0756L10.8584 19.4146C10.7669 19.323 10.646 19.2772 10.527 19.2772ZM19.2758 19.3523C19.1549 19.3523 19.0359 19.3981 18.9425 19.4896C18.7594 19.6746 18.7594 19.9694 18.9425 20.1543L23.5842 24.7942C23.6758 24.8858 23.7948 24.9315 23.9157 24.9315C24.0365 24.9315 24.1555 24.8858 24.2471 24.7942C24.4302 24.6111 24.4302 24.3145 24.2471 24.1314L19.6072 19.4896C19.5138 19.3981 19.3948 19.3523 19.2758 19.3523ZM17.9501 20.678C17.8292 20.678 17.7102 20.7238 17.6168 20.8153C17.4337 21.0003 17.4337 21.2951 17.6168 21.48L22.2586 26.1199C22.3483 26.2114 22.4691 26.2572 22.5881 26.2572C22.709 26.2572 22.8298 26.2114 22.9196 26.1199C23.1045 25.9368 23.1045 25.6402 22.9196 25.457L18.2815 20.8153C18.1881 20.7238 18.0691 20.678 17.9501 20.678ZM8.11182 20.8373C8.07154 20.8373 8.03126 20.8428 7.99097 20.8538L5.89808 21.4141C5.73694 21.458 5.6106 21.5844 5.56666 21.7455L5.00818 23.8366C4.96424 23.9977 5.01002 24.1698 5.1272 24.2888L6.65796 25.8196C6.74769 25.9093 6.86671 25.9569 6.98939 25.9569C7.0315 25.9569 7.07178 25.9514 7.11207 25.9423L9.20313 25.3801C9.36426 25.338 9.49061 25.2117 9.53455 25.0487L10.0949 22.9595C10.1388 22.7965 10.0912 22.6244 9.974 22.5054L8.44324 20.9746C8.35352 20.8867 8.2345 20.8391 8.11182 20.8373ZM7.97083 21.8279L9.1189 22.976L8.69959 24.5452L7.13038 24.9663L5.98231 23.8183L6.40162 22.249L7.97083 21.8279Z',
-  svgPathGridIconViewBox: '0 0 30 30',
+  svgPathGridIcon: "M22.7072 2.33998C20.5868 2.30886 18.2156 3.43862 16.824 4.83022C15.1138 6.54042 15.1486 8.34584 15.7894 10.5065L13.2058 13.0901L7.7566 7.64089C7.75294 7.60976 7.75477 7.5768 7.74927 7.54567L7.48926 6.30605C7.43799 6.06435 7.28968 5.84645 7.08277 5.71279L3.77589 3.56313C3.40601 3.32509 2.91163 3.37636 2.60035 3.68764L1.81116 4.47682C1.50171 4.7881 1.44861 5.28066 1.68848 5.6487L3.80152 8.91713C3.93336 9.12221 4.13843 9.26686 4.3783 9.32179L5.66004 9.61659C5.69483 9.62392 5.72962 9.62209 5.76441 9.62575L11.2155 15.0786L8.03309 18.2647C6.23316 18.0907 4.52112 18.8396 3.417 20.2971C2.0254 22.1373 2.05836 24.7814 3.49756 26.5886C4.41858 27.7459 5.78821 28.4563 7.25123 28.5405C7.34827 28.546 7.44532 28.5479 7.54236 28.5479C8.9065 28.5479 10.2212 28.0059 11.1898 27.0372C12.2866 25.9404 12.8195 24.4445 12.6711 22.9027L14.7311 20.8446C14.8391 21.2035 15.0259 21.5386 15.2987 21.8114L21.5939 28.1102C22.0516 28.5662 22.6522 28.7932 23.2528 28.7932C23.8534 28.7932 24.454 28.5662 24.9099 28.1102L26.2356 26.7827C27.1493 25.869 27.1493 24.3822 26.2356 23.4685L19.9368 17.1697C19.6658 16.8987 19.3307 16.7138 18.9718 16.6039L20.4275 15.1464C22.5881 15.7854 24.3954 15.822 26.1056 14.1118C27.814 12.4035 29.1323 9.21559 28.3834 6.83522C28.3358 6.67958 28.2076 6.55873 28.0483 6.52028C27.889 6.48183 27.7206 6.52944 27.6052 6.64479L24.681 9.56899C24.5638 9.68801 24.3899 9.73561 24.2288 9.68984L23.7161 9.55251C22.5863 9.25038 21.6964 8.36049 21.3943 7.23256L21.257 6.71987C21.213 6.55873 21.2606 6.38478 21.3796 6.2676L24.3093 3.33608C24.4247 3.22072 24.4705 3.05409 24.4338 2.89479C24.3936 2.73549 24.2764 2.60732 24.1189 2.55788C23.6721 2.41506 23.1961 2.34731 22.7072 2.33998ZM22.6669 3.28115C22.7877 3.28298 22.9067 3.28664 23.0239 3.29579L20.7168 5.60292C20.3616 5.95815 20.2242 6.47817 20.3543 6.96157L20.4916 7.47609C20.8798 8.92629 22.0223 10.0689 23.4744 10.4589L23.9871 10.5962C24.4705 10.7262 24.9905 10.5871 25.3439 10.2318L27.6437 7.93202C27.7883 9.80702 26.7318 12.1599 25.4446 13.4472C23.9834 14.9083 22.5021 14.8168 20.4367 14.1686C20.27 14.1173 20.0888 14.1613 19.9661 14.284L11.849 22.401C11.7446 22.5054 11.6952 22.6519 11.7172 22.7984C11.9039 24.1277 11.47 25.4314 10.527 26.3744C9.67737 27.224 8.5055 27.6708 7.30433 27.6049C6.08851 27.5353 4.9972 26.9677 4.22999 26.0045C3.05445 24.5287 3.02698 22.3662 4.16407 20.8648C4.98438 19.7826 6.20936 19.1765 7.52588 19.1765C7.7273 19.1765 7.93238 19.1912 8.13746 19.2186C8.28211 19.2388 8.43043 19.1912 8.53296 19.0868L16.65 10.9716C16.7745 10.8471 16.8203 10.6658 16.7672 10.4973C16.119 8.43373 16.0275 6.95424 17.4887 5.49306C18.7008 4.2809 20.8541 3.27931 22.6669 3.28115ZM3.26319 4.35048L6.57191 6.49831L6.83191 7.73793L5.86695 8.70107L4.58704 8.4081L2.474 5.13967L3.26319 4.35048ZM7.34095 8.55275L12.543 13.7529L11.8801 14.4158L6.67994 9.21559L7.0077 8.88967L7.34095 8.55275ZM18.4811 8.66994C18.3621 8.66994 18.243 8.71572 18.1497 8.80727C17.9666 8.99037 17.9666 9.287 18.1497 9.47011L21.4657 12.7843C21.5573 12.8759 21.6763 12.9216 21.7971 12.9216C21.9161 12.9216 22.037 12.8759 22.1267 12.7843C22.3117 12.6012 22.3117 12.3046 22.1267 12.1215L18.8143 8.80727C18.721 8.71572 18.6019 8.66994 18.4811 8.66994ZM17.1554 12.647C17.0364 12.647 16.9155 12.6928 16.824 12.7843C16.6409 12.9674 16.6409 13.2641 16.824 13.4472L17.4887 14.11C17.5802 14.2016 17.6992 14.2473 17.8201 14.2473C17.9409 14.2473 18.0599 14.2016 18.1515 14.11C18.3346 13.9269 18.3346 13.6303 18.1515 13.4472L17.4887 12.7843C17.3953 12.6928 17.2763 12.647 17.1554 12.647ZM15.4983 14.3041C15.3793 14.3041 15.2603 14.3499 15.1687 14.4433C14.9838 14.6264 14.9838 14.9212 15.1687 15.1043L15.8297 15.7689C15.9213 15.8587 16.0421 15.9063 16.163 15.9063C16.282 15.9063 16.4028 15.8587 16.4944 15.7689C16.6775 15.584 16.6775 15.2892 16.4944 15.1043L15.8297 14.4433C15.7382 14.3499 15.6191 14.3041 15.4983 14.3041ZM13.843 15.9612C13.7222 15.9612 13.6032 16.007 13.5116 16.0985C13.3267 16.2816 13.3267 16.5783 13.5116 16.7632L14.1726 17.4242C14.2642 17.5158 14.385 17.5634 14.504 17.5634C14.6249 17.5634 14.7457 17.5158 14.8373 17.4242C15.0204 17.2429 15.0204 16.9463 14.8373 16.7632L14.1726 16.0985C14.0811 16.007 13.962 15.9612 13.843 15.9612ZM18.4426 17.4444C18.7539 17.4755 19.0487 17.6073 19.2758 17.8344L25.5728 24.1314C26.1221 24.6807 26.1221 25.5706 25.5728 26.1199L24.2452 27.4456C23.6978 27.9949 22.806 27.9949 22.2586 27.4456L15.9597 21.1467C15.6594 20.8465 15.5258 20.4216 15.5734 20.0023L18.1277 17.4462C18.2339 17.4352 18.3383 17.4334 18.4426 17.4444ZM12.1859 17.6201C12.0651 17.6201 11.9461 17.6641 11.8527 17.7556C11.6696 17.9406 11.6696 18.2354 11.8527 18.4203L12.5173 19.0813C12.6071 19.1729 12.7279 19.2186 12.8469 19.2186C12.9678 19.2186 13.0886 19.1729 13.1784 19.0813C13.3633 18.8982 13.3633 18.6034 13.1784 18.4203L12.5173 17.7556C12.424 17.6641 12.3049 17.6201 12.1859 17.6201ZM10.527 19.2772C10.408 19.2772 10.2889 19.323 10.1956 19.4146C10.0125 19.5977 10.0125 19.8925 10.1956 20.0756L10.8584 20.7403C10.95 20.83 11.069 20.8757 11.1898 20.8757C11.3107 20.8757 11.4297 20.83 11.5212 20.7403C11.7044 20.5553 11.7044 20.2605 11.5212 20.0756L10.8584 19.4146C10.7669 19.323 10.646 19.2772 10.527 19.2772ZM19.2758 19.3523C19.1549 19.3523 19.0359 19.3981 18.9425 19.4896C18.7594 19.6746 18.7594 19.9694 18.9425 20.1543L23.5842 24.7942C23.6758 24.8858 23.7948 24.9315 23.9157 24.9315C24.0365 24.9315 24.1555 24.8858 24.2471 24.7942C24.4302 24.6111 24.4302 24.3145 24.2471 24.1314L19.6072 19.4896C19.5138 19.3981 19.3948 19.3523 19.2758 19.3523ZM17.9501 20.678C17.8292 20.678 17.7102 20.7238 17.6168 20.8153C17.4337 21.0003 17.4337 21.2951 17.6168 21.48L22.2586 26.1199C22.3483 26.2114 22.4691 26.2572 22.5881 26.2572C22.709 26.2572 22.8298 26.2114 22.9196 26.1199C23.1045 25.9368 23.1045 25.6402 22.9196 25.457L18.2815 20.8153C18.1881 20.7238 18.0691 20.678 17.9501 20.678ZM8.11182 20.8373C8.07154 20.8373 8.03126 20.8428 7.99097 20.8538L5.89808 21.4141C5.73694 21.458 5.6106 21.5844 5.56666 21.7455L5.00818 23.8366C4.96424 23.9977 5.01002 24.1698 5.1272 24.2888L6.65796 25.8196C6.74769 25.9093 6.86671 25.9569 6.98939 25.9569C7.0315 25.9569 7.07178 25.9514 7.11207 25.9423L9.20313 25.3801C9.36426 25.338 9.49061 25.2117 9.53455 25.0487L10.0949 22.9595C10.1388 22.7965 10.0912 22.6244 9.974 22.5054L8.44324 20.9746C8.35352 20.8867 8.2345 20.8391 8.11182 20.8373ZM7.97083 21.8279L9.1189 22.976L8.69959 24.5452L7.13038 24.9663L5.98231 23.8183L6.40162 22.249L7.97083 21.8279Z",
+  svgPathGridIconViewBox: "0 0 30 30",
   menuOrder: 10,
-  optionOnlyForResidents: 'onlyForResidentsMaintenance',
-  textEmptyDescription: 'allows your users to submit Requests (such as maintenance requests) that all appear in this job board.',
-  textEmptyExample: 'Example might be; Fix my light bulb, hand rail is broken, or please send flowers to Mum.',
-  textEmptyJobTypes: 'Please add the many categories of request types that exist in your village which work alongside the Maintenance area.',
-  textEmptyJobTypesExample: 'Example might be; Electrical, Plumbing, Gardening, or General Maintenance.',
-  textNewTypeButton: 'NEW REQUEST TYPE',
-  textTitleJobTypes: 'Request Types',
-  textJobType: 'Request Type',
-  textAreYouSureYouWantToDelete: 'Are you sure you want to delete that request?',
-  textAreYouSureYouWantToDeleteNote: 'Are you sure you want to delete that note?',
+  optionOnlyForResidents: "onlyForResidentsMaintenance",
+  textEmptyDescription: "allows your users to submit Requests (such as maintenance requests) that all appear in this job board.",
+  textEmptyExample: "Example might be; Fix my light bulb, hand rail is broken, or please send flowers to Mum.",
+  textEmptyJobTypes: "Please add the many categories of request types that exist in your village which work alongside the Maintenance area.",
+  textEmptyJobTypesExample: "Example might be; Electrical, Plumbing, Gardening, or General Maintenance.",
+  textNewTypeButton: "NEW REQUEST TYPE",
+  textTitleJobTypes: "Request Types",
+  textJobType: "Request Type",
+  textAreYouSureYouWantToDelete: "Are you sure you want to delete that request?",
+  textAreYouSureYouWantToDeleteNote: "Are you sure you want to delete that note?",
   textChangedRequestStatus: "changed a maintenance request's status:",
-  textAddedRequest: 'added a maintenance request:',
-  textEditedRequest: 'edited a maintenance request:',
-  textRemovedRequest: 'removed a maintenance request:',
-  textSingularName: 'Request',
-  textYourRequestHere: 'Your Requests will show here',
-  textTitleRequests: 'Requests',
-  textMenuTitle: 'Maintenance',
-  textPermissionMaintenanceTracking: 'Maintenance Tracking',
-  textPermissionManageMaintenanceTypes: 'Manage Maintenance Types',
-  textPermissionManageAssignedMaintenance: 'Manage Assigned Maintenance',
-  textHiddenSectionMaintenanceRequests: 'Maintenance requests',
-  keyHiddenSectionMaintenanceRequests: 'maintenanceRequest',
+  textAddedRequest: "added a maintenance request:",
+  textEditedRequest: "edited a maintenance request:",
+  textRemovedRequest: "removed a maintenance request:",
+  textSingularName: "Request",
+  textYourRequestHere: "Your Requests will show here",
+  textTitleRequests: "Requests",
+  textMenuTitle: "Maintenance",
+  textPermissionMaintenanceTracking: "Maintenance Tracking",
+  textPermissionManageMaintenanceTypes: "Manage Maintenance Types",
+  textPermissionManageAssignedMaintenance: "Manage Assigned Maintenance",
+  textHiddenSectionMaintenanceRequests: "Maintenance requests",
+  keyHiddenSectionMaintenanceRequests: "maintenanceRequest",
   hasMoreSection: true,
-  textMoreSectionMaintenance: 'Maintenance',
-  featureKeyMoreSectionMaintenance: 'maintenance',
-  optionKeyMoreSectionMaintenance: 'maintenanceRequest',
-  hiddenKeyMoreSectionMaintenance: 'maintenanceRequest',
+  textMoreSectionMaintenance: "Maintenance",
+  featureKeyMoreSectionMaintenance: "maintenance",
+  optionKeyMoreSectionMaintenance: "maintenanceRequest",
+  hiddenKeyMoreSectionMaintenance: "maintenanceRequest",
   forceCustomFields: false,
-  textEntityName: 'Job',
+  textEntityName: "Job",
   hasHelpButton: true,
-  helpGuideURL: '',
-  stringConfigJobStatus: 'maintenanceJobStatus',
-  stringConfigHideSeen: 'maintenanceDisableSeen',
+  helpGuideURL: "",
+  stringConfigJobStatus: "maintenanceJobStatus",
+  stringConfigHideSeen: "maintenanceDisableSeen",
   // Comment subscription notification preference
   notificationPreference: {
-    key: 'maintenancerequestComments',
-    label: 'Maintenance comments',
-    permission: 'maintenanceTracking'
+    key: "maintenancerequestComments",
+    label: "Maintenance comments",
+    permission: "maintenanceTracking"
   }
 };
@@ -131,7 +96,7 @@ var FeatureConfig = {
   key: values.featureKey,
   aliases: values.aliases,
   singularName: values.textSingularName,
-  description: 'Submit maintenance requests and track the progress.',
+  description: "Submit maintenance requests and track the progress.",
   emptyText: values.textYourRequestHere,
   widgetOptions: [{
     key: values.featureKey,
@@ -139,10 +104,10 @@ var FeatureConfig = {
     main: true,
     hideOnTabNumbers: [],
     optionKey: values.optionOnlyForResidents,
-    type: 'toggle',
+    type: "toggle",
     inverseOption: false,
-    title: 'Limit Admins to Only Submit on Behalf of Primary Users',
-    description: 'This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.',
+    title: "Limit Admins to Only Submit on Behalf of Primary Users",
+    description: "This will limit admins to only make a submission on behalf of a primary users in the site. Otherwise they can also submit on behalf of other admins/staff users.",
     defaultNew: false,
     default: false
   }],
@@ -155,20 +120,20 @@ var FeatureConfig = {
     url: values.routeRequestsHub,
     countProps: null,
     visibleExps: {
-      type: 'and',
+      type: "and",
       exps: [{
-        type: 'feature',
+        type: "feature",
         value: values.featureKey
       }, {
-        type: 'or',
+        type: "or",
         exps: [{
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceTracking
         }, {
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceTypes
         }, {
-          type: 'permission',
+          type: "permission",
           value: values.permissionMaintenanceAssignment
         }]
       }]
@@ -180,15 +145,24 @@ var FeatureConfig = {
   permissions: [{
     displayName: values.textPermissionMaintenanceTracking,
     key: values.permissionMaintenanceTracking,
-    hq: false
+    hq: false,
+    category: PERMISSION_CATEGORIES.FACILITIES_BOOKINGS,
+    helperText: "Allows tracking and managing maintenance requests and job status updates.",
+    importance: IMPORTANCE_LEVELS.IMPORTANT
   }, {
     displayName: values.textPermissionManageMaintenanceTypes,
     key: values.permissionMaintenanceTypes,
-    hq: false
+    hq: false,
+    category: PERMISSION_CATEGORIES.FACILITIES_BOOKINGS,
+    helperText: "Allows creating and configuring maintenance request types and categories.",
+    importance: IMPORTANCE_LEVELS.IMPORTANT
   }, {
     displayName: values.textPermissionManageAssignedMaintenance,
     key: values.permissionMaintenanceAssignment,
-    hq: false
+    hq: false,
+    category: PERMISSION_CATEGORIES.FACILITIES_BOOKINGS,
+    helperText: "Allows assigning and managing assigned maintenance requests.",
+    importance: IMPORTANCE_LEVELS.IMPORTANT
   }],
   hiddenSections: [{
     displayName: values.textHiddenSectionMaintenanceRequests,
@@ -233,21 +207,21 @@ var FeatureConfig = {
     exact: true
   }],
   env: {
-    baseStage: '',
-    baseAPIUrl: '',
-    baseUploadsUrl: '',
-    uploadBucket: '',
-    colourBrandingMain: '',
-    colourBrandingOff: '',
-    colourBrandingApp: '',
-    defaultProfileImage: '',
-    utcOffset: '',
+    baseStage: "",
+    baseAPIUrl: "",
+    baseUploadsUrl: "",
+    uploadBucket: "",
+    colourBrandingMain: "",
+    colourBrandingOff: "",
+    colourBrandingApp: "",
+    defaultProfileImage: "",
+    utcOffset: "",
     hasAvailableNews: false,
     newsHaveTags: true,
     defaultAllowComments: true,
-    makeApiKey: '',
-    logo: '',
-    clientName: ''
+    makeApiKey: "",
+    logo: "",
+    clientName: ""
   },
   init: environment => {
     FeatureConfig.env = environment;
@@ -256,51 +230,24 @@ var FeatureConfig = {
   notificationPreference: values.notificationPreference
 };
-function asyncGeneratorStep(n, t, e, r, o, a, c) {
-  try {
-    var i = n[a](c),
-      u = i.value;
-  } catch (n) {
-    return void e(n);
-  }
-  i.done ? t(u) : Promise.resolve(u).then(r, o);
-}
-function _asyncToGenerator(n) {
-  return function () {
-    var t = this,
-      e = arguments;
-    return new Promise(function (r, o) {
-      var a = n.apply(t, e);
-      function _next(n) {
-        asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
-      }
-      function _throw(n) {
-        asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
-      }
-      _next(void 0);
-    });
-  };
-}
 var JOBS_LOADED = values.actionJobsLoaded;
-var JOBS_ADDED = values.actionJobsAdded;
 var JOBS_LOADING = values.actionJobsLoading;
 var JOBS_REMOVED = values.actionJobsRemoved;
 var JOBS_TYPES_LOADED = values.actionJobsTypesLoaded;
 var JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
 var JOBS_HIDE_SEEN = values.actionJobsHideSeen;
-function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$8(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
-  Helper: Helper$5,
+  Helper: Helper$6,
   Session: Session$9
 } = PlussCore;
 var maintenanceActions = {
   getJobType: (site, typeId) => {
-    var url = Helper$5.getUrl(values.serviceKey, 'getjobtype');
+    var url = Helper$6.getUrl(values.serviceKey, "getjobtype");
     return Session$9.authedFunction({
-      method: 'POST',
+      method: "POST",
       url,
       data: {
         site,
@@ -309,9 +256,9 @@ var maintenanceActions = {
     });
   },
   getJobTypes: (site, id) => {
-    var url = Helper$5.getUrl(values.serviceKey, 'getjobtypes');
+    var url = Helper$6.getUrl(values.serviceKey, "getjobtypes");
     return Session$9.authedFunction({
-      method: 'POST',
+      method: "POST",
       url,
       data: {
         site
@@ -319,9 +266,9 @@ var maintenanceActions = {
     });
   },
   getJob: (site, id) => {
-    var url = Helper$5.getUrl(values.serviceKey, 'getJob');
+    var url = Helper$6.getUrl(values.serviceKey, "getJob");
     return Session$9.authedFunction({
-      method: 'POST',
+      method: "POST",
       url,
       data: {
         site,
@@ -330,9 +277,9 @@ var maintenanceActions = {
     });
   },
   getJobByJobId: (site, jobId) => {
-    var url = Helper$5.getUrl(values.serviceKey, 'getJob');
+    var url = Helper$6.getUrl(values.serviceKey, "getJob");
     return Session$9.authedFunction({
-      method: 'POST',
+      method: "POST",
       url,
       data: {
         site,
@@ -341,11 +288,11 @@ 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] : '';
+    var status = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
+    var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "";
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'getJobs'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "getJobs"),
       data: {
         site,
         status,
@@ -353,67 +300,47 @@ var maintenanceActions = {
       }
     });
   },
-  getJobs2: (site, status, priority, type, lastKey, assignee, startTime, endTime, search) => {
+  getJobs2: (site, status, type, lastKey) => {
     var query = {
       site
     };
     if (status) {
       query.status = status;
     }
-    if (priority) {
-      query.priority = priority;
-    }
     if (type) {
       query.type = type;
     }
     if (lastKey) {
       query.lastKey = JSON.stringify(lastKey);
     }
-    if (assignee) {
-      query.assignee = assignee;
-    }
-    if (startTime) {
-      query.startTime = startTime;
-    }
-    if (endTime) {
-      query.endTime = endTime;
-    }
-    if (search) {
-      query.search = search;
-    }
     return Session$9.authedFunction({
-      method: 'GET',
-      url: Helper$5.getUrl(values.serviceKey, 'get/requests', query)
+      method: "GET",
+      url: Helper$6.getUrl(values.serviceKey, "get/requests", query)
     });
   },
-  /**
-   * @deprecated Use getJobs2 with pagination instead.
-   * This method recursively fetches ALL pages which can be slow for large datasets.
-   * For better performance, use getJobs2 directly and implement pagination in the UI.
-   */
   getJobsRecursive: function getJobsRecursive(site, status, type, lastKey) {
     var jobs = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
-    return new Promise((resolve, reject) => {
-      maintenanceActions.getJobs2(site, status, undefined, type, lastKey).then(jobRes => {
+    return new Promise(resolve => {
+      maintenanceActions.getJobs2(site, status, type, lastKey).then(jobRes => {
         var newJobs = [...jobs, ...jobRes.data.Items];
         if (!jobRes.data.LastKey) {
           return resolve(newJobs);
         }
-        maintenanceActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs).then(resolve).catch(reject);
-      }).catch(reject);
+        return resolve(maintenanceActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
+      });
     });
   },
   createJob: job => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'sendMaintenance'),
-      data: _objectSpread$7({}, job)
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "sendMaintenance"),
+      data: _objectSpread$8({}, job)
     });
   },
   editJob: (job, site) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'editJob'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "editJob"),
       data: {
         job,
         site
@@ -422,8 +349,8 @@ var maintenanceActions = {
   },
   deleteJob: (site, id) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'requests/remove'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "requests/remove"),
       data: {
         site,
         id
@@ -432,8 +359,8 @@ var maintenanceActions = {
   },
   editJobStatus: (id, status) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'editJobStatus'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "editJobStatus"),
       data: {
         id,
         status
@@ -442,8 +369,8 @@ var maintenanceActions = {
   },
   editJobPriority: (id, priority) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'update/priority'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "update/priority"),
       data: {
         id,
         priority
@@ -452,8 +379,8 @@ var maintenanceActions = {
   },
   assignJob: (jobId, userId) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'update/assign'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "update/assign"),
       data: {
         id: jobId,
         userId
@@ -462,47 +389,47 @@ var maintenanceActions = {
   },
   getAssignees: site => {
     return Session$9.authedFunction({
-      method: 'GET',
-      url: Helper$5.getUrl(values.serviceKey, 'get/assignees', {
+      method: "GET",
+      url: Helper$6.getUrl(values.serviceKey, "get/assignees", {
         site
       })
     });
   },
   addNote: (jobId, note, attachments, images) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "requests/note"),
       data: {
         id: jobId,
         note,
         attachments,
         images,
-        action: 'AddNote'
+        action: "AddNote"
       }
     });
   },
   editNote: (jobId, noteId, note, attachments, images) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "requests/note"),
       data: {
         id: jobId,
         note,
         attachments,
         images,
         noteId,
-        action: 'EditNote'
+        action: "EditNote"
       }
     });
   },
   deleteNote: (jobId, noteId) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'requests/note'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "requests/note"),
       data: {
         id: jobId,
         noteId,
-        action: 'DeleteNote'
+        action: "DeleteNote"
       }
     });
   },
@@ -517,8 +444,8 @@ var maintenanceActions = {
       customFields: customFields || []
     };
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'createJobType'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "createJobType"),
       data
     });
   },
@@ -535,15 +462,15 @@ var maintenanceActions = {
     };
     if (hasCustomFields && customFields) data.customFields = customFields;
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'editJobType'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "editJobType"),
       data
     });
   },
   deleteJobType: (site, id) => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'deleteJobType'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "deleteJobType"),
       data: {
         site,
         id
@@ -552,16 +479,16 @@ var maintenanceActions = {
   },
   getExternalSync: jobId => {
     return Session$9.authedFunction({
-      method: 'GET',
-      url: Helper$5.getUrl(values.serviceKey, 'get/externalsync', {
+      method: "GET",
+      url: Helper$6.getUrl(values.serviceKey, "get/externalsync", {
         id: jobId
       })
     });
   },
   retrySync: jobId => {
     return Session$9.authedFunction({
-      method: 'POST',
-      url: Helper$5.getUrl(values.serviceKey, 'update/retrysync'),
+      method: "POST",
+      url: Helper$6.getUrl(values.serviceKey, "update/retrysync"),
       data: {
         id: jobId
       }
@@ -570,7 +497,7 @@ var maintenanceActions = {
 };
 var {
-  Helper: Helper$4,
+  Helper: Helper$5,
   Session: Session$8
 } = PlussCore;
 var reactionActions = {
@@ -587,8 +514,8 @@ var reactionActions = {
       data.image = image;
     }
     return Session$8.authedFunction({
-      method: 'POST',
-      url: Helper$4.getUrl('reactions', 'comments/add'),
+      method: "POST",
+      url: Helper$5.getUrl("reactions", "comments/add"),
       data
     });
   },
@@ -610,8 +537,8 @@ var reactionActions = {
       query.minTime = minTime;
     }
     return Session$8.authedFunction({
-      method: 'GET',
-      url: Helper$4.getUrl('reactions', 'comments/get', query)
+      method: "GET",
+      url: Helper$5.getUrl("reactions", "comments/get", query)
     });
   }
 };
@@ -645,20 +572,19 @@ var jobStatusOptions = [
 ];
 var {
-  Helper: Helper$3
+  Helper: Helper$4
 } = PlussCore;
 var jobsUpdate = (site, isdashboard) => {
   return dispatch => {
     if (isdashboard) dispatch({
       type: JOBS_LOADING
     });
-    maintenanceActions.getJobs2(site).then(res => {
-      var currentSite = Helper$3.readStorageWithCookie('site');
-      var jobs = res.data.Items;
-      if (!_.isEmpty(jobs) && jobs[0].site === currentSite) {
+    maintenanceActions.getJobsRecursive(site).then(res => {
+      var currentSite = Helper$4.readStorageWithCookie("site");
+      if (!_.isEmpty(res) && res[0].site === currentSite) {
         dispatch({
           type: JOBS_LOADED,
-          payload: jobs
+          payload: res
         });
       } else {
         dispatch({
@@ -666,12 +592,6 @@ var jobsUpdate = (site, isdashboard) => {
           payload: []
         });
       }
-    }).catch(error => {
-      console.error('jobsUpdate error', error);
-      dispatch({
-        type: JOBS_LOADED,
-        payload: []
-      });
     });
   };
 };
@@ -681,12 +601,6 @@ var jobsLoaded = events => {
     payload: events
   };
 };
-var jobsAdded = events => {
-  return {
-    type: JOBS_ADDED,
-    payload: events
-  };
-};
 var removeJob = id => {
   return {
     type: JOBS_REMOVED,
@@ -807,10 +721,10 @@ var jobPriorityOptions = [
 	}
 ];
-var STATUS_IMCOMPLETE = 'All Incomplete';
-var STATUS_NOT_ACTIONED = 'Not Actioned';
-var STATUS_IN_PROGRESS = 'In Progress';
-var STATUS_COMPLETED = 'Completed';
+var STATUS_IMCOMPLETE = "All Incomplete";
+var STATUS_NOT_ACTIONED = "Not Actioned";
+var STATUS_IN_PROGRESS = "In Progress";
+var STATUS_COMPLETED = "Completed";
 var getDefaultPriority = () => jobPriorityOptions.find(p => p.default);
 var getJobPriority = priority => {
   var priorityOption = null;
@@ -818,8 +732,8 @@ var getJobPriority = priority => {
   return priorityOption || getDefaultPriority();
 };
-function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$7(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$7(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$7(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Session: Session$7,
   Components: Components$7,
@@ -835,75 +749,25 @@ class JobList extends Component {
         id: j.userID,
         displayName: j.userName,
         profilePic: j.userProfilePic
-      })), 'id'), 'displayName', 'asc');
+      })), "id"), "displayName", "asc");
       this.setState({
         requesters
       });
     });
-    _defineProperty(this, "refresh", () => {
-      var {
-        auth
-      } = this.props;
-      this.setState({
-        loading: true,
-        lastKey: null,
-        hasMore: true
-      }, /*#__PURE__*/_asyncToGenerator(function* () {
-        try {
-          var statusForApi = _this.state.selectedStatusFilter === STATUS_IMCOMPLETE ? undefined : _this.state.selectedStatusFilter;
-          var res = yield maintenanceActions.getJobs2(auth.site, statusForApi, _this.state.selectedPriorityFilter, _this.state.selectedTypeFilter, null,
-          // first page
-          _this.state.selectedUserFilter, _this.state.selectedTimeFilterStart, _this.state.selectedTimeFilterEnd, _this.state.search);
-          var jobs = res.data.Items;
-          var lastKey = res.data.LastKey;
-          _this.setRequesters(jobs);
-          _this.props.jobsLoaded(jobs);
-          _this.setState({
-            lastKey,
-            hasMore: !!lastKey,
-            loading: false
-          });
-        } catch (error) {
-          console.error('refresh error', error);
-          _this.setState({
-            loading: false
-          });
-        }
-      }));
-    });
-    _defineProperty(this, "loadMore", () => {
+    _defineProperty(this, "getJobs", /*#__PURE__*/_asyncToGenerator(function* () {
       var {
         auth
-      } = this.props;
-      var {
-        loading,
-        loadingMore,
-        hasMore,
-        lastKey
-      } = this.state;
-      if (loading || loadingMore || !hasMore || !lastKey) return;
-      this.setState({
-        loadingMore: true
-      }, /*#__PURE__*/_asyncToGenerator(function* () {
-        try {
-          var statusForApi = _this.state.selectedStatusFilter === STATUS_IMCOMPLETE ? undefined : _this.state.selectedStatusFilter;
-          var res = yield maintenanceActions.getJobs2(auth.site, statusForApi, _this.state.selectedPriorityFilter, _this.state.selectedTypeFilter, lastKey, _this.state.selectedUserFilter, _this.state.selectedTimeFilterStart, _this.state.selectedTimeFilterEnd, _this.state.search);
-          var newJobs = res.data.Items;
-          var newLastKey = res.data.LastKey;
-          _this.props.jobsAdded(newJobs);
-          _this.setState({
-            lastKey: newLastKey,
-            hasMore: !!newLastKey,
-            loadingMore: false
-          });
-        } catch (error) {
-          console.error('loadMore error', error);
-          _this.setState({
-            loadingMore: false
-          });
+      } = _this.props;
+      try {
+        var res = yield maintenanceActions.getJobsRecursive(auth.site);
+        if (!_.isEmpty(res) && res[0].site === auth.site) {
+          _this.setRequesters(res);
+          _this.props.jobsLoaded(res);
         }
-      }));
-    });
+      } catch (error) {
+        console.error("getJobs", error);
+      }
+    }));
     _defineProperty(this, "getAssignees", /*#__PURE__*/_asyncToGenerator(function* () {
       try {
         var res = yield maintenanceActions.getAssignees(_this.props.auth.site);
@@ -911,7 +775,7 @@ class JobList extends Component {
           assignees: res.data.Users
         });
       } catch (error) {
-        console.error('getAssignees', error);
+        console.error("getAssignees", error);
       }
     }));
     _defineProperty(this, "sortByCol", col => {
@@ -931,20 +795,20 @@ class JobList extends Component {
       }
     });
     _defineProperty(this, "onRemoveRequest", /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator(function* (request) {
+      var _ref3 = _asyncToGenerator(function* (request) {
         if (window.confirm(values.textAreYouSureYouWantToDelete)) {
           _this.props.removeJob(request.id);
           try {
             yield maintenanceActions.deleteJob(_this.props.auth.site, request.id);
-            _this.refresh();
+            _this.getJobs();
           } catch (error) {
-            console.log('onRemoveRequest', error);
-            alert('Something went wrong with the request. Please try again.');
+            console.log("onRemoveRequest", error);
+            alert("Something went wrong with the request. Please try again.");
           }
         }
       });
       return function (_x) {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }());
     _defineProperty(this, "openFilter", filter => {
@@ -958,22 +822,22 @@ class JobList extends Component {
       });
     });
     _defineProperty(this, "selectTypeFilter", filter => {
-      this.closeFilter();
       this.setState({
         selectedTypeFilter: filter
-      }, () => this.refresh());
+      });
+      this.closeFilter();
     });
     _defineProperty(this, "selectPriorityFilter", filter => {
-      this.closeFilter();
       this.setState({
         selectedPriorityFilter: filter
-      }, () => this.refresh());
+      });
+      this.closeFilter();
     });
     _defineProperty(this, "selectStatusFilter", filter => {
-      this.closeFilter();
       this.setState({
         selectedStatusFilter: filter
-      }, () => this.refresh());
+      });
+      this.closeFilter();
     });
     _defineProperty(this, "timeFilterChanged", selectedTimeFilter => {
       this.setState({
@@ -993,42 +857,42 @@ class JobList extends Component {
       if (this.state.selectedTimeFilter.dayCount > 0) {
         return true;
       }
-      return moment(this.state.timeFilterStart).startOf('d').valueOf() < moment(this.state.timeFilterEnd).endOf('d').valueOf();
+      return moment(this.state.timeFilterStart).startOf("d").valueOf() < moment(this.state.timeFilterEnd).endOf("d").valueOf();
     });
     _defineProperty(this, "saveTimeFilter", () => {
       if (!this.isValidTimeFilter()) {
         return;
       }
       var startTime = 0;
-      var endTime = moment().endOf('d').valueOf();
-      var text = '';
+      var endTime = moment().endOf("d").valueOf();
+      var text = "";
       if (this.state.selectedTimeFilter.dayCount > 0) {
-        startTime = moment().add(-this.state.selectedTimeFilter.dayCount, 'd').startOf('d').valueOf();
+        startTime = moment().add(-this.state.selectedTimeFilter.dayCount, "d").startOf("d").valueOf();
         text = this.state.selectedTimeFilter.text;
       } else {
-        var startDate = moment(this.state.timeFilterStart).startOf('d');
-        var endDate = moment(this.state.timeFilterEnd).endOf('d');
+        var startDate = moment(this.state.timeFilterStart).startOf("d");
+        var endDate = moment(this.state.timeFilterEnd).endOf("d");
         startTime = startDate.valueOf();
         endTime = endDate.valueOf();
-        text = "".concat(startDate.format('DD/MM/YYYY'), "  to  ").concat(endDate.format('DD/MM/YYYY'));
+        text = "".concat(startDate.format("DD/MM/YYYY"), "  to  ").concat(endDate.format("DD/MM/YYYY"));
       }
-      this.closeFilter();
       this.setState({
         selectedTimeFilterStart: startTime,
         selectedTimeFilterEnd: endTime,
         selectedTimeFilterText: text
-      }, () => this.refresh());
+      });
+      this.closeFilter();
     });
     _defineProperty(this, "removeTimeFilter", () => {
       this.setState({
         selectedTimeFilterStart: null,
         selectedTimeFilterEnd: null,
         selectedTimeFilterText: null
-      }, () => this.refresh());
+      });
     });
     _defineProperty(this, "onHandleChange", event => {
       var stateChange = {};
-      stateChange[event.target.getAttribute('id')] = event.target.value;
+      stateChange[event.target.getAttribute("id")] = event.target.value;
       this.setState(stateChange);
     });
     _defineProperty(this, "onSelectAssignee", user => {
@@ -1040,10 +904,9 @@ class JobList extends Component {
       this.setState({
         selectedUserFilter: null,
         selectedUserFilterText: null
-      }, () => this.refresh());
+      });
     });
     _defineProperty(this, "saveUserFilter", () => {
-      this.closeFilter();
       if (!this.state.selectedAssignee) {
         this.removeUserFilter();
       } else {
@@ -1051,8 +914,9 @@ class JobList extends Component {
           selectedUserFilter: this.state.selectedAssignee.id,
           selectedUserFilterText: this.state.selectedAssignee.displayName,
           selectedAssignee: null
-        }, () => this.refresh());
+        });
       }
+      this.closeFilter();
     });
     _defineProperty(this, "onSelectRequester", user => {
       this.setState({
@@ -1084,41 +948,82 @@ class JobList extends Component {
         lastSearch: thisSearchTime
       });
       setTimeout(() => {
-        // Debounced: trigger server-side refresh after user stops typing
+        // delayed setter to avoid filtering on every keypress
         if (this.state.lastSearch === thisSearchTime) {
-          this.refresh();
+          this.setState({
+            searchTerm: this.state.search
+          });
         }
       }, 500);
     });
     _defineProperty(this, "getSource", () => {
       var source = this.props.source;
-      // Client-side filter: Incomplete status (composite filter, not supported server-side)
-      if (this.state.selectedStatusFilter === STATUS_IMCOMPLETE) {
+      // filter by time
+      if (this.state.selectedTimeFilterStart && this.state.selectedTimeFilterEnd) {
+        source = _.filter(source, r => {
+          return r.createdUnix >= this.state.selectedTimeFilterStart && r.createdUnix <= this.state.selectedTimeFilterEnd;
+        });
+      }
+      // filter by type
+      if (this.state.selectedTypeFilter) {
+        source = _.filter(source, r => {
+          return r.type === this.state.selectedTypeFilter;
+        });
+      }
+      // filter by priority
+      if (this.state.selectedPriorityFilter) {
+        var defaultPriority = getDefaultPriority().name;
+        source = _.filter(source, r => {
+          return r.priority === this.state.selectedPriorityFilter || this.state.selectedPriorityFilter === defaultPriority && _.isNil(r.priority);
+        });
+      }
+      // filter by status
+      if (this.state.selectedStatusFilter) {
         var {
           statusTypes
         } = this.props;
+        var defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
         source = _.filter(source, r => {
-          var status = statusTypes.find(s => s.text === r.status);
-          return !status || status.category !== STATUS_COMPLETED;
+          var status = statusTypes.find(s => s.text === r.status) || defaultStatus;
+          if (this.state.selectedStatusFilter === STATUS_IMCOMPLETE) {
+            return status.category !== STATUS_COMPLETED;
+          }
+          return status.text === this.state.selectedStatusFilter;
+        });
+      }
+      if (this.state.selectedUserFilter) {
+        source = _.filter(source, r => {
+          return r.AssigneeId === this.state.selectedUserFilter;
         });
       }
-      // Client-side filter: requester (not supported server-side)
       if (this.state.selectedRequesterFilter) {
         source = _.filter(source, r => {
           return r.userID === this.state.selectedRequesterFilter;
         });
       }
-      // Note: status, type, priority, assignee, time range, and search filters
-      // are all applied server-side via getJobs2 pagination.
+      if (!_.isEmpty(this.state.searchTerm)) {
+        source = _.filter(source, r => {
+          if (r.jobId && r.jobId === this.state.searchTerm) {
+            return true;
+          }
+          if (r.room && r.room.toLowerCase().indexOf(this.state.searchTerm.toLowerCase()) > -1) {
+            return true;
+          }
+          if (r.title && r.title.toLowerCase().indexOf(this.state.searchTerm.toLowerCase()) > -1) {
+            return true;
+          }
+          return false;
+        });
+      }
       source = _.sortBy(source, event => {
-        if (this.state.sortColumn === 'assigned') {
-          return event.Assignee ? event.Assignee.displayName : 'Unassigned';
+        if (this.state.sortColumn === "assigned") {
+          return event.Assignee ? event.Assignee.displayName : "Unassigned";
         }
-        if (this.state.sortColumn !== 'createdUnix') return event[this.state.sortColumn];
+        if (this.state.sortColumn !== "createdUnix") return event[this.state.sortColumn];
         return event.createdUnix;
       });
       if (this.state.sortDesc) source.reverse();
@@ -1126,14 +1031,14 @@ class JobList extends Component {
     });
     _defineProperty(this, "getCustomFieldValue", field => {
       switch (field.type) {
-        case 'date':
-          return field.answer ? moment(field.answer, 'YYYY-MM-DD').format('DD-MMM-YYYY') : '';
-        case 'time':
-          return field.answer ? moment(field.answer, 'HH:mm').format('h:mm a') : '';
-        case 'yn':
-          return field.answer ? 'Yes' : 'No';
-        case 'checkbox':
-          return field.answer && Array.isArray(field.answer) ? field.answer.join(', ') : '';
+        case "date":
+          return field.answer ? moment(field.answer, "YYYY-MM-DD").format("DD-MMM-YYYY") : "";
+        case "time":
+          return field.answer ? moment(field.answer, "HH:mm").format("h:mm a") : "";
+        case "yn":
+          return field.answer ? "Yes" : "No";
+        case "checkbox":
+          return field.answer && Array.isArray(field.answer) ? field.answer.join(", ") : "";
         default:
           return field.answer;
       }
@@ -1147,7 +1052,7 @@ class JobList extends Component {
       if (customFields && Array.isArray(customFields)) {
         customFields.forEach(field => {
           // Exclude un-exportable fields
-          if (['image', 'document', 'staticTitle', 'staticText'].includes(field.type)) return;
+          if (["image", "document", "staticTitle", "staticText"].includes(field.type)) return;
           var fieldKey = "".concat(_.camelCase(type), ".").concat(_.camelCase(field.label));
           // Build custom columns
           var exists = customColumns.find(c => c.key === fieldKey);
@@ -1169,10 +1074,10 @@ class JobList extends Component {
       var source = this.getSource().map(r => {
         var history = r.history || [];
         var progressEntry = _.find(history, e => {
-          return e.status !== 'Unassigned';
+          return e.status !== "Unassigned";
         });
         var completedEntry = _.find(history, e => {
-          return e.status === 'Completed';
+          return e.status === "Completed";
         });
         var progressTime = null;
         var completedTime = null;
@@ -1186,22 +1091,22 @@ class JobList extends Component {
           completedTime = moment.utc(completedEntry.timestamp).format();
           completedDuration = moment.utc(completedEntry.timestamp).unix() - moment.utc(r.createdTime).unix();
         }
-        var notes = '';
+        var notes = "";
         (r.Notes || []).forEach((note, index) => {
           if (index > 0) {
-            notes += '\n\n';
+            notes += "\n\n";
           }
           if (note.User && !_.isEmpty(note.User.displayName)) {
             notes += "".concat(note.User.displayName, ":\n");
           }
           if (note.Timestamp) {
-            notes += "".concat(moment(note.Timestamp).format('DD-MM-YYYY h:mma'), "\n");
+            notes += "".concat(moment(note.Timestamp).format("DD-MM-YYYY h:mma"), "\n");
           }
           notes += note.Note;
         });
         var customFieldValues = this.getCustomFields(r, customColumns);
         var priority = r.priority || defaultPriority;
-        return _objectSpread$6(_objectSpread$6(_objectSpread$6({}, r), customFieldValues), {}, {
+        return _objectSpread$7(_objectSpread$7(_objectSpread$7({}, r), customFieldValues), {}, {
           notes,
           progressTime,
           completedTime,
@@ -1212,7 +1117,7 @@ class JobList extends Component {
       });
       // Compose revised columns list with custom fields
-      var index = this.exportColumns.findIndex(c => c.key === 'notes');
+      var index = this.exportColumns.findIndex(c => c.key === "notes");
       var columns = [...this.exportColumns.slice(0, index), ...customColumns, ...this.exportColumns.slice(index)];
       return {
         columns,
@@ -1234,67 +1139,64 @@ class JobList extends Component {
       });
     });
     this.state = {
-      sortColumn: 'createdUnix',
+      showCompleted: false,
+      sortColumn: "createdUnix",
       sortDesc: true,
       selectedTimeFilter: Analytics$2.getAnalyticsFilterOptions()[1],
       assignees: [],
-      requesters: [],
-      loading: false,
-      loadingMore: false,
-      lastKey: null,
-      hasMore: true
+      requesters: []
     };
     this.exportColumns = [{
-      label: 'Select All',
-      key: ''
+      label: "Select All",
+      key: ""
     }, {
-      label: 'System Id',
-      key: 'id'
+      label: "System Id",
+      key: "id"
     }, {
       label: "".concat(values.textEntityName, " No."),
-      key: 'jobId'
+      key: "jobId"
     }, {
       label: values.textJobType,
-      key: 'type'
+      key: "type"
     }, {
-      label: 'Status',
-      key: 'status'
+      label: "Status",
+      key: "status"
     }, {
-      label: 'Priority',
-      key: 'priority'
+      label: "Priority",
+      key: "priority"
     }, {
-      label: 'Title',
-      key: 'title'
+      label: "Title",
+      key: "title"
     }, {
-      label: 'Address',
-      key: 'room'
+      label: "Address",
+      key: "room"
     }, {
-      label: 'Description',
-      key: 'description'
+      label: "Description",
+      key: "description"
     }, {
-      label: 'Notes',
-      key: 'notes'
+      label: "Notes",
+      key: "notes"
     }, {
-      label: 'User Name',
-      key: 'userName'
+      label: "User Name",
+      key: "userName"
     }, {
-      label: 'User ID',
-      key: 'userID'
+      label: "User ID",
+      key: "userID"
     }, {
-      label: 'Request Time',
-      key: 'createdTime'
+      label: "Request Time",
+      key: "createdTime"
     }, {
-      label: 'Progress Time',
-      key: 'progressTime'
+      label: "Progress Time",
+      key: "progressTime"
     }, {
-      label: 'Completed Time',
-      key: 'completedTime'
+      label: "Completed Time",
+      key: "completedTime"
     }, {
-      label: 'Time to Progress (in seconds)',
-      key: 'progressDuration'
+      label: "Time to Progress (in seconds)",
+      key: "progressDuration"
     }, {
-      label: 'Time to Complete (in seconds)',
-      key: 'completedDuration'
+      label: "Time to Complete (in seconds)",
+      key: "completedDuration"
     }];
   }
   UNSAFE_componentWillMount() {
@@ -1302,14 +1204,14 @@ class JobList extends Component {
   }
   componentDidMount() {
     this.props.jobStatusesUpdate(this.props.auth.site);
-    this.refresh();
+    this.getJobs();
     this.getAssignees();
   }
   renderFilterPopup() {
     if (!this.state.filterOpen) {
       return null;
     }
-    if (this.state.filterOpen === 'type') {
+    if (this.state.filterOpen === "type") {
       return /*#__PURE__*/jsx(Components$7.Popup, {
         title: "Select ".concat(values.textJobType),
         maxWidth: 600,
@@ -1327,7 +1229,7 @@ class JobList extends Component {
         })
       });
     }
-    if (this.state.filterOpen === 'priority') {
+    if (this.state.filterOpen === "priority") {
       return /*#__PURE__*/jsx(Components$7.Popup, {
         title: "Select Priority",
         maxWidth: 600,
@@ -1345,7 +1247,7 @@ class JobList extends Component {
         })
       });
     }
-    if (this.state.filterOpen === 'status') {
+    if (this.state.filterOpen === "status") {
       var {
         statusTypes
       } = this.props;
@@ -1366,7 +1268,7 @@ class JobList extends Component {
         })
       });
     }
-    if (this.state.filterOpen === 'time') {
+    if (this.state.filterOpen === "time") {
       return /*#__PURE__*/jsx(Components$7.Popup, {
         title: "Select Time",
         maxWidth: 600,
@@ -1374,13 +1276,13 @@ class JobList extends Component {
         hasPadding: true,
         onClose: this.closeFilter,
         buttons: [{
-          type: 'primaryAction',
+          type: "primaryAction",
           onClick: this.saveTimeFilter,
-          text: 'Select',
+          text: "Select",
           isActive: this.isValidTimeFilter()
         }],
         children: /*#__PURE__*/jsx("div", {
-          style: {
+          iconStyle: {
             minHeight: 150
           },
           children: /*#__PURE__*/jsx(Components$7.AnalyticsFilter, {
@@ -1391,19 +1293,19 @@ class JobList extends Component {
         })
       });
     }
-    if (this.state.filterOpen === 'user') {
+    if (this.state.filterOpen === "user") {
       var userContent = null;
       if (this.state.selectedAssignee) {
         userContent = /*#__PURE__*/jsx("div", {
           children: /*#__PURE__*/jsx(Components$7.UserListing, {
             user: this.state.selectedAssignee,
-            rightContent: /*#__PURE__*/jsx(Components$7.SVGIcon, {
+            rightContent: /*#__PURE__*/jsx(Icon, {
               className: "removeIcon",
-              icon: "close",
+              icon: "xmark",
               onClick: () => {
                 this.onSelectAssignee();
               },
-              colour: Colours$3.COLOUR_DUSK
+              colour: Colours$4.COLOUR_DUSK
             })
           }, this.state.selectedAssignee.id)
         });
@@ -1438,27 +1340,27 @@ class JobList extends Component {
         hasPadding: true,
         onClose: this.closeFilter,
         buttons: [{
-          type: 'primaryAction',
+          type: "primaryAction",
           onClick: this.saveUserFilter,
-          text: 'Select',
+          text: "Select",
           isActive: true
         }],
         children: userContent
       });
     }
-    if (this.state.filterOpen === 'requester') {
+    if (this.state.filterOpen === "requester") {
       var _userContent = null;
       if (this.state.selectedRequester) {
         _userContent = /*#__PURE__*/jsx("div", {
           children: /*#__PURE__*/jsx(Components$7.UserListing, {
             user: this.state.selectedRequester,
-            rightContent: /*#__PURE__*/jsx(Components$7.SVGIcon, {
+            rightContent: /*#__PURE__*/jsx(Icon, {
               className: "removeIcon",
-              icon: "close",
+              icon: "xmark",
               onClick: () => {
                 this.onSelectRequester();
               },
-              colour: Colours$3.COLOUR_DUSK
+              colour: Colours$4.COLOUR_DUSK
             })
           }, this.state.selectedRequester.id)
         });
@@ -1493,9 +1395,9 @@ class JobList extends Component {
         hasPadding: true,
         onClose: this.closeFilter,
         buttons: [{
-          type: 'primaryAction',
+          type: "primaryAction",
           onClick: this.saveRequesterFilter,
-          text: 'Select',
+          text: "Select",
           isActive: true
         }],
         children: _userContent
@@ -1528,7 +1430,7 @@ class JobList extends Component {
         }), /*#__PURE__*/jsx("td", {
           children: ev.type
         }), /*#__PURE__*/jsx("td", {
-          children: moment.utc(ev.createdTime).local().format('D MMM YY')
+          children: moment.utc(ev.createdTime).local().format("D MMM YY")
         }), /*#__PURE__*/jsx("td", {
           children: ev.room
         }), /*#__PURE__*/jsx("td", {
@@ -1539,34 +1441,34 @@ class JobList extends Component {
               profilePic: ev.userProfilePic
             },
             textClass: "fontSize-13"
-          }) : 'Unknown'
+          }) : "Unknown"
         }), /*#__PURE__*/jsx("td", {
           children: ev.Assignee ? /*#__PURE__*/jsx(Components$7.UserListing, {
             user: ev.Assignee,
             textClass: "fontSize-13"
-          }) : 'Unassigned'
+          }) : "Unassigned"
         }), /*#__PURE__*/jsx("td", {
           children: /*#__PURE__*/jsx("div", {
             style: {
-              textAlign: 'center',
+              textAlign: "center",
               borderRadius: 4,
               width: 100,
               paddingTop: 2,
               paddingBottom: 2,
-              color: '#fff',
+              color: "#fff",
               backgroundColor: status ? status.color : undefined
             },
-            children: status ? status.text : ''
+            children: status ? status.text : ""
           })
         }), /*#__PURE__*/jsx("td", {
           children: /*#__PURE__*/jsx("div", {
             style: {
-              textAlign: 'center',
+              textAlign: "center",
               borderRadius: 4,
               width: 100,
               paddingTop: 2,
               paddingBottom: 2,
-              color: '#fff',
+              color: "#fff",
               backgroundColor: priority.color
             },
             children: priority.name
@@ -1574,30 +1476,30 @@ class JobList extends Component {
         }), /*#__PURE__*/jsx("td", {
           className: "table-options",
           children: /*#__PURE__*/jsxs("div", {
-            style: {
-              display: 'flex',
-              alignItems: 'center'
+            iconStyle: {
+              display: "flex",
+              alignItems: "center"
             },
             children: [/*#__PURE__*/jsx(Link, {
               to: "".concat(values.routeRequestDetails, "/").concat(ev.id),
-              children: /*#__PURE__*/jsx(FontAwesome, {
+              children: /*#__PURE__*/jsx(Icon, {
                 style: {
                   fontSize: 20,
                   padding: 5,
-                  cursor: 'pointer'
+                  cursor: "pointer"
                 },
-                name: "pencil"
+                icon: "pencil"
               })
             }), Session$7.validateAccess(this.props.auth.site, values.permissionMaintenanceTracking, this.props.auth) && /*#__PURE__*/jsx("a", {
               onClick: () => this.onRemoveRequest(ev),
-              children: /*#__PURE__*/jsx(FontAwesome, {
+              children: /*#__PURE__*/jsx(Icon, {
                 style: {
                   fontSize: 20,
                   padding: 5,
                   marginLeft: 8,
-                  cursor: 'pointer'
+                  cursor: "pointer"
                 },
-                name: "minus-circle"
+                icon: "circle-minus"
               })
             })]
           })
@@ -1611,26 +1513,26 @@ class JobList extends Component {
       sortDesc
     } = this.state;
     if (col !== sortColumn) return null;
-    return /*#__PURE__*/jsx(FontAwesome, {
+    return /*#__PURE__*/jsx(Icon, {
       style: {
         marginLeft: 5
       },
-      name: sortDesc ? 'chevron-up' : 'chevron-down'
+      icon: sortDesc ? "fa-".concat("chevron-up") : "fa-".concat("chevron-down")
     });
   }
   sortIsActive(col) {
-    if (col !== this.state.sortColumn) return '';
-    return ' table--columnActive';
+    if (col !== this.state.sortColumn) return "";
+    return " table--columnActive";
   }
   renderEmpty() {
     var title = this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleRequests;
     return /*#__PURE__*/jsxs("div", {
       style: {
-        display: 'flex',
-        flexDirection: 'column',
+        display: "flex",
+        flexDirection: "column",
         flex: 1,
-        justifyContent: 'center',
-        alignItems: 'center',
+        justifyContent: "center",
+        alignItems: "center",
         marginTop: 32
       },
       children: [/*#__PURE__*/jsx("div", {
@@ -1639,7 +1541,7 @@ class JobList extends Component {
         className: "marginTop-32",
         style: {
           maxWidth: 500,
-          textAlign: 'center'
+          textAlign: "center"
         },
         children: /*#__PURE__*/jsxs("span", {
           className: "fontRegular fontSize-13",
@@ -1652,149 +1554,112 @@ class JobList extends Component {
         className: "marginTop-8 fontRegular fontSize-13",
         style: {
           maxWidth: 500,
-          textAlign: 'center'
+          textAlign: "center"
         },
         children: values.textEmptyExample
       })]
     });
   }
   renderContent() {
-    if (this.state.loading) {
-      return /*#__PURE__*/jsx("div", {
-        style: {
-          display: 'flex',
-          justifyContent: 'center',
-          padding: 40
-        },
-        children: /*#__PURE__*/jsx(FontAwesome, {
-          style: {
-            fontSize: 32,
-            color: '#ccc'
-          },
-          name: "spinner fa-pulse fa-fw"
-        })
-      });
-    }
     if (_.isEmpty(this.props.source)) return this.renderEmpty();
-    return /*#__PURE__*/jsxs("div", {
-      children: [/*#__PURE__*/jsxs(Table, {
-        className: "plussTable",
-        striped: true,
-        bordered: true,
-        condensed: true,
-        hover: true,
-        style: {
-          minWidth: '100%'
-        },
-        children: [/*#__PURE__*/jsx("thead", {
-          children: /*#__PURE__*/jsxs("tr", {
-            children: [/*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('jobId')),
-              style: {
-                cursor: 'pointer',
-                width: 70
-              },
-              onClick: () => {
-                this.sortByCol('jobId');
-              },
-              children: [values.textEntityName, " No.", this.renderSort('jobId')]
-            }), /*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('title')),
-              style: {
-                cursor: 'pointer'
-              },
-              onClick: () => {
-                this.sortByCol('title');
-              },
-              children: ["Title", this.renderSort('title')]
-            }), /*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('type')),
-              style: {
-                cursor: 'pointer',
-                width: 100
-              },
-              onClick: () => {
-                this.sortByCol('type');
-              },
-              children: [values.textJobType, this.renderSort('type')]
-            }), /*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('createdUnix')),
-              style: {
-                cursor: 'pointer',
-                width: 80
-              },
-              onClick: () => {
-                this.sortByCol('createdUnix');
-              },
-              children: ["Date", this.renderSort('createdUnix')]
-            }), /*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('room')),
-              style: {
-                cursor: 'pointer',
-                width: 100
-              },
-              onClick: () => {
-                this.sortByCol('room');
-              },
-              children: ["Address", this.renderSort('room')]
-            }), /*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('userName')),
-              style: {
-                cursor: 'pointer',
-                width: 150
-              },
-              onClick: () => {
-                this.sortByCol('userName');
-              },
-              children: ["Submitted By", this.renderSort('userName')]
-            }), /*#__PURE__*/jsxs("th", {
-              className: "".concat(this.sortIsActive('assigned')),
-              style: {
-                cursor: 'pointer',
-                width: 150
-              },
-              onClick: () => {
-                this.sortByCol('assigned');
-              },
-              children: ["Assigned To", this.renderSort('assigned')]
-            }), /*#__PURE__*/jsx("th", {
-              style: {
-                width: 120
-              },
-              children: "Status"
-            }), /*#__PURE__*/jsx("th", {
-              style: {
-                width: 120
-              },
-              children: "Priority"
-            }), /*#__PURE__*/jsx("th", {
-              style: {
-                width: 50
-              }
-            })]
-          })
-        }), /*#__PURE__*/jsx("tbody", {
-          children: this.renderRequests()
-        })]
-      }), this.state.hasMore && /*#__PURE__*/jsx("div", {
-        style: {
-          display: 'flex',
-          justifyContent: 'center',
-          padding: '16px 0'
-        },
-        children: this.state.loadingMore ? /*#__PURE__*/jsx(FontAwesome, {
-          style: {
-            fontSize: 24,
-            color: '#ccc'
-          },
-          name: "spinner fa-pulse fa-fw"
-        }) : /*#__PURE__*/jsx(Components$7.Button, {
-          inline: true,
-          buttonType: "tertiary",
-          onClick: this.loadMore,
-          isActive: true,
-          children: "Load More"
+    return /*#__PURE__*/jsxs(Table, {
+      className: "plussTable",
+      striped: true,
+      bordered: true,
+      condensed: true,
+      hover: true,
+      style: {
+        minWidth: "100%"
+      },
+      children: [/*#__PURE__*/jsx("thead", {
+        children: /*#__PURE__*/jsxs("tr", {
+          children: [/*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("jobId")),
+            style: {
+              cursor: "pointer",
+              width: 70
+            },
+            onClick: () => {
+              this.sortByCol("jobId");
+            },
+            children: [values.textEntityName, " No.", this.renderSort("jobId")]
+          }), /*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("title")),
+            style: {
+              cursor: "pointer"
+            },
+            onClick: () => {
+              this.sortByCol("title");
+            },
+            children: ["Title", this.renderSort("title")]
+          }), /*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("type")),
+            style: {
+              cursor: "pointer",
+              width: 100
+            },
+            onClick: () => {
+              this.sortByCol("type");
+            },
+            children: [values.textJobType, this.renderSort("type")]
+          }), /*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("createdUnix")),
+            style: {
+              cursor: "pointer",
+              width: 80
+            },
+            onClick: () => {
+              this.sortByCol("createdUnix");
+            },
+            children: ["Date", this.renderSort("createdUnix")]
+          }), /*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("room")),
+            style: {
+              cursor: "pointer",
+              width: 100
+            },
+            onClick: () => {
+              this.sortByCol("room");
+            },
+            children: ["Address", this.renderSort("room")]
+          }), /*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("userName")),
+            style: {
+              cursor: "pointer",
+              width: 150
+            },
+            onClick: () => {
+              this.sortByCol("userName");
+            },
+            children: ["Submitted By", this.renderSort("userName")]
+          }), /*#__PURE__*/jsxs("th", {
+            className: "".concat(this.sortIsActive("assigned")),
+            style: {
+              cursor: "pointer",
+              width: 150
+            },
+            onClick: () => {
+              this.sortByCol("assigned");
+            },
+            children: ["Assigned To", this.renderSort("assigned")]
+          }), /*#__PURE__*/jsx("th", {
+            iconStyle: {
+              width: 120
+            },
+            children: "Status"
+          }), /*#__PURE__*/jsx("th", {
+            iconStyle: {
+              width: 120
+            },
+            children: "Priority"
+          }), /*#__PURE__*/jsx("th", {
+            iconStyle: {
+              width: 50
+            }
+          })]
         })
+      }), /*#__PURE__*/jsx("tbody", {
+        children: this.renderRequests()
       })]
     });
   }
@@ -1802,42 +1667,42 @@ class JobList extends Component {
     var typeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
-        this.openFilter('type');
+        this.openFilter("type");
       },
       text: values.textJobType
     });
     var statusFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
-        this.openFilter('status');
+        this.openFilter("status");
       },
       text: "Status"
     });
     var priorityFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
-        this.openFilter('priority');
+        this.openFilter("priority");
       },
       text: "Priority"
     });
     var timeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
-        this.openFilter('time');
+        this.openFilter("time");
       },
       text: "Time"
     });
     var userFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
-        this.openFilter('user');
+        this.openFilter("user");
       },
       text: "Assigned To"
     });
     var requesterFilter = /*#__PURE__*/jsx(Components$7.Tag, {
       className: "marginRight-10",
       onClick: () => {
-        this.openFilter('requester');
+        this.openFilter("requester");
       },
       text: "Submitted By"
     });
@@ -1845,7 +1710,7 @@ class JobList extends Component {
       typeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('type');
+          this.openFilter("type");
         },
         rightIcon: "close",
         rightClick: e => {
@@ -1859,7 +1724,7 @@ class JobList extends Component {
       priorityFilter = /*#__PURE__*/jsx(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('priority');
+          this.openFilter("priority");
         },
         rightIcon: "close",
         rightClick: e => {
@@ -1873,7 +1738,7 @@ class JobList extends Component {
       statusFilter = /*#__PURE__*/jsx(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('status');
+          this.openFilter("status");
         },
         rightIcon: "close",
         rightClick: e => {
@@ -1887,7 +1752,7 @@ class JobList extends Component {
       timeFilter = /*#__PURE__*/jsx(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('time');
+          this.openFilter("time");
         },
         rightIcon: "close",
         rightClick: e => {
@@ -1901,7 +1766,7 @@ class JobList extends Component {
       userFilter = /*#__PURE__*/jsx(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('user');
+          this.openFilter("user");
         },
         rightIcon: "close",
         rightClick: e => {
@@ -1915,7 +1780,7 @@ class JobList extends Component {
       requesterFilter = /*#__PURE__*/jsx(Components$7.Tag, {
         className: "marginRight-10",
         onClick: () => {
-          this.openFilter('requester');
+          this.openFilter("requester");
         },
         rightIcon: "close",
         rightClick: e => {
@@ -1938,7 +1803,7 @@ class JobList extends Component {
         }), /*#__PURE__*/jsx(Components$7.Button, {
           inline: true,
           buttonType: "primaryAction",
-          leftIcon: "file-code-o",
+          leftIcon: "file-code",
           onClick: this.onOpenExportCsv,
           isActive: !_.isEmpty(this.getSource()),
           children: "Export CSV"
@@ -1973,8 +1838,8 @@ class JobList extends Component {
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
-      style: {
-        minWidth: '100%'
+      iconStyle: {
+        minWidth: "100%"
       },
       children: [this.renderFilterPopup(), this.renderCSVPopup(), this.renderFilters(), this.renderContent()]
     });
@@ -1993,7 +1858,6 @@ var mapStateToProps$7 = state => {
 };
 var JobList$1 = connect(mapStateToProps$7, {
   jobsLoaded,
-  jobsAdded,
   removeJob,
   jobStatusesUpdate
 })(withRouter(JobList));
@@ -2012,7 +1876,7 @@ class JobTypes extends Component {
         var res = yield maintenanceActions.getJobTypes(_this.props.auth.site);
         if (res.data != null) _this.props.jobTypesLoaded(res.data);
       } catch (error) {
-        console.error('getJobTypes', error);
+        console.error("getJobTypes", error);
       } finally {
         _this.setState({
           loading: false
@@ -2045,8 +1909,8 @@ class JobTypes extends Component {
             _this.props.jobTypesLoaded(newJobTypes);
           }
         } catch (error) {
-          console.error('onRemoveJobType', error);
-          alert('Something went wrong with the request. Please try again.');
+          console.error("onRemoveJobType", error);
+          alert("Something went wrong with the request. Please try again.");
         }
       });
       return function (_x) {
@@ -2055,7 +1919,7 @@ class JobTypes extends Component {
     }());
     this.state = {
       jobList: [],
-      sortColumn: 'name',
+      sortColumn: "name",
       sortDesc: false,
       loading: true
     };
@@ -2099,31 +1963,31 @@ class JobTypes extends Component {
           }), /*#__PURE__*/jsx("td", {
             className: "table-options",
             children: /*#__PURE__*/jsxs("div", {
-              style: {
-                display: 'flex',
-                alignItems: 'center'
+              iconStyle: {
+                display: "flex",
+                alignItems: "center"
               },
               children: [Session$6.validateAccess(this.props.auth.site, values.permissionMaintenanceTypes, this.props.auth) && /*#__PURE__*/jsx(Link, {
                 to: "".concat(values.routeAddRequestType, "/").concat(ev.id),
-                children: /*#__PURE__*/jsx(FontAwesome, {
+                children: /*#__PURE__*/jsx(Icon, {
                   style: {
                     fontSize: 20,
                     padding: 5,
                     marginLeft: 12,
-                    cursor: 'pointer'
+                    cursor: "pointer"
                   },
-                  name: "pencil"
+                  icon: "pencil"
                 })
               }), Session$6.validateAccess(this.props.auth.site, values.permissionMaintenanceTypes, this.props.auth) && /*#__PURE__*/jsx("a", {
                 onClick: () => this.onRemoveJobType(ev),
-                children: /*#__PURE__*/jsx(FontAwesome, {
+                children: /*#__PURE__*/jsx(Icon, {
                   style: {
                     fontSize: 20,
                     padding: 5,
                     marginLeft: 8,
-                    cursor: 'pointer'
+                    cursor: "pointer"
                   },
-                  name: "minus-circle"
+                  icon: "circle-minus"
                 })
               })]
             })
@@ -2141,30 +2005,30 @@ class JobTypes extends Component {
       condensed: true,
       hover: true,
       style: {
-        minWidth: '100%'
+        minWidth: "100%"
       },
       children: [/*#__PURE__*/jsx("thead", {
         children: /*#__PURE__*/jsxs("tr", {
           children: [/*#__PURE__*/jsxs("th", {
             style: {
-              cursor: 'pointer'
+              cursor: "pointer"
             },
-            onClick: () => this.sortByCol('name'),
+            onClick: () => this.sortByCol("name"),
             children: [values.textSingularName, " type"]
           }), /*#__PURE__*/jsx("th", {
             style: {
-              cursor: 'pointer'
+              cursor: "pointer"
             },
-            onClick: () => this.sortByCol('name'),
+            onClick: () => this.sortByCol("name"),
             children: "Type Description"
           }), /*#__PURE__*/jsx("th", {
             style: {
-              cursor: 'pointer'
+              cursor: "pointer"
             },
-            onClick: () => this.sortByCol('email'),
+            onClick: () => this.sortByCol("email"),
             children: "Email"
           }), /*#__PURE__*/jsx("th", {
-            style: {
+            iconStyle: {
               width: 70
             }
           })]
@@ -2177,11 +2041,11 @@ class JobTypes extends Component {
   renderEmpty() {
     return /*#__PURE__*/jsxs("div", {
       style: {
-        display: 'flex',
-        flexDirection: 'column',
+        display: "flex",
+        flexDirection: "column",
         flex: 1,
-        justifyContent: 'center',
-        alignItems: 'center',
+        justifyContent: "center",
+        alignItems: "center",
         marginTop: 32
       },
       children: [/*#__PURE__*/jsx("div", {
@@ -2190,7 +2054,7 @@ class JobTypes extends Component {
         className: "marginTop-32",
         style: {
           maxWidth: 500,
-          textAlign: 'center'
+          textAlign: "center"
         },
         children: /*#__PURE__*/jsx("span", {
           className: "fontRegular fontSize-13",
@@ -2200,7 +2064,7 @@ class JobTypes extends Component {
         className: "marginTop-8 fontRegular fontSize-13",
         style: {
           maxWidth: 500,
-          textAlign: 'center'
+          textAlign: "center"
         },
         children: values.textEmptyJobTypesExample
       })]
@@ -2217,27 +2081,29 @@ class JobTypes extends Component {
     } = this.state;
     if (jobList.length === 0 && loading) {
       return /*#__PURE__*/jsx("div", {
-        style: {
-          minWidth: '100%'
+        iconStyle: {
+          minWidth: "100%"
         },
         children: /*#__PURE__*/jsx("div", {
           className: "padding-60 paddingVertical-40",
           style: {
-            textAlign: 'center'
+            textAlign: "center"
           },
-          children: /*#__PURE__*/jsx(FontAwesome, {
-            style: {
+          children: /*#__PURE__*/jsx(Icon, {
+            iconStyle: {
               fontSize: 30,
               color: FeatureConfig.env.colourBrandingOff
             },
-            name: "spinner fa-pulse fa-fw"
+            icon: "spinner",
+            pulse: true,
+            fixedWidth: true
           })
         })
       });
     }
     return /*#__PURE__*/jsxs("div", {
-      style: {
-        minWidth: '100%'
+      iconStyle: {
+        minWidth: "100%"
       },
       children: [/*#__PURE__*/jsx("div", {
         className: "marginBottom-32",
@@ -2250,8 +2116,8 @@ class JobTypes extends Component {
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
-      style: {
-        minWidth: '100%'
+      iconStyle: {
+        minWidth: "100%"
       },
       children: [/*#__PURE__*/jsx("div", {
         children: this.renderJobTypes()
@@ -2275,12 +2141,12 @@ var JobTypes$1 = connect(mapStateToProps$6, {
   jobTypesUpdate
 })(withRouter(JobTypes));
-function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$6(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$6(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$6(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Session: Session$5,
   Components: Components$5,
-  Colours: Colours$2
+  Colours: Colours$3
 } = PlussCore;
 class Configuration extends Component {
   constructor(props) {
@@ -2336,7 +2202,7 @@ class Configuration extends Component {
         showWarnings: false,
         showStatusPopup: true,
         selectedStatusIndex: -1,
-        statusLabel: '',
+        statusLabel: "",
         statusCategory: STATUS_NOT_ACTIONED,
         statusColour: defaultStatus.color
       });
@@ -2375,7 +2241,7 @@ class Configuration extends Component {
     });
     _defineProperty(this, "onHandleChange", event => {
       var stateChange = {};
-      stateChange[event.target.getAttribute('id')] = event.target.value;
+      stateChange[event.target.getAttribute("id")] = event.target.value;
       this.setState(stateChange);
     });
     _defineProperty(this, "onToggleDisableSeen", () => {
@@ -2403,7 +2269,7 @@ class Configuration extends Component {
             success: true
           });
         } catch (error) {
-          console.log('onSaveConfig - error', error);
+          console.log("onSaveConfig - error", error);
           _this.setState({
             success: false
           });
@@ -2419,9 +2285,9 @@ class Configuration extends Component {
       submitting: false,
       selectedStatusIndex: -1,
       showStatusPopup: false,
-      statusLabel: '',
+      statusLabel: "",
       statusCategory: STATUS_NOT_ACTIONED,
-      statusColour: '',
+      statusColour: "",
       fetchingStatusTypes: true,
       statusTypes: this.props.statusTypes,
       fetchingHideSeen: true,
@@ -2432,8 +2298,8 @@ class Configuration extends Component {
     Session$5.checkLoggedIn(this);
   }
   componentDidMount() {
-    if (!Session$5.validateAccess(this.props.auth.site, 'featurePicker', this.props.auth, true)) {
-      this.props.history.push('/mastermenu');
+    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, statusTypes => this.setState({
         statusTypes,
@@ -2483,7 +2349,7 @@ class Configuration extends Component {
           style: styles$6.statusTypeContainer,
           children: [/*#__PURE__*/jsx("div", {
             className: "statusLabel",
-            style: _objectSpread$5(_objectSpread$5({}, styles$6.statusTextContainer), {}, {
+            style: _objectSpread$6(_objectSpread$6({}, styles$6.statusTextContainer), {}, {
               backgroundColor: status.color
             }),
             children: /*#__PURE__*/jsx("span", {
@@ -2496,39 +2362,39 @@ class Configuration extends Component {
               className: "fontMedium fontSize-16 text-dark",
               children: status.category
             })
-          }), /*#__PURE__*/jsx(FontAwesome, {
-            style: _objectSpread$5(_objectSpread$5({}, styles$6.statusIcon), {}, {
-              visibility: index === 0 ? 'hidden' : 'visible'
+          }), /*#__PURE__*/jsx(Icon, {
+            style: _objectSpread$6(_objectSpread$6({}, styles$6.statusIcon), {}, {
+              visibility: index === 0 ? "hidden" : "visible"
             }),
-            name: 'arrow-up',
+            name: "arrow-up",
             onClick: () => this.onMoveStatus(index, true)
-          }), /*#__PURE__*/jsx(FontAwesome, {
-            style: _objectSpread$5(_objectSpread$5({}, styles$6.statusIcon), {}, {
-              visibility: index === statusTypes.length - 1 ? 'hidden' : 'visible'
+          }), /*#__PURE__*/jsx(Icon, {
+            style: _objectSpread$6(_objectSpread$6({}, styles$6.statusIcon), {}, {
+              visibility: index === statusTypes.length - 1 ? "hidden" : "visible"
             }),
-            name: 'arrow-down',
+            name: "arrow-down",
             onClick: () => this.onMoveStatus(index, false)
-          }), /*#__PURE__*/jsx(FontAwesome, {
-            style: _objectSpread$5({}, styles$6.statusIcon),
-            name: "pencil",
+          }), /*#__PURE__*/jsx(Icon, {
+            style: _objectSpread$6({}, styles$6.statusIcon),
+            icon: "pencil",
             onClick: () => this.onEditStatus(index)
-          }), /*#__PURE__*/jsx(FontAwesome, {
-            style: _objectSpread$5({}, styles$6.statusIcon),
-            name: "minus-circle",
+          }), /*#__PURE__*/jsx(Icon, {
+            style: _objectSpread$6({}, styles$6.statusIcon),
+            icon: "circle-minus",
             onClick: () => this.onDeleteStatus(index)
           })]
         }, "".concat(status.text, "_").concat(index));
       }), /*#__PURE__*/jsxs("div", {
         onClick: this.onAddStatus,
         style: {
-          display: 'flex',
-          flexDirection: 'row',
-          alignItems: 'center',
+          display: "flex",
+          flexDirection: "row",
+          alignItems: "center",
           marginTop: 16
         },
-        children: [/*#__PURE__*/jsx(Components$5.P60Icon, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "addoption_plus",
-          icon: "add",
+          icon: "plus",
           style: {
             fontSize: 12
           }
@@ -2570,8 +2436,8 @@ class Configuration extends Component {
   renderSuccess() {
     if (!this.state.success) return null;
     return /*#__PURE__*/jsx("span", {
-      style: _objectSpread$5(_objectSpread$5({}, styles$6.savedText), {}, {
-        color: Colours$2.COLOUR_GREEN
+      iconStyle: _objectSpread$6(_objectSpread$6({}, styles$6.savedText), {}, {
+        color: Colours$3.COLOUR_GREEN
       }),
       children: "Saved"
     });
@@ -2593,21 +2459,21 @@ class Configuration extends Component {
       minWidth: 450,
       hasPadding: true,
       buttons: [{
-        type: 'primaryAction',
+        type: "primaryAction",
         onClick: this.onSaveStatus,
         isActive: canSave,
         isActive: true,
-        text: submitting ? 'Saving...' : 'Save',
-        className: 'popupButton'
+        text: submitting ? "Saving..." : "Save",
+        className: "popupButton"
       }, {
-        type: 'outlinedAction',
+        type: "outlinedAction",
         onClick: this.onHideStatusPopup,
         isActive: !submitting,
-        text: 'Cancel',
-        className: 'popupButton'
+        text: "Cancel",
+        className: "popupButton"
       }],
       onClose: this.onHideStatusPopup,
-      title: selectedStatusIndex < 0 ? 'New Status' : 'Edit Status',
+      title: selectedStatusIndex < 0 ? "New Status" : "Edit Status",
       children: [/*#__PURE__*/jsx(Components$5.GenericInput, {
         id: "statusLabel",
         type: "text",
@@ -2626,15 +2492,15 @@ class Configuration extends Component {
           className: "marginBottom-16",
           children: [/*#__PURE__*/jsx("div", {
             className: "marginBottom-4",
-            children: 'This is used to categorise statuses for filtering and analytics purposes'
+            children: "This is used to categorise statuses for filtering and analytics purposes"
           }), /*#__PURE__*/jsx("div", {
             className: "text-bold",
-            children: 'This status is considered'
+            children: "This status is considered"
           })]
         }),
         className: "marginBottom-20",
         rowStyle: {
-          flexDirection: 'column'
+          flexDirection: "column"
         },
         buttonStyle: {
           marginBottom: 8
@@ -2660,7 +2526,7 @@ class Configuration extends Component {
           })
         }]
       }), /*#__PURE__*/jsx(Components$5.ColourOptions, {
-        options: ['vibrant', 'picker'],
+        options: ["vibrant", "picker"],
         defaultTab: "vibrant",
         value: statusColour,
         onColourSelected: statusColour => this.setState({
@@ -2683,11 +2549,11 @@ class Configuration extends Component {
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
-      style: {
-        minWidth: '100%'
+      iconStyle: {
+        minWidth: "100%"
       },
       children: [this.renderStatuses(), this.renderOtherOptions(), /*#__PURE__*/jsxs("div", {
-        style: {
+        iconStyle: {
           paddingTop: 24,
           paddingBottom: 24
         },
@@ -2700,13 +2566,13 @@ var styles$6 = {
   statusCategoryHeading: {
     marginLeft: 130,
     width: 160,
-    textAlign: 'center',
+    textAlign: "center",
     marginBottom: 12
   },
   statusTypeContainer: {
-    display: 'flex',
-    flexDirection: 'row',
-    alignItems: 'center',
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center",
     marginBottom: 20
   },
   statusTextContainer: {
@@ -2714,19 +2580,19 @@ var styles$6 = {
   },
   statusCategoryContainer: {
     width: 160,
-    textAlign: 'center'
+    textAlign: "center"
   },
   statusIcon: {
-    cursor: 'pointer',
+    cursor: "pointer",
     fontSize: 20,
     padding: 5,
     marginLeft: 10,
-    color: Colours$2.COLOUR_BRANDING_ACTION,
-    visibility: 'visible'
+    color: Colours$3.COLOUR_BRANDING_ACTION,
+    visibility: "visible"
   },
   savedText: {
     fontSize: 14,
-    lineHeight: '33px',
+    lineHeight: "33px",
     marginLeft: 15
   }
 };
@@ -2754,7 +2620,55 @@ var {
 } = PlussCore;
 class RequestsHub extends Component {
   constructor(props) {
+    var _this;
     super(props);
+    _this = this;
+    _defineProperty(this, "setData", () => {
+      var allList = [];
+      this.state.allList.forEach(ev => {
+        if (ev != null && !ev.Deleted) allList.push(ev);
+      });
+      var upcoming = _.filter(allList, ev => {
+        if (!ev) return false;
+        if (ev.status && ev.status === "Completed") return false;
+        return true;
+      });
+      var completed = _.filter(allList, ev => {
+        if (!ev) return false;
+        if (ev.status && ev.status === "Completed") return true;
+        return false;
+      });
+      // console.log('setData', upcoming, completed);
+      this.setState({
+        allList,
+        upcoming,
+        completed
+      });
+    });
+    _defineProperty(this, "getData", () => {
+      var {
+        auth
+      } = this.props;
+      this.setState({
+        loadingAll: true
+      }, /*#__PURE__*/_asyncToGenerator(function* () {
+        try {
+          var res = yield maintenanceActions.getJobsRecursive(auth.site);
+          _this.setState({
+            loadingAll: false
+          });
+          if (!_.isEmpty(res) && res[0].site === auth.site) {
+            _this.props.jobsLoaded(res);
+          }
+        } catch (error) {
+          console.error("getData", error);
+          _this.setState({
+            loadingAll: false
+          });
+        }
+      }));
+    });
     _defineProperty(this, "onAddNew", () => {
       var {
         auth
@@ -2775,74 +2689,91 @@ class RequestsHub extends Component {
       var {
         auth
       } = this.props;
-      if (Session$4.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return isClass ? '' : true;
-      return isClass ? ' hub-sideContent-topButton--hide' : false;
+      if (Session$4.validateAccess(auth.site, values.permissionMaintenanceTracking, auth)) return isClass ? "" : true;
+      return isClass ? " hub-sideContent-topButton--hide" : false;
     });
     _defineProperty(this, "getSideBarSectionColour", id => this.state.selectedSection === id ? {
-      backgroundColor: '#fff'
+      backgroundColor: "#fff"
     } : {});
-    _defineProperty(this, "renderStats", (stat, loading) => loading ? /*#__PURE__*/jsx(FontAwesome, {
+    _defineProperty(this, "renderStats", (stat, loading) => loading ? /*#__PURE__*/jsx(Icon, {
       style: styles$5.spinner,
-      name: "spinner fa-pulse fa-fw"
+      icon: "spinner",
+      pulse: true,
+      fixedWidth: true
     }) : stat);
     this.state = {
-      selectedSection: 'all',
-      location: '',
+      selectedSection: "all",
+      location: "",
+      loadingAll: false,
       loadingSubmissions: false,
       submissionEntries: [],
+      allList: [],
+      completed: [],
+      upcoming: [],
       now: moment.utc(),
       onlyFuture: true,
-      search: ''
+      search: ""
     };
   }
+  UNSAFE_componentWillMount() {
+    this.updateProps(this.props);
+  }
   componentDidMount() {
-    // Data fetching is now handled by JobList component with pagination
+    this.getData();
+  }
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (!_.isEqual(this.props.jobs, nextProps.jobs)) this.updateProps(nextProps);
+  }
+  updateProps(props) {
+    this.setState({
+      allList: props.jobs
+    }, this.setData);
   }
   renderLeftBar() {
     var sectionItems = [];
     if (this.canAddNew()) {
       sectionItems.push({
-        type: 'newButton',
+        type: "newButton",
         text: "New ".concat(values.textSingularName),
         onClick: this.onAddNew
       });
     }
     sectionItems.push({
-      type: 'navItem',
+      type: "navItem",
       text: "View ".concat(values.textSingularName, "s"),
-      icon: 'eye',
+      icon: "eye",
       isFontAwesome: true,
-      selected: this.state.selectedSection === 'all',
+      selected: this.state.selectedSection === "all",
       onClick: () => {
         this.setState({
-          selectedSection: 'all'
+          selectedSection: "all"
         });
       }
     });
     if (Session$4.validateAccess(this.props.auth.site, values.permissionMaintenanceTypes, this.props.auth)) {
       sectionItems.push({
-        type: 'navItem',
+        type: "navItem",
         text: values.textTitleJobTypes,
         // icon: 'maintenance2',
         // isSVG: true,
-        selected: this.state.selectedSection === 'requestTypes',
+        selected: this.state.selectedSection === "requestTypes",
         onClick: () => {
           this.setState({
-            selectedSection: 'requestTypes'
+            selectedSection: "requestTypes"
           });
         }
       });
     }
-    if (Session$4.validateAccess(this.props.auth.site, 'featurePicker', this.props.auth)) {
+    if (Session$4.validateAccess(this.props.auth.site, "featurePicker", this.props.auth)) {
       sectionItems.push({
-        type: 'navItem',
-        text: 'Feature Configuration',
-        icon: 'settings',
+        type: "navItem",
+        text: "Feature Configuration",
+        icon: "settings",
         isFontAwesome: false,
-        selected: this.state.selectedSection === 'config',
+        selected: this.state.selectedSection === "config",
         onClick: () => {
           this.setState({
-            selectedSection: 'config'
+            selectedSection: "config"
           });
         }
       });
@@ -2860,14 +2791,16 @@ class RequestsHub extends Component {
     });
   }
   renderRight() {
-    if (this.state.selectedSection === 'requestTypes') {
+    if (this.state.selectedSection === "requestTypes") {
       return /*#__PURE__*/jsx(JobTypes$1, {
         onNew: this.onAddRequestType
       });
-    } else if (this.state.selectedSection === 'config') {
+    } else if (this.state.selectedSection === "config") {
       return /*#__PURE__*/jsx(Configuration$1, {});
     }
-    return /*#__PURE__*/jsx(JobList$1, {});
+    return /*#__PURE__*/jsx(JobList$1, {
+      source: this.state.allList
+    });
   }
   render() {
     return /*#__PURE__*/jsxs("div", {
@@ -2884,21 +2817,21 @@ class RequestsHub extends Component {
 }
 var styles$5 = {
   sideBarTitleSection: {
-    lineHeight: '40px',
+    lineHeight: "40px",
     marginTop: 30,
     marginBottom: 30,
     paddingLeft: 24,
     paddingRight: 24
   },
   sideBarSection: {
-    weight: '100%',
+    weight: "100%",
     minWidth: 200,
     padding: 32,
     paddingLeft: 24,
-    cursor: 'pointer',
-    display: 'flex',
-    flexDirection: 'column',
-    justifyContent: 'center'
+    cursor: "pointer",
+    display: "flex",
+    flexDirection: "column",
+    justifyContent: "center"
   },
   spinner: {
     fontSize: 32,
@@ -2910,19 +2843,22 @@ var mapStateToProps$4 = state => {
     auth
   } = state;
   return {
+    jobs: state[values.reducerKey].jobs,
     auth,
     strings: state.strings && state.strings.config || {}
   };
 };
-var RequestsHub$1 = connect(mapStateToProps$4, {})(withRouter(RequestsHub));
+var RequestsHub$1 = connect(mapStateToProps$4, {
+  jobsLoaded
+})(withRouter(RequestsHub));
-function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Apis: Apis$1,
-  Helper: Helper$2,
+  Helper: Helper$3,
   Session: Session$3,
-  Colours: Colours$1,
+  Colours: Colours$2,
   Components: Components$3
 } = PlussCore;
 var IMAGE_SIZE_NOTE = 72;
@@ -3006,7 +2942,7 @@ class Job extends Component {
       var statusType = statusTypes.find(s => s.text === status);
       if (!statusType) {
         var defaultStatus = statusTypes.find(s => s.category === STATUS_NOT_ACTIONED);
-        statusType = _objectSpread$4(_objectSpread$4({}, defaultStatus), {}, {
+        statusType = _objectSpread$5(_objectSpread$5({}, defaultStatus), {}, {
           text: status
         });
       }
@@ -3201,7 +3137,7 @@ class Job extends Component {
       }
       maintenanceActions.deleteNote(this.state.jobId, n.Id);
       var newNotes = _.filter(this.state.job.Notes, note => note.Id !== n.Id);
-      var newJob = _objectSpread$4({}, this.state.job);
+      var newJob = _objectSpread$5({}, this.state.job);
       newJob.Notes = newNotes;
       this.setState({
         job: newJob,
@@ -3286,7 +3222,7 @@ class Job extends Component {
     _defineProperty(this, "onSelectPriority", /*#__PURE__*/function () {
       var _ref0 = _asyncToGenerator(function* (priority) {
         _this.setState({
-          job: _objectSpread$4(_objectSpread$4({}, _this.state.job), {}, {
+          job: _objectSpread$5(_objectSpread$5({}, _this.state.job), {}, {
             priority
           }),
           priorityChangerOpen: false
@@ -3316,7 +3252,7 @@ class Job extends Component {
     _defineProperty(this, "onSelectStatus", /*#__PURE__*/function () {
       var _ref1 = _asyncToGenerator(function* (status) {
         _this.setState({
-          job: _objectSpread$4(_objectSpread$4({}, _this.state.job), {}, {
+          job: _objectSpread$5(_objectSpread$5({}, _this.state.job), {}, {
             status: status
           }),
           statusChangerOpen: false
@@ -3339,7 +3275,7 @@ class Job extends Component {
       };
     }());
     this.state = {
-      jobId: Helper$2.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
+      jobId: Helper$3.safeReadParams(props, "jobId") ? props.match.params.jobId : null,
       job: null,
       showingSelector: false,
       updating: false,
@@ -3531,9 +3467,9 @@ class Job extends Component {
           children: [/*#__PURE__*/jsx("div", {
             className: "commentReply_button".concat(!_.isEmpty(this.state.commentInput) ? " commentReply_button-active" : ""),
             onClick: this.onAddComment,
-            children: /*#__PURE__*/jsx(FontAwesome, {
+            children: /*#__PURE__*/jsx(Icon, {
               className: "commentReply_icon",
-              name: "paper-plane-o"
+              icon: "paper-plane"
             })
           }), /*#__PURE__*/jsx(Textarea, {
             id: "commentInput",
@@ -3560,7 +3496,7 @@ class Job extends Component {
           children: /*#__PURE__*/jsx("div", {
             className: "imageGrid_image",
             style: {
-              backgroundImage: "url('".concat(Helper$2.get1400(image), "')"),
+              backgroundImage: "url('".concat(Helper$3.get1400(image), "')"),
               width: size,
               height: size
             }
@@ -3656,7 +3592,7 @@ class Job extends Component {
     } = this.state.job;
     var hasCustomFields = customFields && customFields.length > 0;
     return /*#__PURE__*/jsxs("div", {
-      style: {
+      iconStyle: {
         paddingBottom: 40
       },
       children: [/*#__PURE__*/jsxs("div", {
@@ -3804,9 +3740,9 @@ class Job extends Component {
         className: "maintenanceNote",
         children: [/*#__PURE__*/jsxs("div", {
           className: "maintenanceNote_top",
-          children: [this.props.auth && this.props.auth.user && this.props.auth.user.Id === note.User.id && /*#__PURE__*/jsx(Components$3.SVGIcon, {
-            colour: Colours$1.COLOUR_DUSK_LIGHT,
-            icon: "more15",
+          children: [this.props.auth && this.props.auth.user && this.props.auth.user.Id === note.User.id && /*#__PURE__*/jsx(Icon, {
+            colour: Colours$2.COLOUR_DUSK_LIGHT,
+            icon: "ellipsis-vertical",
             className: "maintenanceNote_moreIcon",
             onClick: () => this.onOpenNoteMenu(index)
           }), /*#__PURE__*/jsx("p", {
@@ -3825,7 +3761,7 @@ class Job extends Component {
           })]
         }), /*#__PURE__*/jsx("p", {
           className: "maintenanceNote_text",
-          children: Helper$2.toParagraphed(note.Note)
+          children: Helper$3.toParagraphed(note.Note)
         }), note.Attachments.map((a, i) => this.renderAttachment(a, i)), note.Images && note.Images.length > 0 ? this.renderImageGrid(note.Images, IMAGE_SIZE_NOTE) : null]
       })]
     }, index);
@@ -3869,7 +3805,7 @@ class Job extends Component {
       }), /*#__PURE__*/jsx("div", {
         className: "statusLabel statusLabel-large statusLabel-full",
         style: {
-          backgroundColor: Colours$1.COLOUR_DUSK
+          backgroundColor: Colours$2.COLOUR_DUSK
         },
         children: /*#__PURE__*/jsxs("span", {
           className: "statusLabel_text",
@@ -3880,7 +3816,7 @@ class Job extends Component {
   }
   renderExternalSyncEntry(e, i) {
     var isSuccess = e.EntryType === "ExternalIDSet";
-    var backgroundColor = isSuccess ? Colours$1.COLOUR_GREEN : Colours$1.COLOUR_RED; // Green for success, red for failure
+    var backgroundColor = isSuccess ? Colours$2.COLOUR_GREEN : Colours$2.COLOUR_RED; // Green for success, red for failure
     return /*#__PURE__*/jsxs("div", {
       className: "ticketHistoryEntry",
@@ -3943,20 +3879,22 @@ class Job extends Component {
     // Show spinner while retrying
     if (retryingSync) {
-      return /*#__PURE__*/jsx(FontAwesome, {
+      return /*#__PURE__*/jsx(Icon, {
         style: {
           fontSize: 20,
-          color: Colours$1.COLOUR_DUSK_LIGHT,
+          color: Colours$2.COLOUR_DUSK_LIGHT,
           marginLeft: 8
         },
-        name: "spinner fa-pulse fa-fw"
+        icon: "spinner",
+        pulse: true,
+        fixedWidth: true
       });
     }
     return /*#__PURE__*/jsx("div", {
       className: "statusLabel pointer",
       onClick: this.onRetrySync,
       style: {
-        backgroundColor: Colours$1.COLOUR_RED,
+        backgroundColor: Colours$2.COLOUR_RED,
         marginLeft: 8
       },
       children: /*#__PURE__*/jsx("span", {
@@ -3975,11 +3913,11 @@ class Job extends Component {
     if (retrySyncError) {
       return /*#__PURE__*/jsxs(Components$3.Text, {
         type: "body",
-        children: [/*#__PURE__*/jsx(FontAwesome, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "userStatusIcon",
-          name: "times-circle",
+          icon: "circle-xmark",
           style: {
-            color: Colours$1.COLOUR_RED
+            color: Colours$2.COLOUR_RED
           }
         }), " ", retrySyncError]
       });
@@ -3989,11 +3927,11 @@ class Job extends Component {
     if (retrySyncInitiated) {
       return /*#__PURE__*/jsxs(Components$3.Text, {
         type: "body",
-        children: [/*#__PURE__*/jsx(FontAwesome, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "userStatusIcon",
-          name: "check-circle",
+          icon: "circle-check",
           style: {
-            color: Colours$1.COLOUR_GREEN
+            color: Colours$2.COLOUR_GREEN
           }
         }), " ", "Sync retry initiated. Check back shortly for results."]
       });
@@ -4003,11 +3941,11 @@ class Job extends Component {
     if (this.hasSyncFailureWithoutSuccess()) {
       return /*#__PURE__*/jsxs(Components$3.Text, {
         type: "body",
-        children: [/*#__PURE__*/jsx(FontAwesome, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "userStatusIcon",
-          name: "times-circle",
+          icon: "circle-xmark",
           style: {
-            color: Colours$1.COLOUR_RED
+            color: Colours$2.COLOUR_RED
           }
         }), " ", "External sync failed. Use the retry button to attempt again."]
       });
@@ -4067,11 +4005,11 @@ class Job extends Component {
     } = this.state;
     if (!job || !job.history) return null;
     var source = _.sortBy([...job.history.map(e => {
-      return _objectSpread$4(_objectSpread$4({}, e), {}, {
+      return _objectSpread$5(_objectSpread$5({}, e), {}, {
         EntryType: e.EntryType || "status"
       });
     }), ...(job.Notes || []).map(e => {
-      return _objectSpread$4(_objectSpread$4({}, e), {}, {
+      return _objectSpread$5(_objectSpread$5({}, e), {}, {
         timestamp: e.Timestamp,
         EntryType: "note"
       });
@@ -4146,9 +4084,11 @@ class Job extends Component {
         hasPadding: true,
         children: /*#__PURE__*/jsx("div", {
           className: "flex flex-center-row",
-          children: /*#__PURE__*/jsx(FontAwesome, {
+          children: /*#__PURE__*/jsx(Icon, {
             className: "spinner",
-            name: "spinner fa-pulse fa-fw"
+            icon: "spinner",
+            pulse: true,
+            fixedWidth: true
           })
         })
       });
@@ -4194,9 +4134,9 @@ class Job extends Component {
         onClick: () => {
           this.attachmentInput.click();
         },
-        children: [/*#__PURE__*/jsx(FontAwesome, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "iconTextButton_icon",
-          name: "paperclip"
+          icon: "paperclip"
         }), /*#__PURE__*/jsx("p", {
           className: "iconTextButton_text",
           children: "Add Attachment"
@@ -4219,22 +4159,24 @@ class Job extends Component {
     if (this.state.confirmingAssignee) {
       content = /*#__PURE__*/jsx("div", {
         className: "flex flex-center-row",
-        children: /*#__PURE__*/jsx(FontAwesome, {
+        children: /*#__PURE__*/jsx(Icon, {
           className: "spinner",
-          name: "spinner fa-pulse fa-fw"
+          icon: "spinner",
+          pulse: true,
+          fixedWidth: true
         })
       });
     } else if (this.state.selectedAssignee) {
       content = /*#__PURE__*/jsx("div", {
         children: /*#__PURE__*/jsx(Components$3.UserListing, {
           user: this.state.selectedAssignee,
-          rightContent: /*#__PURE__*/jsx(Components$3.SVGIcon, {
+          rightContent: /*#__PURE__*/jsx(Icon, {
             className: "removeIcon",
-            icon: "close",
+            icon: "xmark",
             onClick: () => {
               this.onSelectAssignee();
             },
-            colour: Colours$1.COLOUR_DUSK
+            colour: Colours$2.COLOUR_DUSK
           })
         }, this.state.selectedAssignee.id)
       });
@@ -4321,14 +4263,14 @@ var Job$1 = connect(mapStateToProps$3, {
   jobStatusesUpdate
 })(withRouter(Job));
-function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Actions,
   Components: Components$2,
-  Helper: Helper$1,
+  Helper: Helper$2,
   Session: Session$2,
-  Colours,
+  Colours: Colours$1,
   Apis
 } = PlussCore;
 class AddJob extends Component {
@@ -4347,7 +4289,7 @@ class AddJob extends Component {
           type,
           customFields
         } = res.data;
-        _this.setState(_objectSpread$3(_objectSpread$3({}, res.data), {}, {
+        _this.setState(_objectSpread$4(_objectSpread$4({}, res.data), {}, {
           prevType: type,
           prevCustomFileds: customFields,
           type,
@@ -4595,7 +4537,7 @@ class AddJob extends Component {
       event.target.value = "";
     });
     _defineProperty(this, "onToggleDatePicker", qId => {
-      var showDate = _objectSpread$3({}, this.state.showDate);
+      var showDate = _objectSpread$4({}, this.state.showDate);
       showDate[qId] = !showDate[qId];
       this.setState({
         showDate
@@ -4684,7 +4626,7 @@ class AddJob extends Component {
         if (_.isNil(answer) || _.isEmpty(answer)) return true;
         switch (type) {
           case "email":
-            return Helper$1.isEmail(answer);
+            return Helper$2.isEmail(answer);
           case "date":
             return moment(answer, "YYYY-MM-DD", true).isValid();
           case "time":
@@ -4705,7 +4647,7 @@ class AddJob extends Component {
     this.customImageInputs = {};
     this.customDocumentInputs = {};
     this.state = {
-      jobId: Helper$1.safeReadParams(this.props, "jobId") ? this.props.match.params.jobId : null,
+      jobId: Helper$2.safeReadParams(this.props, "jobId") ? this.props.match.params.jobId : null,
       job: null,
       showingSelector: false,
       updating: false,
@@ -4764,9 +4706,9 @@ class AddJob extends Component {
     } = this.state;
     return types.map(ev => {
       if (ev != null) {
-        return /*#__PURE__*/jsx(DropdownItem, {
+        return /*#__PURE__*/jsx(MenuItem, {
           eventKey: ev.typeName,
-          ive: type === ev.typeName,
+          active: type === ev.typeName,
           children: ev.typeName
         }, ev.typeName);
       }
@@ -5022,7 +4964,7 @@ class AddJob extends Component {
             className: "inputRequired "
           }) : null, /*#__PURE__*/jsxs("div", {
             className: "visitorSignIn_question",
-            style: {
+            iconStyle: {
               flex: 1
             },
             children: [/*#__PURE__*/jsx("div", {
@@ -5072,7 +5014,7 @@ class AddJob extends Component {
       case "staticText":
         return /*#__PURE__*/jsx("p", {
           className: "visitorSignIn_text-staticText",
-          children: Helper$1.toParagraphed(field.label, {
+          children: Helper$2.toParagraphed(field.label, {
             marginTop: 10
           })
         }, fieldId);
@@ -5090,9 +5032,9 @@ class AddJob extends Component {
             errorMessage: "Not a valid date",
             alwaysShowLabel: true,
             readOnly: true,
-            rightContent: !_.isEmpty(field.answer) && /*#__PURE__*/jsx(Components$2.SVGIcon, {
-              colour: Colours.COLOUR_DUSK_LIGHT,
-              icon: "close",
+            rightContent: !_.isEmpty(field.answer) && /*#__PURE__*/jsx(Icon, {
+              colour: Colours$1.COLOUR_DUSK_LIGHT,
+              icon: "xmark",
               className: "timepicker_clear",
               onClick: () => this.onChangeDateAnswer(fieldId, undefined, false)
             })
@@ -5123,9 +5065,9 @@ class AddJob extends Component {
                 width: "100%"
               }
             }),
-            rightContent: !_.isEmpty(field.answer) && /*#__PURE__*/jsx(Components$2.SVGIcon, {
-              colour: Colours.COLOUR_DUSK_LIGHT,
-              icon: "close",
+            rightContent: !_.isEmpty(field.answer) && /*#__PURE__*/jsx(Icon, {
+              colour: Colours$1.COLOUR_DUSK_LIGHT,
+              icon: "xmark",
               className: "timepicker_clear",
               onClick: () => this.onChangeTimeAnswer(fieldId, undefined)
             })
@@ -5139,7 +5081,7 @@ class AddJob extends Component {
             className: "inputRequired "
           }) : null, /*#__PURE__*/jsxs("div", {
             className: "visitorSignIn_question",
-            style: {
+            iconStyle: {
               flex: 1
             },
             children: [/*#__PURE__*/jsx(Components$2.Text, {
@@ -5162,7 +5104,7 @@ class AddJob extends Component {
             className: "inputRequired "
           }) : null, /*#__PURE__*/jsxs("div", {
             className: "visitorSignIn_question",
-            style: {
+            iconStyle: {
               flex: 1
             },
             children: [/*#__PURE__*/jsx(Components$2.Text, {
@@ -5184,9 +5126,9 @@ class AddJob extends Component {
             }), /*#__PURE__*/jsxs("div", {
               className: "iconTextButton marginBottom-16",
               onClick: () => this.customDocumentInputs[fieldId].click(),
-              children: [/*#__PURE__*/jsx(FontAwesome, {
+              children: [/*#__PURE__*/jsx(Icon, {
                 className: "iconTextButton_icon",
-                name: "paperclip"
+                icon: "paperclip"
               }), /*#__PURE__*/jsx("p", {
                 className: "iconTextButton_text",
                 children: "Add Attachment"
@@ -5214,7 +5156,7 @@ class AddJob extends Component {
       customFields
     } = this.state;
     return /*#__PURE__*/jsx("div", {
-      style: {
+      iconStyle: {
         marginBottom: 15
       },
       children: /*#__PURE__*/jsxs("div", {
@@ -5249,7 +5191,7 @@ class AddJob extends Component {
             return this.state.showWarnings && _.isEmpty(this.state.room);
           }
         }), /*#__PURE__*/jsxs("div", {
-          style: {
+          iconStyle: {
             marginBottom: 15
           },
           children: [/*#__PURE__*/jsx(Components$2.Text, {
@@ -5349,7 +5291,7 @@ var mapStateToProps$2 = state => {
   return {
     auth,
     strings: state.strings && state.strings.config || {},
-    optionOnlyForResidents: Helper$1.getSiteSettingFromState(state, values.optionOnlyForResidents)
+    optionOnlyForResidents: Helper$2.getSiteSettingFromState(state, values.optionOnlyForResidents)
   };
 };
 var AddJob$1 = connect(mapStateToProps$2, {
@@ -5361,14 +5303,14 @@ var AddJob$1 = connect(mapStateToProps$2, {
 var {
   Components: Components$1,
   Session: Session$1,
-  Helper
+  Helper: Helper$1
 } = PlussCore;
 var DEFAULT_FIELD = {
-  type: 'text',
-  label: '',
+  type: "text",
+  label: "",
   mandatory: false,
   isTitle: false,
-  values: ['']
+  values: [""]
 };
 class AddJobType extends Component {
   constructor(props) {
@@ -5395,18 +5337,18 @@ class AddJobType extends Component {
           customFields: customFields || [_.cloneDeep(DEFAULT_FIELD)]
         });
       } catch (error) {
-        console.error('getJobType', error);
+        console.error("getJobType", error);
       }
     }));
     _defineProperty(this, "getFieldTypeTitle", type => {
       var fieldType = this.fieldTypes.find(f => f.Key === type);
-      return fieldType ? fieldType.Title : '';
+      return fieldType ? fieldType.Title : "";
     });
     _defineProperty(this, "validateEmail", () => {
       var {
         jobTypeEmail
       } = this.state;
-      return !_.isEmpty(jobTypeEmail) && Helper.isEmail(jobTypeEmail);
+      return !_.isEmpty(jobTypeEmail) && Helper$1.isEmail(jobTypeEmail);
     });
     _defineProperty(this, "isJobTypeValid", () => {
       var {
@@ -5421,7 +5363,7 @@ class AddJobType extends Component {
     });
     _defineProperty(this, "onHandleChange", event => {
       var stateChange = {};
-      stateChange[event.target.getAttribute('id')] = event.target.value;
+      stateChange[event.target.getAttribute("id")] = event.target.value;
       this.setState(stateChange);
     });
     _defineProperty(this, "onFieldTypeChanged", (fieldIndex, key) => {
@@ -5483,7 +5425,7 @@ class AddJobType extends Component {
     });
     _defineProperty(this, "onAddNewOption", fieldIndex => {
       var customFields = [...this.state.customFields];
-      customFields[fieldIndex].values.push('');
+      customFields[fieldIndex].values.push("");
       this.setState({
         customFields
       });
@@ -5559,59 +5501,59 @@ class AddJobType extends Component {
             success: true
           });
         } catch (error) {
-          console.error('onSave', error);
+          console.error("onSave", error);
           _this.setState({
             submitting: false
           });
-          alert('Something went wrong with the request. Please try again.');
+          alert("Something went wrong with the request. Please try again.");
         }
       }));
     });
     this.fieldTypes = [{
-      Title: 'Text Input',
-      Key: 'text'
+      Title: "Text Input",
+      Key: "text"
     }, {
-      Title: 'Email Input',
-      Key: 'email'
+      Title: "Email Input",
+      Key: "email"
     }, {
-      Title: 'Phone Input',
-      Key: 'phone'
+      Title: "Phone Input",
+      Key: "phone"
     }, {
-      Title: 'Date Input',
-      Key: 'date'
+      Title: "Date Input",
+      Key: "date"
     }, {
-      Title: 'Time Input',
-      Key: 'time'
+      Title: "Time Input",
+      Key: "time"
     }, {
-      Title: 'Image Input',
-      Key: 'image'
+      Title: "Image Input",
+      Key: "image"
     },
     // {
     //   Title: 'Document Input',
     //   Key: 'document',
     // },
     {
-      Title: 'Yes/No Question',
-      Key: 'yn'
+      Title: "Yes/No Question",
+      Key: "yn"
     }, {
-      Title: 'Multiple Choice',
-      Key: 'multichoice'
+      Title: "Multiple Choice",
+      Key: "multichoice"
     }, {
-      Title: 'Checkboxes',
-      Key: 'checkbox'
+      Title: "Checkboxes",
+      Key: "checkbox"
     }, {
-      Title: 'Title Text',
-      Key: 'staticTitle'
+      Title: "Title Text",
+      Key: "staticTitle"
     }, {
-      Title: 'Paragraph Text',
-      Key: 'staticText'
+      Title: "Paragraph Text",
+      Key: "staticText"
     }];
     this.state = {
       loading: false,
-      jobTypeId: Helper.safeReadParams(this.props, 'jobTypeId') ? this.props.match.params.jobTypeId : null,
-      jobTypeName: '',
-      jobTypeEmail: '',
-      jobTypeDescription: '',
+      jobTypeId: Helper$1.safeReadParams(this.props, "jobTypeId") ? this.props.match.params.jobTypeId : null,
+      jobTypeName: "",
+      jobTypeEmail: "",
+      jobTypeDescription: "",
       hasCustomFields: false,
       customFields: [_.cloneDeep(DEFAULT_FIELD)],
       jobTypeLevel: 1,
@@ -5647,23 +5589,23 @@ class AddJobType extends Component {
           mandatory,
           isTitle
         } = field;
-        if (['staticTitle', 'staticText'].includes(type)) return;
+        if (["staticTitle", "staticText"].includes(type)) return;
         if (_.isEmpty(label)) {
           missingLabel = true;
-        } else if (_.isEmpty(type) || (type === 'multichoice' || type === 'checkbox') && (!values || values.length < 2 || !values.every(value => !_.isEmpty(value)))) {
+        } else if (_.isEmpty(type) || (type === "multichoice" || type === "checkbox") && (!values || values.length < 2 || !values.every(value => !_.isEmpty(value)))) {
           warnings.push("'".concat(label, "' is incomplete"));
         }
         if (mandatory) hasMandatoryField = true;
         if (isTitle) titleFieldCount += 1;
       });
       if (missingLabel) {
-        warnings.push('All inputs must have a label');
+        warnings.push("All inputs must have a label");
       }
       if (!hasMandatoryField) {
-        warnings.push('There must be at least one required input');
+        warnings.push("There must be at least one required input");
       }
       if (titleFieldCount > 1) {
-        warnings.push('Only one required input can be selected as title for the request');
+        warnings.push("Only one required input can be selected as title for the request");
       }
     }
     this.setState({
@@ -5697,7 +5639,7 @@ class AddJobType extends Component {
       children: [/*#__PURE__*/jsxs(Components$1.Text, {
         type: "formTitleLarge",
         className: "marginBottom-24",
-        children: [!jobTypeId ? 'New' : 'Edit', " ", values.textJobType]
+        children: [!jobTypeId ? "New" : "Edit", " ", values.textJobType]
       }), /*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "jobTypeName",
         type: "text",
@@ -5737,13 +5679,13 @@ class AddJobType extends Component {
         label: "Do you want to create a custom form for this ".concat("".concat(values.textJobType), "?"),
         isActive: hasCustomFields,
         options: [{
-          Label: 'Yes',
+          Label: "Yes",
           Value: true,
           onChange: () => this.setState({
             hasCustomFields: true
           })
         }, {
-          Label: 'No',
+          Label: "No",
           Value: false,
           onChange: () => this.setState({
             hasCustomFields: false
@@ -5773,14 +5715,14 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), /*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldPlaceHolder".concat(fieldIndex),
-        className: 'placeHolderInput',
-        placeholder: 'Insert placeholder (optional)',
+        className: "placeHolderInput",
+        placeholder: "Insert placeholder (optional)",
         value: field.placeHolder,
         onChange: e => this.onFieldPlaceHolderChanged(fieldIndex, e)
       }), this.renderOptionalCheckBox(field, fieldIndex), this.renderTitleCheckBox(field, fieldIndex)]
@@ -5791,8 +5733,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), this.renderOptionalCheckBox(field, fieldIndex), this.renderTitleCheckBox(field, fieldIndex)]
@@ -5803,8 +5745,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), this.renderOptionalCheckBox(field, fieldIndex), this.renderTitleCheckBox(field, fieldIndex)]
@@ -5815,8 +5757,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), this.renderOptionalCheckBox(field, fieldIndex)]
@@ -5827,8 +5769,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), this.renderOptionalCheckBox(field, fieldIndex)]
@@ -5839,8 +5781,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), /*#__PURE__*/jsxs(Table, {
@@ -5856,7 +5798,7 @@ class AddJobType extends Component {
             })]
           })
         }), /*#__PURE__*/jsx("tbody", {
-          children: ['Yes', 'No'].map((value, optionIndex) => {
+          children: ["Yes", "No"].map((value, optionIndex) => {
             return /*#__PURE__*/jsxs("tr", {
               className: "option",
               children: [/*#__PURE__*/jsx("td", {
@@ -5886,8 +5828,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), /*#__PURE__*/jsxs(Table, {
@@ -5917,15 +5859,15 @@ class AddJobType extends Component {
               }), /*#__PURE__*/jsx("td", {
                 children: /*#__PURE__*/jsx(Components$1.GenericInput, {
                   id: "fieldOption".concat(optionIndex),
-                  placeholder: 'Enter option',
+                  placeholder: "Enter option",
                   value: value,
                   onChange: e => this.onFieldOptionChanged(fieldIndex, optionIndex, e)
                 })
               }), /*#__PURE__*/jsx("td", {
                 children: customFields[fieldIndex].values.length > 1 ? /*#__PURE__*/jsx("div", {
                   onClick: () => this.onRemoveOption(fieldIndex, optionIndex),
-                  children: /*#__PURE__*/jsx(FontAwesome, {
-                    name: "minus-circle",
+                  children: /*#__PURE__*/jsx(Icon, {
+                    icon: "circle-minus",
                     className: "cornerCancelButton_icon"
                   })
                 }) : null
@@ -5936,9 +5878,9 @@ class AddJobType extends Component {
       }), /*#__PURE__*/jsxs("div", {
         className: "clearfix addoption optionAdd marginBottom-10",
         onClick: () => this.onAddNewOption(fieldIndex),
-        children: [/*#__PURE__*/jsx(Components$1.P60Icon, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "addoption_plus",
-          icon: "add-circle"
+          icon: "circle-plus"
         }), /*#__PURE__*/jsx("div", {
           className: "fillSpace",
           children: /*#__PURE__*/jsx("p", {
@@ -5957,8 +5899,8 @@ class AddJobType extends Component {
       className: "fieldInner",
       children: [/*#__PURE__*/jsx(Components$1.GenericInput, {
         id: "fieldLabel".concat(fieldIndex),
-        className: 'textInput',
-        placeholder: 'Type your label here (required)',
+        className: "textInput",
+        placeholder: "Type your label here (required)",
         value: field.label,
         onChange: e => this.onFieldLabelChanged(fieldIndex, e)
       }), /*#__PURE__*/jsxs(Table, {
@@ -5988,15 +5930,15 @@ class AddJobType extends Component {
               }), /*#__PURE__*/jsx("td", {
                 children: /*#__PURE__*/jsx(Components$1.GenericInput, {
                   id: "fieldOption".concat(optionIndex),
-                  placeholder: 'Enter option',
+                  placeholder: "Enter option",
                   value: value,
                   onChange: e => this.onFieldOptionChanged(fieldIndex, optionIndex, e)
                 })
               }), /*#__PURE__*/jsx("td", {
                 children: customFields[fieldIndex].values.length > 1 ? /*#__PURE__*/jsx("div", {
                   onClick: () => this.onRemoveOption(fieldIndex, optionIndex),
-                  children: /*#__PURE__*/jsx(FontAwesome, {
-                    name: "minus-circle",
+                  children: /*#__PURE__*/jsx(Icon, {
+                    icon: "circle-minus",
                     className: "cornerCancelButton_icon"
                   })
                 }) : null
@@ -6007,9 +5949,9 @@ class AddJobType extends Component {
       }), /*#__PURE__*/jsxs("div", {
         className: "clearfix addoption optionAdd marginBottom-10",
         onClick: () => this.onAddNewOption(fieldIndex),
-        children: [/*#__PURE__*/jsx(Components$1.P60Icon, {
+        children: [/*#__PURE__*/jsx(Icon, {
           className: "addoption_plus",
-          icon: "add-circle"
+          icon: "circle-plus"
         }), /*#__PURE__*/jsx("div", {
           className: "fillSpace",
           children: /*#__PURE__*/jsx("p", {
@@ -6050,27 +5992,27 @@ class AddJobType extends Component {
     } = this.state;
     var renderFieldContent = () => {
       switch (field.type) {
-        case 'text':
-        case 'email':
-        case 'phone':
+        case "text":
+        case "email":
+        case "phone":
           return this.renderFieldText(field, fieldIndex);
-        case 'date':
+        case "date":
           return this.renderFieldDate(field, fieldIndex);
-        case 'time':
+        case "time":
           return this.renderFieldTime(field, fieldIndex);
-        case 'image':
+        case "image":
           return this.renderFieldImage(field, fieldIndex);
-        case 'document':
+        case "document":
           return this.renderFieldDocument(field, fieldIndex);
-        case 'yn':
+        case "yn":
           return this.renderFieldYesNo(field, fieldIndex);
-        case 'multichoice':
+        case "multichoice":
           return this.renderFieldMultiple(field, fieldIndex);
-        case 'checkbox':
+        case "checkbox":
           return this.renderFieldCheckbox(field, fieldIndex);
-        case 'staticTitle':
+        case "staticTitle":
           return this.renderFieldStaticTitle(field, fieldIndex);
-        case 'staticText':
+        case "staticText":
           return this.renderFieldStaticText(field, fieldIndex);
         default:
           return null;
@@ -6116,15 +6058,15 @@ class AddJobType extends Component {
         children: [fieldIndex > 0 ? /*#__PURE__*/jsx("div", {
           className: "circle",
           onClick: () => this.onMoveFieldPrev(fieldIndex),
-          children: /*#__PURE__*/jsx(FontAwesome, {
-            name: "angle-up",
+          children: /*#__PURE__*/jsx(Icon, {
+            icon: "angle-up",
             className: "icon"
           })
         }) : null, fieldIndex < customFields.length - 1 ? /*#__PURE__*/jsx("div", {
           className: "circle",
           onClick: () => this.onMoveFieldNext(fieldIndex),
-          children: /*#__PURE__*/jsx(FontAwesome, {
-            name: "angle-down",
+          children: /*#__PURE__*/jsx(Icon, {
+            icon: "angle-down",
             className: "icon"
           })
         }) : null]
@@ -6144,7 +6086,7 @@ class AddJobType extends Component {
         type: "bodyLarge",
         className: "marginBottom-24 paddingLeft-40",
         style: {
-          color: Colours$3.COLOUR_LIGHTGREY
+          color: Colours$4.COLOUR_LIGHTGREY
         },
         children: "By default, the form submission title will be the name of the person submitting the form. You can choose to select a different field to use as the title for the form submission."
       }), /*#__PURE__*/jsxs("div", {
@@ -6152,9 +6094,9 @@ class AddJobType extends Component {
         children: [customFields.map((field, fieldIndex) => this.renderField(field, fieldIndex)), /*#__PURE__*/jsxs("div", {
           className: "clearfix addoption addField",
           onClick: () => this.onAddNewField(),
-          children: [/*#__PURE__*/jsx(Components$1.P60Icon, {
+          children: [/*#__PURE__*/jsx(Icon, {
             className: "addoption_plus",
-            icon: "add-circle"
+            icon: "circle-plus"
           }), /*#__PURE__*/jsx("div", {
             className: "fillSpace",
             children: /*#__PURE__*/jsx("p", {
@@ -6175,10 +6117,10 @@ class AddJobType extends Component {
     return /*#__PURE__*/jsxs("div", {
       className: "padding-60 paddingVertical-8 text-bodyLarge",
       style: {
-        color: Colours$3.COLOUR_RED
+        color: Colours$4.COLOUR_RED
       },
       children: ["To save the form", /*#__PURE__*/jsx("ul", {
-        style: {
+        iconStyle: {
           padding: 0,
           paddingLeft: 16
         },
@@ -6195,11 +6137,11 @@ class AddJobType extends Component {
     } = this.state;
     if (!success) return null;
     return /*#__PURE__*/jsx(Components$1.SuccessPopup, {
-      text: "".concat("".concat(values.textJobType), " has been ", !jobTypeId ? 'added' : 'edited'),
+      text: "".concat("".concat(values.textJobType), " has been ", !jobTypeId ? "added" : "edited"),
       buttons: [{
-        type: 'outlined',
+        type: "outlined",
         onClick: this.onBack,
-        text: 'Go to home'
+        text: "Go to home"
       }]
     });
   }
@@ -6262,10 +6204,14 @@ var AddJobType$1 = connect(mapStateToProps$1, {
   jobTypesUpdate
 })(withRouter(AddJobType));
+function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var {
   Analytics: Analytics$1,
   Session,
-  Components
+  Components,
+  Helper,
+  Colours
 } = PlussCore;
 var getInitialState = () => ({
   requests: 0,
@@ -6285,10 +6231,21 @@ var AnalyticsHub = _ref => {
     auth,
     prevText,
     dayCount,
-    strings
+    strings,
+    userType,
+    userCategory,
+    selectedSites
   } = _ref;
   var [analyticsData, setAnalyticsData] = useState(getInitialState());
   var [isExportOpen, setIsExportOpen] = useState(false);
+  var [failedSites, setFailedSites] = useState([]);
+  var [comparisonData, setComparisonData] = useState({
+    requests: [],
+    completedRequests: [],
+    comments: [],
+    isLoading: true
+  });
+  var comparisonMode = selectedSites && selectedSites.length > 1;
   var hasAccess = Session.validateAccess(auth.site, values.permissionMaintenanceTracking, auth);
   if (!hasAccess) {
     return null;
@@ -6300,55 +6257,140 @@ var AnalyticsHub = _ref => {
     return strings.sideNav[key];
   })();
   var exportColumns = [{
-    label: 'Select All',
-    key: ''
-  }, {
-    label: 'Start Date',
-    key: 'startDate'
+    label: "Select All",
+    key: ""
+  }, ...(comparisonMode ? [{
+    label: "Site",
+    key: "site"
+  }] : []), {
+    label: "Start Date",
+    key: "startDate"
   }, {
-    label: 'End Date',
-    key: 'endDate'
+    label: "End Date",
+    key: "endDate"
   }, {
     label: "".concat(values.textSingularName, "s"),
-    key: 'requests'
+    key: "requests"
   }, {
     label: "Completed ".concat(values.textSingularName, "s"),
-    key: 'completedRequests'
+    key: "completedRequests"
   }, {
-    label: 'Comments',
-    key: 'comments'
+    label: "Comments",
+    key: "comments"
   }];
   useEffect(() => {
     getData();
-  }, [startTime, endTime]);
+  }, [startTime, endTime, userType, userCategory, selectedSites]);
   var getData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(function* () {
-      setAnalyticsData(getInitialState());
-      // Load analytics data here using startTime and endTime
-      var timeDifference = endTime - startTime;
-      var [currentStatsResponse, prevStatsResponse] = yield Promise.all([analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime, endTime, true), analyticsActions.getAggregateEntityStats(auth.site, values.analyticsKey, startTime - timeDifference, startTime, true)]);
-      var data = {
-        requests: Analytics$1.countActivities(currentStatsResponse.data, 'Request', 'total'),
-        prevRequests: Analytics$1.countActivities(prevStatsResponse.data, 'Request', 'total'),
-        completedRequests: Analytics$1.countActivities(currentStatsResponse.data, 'RequestCompleted', 'unique'),
-        prevCompletedRequests: Analytics$1.countActivities(prevStatsResponse.data, 'RequestCompleted', 'unique'),
-        comments: Analytics$1.countActivities(currentStatsResponse.data, 'Comment', 'total'),
-        prevComments: Analytics$1.countActivities(prevStatsResponse.data, 'Comment', 'total'),
-        isLoading: false
-      };
-      setAnalyticsData(data);
+      try {
+        setFailedSites([]);
+        if (comparisonMode) {
+          setComparisonData({
+            requests: [],
+            completedRequests: [],
+            comments: [],
+            isLoading: true
+          });
+          var multiSiteResultsObj = yield Analytics$1.fetchMultiSiteData(selectedSites, /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(function* (site) {
+              var {
+                data
+              } = yield analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
+                userType,
+                userCategory
+              });
+              return data;
+            });
+            return function (_x) {
+              return _ref3.apply(this, arguments);
+            };
+          }());
+          var roles = auth.user.Roles;
+          var failed = Object.entries(multiSiteResultsObj).filter(_ref4 => {
+            var [, data] = _ref4;
+            return data === null;
+          }).map(_ref5 => {
+            var [site] = _ref5;
+            return Helper.getSiteNameFromRoles(site, roles);
+          });
+          setFailedSites(failed);
+          var multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref6 => {
+            var [, data] = _ref6;
+            return data !== null;
+          }).map(_ref7 => {
+            var [site, data] = _ref7;
+            return {
+              site,
+              data
+            };
+          });
+          var buildComparison = (activityKey, countType) => multiSiteResults.map(result => ({
+            name: Helper.getSiteNameFromRoles(result.site, roles),
+            value: Analytics$1.countActivities(result.data, activityKey, countType)
+          }));
+          setComparisonData({
+            requests: buildComparison("Request", "total"),
+            completedRequests: buildComparison("RequestCompleted", "unique"),
+            comments: buildComparison("Comment", "total"),
+            isLoading: false
+          });
+        } else {
+          setAnalyticsData(getInitialState());
+          var site = selectedSites && selectedSites.length === 1 ? selectedSites[0] : auth.site;
+          var timeDifference = endTime - startTime;
+          var [currentStatsResponse, prevStatsResponse] = yield Promise.all([analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime, endTime, true, {
+            userType,
+            userCategory
+          }), analyticsActions.getAggregateEntityStats(site, values.analyticsKey, startTime - timeDifference, startTime, true, {
+            userType,
+            userCategory
+          })]);
+          var data = {
+            requests: Analytics$1.countActivities(currentStatsResponse.data, "Request", "total"),
+            prevRequests: Analytics$1.countActivities(prevStatsResponse.data, "Request", "total"),
+            completedRequests: Analytics$1.countActivities(currentStatsResponse.data, "RequestCompleted", "unique"),
+            prevCompletedRequests: Analytics$1.countActivities(prevStatsResponse.data, "RequestCompleted", "unique"),
+            comments: Analytics$1.countActivities(currentStatsResponse.data, "Comment", "total"),
+            prevComments: Analytics$1.countActivities(prevStatsResponse.data, "Comment", "total"),
+            isLoading: false
+          };
+          setAnalyticsData(data);
+        }
+      } catch (err) {
+        if (comparisonMode) {
+          setComparisonData(prev => _objectSpread$3(_objectSpread$3({}, prev), {}, {
+            isLoading: false
+          }));
+        } else {
+          setAnalyticsData(prev => _objectSpread$3(_objectSpread$3({}, prev), {}, {
+            isLoading: false
+          }));
+        }
+      }
     });
     return function getData() {
       return _ref2.apply(this, arguments);
     };
   }();
   var isReadyToOpenCSV = () => {
-    return !analyticsData.isLoading;
+    return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
   };
   var getExportSource = () => {
+    if (comparisonMode) {
+      var sites = comparisonData.requests || [];
+      return sites.map((site, i) => ({
+        site: site.name,
+        startDate: moment(startTime + 1).format("D-MM-YYYY"),
+        endDate: moment(endTime).format("D-MM-YYYY"),
+        requests: site.value,
+        completedRequests: comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value || 0,
+        comments: comparisonData.comments[i] && comparisonData.comments[i].value || 0
+      }));
+    }
     return [{
-      startDate: moment(startTime + 1).format('D-MM-YYYY'),
-      endDate: moment(endTime).format('D-MM-YYYY'),
+      startDate: moment(startTime + 1).format("D-MM-YYYY"),
+      endDate: moment(endTime).format("D-MM-YYYY"),
       requests: analyticsData.requests,
       completedRequests: analyticsData.completedRequests,
       comments: analyticsData.comments
@@ -6359,13 +6401,14 @@ var AnalyticsHub = _ref => {
       return null;
     }
     var source = getExportSource();
+    var filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, "-")).join("_");
     return /*#__PURE__*/jsx(Components.ExportCsvPopup, {
       onClose: () => {
         setIsExportOpen(false);
       },
       columns: exportColumns,
       source: source,
-      filename: "".concat(values.analyticsKey, "analytics_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
+      filename: "".concat(values.analyticsKey, "analytics").concat(comparisonMode ? "_comparison" : "").concat(filterSuffix ? "_".concat(filterSuffix) : "", "_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
     });
   };
   return /*#__PURE__*/jsxs("div", {
@@ -6383,36 +6426,76 @@ var AnalyticsHub = _ref => {
           setIsExportOpen(true);
         },
         isActive: isReadyToOpenCSV(),
-        leftIcon: "file-code-o",
+        leftIcon: "file-code",
         children: "Export CSV"
       })]
-    }), /*#__PURE__*/jsxs("div", {
+    }), failedSites.length > 0 && /*#__PURE__*/jsxs(Components.Text, {
+      type: "help",
+      style: {
+        color: Colours.COLOUR_RED,
+        marginTop: 8
+      },
+      children: ["Data unavailable for: ", failedSites.join(", ")]
+    }), /*#__PURE__*/jsx("div", {
       className: "analyticsSection dashboardSection_content",
-      children: [/*#__PURE__*/jsx(Components.StatBox, {
-        title: "".concat(featureTitle, " Requests"),
-        icon: faWrench,
-        value: analyticsData.requests,
-        previousValue: analyticsData.prevRequests,
-        prevText: prevText,
-        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount),
-        isLoading: analyticsData.isLoading
-      }), /*#__PURE__*/jsx(Components.StatBox, {
-        title: "Completed ".concat(featureTitle, " Requests"),
-        icon: faCircleCheck,
-        value: analyticsData.completedRequests,
-        previousValue: analyticsData.prevCompletedRequests,
-        prevText: prevText,
-        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount),
-        isLoading: analyticsData.isLoading
-      }), /*#__PURE__*/jsx(Components.StatBox, {
-        title: "".concat(featureTitle, " Comments"),
-        icon: faComment,
-        value: analyticsData.comments,
-        previousValue: analyticsData.prevComments,
-        prevText: prevText,
-        viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount),
-        isLoading: analyticsData.isLoading
-      })]
+      children: (() => {
+        var chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");
+        if (comparisonMode) {
+          return /*#__PURE__*/jsxs("div", {
+            style: {
+              display: "flex",
+              flexDirection: "column",
+              gap: 16
+            },
+            children: [/*#__PURE__*/jsx(Components.ComparisonStatBox, {
+              title: "".concat(featureTitle, " Requests"),
+              data: comparisonData.requests,
+              prevText: prevText,
+              viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+              isLoading: comparisonData.isLoading
+            }), /*#__PURE__*/jsx(Components.ComparisonStatBox, {
+              title: "Completed ".concat(featureTitle, " Requests"),
+              data: comparisonData.completedRequests,
+              prevText: prevText,
+              viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount).concat(chartSuffix),
+              isLoading: comparisonData.isLoading
+            }), /*#__PURE__*/jsx(Components.ComparisonStatBox, {
+              title: "".concat(featureTitle, " Comments"),
+              data: comparisonData.comments,
+              prevText: prevText,
+              viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+              isLoading: comparisonData.isLoading
+            })]
+          });
+        }
+        return /*#__PURE__*/jsxs(Fragment, {
+          children: [/*#__PURE__*/jsx(Components.StatBox, {
+            title: "".concat(featureTitle, " Requests"),
+            icon: "wrench",
+            value: analyticsData.requests,
+            previousValue: analyticsData.prevRequests,
+            prevText: prevText,
+            viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Request&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+            isLoading: analyticsData.isLoading
+          }), /*#__PURE__*/jsx(Components.StatBox, {
+            title: "Completed ".concat(featureTitle, " Requests"),
+            icon: "circle-check",
+            value: analyticsData.completedRequests,
+            previousValue: analyticsData.prevCompletedRequests,
+            prevText: prevText,
+            viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=RequestCompleted&countType=unique&dayCount=").concat(dayCount).concat(chartSuffix),
+            isLoading: analyticsData.isLoading
+          }), /*#__PURE__*/jsx(Components.StatBox, {
+            title: "".concat(featureTitle, " Comments"),
+            icon: "comment",
+            value: analyticsData.comments,
+            previousValue: analyticsData.prevComments,
+            prevText: prevText,
+            viewGraphLink: "/chart?entity=".concat(values.analyticsKey, "&startTime=").concat(startTime, "&endTime=").concat(endTime, "&key=Comment&countType=total&dayCount=").concat(dayCount).concat(chartSuffix),
+            isLoading: analyticsData.isLoading
+          })]
+        });
+      })()
     })]
   });
 };
@@ -6445,19 +6528,15 @@ var MaintenanceReducer = (function () {
         loading: true
       });
     case JOBS_LOADED:
+      var result = _.unionWith(action.payload, state.jobs, (v1, v2) => {
+        return v1 != null && v2 != null && v1.id === v2.id;
+      });
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
-        jobs: action.payload.map(job => _objectSpread$2({
+        jobs: result.map(job => _objectSpread$2({
           title: job.title || job.description
         }, job)),
         loading: false
       });
-    case JOBS_ADDED:
-      var added = _.unionWith(action.payload.map(job => _objectSpread$2({
-        title: job.title || job.description
-      }, job)), state.jobs, (v1, v2) => v1 != null && v2 != null && v1.id === v2.id);
-      return _objectSpread$2(_objectSpread$2({}, state), {}, {
-        jobs: added
-      });
     case JOBS_REMOVED:
       var index = _.findIndex(state.jobs, event => {
         return event != null && event.id === action.payload;
@@ -6478,7 +6557,7 @@ var MaintenanceReducer = (function () {
         jobtypes
       });
     case JOBS_STATUSES_LOADED:
-      var jobstatuses = _.orderBy(action.payload, 'order', 'asc');
+      var jobstatuses = _.orderBy(action.payload, "order", "asc");
       return _objectSpread$2(_objectSpread$2({}, state), {}, {
         jobstatuses
       });
@@ -6511,7 +6590,7 @@ class ActivityText extends Component {
             className: clickableClasses,
             children: _.truncate(data.Data.title || data.Data.description, {
               length: 30,
-              separator: '...'
+              separator: "..."
             })
           })]
         });
@@ -6526,7 +6605,7 @@ class ActivityText extends Component {
             className: clickableClasses,
             children: _.truncate(data.Data.title || data.Data.description, {
               length: 30,
-              separator: '...'
+              separator: "..."
             })
           })]
         });
@@ -6541,7 +6620,7 @@ class ActivityText extends Component {
             className: clickableClasses,
             children: _.truncate(data.Data.title || data.Data.description, {
               length: 30,
-              separator: '...'
+              separator: "..."
             })
           })]
         });
@@ -6555,7 +6634,7 @@ class ActivityText extends Component {
             className: highlightedClasses,
             children: _.truncate(data.Data.title || data.Data.description, {
               length: 30,
-              separator: '...'
+              separator: "..."
             })
           })]
         });
@@ -6597,9 +6676,9 @@ class ViewFull extends Component {
 }
 var styles$2 = {
   image: {
-    width: '100%',
-    height: '100%',
-    objectFit: 'contain'
+    width: "100%",
+    height: "100%",
+    objectFit: "contain"
   }
 };
@@ -6633,10 +6712,10 @@ class PreviewWidget extends Component {
 }
 var styles$1 = {
   container: {
-    position: 'relative'
+    position: "relative"
   },
   image: {
-    width: '100%'
+    width: "100%"
   }
 };
@@ -6669,10 +6748,10 @@ class PreviewFull extends Component {
 }
 var styles = {
   container: {
-    position: 'relative'
+    position: "relative"
   },
   image: {
-    width: '100%'
+    width: "100%"
   }
 };