PLT-7783 Update PAT help text (#168)

* Update PAT help text

* Separate help text from checkbox

* Updating UI for access tokens

* Removing div, and adding span for help text

components/admin_console/manage_roles_modal/manage_roles_modal.jsx

@@ -238,8 +238,14 @@ export default class ManageRolesModal extends React.PureComponent {
  />
  <FormattedHTMLMessage
  id='admin.manage_roles.allowUserAccessTokens'
- defaultMessage='Allow this account to generate <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">user access tokens</a>.'
+ defaultMessage='Allow this account to generate <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">personal access tokens</a>.'
  />
+ <span className='d-block padding-top padding-bottom light'>
+ <FormattedHTMLMessage
+ id='admin.manage_roles.allowUserAccessTokensDesc'
+ defaultMessage="Removing this permission doesn't delete existing tokens. To delete them, go to the user's Manage Tokens menu."
+ />
+ </span>
  </label>
  </div>
  <div className='member-row--padded'>

components/admin_console/manage_tokens_modal/manage_tokens_modal.jsx

@@ -146,7 +146,7 @@ export default class ManageTokensModal extends React.PureComponent {
  <div className='padding-top x2'>
  <FormattedHTMLMessage
  id='admin.manage_tokens.userAccessTokensDescription'
- defaultMessage='Personal access tokens function similar to session tokens and can be used by integrations to <a href="https://about.mattermost.com/default-api-authentication" target="_blank">interact with this Mattermost server</a>. Learn more about <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">personal access tokens</a>.'
+ defaultMessage='Personal access tokens function similar to session tokens and can be used by integrations to <a href="https://about.mattermost.com/default-api-authentication" target="_blank">interact with this Mattermost server</a>. Tokens are disabled if the user is deactivated. Learn more about <a href="https://about.mattermost.com/default-user-access-tokens" target="_blank">personal access tokens</a>.'
  />
  </div>
  <div className='manage-teams__teams'>

i18n/en.json

@@ -640,6 +640,7 @@
  "admin.logs.title": "Server Logs",
  "admin.manage_roles.additionalRoles": "Select additional permissions for the account. <a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">Read more about roles and permissions</a>.",
  "admin.manage_roles.allowUserAccessTokens": "Allow this account to generate <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+ "admin.manage_roles.allowUserAccessTokensDesc": "Removing this permission doesn't delete existing tokens. To delete them, go to the user's Manage Tokens menu.",
  "admin.manage_roles.cancel": "Cancel",
  "admin.manage_roles.manageRolesTitle": "Manage Roles",
  "admin.manage_roles.postAllPublicRole": "Access to post to all Mattermost public channels.",
@@ -651,7 +652,7 @@
  "admin.manage_roles.systemAdmin": "System Admin",
  "admin.manage_roles.systemMember": "Member",
  "admin.manage_tokens.manageTokensTitle": "Manage Personal Access Tokens",
- "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
+ "admin.manage_tokens.userAccessTokensDescription": "Personal access tokens function similar to session tokens and can be used by integrations to <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">interact with this Mattermost server</a>. Tokens are disabled if the user is deactivated. Learn more about <a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">personal access tokens</a>.",
  "admin.manage_tokens.userAccessTokensNone": "No personal access tokens.",
  "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see <a href=\"http:https://docs.mattermost.com/deployment/metrics.html\" target='_blank'>documentation</a> to learn more about configuring performance monitoring for Mattermost.",
  "admin.metrics.enableTitle": "Enable Performance Monitoring:",

sass/utils/_modifiers.scss

@@ -107,3 +107,8 @@
  margin-bottom: 21px;
  }
 }
+
+.d-block {
+ display: block;
+}
+