@plusscommunities/pluss-newsletter-web-sharing 1.3.4 → 1.3.8-beta.0

package/dist/index.cjs.js

@@ -67,97 +67,97 @@ var NewsletterPreview__default = /*#__PURE__*/_interopDefaultLegacy(NewsletterPr
 
 // import * as PlussCore from '../../pluss-core/src';
 var values = {
-  featureKey: 'sharing',
-  serviceKey: 'newsletterSharing',
-  reducerKey: 'newsSharing',
-  analyticsKey: 'newsSharing',
-  actionNewsLoaded: 'NEWS_LOADEDSharing',
-  actionNewsUpdated: 'NEWS_UPDATEDSharing',
-  actionNewsRemoved: 'NEWS_REMOVEDSharing',
-  actionNewsSubmissionsLoaded: 'NEWS_SUBMISSIONS_LOADEDSharing',
-  actionNewsSubmissionRemoved: 'NEWS_SUBMISSION_REMOVEDSharing',
-  actionNewsPurge: 'NEWS_PURGESharing',
-  actionNewsDashboardLoading: 'NEWS_DASHBOARD_LOADINGSharing',
-  actionNewsSubmissionsDashboardLoading: 'NEWS_SUBMISSIONS_DASHBOARD_LOADINGSharing',
-  permissionNewsletter: 'newsletterSharing',
-  permissionNewsletterSubmit: 'newsletterSubmitSharing',
-  activityAddNewsSubmission: 'AddNewsSubmissionSharing',
-  activityApproveNewsSubmission: 'ApproveNewsSubmissionSharing',
-  activityRejectNewsSubmission: 'RejectNewsSubmissionSharing',
-  activityAddNews: 'AddNewsSharing',
-  activityEditNews: 'EditNewsSharing',
-  acitivtyDeleteNews: 'DeleteNewsSharing',
-  routeNewsHub: '/newsSharing',
-  routeAddNewsletterEntry: '/newsSharing/article',
-  routePublishAvailableNews: '/newsSharing/content/',
-  routeNewsletterSubmission: '/newsSharing/newslettersubmission/',
-  routeNewsletterAnalytics: '/newsSharing/analytics/',
-  routeGenerateNewsletter: '/newsletterSharing/generate',
-  routeNewsletterTemplate: '/embed/newsletterSharing',
-  screenNewsHub: 'NewsHubSharing',
-  screenAddNewsletterEntry: 'AddNewsletterEntrySharing',
-  screenPublishAvailableNews: 'PublishAvailableNewsSharing',
-  screenNewsletterSubmission: 'NewsletterSubmissionSharing',
-  screenNewsletterAnalytics: 'NewsletterAnalyticsSharing',
-  screenGenerateNewsletter: 'GenerateNewsletterSharing',
-  screenNewsletterTemplate: 'NewsletterTemplateSharing',
-  svgPathGridIcon: 'M6.9375 5.25C5.59802 5.25 4.5 6.34802 4.5 7.6875V13.6875V15.9507C4.5 16.6825 5.39622 17.1394 5.98828 16.7095C5.98853 16.7095 5.98877 16.7095 5.98901 16.7095L7.60913 15.531C7.91811 16.5231 8.84788 17.25 9.9375 17.25H14.6294L18.011 19.7095C18.0112 19.7095 18.0115 19.7095 18.0117 19.7095C18.6038 20.1394 19.5 19.6825 19.5 18.9507V16.6875V10.6875C19.5 9.34802 18.402 8.25 17.0625 8.25H16.5V7.6875C16.5 6.34802 15.402 5.25 14.0625 5.25H6.9375ZM6.9375 6.375H14.0625C14.7938 6.375 15.375 6.95623 15.375 7.6875V11.8125C15.375 12.5438 14.7938 13.125 14.0625 13.125H9.1875C9.06854 13.125 8.95264 13.1627 8.85645 13.2327L5.625 15.583V13.6875V7.6875C5.625 6.95623 6.20623 6.375 6.9375 6.375ZM16.5 9.375H17.0625C17.7938 9.375 18.375 9.95623 18.375 10.6875V16.6875V18.583L15.1436 16.2327C15.0474 16.1627 14.9315 16.125 14.8125 16.125H9.9375C9.20623 16.125 8.625 15.5438 8.625 14.8125V14.792L9.37061 14.25H14.0625C15.402 14.25 16.5 13.152 16.5 11.8125V9.375Z',
-  svgPathGridIconViewBox: '0 0 24 24',
-  optionForceNewsAuthorName: 'forceNewsAuthorNameSharing',
-  optionNewsComments: 'newsCommentsSharing',
-  optionNewsNotifications: 'newsNotificationsSharing',
-  optionUseLargeNews: 'useLargeNewsSharing',
-  localStorageNewsletterBrandData: "newsletterBrandDataSharing",
-  localStorageNewsletterMakerLastUpdate: "newsletterMakerLastUpdateSharing",
-  localStorageNewsletterMakerData: "newsletterMakerDataSharing",
-  stringPostfixSubmissionEmail: 'newssubmissionemailSharing',
-  menuOrder: 3.5,
-  textTipKeepYourTVNewsFeedActiveAndCurrent: 'Tip: Keep your TV Sharing feed active and current, but don’t flood\nit with so much content that important posts get lost.',
-  textFeaturedNews: 'Featured Sharing',
-  textIsThisAFeaturedNewsArticle: 'Is this a featured sharing?',
-  textFeaturedNewsArticlesWillBeHighlighted: 'Featured sharings will be highlighted on the Home page.',
-  textThisPostHasPreviouslyBeenPublished: "This sharing has previously been published. Are you sure you want to continue?",
-  textNewsletterTitlePostfix: 'Sharing',
-  textCreateNewsletter: 'Create Sharing',
-  textNoSelectedNews: 'No selected sharing yet',
-  textNewsletterTitle: 'Sharing Title',
-  textSelectNews: 'Select Sharing',
-  textSelectedNews: 'Selected Sharing',
-  textAddEditNewsPostfix: 'sharing',
+  featureKey: 'shifts',
+  serviceKey: 'newsletterShifts',
+  reducerKey: 'newsShifts',
+  analyticsKey: 'newsShifts',
+  actionNewsLoaded: 'NEWS_LOADEDShifts',
+  actionNewsUpdated: 'NEWS_UPDATEDShifts',
+  actionNewsRemoved: 'NEWS_REMOVEDShifts',
+  actionNewsSubmissionsLoaded: 'NEWS_SUBMISSIONS_LOADEDShifts',
+  actionNewsSubmissionRemoved: 'NEWS_SUBMISSION_REMOVEDShifts',
+  actionNewsPurge: 'NEWS_PURGEShifts',
+  actionNewsDashboardLoading: 'NEWS_DASHBOARD_LOADINGShifts',
+  actionNewsSubmissionsDashboardLoading: 'NEWS_SUBMISSIONS_DASHBOARD_LOADINGShifts',
+  permissionNewsletter: 'newsletterShifts',
+  permissionNewsletterSubmit: 'newsletterSubmitShifts',
+  activityAddNewsSubmission: 'AddNewsSubmissionShifts',
+  activityApproveNewsSubmission: 'ApproveNewsSubmissionShifts',
+  activityRejectNewsSubmission: 'RejectNewsSubmissionShifts',
+  activityAddNews: 'AddNewsShifts',
+  activityEditNews: 'EditNewsShifts',
+  acitivtyDeleteNews: 'DeleteNewsShifts',
+  routeNewsHub: '/newsShifts',
+  routeAddNewsletterEntry: '/newsShifts/article',
+  routePublishAvailableNews: '/newsShifts/content/',
+  routeNewsletterSubmission: '/newsShifts/newslettersubmission/',
+  routeNewsletterAnalytics: '/newsShifts/analytics/',
+  routeGenerateNewsletter: '/newsletterShifts/generate',
+  routeNewsletterTemplate: '/embed/newsletterShifts',
+  screenNewsHub: 'NewsHubShifts',
+  screenAddNewsletterEntry: 'AddNewsletterEntryShifts',
+  screenPublishAvailableNews: 'PublishAvailableNewsShifts',
+  screenNewsletterSubmission: 'NewsletterSubmissionShifts',
+  screenNewsletterAnalytics: 'NewsletterAnalyticsShifts',
+  screenGenerateNewsletter: 'GenerateNewsletterShifts',
+  screenNewsletterTemplate: 'NewsletterTemplateShifts',
+  svgPathGridIcon: 'M8.625 4.5C7.18359 4.5 6 5.68359 6 7.125C6 8.56641 7.18359 9.75 8.625 9.75C10.0664 9.75 11.25 8.56641 11.25 7.125C11.25 5.68359 10.0664 4.5 8.625 4.5ZM15.375 4.5C13.9336 4.5 12.75 5.68359 12.75 7.125C12.75 8.56641 13.9336 9.75 15.375 9.75C16.8164 9.75 18 8.56641 18 7.125C18 5.68359 16.8164 4.5 15.375 4.5ZM8.625 6C9.25488 6 9.75 6.49512 9.75 7.125C9.75 7.75488 9.25488 8.25 8.625 8.25C7.99512 8.25 7.5 7.75488 7.5 7.125C7.5 6.49512 7.99512 6 8.625 6ZM15.375 6C16.0049 6 16.5 6.49512 16.5 7.125C16.5 7.75488 16.0049 8.25 15.375 8.25C14.7451 8.25 14.25 7.75488 14.25 7.125C14.25 6.49512 14.7451 6 15.375 6ZM5.25 9C3.60059 9 2.25 10.3506 2.25 12C2.25 12.835 2.60742 13.5879 3.16406 14.1328C2.16504 14.8096 1.5 15.9609 1.5 17.25H3C3 15.999 3.99902 15 5.25 15C6.50098 15 7.5 15.999 7.5 17.25H9C9 15.9609 8.33496 14.8096 7.33594 14.1328C7.89258 13.5879 8.25 12.835 8.25 12C8.25 10.3506 6.89941 9 5.25 9ZM9 17.25C8.53125 17.877 8.25 18.665 8.25 19.5H9.75C9.75 18.249 10.749 17.25 12 17.25C13.251 17.25 14.25 18.249 14.25 19.5H15.75C15.75 18.665 15.4688 17.877 15 17.25C14.7451 16.9102 14.4375 16.6201 14.0859 16.3828C14.6426 15.8379 15 15.085 15 14.25C15 12.6006 13.6494 11.25 12 11.25C10.3506 11.25 9 12.6006 9 14.25C9 15.085 9.35742 15.8379 9.91406 16.3828C9.5625 16.6201 9.25488 16.9102 9 17.25ZM15 17.25H16.5C16.5 15.999 17.499 15 18.75 15C20.001 15 21 15.999 21 17.25H22.5C22.5 15.9609 21.835 14.8096 20.8359 14.1328C21.3926 13.5879 21.75 12.835 21.75 12C21.75 10.3506 20.3994 9 18.75 9C17.1006 9 15.75 10.3506 15.75 12C15.75 12.835 16.1074 13.5879 16.6641 14.1328C15.665 14.8096 15 15.9609 15 17.25ZM5.25 10.5C6.08789 10.5 6.75 11.1621 6.75 12C6.75 12.8379 6.08789 13.5 5.25 13.5C4.41211 13.5 3.75 12.8379 3.75 12C3.75 11.1621 4.41211 10.5 5.25 10.5ZM18.75 10.5C19.5879 10.5 20.25 11.1621 20.25 12C20.25 12.8379 19.5879 13.5 18.75 13.5C17.9121 13.5 17.25 12.8379 17.25 12C17.25 11.1621 17.9121 10.5 18.75 10.5ZM12 12.75C12.8379 12.75 13.5 13.4121 13.5 14.25C13.5 15.0879 12.8379 15.75 12 15.75C11.1621 15.75 10.5 15.0879 10.5 14.25C10.5 13.4121 11.1621 12.75 12 12.75Z',
+  svgPathGridIconViewBox: '0 0 30 30',
+  optionForceNewsAuthorName: 'forceNewsAuthorNameShifts',
+  optionNewsComments: 'newsCommentsShifts',
+  optionNewsNotifications: 'newsNotificationsShifts',
+  optionUseLargeNews: 'useLargeNewsShifts',
+  localStorageNewsletterBrandData: "newsletterBrandDataShifts",
+  localStorageNewsletterMakerLastUpdate: "newsletterMakerLastUpdateShifts",
+  localStorageNewsletterMakerData: "newsletterMakerDataShifts",
+  stringPostfixSubmissionEmail: 'newssubmissionemailShifts',
+  menuOrder: 3.4,
+  textTipKeepYourTVNewsFeedActiveAndCurrent: 'Tip: Keep your TV Shifts feed active and current, but don’t flood\nit with so much content that important posts get lost.',
+  textFeaturedNews: 'Featured Shifts',
+  textIsThisAFeaturedNewsArticle: 'Is this a featured shift?',
+  textFeaturedNewsArticlesWillBeHighlighted: 'Featured shifts will be highlighted on the Home page.',
+  textThisPostHasPreviouslyBeenPublished: "This shift has previously been published to this village. Are you sure you want to continue?",
+  textNewsletterTitlePostfix: 'Shift',
+  textCreateNewsletter: 'Create Shift',
+  textNoSelectedNews: 'No selected shift yet',
+  textNewsletterTitle: 'Shift Title',
+  textSelectNews: 'Select Shift',
+  textSelectedNews: 'Selected Shift',
+  textAddEditNewsPostfix: 'shifts',
   textNoteThisWillNotChangeInTheApp: function textNoteThisWillNotChangeInTheApp(changeText) {
-    return "Note: This will not ".concat(changeText, " the sharing in the app");
+    return "Note: This will not ".concat(changeText, " the shift in the app");
   },
-  textAreYouSureYouWantToDelete: "Are you sure you want to delete that sharing?",
-  textThereAreNoNews: 'There are no sharings',
-  textTitleNews: 'Sharing',
-  textSubmitYourNewNewsPostHere: 'Submit your new sharing here. You will be notified once your sharing has been approved.',
-  textPrintNewsletter: 'Print Sharing',
-  textBackToNews: 'Back to Sharing',
-  textNewsAnalytics: 'SHARING ANALYTICS',
-  textNewsSubmission: 'SHARING SUBMISSION',
-  textNewsPost: 'SHARING POST',
-  textNewsPostTitle: 'Sharing title',
-  textWhenANewsletterSubmissionIsAdded: 'When a sharing submission is added, the entered address will recieve an email notification.',
-  textIsThisAFeaturedNewsPost: 'Is this a featured sharing?',
-  textFeaturedNewsPostWillBeHighlighted: 'Featured sharing will be highlighted on the Home page.',
-  textSubmittedANewsletterPostForReview: 'submitted a sharing for review:',
-  textApprovedANewsSubmission: 'approved a sharing submission:',
-  textRejectedANewsSubmission: 'rejected a sharing submission:',
-  textAddedANewsletterPost: 'added a sharing:',
-  textEditedANewsletterPost: 'edited a sharing:',
-  textDeletedANewsletterPost: 'deleted a sharing:',
-  textSingularName: 'Sharing',
-  textThereIsNoNews: 'There is no Sharing',
-  textTheAuthorOfANewsPostWillAlwaysDisplay: 'The author of a sharing will always display.',
-  textAllowNewsComments: 'Allow Sharing Comments',
-  textUsersCanPostCommentsOnNews: 'Users can post comments on Sharing within the app.',
-  textAllowNewsNotification: 'Allow Sharing Notifications',
-  textWhenSettingUpANewsPost: 'When setting up a sharing, the creator may choose to send a push notification to users of the app.',
-  textCondensedNewsStyle: 'Condensed Sharing Style',
-  textTheNewsSectionUsesCondensedNewsItems: 'The Sharing section uses condensed Sharing items - smaller images, less information and less scrolling.',
-  textMenuTitle: 'Sharing',
-  textPermissionNewsletterManagement: 'Sharing Management',
-  textPermissionNewsletterSubmission: 'Sharing Submission (Approval Required)'
+  textAreYouSureYouWantToDelete: "Are you sure you want to delete that shift?",
+  textThereAreNoNews: 'There are no shifts',
+  textTitleNews: 'Shifts',
+  textSubmitYourNewNewsPostHere: 'Submit your new shift here. You will be notified once your post has been approved.',
+  textPrintNewsletter: 'Print Shifts',
+  textBackToNews: 'Back to Shifts',
+  textNewsAnalytics: 'SHIFTS ANALYTICS',
+  textNewsSubmission: 'SHIFTS SUBMISSION',
+  textNewsPost: 'SHIFT POST',
+  textNewsPostTitle: 'Shift title',
+  textWhenANewsletterSubmissionIsAdded: 'When a shift submission is added, the entered address will recieve an email notification.',
+  textIsThisAFeaturedNewsPost: 'Is this a featured shift?',
+  textFeaturedNewsPostWillBeHighlighted: 'Featured shifts will be highlighted on the Home page.',
+  textSubmittedANewsletterPostForReview: 'submitted a shift for review:',
+  textApprovedANewsSubmission: 'approved a shift submission:',
+  textRejectedANewsSubmission: 'rejected a shift submission:',
+  textAddedANewsletterPost: 'added a shift:',
+  textEditedANewsletterPost: 'edited a shift:',
+  textDeletedANewsletterPost: 'deleted a shift:',
+  textSingularName: 'Shift',
+  textThereIsNoNews: 'There is no Shift',
+  textTheAuthorOfANewsPostWillAlwaysDisplay: 'The author of a shift will always display.',
+  textAllowNewsComments: 'Allow Shift Comments',
+  textUsersCanPostCommentsOnNews: 'Users can post comments on Shifts within the app.',
+  textAllowNewsNotification: 'Allow Shifts Notifications',
+  textWhenSettingUpANewsPost: 'When setting up a shift, the creator may choose to send a push notification to users of the app.',
+  textCondensedNewsStyle: 'Condensed Shifts Style',
+  textTheNewsSectionUsesCondensedNewsItems: 'The Shifts section uses condensed Shifts items - smaller images, less information and less scrolling.',
+  textMenuTitle: 'Shifts',
+  textPermissionNewsletterManagement: 'Shifts Management',
+  textPermissionNewsletterSubmission: 'Shifts Submission (Approval Required)'
 };
 var FeatureConfig = {
   key: values.featureKey,
@@ -950,7 +950,9 @@ var ListNewsletter$1 = /*#__PURE__*/function (_Component) {
         style: {
           minWidth: '100%'
         }
-      }, this.renderContent());
+      }, this.renderContent(), /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "hub_tidioPadding"
+      }));
     }
   }]);
 
