temp work

components/announcement_bar/configuration_bar/configuration_bar.jsx

@@ -52,7 +52,7 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  this.props.actions.dismissNotice(AnnouncementBarMessages.NUMBER_OF_ACTIVE_USERS_WARN_METRIC_STATUS_ACK);
  }
 
- getNoticeForWarnMetric = (warnMetricStatus) => {
+ getNoticeForWarnMetric = (warnMetricStatus, isE0Edition) => {
  if (!warnMetricStatus) {
  return null;
  }
@@ -65,41 +65,76 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  var canCloseBar = false;
 
  switch (warnMetricStatus.id) {
+ case WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_500K:
  case WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500:
  if (warnMetricStatus.acked) {
- message = (
- <React.Fragment>
- <img
- className='advisor-icon'
- src={ackIcon}
- />
- <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.'}
- />
- </React.Fragment>
- );
+ if (isE0Edition) {
+ message = (
+ <React.Fragment>
+ <img
+ className='advisor-icon'
+ src={ackIcon}
+ />
+ <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.'}
+ />
+ </React.Fragment>
+ );
+ } else {
+ message = (
+ <React.Fragment>
+ <img
+ className='advisor-icon'
+ src={ackIcon}
+ />
+ <FormattedMarkdownMessage
+ id={t('announcement_bar.warn_metric_status_ack.text')}
+ defaultMessage={'Thank you for contacting Mattermost. We will follow up with you soon.'}
+ />
+ </React.Fragment>
+ );
+ }
+
  type = AnnouncementBarTypes.ADVISOR_ACK;
  showModal = false;
  dismissFunc = this.dismissNumberOfActiveUsersWarnMetricAck;
  isDismissed = this.props.dismissedNumberOfActiveUsersWarnMetricStatusAck;
  canCloseBar = true;
  } else {
- 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.'}
- values={{
- limit: warnMetricStatus.limit,
- }}
- />
- </React.Fragment>
- );
+ if (warnMetricStatus.id === WarnMetricTypes.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500) {
+ 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.'}
+ values={{
+ limit: warnMetricStatus.limit,
+ }}
+ />
+ </React.Fragment>
+ );
+ } else {
+ message = (
+ <React.Fragment>
+ <img
+ className='advisor-icon'
+ src={alertIcon}
+ />
+ <FormattedMarkdownMessage
+ id={t('announcement_bar.number_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;
@@ -176,9 +211,14 @@ class ConfigurationAnnouncementBar extends React.PureComponent {
  />
  );
  }
- if (this.props.license.IsLicensed === 'false' && this.props.warnMetricsStatus) {
+ if (this.props.license &&
+ this.props.license.IsLicensed === 'false' &&
+ this.props.warnMetricsStatus) {
+ const enterpriseReady = (this.props.config.BuildEnterpriseReady === 'true');
+ console.log('CITOMAI enterpriseReady' + enterpriseReady);
+
  for (const status of Object.values(this.props.warnMetricsStatus)) {
- var notice = this.getNoticeForWarnMetric(status);
+ var notice = this.getNoticeForWarnMetric(status, enterpriseReady);
  if (!notice || notice.IsDismissed) {
  continue;
  }

components/warn_metric_ack_modal/index.ts

@@ -6,7 +6,8 @@ import {connect} from 'react-redux';
 
 import {GlobalState} from 'mattermost-redux/types/store';
 import {ActionFunc} from 'mattermost-redux/types/actions';
-import {getStandardAnalytics, sendWarnMetricAck} from 'mattermost-redux/actions/admin';
+import {getStandardAnalytics, sendWarnMetricAck, requestTrialLicenseAndAckWarnMetric} from 'mattermost-redux/actions/admin';
+import {getLicenseConfig} from 'mattermost-redux/actions/general';
 
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/common';
 import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
@@ -32,13 +33,16 @@ function mapStateToProps(state: GlobalState, ownProps: Props) {
  diagnosticId: config.DiagnosticId,
  show: isModalOpen(state, ModalIdentifiers.WARN_METRIC_ACK),
  closeParentComponent: ownProps.closeParentComponent,
+ enterpriseReady: config.BuildEnterpriseReady === 'true',
  };
 }
 
 type Actions = {
  closeModal: (arg: string) => void;
  getStandardAnalytics: () => any;
  sendWarnMetricAck: (arg0: string, arg1: boolean) => ActionFunc & Partial<{error?: string}>;
+ requestTrialLicenseAndAckWarnMetric: (arg0: string) => ActionFunc & Partial<{error?: string}>;
+ getLicenseConfig: () => void;
 };
 
 function mapDispatchToProps(dispatch: Dispatch) {
@@ -48,6 +52,8 @@ function mapDispatchToProps(dispatch: Dispatch) {
  closeModal,
  getStandardAnalytics,
  sendWarnMetricAck,
+ requestTrialLicenseAndAckWarnMetric,
+ getLicenseConfig,
  },
  dispatch,
  ),

components/warn_metric_ack_modal/warn_metric_ack_modal.test.tsx

@@ -17,6 +17,7 @@ jest.mock('react-dom', () => ({
 
 describe('components/WarnMetricAckModal', () => {
  const serverError = 'some error';
+ const gettingTrialError = 'some error';
 
  const baseProps = {
  stats: {
@@ -36,10 +37,16 @@ describe('components/WarnMetricAckModal', () => {
  limit: 500,
  acked: false,
  },
+ license: {
+ IsLicensed: 'false',
+ },
+ enterpriseReady: false,
  actions: {
  closeModal: jest.fn(),
  getStandardAnalytics: jest.fn(),
  sendWarnMetricAck: jest.fn(),
+ requestTrialLicenseAndAckWarnMetric: jest.fn(),
+ getLicenseConfig: jest.fn(),
  },
  };
 
@@ -81,14 +88,30 @@ describe('components/WarnMetricAckModal', () => {
  expect(wrapper.state('saving')).toEqual(false);
  });
 
+ test('send ack on start trial button click', () => {
+ const props = {...baseProps};
+ props.enterpriseReady = true;
+
+ const wrapper = shallow<WarnMetricAckModal>(
+ <WarnMetricAckModal {...props}/>,
+ );
+
+ wrapper.setState({gettingTrial: false});
+ wrapper.find('.save-button').simulate('click');
+ expect(props.actions.requestTrialLicenseAndAckWarnMetric).toHaveBeenCalledTimes(1);
+ });
+
  test('send ack on acknowledge button click', () => {
+ const props = {...baseProps};
+ props.enterpriseReady = false;
+
  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', () => {