@plusscommunities/pluss-newsletter-web-sharing 1.3.7 → 1.3.8

package/dist/index.cjs.js

@@ -988,6 +988,7 @@ var getSiteNameFromRoles = Helper.getSiteNameFromRoles;
 var onlyAlphanumeric = Helper.onlyAlphanumeric;
 var setLocalStorage = Helper.setLocalStorage;
 var readJSONFromStorage = Helper.readJSONFromStorage;
+var getSiteSettingFromState = Helper.getSiteSettingFromState;
 
 function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
@@ -2323,6 +2324,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       differentPublish: false,
       isTvMode: false,
       allowComments: DEFAULT_ALLOW_COMMENTS,
+      commentVisibilityLimited: _this.props.commentVisibilityLimited,
       shouldNotify: false,
       publishDate: moment__default['default']().format('YYYY-MM-DD'),
       publishDateText: moment__default['default']().format('DD/MM/YYYY'),
@@ -2561,6 +2563,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         isTvMode: Boolean(update.TVMode),
         isFeatured: Boolean(update.IsFeatured),
         allowComments: Boolean(update.AllowComments),
+        commentVisibilityLimited: Boolean(update.CommentVisibilityLimited),
         featuredExpiryDate: moment__default['default'](update.FeaturedExpiry || undefined).format('YYYY-MM-DD'),
         featuredExpiryDateText: moment__default['default'](update.FeaturedExpiry || undefined).format('DD/MM/YYYY'),
         authorDisplay: update.AuthorDisplay,
@@ -2916,6 +2919,10 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       if (!___default['default'].isEmpty(result.Images)) {
         result.Thumbnail = getThumb300(result.Images[0]);
         result.Image = get1400(result.Images[0]);
+      }
+
+      if (result.AllowComments) {
+        result.CommentVisibilityLimited = this.state.commentVisibilityLimited;
       } // if (baseClient === 'pluss60') {
       //   const publisherImage = this.refs.publisherImage.getWrappedInstance().getValue();
       //   if (!_.isEmpty(publisherImage) || !_.isEmpty(this.state.publisherTitleInput)) {
@@ -3514,7 +3521,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       var _this13 = this;
 
       if (___default['default'].includes(this.props.auth.hidden, values.optionNewsComments)) return null;
