@plusscommunities/pluss-maintenance-app 1.0.8 → 1.0.12

package/package.json

@@ -1,16 +1,19 @@
 {
   "name": "@plusscommunities/pluss-maintenance-app",
-  "version": "1.0.8",
+  "version": "1.0.12",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "src/index.js",
   "scripts": {
-    "upload": "npm version patch && npm publish",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "core": "npm i @plusscommunities/pluss-core-app@latest",
+    "patch": "npm version patch",
+    "upload": "npm publish --access public && rm -rf node_modules",
+    "upload:p": "npm run patch && npm run upload",
+    "upload:cp": "npm run core && npm run patch && npm run upload"
   },
   "author": "Phillip Suh",
   "license": "ISC",
   "dependencies": {
-    "@plusscommunities/pluss-core-app": "1.0.8",
+    "@plusscommunities/pluss-core-app": "^1.1.5",
     "axios": "^0.16.2",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",
@@ -20,5 +23,8 @@
     "react-native-iphone-x-helper": "^1.3.1",
     "react-native-webview": "11.2.3",
     "react-redux": "^5.0.5"
+  },
+  "peerDependencies": {
+    "redux-persist": "^4.8.3"
   }
 }

package/src/components/MaintenanceList.js

@@ -125,9 +125,9 @@ class MaintenanceList extends Component {
     );
   }
 
-  renderAddButton() {
-    return this.props.enableAdd ? <Components.AddContentButton /> : null;
-  }
+  // renderAddButton() {
+  //   return this.props.enableAdd ? <Components.AddContentButton /> : null;
+  // }
 
   renderStatusPopup() {
     if (!this.state.showStatusPopup) return null;

package/src/feature.config.js

@@ -1,25 +1,28 @@
-// import * as PlussCore from '../pluss-core-app';
+// import * as PlussCore from '../../pluss-core/src';
 import * as PlussCore from '@plusscommunities/pluss-core-app';
 
 export { PlussCore };
 
 export const Services = {
   navigation: null,
-  analytics: null,
+};
+
+export const BaseComponents = {
+  NotificationBell: null,
 };
 
 const FeatureConfig = {
   key: 'maintenance',
   aliases: ['maintenanceRequest'],
   title: 'Request',
-  defaultNavigate: 'maintenance',
   gridMenu: {
     icon: 'maintenance',
     viewBox: '0 0 30 30',
+    navigate: 'maintenance',
   },
   addMenu: {
     order: 5,
-    type: 'request',
+    icon: 'request',
     title: 'Request',
     navigate: 'serviceRequest',
     visibleExps: { type: 'feature', value: 'maintenance' },
@@ -36,12 +39,13 @@ const FeatureConfig = {
       ],
     },
   },
-  kiosk: {
+  kioskAction: {
     order: 1,
     icon: 'wrench',
     title: 'Request',
     navigate: 'serviceRequest',
   },
+  hideTabBar: [],
   env: {
     baseStage: '',
     baseAPIUrl: '',
@@ -55,12 +59,14 @@ const FeatureConfig = {
     awsStorageBucket: '',
     preferredSite: '',
     strings: {},
+    newEventDefaults: '',
+    defaultAllowComments: true,
   },
-  init: (environment, navigation, analytics) => {
+  init: (environment, navigation, notificationBell) => {
     FeatureConfig.env = environment;
     Services.navigation = navigation;
-    Services.analytics = analytics;
-    PlussCore.Config.init(environment);
+    BaseComponents.NotificationBell = notificationBell;
+    PlussCore.Config.init(environment, navigation);
 
     // Override strings
     if (environment && environment.strings) {
@@ -71,7 +77,7 @@ const FeatureConfig = {
       if (MAINTENANCE_REQUEST) {
         FeatureConfig.title = MAINTENANCE_REQUEST;
         FeatureConfig.moreMenu.title = MAINTENANCE_REQUEST;
-        FeatureConfig.kiosk.title = MAINTENANCE_REQUEST;
+        FeatureConfig.kioskAction.title = MAINTENANCE_REQUEST;
       }
     }
   },

package/src/screens/MaintenancePage.js

@@ -3,7 +3,7 @@ import { View, StyleSheet } from 'react-native';
 import { connect } from 'react-redux';
 import _ from 'lodash';
 import MaintenanceList from '../components/MaintenanceList';
-import { PlussCore, Services } from '../feature.config';
+import { PlussCore, Services, BaseComponents } from '../feature.config';
 
 const { Components, Helper, Styles, Config } = PlussCore;
 
@@ -37,7 +37,7 @@ class MaintenancePage extends Component {
           rightContent={
             _.includes(this.props.user.hidden, 'notifications') ? null : (
               <View style={styles.notificationContainer}>
-                <Components.NotificationBell
+                <BaseComponents.NotificationBell
                   colourBrandingHeader={this.props.colourBrandingHeader}
                   containerStyle={Styles.notificationBell}
                 />
@@ -65,7 +65,7 @@ class MaintenancePage extends Component {
           enableAdd={!isHomeTab}
           options={this.props.options}
         />
-        {isHomeTab && <Components.AddContentButton />}
+        {/* {isHomeTab && <Components.AddContentButton />} */}
       </View>
     );
   }

package/src/screens/RequestDetail.js

@@ -431,6 +431,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 }}