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

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

@@ -0,0 +1 @@
+{"version":3,"names":["values","featureKey","aliases","reducerKey","serviceKey","updateKey","commentKey","actionJobsLoaded","actionJobAdded","actionJobsAdded","actionJobsStatusesLoaded","actionJobsHideSeen","actionJobFilterLoaded","screenMaintenance","screenRequestDetail","screenServiceRequest","screenJobTypePicker","screenRequestNotes","permissionMaintenanceTracking","permissionMaintenanceAssignment","iconGridMenu","gridViewBox","iconAddMenu","iconKioskAction","hasMoreOption","orderAddMenu","orderMoreMenu","orderKioskAction","textFeatureTitle","textAddMenuTitle","textMoreMenuTitle","textKioskActionTitle","textEntityName","textJobType","emptyRequestsStaff","emptyRequestsUser","forceCustomFields","stringConfigJobStatus","stringConfigHideSeen"],"sources":["values.config.food.js"],"sourcesContent":["const values = {\n  featureKey: 'maintenanceFood',\n  aliases: ['maintenanceRequest'],\n  reducerKey: 'jobsFood',\n  serviceKey: 'maintenanceFood',\n  updateKey: 'jobsFood',\n  commentKey: 'maintenancerequestFood',\n  actionJobsLoaded: 'JOBS_LOADEDFood',\n  actionJobAdded: 'JOB_ADDEDFood',\n  actionJobsAdded: 'JOBS_ADDEDFood',\n  actionJobsStatusesLoaded: 'JOBS_STATUSES_LOADEDFood',\n  actionJobsHideSeen: 'JOBS_HIDE_SEENFood',\n  actionJobFilterLoaded: 'JOBS_FILTER_LOADEDFood',\n  screenMaintenance: 'maintenanceFood',\n  screenRequestDetail: 'requestDetailFood',\n  screenServiceRequest: 'serviceRequestFood',\n  screenJobTypePicker: 'jobTypePickerFood',\n  screenRequestNotes: 'requestNotesFood',\n  permissionMaintenanceTracking: 'maintenanceTrackingFood',\n  permissionMaintenanceAssignment: 'maintenanceAssignmentFood',\n  iconGridMenu: 'form',\n  gridViewBox: '0 0 256 256',\n  iconAddMenu: 'form',\n  iconKioskAction: 'form',\n  hasMoreOption: false,\n  orderAddMenu: 5,\n  orderMoreMenu: 4,\n  orderKioskAction: 1,\n  textFeatureTitle: 'Food Ordering',\n  textAddMenuTitle: 'New Food Order',\n  textMoreMenuTitle: 'Food Ordering',\n  textKioskActionTitle: 'Food Ordering',\n  textEntityName: 'Food Order',\n  textJobType: 'Food Order Type',\n  emptyRequestsStaff: 'No active Food Orders',\n  emptyRequestsUser: 'Your Food Orders will show here',\n  forceCustomFields: true,\n  stringConfigJobStatus: 'maintenanceJobStatusFood',\n  stringConfigHideSeen: 'maintenanceDisableSeenFood',\n};\n\nexport { values };\n"],"mappings":"AAAA,MAAMA,MAAM,GAAG;EACbC,UAAU,EAAE,iBAAiB;EAC7BC,OAAO,EAAE,CAAC,oBAAoB,CAAC;EAC/BC,UAAU,EAAE,UAAU;EACtBC,UAAU,EAAE,iBAAiB;EAC7BC,SAAS,EAAE,UAAU;EACrBC,UAAU,EAAE,wBAAwB;EACpCC,gBAAgB,EAAE,iBAAiB;EACnCC,cAAc,EAAE,eAAe;EAC/BC,eAAe,EAAE,gBAAgB;EACjCC,wBAAwB,EAAE,0BAA0B;EACpDC,kBAAkB,EAAE,oBAAoB;EACxCC,qBAAqB,EAAE,wBAAwB;EAC/CC,iBAAiB,EAAE,iBAAiB;EACpCC,mBAAmB,EAAE,mBAAmB;EACxCC,oBAAoB,EAAE,oBAAoB;EAC1CC,mBAAmB,EAAE,mBAAmB;EACxCC,kBAAkB,EAAE,kBAAkB;EACtCC,6BAA6B,EAAE,yBAAyB;EACxDC,+BAA+B,EAAE,2BAA2B;EAC5DC,YAAY,EAAE,MAAM;EACpBC,WAAW,EAAE,aAAa;EAC1BC,WAAW,EAAE,MAAM;EACnBC,eAAe,EAAE,MAAM;EACvBC,aAAa,EAAE,KAAK;EACpBC,YAAY,EAAE,CAAC;EACfC,aAAa,EAAE,CAAC;EAChBC,gBAAgB,EAAE,CAAC;EACnBC,gBAAgB,EAAE,eAAe;EACjCC,gBAAgB,EAAE,gBAAgB;EAClCC,iBAAiB,EAAE,eAAe;EAClCC,oBAAoB,EAAE,eAAe;EACrCC,cAAc,EAAE,YAAY;EAC5BC,WAAW,EAAE,iBAAiB;EAC9BC,kBAAkB,EAAE,uBAAuB;EAC3CC,iBAAiB,EAAE,iCAAiC;EACpDC,iBAAiB,EAAE,IAAI;EACvBC,qBAAqB,EAAE,0BAA0B;EACjDC,oBAAoB,EAAE;AACxB,CAAC;AAED,SAAStC,MAAM","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-app",
-  "version": "7.0.0",
+  "version": "7.0.1-auth.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/module/index.js",
   "module": "dist/module/index.js",
@@ -15,6 +15,9 @@
     "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,13 +25,14 @@
     "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": {},
   "peerDependencies": {
-    "@plusscommunities/pluss-core-app": "7.0.0",
+    "@plusscommunities/pluss-core-app": "^7.0.2-auth.0",
     "axios": "^1.6.8",
     "lodash": "^4.17.4",
     "moment": "^2.30.1",

package/src/components/FilterPopupMenu.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import _ from 'lodash';
 import { maintenanceActions } from '../apis';
 import { Colours, Helper } from '../core.config';
-import { getJobStatusOptions, getIncompleteJobStatuses, jobPriorityOptions } from '../helper';
+import { getJobStatusOptions, getIncompleteJobStatuses, jobPriorityOptions, getDefaultJobPriority } from '../helper';
 import { values } from '../values.config';
 
 const SCREEN_HEIGHT = Dimensions.get('window').height;
@@ -21,16 +21,6 @@ class FilterPopupMenu extends Component {
       selectedAssignee: props.assignee || '',
       assignees: [],
     };
-    this.priorityOptions = [
-      {
-        label: 'All',
-        value: '',
-      },
-      ...jobPriorityOptions.map(p => ({
-        label: p.label,
-        value: p.label,
-      }))
-    ];
   }
 
   componentDidMount() {
@@ -53,16 +43,35 @@ class FilterPopupMenu extends Component {
       },
       {
         label: 'Incomplete',
-        value: `Unassigned|${getIncompleteJobStatuses(this.props).map(s => s.text).join('|')}`,
+        value: `Unassigned|${getIncompleteJobStatuses(this.props)
+          .map(s => s.text)
+          .join('|')}`,
       },
       ...statusOptions.map(s => ({
         label: s.text,
         value: s.text,
       })),
     ];
-    // console.log('getStatusOptions', options);
+    // console.log('getStatusOptions', JSON.stringify(options, null, 2));
     return options;
-  }
+  };
+
+  getPriorityOptions = () => {
+    const priorityOptions = jobPriorityOptions;
+    const defaultPriority = getDefaultJobPriority();
+    const options = [
+      {
+        label: 'All',
+        value: '',
+      },
+      ...priorityOptions.map(p => ({
+        label: p.label,
+        value: p.label === defaultPriority?.label ? `${p.label}|undefined` : p.label,
+      })),
+    ];
+    // console.log('getPriorityOptions', JSON.stringify(options, null, 2));
+    return options;
+  };
 
   getAssignees = async () => {
     try {
@@ -110,6 +119,7 @@ class FilterPopupMenu extends Component {
         status: selectedStatus,
         statusText: this.getStatusOptions().find(o => o.value === selectedStatus)?.label,
         priority: selectedPriority,
+        priorityText: this.getPriorityOptions().find(o => o.value === selectedPriority)?.label,
         type: selectedType,
         assignee: selectedAssignee,
         assigneeName: this.state.assignees.find(a => a.value === selectedAssignee)?.label,
@@ -161,7 +171,7 @@ 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 isStaff = this.props.user.category === 'staff';
     const canFilterAssignee = !_.includes(this.props.user.permissions, values.permissionMaintenanceAssignment);
 
     return (
@@ -171,7 +181,7 @@ class FilterPopupMenu extends Component {
             {this.renderTitle()}
             <ScrollView style={styles.optionContent}>
               {this.renderOptions('Status', this.getStatusOptions(), 'selectedStatus')}
-              {isStaff ? this.renderOptions('Priority', this.priorityOptions, 'selectedPriority') : null}
+              {isStaff ? this.renderOptions('Priority', this.getPriorityOptions(), 'selectedPriority') : null}
               {this.renderOptions('Type', this.state.types, 'selectedType')}
               {canFilterAssignee ? this.renderOptions('Assigned To', this.state.assignees, 'selectedAssignee') : null}
             </ScrollView>

package/src/components/MaintenanceList.js

@@ -153,7 +153,7 @@ class MaintenanceList extends Component {
       filterTexts.push(jobfilters.statusText);
     }
     if (!_.isEmpty(jobfilters.priority)) {
-      filterTexts.push(jobfilters.priority);
+      filterTexts.push(jobfilters.priorityText);
     }
     if (!_.isEmpty(jobfilters.type)) {
       filterTexts.push(jobfilters.type);
@@ -317,10 +317,10 @@ const mapStateToProps = state => {
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
     dataUpdated: notifications.dataUpdated[values.updateKey],
     statusTypes: state[values.reducerKey].jobstatuses,
-    jobfilters: state[values.reducerKey].jobfilters,
+    jobfilters: state[values.reducerKey].jobfilters || {},
   };
 };
 
-export default connect(mapStateToProps, { jobsLoaded, jobAdded, jobsAdded, jobStatusesUpdate, jobHideSeenUpdate, jobsFilterLoaded }, null, { forwardRef: true })(
-  MaintenanceList,
-);
+export default connect(mapStateToProps, { jobsLoaded, jobAdded, jobsAdded, jobStatusesUpdate, jobHideSeenUpdate, jobsFilterLoaded }, null, {
+  forwardRef: true,
+})(MaintenanceList);

package/src/helper.js

@@ -41,7 +41,7 @@ const jobPriorityOptions = [
   },
 ];
 
-const getJobStatusOptions = props => props?.statusTypes?.length ? props?.statusTypes : jobStatusOptions;
+const getJobStatusOptions = props => (props?.statusTypes?.length ? props?.statusTypes : jobStatusOptions);
 
 const getDefaultJobStatuses = props => getJobStatusOptions(props).filter(s => s.category === STATUS_NOT_ACTIONED);
 
@@ -53,9 +53,11 @@ const getJobStatus = (status, props) => {
   let statusOption = null;
   if (status) statusOption = statusOptions.find(s => s.text === status);
   return statusOption || getDefaultJobStatuses(props)[0];
-}
+};
+
+const getDefaultJobPriority = () => jobPriorityOptions.find(p => p.default);
 
-const getJobPriority = priority => jobPriorityOptions.find(p => p.label === priority) || jobPriorityOptions.find(p => p.default);
+const getJobPriority = priority => jobPriorityOptions.find(p => p.label === priority) || getDefaultJobPriority();
 
 export {
   jobStatusOptions,
@@ -65,4 +67,5 @@ export {
   getIncompleteJobStatuses,
   getJobStatus,
   getJobPriority,
+  getDefaultJobPriority,
 };

package/src/reducers/JobsReducer.js

@@ -15,6 +15,7 @@ const INITIAL_STATE = {
     status: '',
     statusText: '',
     priority: '',
+    priorityText: '',
     type: '',
     assignee: '',
     assigneeName: '',
@@ -59,7 +60,7 @@ export default (state = INITIAL_STATE, action) => {
     case JOBS_HIDE_SEEN:
       return { ...state, hideSeen: action.payload };
     case JOB_FILTER_LOADED:
-      return { ...state, jobfilters: action.payload };
+      return { ...state, jobfilters: action.payload || INITIAL_STATE.jobfilters };
     case REHYDRATE:
       if (!action.payload) return state;
       if (action.payload[REDUCER_KEY]) {

package/src/screens/RequestDetail.js

@@ -37,6 +37,7 @@ class RequestDetail extends Component {
       galleryImages: [],
       showMessages: false,
       assignees: [],
+      selectedPDF: null,
     };
 
     this.scrollView = React.createRef();
@@ -333,7 +334,7 @@ class RequestDetail extends Component {
     const statusOption = getJobStatus(status, this.props);
     const priority = getJobPriority(job.priority);
     const canEdit = this.hasPermission();
-    const isStaff = this.props.user.category === 'staff'
+    const isStaff = this.props.user.category === 'staff';
     const showSeen = !status || status === getJobStatus(null, this.props).text;
 
     return (
@@ -464,6 +465,24 @@ class RequestDetail extends Component {
     return null;
   }
 
+  renderDocument(documents) {
+    const { colourBrandingMain } = this.props;
+
+    if (!_.isNil(documents) && !_.isEmpty(documents)) {
+      return documents.map((document, index) => {
+        return (
+          <TouchableOpacity key={index} style={styles.documentContainer} onPress={() => this.setState({ selectedPDF: document })}>
+            <View style={{ ...styles.documentTypeContainer, backgroundColor: colourBrandingMain }}>
+              <Text style={styles.documentTypeText}>{document.ext}</Text>
+            </View>
+            <Text style={styles.documentText}>{`${document.name}${document.uploading ? ` - ${document.uploadProgress}` : ''}`}</Text>
+          </TouchableOpacity>
+        );
+      });
+    }
+    return null;
+  }
+
   renderImagePopup() {
     return (
       <Components.ImagePopup
@@ -475,6 +494,18 @@ class RequestDetail extends Component {
     );
   }
 
+  renderDocumentPopup() {
+    if (_.isEmpty(this.state.selectedPDF)) return null;
+    return (
+      <Components.PDFPopup
+        source={this.state.selectedPDF.url}
+        onClose={() => this.setState({ selectedPDF: null })}
+        title={this.state.selectedPDF.name}
+        pdfCount={1}
+      />
+    );
+  }
+
   renderAssignee() {
     const { job } = this.state;
     if (!this.hasPermission() && !job.Assignee) return null;
@@ -526,7 +557,9 @@ class RequestDetail extends Component {
         case 'checkbox':
           return <Text style={styles.customText}>{field.answer && Array.isArray(field.answer) ? field.answer.join(', ') : ''}</Text>;
         case 'image':
-          return <View style={{ marginTop: 8 }}>{this.renderImage(field.answer)}</View>;
+          return <View style={styles.customImage}>{this.renderImage(field.answer)}</View>;
+        case 'document':
+          return <View style={styles.customDocument}>{this.renderDocument(field.answer)}</View>;
         default:
           return <Text style={styles.customText}>{field.answer}</Text>;
       }
@@ -642,8 +675,8 @@ class RequestDetail extends Component {
         entityId={this.props.job.id}
         entityName={this.props.job.title}
         site={this.state.job.site || this.state.job.location}
-      // noScroll={true}
-      // style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
+        // noScroll={true}
+        // style={{ position: 'absolute', bottom: 0, left: 0, right: 0 }}
       />
     );
   }
@@ -678,6 +711,7 @@ class RequestDetail extends Component {
         {this.renderStatusPopup()}
         {this.renderPriorityPopup()}
         {this.renderImagePopup()}
+        {this.renderDocumentPopup()}
         <DateTimePicker
           isVisible={this.state.isDateTimePickerVisible}
           onConfirm={this.onDateSelected}
@@ -949,6 +983,13 @@ const styles = StyleSheet.create({
     color: Colours.TEXT_DARKEST,
     paddingVertical: 8,
   },
+  customImage: {
+    marginTop: 8,
+  },
+  customDocument: {
+    marginTop: 8,
+    marginBottom: 16,
+  },
   customStaticTitle: {
     fontSize: 20,
     fontFamily: 'sf-semibold',
@@ -962,6 +1003,31 @@ const styles = StyleSheet.create({
     lineHeight: 24,
     marginBottom: 10,
   },
+  documentContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    paddingVertical: 4,
+  },
+  documentTypeContainer: {
+    width: 50,
+    height: 60,
+    justifyContent: 'center',
+    alignItems: 'center',
+    borderRadius: 5,
+    marginRight: 8,
+  },
+  documentTypeText: {
+    color: '#fff',
+    fontFamily: 'sf-semibold',
+    textAlign: 'center',
+  },
+  documentText: {
+    flex: 1,
+    fontFamily: 'sf-semibold',
+    fontSize: 16,
+    color: '#65686D',
+  },
 });
 
 const mapStateToProps = state => {