@plusscommunities/pluss-feeds-web 1.0.2-beta.0 → 1.0.3

package/dist/index.cjs.js

@@ -73,13 +73,13 @@ const values = {
   textAreYouSureYouWantToDelete: 'Are you sure you want to delete the post?',
   textAreYouSureYouWantToApprove: 'Are you sure you want to approve the post?',
   textAreYouSureYouWantToReject: 'Are you sure you want to reject the post?',
-  textSingularName: 'Resident Feed',
-  textEmptyState: 'Your Resident Feeds will show here',
-  textTitleFeeds: 'Care Feeds',
-  textMenuTitle: 'Care Feeds',
-  textPermissionFeedManagement: 'Resident Feed Management',
-  textPermissionFeedPost: 'Post Resident Feed',
-  textPermissionFeedDraft: 'Draft Resident Feed'
+  textSingularName: 'Resident Activity',
+  textEmptyState: 'Your Resident Activity will show here',
+  textTitleFeeds: 'Resident Activity',
+  textMenuTitle: 'Resident Activity',
+  textPermissionFeedManagement: 'Resident Activity Feed Management',
+  textPermissionFeedPost: 'Post to Resident Activity Feed',
+  textPermissionFeedDraft: 'Resident Activity Feed Submission (Approval Required)'
 };
 
 // import * as PlussCore from '../../pluss-core/src';
