@plusscommunities/pluss-maintenance-web 1.1.9 → 1.1.11-beta.0

package/dist/index.cjs.js

@@ -828,7 +828,24 @@ var JobList = /*#__PURE__*/function (_Component) {
           completedDuration = moment__default['default'].utc(completedEntry.timestamp).unix() - moment__default['default'].utc(r.createdTime).unix();
         }
 
+        var notes = '';
+        (r.Notes || []).forEach(function (note, index) {
+          if (index > 0) {
+            notes += '\n\n';
+          }
+
+          if (note.User && !___default['default'].isEmpty(note.User.displayName)) {
+            notes += "".concat(note.User.displayName, ":\n");
+          }
+
+          if (note.Timestamp) {
+            notes += "".concat(moment__default['default'](note.Timestamp).format('DD-MM-YYYY h:mma'), "\n");
+          }
+
+          notes += note.Note;
+        });
         return _objectSpread$4(_objectSpread$4({}, r), {}, {
+          notes: notes,
           progressTime: progressTime,
           completedTime: completedTime,
           progressDuration: progressDuration,
@@ -885,6 +902,9 @@ var JobList = /*#__PURE__*/function (_Component) {
     }, {
       label: 'Description',
       key: 'description'
+    }, {
+      label: 'Notes',
+      key: 'notes'
     }, {
       label: 'User Name',
       key: 'userName'
@@ -1899,7 +1919,8 @@ function _createSuper$8(Derived) { var hasNativeReflectConstruct = _isNativeRefl
 
 function _isNativeReflectConstruct$8() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var Components$3 = PlussCore__namespace.Components,
-    Session$3 = PlussCore__namespace.Session;
+    Session$3 = PlussCore__namespace.Session,
+    Urls = PlussCore__namespace.Urls;
 
 var RequestsHub = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](RequestsHub, _Component);
@@ -2099,7 +2120,11 @@ var RequestsHub = /*#__PURE__*/function (_Component) {
         sections: [{
           title: 'Requests',
           items: sectionItems
-        }]
+        }],
+        helpGuide: {
+          text: "Help with Requests",
+          url: Urls.HelpGuide.Maintenance
+        }
       });
     }
   }, {

package/dist/index.esm.js

@@ -784,7 +784,24 @@ var JobList = /*#__PURE__*/function (_Component) {
           completedDuration = moment.utc(completedEntry.timestamp).unix() - moment.utc(r.createdTime).unix();
         }
 
+        var notes = '';
+        (r.Notes || []).forEach(function (note, index) {
+          if (index > 0) {
+            notes += '\n\n';
+          }
+
+          if (note.User && !_.isEmpty(note.User.displayName)) {
+            notes += "".concat(note.User.displayName, ":\n");
+          }
+
+          if (note.Timestamp) {
+            notes += "".concat(moment(note.Timestamp).format('DD-MM-YYYY h:mma'), "\n");
+          }
+
+          notes += note.Note;
+        });
         return _objectSpread$4(_objectSpread$4({}, r), {}, {
+          notes: notes,
           progressTime: progressTime,
           completedTime: completedTime,
           progressDuration: progressDuration,
@@ -841,6 +858,9 @@ var JobList = /*#__PURE__*/function (_Component) {
     }, {
       label: 'Description',
       key: 'description'
+    }, {
+      label: 'Notes',
+      key: 'notes'
     }, {
       label: 'User Name',
       key: 'userName'
@@ -1855,7 +1875,8 @@ function _createSuper$8(Derived) { var hasNativeReflectConstruct = _isNativeRefl
 
 function _isNativeReflectConstruct$8() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var Components$3 = PlussCore.Components,
-    Session$3 = PlussCore.Session;
+    Session$3 = PlussCore.Session,
+    Urls = PlussCore.Urls;
 
 var RequestsHub = /*#__PURE__*/function (_Component) {
   _inherits(RequestsHub, _Component);
@@ -2055,7 +2076,11 @@ var RequestsHub = /*#__PURE__*/function (_Component) {
         sections: [{
           title: 'Requests',
           items: sectionItems
-        }]
+        }],
+        helpGuide: {
+          text: "Help with Requests",
+          url: Urls.HelpGuide.Maintenance
+        }
       });
     }
   }, {

package/dist/index.umd.js

@@ -807,7 +807,24 @@
             completedDuration = moment__default['default'].utc(completedEntry.timestamp).unix() - moment__default['default'].utc(r.createdTime).unix();
           }
 
+          var notes = '';
+          (r.Notes || []).forEach(function (note, index) {
+            if (index > 0) {
+              notes += '\n\n';
+            }
+
+            if (note.User && !___default['default'].isEmpty(note.User.displayName)) {
+              notes += "".concat(note.User.displayName, ":\n");
+            }
+
+            if (note.Timestamp) {
+              notes += "".concat(moment__default['default'](note.Timestamp).format('DD-MM-YYYY h:mma'), "\n");
+            }
+
+            notes += note.Note;
+          });
           return _objectSpread$4(_objectSpread$4({}, r), {}, {
+            notes: notes,
             progressTime: progressTime,
             completedTime: completedTime,
             progressDuration: progressDuration,
@@ -864,6 +881,9 @@
       }, {
         label: 'Description',
         key: 'description'
+      }, {
+        label: 'Notes',
+        key: 'notes'
       }, {
         label: 'User Name',
         key: 'userName'
@@ -1878,7 +1898,8 @@
 
   function _isNativeReflectConstruct$8() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
   var Components$3 = PlussCore__namespace.Components,
-      Session$3 = PlussCore__namespace.Session;
+      Session$3 = PlussCore__namespace.Session,
+      Urls = PlussCore__namespace.Urls;
 
   var RequestsHub = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](RequestsHub, _Component);
@@ -2078,7 +2099,11 @@
           sections: [{
             title: 'Requests',
             items: sectionItems
-          }]
+          }],
+          helpGuide: {
+            text: "Help with Requests",
+            url: Urls.HelpGuide.Maintenance
+          }
         });
       }
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-maintenance-web",
-  "version": "1.1.9",
+  "version": "1.1.11-beta.0",
   "description": "Extension package to enable maintenance on Pluss Communities Platform",
   "main": "dist/index.cjs.js",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.14.0",
