@plusscommunities/pluss-maintenance-app 6.0.5-auth.0 → 6.1.1-beta.0

package/dist/module/values.config.d.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle"],"sources":["values.config.d.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenanceD',\n  aliases: ['maintenanceRequestD'],\n  reducerKey: 'jobsD',\n  serviceKey: 'maintenanceD',\n  updateKey: 'jobsD',\n  actionJobsLoaded: 'JOBS_LOADEDD',\n  actionJobAdded: 'JOB_ADDEDD',\n  actionJobsAdded: 'JOBS_ADDEDD',\n  screenMaintenance: 'maintenanceD',\n  screenRequestDetail: 'requestDetailD',\n  screenServiceRequest: 'serviceRequestD',\n  screenJobTypePicker: 'jobTypePickerD',\n  screenRequestNotes: 'requestNotesD',\n  permissionMaintenanceTracking: 'maintenanceTrackingD',\n  iconGridMenu: 'maintenance',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request D',\n  textAddMenuTitle: 'Request D',\n  textMoreMenuTitle: 'Request D',\n  textKioskActionTitle: 'Request D',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,cAAc;EAC1BC,OAAO,EAAE,CAAC,qBAAqB,CAAC;EAChCC,UAAU,EAAE,OAAO;EACnBC,UAAU,EAAE,cAAc;EAC1BC,SAAS,EAAE,OAAO;EAClBC,gBAAgB,EAAE,cAAc;EAChCC,cAAc,EAAE,YAAY;EAC5BC,eAAe,EAAE,aAAa;EAC9BC,iBAAiB,EAAE,cAAc;EACjCC,mBAAmB,EAAE,gBAAgB;EACrCC,oBAAoB,EAAE,iBAAiB;EACvCC,mBAAmB,EAAE,gBAAgB;EACrCC,kBAAkB,EAAE,eAAe;EACnCC,6BAA6B,EAAE,sBAAsB;EACrDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,WAAW;EAC7BC,gBAAgB,EAAE,WAAW;EAC7BC,iBAAiB,EAAE,WAAW;EAC9BC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAASxB,MAAM","ignoreList":[]}

package/dist/module/values.config.default.js

@@ -0,0 +1,28 @@
+const values = {
+  featureKey: 'maintenance',
+  aliases: ['maintenanceRequest'],
+  reducerKey: 'jobs',
+  serviceKey: 'maintenance',
+  updateKey: 'jobs',
+  actionJobsLoaded: 'JOBS_LOADED',
+  actionJobAdded: 'JOB_ADDED',
+  actionJobsAdded: 'JOBS_ADDED',
+  screenMaintenance: 'maintenance',
+  screenRequestDetail: 'requestDetail',
+  screenServiceRequest: 'serviceRequest',
+  screenJobTypePicker: 'jobTypePicker',
+  screenRequestNotes: 'requestNotes',
+  permissionMaintenanceTracking: 'maintenanceTracking',
+  iconGridMenu: 'maintenance',
+  iconAddMenu: 'request',
+  iconKioskAction: 'wrench',
+  orderAddMenu: 5,
+  orderMoreMenu: 4,
+  orderKioskAction: 1,
+  textFeatureTitle: 'Request',
+  textAddMenuTitle: 'Request',
+  textMoreMenuTitle: 'Request',
+  textKioskActionTitle: 'Request'
+};
+export { values };
+//# sourceMappingURL=values.config.default.js.map

