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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-app",
-  "version": "6.1.1-beta.0",
+  "version": "7.0.0-auth.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/module/index.js",
   "module": "dist/module/index.js",
@@ -10,11 +10,14 @@
     "src/"
   ],
   "scripts": {
-    "build": "npm i --legacy-peer-deps && bob build",
+    "build": "npm i && bob build",
     "betapatch": "npm version prepatch --preid=beta",
     "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",
     "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",
@@ -22,23 +25,24 @@
     "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;"
+    "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;",
+    "copy:authupload": "npm run authpatch; 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 authupload; done; npm run copy:set;"
   },
   "author": "Thorbjorn Kappel Davis",
   "license": "ISC",
-  "dependencies": {
-    "@plusscommunities/pluss-core-app": "^6.0.3",
+  "dependencies": {},
+  "peerDependencies": {
+    "@plusscommunities/pluss-core-app": "7.0.1-auth.0",
     "axios": "^1.6.8",
     "lodash": "^4.17.4",
     "moment": "^2.30.1",
-    "react": "18.2.0",
-    "react-native": "0.73.6",
-    "react-native-elements": "^0.17.0",
+    "react": "18.3.1",
+    "react-native": "0.76.9",
+    "@rneui/base": "^4.0.0-rc.8",
+    "@rneui/themed": "^4.0.0-rc.8",
     "react-native-iphone-x-helper": "^1.3.1",
-    "react-native-webview": "13.6.4",
-    "react-redux": "^7.2.6"
-  },
-  "peerDependencies": {
+    "react-native-webview": "13.12.5",
+    "react-redux": "^7.2.6",
     "redux-persist": "^6.0.0"
   },
   "devDependencies": {

package/src/actions/JobActions.js

@@ -1,4 +1,7 @@
-import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED } from './types';
+import { JOBS_LOADED, JOB_ADDED, JOBS_ADDED, JOBS_STATUSES_LOADED, JOBS_HIDE_SEEN, JOB_FILTER_LOADED } from './types';
+import { stringActions } from '../apis';
+import { values } from '../values.config';
+import { jobStatusOptions } from '../helper';
 
 export const jobsLoaded = jobs => {
   return {
@@ -20,3 +23,52 @@ export const jobsAdded = jobs => {
     payload: jobs,
   };
 };
+
+export const jobStatusesUpdate = (site, callback = null) => {
+  return dispatch => {
+    stringActions
+      .getString(site, values.stringConfigJobStatus)
+      .then(res => {
+        dispatch({
+          type: JOBS_STATUSES_LOADED,
+          payload: res.data,
+        });
+        if (callback) callback(res.data);
+      })
+      .catch(() => {
+        dispatch({
+          type: JOBS_STATUSES_LOADED,
+          payload: jobStatusOptions,
+        });
+        if (callback) callback(jobStatusOptions);
+      });
+  };
+};
+
+export const jobHideSeenUpdate = (site, callback = null) => {
+  return (dispatch) => {
+    stringActions
+      .getString(site, values.stringConfigHideSeen)
+      .then((res) => {
+        dispatch({
+          type: JOBS_HIDE_SEEN,
+          payload: res.data,
+        });
+        if (callback) callback(res.data);
+      })
+      .catch((_error) => {
+        dispatch({
+          type: JOBS_HIDE_SEEN,
+          payload: false,
+        });
+        if (callback) callback(false);
+      });
+  };
+};
+
+export const jobsFilterLoaded = filters => {
+  return {
+    type: JOB_FILTER_LOADED,
+    payload: filters,
+  };
+};

package/src/actions/types.js

@@ -3,3 +3,7 @@ import { values } from '../values.config';
 export const JOBS_LOADED = values.actionJobsLoaded;
 export const JOB_ADDED = values.actionJobAdded;
 export const JOBS_ADDED = values.actionJobsAdded;
+export const JOBS_STATUSES_LOADED = values.actionJobsStatusesLoaded;
+export const JOBS_HIDE_SEEN = values.actionJobsHideSeen;
+export const JOB_FILTER_LOADED = values.actionJobFilterLoaded;
+

package/src/apis/index.js

@@ -1 +1,5 @@
-export * from './generalActions';
+import { Apis } from '../core.config';
+
+export const stringActions = Apis.stringActions;
+
+export * from './maintenanceActions';

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

@@ -1,10 +1,7 @@
-// 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 generalActions = {
+export const maintenanceActions = {
   getJob: (site, id) => {
     return Session.authedFunction({
       method: 'POST',
@@ -26,11 +23,14 @@ export const generalActions = {
       data: { site, status, type },
     });
   },
-  getJobs2: (site, status, type, lastKey) => {
+  getJobs2: (site, status, priority, type, lastKey) => {
     const query = { site };
     if (status) {
       query.status = status;
     }
+    if (priority) {
+      query.priority = priority;
+    }
     if (type) {
       query.type = type;
     }
@@ -42,18 +42,32 @@ export const generalActions = {
       url: Helper.getUrl(values.serviceKey, 'get/requests', query),
     });
   },
-  getJobsRecursive: (site, status, type, lastKey, jobs = []) => {
+  getJobsRecursive: (site, status, priority, type, lastKey, jobs = []) => {
     return new Promise(resolve => {
-      generalActions.getJobs2(site, status, type, lastKey).then(jobRes => {
+      maintenanceActions.getJobs2(site, status, priority, type, lastKey).then(jobRes => {
         const newJobs = [...jobs, ...jobRes.data.Items];
         if (!jobRes.data.LastKey) {
           return resolve(newJobs);
         }
-        return resolve(generalActions.getJobsRecursive(site, status, type, jobRes.data.LastKey, newJobs));
+        return resolve(maintenanceActions.getJobsRecursive(site, status, priority, type, jobRes.data.LastKey, newJobs));
       });
     });
   },
-  sendMaintenanceRequest: (userID, userName, phone, room, title, description, date, type, images, location, isHome, homeText) => {
+  sendMaintenanceRequest: (
+    userID,
+    userName,
+    phone,
+    room,
+    title,
+    description,
+    date,
+    type,
+    images,
+    location,
+    isHome,
+    homeText,
+    customFields,
+  ) => {
     const request = {
       method: 'POST',
       url: Helper.getUrl(values.serviceKey, 'sendMaintenance'),
@@ -70,6 +84,7 @@ export const generalActions = {
         location,
         isHome,
         homeText,
+        customFields,
       },
     };
     return Session.authedFunction(request);
@@ -88,7 +103,30 @@ export const generalActions = {
       data: { id, status },
     });
   },
-  addNote: (jobId, note, attachments) => {
+  editJobPriority: (id, priority) => {
+    return Session.authedFunction({
+      method: 'POST',
+      url: Helper.getUrl(values.serviceKey, 'update/priority'),
+      data: { id, priority },
+    });
+  },
+  assignJob: (jobId, userId) => {
+    return Session.authedFunction({
+      method: 'POST',
+      url: Helper.getUrl(values.serviceKey, 'update/assign'),
+      data: {
+        id: jobId,
+        userId,
+      },
+    });
+  },
+  getAssignees: site => {
+    return Session.authedFunction({
+      method: 'GET',
+      url: Helper.getUrl(values.serviceKey, 'get/assignees', { site }),
+    });
+  },
+  addNote: (jobId, note, attachments, images) => {
     return Session.authedFunction({
       method: 'POST',
       url: Helper.getUrl(values.serviceKey, 'requests/note'),
@@ -96,11 +134,12 @@ export const generalActions = {
         id: jobId,
         note,
         attachments,
+        images,
         action: 'AddNote',
       },
     });
   },
-  editNote: (jobId, noteId, note, attachments) => {
+  editNote: (jobId, noteId, note, attachments, images) => {
     return Session.authedFunction({
       method: 'POST',
       url: Helper.getUrl(values.serviceKey, 'requests/note'),
@@ -108,6 +147,7 @@ export const generalActions = {
         id: jobId,
         note,
         attachments,
+        images,
         noteId,
         action: 'EditNote',
       },
@@ -124,10 +164,6 @@ export const generalActions = {
       },
     });
   },
-  // getWeeklyMenu: async time => {
-  //   //deprecated
-  //   return null;
-  // },
   getJobTypes: async site => {
     const url = Helper.getUrl(values.serviceKey, 'getjobtypes');
     return Session.authedFunction({
@@ -136,32 +172,4 @@ export const generalActions = {
       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/components/FilterPopupMenu.js

@@ -1,9 +1,13 @@
 import React, { Component } from 'react';
-import { View, Text, TouchableOpacity, Modal } from 'react-native';
+import { View, Text, TouchableOpacity, Modal, ScrollView, Dimensions } from 'react-native';
 import { connect } from 'react-redux';
 import _ from 'lodash';
-import { generalActions } from '../apis';
+import { maintenanceActions } from '../apis';
 import { Colours, Helper } from '../core.config';
+import { getJobStatusOptions, getIncompleteJobStatuses, jobPriorityOptions } from '../helper';
+import { values } from '../values.config';
+
+const SCREEN_HEIGHT = Dimensions.get('window').height;
 
 class FilterPopupMenu extends Component {
   constructor(props) {
@@ -12,33 +16,25 @@ class FilterPopupMenu extends Component {
     this.state = {
       types: props.types || [],
       selectedStatus: props.status || '',
+      selectedPriority: props.priority || '',
       selectedType: props.type || '',
+      selectedAssignee: props.assignee || '',
+      assignees: [],
     };
-    this.statusOptions = [
+    this.priorityOptions = [
       {
         label: 'All',
         value: '',
       },
-      {
-        label: 'Incomplete',
-        value: 'Unassigned|In Progress',
-      },
-      {
-        label: 'Unassigned',
-        value: 'Unassigned',
-      },
-      {
-        label: 'In Progress',
-        value: 'In Progress',
-      },
-      {
-        label: 'Completed',
-        value: 'Completed',
-      },
+      ...jobPriorityOptions.map(p => ({
+        label: p.label,
+        value: p.label,
+      }))
     ];
   }
 
   componentDidMount() {
+    this.getAssignees();
     if (_.isEmpty(this.state.types)) this.refreshTypes();
   }
 
@@ -48,8 +44,50 @@ class FilterPopupMenu extends Component {
     }
   }
 
+  getStatusOptions = () => {
+    const statusOptions = getJobStatusOptions(this.props);
+    const options = [
+      {
+        label: 'All',
+        value: '',
+      },
+      {
+        label: 'Incomplete',
+        value: `Unassigned|${getIncompleteJobStatuses(this.props).map(s => s.text).join('|')}`,
+      },
+      ...statusOptions.map(s => ({
+        label: s.text,
+        value: s.text,
+      })),
+    ];
+    // console.log('getStatusOptions', options);
+    return options;
+  }
+
+  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 generalActions.getJobTypes(Helper.getSite(this.props.site));
+    const { data } = await maintenanceActions.getJobTypes(Helper.getSite(this.props.site));
     const types = data.map(t => {
       return { label: t.typeName, value: t.typeName };
     });
@@ -66,11 +104,15 @@ class FilterPopupMenu extends Component {
 
   onDone = () => {
     const { onClose } = this.props;
-    const { selectedStatus, selectedType } = this.state;
+    const { selectedStatus, selectedPriority, selectedType, selectedAssignee } = this.state;
     if (onClose)
       onClose({
         status: selectedStatus,
+        statusText: this.getStatusOptions().find(o => o.value === selectedStatus)?.label,
+        priority: selectedPriority,
         type: selectedType,
+        assignee: selectedAssignee,
+        assigneeName: this.state.assignees.find(a => a.value === selectedAssignee)?.label,
       });
   };
 
@@ -118,15 +160,21 @@ class FilterPopupMenu extends Component {
   }
 
   render() {
+    // console.log('FilterPopupMenu', JSON.stringify({ category: this.props.user.category, permissions: this.props.user.permissions }, null, 2))
+    const isStaff = this.props.user.category === 'staff'
+    const canFilterAssignee = !_.includes(this.props.user.permissions, values.permissionMaintenanceAssignment);
+
     return (
       <Modal visible transparent animationType="slide" onRequestClose={this.onDone}>
         <View style={styles.container}>
           <View style={styles.menu}>
             {this.renderTitle()}
-            <View style={styles.optionContent}>
-              {this.renderOptions('Status', this.statusOptions, 'selectedStatus')}
+            <ScrollView style={styles.optionContent}>
+              {this.renderOptions('Status', this.getStatusOptions(), 'selectedStatus')}
+              {isStaff ? this.renderOptions('Priority', this.priorityOptions, 'selectedPriority') : null}
               {this.renderOptions('Type', this.state.types, 'selectedType')}
-            </View>
+              {canFilterAssignee ? this.renderOptions('Assigned To', this.state.assignees, 'selectedAssignee') : null}
+            </ScrollView>
             {this.renderCancel()}
           </View>
         </View>
@@ -153,6 +201,7 @@ const styles = {
     backgroundColor: '#fff',
     borderTopLeftRadius: 12,
     borderTopRightRadius: 12,
+    maxHeight: SCREEN_HEIGHT * 0.8,
   },
   cancelContainer: {
     paddingVertical: 16,
@@ -216,8 +265,10 @@ const mapStateToProps = state => {
   const { user } = state;
 
   return {
+    user,
     site: user.site,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
+    statusTypes: state[values.reducerKey].jobstatuses,
   };
 };