-      return /*#__PURE__*/React__default['default'].createElement(CheckBox, {
+      return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(CheckBox, {
         className: "marginTop-16",
         label: "Allow comments",
         isActive: this.state.allowComments,
@@ -3523,7 +3530,16 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
             allowComments: !_this13.state.allowComments
           });
         }
-      });
+      }), this.state.allowComments && /*#__PURE__*/React__default['default'].createElement(CheckBox, {
+        className: "marginTop-16",
+        label: "Users can only see their own comments",
+        isActive: this.state.commentVisibilityLimited,
+        onChange: function onChange() {
+          _this13.setState({
+            commentVisibilityLimited: !_this13.state.commentVisibilityLimited
+          });
+        }
+      }));
     }
   }, {
     key: "renderTags",
@@ -3850,7 +3866,8 @@ var mapStateToProps$4 = function mapStateToProps(state) {
   return {
     auth: auth,
     users: allUsers,
-    forceNewsAuthorName: auth && auth.siteSettings && auth.siteSettings[values.optionForceNewsAuthorName]
+    forceNewsAuthorName: getSiteSettingFromState(state, values.optionForceNewsAuthorName),
+    commentVisibilityLimited: getSiteSettingFromState(state, 'CommentVisibilityLimited')
   };
 };
 

package/dist/index.esm.js

@@ -944,6 +944,7 @@ var getSiteNameFromRoles = Helper.getSiteNameFromRoles;
 var onlyAlphanumeric = Helper.onlyAlphanumeric;
 var setLocalStorage = Helper.setLocalStorage;
 var readJSONFromStorage = Helper.readJSONFromStorage;
+var getSiteSettingFromState = Helper.getSiteSettingFromState;
 
 function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -2279,6 +2280,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       differentPublish: false,
       isTvMode: false,
       allowComments: DEFAULT_ALLOW_COMMENTS,
+      commentVisibilityLimited: _this.props.commentVisibilityLimited,
       shouldNotify: false,
       publishDate: moment().format('YYYY-MM-DD'),
       publishDateText: moment().format('DD/MM/YYYY'),
@@ -2517,6 +2519,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         isTvMode: Boolean(update.TVMode),
         isFeatured: Boolean(update.IsFeatured),
         allowComments: Boolean(update.AllowComments),
+        commentVisibilityLimited: Boolean(update.CommentVisibilityLimited),
         featuredExpiryDate: moment(update.FeaturedExpiry || undefined).format('YYYY-MM-DD'),
         featuredExpiryDateText: moment(update.FeaturedExpiry || undefined).format('DD/MM/YYYY'),
         authorDisplay: update.AuthorDisplay,
@@ -2872,6 +2875,10 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       if (!_.isEmpty(result.Images)) {
         result.Thumbnail = getThumb300(result.Images[0]);
         result.Image = get1400(result.Images[0]);
+      }
+
+      if (result.AllowComments) {
+        result.CommentVisibilityLimited = this.state.commentVisibilityLimited;
       } // if (baseClient === 'pluss60') {
       //   const publisherImage = this.refs.publisherImage.getWrappedInstance().getValue();
       //   if (!_.isEmpty(publisherImage) || !_.isEmpty(this.state.publisherTitleInput)) {
@@ -3470,7 +3477,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       var _this13 = this;
 
       if (_.includes(this.props.auth.hidden, values.optionNewsComments)) return null;
-      return /*#__PURE__*/React.createElement(CheckBox, {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CheckBox, {
         className: "marginTop-16",
         label: "Allow comments",
         isActive: this.state.allowComments,
@@ -3479,7 +3486,16 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
             allowComments: !_this13.state.allowComments
           });
         }
-      });
+      }), this.state.allowComments && /*#__PURE__*/React.createElement(CheckBox, {
+        className: "marginTop-16",
+        label: "Users can only see their own comments",
+        isActive: this.state.commentVisibilityLimited,
+        onChange: function onChange() {
+          _this13.setState({
+            commentVisibilityLimited: !_this13.state.commentVisibilityLimited
+          });
+        }
+      }));
     }
   }, {
     key: "renderTags",
@@ -3806,7 +3822,8 @@ var mapStateToProps$4 = function mapStateToProps(state) {
   return {
     auth: auth,
     users: allUsers,
-    forceNewsAuthorName: auth && auth.siteSettings && auth.siteSettings[values.optionForceNewsAuthorName]
+    forceNewsAuthorName: getSiteSettingFromState(state, values.optionForceNewsAuthorName),
+    commentVisibilityLimited: getSiteSettingFromState(state, 'CommentVisibilityLimited')
   };
 };
 

package/dist/index.umd.js

@@ -967,6 +967,7 @@
   var onlyAlphanumeric = Helper.onlyAlphanumeric;
   var setLocalStorage = Helper.setLocalStorage;
   var readJSONFromStorage = Helper.readJSONFromStorage;
+  var getSiteSettingFromState = Helper.getSiteSettingFromState;
 
   function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
@@ -2302,6 +2303,7 @@
         differentPublish: false,
         isTvMode: false,
         allowComments: DEFAULT_ALLOW_COMMENTS,
+        commentVisibilityLimited: _this.props.commentVisibilityLimited,
         shouldNotify: false,
         publishDate: moment__default['default']().format('YYYY-MM-DD'),
         publishDateText: moment__default['default']().format('DD/MM/YYYY'),
@@ -2540,6 +2542,7 @@
           isTvMode: Boolean(update.TVMode),
           isFeatured: Boolean(update.IsFeatured),
           allowComments: Boolean(update.AllowComments),
+          commentVisibilityLimited: Boolean(update.CommentVisibilityLimited),
           featuredExpiryDate: moment__default['default'](update.FeaturedExpiry || undefined).format('YYYY-MM-DD'),
           featuredExpiryDateText: moment__default['default'](update.FeaturedExpiry || undefined).format('DD/MM/YYYY'),
           authorDisplay: update.AuthorDisplay,
@@ -2895,6 +2898,10 @@
         if (!___default['default'].isEmpty(result.Images)) {
           result.Thumbnail = getThumb300(result.Images[0]);
           result.Image = get1400(result.Images[0]);
+        }
+
+        if (result.AllowComments) {
+          result.CommentVisibilityLimited = this.state.commentVisibilityLimited;
         } // if (baseClient === 'pluss60') {
         //   const publisherImage = this.refs.publisherImage.getWrappedInstance().getValue();
         //   if (!_.isEmpty(publisherImage) || !_.isEmpty(this.state.publisherTitleInput)) {
@@ -3493,7 +3500,7 @@
         var _this13 = this;
 
         if (___default['default'].includes(this.props.auth.hidden, values.optionNewsComments)) return null;
-        return /*#__PURE__*/React__default['default'].createElement(CheckBox, {
+        return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(CheckBox, {
           className: "marginTop-16",
           label: "Allow comments",
           isActive: this.state.allowComments,
@@ -3502,7 +3509,16 @@
               allowComments: !_this13.state.allowComments
             });
           }
-        });
+        }), this.state.allowComments && /*#__PURE__*/React__default['default'].createElement(CheckBox, {
+          className: "marginTop-16",
+          label: "Users can only see their own comments",
+          isActive: this.state.commentVisibilityLimited,
+          onChange: function onChange() {
+            _this13.setState({
+              commentVisibilityLimited: !_this13.state.commentVisibilityLimited
+            });
+          }
+        }));
       }
     }, {
       key: "renderTags",
@@ -3829,7 +3845,8 @@
     return {
       auth: auth,
       users: allUsers,
-      forceNewsAuthorName: auth && auth.siteSettings && auth.siteSettings[values.optionForceNewsAuthorName]
+      forceNewsAuthorName: getSiteSettingFromState(state, values.optionForceNewsAuthorName),
+      commentVisibilityLimited: getSiteSettingFromState(state, 'CommentVisibilityLimited')
     };
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-web-sharing",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "main": "dist/index.cjs.js",
   "scripts": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.14.0",
-    "@plusscommunities/pluss-core-web": "^1.2.8",
+    "@plusscommunities/pluss-core-web": "^1.2.11",
     "lodash": "^4.17.4",
     "moment": "^2.18.1",
     "react": "^16.14.0",

package/src/helper/index.js

@@ -16,3 +16,4 @@ export const getSiteNameFromRoles = Helper.getSiteNameFromRoles;
 export const onlyAlphanumeric = Helper.onlyAlphanumeric;
 export const setLocalStorage = Helper.setLocalStorage;
 export const readJSONFromStorage = Helper.readJSONFromStorage;
+export const getSiteSettingFromState = Helper.getSiteSettingFromState;

package/src/screens/Newsletter/AddNewsletterEntry.js

@@ -36,6 +36,7 @@ import {
   isVideo,
   isUrl,
   getFileName,
+  getSiteSettingFromState,
 } from '../../helper';
 import { newsHaveTags, DEFAULT_ALLOW_COMMENTS } from '../../config';
 import { checkLoggedIn, validateAccess } from '../../session';
@@ -65,6 +66,7 @@ class AddNewsletterEntry extends Component {
     differentPublish: false,
     isTvMode: false,
     allowComments: DEFAULT_ALLOW_COMMENTS,
+    commentVisibilityLimited: this.props.commentVisibilityLimited,
     shouldNotify: false,
     publishDate: moment().format('YYYY-MM-DD'),
     publishDateText: moment().format('DD/MM/YYYY'),
@@ -134,6 +136,7 @@ class AddNewsletterEntry extends Component {
       isTvMode: Boolean(update.TVMode),
       isFeatured: Boolean(update.IsFeatured),
       allowComments: Boolean(update.AllowComments),
+      commentVisibilityLimited: Boolean(update.CommentVisibilityLimited),
       featuredExpiryDate: moment(update.FeaturedExpiry || undefined).format('YYYY-MM-DD'),
       featuredExpiryDateText: moment(update.FeaturedExpiry || undefined).format('DD/MM/YYYY'),
       authorDisplay: update.AuthorDisplay,
@@ -536,6 +539,10 @@ class AddNewsletterEntry extends Component {
       result.Image = get1400(result.Images[0]);
     }
 
+    if (result.AllowComments) {
+      result.CommentVisibilityLimited = this.state.commentVisibilityLimited;
+    }
+
     // if (baseClient === 'pluss60') {
     //   const publisherImage = this.refs.publisherImage.getWrappedInstance().getValue();
     //   if (!_.isEmpty(publisherImage) || !_.isEmpty(this.state.publisherTitleInput)) {
@@ -1089,14 +1096,26 @@ class AddNewsletterEntry extends Component {
     if (_.includes(this.props.auth.hidden, values.optionNewsComments)) return null;
 
     return (
-      <CheckBox
-        className="marginTop-16"
-        label="Allow comments"
-        isActive={this.state.allowComments}
-        onChange={() => {
-          this.setState({ allowComments: !this.state.allowComments });
-        }}
-      />
+      <div>
+        <CheckBox
+          className="marginTop-16"
+          label="Allow comments"
+          isActive={this.state.allowComments}
+          onChange={() => {
+            this.setState({ allowComments: !this.state.allowComments });
+          }}
+        />
+        {this.state.allowComments && (
+          <CheckBox
+            className="marginTop-16"
+            label="Users can only see their own comments"
+            isActive={this.state.commentVisibilityLimited}
+            onChange={() => {
+              this.setState({ commentVisibilityLimited: !this.state.commentVisibilityLimited });
+            }}
+          />
+        )}
+      </div>
     );
   }
 
@@ -1350,7 +1369,12 @@ class AddNewsletterEntry extends Component {
 const mapStateToProps = (state) => {
   const { auth } = state;
   const { allUsers } = state.users;
-  return { auth, users: allUsers, forceNewsAuthorName: auth && auth.siteSettings && auth.siteSettings[values.optionForceNewsAuthorName] };
+  return {
+    auth,
+    users: allUsers,
+    forceNewsAuthorName: getSiteSettingFromState(state, values.optionForceNewsAuthorName),
+    commentVisibilityLimited: getSiteSettingFromState(state, 'CommentVisibilityLimited'),
+  };
 };
 
 export default connect(mapStateToProps, { newsUpdate, usersLoaded, addRecentlyCreated })(AddNewsletterEntry);