@plusscommunities/pluss-maintenance-app 1.0.11 → 1.1.2-beta.0

package/package.json

@@ -1,26 +1,32 @@
 {
   "name": "@plusscommunities/pluss-maintenance-app",
-  "version": "1.0.11",
+  "version": "1.1.2-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "src/index.js",
   "scripts": {
+    "precore": "npm i @plusscommunities/pluss-core-app@beta",
     "core": "npm i @plusscommunities/pluss-core-app@latest",
-    "upload": "npm version patch && npm publish --access public && rm -rf node_modules",
-    "deploy": "npm run core && npm run upload",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "prepatch": "npm version prepatch --preid=beta",
+    "patch": "npm version patch",
+    "preupload": "npm publish --access public --tag beta && rm -rf node_modules",
+    "preupload:p": "npm run prepatch && npm run preupload",
+    "preupload:cp": "npm run precore && npm run upload:p",
+    "upload": "npm publish --access public && rm -rf node_modules",
+    "upload:p": "npm run patch && npm run upload",
+    "upload:cp": "npm run core && npm run upload:p"
   },
   "author": "Phillip Suh",
   "license": "ISC",
   "dependencies": {
-    "@plusscommunities/pluss-core-app": "^1.1.2",
+    "@plusscommunities/pluss-core-app": "^1.4.2-beta.0",
     "axios": "^0.16.2",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",
-    "react": "16.13.1",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-41.0.0.tar.gz",
+    "react": "17.0.1",
+    "react-native": "0.64.3",
     "react-native-elements": "^0.17.0",
     "react-native-iphone-x-helper": "^1.3.1",
-    "react-native-webview": "11.2.3",
+    "react-native-webview": "11.15.0",
     "react-redux": "^5.0.5"
   },
   "peerDependencies": {

package/src/apis/generalActions.js

@@ -1,9 +1,7 @@
 // import axios from 'axios';
 // import { getUrl } from './helper';
 // import { authedFunction } from '../js';
-import { PlussCore } from '../feature.config';
-
-const { Helper, Session } = PlussCore;
+import { Helper, Session } from '../core.config';
 
 export const generalActions = {
   getJob: (site, jobId) => {

package/src/components/MaintenanceList.js

@@ -7,9 +7,7 @@ import { generalActions } from '../apis';
 import { jobsLoaded } from '../actions';
 import MaintenanceListItem from '../components/MaintenanceListItem';
 import StatusSelectorPopup from './StatusSelectorPopup';
-import { PlussCore } from '../feature.config';
-
-const { Components, Colours, Config } = PlussCore;
+import { Components, Colours, Config } from '../core.config';
 
 const SHOW_ALL_STATUS = 'Show All';
 
@@ -201,4 +199,4 @@ const mapStateToProps = state => {
   };
 };
 
-export default connect(mapStateToProps, { jobsLoaded }, null, { withRef: true })(MaintenanceList);
+export default connect(mapStateToProps, { jobsLoaded }, null, { forwardRef: true })(MaintenanceList);

package/src/components/MaintenanceListItem.js

@@ -17,9 +17,8 @@ import moment from 'moment';
 // } from '../../js';
 // import NavigationService from '../../js/NavigationService';
 import { getJobStatusProps, jobStatusOptions } from '../helper';
-import { PlussCore, Services } from '../feature.config';
-
-const { Helper, Colours } = PlussCore;
+import { Services } from '../feature.config';
+import { Helper, Colours } from '../core.config';
 
 class MaintenanceListItem extends Component {
   onPressJob = () => {

package/src/components/MaintenanceWidgetItem.js

@@ -5,9 +5,8 @@ import { Icon } from 'react-native-elements';
 import moment from 'moment';
 import _ from 'lodash';
 import { getJobStatusProps, jobStatusOptions } from '../helper';
-import { PlussCore, Services } from '../feature.config';
-
-const { Colours, Helper } = PlussCore;
+import { Services } from '../feature.config';
+import { Colours, Helper } from '../core.config';
 
 class MaintenanceWidgetItem extends Component {
   onPressJob = () => {

package/src/components/StatusSelectorPopup.js

@@ -2,9 +2,7 @@ import React, { PureComponent } from 'react';
 import { View, StyleSheet, TouchableOpacity, Text } from 'react-native';
 import { connect } from 'react-redux';
 import { jobStatusOptions, getJobStatusColour } from '../helper';
-import { PlussCore } from '../feature.config';
-
-const { Components, Colours } = PlussCore;
+import { Components, Colours } from '../core.config';
 
 class StatusSelectorPopup extends PureComponent {
   render() {

package/src/components/WidgetSmall.js

@@ -5,9 +5,8 @@ import _ from 'lodash';
 import { generalActions } from '../apis';
 import { jobsLoaded } from '../actions';
 import MaintenanceWidgetItem from './MaintenanceWidgetItem';
-import { PlussCore, Services } from '../feature.config';
-
-const { Colours, Components, Config } = PlussCore;
+import { Services } from '../feature.config';
+import { Colours, Components, Config } from '../core.config';
 
 const MAX_ITEMS = 10;
 
@@ -147,4 +146,4 @@ const mapStateToProps = state => {
   };
 };
 
-export default connect(mapStateToProps, { jobsLoaded }, null, { withRef: true })(WidgetSmall);
+export default connect(mapStateToProps, { jobsLoaded }, null, { forwardRef: true })(WidgetSmall);

package/src/core.config.js

@@ -0,0 +1,5 @@
+// import * as PlussCore from '../../pluss-core/src';
+import * as PlussCore from '@plusscommunities/pluss-core-app';
+
+const { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours } = PlussCore;
+export { Apis, Fonts, Actions, ActionTypes, Config, Components, Styles, Session, Helper, Constants, Colours };

package/src/feature.config.js

@@ -1,8 +1,6 @@
 // import * as PlussCore from '../../pluss-core/src';
 import * as PlussCore from '@plusscommunities/pluss-core-app';
 
-export { PlussCore };
-
 export const Services = {
   navigation: null,
 };

package/src/helper.js

@@ -1,6 +1,4 @@
-import { PlussCore } from './feature.config';
-
-const { Colours } = PlussCore;
+import { Colours } from './core.config';
 
 const jobStatusOptions = [
   {

package/src/reducers/JobsReducer.js

@@ -1,9 +1,8 @@
 /* eslint-disable no-param-reassign */
-import { REHYDRATE } from 'redux-persist/constants';
+import { REHYDRATE } from 'redux-persist';
 import { JOBS_LOADED, JOB_ADDED } from '../actions/types';
-import { PlussCore } from '../feature.config';
+import { ActionTypes } from '../core.config';
 
-const { ActionTypes } = PlussCore;
 const REDUCER_KEY = 'jobs';
 
 const INITIAL_STATE = {
@@ -30,6 +29,7 @@ export default (state = INITIAL_STATE, action) => {
       }
       return { ...state, jobs: updateJobs };
     case REHYDRATE:
+      if (!action.payload) return state;
       if (action.payload[REDUCER_KEY]) {
         if (action.payload[REDUCER_KEY].jobs == null) {
           action.payload[REDUCER_KEY].jobs = [];

package/src/screens/JobTypePicker.js

@@ -3,9 +3,8 @@ import _ from 'lodash';
 import { TouchableOpacity, View, ScrollView, Text } from 'react-native';
 import { connect } from 'react-redux';
 import { Icon } from 'react-native-elements';
-import { PlussCore, Services } from '../feature.config';
-
-const { Components, Colours } = PlussCore;
+import { Services } from '../feature.config';
+import { Components, Colours } from '../core.config';
 
 class JobTypePicker extends Component {
   state = {

package/src/screens/MaintenancePage.js

@@ -3,9 +3,8 @@ import { View, StyleSheet } from 'react-native';
 import { connect } from 'react-redux';
 import _ from 'lodash';
 import MaintenanceList from '../components/MaintenanceList';
-import { PlussCore, Services, BaseComponents } from '../feature.config';
-
-const { Components, Helper, Styles, Config } = PlussCore;
+import { Services, BaseComponents } from '../feature.config';
+import { Components, Helper, Styles, Config } from '../core.config';
 
 class MaintenancePage extends Component {
   constructor(props) {

package/src/screens/RequestDetail.js

@@ -9,9 +9,8 @@ import { generalActions } from '../apis';
 import { jobAdded } from '../actions';
 import StatusSelectorPopup from '../components/StatusSelectorPopup';
 import { jobStatusOptions, getJobStatusProps } from '../helper';
-import { PlussCore, Services } from '../feature.config';
-
-const { Colours, Helper, Components, Config } = PlussCore;
+import { Services } from '../feature.config';
+import { Colours, Helper, Components, Config } from '../core.config';
 
 class RequestDetail extends Component {
   constructor(props) {
@@ -431,6 +430,7 @@ class RequestDetail extends Component {
         scrollView={this.scrollView}
         entityType="maintenancerequest"
         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 }}

package/src/screens/RequestNotes.js

@@ -7,9 +7,8 @@ import moment from 'moment';
 import { jobAdded } from '../actions';
 import { generalActions } from '../apis';
 import { getBottomSpace } from 'react-native-iphone-x-helper';
-import { PlussCore, Services } from '../feature.config';
-
-const { Components, Colours, Helper } = PlussCore;
+import { Services } from '../feature.config';
+import { Components, Colours, Helper } from '../core.config';
 
 class RequestNotes extends Component {
   constructor(props) {

package/src/screens/ServiceRequest.js

@@ -17,9 +17,8 @@ import { Icon } from 'react-native-elements';
 import { connect } from 'react-redux';
 import { jobAdded } from '../actions';
 import { generalActions } from '../apis';
-import { PlussCore, Services } from '../feature.config';
-
-const { Components, Colours, Helper, Config } = PlussCore;
+import { Services } from '../feature.config';
+import { Components, Colours, Helper, Config } from '../core.config';
 
 const PHOTO_SIZE = (Dimensions.get('window').width - 64) / 3;
 
@@ -206,7 +205,7 @@ class MaintenanceRequest extends Component {
     if (this.state.uploadingImage || this.state.submitting) {
       return;
     }
-    this.imageUploader.getWrappedInstance().showUploadMenu();
+    this.imageUploader.showUploadMenu();
   };
 
   submit = async () => {