MM-28733 : Admin Advisor v2 (#6461)

(cherry picked from commit 3b866f3)

actions/websocket_actions.jsx

@@ -72,7 +72,7 @@ import {loadProfilesForSidebar} from 'actions/user_actions.jsx';
 import store from 'stores/redux_store.jsx';
 import WebSocketClient from 'client/web_websocket_client.jsx';
 import {loadPlugin, loadPluginsIfNecessary, removePlugin} from 'plugins';
-import {ActionTypes, Constants, AnnouncementBarMessages, SocketEvents, UserStatuses, ModalIdentifiers} from 'utils/constants';
+import {ActionTypes, Constants, AnnouncementBarMessages, SocketEvents, UserStatuses, ModalIdentifiers, WarnMetricTypes} from 'utils/constants';
 import {getSiteURL} from 'utils/url';
 import {isGuest} from 'utils/utils';
 import RemovedFromChannelModal from 'components/removed_from_channel_modal';
@@ -1256,14 +1256,21 @@ function handleGroupNotAssociatedToChannelEvent(msg) {
 }
 
 function handleWarnMetricStatusReceivedEvent(msg) {
+ var receivedData = JSON.parse(msg.data.warnMetricStatus);
+ let bannerData;
+ if (receivedData.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500) {
+ bannerData = AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_USERS;
+ } else if (receivedData.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M) {
+ bannerData = AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_POSTS;
+ }
  store.dispatch(batchActions([
  {
  type: GeneralTypes.WARN_METRIC_STATUS_RECEIVED,
- data: JSON.parse(msg.data.warnMetricStatus),
+ data: receivedData,
  },
  {
  type: ActionTypes.SHOW_NOTICE,
- data: [AnnouncementBarMessages.NUMBER_OF_ACTIVE_USERS_WARN_METRIC_STATUS],
+ data: [bannerData],
  },
  ]));
 }

components/announcement_bar/configuration_bar/configuration_bar.jsx

@@ -33,6 +33,8 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  dismissedExpiringLicense: PropTypes.bool,
  dismissedNumberOfActiveUsersWarnMetricStatus: PropTypes.bool,
  dismissedNumberOfActiveUsersWarnMetricStatusAck: PropTypes.bool,
+ dismissedNumberOfPostsWarnMetricStatus: PropTypes.bool,
+ dismissedNumberOfPostsWarnMetricStatusAck: PropTypes.bool,
  siteURL: PropTypes.string.isRequired,
  warnMetricsStatus: PropTypes.object,
  actions: PropTypes.shape({
@@ -45,15 +47,25 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  }
 
  dismissNumberOfActiveUsersWarnMetric = () => {
- this.props.actions.dismissNotice(AnnouncementBarMessages.NUMBER_OF_ACTIVE_USERS_WARN_METRIC_STATUS);
+ this.props.actions.dismissNotice(AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_USERS);
+ }
+
+ dismissNumberOfPostsWarnMetric = () => {
+ this.props.actions.dismissNotice(AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_POSTS);
  }
 
  dismissNumberOfActiveUsersWarnMetricAck = () => {
- this.props.actions.dismissNotice(AnnouncementBarMessages.NUMBER_OF_ACTIVE_USERS_WARN_METRIC_STATUS_ACK);
+ this.props.actions.dismissNotice(AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_USERS_ACK);
+ }
+
+ dismissNumberOfPostsWarnMetricAck = () => {
+ this.props.actions.dismissNotice(AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_POSTS_ACK);
  }
 
  getNoticeForWarnMetric = (warnMetricStatus) => {
- if (!warnMetricStatus) {
+ if (!warnMetricStatus ||
+ (warnMetricStatus.id !== WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500 &&
+ warnMetricStatus.id !== WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M)) {
  return null;
  }
 
@@ -64,59 +76,81 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  var isDismissed = null;
  var canCloseBar = false;
 
- switch (warnMetricStatus.id) {
- case WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500:
- if (warnMetricStatus.acked) {
+ if (warnMetricStatus.acked) {
+ message = (
+ <React.Fragment>
+ <img
+ className='advisor-icon'
+ src={ackIcon}
+ />
+ <FormattedMessage
+ id='announcement_bar.warn_metric_status_ack.text'
+ defaultMessage='Thank you for contacting Mattermost. We will follow up with you soon.'
+ />
+ </React.Fragment>
+ );
+
+ if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500) {
+ dismissFunc = this.dismissNumberOfActiveUsersWarnMetricAck;
+ isDismissed = this.props.dismissedNumberOfActiveUsersWarnMetricStatusAck;
+ } else if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M) {
+ dismissFunc = this.dismissNumberOfPostsWarnMetricAck;
+ isDismissed = this.props.dismissedNumberOfPostsWarnMetricStatusAck;
+ }
+
+ type = AnnouncementBarTypes.ADVISOR_ACK;
+ showModal = false;
+ canCloseBar = true;
+ } else {
+ if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500) {
  message = (
  <React.Fragment>
  <img
  className='advisor-icon'
- src={ackIcon}
+ src={alertIcon}
  />
  <FormattedMarkdownMessage
- id={t('announcement_bar.error.number_active_users_warn_metric_status_ack.text')}
- defaultMessage={'Your trial has started! Go to the [System Console](/admin_console/environment/web_server) to check out the new features.'}
+ id='announcement_bar.number_active_users_warn_metric_status.text'
+ defaultMessage='You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.'
+ values={{
+ limit: warnMetricStatus.limit,
+ }}
  />
  </React.Fragment>
  );
- type = AnnouncementBarTypes.ADVISOR_ACK;
- showModal = false;
- dismissFunc = this.dismissNumberOfActiveUsersWarnMetricAck;
- isDismissed = this.props.dismissedNumberOfActiveUsersWarnMetricStatusAck;
- canCloseBar = true;
- } else {
+ dismissFunc = this.dismissNumberOfActiveUsersWarnMetric;
+ isDismissed = this.props.dismissedNumberOfActiveUsersWarnMetricStatus;
+ } else if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M) {
  message = (
  <React.Fragment>
  <img
  className='advisor-icon'
  src={alertIcon}
  />
  <FormattedMarkdownMessage
- id={t('announcement_bar.error.number_active_users_warn_metric_status.text')}
- defaultMessage={'You now have over {limit} users. We strongly recommend using advanced features for large-scale servers.'}
+ id='announcement_bar.number_of_posts_warn_metric_status.text'
+ defaultMessage='You now have over {limit} posts. We strongly recommend using advanced features for large-scale servers.'
  values={{
  limit: warnMetricStatus.limit,
  }}
  />
  </React.Fragment>
  );
- type = AnnouncementBarTypes.ADVISOR;
- showModal = true;
- dismissFunc = this.dismissNumberOfActiveUsersWarnMetric;
- isDismissed = this.props.dismissedNumberOfActiveUsersWarnMetricStatus;
- canCloseBar = false;
+ dismissFunc = this.dismissNumberOfPostsWarnMetric;
+ isDismissed = this.props.dismissedNumberOfPostsWarnMetricStatus;
  }
- return {
- Message: message,
- DismissFunc: dismissFunc,
- IsDismissed: isDismissed,
- Type: type,
- ShowModal: showModal,
- CanCloseBar: canCloseBar,
- };
- default:
- return null;
+ type = AnnouncementBarTypes.ADVISOR;
+ showModal = true;
+ canCloseBar = false;
  }
+ return {
+ Message: message,
+ DismissFunc: dismissFunc,
+ IsDismissed: isDismissed,
+ Type: type,
+ ShowModal: showModal,
+ CanCloseBar: canCloseBar,
+ };
  }
 
  render() {
@@ -176,7 +210,8 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  />
  );
  }
