@plusscommunities/pluss-maintenance-web 1.0.23 → 1.0.27-beta.0

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@plusscommunities/pluss-maintenance-web",
-  "version": "1.0.23",
+  "version": "1.0.27-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/index.cjs.js",
   "scripts": {
     "build": "npm i && rollup -c",
-    "core": "npm i @plusscommunities/pluss-core-web@latest",
+    "betapatch": "npm version prepatch --preid=beta",
     "patch": "npm version patch",
+    "betaupload": "npm run build && npm publish --access public --tag beta && rm -rf node_modules",
+    "betaupload:p": "npm run betapatch && npm run betaupload",
     "upload": "npm run build && 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"
+    "upload:p": "npm run patch && npm run upload"
   },
   "author": "Phillip Suh",
   "license": "ISC",
@@ -29,7 +30,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.14.0",
-    "@plusscommunities/pluss-core-web": "^1.2.5",
+    "@plusscommunities/pluss-core-web": "^1.2.13-beta.0",
     "js-cookie": "^2.2.0",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",

package/src/apis/reactionActions.js

@@ -3,13 +3,14 @@ import { PlussCore } from '../feature.config';
 const { Helper, Session } = PlussCore;
 
 export const reactionActions = {
-  addComment: (entityId, entityType, entityName, site, comment, image) => {
+  addComment: (entityId, entityType, entityName, site, comment, image, parentId) => {
     const data = {
       entityId,
       entityType,
       entityName,
       site,
       comment,
+      parentId,
     };
     if (!_.isEmpty(image)) {
       data.image = image;

package/src/components/JobList.js

@@ -11,7 +11,7 @@ import { PlussCore } from '../feature.config';
 import { maintenanceActions } from '../apis';
 import StatusTypes from '../maintenanceStatus.json';
 
-const { Session, Components } = PlussCore;
+const { Session } = PlussCore;
 
 class JobList extends Component {
   constructor(props) {
@@ -66,10 +66,6 @@ class JobList extends Component {
     }
   };
 
-  onOpenJobTypes = () => {
-    this.props.history.push('/requestTypes');
-  };
-
   renderRequests() {
     let source = _.sortBy(this.props.source, (event) => {
       if (this.state.sortColumn !== 'createdUnix') return event[this.state.sortColumn];
@@ -155,21 +151,6 @@ class JobList extends Component {
     );
   }
 
-  renderButtons() {
-    if (!Session.validateAccess(this.props.auth.site, 'maintenanceTypes', this.props.auth)) return null;
-
-    return (
-      <div className="flex-reverse">
-        <Components.Button inline buttonType="primaryAction" onClick={this.onOpenJobTypes} isActive>
-          <div className="flex flex-row flex-center">
-            <Components.SVGIcon colour={'#fff'} icon="maintenance2" height="17px" />
-            <div className="marginLeft-10">Request Types</div>
-          </div>
-        </Components.Button>
-      </div>
-    );
-  }
-
   renderContent() {
     if (_.isEmpty(this.props.source)) return this.renderEmpty();
 
@@ -226,8 +207,8 @@ class JobList extends Component {
   render() {
     return (
       <div style={{ minWidth: '100%' }}>
-        {this.renderButtons()}
         {this.renderContent()}
+        <div className="hub_tidioPadding"></div>
       </div>
     );
   }

package/src/{screens → components}/JobTypes.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { Table } from 'react-bootstrap';
 import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
 import _ from 'lodash';
 import FontAwesome from 'react-fontawesome';
 import { withRouter } from 'react-router';
@@ -256,8 +255,7 @@ class JobTypes extends Component {
     }
     return (
       <div style={{ minWidth: '100%' }}>
-        <div className="flex flex-row flex-center flex-between marginBottom-32">
-          <Components.PageTitle>Request Types</Components.PageTitle>
+        <div className="marginBottom-32">
           <Components.AddButton onClick={() => this.onShowJobType()} text="NEW REQUEST TYPE" />
         </div>
         {this.renderContent()}
@@ -336,14 +334,10 @@ class JobTypes extends Component {
 
   render() {
     return (
-      <div className="hub-wrapperContainer">
-        <div className="hub-headerContentWrapper">
-          <Components.Header />
-          <div className="hub-contentWrapper" style={{ position: 'relative' }}>
-            {this.renderJobTypes()}
-          </div>
-          {this.renderNewUserTypePopup()}
-        </div>
+      <div style={{ minWidth: '100%' }}>
+        <div>{this.renderJobTypes()}</div>
+        {this.renderNewUserTypePopup()}
+        <div className="hub_tidioPadding"></div>
       </div>
     );
   }

package/src/index.js

@@ -1,11 +1,10 @@
 import RequestsHub from './screens/RequestsHub';
 import Job from './screens/Job';
 import AddJob from './screens/AddJob';
-import JobTypes from './screens/JobTypes';
 import MaintenanceReducer from './reducers/MaintenanceReducer';
 
 export const Reducers = { maintenance: MaintenanceReducer };
-export const Screens = { RequestsHub, Job, AddJob, JobTypes };
+export const Screens = { RequestsHub, Job, AddJob };
 export { default as Config } from './feature.config';
 export { default as ActivityText } from './components/ActivityText';
 export { default as ViewWidget } from './components/ViewWidget';

package/src/screens/RequestsHub.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
+import { withRouter } from 'react-router';
 import _ from 'lodash';
 import moment from 'moment';
 import FontAwesome from 'react-fontawesome';
@@ -7,6 +8,7 @@ import Config, { PlussCore } from '../feature.config';
 import { jobsLoaded } from '../actions';
 import { maintenanceActions } from '../apis';
 import JobList from '../components/JobList';
+import JobTypes from '../components/JobTypes';
 
 const { Components, Session } = PlussCore;
 
@@ -14,7 +16,7 @@ class RequestsHub extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedSection: 'upcoming',
+      selectedSection: 'all',
       location: '',
       loadingAll: false,
       loadingSubmissions: false,
@@ -102,49 +104,57 @@ class RequestsHub extends Component {
   renderStats = (stat, loading) => (loading ? <FontAwesome style={styles.spinner} name="spinner fa-pulse fa-fw" /> : stat);
 
   renderLeftBar() {
+    const sectionItems = [];
+
+    if (this.canAddNew()) {
+      sectionItems.push({
+        type: 'newButton',
+        text: 'New Request',
+        onClick: this.onAddNew,
+      });
+    }
+
+    sectionItems.push({
+      type: 'navItem',
+      text: 'View Requests',
+      icon: 'eye',
+      isFontAwesome: true,
+      selected: this.state.selectedSection === 'all',
+      onClick: () => {
+        this.setState({ selectedSection: 'all' });
+      },
+    });
+
+    if (Session.validateAccess(this.props.auth.site, 'maintenanceTypes', this.props.auth)) {
+      sectionItems.push({
+        type: 'navItem',
+        text: 'Request Types',
+        // icon: 'maintenance2',
+        // isSVG: true,
+        selected: this.state.selectedSection === 'requestTypes',
+        onClick: () => {
+          this.setState({ selectedSection: 'requestTypes' });
+        },
+      });
+    }
+
     return (
-      <div className="hub-sideContent">
-        {/* Top Add Button */}
-        <div className="hub-sideContent-topButton" />
-        <div style={{ paddingLeft: 15, width: '100%' }}>
-          {/* Title */}
-          <div className="fontMedium fontSize-32 text-dark" style={styles.sideBarTitleSection}>
-            Maintenance requests
-          </div>
-          {/* Content */}
-          {/* All Articles */}
-          <div
-            onClick={() => {
-              this.setState({ selectedSection: 'completed' });
-            }}
-            className="sideBarSection"
-            style={this.getSideBarSectionColour('completed')}
-          >
-            <div className="fontMedium fontSize-36 text-dark" style={{ lineHeight: '50px' }}>
-              {this.renderStats(this.state.completed.length, this.state.loadingAll)}
-            </div>
-            <div className="fontRegular fontSize-16 text-light lineHeight-22">Complete</div>
-          </div>
-          {/* Upcoming */}
-          <div
-            onClick={() => {
-              this.setState({ selectedSection: 'upcoming' });
-            }}
-            className="sideBarSection"
-            style={this.getSideBarSectionColour('upcoming')}
-          >
-            <div className="fontMedium fontSize-36 text-dark" style={{ lineHeight: '50px' }}>
-              {this.renderStats(this.state.upcoming.length, this.state.loadingAll)}
-            </div>
-            <div className="fontRegular fontSize-16 text-light lineHeight-22">Incomplete</div>
-          </div>
-        </div>
-      </div>
+      <Components.HubSidebar
+        sections={[
+          {
+            title: 'Requests',
+            items: sectionItems,
+          },
+        ]}
+      />
     );
   }
 
   renderRight() {
-    return <JobList source={this.state.selectedSection === 'completed' ? this.state.completed : this.state.upcoming} />;
+    if (this.state.selectedSection === 'requestTypes') {
+      return <JobTypes />;
+    }
+    return <JobList source={this.state.allList} />;
   }
 
   render() {
@@ -152,7 +162,7 @@ class RequestsHub extends Component {
       <div className="hub-wrapperContainer">
         {this.renderLeftBar()}
         <div className="hub-headerContentWrapper">
-          <Components.Header>{this.canAddNew() && <Components.AddButton onClick={this.onAddNew} text="NEW REQUEST" />}</Components.Header>
+          <Components.Header />
           <div className="hub-contentWrapper">{this.renderRight()}</div>
         </div>
       </div>
@@ -193,4 +203,4 @@ const mapStateToProps = (state) => {
   };
 };
 
-export default connect(mapStateToProps, { jobsLoaded })(RequestsHub);
+export default connect(mapStateToProps, { jobsLoaded })(withRouter(RequestsHub));