@@ -986,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); }; }
 
@@ -1322,7 +1325,9 @@ var NewsletterSubmissions = /*#__PURE__*/function (_Component) {
         onClick: function onClick() {
           _this7.sortByCol('SubmittedBy');
         }
-      }, "Submitted By", this.renderSort('SubmittedBy')))), /*#__PURE__*/React__default['default'].createElement("tbody", null, this.renderNewsletter())));
+      }, "Submitted By", this.renderSort('SubmittedBy')))), /*#__PURE__*/React__default['default'].createElement("tbody", null, this.renderNewsletter())), /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "hub_tidioPadding"
+      }));
     }
   }]);
 
@@ -2319,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'),
@@ -2327,9 +2333,11 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       links: [],
       authorDisplay: false,
       customAuthorInput: '',
-      isAudienceValid: true,
       textFormatOpen: false,
-      selectedOption: 'audience'
+      selectedOption: 'audience',
+      isAudienceValid: true,
+      audienceType: '',
+      audienceTypeSelection: []
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", _objectSpread$8({}, _this.initialState));
@@ -2453,9 +2461,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "handleSubmit", function () {
-      // console.log(this.audienceSelector);
-      _this.audienceSelector.getWrappedInstance().onSubmit();
-
       if (!_this.validateForm()) {
         _this.setState({
           showWarnings: true
@@ -2486,6 +2491,14 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
       });
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeAudience", function (audienceType, audienceTypeSelection, isAudienceValid) {
+      _this.setState({
+        audienceType: audienceType,
+        audienceTypeSelection: audienceTypeSelection,
+        isAudienceValid: isAudienceValid
+      });
+    });
+
     return _this;
   }
 
