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

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

@@ -1,24 +1,25 @@
 import { Helper, Session } from '../core.config';
+import { values } from '../values.config';
 
 export const maintenanceActions = {
   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,7 +36,7 @@ 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 = []) => {
@@ -49,10 +50,24 @@ export const maintenanceActions = {
       });
     });
   },
-  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('maintenance', 'sendMaintenance'),
+      url: Helper.getUrl(values.serviceKey, 'sendMaintenance'),
       data: {
         userID,
         userName,
@@ -66,6 +81,7 @@ export const maintenanceActions = {
         location,
         isHome,
         homeText,
+        customFields,
       },
     };
     return Session.authedFunction(request);
@@ -73,21 +89,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'),
+      url: Helper.getUrl(values.serviceKey, 'update/assign'),
       data: {
         id: jobId,
         userId,
@@ -97,13 +113,13 @@ export const maintenanceActions = {
   getAssignees: site => {
     return Session.authedFunction({
       method: 'GET',
-      url: Helper.getUrl('maintenance', 'get/assignees', { site }),
+      url: Helper.getUrl(values.serviceKey, '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 +131,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 +144,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,
@@ -137,7 +153,7 @@ export const maintenanceActions = {
     });
   },
   getJobTypes: async site => {
-    const url = Helper.getUrl('maintenance', 'getjobtypes');
+    const url = Helper.getUrl(values.serviceKey, 'getjobtypes');
     return Session.authedFunction({
       method: 'POST',
       url,

package/src/components/MaintenanceList.js

@@ -7,6 +7,7 @@ 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) {
@@ -201,7 +202,7 @@ class MaintenanceList extends Component {
     return (
       <View style={styles.searchContainer}>
         <Components.GenericInput
-          placeholder="Search by Job ID or Location"
+          placeholder={`Search by ${values.textEntityName} ID or Address`}
           value={this.state.searchText}
           onChangeText={this.onSearchText}
           onSubmitEditing={this.onSearchSubmit}
@@ -316,7 +317,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 +328,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() {
@@ -72,7 +73,11 @@ class MaintenanceListItem extends Component {
           <View style={styles.jobInnerContainer}>
             <View style={styles.jobTopSection}>
               <View style={styles.jobTopLeft}>
-                {job.jobId ? <Text style={[styles.jobIdText, { color: this.props.colourBrandingMain }]}>{`Job #${job.jobId}`}</Text> : null}
+                {job.jobId ? (
+                  <Text
+                    style={[styles.jobIdText, { color: this.props.colourBrandingMain }]}
+                  >{`${values.textEntityName} #${job.jobId}`}</Text>
+                ) : null}
                 <Text style={styles.jobTitleText}>{job.title}</Text>
                 {job.room ? <Text style={styles.jobLocationText}>{job.room}</Text> : null}
                 <View style={styles.jobTypeSeenContainer}>

package/src/components/MaintenanceWidgetItem.js

@@ -7,10 +7,11 @@ import _ from 'lodash';
 import { getJobStatusProps, jobStatusOptions } from '../helper';
 import { Services } from '../feature.config';
 import { Colours, Helper } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenanceWidgetItem extends Component {
   onPressJob = () => {
-    Services.navigation.navigate('requestDetail', { job: this.props.job });
+    Services.navigation.navigate(values.screenRequestDetail, { job: this.props.job });
   };
 
   render() {

package/src/components/WidgetSmall.js

@@ -7,6 +7,7 @@ import { jobsLoaded } from '../actions';
 import MaintenanceWidgetItem from './MaintenanceWidgetItem';
 import { Services } from '../feature.config';
 import { Colours, Components, Config } from '../core.config';
+import { values } from '../values.config';
 
 const MAX_ITEMS = 10;
 
@@ -27,7 +28,7 @@ class WidgetSmall extends Component {
   getTitle = () => {
     const { options } = this.props;
     if (options && !_.isEmpty(options.Title)) return options.Title;
-    return Config.env.strings.MAINTENANCE;
+    return this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
   };
 
   getEmptyStateText = () => {
@@ -136,13 +137,15 @@ const styles = StyleSheet.create({
 });
 
 const mapStateToProps = state => {
-  const { user, jobs, notifications } = state;
+  const { user, notifications } = state;
+  const jobs = state[values.reducerKey];
   return {
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
     jobs: _.orderBy(jobs.jobs, ['createdUnix'], ['desc']),
     site: user.site,
     userCategory: user.category,
-    dataUpdated: notifications.dataUpdated.jobs,
+    dataUpdated: notifications.dataUpdated[values.updateKey],
+    strings: state.strings?.config || {},
   };
 };
 

package/src/feature.config.js

@@ -1,5 +1,6 @@
 // import * as PlussCore from '../../pluss-core/src';
 import * as PlussCore from '@plusscommunities/pluss-core-app';
+import { values } from './values.config';
 
 export const Services = {
   navigation: null,
@@ -10,25 +11,25 @@ export const BaseComponents = {
 };
 
 const FeatureConfig = {
-  key: 'maintenance',
-  aliases: ['maintenanceRequest'],
-  title: 'Request',
+  key: values.featureKey,
+  aliases: values.aliases,
+  title: values.textFeatureTitle,
   gridMenu: {
-    icon: 'maintenance',
+    icon: values.iconGridMenu,
     viewBox: '0 0 30 30',
-    navigate: 'maintenance',
+    navigate: values.screenMaintenance,
   },
   addMenu: {
-    order: 5,
-    icon: 'request',
-    title: 'Request',
-    navigate: 'serviceRequest',
-    visibleExps: { type: 'feature', value: 'maintenance' },
+    order: values.orderAddMenu,
+    icon: values.iconAddMenu,
+    title: values.textAddMenuTitle,
+    navigate: values.screenServiceRequest,
+    visibleExps: { type: 'feature', value: values.featureKey },
   },
   moreMenu: {
-    order: 4,
-    title: 'Request',
-    navigate: 'maintenance',
+    order: values.orderMoreMenu,
+    title: values.textMoreMenuTitle,
+    navigate: values.screenMaintenance,
     visibleExps: {
       type: 'and',
       exps: [
@@ -38,10 +39,10 @@ const FeatureConfig = {
     },
   },
   kioskAction: {
-    order: 1,
-    icon: 'wrench',
-    title: 'Request',
-    navigate: 'serviceRequest',
+    order: values.orderKioskAction,
+    icon: values.iconKioskAction,
+    title: values.textKioskActionTitle,
+    navigate: values.screenServiceRequest,
   },
   hideTabBar: [],
   env: {
@@ -65,19 +66,6 @@ const FeatureConfig = {
     Services.navigation = navigation;
     BaseComponents.NotificationBell = notificationBell;
     PlussCore.Config.init(environment, navigation);
-
-    // Override strings
-    if (environment && environment.strings) {
-      const { MAINTENANCE, MAINTENANCE_REQUEST } = environment.strings;
-      if (MAINTENANCE) {
-        FeatureConfig.addMenu.title = MAINTENANCE;
-      }
-      if (MAINTENANCE_REQUEST) {
-        FeatureConfig.title = MAINTENANCE_REQUEST;
-        FeatureConfig.moreMenu.title = MAINTENANCE_REQUEST;
-        FeatureConfig.kioskAction.title = MAINTENANCE_REQUEST;
-      }
-    }
   },
 };
 export default FeatureConfig;

package/src/index.js

@@ -4,15 +4,22 @@ import ServiceRequest from './screens/ServiceRequest';
 import JobTypePicker from './screens/JobTypePicker';
 import RequestNotes from './screens/RequestNotes';
 import JobsReducer from './reducers/JobsReducer';
+import { values } from './values.config';
 
-export const Reducers = { jobs: JobsReducer };
-export const Screens = {
-  maintenance: MaintenancePage,
-  requestDetail: RequestDetail,
-  serviceRequest: ServiceRequest,
-  jobTypePicker: JobTypePicker,
-  requestNotes: RequestNotes,
-};
+export const Reducers = (() => {
+  const reducers = {};
+  reducers[values.reducerKey] = JobsReducer;
+  return reducers;
+})();
+export const Screens = (() => {
+  const screens = {};
+  screens[values.screenMaintenance] = MaintenancePage;
+  screens[values.screenRequestDetail] = RequestDetail;
+  screens[values.screenServiceRequest] = ServiceRequest;
+  screens[values.screenJobTypePicker] = JobTypePicker;
+  screens[values.screenRequestNotes] = RequestNotes;
+  return screens;
+})();
 export { default as Config } from './feature.config';
 export { default as WidgetSmall } from './components/WidgetSmall';
 export { default as WidgetLarge } from './components/WidgetLarge';

package/src/screens/MaintenancePage.js

@@ -5,6 +5,7 @@ import _ from 'lodash';
 import MaintenanceList from '../components/MaintenanceList';
 import { Services, BaseComponents } from '../feature.config';
 import { Components, Helper, Styles, Config } from '../core.config';
+import { values } from '../values.config';
 
 class MaintenancePage extends Component {
   constructor(props) {
@@ -29,10 +30,11 @@ class MaintenancePage extends Component {
   };
 
   renderHeader() {
+    const title = this.props.title || this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
     if (this.state.isHomeTab) {
       return (
         <Components.Header
-          text={this.props.title || Config.env.strings.MAINTENANCE}
+          text={title}
           rightContent={
             _.includes(this.props.user.hidden, 'notifications') ? null : (
               <View style={styles.notificationContainer}>
@@ -46,9 +48,7 @@ class MaintenancePage extends Component {
         />
       );
     }
-    return (
-      <Components.Header leftIcon="angle-left" onPressLeft={this.onPressBack} text={this.props.title || Config.env.strings.MAINTENANCE} />
-    );
+    return <Components.Header leftIcon="angle-left" onPressLeft={this.onPressBack} text={values.textFeatureTitle} />;
   }
 
   render() {
@@ -89,6 +89,7 @@ const styles = StyleSheet.create({
 const mapStateToProps = state => {
   return {
     user: state.user,
+    strings: state.strings?.config || {},
   };
 };