package/dist/module/values.config.default.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle"],"sources":["values.config.default.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenance',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobs',\n  serviceKey: 'maintenance',\n  updateKey: 'jobs',\n  actionJobsLoaded: 'JOBS_LOADED',\n  actionJobAdded: 'JOB_ADDED',\n  actionJobsAdded: 'JOBS_ADDED',\n  screenMaintenance: 'maintenance',\n  screenRequestDetail: 'requestDetail',\n  screenServiceRequest: 'serviceRequest',\n  screenJobTypePicker: 'jobTypePicker',\n  screenRequestNotes: 'requestNotes',\n  permissionMaintenanceTracking: 'maintenanceTracking',\n  iconGridMenu: 'maintenance',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request',\n  textAddMenuTitle: 'Request',\n  textMoreMenuTitle: 'Request',\n  textKioskActionTitle: 'Request',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,aAAa;EACzBC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,MAAM;EAClBC,UAAU,EAAE,aAAa;EACzBC,SAAS,EAAE,MAAM;EACjBC,gBAAgB,EAAE,aAAa;EAC/BC,cAAc,EAAE,WAAW;EAC3BC,eAAe,EAAE,YAAY;EAC7BC,iBAAiB,EAAE,aAAa;EAChCC,mBAAmB,EAAE,eAAe;EACpCC,oBAAoB,EAAE,gBAAgB;EACtCC,mBAAmB,EAAE,eAAe;EACpCC,kBAAkB,EAAE,cAAc;EAClCC,6BAA6B,EAAE,qBAAqB;EACpDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,SAAS;EAC3BC,gBAAgB,EAAE,SAAS;EAC3BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAASxB,MAAM","ignoreList":[]}

package/dist/module/values.config.js

@@ -0,0 +1,28 @@
+const values = {
+  featureKey: 'maintenance',
+  aliases: ['maintenanceRequest'],
+  reducerKey: 'jobs',
+  serviceKey: 'maintenance',
+  updateKey: 'jobs',
+  actionJobsLoaded: 'JOBS_LOADED',
+  actionJobAdded: 'JOB_ADDED',
+  actionJobsAdded: 'JOBS_ADDED',
+  screenMaintenance: 'maintenance',
+  screenRequestDetail: 'requestDetail',
+  screenServiceRequest: 'serviceRequest',
+  screenJobTypePicker: 'jobTypePicker',
+  screenRequestNotes: 'requestNotes',
+  permissionMaintenanceTracking: 'maintenanceTracking',
+  iconGridMenu: 'maintenance',
+  iconAddMenu: 'request',
+  iconKioskAction: 'wrench',
+  orderAddMenu: 5,
+  orderMoreMenu: 4,
+  orderKioskAction: 1,
+  textFeatureTitle: 'Request',
+  textAddMenuTitle: 'Request',
+  textMoreMenuTitle: 'Request',
+  textKioskActionTitle: 'Request'
+};
+export { values };
+//# sourceMappingURL=values.config.js.map

package/dist/module/values.config.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","iconGridMenu","iconAddMenu","iconKioskAction","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle"],"sources":["values.config.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenance',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobs',\n  serviceKey: 'maintenance',\n  updateKey: 'jobs',\n  actionJobsLoaded: 'JOBS_LOADED',\n  actionJobAdded: 'JOB_ADDED',\n  actionJobsAdded: 'JOBS_ADDED',\n  screenMaintenance: 'maintenance',\n  screenRequestDetail: 'requestDetail',\n  screenServiceRequest: 'serviceRequest',\n  screenJobTypePicker: 'jobTypePicker',\n  screenRequestNotes: 'requestNotes',\n  permissionMaintenanceTracking: 'maintenanceTracking',\n  iconGridMenu: 'maintenance',\n  iconAddMenu: 'request',\n  iconKioskAction: 'wrench',\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Request',\n  textAddMenuTitle: 'Request',\n  textMoreMenuTitle: 'Request',\n  textKioskActionTitle: 'Request',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,aAAa;EACzBC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,MAAM;EAClBC,UAAU,EAAE,aAAa;EACzBC,SAAS,EAAE,MAAM;EACjBC,gBAAgB,EAAE,aAAa;EAC/BC,cAAc,EAAE,WAAW;EAC3BC,eAAe,EAAE,YAAY;EAC7BC,iBAAiB,EAAE,aAAa;EAChCC,mBAAmB,EAAE,eAAe;EACpCC,oBAAoB,EAAE,gBAAgB;EACtCC,mBAAmB,EAAE,eAAe;EACpCC,kBAAkB,EAAE,cAAc;EAClCC,6BAA6B,EAAE,qBAAqB;EACpDC,YAAY,EAAE,aAAa;EAC3BC,WAAW,EAAE,SAAS;EACtBC,eAAe,EAAE,QAAQ;EACzBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,SAAS;EAC3BC,gBAAgB,EAAE,SAAS;EAC3BC,iBAAiB,EAAE,SAAS;EAC5BC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAASxB,MAAM","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-app",
-  "version": "6.0.5-auth.0",
+  "version": "6.1.1-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/module/index.js",
   "module": "dist/module/index.js",