@@ -2530,13 +2543,6 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         textFormatOpen: isOpen
       });
     }
-  }, {
-    key: "updateAudienceValidation",
-    value: function updateAudienceValidation(valid) {
-      this.setState({
-        isAudienceValid: valid
-      });
-    }
   }, {
     key: "getData",
     value: function getData() {
@@ -2557,9 +2563,12 @@ 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
+        authorDisplay: update.AuthorDisplay,
+        audienceType: update.AudienceType || '',
+        audienceTypeSelection: update.AudienceTypeSelection || []
       };
 
       if (update.AuthorDisplay === 'custom') {
@@ -2884,8 +2893,8 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         Text: this.state.textInput,
         Thumbnail: '',
         Video: this.state.videoInput,
-        AudienceType: this.audienceSelector.getWrappedInstance().getAudienceType(),
-        AudienceTypeSelection: this.audienceSelector.getWrappedInstance().getAudienceTypeSelection(),
+        AudienceType: this.state.audienceType,
+        AudienceTypeSelection: this.state.audienceTypeSelection,
         Site: this.props.auth.site,
         Tagged: this.state.tagged,
         HasSponsor: this.state.HasSponsor,
@@ -2910,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)) {
@@ -3117,20 +3130,20 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAudience",
     value: function renderAudience() {
-      var _this9 = this;
-
+      var auth = this.props.auth;
+      var _this$state = this.state,
+          audienceType = _this$state.audienceType,
+          audienceTypeSelection = _this$state.audienceTypeSelection;
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
       }, /*#__PURE__*/React__default['default'].createElement(AudienceSelector, {
-        updateValidation: this.updateAudienceValidation.bind(this),
-        ref: function ref(a) {
-          _this9.audienceSelector = a;
-        },
-        auth: this.props.auth,
+        onChange: this.onChangeAudience,
+        auth: auth,
         custom: true,
+        audienceType: audienceType,
+        audienceTypeSelection: audienceTypeSelection,
         disallowSingleUsers: true,
-        disallowUserType: true,
-        customSite: this.props.auth.site === 'hq' ? 'All sites' : false
+        disallowUserType: true
       }));
     }
   }, {
@@ -3228,7 +3241,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderForm",
     value: function renderForm() {
-      var _this10 = this;
+      var _this9 = this;
 
       if (this.state.success) {
         return null;
@@ -3249,14 +3262,14 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         label: "Title",
         placeholder: "Insert title here",
         showError: function showError() {
-          return _this10.state.showWarnings && _this10.isEmpty(_this10.state.titleInput);
+          return _this9.state.showWarnings && _this9.isEmpty(_this9.state.titleInput);
         },
         isValid: function isValid() {
-          return !_this10.isEmpty(_this10.state.titleInput);
+          return !_this9.isEmpty(_this9.state.titleInput);
         },
         value: this.state.titleInput,
         onChange: function onChange(e) {
-          return _this10.handleChange(e);
+          return _this9.handleChange(e);
         },
         isRequired: true,
         alwaysShowLabel: true
@@ -3280,7 +3293,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "https://",
         value: this.state.loadFromWebsiteInput,
         onChange: function onChange(e) {
-          return _this10.handleChange(e);
+          return _this9.handleChange(e);
         },
         alwaysShowLabel: true
       })))), /*#__PURE__*/React__default['default'].createElement(GenericInput, {
@@ -3290,18 +3303,18 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Enter story here",
         value: this.state.textInput,
         onChange: function onChange(e) {
-          return _this10.handleChange(e);
+          return _this9.handleChange(e);
         },
         isRequired: true,
         showError: function showError() {
-          return _this10.state.showWarnings && _this10.isEmpty(_this10.state.textInput);
+          return _this9.state.showWarnings && _this9.isEmpty(_this9.state.textInput);
         },
         isValid: function isValid() {
-          return !_this10.isEmpty(_this10.state.textInput);
+          return !_this9.isEmpty(_this9.state.textInput);
         },
         help: /*#__PURE__*/React__default['default'].createElement("a", {
           onClick: function onClick() {
-            _this10.toggleTextFormat(true);
+            _this9.toggleTextFormat(true);
           },
           className: "pointer"
         }, "Text formatting"),
@@ -3324,7 +3337,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAddAttachment",
     value: function renderAddAttachment() {
-      var _this11 = this;
+      var _this10 = this;
 
       if (this.inputsDisabled()) {
         return null;
@@ -3332,7 +3345,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
 
       return /*#__PURE__*/React__default['default'].createElement(FileInput, {
         ref: function ref(_ref) {
-          _this11.pdFileInput = _ref;
+          _this10.pdFileInput = _ref;
         },
         style: {
           height: 120,
@@ -3346,7 +3359,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAttachments",
     value: function renderAttachments() {
-      var _this12 = this;
+      var _this11 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
@@ -3367,9 +3380,9 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           placeholder: "Enter Title",
           value: link.Text,
           onChange: function onChange(e) {
-            return _this12.handleLinkChange(index, 'Text', e.target.value);
+            return _this11.handleLinkChange(index, 'Text', e.target.value);
           },
-          disabled: _this12.inputsDisabled(),
+          disabled: _this11.inputsDisabled(),
           alwaysShowLabel: true,
           style: {
             margin: 0,
@@ -3383,9 +3396,9 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           placeholder: "https://",
           value: link.Url,
           onChange: function onChange(e) {
-            return _this12.handleLinkChange(index, 'Url', e.target.value);
+            return _this11.handleLinkChange(index, 'Url', e.target.value);
           },
-          disabled: _this12.inputsDisabled(),
+          disabled: _this11.inputsDisabled(),
           alwaysShowLabel: true,
           style: {
             margin: 0,
@@ -3395,7 +3408,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           className: "removeoption pdfAttachmentInput_remove",
           icon: "remove-circle",
           onClick: function onClick() {
-            _this12.removeLink(index);
+            _this11.removeLink(index);
           }
         }));
       }), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3433,9 +3446,9 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           placeholder: "Title",
           value: attachment.Title,
           onChange: function onChange(e) {
-            return _this12.handleAttachmentChange(index, 'Title', e);
+            return _this11.handleAttachmentChange(index, 'Title', e);
           },
-          disabled: _this12.inputsDisabled(),
+          disabled: _this11.inputsDisabled(),
           alwaysShowLabel: true,
           style: {
             margin: 0,
@@ -3445,7 +3458,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           className: "removeoption pdfAttachmentInput_remove",
           icon: "remove-circle",
           onClick: function onClick() {
-            _this12.removeAttachment(index);
+            _this11.removeAttachment(index);
           }
         }));
       }), this.renderAddAttachment()));