@@ -93,8 +93,7 @@ const FeatureConfig = {
   menu: {
     order: values.menuOrder,
     text: values.textMenuTitle,
-    icon: 'stethoscope',
-    isFontAwesome: true,
+    icon: 'list-burger',
     url: values.routeHub,
     countProps: null,
     visibleExps: {
@@ -829,13 +828,15 @@ class FeedList extends React.Component {
     }, userContent);
   }
   renderTypePopup() {
+    const validTypes = ___default["default"].uniq(this.props.source.map(r => r.type)).filter(t => t);
+    const orderedTypes = ___default["default"].sortBy(validTypes, t => t.toLowerCase());
     return /*#__PURE__*/React__default["default"].createElement(Components$4.Popup, {
       title: "Select Type",
       maxWidth: 600,
       minWidth: 400,
       hasPadding: true,
       onClose: this.closeFilter
-    }, ___default["default"].sortBy(___default["default"].uniq(this.props.source.map(r => r.type)), t => t.toLowerCase()).map(type => {
+    }, orderedTypes.map(type => {
       return /*#__PURE__*/React__default["default"].createElement(Components$4.Tag, {
         key: type,
         onClick: () => this.selectTypeFilter(type),
@@ -865,7 +866,7 @@ class FeedList extends React.Component {
         className: "table-TitleColumn"
       }, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
         to: "".concat(values.routeFeedDetails, "/").concat(feed.id)
-      }, /*#__PURE__*/React__default["default"].createElement("span", null, feed.title))), /*#__PURE__*/React__default["default"].createElement("td", null, moment__default["default"].utc(feed.createdTime).local().format('ddd D MMM YYYY h:mma')), /*#__PURE__*/React__default["default"].createElement("td", null, feed.user && feed.user.displayName), /*#__PURE__*/React__default["default"].createElement("td", null, feed.author && feed.author.displayName), /*#__PURE__*/React__default["default"].createElement("td", {
+      }, /*#__PURE__*/React__default["default"].createElement("span", null, feed.title))), /*#__PURE__*/React__default["default"].createElement("td", null, moment__default["default"].utc(feed.created).local().format('ddd D MMM YYYY h:mma')), /*#__PURE__*/React__default["default"].createElement("td", null, feed.user && feed.user.displayName), /*#__PURE__*/React__default["default"].createElement("td", null, feed.author && feed.author.displayName), /*#__PURE__*/React__default["default"].createElement("td", {
         className: "table-options"
       }, canEdit ? /*#__PURE__*/React__default["default"].createElement("div", {
         style: {
@@ -1794,7 +1795,7 @@ class FeedHub extends React.Component {
     if (this.canAddNew()) {
       sectionItems.push({
         type: 'newButton',
-        text: 'New Feed',
+        text: 'New Post',
         onClick: this.onAddNew
       });
     }
@@ -1831,7 +1832,7 @@ class FeedHub extends React.Component {
     if (Session$2.validateAccess(this.props.auth.site, values.permissionFeedManagement, this.props.auth)) {
       sectionItems.push({
         type: 'navItem',
-        text: 'Feed Types',
+        text: 'Post Types',
         // icon: 'maintenance2',
         // isSVG: true,
         selected: this.state.selectedSection === 'feedTypes',
@@ -1846,11 +1847,11 @@ class FeedHub extends React.Component {
       sections: [{
         title: this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleFeeds,
         items: sectionItems
-      }]
-      // helpGuide={{
-      //   text: `Help with Feeds`,
-      //   url: Urls.HelpGuide.Feeds,
-      // }}
+      }],
+      helpGuide: {
+        text: "Help with Resident Activity",
+        url: 'https://www.plusscommunities.com/resident-activity-feed-feature'
+      }
     });
   }
   renderRight() {
@@ -2454,34 +2455,6 @@ class AddFeed extends React.Component {
       }, 100);
     }
   }
-  renderTypeOptions() {
-    const {
-      types,
-      type
-    } = this.state;
-    return /*#__PURE__*/React__default["default"].createElement("div", {
-      style: {
-        marginBottom: 15
-      }
-    }, /*#__PURE__*/React__default["default"].createElement(Components.Text, {
-      type: "formLabel"
-    }, "Select Type"), /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "marginTop-4"
-    }, types.map(ev => {
-      if (ev === null) return null;
-      return /*#__PURE__*/React__default["default"].createElement(Components.Tag, {
-        key: ev.id,
-        text: ev.label,
-        style: {
-          backgroundColor: ev.colour,
-          borderRadius: 8,
-          marginRight: 10,
-          opacity: ev.label === type ? 1 : 0.5
-        },
-        onClick: () => this.onSelectType(ev.label)
-      });
-    })));
-  }
   renderSuccess() {
     if (!this.state.success) return null;
     const title = this.props.strings["".concat(values.featureKey, "_textTitleFeeds")] || values.textTitleFeeds;
@@ -2498,12 +2471,14 @@ class AddFeed extends React.Component {
     const {
       userId,
       userName,
+      type,
       title
     } = this.state;
-    // console.log('validateForm', { userId, userName, title });
+    // console.log('validateForm', { userId, userName, type, title });
 
     if (___default["default"].isEmpty(userId)) return false;
     if (___default["default"].isEmpty(userName)) return false;
+    if (___default["default"].isEmpty(type)) return false;
     if (___default["default"].isEmpty(title)) return false;
     return true;
   }
@@ -2570,6 +2545,45 @@ class AddFeed extends React.Component {
       text: "Select User"
     })));
   }
+  renderTypeOptions() {
+    const {
+      showWarnings,
+      types,
+      type
+    } = this.state;
+    const isValid = !!type;
+    const showError = showWarnings && !isValid;
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "genericInputContainer ".concat(isValid ? 'genericInput-valid' : '', " ").concat(showError ? 'genericInput-error' : '').trim()
+    }, /*#__PURE__*/React__default["default"].createElement("div", {
+      style: {
+        display: 'flex',
+        flexDirection: 'row',
+        alignItems: 'center',
+        marginBottom: 0,
+        justifyContent: 'space-between'
+      }
+    }, /*#__PURE__*/React__default["default"].createElement(Components.Text, {
+      type: "formLabel"
+    }, "Select Type"), showError ? /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "fieldLabel fieldLabel-warning"
+    }, "Required") : null), /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "marginTop-4"
+    }, types.map(ev => {
+      if (ev === null) return null;
+      return /*#__PURE__*/React__default["default"].createElement(Components.Tag, {
+        key: ev.id,
+        text: ev.label,
+        style: {
+          backgroundColor: ev.colour,
+          borderRadius: 8,
+          marginRight: 10,
+          opacity: ev.label === type ? 1 : 0.5
+        },
+        onClick: () => this.onSelectType(ev.label)
+      });
+    })));
+  }
   renderMain() {
     return /*#__PURE__*/React__default["default"].createElement("div", {
       style: {
@@ -2580,7 +2594,7 @@ class AddFeed extends React.Component {
     }, /*#__PURE__*/React__default["default"].createElement(Components.Text, {
       type: "formTitleLarge",
       className: "marginBottom-24"
-    }, this.state.feedId == null ? 'New' : 'Edit', " Feed"), this.renderSelectUser(), this.renderTypeOptions(), /*#__PURE__*/React__default["default"].createElement(Components.GenericInput, {
+    }, this.state.feedId == null ? 'New' : 'Edit', " Post"), this.renderSelectUser(), this.renderTypeOptions(), /*#__PURE__*/React__default["default"].createElement(Components.GenericInput, {
       id: "title",
       label: "Title",
       type: "textarea",

package/dist/index.esm.js

@@ -42,13 +42,13 @@ const values = {
   textAreYouSureYouWantToDelete: 'Are you sure you want to delete the post?',
   textAreYouSureYouWantToApprove: 'Are you sure you want to approve the post?',
   textAreYouSureYouWantToReject: 'Are you sure you want to reject the post?',
-  textSingularName: 'Resident Feed',
-  textEmptyState: 'Your Resident Feeds will show here',
-  textTitleFeeds: 'Care Feeds',
-  textMenuTitle: 'Care Feeds',
-  textPermissionFeedManagement: 'Resident Feed Management',
-  textPermissionFeedPost: 'Post Resident Feed',
-  textPermissionFeedDraft: 'Draft Resident Feed'
+  textSingularName: 'Resident Activity',
+  textEmptyState: 'Your Resident Activity will show here',
+  textTitleFeeds: 'Resident Activity',
+  textMenuTitle: 'Resident Activity',
+  textPermissionFeedManagement: 'Resident Activity Feed Management',
+  textPermissionFeedPost: 'Post to Resident Activity Feed',
+  textPermissionFeedDraft: 'Resident Activity Feed Submission (Approval Required)'
 };
 
 // import * as PlussCore from '../../pluss-core/src';
@@ -62,8 +62,7 @@ const FeatureConfig = {
   menu: {
     order: values.menuOrder,
     text: values.textMenuTitle,
-    icon: 'stethoscope',
-    isFontAwesome: true,
+    icon: 'list-burger',
     url: values.routeHub,
     countProps: null,
     visibleExps: {
@@ -798,13 +797,15 @@ class FeedList extends Component {
     }, userContent);
   }
   renderTypePopup() {
+    const validTypes = _.uniq(this.props.source.map(r => r.type)).filter(t => t);
+    const orderedTypes = _.sortBy(validTypes, t => t.toLowerCase());
     return /*#__PURE__*/React.createElement(Components$4.Popup, {
       title: "Select Type",
       maxWidth: 600,
       minWidth: 400,
       hasPadding: true,
       onClose: this.closeFilter
-    }, _.sortBy(_.uniq(this.props.source.map(r => r.type)), t => t.toLowerCase()).map(type => {
+    }, orderedTypes.map(type => {
       return /*#__PURE__*/React.createElement(Components$4.Tag, {
         key: type,
         onClick: () => this.selectTypeFilter(type),
@@ -834,7 +835,7 @@ class FeedList extends Component {
         className: "table-TitleColumn"
       }, /*#__PURE__*/React.createElement(Link, {
         to: "".concat(values.routeFeedDetails, "/").concat(feed.id)
-      }, /*#__PURE__*/React.createElement("span", null, feed.title))), /*#__PURE__*/React.createElement("td", null, moment.utc(feed.createdTime).local().format('ddd D MMM YYYY h:mma')), /*#__PURE__*/React.createElement("td", null, feed.user && feed.user.displayName), /*#__PURE__*/React.createElement("td", null, feed.author && feed.author.displayName), /*#__PURE__*/React.createElement("td", {
+      }, /*#__PURE__*/React.createElement("span", null, feed.title))), /*#__PURE__*/React.createElement("td", null, moment.utc(feed.created).local().format('ddd D MMM YYYY h:mma')), /*#__PURE__*/React.createElement("td", null, feed.user && feed.user.displayName), /*#__PURE__*/React.createElement("td", null, feed.author && feed.author.displayName), /*#__PURE__*/React.createElement("td", {
         className: "table-options"
       }, canEdit ? /*#__PURE__*/React.createElement("div", {
         style: {
@@ -1763,7 +1764,7 @@ class FeedHub extends Component {
     if (this.canAddNew()) {
       sectionItems.push({
         type: 'newButton',
-        text: 'New Feed',
+        text: 'New Post',
         onClick: this.onAddNew
       });
     }
@@ -1800,7 +1801,7 @@ class FeedHub extends Component {
     if (Session$2.validateAccess(this.props.auth.site, values.permissionFeedManagement, this.props.auth)) {
       sectionItems.push({
         type: 'navItem',
-        text: 'Feed Types',
+        text: 'Post Types',
         // icon: 'maintenance2',
         // isSVG: true,
         selected: this.state.selectedSection === 'feedTypes',
@@ -1815,11 +1816,11 @@ class FeedHub extends Component {
       sections: [{
         title: this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleFeeds,
         items: sectionItems
-      }]
-      // helpGuide={{
-      //   text: `Help with Feeds`,
-      //   url: Urls.HelpGuide.Feeds,
-      // }}
+      }],
+      helpGuide: {
+        text: "Help with Resident Activity",
+        url: 'https://www.plusscommunities.com/resident-activity-feed-feature'
+      }
     });
   }
   renderRight() {
@@ -2423,34 +2424,6 @@ class AddFeed extends Component {
       }, 100);
     }
   }
-  renderTypeOptions() {
-    const {
-      types,
-      type
-    } = this.state;
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        marginBottom: 15
-      }
-    }, /*#__PURE__*/React.createElement(Components.Text, {
-      type: "formLabel"
-    }, "Select Type"), /*#__PURE__*/React.createElement("div", {
-      className: "marginTop-4"
-    }, types.map(ev => {
-      if (ev === null) return null;
-      return /*#__PURE__*/React.createElement(Components.Tag, {
-        key: ev.id,
-        text: ev.label,
-        style: {
-          backgroundColor: ev.colour,
-          borderRadius: 8,
-          marginRight: 10,
-          opacity: ev.label === type ? 1 : 0.5
-        },
-        onClick: () => this.onSelectType(ev.label)
-      });
-    })));
-  }
   renderSuccess() {
     if (!this.state.success) return null;
     const title = this.props.strings["".concat(values.featureKey, "_textTitleFeeds")] || values.textTitleFeeds;
@@ -2467,12 +2440,14 @@ class AddFeed extends Component {
     const {
       userId,
       userName,
+      type,
       title
     } = this.state;
-    // console.log('validateForm', { userId, userName, title });
+    // console.log('validateForm', { userId, userName, type, title });
 
     if (_.isEmpty(userId)) return false;
     if (_.isEmpty(userName)) return false;
+    if (_.isEmpty(type)) return false;
     if (_.isEmpty(title)) return false;
     return true;
   }
@@ -2539,6 +2514,45 @@ class AddFeed extends Component {
       text: "Select User"
     })));
   }
+  renderTypeOptions() {
+    const {
+      showWarnings,
+      types,
+      type
+    } = this.state;
+    const isValid = !!type;
+    const showError = showWarnings && !isValid;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "genericInputContainer ".concat(isValid ? 'genericInput-valid' : '', " ").concat(showError ? 'genericInput-error' : '').trim()
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        flexDirection: 'row',
+        alignItems: 'center',
+        marginBottom: 0,
+        justifyContent: 'space-between'
+      }
+    }, /*#__PURE__*/React.createElement(Components.Text, {
+      type: "formLabel"
+    }, "Select Type"), showError ? /*#__PURE__*/React.createElement("div", {
+      className: "fieldLabel fieldLabel-warning"
+    }, "Required") : null), /*#__PURE__*/React.createElement("div", {
+      className: "marginTop-4"
+    }, types.map(ev => {
+      if (ev === null) return null;
+      return /*#__PURE__*/React.createElement(Components.Tag, {
+        key: ev.id,
+        text: ev.label,
+        style: {
+          backgroundColor: ev.colour,
+          borderRadius: 8,
+          marginRight: 10,
+          opacity: ev.label === type ? 1 : 0.5
+        },
+        onClick: () => this.onSelectType(ev.label)
+      });
+    })));
+  }
   renderMain() {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -2549,7 +2563,7 @@ class AddFeed extends Component {
     }, /*#__PURE__*/React.createElement(Components.Text, {
       type: "formTitleLarge",
       className: "marginBottom-24"
-    }, this.state.feedId == null ? 'New' : 'Edit', " Feed"), this.renderSelectUser(), this.renderTypeOptions(), /*#__PURE__*/React.createElement(Components.GenericInput, {
+    }, this.state.feedId == null ? 'New' : 'Edit', " Post"), this.renderSelectUser(), this.renderTypeOptions(), /*#__PURE__*/React.createElement(Components.GenericInput, {
       id: "title",
       label: "Title",
       type: "textarea",

package/dist/index.umd.js

@@ -63,13 +63,13 @@
     textAreYouSureYouWantToDelete: 'Are you sure you want to delete the post?',
     textAreYouSureYouWantToApprove: 'Are you sure you want to approve the post?',
     textAreYouSureYouWantToReject: 'Are you sure you want to reject the post?',
-    textSingularName: 'Resident Feed',
-    textEmptyState: 'Your Resident Feeds will show here',
-    textTitleFeeds: 'Care Feeds',
-    textMenuTitle: 'Care Feeds',
-    textPermissionFeedManagement: 'Resident Feed Management',
-    textPermissionFeedPost: 'Post Resident Feed',
-    textPermissionFeedDraft: 'Draft Resident Feed'
+    textSingularName: 'Resident Activity',
+    textEmptyState: 'Your Resident Activity will show here',
+    textTitleFeeds: 'Resident Activity',
+    textMenuTitle: 'Resident Activity',
+    textPermissionFeedManagement: 'Resident Activity Feed Management',
+    textPermissionFeedPost: 'Post to Resident Activity Feed',
+    textPermissionFeedDraft: 'Resident Activity Feed Submission (Approval Required)'
   };
 
   // import * as PlussCore from '../../pluss-core/src';
@@ -83,8 +83,7 @@
     menu: {
       order: values.menuOrder,
       text: values.textMenuTitle,
-      icon: 'stethoscope',
-      isFontAwesome: true,
+      icon: 'list-burger',
       url: values.routeHub,
       countProps: null,
       visibleExps: {
@@ -819,13 +818,15 @@
       }, userContent);
     }
     renderTypePopup() {
+      const validTypes = ___default["default"].uniq(this.props.source.map(r => r.type)).filter(t => t);
+      const orderedTypes = ___default["default"].sortBy(validTypes, t => t.toLowerCase());
       return /*#__PURE__*/React__default["default"].createElement(Components$4.Popup, {
         title: "Select Type",
         maxWidth: 600,
         minWidth: 400,
         hasPadding: true,
         onClose: this.closeFilter
-      }, ___default["default"].sortBy(___default["default"].uniq(this.props.source.map(r => r.type)), t => t.toLowerCase()).map(type => {
+      }, orderedTypes.map(type => {
         return /*#__PURE__*/React__default["default"].createElement(Components$4.Tag, {
           key: type,
           onClick: () => this.selectTypeFilter(type),
@@ -855,7 +856,7 @@
           className: "table-TitleColumn"
         }, /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
           to: "".concat(values.routeFeedDetails, "/").concat(feed.id)
-        }, /*#__PURE__*/React__default["default"].createElement("span", null, feed.title))), /*#__PURE__*/React__default["default"].createElement("td", null, moment__default["default"].utc(feed.createdTime).local().format('ddd D MMM YYYY h:mma')), /*#__PURE__*/React__default["default"].createElement("td", null, feed.user && feed.user.displayName), /*#__PURE__*/React__default["default"].createElement("td", null, feed.author && feed.author.displayName), /*#__PURE__*/React__default["default"].createElement("td", {
+        }, /*#__PURE__*/React__default["default"].createElement("span", null, feed.title))), /*#__PURE__*/React__default["default"].createElement("td", null, moment__default["default"].utc(feed.created).local().format('ddd D MMM YYYY h:mma')), /*#__PURE__*/React__default["default"].createElement("td", null, feed.user && feed.user.displayName), /*#__PURE__*/React__default["default"].createElement("td", null, feed.author && feed.author.displayName), /*#__PURE__*/React__default["default"].createElement("td", {
           className: "table-options"
         }, canEdit ? /*#__PURE__*/React__default["default"].createElement("div", {
           style: {
@@ -1784,7 +1785,7 @@
       if (this.canAddNew()) {
         sectionItems.push({
           type: 'newButton',
-          text: 'New Feed',
+          text: 'New Post',
           onClick: this.onAddNew
         });
       }
@@ -1821,7 +1822,7 @@
       if (Session$2.validateAccess(this.props.auth.site, values.permissionFeedManagement, this.props.auth)) {
         sectionItems.push({
           type: 'navItem',
-          text: 'Feed Types',
+          text: 'Post Types',
           // icon: 'maintenance2',
           // isSVG: true,
           selected: this.state.selectedSection === 'feedTypes',
@@ -1836,11 +1837,11 @@
         sections: [{
           title: this.props.strings["".concat(values.featureKey, "_textTitleRequests")] || values.textTitleFeeds,
           items: sectionItems
-        }]
-        // helpGuide={{
-        //   text: `Help with Feeds`,
-        //   url: Urls.HelpGuide.Feeds,
-        // }}
+        }],
+        helpGuide: {
+          text: "Help with Resident Activity",
+          url: 'https://www.plusscommunities.com/resident-activity-feed-feature'
+        }
       });
     }
     renderRight() {
@@ -2444,34 +2445,6 @@
         }, 100);
       }
     }
-    renderTypeOptions() {
-      const {
-        types,
-        type
-      } = this.state;
-      return /*#__PURE__*/React__default["default"].createElement("div", {
-        style: {
-          marginBottom: 15
-        }
-      }, /*#__PURE__*/React__default["default"].createElement(Components.Text, {
-        type: "formLabel"
-      }, "Select Type"), /*#__PURE__*/React__default["default"].createElement("div", {
-        className: "marginTop-4"
-      }, types.map(ev => {
-        if (ev === null) return null;
-        return /*#__PURE__*/React__default["default"].createElement(Components.Tag, {
-          key: ev.id,
-          text: ev.label,
-          style: {
-            backgroundColor: ev.colour,
-            borderRadius: 8,
-            marginRight: 10,
-            opacity: ev.label === type ? 1 : 0.5
-          },
-          onClick: () => this.onSelectType(ev.label)
-        });
-      })));
-    }
     renderSuccess() {
       if (!this.state.success) return null;
       const title = this.props.strings["".concat(values.featureKey, "_textTitleFeeds")] || values.textTitleFeeds;
@@ -2488,12 +2461,14 @@
       const {
         userId,
         userName,
+        type,
         title
       } = this.state;
-      // console.log('validateForm', { userId, userName, title });
+      // console.log('validateForm', { userId, userName, type, title });
 
       if (___default["default"].isEmpty(userId)) return false;
       if (___default["default"].isEmpty(userName)) return false;
+      if (___default["default"].isEmpty(type)) return false;
       if (___default["default"].isEmpty(title)) return false;
       return true;
     }
@@ -2560,6 +2535,45 @@
         text: "Select User"
       })));
     }
+    renderTypeOptions() {
+      const {
+        showWarnings,
+        types,
+        type
+      } = this.state;
+      const isValid = !!type;
+      const showError = showWarnings && !isValid;
+      return /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "genericInputContainer ".concat(isValid ? 'genericInput-valid' : '', " ").concat(showError ? 'genericInput-error' : '').trim()
+      }, /*#__PURE__*/React__default["default"].createElement("div", {
+        style: {
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          marginBottom: 0,
+          justifyContent: 'space-between'
+        }
+      }, /*#__PURE__*/React__default["default"].createElement(Components.Text, {
+        type: "formLabel"
+      }, "Select Type"), showError ? /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "fieldLabel fieldLabel-warning"
+      }, "Required") : null), /*#__PURE__*/React__default["default"].createElement("div", {
+        className: "marginTop-4"
+      }, types.map(ev => {
+        if (ev === null) return null;
+        return /*#__PURE__*/React__default["default"].createElement(Components.Tag, {
+          key: ev.id,
+          text: ev.label,
+          style: {
+            backgroundColor: ev.colour,
+            borderRadius: 8,
+            marginRight: 10,
+            opacity: ev.label === type ? 1 : 0.5
+          },
+          onClick: () => this.onSelectType(ev.label)
+        });
+      })));
+    }
     renderMain() {
       return /*#__PURE__*/React__default["default"].createElement("div", {
         style: {
@@ -2570,7 +2584,7 @@
       }, /*#__PURE__*/React__default["default"].createElement(Components.Text, {
         type: "formTitleLarge",
         className: "marginBottom-24"
-      }, this.state.feedId == null ? 'New' : 'Edit', " Feed"), this.renderSelectUser(), this.renderTypeOptions(), /*#__PURE__*/React__default["default"].createElement(Components.GenericInput, {
+      }, this.state.feedId == null ? 'New' : 'Edit', " Post"), this.renderSelectUser(), this.renderTypeOptions(), /*#__PURE__*/React__default["default"].createElement(Components.GenericInput, {
         id: "title",
         label: "Title",
         type: "textarea",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-feeds-web",
-  "version": "1.0.2-beta.0",
+  "version": "1.0.3",
   "description": "Extension package to enable feeds on Pluss Communities Platform",
   "main": "dist/index.cjs.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@babel/runtime": "^7.14.0"
   },
   "peerDependencies": {
-    "@plusscommunities/pluss-core-web": "^1.6.2-beta.0",
+    "@plusscommunities/pluss-core-web": "^1.6.5",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.2.0",

package/src/components/FeedList.js

@@ -384,9 +384,12 @@ class FeedList extends Component {
   }
 
   renderTypePopup() {
+    const validTypes = _.uniq(this.props.source.map((r) => r.type)).filter((t) => t);
+    const orderedTypes = _.sortBy(validTypes, (t) => t.toLowerCase());
+
     return (
       <Components.Popup title="Select Type" maxWidth={600} minWidth={400} hasPadding onClose={this.closeFilter}>
-        {_.sortBy(_.uniq(this.props.source.map((r) => r.type)), (t) => t.toLowerCase()).map((type) => {
+        {orderedTypes.map((type) => {
           return (
             <Components.Tag key={type} onClick={() => this.selectTypeFilter(type)} text={type} className="marginRight-10 marginBottom-8" />
           );
@@ -421,7 +424,7 @@ class FeedList extends Component {
               <span>{feed.title}</span>
             </Link>
           </td>
-          <td>{moment.utc(feed.createdTime).local().format('ddd D MMM YYYY h:mma')}</td>
+          <td>{moment.utc(feed.created).local().format('ddd D MMM YYYY h:mma')}</td>
           <td>{feed.user && feed.user.displayName}</td>
           <td>{feed.author && feed.author.displayName}</td>
           <td className="table-options">

package/src/feature.config.js

@@ -14,8 +14,7 @@ const FeatureConfig = {
   menu: {
     order: values.menuOrder,
     text: values.textMenuTitle,
-    icon: 'stethoscope',
-    isFontAwesome: true,
+    icon: 'list-burger',
     url: values.routeHub,
     countProps: null,
     visibleExps: {

package/src/screens/AddFeed.js

@@ -122,28 +122,6 @@ class AddFeed extends Component {
     this.setState({ type: key });
   };
 
-  renderTypeOptions() {
-    const { types, type } = this.state;
-    return (
-      <div style={{ marginBottom: 15 }}>
-        <Components.Text type="formLabel">Select Type</Components.Text>
-        <div className="marginTop-4">
-          {types.map((ev) => {
-            if (ev === null) return null;
-            return (
-              <Components.Tag
-                key={ev.id}
-                text={ev.label}
-                style={{ backgroundColor: ev.colour, borderRadius: 8, marginRight: 10, opacity: ev.label === type ? 1 : 0.5 }}
-                onClick={() => this.onSelectType(ev.label)}
-              />
-            );
-          })}
-        </div>
-      </div>
-    );
-  }
-
   onHandleChange = (event) => {
     var stateChange = {};
     stateChange[event.target.getAttribute('id')] = event.target.value;
@@ -220,11 +198,12 @@ class AddFeed extends Component {
   }
 
   validateForm() {
-    const { userId, userName, title } = this.state;
-    // console.log('validateForm', { userId, userName, title });
+    const { userId, userName, type, title } = this.state;
+    // console.log('validateForm', { userId, userName, type, title });
 
     if (_.isEmpty(userId)) return false;
     if (_.isEmpty(userName)) return false;
+    if (_.isEmpty(type)) return false;
     if (_.isEmpty(title)) return false;
     return true;
   }
@@ -256,6 +235,7 @@ class AddFeed extends Component {
     const { showWarnings, selectedUser } = this.state;
     const isValid = !_.isNil(selectedUser);
     const showError = showWarnings && !isValid;
+
     return (
       <div className={`genericInputContainer ${isValid ? 'genericInput-valid' : ''} ${showError ? 'genericInput-error' : ''}`.trim()}>
         <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 0, justifyContent: 'space-between' }}>
@@ -276,12 +256,40 @@ class AddFeed extends Component {
     );
   }
 
+  renderTypeOptions() {
+    const { showWarnings, types, type } = this.state;
+    const isValid = !!type;
+    const showError = showWarnings && !isValid;
+
+    return (
+      <div className={`genericInputContainer ${isValid ? 'genericInput-valid' : ''} ${showError ? 'genericInput-error' : ''}`.trim()}>
+        <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 0, justifyContent: 'space-between' }}>
+          <Components.Text type="formLabel">Select Type</Components.Text>
+          {showError ? <div className="fieldLabel fieldLabel-warning">Required</div> : null}
+        </div>
+        <div className="marginTop-4">
+          {types.map((ev) => {
+            if (ev === null) return null;
+            return (
+              <Components.Tag
+                key={ev.id}
+                text={ev.label}
+                style={{ backgroundColor: ev.colour, borderRadius: 8, marginRight: 10, opacity: ev.label === type ? 1 : 0.5 }}
+                onClick={() => this.onSelectType(ev.label)}
+              />
+            );
+          })}
+        </div>
+      </div>
+    );
+  }
+
   renderMain() {
     return (
       <div style={{ marginBottom: 15 }}>
         <div className="padding-60 paddingVertical-40 bottomDivideBorder">
           <Components.Text type="formTitleLarge" className="marginBottom-24">
-            {this.state.feedId == null ? 'New' : 'Edit'} Feed
+            {this.state.feedId == null ? 'New' : 'Edit'} Post
           </Components.Text>
           {/* Resident Information */}
           {this.renderSelectUser()}

package/src/screens/FeedHub.js

@@ -121,7 +121,7 @@ class FeedHub extends Component {
     if (this.canAddNew()) {
       sectionItems.push({
         type: 'newButton',
-        text: 'New Feed',
+        text: 'New Post',
         onClick: this.onAddNew,
       });
     }
@@ -157,7 +157,7 @@ class FeedHub extends Component {
     if (Session.validateAccess(this.props.auth.site, values.permissionFeedManagement, this.props.auth)) {
       sectionItems.push({
         type: 'navItem',
-        text: 'Feed Types',
+        text: 'Post Types',
         // icon: 'maintenance2',
         // isSVG: true,
         selected: this.state.selectedSection === 'feedTypes',
@@ -175,10 +175,10 @@ class FeedHub extends Component {
             items: sectionItems,
           },
         ]}
-        // helpGuide={{
-        //   text: `Help with Feeds`,
-        //   url: Urls.HelpGuide.Feeds,
-        // }}
+        helpGuide={{
+          text: `Help with Resident Activity`,
+          url: 'https://www.plusscommunities.com/resident-activity-feed-feature',
+        }}
       />
     );
   }

package/src/values.config.default.js

@@ -30,13 +30,13 @@ const values = {
   textAreYouSureYouWantToDelete: 'Are you sure you want to delete the post?',
   textAreYouSureYouWantToApprove: 'Are you sure you want to approve the post?',
   textAreYouSureYouWantToReject: 'Are you sure you want to reject the post?',
-  textSingularName: 'Resident Feed',
-  textEmptyState: 'Your Resident Feeds will show here',
-  textTitleFeeds: 'Care Feeds',
-  textMenuTitle: 'Care Feeds',
-  textPermissionFeedManagement: 'Resident Feed Management',
-  textPermissionFeedPost: 'Post Resident Feed',
-  textPermissionFeedDraft: 'Draft Resident Feed',
+  textSingularName: 'Resident Activity',
+  textEmptyState: 'Your Resident Activity will show here',
+  textTitleFeeds: 'Resident Activity',
+  textMenuTitle: 'Resident Activity',
+  textPermissionFeedManagement: 'Resident Activity Feed Management',
+  textPermissionFeedPost: 'Post to Resident Activity Feed',
+  textPermissionFeedDraft: 'Resident Activity Feed Submission (Approval Required)',
 };
 
 export { values };

package/src/values.config.js

@@ -30,13 +30,13 @@ const values = {
   textAreYouSureYouWantToDelete: 'Are you sure you want to delete the post?',
   textAreYouSureYouWantToApprove: 'Are you sure you want to approve the post?',
   textAreYouSureYouWantToReject: 'Are you sure you want to reject the post?',
-  textSingularName: 'Resident Feed',
-  textEmptyState: 'Your Resident Feeds will show here',
-  textTitleFeeds: 'Care Feeds',
-  textMenuTitle: 'Care Feeds',
-  textPermissionFeedManagement: 'Resident Feed Management',
-  textPermissionFeedPost: 'Post Resident Feed',
-  textPermissionFeedDraft: 'Draft Resident Feed',
+  textSingularName: 'Resident Activity',
+  textEmptyState: 'Your Resident Activity will show here',
+  textTitleFeeds: 'Resident Activity',
+  textMenuTitle: 'Resident Activity',
+  textPermissionFeedManagement: 'Resident Activity Feed Management',
+  textPermissionFeedPost: 'Post to Resident Activity Feed',
+  textPermissionFeedDraft: 'Resident Activity Feed Submission (Approval Required)',
 };
 
 export { values };