@@ -15,17 +15,19 @@
     "patch": "npm version patch",
     "betaupload": "npm run build && npm publish --access public --tag beta",
     "betaupload:p": "npm run betapatch && npm run betaupload",
-    "authpatch": "npm version prepatch --preid=auth",
-    "authupload": "npm run build && npm publish --access public --tag auth",
-    "authupload:p": "npm run authpatch && npm run authupload",
     "upload": "npm run build && npm publish --access public",
-    "upload:p": "npm run patch && npm run upload"
+    "upload:p": "npm run patch && npm run upload",
+    "copy:add": "run(){ ext=${1:-default}; test -f src/values.config.$ext.js || cp src/values.config.default.js src/values.config.$ext.js; }; run",
+    "copy:get": "echo $npm_package_name",
+    "copy:set": "run(){ target='\\@plusscommunities\\/pluss-maintenance-app'; ext=${1:-default}; [ $ext == 'default' ] && replace=$target || replace=$target'-'$ext; echo 'Setting target to '$replace; test -f src/values.config.$ext.js && cp -f src/values.config.$ext.js src/values.config.js; sed -i '' -e 's/'$target'.*\"/'$replace'\"/g' package.json; }; run",
+    "copy:uploadnopatch": "for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run upload; done; npm run copy:set;",
+    "copy:upload": "npm run patch; npm run copy:uploadnopatch;",
+    "copy:betaupload": "npm run betapatch; for file in `ls ./src/values.config.*.js`; do dup=`echo $file | sed 's/.*values\\.config\\.\\(.*\\)\\.js/\\1/'`; npm run copy:set $dup; npm run betaupload; done; npm run copy:set;"
   },
   "author": "Thorbjorn Kappel Davis",
   "license": "ISC",
-  "dependencies": {},
-  "peerDependencies": {
-    "@plusscommunities/pluss-core-app": "^6.0.10-auth.0",
+  "dependencies": {
+    "@plusscommunities/pluss-core-app": "^6.0.3",
     "axios": "^1.6.8",
     "lodash": "^4.17.4",
     "moment": "^2.30.1",
@@ -34,7 +36,9 @@
     "react-native-elements": "^0.17.0",
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-webview": "13.6.4",
-    "react-redux": "^7.2.6",
+    "react-redux": "^7.2.6"
+  },
+  "peerDependencies": {
     "redux-persist": "^6.0.0"
   },
   "devDependencies": {

package/src/actions/types.js

@@ -1,3 +1,5 @@
-export const JOBS_LOADED = 'JOBS_LOADED';
-export const JOB_ADDED = 'JOB_ADDED';
-export const JOBS_ADDED = 'JOBS_ADDED';
+import { values } from '../values.config';
+
+export const JOBS_LOADED = values.actionJobsLoaded;
+export const JOB_ADDED = values.actionJobAdded;
+export const JOBS_ADDED = values.actionJobsAdded;

package/src/apis/{maintenanceActions.js → generalActions.js}

@@ -1,24 +1,28 @@
+// import axios from 'axios';
+// import { getUrl } from './helper';
+// import { authedFunction } from '../js';
 import { Helper, Session } from '../core.config';
+import { values } from '../values.config';
 
-export const maintenanceActions = {
+export const generalActions = {
   getJob: (site, id) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'getJob'),
+      url: Helper.getUrl(values.serviceKey, 'getJob'),
       data: { site, id },
     });
   },
   getJobByJobId: (site, jobId) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'getJob'),
