@plusscommunities/pluss-maintenance-web 1.1.16-auth.0 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-web",
-  "version": "1.1.16-auth.0",
+  "version": "1.1.16",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/index.cjs.js",
   "scripts": {
@@ -9,9 +9,6 @@
     "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",
-    "authpatch": "npm version prepatch --preid=auth",
-    "authupload": "npm run build && npm publish --access public --tag auth && rm -rf node_modules",
-    "authupload:p": "npm run authpatch && npm run authupload",
     "upload": "npm run build && npm publish --access public && rm -rf node_modules",
     "upload:p": "npm run patch && npm run upload"
   },
@@ -32,23 +29,23 @@
     "rollup-plugin-styles": "^3.14.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
-    "@plusscommunities/pluss-core-web": "1.4.34-auth.0",
+    "@babel/runtime": "^7.14.0"
+  },
+  "peerDependencies": {
+    "@plusscommunities/pluss-core-web": "^1.4.33",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "js-cookie": "^2.2.0",
     "lodash": "^4.17.4",
-    "moment": "^2.18.1",
+    "moment": "^2.30.1",
     "react": "^16.14.0",
     "react-bootstrap": "^0.31.2",
     "react-dom": "^16.14.0",
     "react-fontawesome": "^1.6.1",
+    "react-redux": "^5.0.6",
     "react-router-dom": "^4.2.2",
     "react-textarea-autosize": "^7.1.0-1"
   },
-  "peerDependencies": {
-    "react-redux": "^7.2.9"
-  },
   "keywords": []
 }

package/src/feature.config.js

@@ -1,5 +1,5 @@
-// import * as PlussCore from '../../pluss-core/src';
-import * as PlussCore from '@plusscommunities/pluss-core-web';
+import * as PlussCore from '../../pluss-core/src';
+// import * as PlussCore from '@plusscommunities/pluss-core-web';
 
 export { PlussCore };
 

package/src/screens/AddJob.js

@@ -12,6 +12,7 @@ const { Actions, Components, Helper, Session } = PlussCore;
 class AddJob extends Component {
   constructor(props) {
     super(props);
+    this.imageInput = null;
     this.state = {
       jobId: Helper.safeReadParams(this.props, 'jobId') ? this.props.match.params.jobId : null,
       job: null,
@@ -20,6 +21,7 @@ class AddJob extends Component {
       connected: false,
       types: [],
       users: [],
+      images: [],
       userSearch: '',
       userFilterOpen: false,
       selectedUser: null,
@@ -65,11 +67,24 @@ class AddJob extends Component {
           profilePic: userProfilePic,
         },
       });
+      this.checkSetImages(res.data.images);
     } catch (error) {
       console.error('getJob', error);
     }
   };
 
+  checkSetImages(images) {
+    if (this.imageInput) {
+      if (!_.isEmpty(images)) {
+        this.imageInput.getWrappedInstance().setValue(images);
+      }
+    } else {
+      setTimeout(() => {
+        this.checkSetImage(images);
+      }, 100);
+    }
+  }
+
   getJobTypes = async () => {
     try {
       const res = await maintenanceActions.getJobTypes(this.props.auth.site);
@@ -167,7 +182,7 @@ class AddJob extends Component {
       homeText: this.state.homeText,
       type: this.state.type,
       date: null,
-      image: this.state.image,
+      images: this.state.images,
     };
 
     if (this.state.id != null) {
@@ -348,6 +363,20 @@ class AddJob extends Component {
             }}
             alwaysShowLabel
           />
+          <div className="marginBottom-16">
+            <Components.Text type="formLabel" className="marginBottom-4">
+              Images
+            </Components.Text>
+            <Components.ImageInput
+              ref={(ref) => {
+                this.imageInput = ref;
+              }}
+              multiple
+              refreshCallback={(images) => {
+                this.setState({ images });
+              }}
+            />
+          </div>
           <Components.RadioButton
             label="Person must be home during work?"
             isActive={this.state.isHome}

package/src/screens/Job.js

@@ -415,6 +415,7 @@ class Job extends Component {
   }
 
   renderComment(c) {
+    return <Components.Comment key={c.Id} comment={c} />;
     return (
       <div key={c.Id} className="comment">
         <p className="comment_text">{Helper.toParagraphed(c.Comment)}</p>
@@ -458,15 +459,40 @@ class Job extends Component {
     );
   }
 
+  renderImages() {
+    if (_.isEmpty(this.state.job.image) && _.isEmpty(this.state.job.images)) return null;
+
+    const imagesToUse = _.isEmpty(this.state.job.image) ? this.state.job.images : [this.state.job.image];
+    return (
+      <div className="padding-60 paddingVertical-40 bottomDivideBorder">
+        <Components.Text type="formTitleSmall" className="marginBottom-16">
+          Images
+        </Components.Text>
+        <div className="imageGrid">
+          {imagesToUse.map((image, i) => {
+            return (
+              <a href={image} target="_blank" rel="noopener noreferrer" key={i}>
+                <div className="imageGrid_image" style={{ backgroundImage: `url('${Helper.get1400(image)}')` }}></div>
+              </a>
+            );
+          })}
+        </div>
+      </div>
+    );
+  }
+
   renderInner() {
     if (this.state.job == null) return null;
 
     return (
       <div style={{ paddingBottom: 40 }}>
         <div className="padding-60 paddingVertical-40 bottomDivideBorder relative">
-          <Components.Text type="formTitleLarge" className="marginBottom-24">
+          <Components.Text type="formTitleLarge" className="marginBottom-8">
             {this.state.job.title || 'Request'}
           </Components.Text>
+          <Components.Text type="formTitleMedium" className="marginBottom-24">
+            Job #{this.state.job.jobId}
+          </Components.Text>
           <div className="marginTop-16">
             <div className={'fieldLabel'}>Request date</div>
             <div className={'fontRegular fontSize-16 text-dark marginTop-5'}>
@@ -511,25 +537,7 @@ class Job extends Component {
             </div>
           )}
         </div>
-        {(this.state.job.image || this.state.job.images) && (
-          <div className="padding-60 paddingVertical-40 bottomDivideBorder">
-            <Components.Text type="formTitleSmall" className="marginBottom-16">
-              Image
-            </Components.Text>
-            <div
-              style={{
-                marginTop: 16,
-                height: 180,
-                width: 260,
-                borderRadius: 4,
-                border: '1px solid #aaa',
-                backgroundColor: '#ddd',
-                backgroundImage: `url(${this.state.job.thumbnail})`,
-                backgroundPosition: 'center',
-              }}
-            />
-          </div>
-        )}
+        {this.renderImages()}
         {this.renderCommentSection()}
       </div>
     );