- if (this.props.license.IsLicensed === 'false' && this.props.warnMetricsStatus) {
+ if (this.props.license?.IsLicensed === 'false' &&
+ this.props.warnMetricsStatus) {
  for (const status of Object.values(this.props.warnMetricsStatus)) {
  var notice = this.getNoticeForWarnMetric(status);
  if (!notice || notice.IsDismissed) {
@@ -190,7 +225,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  type={notice.Type}
  showModal={notice.ShowModal}
  modalButtonText={t('announcement_bar.error.warn_metric_status.link')}
- modalButtonDefaultText={'Learn More'}
+ modalButtonDefaultText='Learn more'
  warnMetricStatus={status}
  message={notice.Message}
  />

components/announcement_bar/configuration_bar/index.js

@@ -14,8 +14,10 @@ function mapStateToProps(state) {
  return {
  siteURL: getSiteURL(state),
  dismissedExpiringLicense: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.LICENSE_EXPIRING]),
- dismissedNumberOfActiveUsersWarnMetricStatus: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.NUMBER_OF_ACTIVE_USERS_WARN_METRIC_STATUS]),
- dismissedNumberOfActiveUsersWarnMetricStatusAck: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.NUMBER_OF_ACTIVE_USERS_WARN_METRIC_STATUS_ACK]),
+ dismissedNumberOfActiveUsersWarnMetricStatus: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_USERS]),
+ dismissedNumberOfActiveUsersWarnMetricStatusAck: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_USERS_ACK]),
+ dismissedNumberOfPostsWarnMetricStatus: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_POSTS]),
+ dismissedNumberOfPostsWarnMetricStatusAck: Boolean(state.views.notice.hasBeenDismissed[AnnouncementBarMessages.WARN_METRIC_STATUS_NUMBER_OF_POSTS_ACK]),
  };
 }
 