+      url: Helper.getUrl(values.serviceKey, 'getJob'),
       data: { site, jobId },
     });
   },
   getJobs: (site, status = '', type = '') => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'getJobs'),
+      url: Helper.getUrl(values.serviceKey, 'getJobs'),
       data: { site, status, type },
     });
   },
@@ -35,24 +39,24 @@ export const maintenanceActions = {
     }
     return Session.authedFunction({
       method: 'GET',
-      url: Helper.getUrl('maintenance', 'get/requests', query),
+      url: Helper.getUrl(values.serviceKey, 'get/requests', query),
     });
   },
   getJobsRecursive: (site, status, type, lastKey, jobs = []) => {
     return new Promise(resolve => {
-      maintenanceActions.getJobs2(site, status, type, lastKey).then(jobRes => {
+      generalActions.getJobs2(site, status, type, lastKey).then(jobRes => {
         const newJobs = [...jobs, ...jobRes.data.Items];
         if (!jobRes.data.LastKey) {
           return resolve(newJobs);
         }
-        return resolve(maintenanceActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
+        return resolve(generalActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
       });
     });
   },
   sendMaintenanceRequest: (userID, userName, phone, room, title, description, date, type, images, location, isHome, homeText) => {
     const request = {
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'sendMaintenance'),
+      url: Helper.getUrl(values.serviceKey, 'sendMaintenance'),
       data: {
         userID,
         userName,
@@ -73,37 +77,21 @@ export const maintenanceActions = {
   editJob: (job, site) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'editJob'),
+      url: Helper.getUrl(values.serviceKey, 'editJob'),
       data: { job, site },
     });
   },
   editJobStatus: (id, status) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'editJobStatus'),
+      url: Helper.getUrl(values.serviceKey, 'editJobStatus'),
       data: { id, status },
     });
   },
-  assignJob: (jobId, userId) => {
-    return Session.authedFunction({
-      method: 'POST',
-      url: Helper.getUrl('maintenance', 'update/assign'),
-      data: {
-        id: jobId,
-        userId,
-      },
-    });
-  },
-  getAssignees: site => {
-    return Session.authedFunction({
-      method: 'GET',
-      url: Helper.getUrl('maintenance', 'get/assignees', { site }),
-    });
-  },
   addNote: (jobId, note, attachments) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'requests/note'),
+      url: Helper.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         note,
@@ -115,7 +103,7 @@ export const maintenanceActions = {
   editNote: (jobId, noteId, note, attachments) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'requests/note'),