@@ -3453,7 +3466,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderFeatured",
     value: function renderFeatured() {
-      var _this13 = this;
+      var _this12 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
@@ -3464,7 +3477,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes',
           Value: true,
           onChange: function onChange() {
-            return _this13.setState({
+            return _this12.setState({
               isFeatured: true
             });
           }
@@ -3472,7 +3485,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: false,
           onChange: function onChange() {
-            return _this13.setState({
+            return _this12.setState({
               isFeatured: false
             });
           }
@@ -3490,11 +3503,11 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         alwaysShowLabel: true,
         value: this.state.featuredExpiryDateText,
         onChange: function onChange(e) {
-          return _this13.handleExpiryDateTextChange(e.target.value);
+          return _this12.handleExpiryDateTextChange(e.target.value);
         },
         onClick: function onClick(e) {
-          return _this13.setState({
-            showExpiryDate: !_this13.state.showExpiryDate
+          return _this12.setState({
+            showExpiryDate: !_this12.state.showExpiryDate
           });
         }
       }), this.state.showExpiryDate && /*#__PURE__*/React__default['default'].createElement(DatePicker, {
@@ -3505,24 +3518,33 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderComments",
     value: function renderComments() {
-      var _this14 = this;
+      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,
         onChange: function onChange() {
-          _this14.setState({
-            allowComments: !_this14.state.allowComments
+          _this13.setState({
+            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",
     value: function renderTags() {
-      var _this15 = this;
+      var _this14 = this;
 
       if (!newsHaveTags) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3535,7 +3557,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Humour, Social, etc.",
         value: this.state.tagsInput,
         onChange: function onChange(e) {
-          return _this15.handleChange(e);
+          return _this14.handleChange(e);
         },
         alwaysShowLabel: true
       }));
@@ -3543,7 +3565,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderNotify",
     value: function renderNotify() {
-      var _this16 = this;
+      var _this15 = this;
 
       if (this.state.eventId || ___default['default'].includes(this.props.auth.hidden, 'eventNotifications')) {
         return null;
@@ -3558,7 +3580,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes',
           Value: true,
           onChange: function onChange() {
-            return _this16.setState({
+            return _this15.setState({
               shouldNotify: true
             });
           }
@@ -3566,7 +3588,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: false,
           onChange: function onChange() {
-            return _this16.setState({
+            return _this15.setState({
               shouldNotify: false
             });
           }
@@ -3581,7 +3603,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderTvMode",
     value: function renderTvMode() {
-      var _this17 = this;
+      var _this16 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "marginTop-16"
@@ -3592,7 +3614,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes',
           Value: true,
           onChange: function onChange() {
-            return _this17.setState({
+            return _this16.setState({
               isTvMode: true
             });
           }
@@ -3600,7 +3622,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: false,
           onChange: function onChange() {
-            return _this17.setState({
+            return _this16.setState({
               isTvMode: false
             });
           }
@@ -3612,7 +3634,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAuthor",
     value: function renderAuthor() {
-      var _this18 = this;
+      var _this17 = this;
 
       if (this.props.forceNewsAuthorName) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -3624,7 +3646,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'No',
           Value: true,
           onChange: function onChange() {
-            return _this18.setState({
+            return _this17.setState({
               authorDisplay: false
             });
           }
@@ -3638,7 +3660,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes, use my name',
           Value: true,
           onChange: function onChange() {
-            return _this18.setState({
+            return _this17.setState({
               authorDisplay: 'name'
             });
           }
@@ -3652,7 +3674,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           Label: 'Yes, use the following:',
           Value: true,
           onChange: function onChange() {
-            return _this18.setState({
+            return _this17.setState({
               authorDisplay: 'custom'
             });
           }
@@ -3666,14 +3688,14 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Enter custom name",
         value: this.state.customAuthorInput,
         onChange: function onChange(e) {
-          return _this18.handleChange(e);
+          return _this17.handleChange(e);
         }
       }));
     }
   }, {
     key: "renderVideo",
     value: function renderVideo() {
-      var _this19 = this;
+      var _this18 = this;
 
       return /*#__PURE__*/React__default['default'].createElement("div", {
         className: "optionsContent_bottom"
@@ -3685,7 +3707,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "https://...",
         value: this.state.videoInput,
         onChange: function onChange(e) {
-          return _this19.handleChange(e);
+          return _this18.handleChange(e);
         },
         alwaysShowLabel: true
       }));
@@ -3754,23 +3776,23 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderResults",
     value: function renderResults() {
-      var _this20 = this;
+      var _this19 = this;
 
       if (this.state.userSearch == null) {
         return null;
       }
 
       var source = ___default['default'].sortBy(___default['default'].filter(this.state.contacts, function (ev) {
-        return ev.displayName.toLowerCase().indexOf(_this20.state.userSearch.toLowerCase()) > -1 && ev.category === 'resident';
+        return ev.displayName.toLowerCase().indexOf(_this19.state.userSearch.toLowerCase()) > -1 && ev.category === 'resident';
       }), 'displayName');
 
       return source.map(function (user, index) {
         return /*#__PURE__*/React__default['default'].createElement(UserListing, {
           user: user,
-          onClick: _this20.tagUser.bind(_this20, user),
+          onClick: _this19.tagUser.bind(_this19, user),
           key: user.id,
-          rightContent: _this20.renderTick(user),
-          subContent: _this20.renderSubText(user),
+          rightContent: _this19.renderTick(user),
+          subContent: _this19.renderSubText(user),
           size: 50
         });
       });
@@ -3778,7 +3800,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderTagged",
     value: function renderTagged() {
-      var _this21 = this;
+      var _this20 = this;
 
       if (!this.state.showTagged || this.state.success) {
         return null;
@@ -3800,7 +3822,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
           user: user,
           key: user.userId,
           whiteText: true,
-          rightContent: _this21.renderRemoveTag(user)
+          rightContent: _this20.renderRemoveTag(user)
         });
       })), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "marginTop-24"
@@ -3816,7 +3838,7 @@ var AddNewsletterEntry = /*#__PURE__*/function (_Component) {
         placeholder: "Search for user",
         value: this.state.userSearch,
         onChange: function onChange(e) {
-          return _this21.handleSearchChange(e);
+          return _this20.handleSearchChange(e);
         }
       }), this.renderResults()))));
     }
@@ -3844,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')
   };
 };
 
@@ -3890,11 +3913,21 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
       publishDate: moment__default['default']().format('YYYY-MM-DD'),
       publishDateText: moment__default['default']().format('DD/MM/YYYY'),
       publishTime: '12:00pm',
-      isAudienceValid: true
+      isAudienceValid: true,
+      audienceType: '',
+      audienceTypeSelection: []
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", _objectSpread$7({}, _this.initialState));
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeAudience", function (audienceType, audienceTypeSelection, isAudienceValid) {
+      _this.setState({
+        audienceType: audienceType,
+        audienceTypeSelection: audienceTypeSelection,
+        isAudienceValid: isAudienceValid
+      });
+    });
+
     return _this;
   }
 
@@ -3984,13 +4017,6 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
 
       return moment__default['default'].utc(this.state.update.Timestamp).local().format('D MMM');
     }
-  }, {
-    key: "updateAudienceValidation",
-    value: function updateAudienceValidation(valid) {
-      this.setState({
-        isAudienceValid: valid
-      });
-    }
   }, {
     key: "validatePublishTime",
     value: function validatePublishTime() {
@@ -4022,8 +4048,6 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
     value: function handleSubmit() {
       var _this3 = this;
 
-      this.audienceSelector.getWrappedInstance().onSubmit();
-
       if (!this.validateForm()) {
         return;
       }
@@ -4038,8 +4062,8 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
         Timestamp: timeToUse.toISOString(),
         UnixTimestamp: timeToUse.valueOf(),
         Site: this.props.auth.site,
-        AudienceType: this.audienceSelector.getWrappedInstance().getAudienceType(),
-        AudienceTypeSelection: this.audienceSelector.getWrappedInstance().getAudienceTypeSelection(),
+        AudienceType: this.state.audienceType,
+        AudienceTypeSelection: this.state.audienceTypeSelection,
         IsFeatured: this.state.isFeatured,
         FeaturedExpiry: this.state.isFeatured ? getUTCFromTimeDatePickers(this.state.featuredExpiryDate, '23:59').valueOf() : undefined,
         AllowComments: this.state.allowComments
@@ -4205,16 +4229,14 @@ var PublishAvailableNews = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "padding-60 paddingVertical-40 bottomDivideBorder"
       }, /*#__PURE__*/React__default['default'].createElement(AudienceSelector, {
-        updateValidation: this.updateAudienceValidation.bind(this),
-        ref: function ref(a) {
-          _this5.audienceSelector = a;
-        },
+        onChange: this.onChangeAudience,
         auth: this.props.auth,
         custom: true,
-        maxWidth: 300,
+        audienceType: this.state.audienceType,
+        audienceTypeSelection: this.state.audienceTypeSelection,
         disallowSingleUsers: true,
         disallowUserType: true,
-        customSite: this.props.auth.site === 'hq' ? 'All sites' : false
+        maxWidth: 300
       })), /*#__PURE__*/React__default['default'].createElement("div", {
         className: "padding-60 paddingVertical-40 bottomDivideBorder"
       }, /*#__PURE__*/React__default['default'].createElement("p", {