components/warn_metric_ack_modal/__snapshots__/warn_metric_ack_modal.test.tsx.snap

@@ -39,27 +39,13 @@ exports[`components/WarnMetricAckModal error display 1`] = `
  bsClass="modal-title"
  componentClass="h1"
  id="warnMetricAckHeaderModalLabel"
- >
- <FormattedMessage
- defaultMessage="Scaling with Mattermost"
- id="warn_metric_ack_modal.header.title"
- />
- </ModalTitle>
+ />
  </ModalHeader>
  <ModalBody
  bsClass="modal-body"
  componentClass="div"
  >
  <div>
- <FormattedMessage
- defaultMessage="Mattermost strongly recommends that deployments of over {limit} users upgrade to Mattermost Enterprise Edition, which offers features such as user management, server clustering, and performance monitoring"
- id="warn_metric_ack_modal.number_of_active_users.description"
- values={
- Object {
- "limit": 500,
- }
- }
- />
  <br />
  <div
  className="form-group has-error"
@@ -78,7 +64,7 @@ exports[`components/WarnMetricAckModal error display 1`] = `
  forceAck={true}
  messageId="warn_metric_ack_modal.mailto.link"
  onClickHandler={[Function]}
- url="mailto:[email protected][email protected]&subject=Mattermost%20Contact%20Us%20request&body=Mattermost%20Contact%20Us%20request.%20My%20team%20now%20has%20500%20users%20and%20I%20am%20considering%20Mattermost%20Enterprise%20Edition.%0D%0AContact%20Fake%20Person%0D%0AEmail%20a%40test.com%0D%0ASite%20URL%20http%3A%2F%2Flocalhost%3A8065%0D%0ADiagnostic%20Id%20diag_0%0D%0AIf%20you%20have%20any%20additional%20inquiries%2C%20please%20contact%20support%40mattermost.com"
+ url="mailto:[email protected][email protected]&subject=Mattermost%20Contact%20Us%20request&body=Mattermost%20Contact%20Us%20request.%0D%0AContact%20Fake%20Person%0D%0AEmail%20a%40test.com%0D%0ASite%20URL%20http%3A%2F%2Flocalhost%3A8065%0D%0ADiagnostic%20Id%20diag_0%0D%0AIf%20you%20have%20any%20additional%20inquiries%2C%20please%20contact%20support%40mattermost.com"
  />,
  }
  }