-    "@plusscommunities/pluss-core-web": "1.4.22",
+    "@plusscommunities/pluss-core-web": "1.4.30",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",

package/src/components/JobList.js

@@ -32,6 +32,7 @@ class JobList extends Component {
       { label: 'Title', key: 'title' },
       { label: 'Location', key: 'room' },
       { label: 'Description', key: 'description' },
+      { label: 'Notes', key: 'notes' },
       { label: 'User Name', key: 'userName' },
       { label: 'User ID', key: 'userID' },
       { label: 'Request Time', key: 'createdTime' },
@@ -247,7 +248,20 @@ class JobList extends Component {
         completedTime = moment.utc(completedEntry.timestamp).format();
         completedDuration = moment.utc(completedEntry.timestamp).unix() - moment.utc(r.createdTime).unix();
       }
-      return { ...r, progressTime, completedTime, progressDuration, completedDuration };
+      let notes = '';
+      (r.Notes || []).forEach((note, index) => {
+        if (index > 0) {
+          notes += '\n\n';
+        }
+        if (note.User && !_.isEmpty(note.User.displayName)) {
+          notes += `${note.User.displayName}:\n`;
+        }
+        if (note.Timestamp) {
+          notes += `${moment(note.Timestamp).format('DD-MM-YYYY h:mma')}\n`;
+        }
+        notes += note.Note;
+      });
+      return { ...r, notes, progressTime, completedTime, progressDuration, completedDuration };
     });
   };
 

package/src/screens/RequestsHub.js

@@ -10,7 +10,7 @@ import { maintenanceActions } from '../apis';
 import JobList from '../components/JobList';
 import JobTypes from '../components/JobTypes';
 
-const { Components, Session } = PlussCore;
+const { Components, Session, Urls } = PlussCore;
 
 class RequestsHub extends Component {
   constructor(props) {
@@ -145,6 +145,10 @@ class RequestsHub extends Component {
             items: sectionItems,
           },
         ]}
+        helpGuide={{
+          text: `Help with Requests`,
+          url: Urls.HelpGuide.Maintenance,
+        }}
       />
     );
   }