Added legal text to upgrade button, and showing again the Edition sec…

…tion in team edition (#6470) Automatic Merge
mattermost · Sep 30, 2020 · 4292e56 · 4292e56
1 parent 58b1887
commit 4292e56
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 6 deletions.
diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx
@@ -184,7 +184,10 @@ const AdminDefinition = {
  icon: 'fa-info-circle',
  sectionTitle: t('admin.sidebar.about'),
  sectionTitleDefault: 'About',
- isHidden: it.not(it.userHasReadPermissionOnResource('about')),
+ isHidden: it.any(
+ it.configIsTrue('ExperimentalSettings', 'RestrictSystemAdmin'),
+ it.not(it.userHasReadPermissionOnResource('about')),
+ ),
  license: {
  url: 'about/license',
  title: t('admin.sidebar.license'),
@@ -199,10 +202,6 @@ const AdminDefinition = {
  'Mattermost Enterprise Edition. Unlock enterprise features in this software through the purchase of a subscription from ',
  'This software is offered under a commercial license.\n\nSee ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system.',
  ],
- isHidden: it.any(
- it.not(it.enterpriseReady),
- it.configIsTrue('ExperimentalSettings', 'RestrictSystemAdmin'),
- ),
  isDisabled: it.not(it.userHasWritePermissionOnResource('about')),
  schema: {
  id: 'LicenseSettings',

diff --git a/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap b/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.jsx.snap
@@ -219,6 +219,33 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
  <ul
  className="nav nav-pills nav-stacked"
  >
+ <AdminSidebarCategory
+ definitionKey="about"
+ icon="fa-info-circle"
+ key="about"
+ parentLink="/admin_console"
+ sectionClass=""
+ title={
+ <FormattedMessage
+ defaultMessage="About"
+ id="admin.sidebar.about"
+ />
+ }
+ >
+ <AdminSidebarSection
+ definitionKey="about.license"
+ key="about.license"
+ name="about/license"
+ parentLink=""
+ subsection={false}
+ title={
+ <FormattedMessage
+ defaultMessage="Edition and License"
+ id="admin.sidebar.license"
+ />
+ }
+ />
+ </AdminSidebarCategory>
  <AdminSidebarCategory
  definitionKey="reporting"
  icon="fa-bar-chart"

diff --git a/components/admin_console/license_settings/__snapshots__/license_settings.test.jsx.snap b/components/admin_console/license_settings/__snapshots__/license_settings.test.jsx.snap
@@ -191,6 +191,14 @@ exports[`components/admin_console/license_settings/LicenseSettings load screen w
  </LoadingWrapper>
  </button>
  </p>
+ <p
+ className="upgrade-legal-terms"
+ >
+ <injectIntl(FormattedMarkdownMessage)
+ defaultMessage="By clicking **Upgrade to Enterprise Edition**, I agree to the terms of the Mattermost Enterprise Edition License."
+ id="admin.license.enterprise.upgrade.accept-terms"
+ />
+ </p>
  </div>
  </div>
  </div>
@@ -979,6 +987,14 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
  </LoadingWrapper>
  </button>
  </p>
+ <p
+ className="upgrade-legal-terms"
+ >
+ <injectIntl(FormattedMarkdownMessage)
+ defaultMessage="By clicking **Upgrade to Enterprise Edition**, I agree to the terms of the Mattermost Enterprise Edition License."
+ id="admin.license.enterprise.upgrade.accept-terms"
+ />
+ </p>
  </div>
  </div>
  </div>
@@ -1110,6 +1126,14 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
  </LoadingWrapper>
  </button>
  </p>
+ <p
+ className="upgrade-legal-terms"
+ >
+ <injectIntl(FormattedMarkdownMessage)
+ defaultMessage="By clicking **Upgrade to Enterprise Edition**, I agree to the terms of the Mattermost Enterprise Edition License."
+ id="admin.license.enterprise.upgrade.accept-terms"
+ />
+ </p>
  </div>
  </div>
  </div>

diff --git a/components/admin_console/license_settings/license_settings.jsx b/components/admin_console/license_settings/license_settings.jsx
@@ -240,6 +240,12 @@ export default class LicenseSettings extends React.PureComponent {
  </LoadingWrapper>
  </button>
  </p>
+ <p className='upgrade-legal-terms'>
+ <FormattedMarkdownMessage
+ id='admin.license.enterprise.upgrade.accept-terms'
+ defaultMessage='By clicking **Upgrade to Enterprise Edition**, I agree to the terms of the Mattermost Enterprise Edition License.'
+ />
+ </p>
  {this.state.upgradeError &&
  <div className='col-sm-12'>
  <div className='form-group has-error'>

diff --git a/i18n/en.json b/i18n/en.json
@@ -1005,6 +1005,7 @@
  "admin.license.enterprise.restart": "Restart Server",
  "admin.license.enterprise.restarting": "Restarting",
  "admin.license.enterprise.upgrade": "Upgrade to Enterprise Edition",
+ "admin.license.enterprise.upgrade.accept-terms": "By clicking **Upgrade to Enterprise Edition**, I agree to the terms of the Mattermost Enterprise Edition License.",
  "admin.license.enterprise.upgrading": "Upgrading {percentage}%",
  "admin.license.key": "License Key: ",
  "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server",

diff --git a/sass/routes/_admin-console.scss b/sass/routes/_admin-console.scss
@@ -510,7 +510,7 @@
  font-weight: 400;
  margin-top: 10px;
  }
- .trial-legal-terms {
+ .trial-legal-terms, .upgrade-legal-terms {
  margin-top: 10px;
  margin-bottom: 0;
  color: $dark-gray;