@@ -97,12 +83,12 @@ exports[`components/WarnMetricAckModal error display 1`] = `
  }
  >
  <FormattedMessage
- defaultMessage="By clicking Acknowledge, you will be sharing your information with Mattermost Inc., to learn more about upgrading. {link}"
- id="warn_metric_ack_modal.number_of_active_users.subtext"
+ defaultMessage="By clicking Acknowledge, you will be sharing your information with Mattermost Inc. {link}"
+ id="warn_metric_ack_modal.subtext"
  values={
  Object {
  "link": <ErrorLink
- defaultMessage="Learn More"
+ defaultMessage="Learn more"
  messageId="warn_metric_ack_modal.learn_more.link"
  url="https://mattermost.com/pl/default-admin-advisory"
  />,
@@ -176,27 +162,13 @@ exports[`components/WarnMetricAckModal should match snapshot, init 1`] = `
  bsClass="modal-title"
  componentClass="h1"
  id="warnMetricAckHeaderModalLabel"
- >
- <FormattedMessage
- defaultMessage="Scaling with Mattermost"
- id="warn_metric_ack_modal.header.title"
- />
- </ModalTitle>
+ />
  </ModalHeader>
  <ModalBody
  bsClass="modal-body"
  componentClass="div"
  >
  <div>
- <FormattedMessage
- defaultMessage="Mattermost strongly recommends that deployments of over {limit} users upgrade to Mattermost Enterprise Edition, which offers features such as user management, server clustering, and performance monitoring"
- id="warn_metric_ack_modal.number_of_active_users.description"
- values={
- Object {
- "limit": 500,
- }
- }
- />
  <br />
  <br />
  <div
@@ -210,12 +182,12 @@ exports[`components/WarnMetricAckModal should match snapshot, init 1`] = `
  }
  >
  <FormattedMessage
- defaultMessage="By clicking Acknowledge, you will be sharing your information with Mattermost Inc., to learn more about upgrading. {link}"
- id="warn_metric_ack_modal.number_of_active_users.subtext"
+ defaultMessage="By clicking Acknowledge, you will be sharing your information with Mattermost Inc. {link}"
+ id="warn_metric_ack_modal.subtext"
  values={
  Object {
  "link": <ErrorLink
- defaultMessage="Learn More"
+ defaultMessage="Learn more"
  messageId="warn_metric_ack_modal.learn_more.link"
  url="https://mattermost.com/pl/default-admin-advisory"
  />,

components/warn_metric_ack_modal/index.ts

@@ -9,7 +9,7 @@ import {ActionFunc} from 'mattermost-redux/types/actions';
 import {getStandardAnalytics, sendWarnMetricAck} from 'mattermost-redux/actions/admin';
 
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/common';
-import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
+import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
 import {closeModal} from 'actions/views/modals';
 
@@ -28,7 +28,6 @@ function mapStateToProps(state: GlobalState, ownProps: Props) {
  return {
  stats: state.entities.admin.analytics,
  user: getCurrentUser(state),
- license: getLicense(state),
  diagnosticId: config.DiagnosticId,
  show: isModalOpen(state, ModalIdentifiers.WARN_METRIC_ACK),
  closeParentComponent: ownProps.closeParentComponent,

components/warn_metric_ack_modal/warn_metric_ack_modal.test.tsx

@@ -82,13 +82,15 @@ describe('components/WarnMetricAckModal', () => {
  });
 
  test('send ack on acknowledge button click', () => {
+ const props = {...baseProps};
+
  const wrapper = shallow<WarnMetricAckModal>(
- <WarnMetricAckModal {...baseProps}/>,
+ <WarnMetricAckModal {...props}/>,
  );
 
  wrapper.setState({saving: false});
  wrapper.find('.save-button').simulate('click');
- expect(baseProps.actions.sendWarnMetricAck).toHaveBeenCalledTimes(1);
+ expect(props.actions.sendWarnMetricAck).toHaveBeenCalledTimes(1);
  });
 
  test('should have called props.onHide when Modal.onExited is called', () => {