+      url: Helper.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         note,
@@ -128,7 +116,7 @@ export const maintenanceActions = {
   deleteNote: (jobId, noteId) => {
     return Session.authedFunction({
       method: 'POST',
-      url: Helper.getUrl('maintenance', 'requests/note'),
+      url: Helper.getUrl(values.serviceKey, 'requests/note'),
       data: {
         id: jobId,
         noteId,
@@ -136,12 +124,44 @@ export const maintenanceActions = {
       },
     });
   },
+  // getWeeklyMenu: async time => {
+  //   //deprecated
+  //   return null;
+  // },
   getJobTypes: async site => {
-    const url = Helper.getUrl('maintenance', 'getjobtypes');
+    const url = Helper.getUrl(values.serviceKey, 'getjobtypes');
     return Session.authedFunction({
       method: 'POST',
       url,
       data: { site },
     });
   },
+  // sendBookingRequest: async bookingInfo => {
+  //   return authedFunction({
+  //     method: 'POST',
+  //     data: {
+  //       bookingInfo,
+  //     },
+  //     url: getUrl('utility', 'sendBookingRequest'),
+  //   });
+  // },
+  // getString: async (site, id, useDefault) => {
+  //   return axios({
+  //     method: 'GET',
+  //     url: getUrl('strings', `get/${site}_${id}`, useDefault ? { useDefault } : undefined),
+  //   }).catch(error => {
+  //     console.log('getString error', error);
+  //     throw error;
+  //   });
+  // },
+  // getGeneralTerms: async () => {
+  //   return axios({
+  //     method: 'GET',
+  //     url: 'https://pluss.plussapp.com.au/strings-prd/get/plussSpace_termsofuse',
+  //   });
+  // },
+  // declineTerms: async (site, userID) => {
+  //   //deprecated
+  //   return null;
+  // },
 };

package/src/apis/index.js

@@ -1 +1 @@
-export * from './maintenanceActions';
+export * from './generalActions';

package/src/components/FilterPopupMenu.js

@@ -1,12 +1,10 @@
 import React, { Component } from 'react';
-import { View, Text, TouchableOpacity, Modal, ScrollView, Dimensions } from 'react-native';
+import { View, Text, TouchableOpacity, Modal } from 'react-native';
 import { connect } from 'react-redux';
 import _ from 'lodash';
-import { maintenanceActions } from '../apis';
+import { generalActions } from '../apis';
 import { Colours, Helper } from '../core.config';
 
-const SCREEN_HEIGHT = Dimensions.get('window').height;
-
 class FilterPopupMenu extends Component {
   constructor(props) {
     super(props);
@@ -15,8 +13,6 @@ class FilterPopupMenu extends Component {
       types: props.types || [],
       selectedStatus: props.status || '',
       selectedType: props.type || '',
-      selectedAssignee: props.assignee || '',
-      assignees: [],
     };
     this.statusOptions = [
       {
@@ -28,7 +24,7 @@ class FilterPopupMenu extends Component {
         value: 'Unassigned|In Progress',
       },
       {
-        label: 'Open',
+        label: 'Unassigned',
         value: 'Unassigned',
       },
       {
@@ -43,7 +39,6 @@ class FilterPopupMenu extends Component {
   }
 
   componentDidMount() {
-    this.getAssignees();
     if (_.isEmpty(this.state.types)) this.refreshTypes();
   }
 
@@ -53,30 +48,8 @@ class FilterPopupMenu extends Component {
     }
   }
 
-  getAssignees = async () => {
-    try {
-      const res = await maintenanceActions.getAssignees(this.props.site);
-      let assignees = res.data.Users.map(t => {
-        return { label: t.displayName, value: t.id };
-      });
-      assignees = _.orderBy(assignees, 'label');
-
-      assignees.splice(0, 0, { label: 'All', value: '' });
-
-      const newState = { assignees };
-
-      if (!assignees.some(a => a.value === this.state.selectedAssignee)) {
-        newState.selectedAssignee = '';
-      }
-      // console.log('refreshassignees', assignees);
-      this.setState(newState);
-    } catch (error) {
-      console.error('getAssignees', error);
-    }
-  };
-
   refreshTypes = async () => {
-    const { data } = await maintenanceActions.getJobTypes(Helper.getSite(this.props.site));
+    const { data } = await generalActions.getJobTypes(Helper.getSite(this.props.site));
     const types = data.map(t => {
       return { label: t.typeName, value: t.typeName };
     });
@@ -93,14 +66,11 @@ class FilterPopupMenu extends Component {
 
   onDone = () => {
     const { onClose } = this.props;
-    const { selectedStatus, selectedType, selectedAssignee } = this.state;
+    const { selectedStatus, selectedType } = this.state;
     if (onClose)
       onClose({
         status: selectedStatus,
-        statusText: this.statusOptions.find(o => o.value === selectedStatus)?.label,
         type: selectedType,
-        assignee: selectedAssignee,
-        assigneeName: this.state.assignees.find(a => a.value === selectedAssignee)?.label,
       });
   };
 
@@ -153,11 +123,10 @@ class FilterPopupMenu extends Component {
         <View style={styles.container}>
           <View style={styles.menu}>
             {this.renderTitle()}
-            <ScrollView style={styles.optionContent}>
+            <View style={styles.optionContent}>
               {this.renderOptions('Status', this.statusOptions, 'selectedStatus')}
               {this.renderOptions('Type', this.state.types, 'selectedType')}
-              {this.renderOptions('Assigned To', this.state.assignees, 'selectedAssignee')}
-            </ScrollView>
+            </View>
             {this.renderCancel()}
           </View>
         </View>
@@ -184,7 +153,6 @@ const styles = {
     backgroundColor: '#fff',
     borderTopLeftRadius: 12,
     borderTopRightRadius: 12,
-    maxHeight: SCREEN_HEIGHT * 0.8,
   },
   cancelContainer: {
     paddingVertical: 16,

package/src/components/MaintenanceList.js

@@ -2,18 +2,18 @@ import React, { Component } from 'react';
 import { View, StyleSheet, FlatList, TouchableOpacity, Text } from 'react-native';
 import _ from 'lodash';
 import { connect } from 'react-redux';
-import { maintenanceActions } from '../apis';
+import { generalActions } from '../apis';
 import { jobsLoaded, jobAdded, jobsAdded } from '../actions';
 import MaintenanceListItem from '../components/MaintenanceListItem';
 import FilterPopupMenu from './FilterPopupMenu';
 import { Components, Colours, Config, Helper } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenanceList extends Component {
   constructor(props) {
     super(props);
 
     this.initialStatus = props.hasPermission ? 'Unassigned|In Progress' : '';
-    this.initialStatusText = props.hasPermission ? 'Incomplete' : '';
 
     this.state = {
       types: [],
@@ -22,10 +22,7 @@ class MaintenanceList extends Component {
       searchText: '',
       showFilterPopup: false,
       selectedStatus: this.initialStatus,
-      selectedStatusText: this.initialStatusText,
       selectedType: '',
-      selectedAssignee: '',
-      selectedAssigneeName: '',
     };
   }
 
@@ -46,8 +43,8 @@ class MaintenanceList extends Component {
       try {
         const { selectedStatus, selectedType } = this.state;
         // console.log('filters', { selectedStatus, selectedType });
-        const res = await maintenanceActions.getJobsRecursive(this.props.site, selectedStatus, selectedType);
-        // console.log('refresh', res?.data);
+        const res = await generalActions.getJobsRecursive(this.props.site, selectedStatus, selectedType);
+        // console.log('refresh', JSON.stringify(res, null, 2));
         if (selectedStatus !== this.initialStatus || !_.isEmpty(selectedType)) {
           this.props.jobsAdded(res);
         } else {
@@ -62,7 +59,7 @@ class MaintenanceList extends Component {
   };
 
   refreshTypes = async () => {
-    const { data } = await maintenanceActions.getJobTypes(Helper.getSite(this.props.site));
+    const { data } = await generalActions.getJobTypes(Helper.getSite(this.props.site));
     const types = data.map(t => {
       return { label: t.typeName, value: t.typeName };
     });
@@ -76,7 +73,7 @@ class MaintenanceList extends Component {
 
     this.onLoadingChanged(true, async () => {
       try {
-        const job = await maintenanceActions.getJobByJobId(this.props.site, jobId);
+        const job = await generalActions.getJobByJobId(this.props.site, jobId);
         // console.log('fetchJob', job?.data);
         this.props.jobAdded(job.data);
       } catch (error) {
@@ -95,7 +92,7 @@ class MaintenanceList extends Component {
   }
 
   resetDataSource = (source = '') => {
-    const { searchText, selectedStatus, selectedType, selectedAssignee } = this.state;
+    const { searchText, selectedStatus, selectedType } = this.state;
     const { jobs } = this.props;
 
     let filteredList = jobs;
@@ -112,7 +109,6 @@ class MaintenanceList extends Component {
     }
     if (selectedStatus) filteredList = filteredList.filter(j => selectedStatus.includes(j.status));
     if (selectedType) filteredList = filteredList.filter(j => selectedType.includes(j.type));
-    if (selectedAssignee) filteredList = filteredList.filter(j => selectedAssignee.includes(j.AssigneeId));
     if (jobIdMatch) {
       const jobIndex = filteredList.indexOf(jobIdMatch);
       if (jobIndex > -1) {
@@ -147,38 +143,10 @@ class MaintenanceList extends Component {
   };
 
   onSelectFilter = selected => {
-    this.setState(
-      {
-        selectedStatus: selected.status,
-        selectedStatusText: selected.statusText,
-        selectedType: selected.type,
-        selectedAssignee: selected.assignee,
-        selectedAssigneeName: selected.assigneeName,
-      },
-      () => {
-        this.resetDataSource();
-        this.onToggleFilter();
-      },
-    );
-  };
-
-  getFilterButtonText = () => {
-    const { selectedStatus, selectedStatusText, selectedType, selectedAssignee, selectedAssigneeName } = this.state;
-    const filterTexts = [];
-    if (!_.isEmpty(selectedStatus)) {
-      filterTexts.push(selectedStatusText);
-    }
-
-    if (!_.isEmpty(selectedType)) {
-      filterTexts.push(selectedType);
-    }
-    if (!_.isEmpty(selectedAssignee)) {
-      filterTexts.push(selectedAssigneeName);
-    }
-    if (_.isEmpty(filterTexts)) {
-      return 'Filter';
-    }
-    return `Filtering by ${filterTexts.join(', ')}`;
+    this.setState({ selectedStatus: selected.status, selectedType: selected.type }, () => {
+      this.resetDataSource();
+      this.onToggleFilter();
+    });
   };
 
   renderEmptyList() {
@@ -189,7 +157,7 @@ class MaintenanceList extends Component {
     return (
       <TouchableOpacity onPress={this.onToggleFilter}>
         <View style={styles.filterButton}>
-          <Text style={[styles.filterButtonText, { color: this.props.colourBrandingMain }]}>{this.getFilterButtonText()}</Text>
+          <Text style={[styles.filterButtonText, { color: this.props.colourBrandingMain }]}>Filter</Text>
         </View>
       </TouchableOpacity>
     );
@@ -218,7 +186,7 @@ class MaintenanceList extends Component {
     const { ListHeaderComponent } = this.props;
     return (
       <View>
-        {ListHeaderComponent ? ListHeaderComponent : <View style={{ height: 8 }} />}
+        {ListHeaderComponent ? ListHeaderComponent : <View style={{ height: 32 }} />}
         {this.renderFilterButton()}
         {this.renderSearch()}
       </View>
@@ -243,18 +211,11 @@ class MaintenanceList extends Component {
   }
 
   renderFilterPopup() {
-    const { showFilterPopup, types, selectedStatus, selectedType, selectedAssignee } = this.state;
+    const { showFilterPopup, types, selectedStatus, selectedType } = this.state;
     if (!showFilterPopup) return null;
 
     return (
-      <FilterPopupMenu
-        site={this.props.site}
-        types={types}
-        status={selectedStatus}
-        assignee={selectedAssignee}
-        type={selectedType}
-        onClose={this.onSelectFilter}
-      />
+      <FilterPopupMenu site={this.props.site} types={types} status={selectedStatus} type={selectedType} onClose={this.onSelectFilter} />
     );
   }
 
@@ -305,9 +266,9 @@ const styles = StyleSheet.create({
     paddingHorizontal: 16,
   },
   filterButton: {
-    paddingBottom: 8,
-    paddingHorizontal: 16,
-    flexDirection: 'row-reverse',
+    position: 'absolute',
+    right: 20,
+    top: -32,
   },
   filterButtonText: {
     fontFamily: 'sf-semibold',
@@ -316,7 +277,8 @@ const styles = StyleSheet.create({
 });
 
 const mapStateToProps = state => {
-  const { user, jobs, notifications } = state;
+  const { user, notifications } = state;
+  const jobs = state[values.reducerKey];
   const jobsOrdered = _.orderBy(jobs.jobs, ['createdUnix'], ['desc']);
   const hasPermission = _.includes(user.permissions, 'maintenanceTracking');
 
@@ -326,7 +288,7 @@ const mapStateToProps = state => {
     site: user.site,
     userCategory: user.category,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
-    dataUpdated: notifications.dataUpdated['jobs'],
+    dataUpdated: notifications.dataUpdated[values.updateKey],
   };
 };
 

package/src/components/MaintenanceListItem.js

@@ -19,10 +19,11 @@ import moment from 'moment';
 import { getJobStatusProps, jobStatusOptions } from '../helper';
 import { Services } from '../feature.config';
 import { Helper, Colours } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenanceListItem extends Component {
   onPressJob = () => {
-    Services.navigation.navigate('requestDetail', { job: this.props.job });
+    Services.navigation.navigate(values.screenRequestDetail, { job: this.props.job });
   };
 
   renderCommentCount() {
@@ -63,7 +64,7 @@ class MaintenanceListItem extends Component {
     const { job } = this.props;
     const createdTime = moment(job.createdUnix);
     const createdTimeText = `${createdTime.format('ddd, D MMMM')} • ${createdTime.format('h:mma')}`;
-    const assigneeText = job.Assignee ? `Assigned to\n${job.Assignee.displayName}` : '';
+    const activityTimeText = job.expectedDate ? moment(job.expectedDate).format('D MMMM') : '--';
     const { statusText, statusColor } = getJobStatusProps(job.status);
 
     return (
@@ -92,14 +93,14 @@ class MaintenanceListItem extends Component {
               <Text style={styles.jobCreatedText}>{createdTimeText}</Text>
               <View style={styles.jobActivityContainer}>
                 <View style={[styles.jobStatusContainer, { backgroundColor: statusColor }]}>
-                  {/* <Icon name="wrench" type="font-awesome" iconStyle={styles.jobStatusIcon} /> */}
+                  <Icon name="wrench" type="font-awesome" iconStyle={styles.jobStatusIcon} />
                   <Text style={styles.jobStatusText}>{statusText}</Text>
                 </View>
                 <View style={[styles.jobStatusLine, { borderColor: statusColor }]}>
                   <View style={styles.jobStatusLineMask} />
                 </View>
                 <View style={[styles.jobStatusCircle, { backgroundColor: statusColor }]} />
-                <Text style={styles.jobStatusDateText}>{assigneeText}</Text>
+                <Text style={styles.jobStatusDateText}>{activityTimeText}</Text>
               </View>
             </View>
           </View>
@@ -227,7 +228,7 @@ const styles = StyleSheet.create({
   jobStatusContainer: {
     flexDirection: 'row',
     alignItems: 'center',
-    justifyContent: 'center',
+    justifyContent: 'space-between',
     width: 105,
     height: 30,
     paddingHorizontal: 8,
@@ -265,7 +266,7 @@ const styles = StyleSheet.create({
   jobStatusDateText: {
     flex: 1,
     textAlign: 'right',
-    fontFamily: 'sf-medium',
+    fontFamily: 'sf-bold',
     fontSize: 14,
     color: Colours.TEXT_DARK,
   },