Rename System Roles to Delegated Granular Administration (#27761)

Automatic Merge

e2e-tests/cypress/tests/integration/channels/enterprise/system_console/helpers.js

@@ -40,7 +40,7 @@ export function makeUserASystemRole(testUsers, role) {
     cy.visit('/admin_console/user_management/system_roles');
 
     cy.get('.admin-console__header').within(() => {
-        cy.findByText('System Roles', {timeout: TIMEOUTS.ONE_MIN}).should('exist').and('be.visible');
+        cy.findByText('Delegated Granular Administration', {timeout: TIMEOUTS.ONE_MIN}).should('exist').and('be.visible');
     });
 
     // # Click on edit for the role

e2e-tests/cypress/tests/integration/channels/enterprise/system_console/user_management/user_management_admin_control_spec.js

@@ -122,7 +122,7 @@ describe('User Management', () => {
         cy.visit('/admin_console/user_management/system_roles');
 
         cy.get('.admin-console__header').within(() => {
-            cy.findByText('System Roles', {timeout: TIMEOUTS.ONE_MIN}).should('exist').and('be.visible');
+            cy.findByText('Delegated Granular Administration', {timeout: TIMEOUTS.ONE_MIN}).should('exist').and('be.visible');
         });
 
         // # Click on edit for the role

e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_cloud_spec.js

@@ -19,7 +19,7 @@ const professionalPaidFeatures = [
 
 const enterprisePaidFeatures = [
     {sidebarName: 'Groups', featureDiscoveryTitle: 'Active Directory/LDAP groups'},
-    {sidebarName: 'System Roles', featureDiscoveryTitle: 'controlled access to the System Console'},
+    {sidebarName: 'Delegated Granular Administration', featureDiscoveryTitle: 'controlled access to the System Console'},
     {sidebarName: 'Data Retention Policy', featureDiscoveryTitle: 'Create data retention schedules with Mattermost Enterprise'},
     {sidebarName: 'Compliance Export', featureDiscoveryTitle: 'Run compliance exports with Mattermost Enterprise'},
     {sidebarName: 'Custom Terms of Service', featureDiscoveryTitle: 'Create custom terms of service with Mattermost Enterprise'},

e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_not_cloud_spec.js

@@ -19,7 +19,7 @@ const professionalPaidFeatures = [
 
 const enterprisePaidFeatures = [
     {sidebarName: 'Groups', featureDiscoveryTitle: 'Active Directory/LDAP groups'},
-    {sidebarName: 'System Roles', featureDiscoveryTitle: 'controlled access to the System Console'},
+    {sidebarName: 'Delegated Granular Administration', featureDiscoveryTitle: 'controlled access to the System Console'},
     {sidebarName: 'Data Retention Policy', featureDiscoveryTitle: 'Create data retention schedules with Mattermost Enterprise'},
     {sidebarName: 'Compliance Export', featureDiscoveryTitle: 'Run compliance exports with Mattermost Enterprise'},
     {sidebarName: 'Custom Terms of Service', featureDiscoveryTitle: 'Create custom terms of service with Mattermost Enterprise'},

e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_spec.js

@@ -31,7 +31,7 @@ describe('Feature discovery', () => {
             {sidebarName: 'OpenID Connect', featureDiscoveryTitle: 'OpenID Connect'},
             {sidebarName: 'Groups', featureDiscoveryTitle: 'Active Directory/LDAP groups'},
             {sidebarName: 'Compliance Export', featureDiscoveryTitle: 'compliance exports'},
-            {sidebarName: 'System Roles', featureDiscoveryTitle: 'controlled access to the System Console'},
+            {sidebarName: 'Delegated Granular Administration', featureDiscoveryTitle: 'controlled access to the System Console'},
             {sidebarName: 'Permissions', featureDiscoveryTitle: 'role-based permissions'},
             {sidebarName: 'Channels', featureDiscoveryTitle: 'read-only channels'},
             {sidebarName: 'Custom Terms of Service', featureDiscoveryTitle: 'custom terms of service'},

e2e-tests/cypress/tests/utils/admin_console.js

@@ -80,8 +80,8 @@ export const adminConsoleNavigation = [
     },
     {
         type: ['team', 'e20', 'cloud_enterprise'],
-        header: 'System Roles',
+        header: 'Delegated Granular Administration',
-        sidebar: 'System Roles',
+        sidebar: 'Delegated Granular Administration',
         url: 'admin_console/user_management/system_roles',
     },
     {

webapp/channels/src/components/admin_console/admin_definition.tsx

@@ -596,7 +596,7 @@ const AdminDefinition: AdminDefinitionType = {
             },
             system_roles: {
                 url: 'user_management/system_roles',
-                title: defineMessage({id: 'admin.sidebar.systemRoles', defaultMessage: 'System Roles'}),
+                title: defineMessage({id: 'admin.sidebar.systemRoles', defaultMessage: 'Delegated Granular Administration'}),
                 isHidden: it.any(
                     it.not(it.licensedForFeature('LDAPGroups')),
                     it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)),
@@ -611,14 +611,14 @@ const AdminDefinition: AdminDefinitionType = {
             system_roles_feature_discovery: {
                 url: 'user_management/system_roles',
                 isDiscovery: true,
-                title: defineMessage({id: 'admin.sidebar.systemRoles', defaultMessage: 'System Roles'}),
+                title: defineMessage({id: 'admin.sidebar.systemRoles', defaultMessage: 'Delegated Granular Administration'}),
                 isHidden: it.any(
                     it.licensedForFeature('LDAPGroups'),
                     it.not(it.enterpriseReady),
                 ),
                 schema: {
                     id: 'SystemRoles',
-                    name: defineMessage({id: 'admin.permissions.systemRoles', defaultMessage: 'System Roles'}),
+                    name: defineMessage({id: 'admin.permissions.systemRoles', defaultMessage: 'Delegated Granular Administration'}),
                     settings: [
                         {
                             type: 'custom',

webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap

@@ -190,7 +190,7 @@ exports[`components/AdminSidebar Plugins should match snapshot 1`] = `
               }
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="System Roles"
+                  defaultMessage="Delegated Granular Administration"
                   id="admin.sidebar.systemRoles"
                 />
               }
@@ -3539,7 +3539,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
               name="user_management/system_roles"
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="System Roles"
+                  defaultMessage="Delegated Granular Administration"
                   id="admin.sidebar.systemRoles"
                 />
               }
@@ -4421,7 +4421,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
               }
               title={
                 <Memo(MemoizedFormattedMessage)
-                  defaultMessage="System Roles"
+                  defaultMessage="Delegated Granular Administration"
                   id="admin.sidebar.systemRoles"
                 />
               }

webapp/channels/src/components/admin_console/feature_discovery/features/system_roles.tsx

@@ -21,7 +21,7 @@ const SystemRolesFeatureDiscovery: React.FC = () => {
             })}
             copy={defineMessage({
                 id: 'admin.system_roles_feature_discovery.copy',
-                defaultMessage: 'Use System Roles to give designated users read and/or write access to select sections of System Console.',
+                defaultMessage: 'Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.',
             })}
             learnMoreURL='https://docs.mattermost.com/deployment/admin-roles.html'
             featureDiscoveryImage={<SystemRolesSVG/>}

webapp/channels/src/components/admin_console/system_roles/__snapshots__/system_roles.test.tsx.snap

@@ -6,7 +6,7 @@ exports[`admin_console/system_roles should match snapshot 1`] = `
 >
   <AdminHeader>
     <MemoizedFormattedMessage
-      defaultMessage="System Roles"
+      defaultMessage="Delegated Granular Administration"
       id="admin.permissions.systemRoles"
     />
   </AdminHeader>

webapp/channels/src/components/admin_console/system_roles/system_role/strings.tsx

@@ -105,7 +105,7 @@ export const sectionStrings: Record<string, Record<string, MessageDescriptor>> =
     user_management_system_roles: defineMessages({
         name: {
             id: 'admin.permissions.sysconsole_section_user_management_system_roles.name',
-            defaultMessage: 'System Roles',
+            defaultMessage: 'Delegated Granular Administration',
         },
     }),
     environment: defineMessages({

webapp/channels/src/components/admin_console/system_roles/system_roles.tsx

@@ -82,7 +82,7 @@ export default class SystemRoles extends React.PureComponent<Props> {
                 <AdminHeader>
                     <FormattedMessage
                         id='admin.permissions.systemRoles'
-                        defaultMessage='System Roles'
+                        defaultMessage='Delegated Granular Administration'
                     />
                 </AdminHeader>
                 <div className='admin-console__wrapper'>

webapp/channels/src/components/learn_more_trial_modal/learn_more_trial_modal.tsx

@@ -113,7 +113,7 @@ const LearnMoreTrialModal = (
         {
             id: 'systemConsole',
             title: formatMessage({id: 'learn_more_about_trial.modal.systemConsoleTitle', defaultMessage: 'Provide controlled access to the System Console'}),
-            description: formatMessage({id: 'learn_more_about_trial.modal.systemConsoleDescription', defaultMessage: 'Use System Roles to give designated users read and/or write access to select sections of System Console.'}),
+            description: formatMessage({id: 'learn_more_about_trial.modal.systemConsoleDescription', defaultMessage: 'Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.'}),
             svgWrapperClassName: 'personBoxSvg',
             svgElement: (
                 <SystemRolesSVG

webapp/channels/src/components/three_days_left_trial_modal/three_days_left_trial_modal.tsx

@@ -87,7 +87,7 @@ function ThreeDaysLeftTrialModal(props: Props): JSX.Element | null {
         {
             id: 'systemConsole',
             title: formatMessage({id: 'three_days_left_trial.modal.systemConsoleTitle', defaultMessage: 'Provide controlled access to the System Console'}),
-            description: formatMessage({id: 'three_days_left_trial.modal.systemConsoleDescription', defaultMessage: 'Use System Roles to give designated users read and/or write access to select sections of System Console.'}),
+            description: formatMessage({id: 'three_days_left_trial.modal.systemConsoleDescription', defaultMessage: 'Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.'}),
             svgWrapperClassName: 'personBoxSvg',
             svgElement: (
                 <SystemRolesSVG

webapp/channels/src/components/trial_benefits_modal/trial_benefits_modal.tsx

@@ -104,7 +104,7 @@ const TrialBenefitsModal = ({
         {
             id: 'systemConsole',
             title: formatMessage({id: 'trial_benefits.modal.systemConsoleTitle', defaultMessage: 'Provide controlled access to the System Console'}),
-            description: formatMessage({id: 'trial_benefits.modal.systemConsoleDescription', defaultMessage: 'Use System Roles to give designated users read and/or write access to select sections of System Console.'}),
+            description: formatMessage({id: 'trial_benefits.modal.systemConsoleDescription', defaultMessage: 'Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.'}),
             svgWrapperClassName: 'personBoxSvg',
             svgElement: (
                 <SystemRolesSVG

webapp/channels/src/i18n/en.json

@@ -1871,7 +1871,7 @@
   "admin.permissions.system_role_users.add_people": "Add People",
   "admin.permissions.system_role_users.description": "List of people assigned to this system role.",
   "admin.permissions.system_role_users.title": "Assigned People",
-  "admin.permissions.systemRoles": "System Roles",
+  "admin.permissions.systemRoles": "Delegated Granular Administration",
   "admin.permissions.systemRolesBannerText": "Manage different levels of access to the system console.",
   "admin.permissions.systemRolesBannerTitle": "Admin Roles",
   "admin.permissions.systemScheme": "System Scheme",
@@ -2376,7 +2376,7 @@
   "admin.sidebar.siteStatistics": "Site Statistics",
   "admin.sidebar.smtp": "SMTP",
   "admin.sidebar.subscription": "Subscription",
-  "admin.sidebar.systemRoles": "System Roles",
+  "admin.sidebar.systemRoles": "Delegated Granular Administration",
   "admin.sidebar.teams": "Teams",
   "admin.sidebar.teamStatistics": "Team Statistics",
   "admin.sidebar.userManagement": "User Management",
@@ -2443,7 +2443,7 @@
   "admin.support.termsOfServiceTextTitle": "Custom Terms of Service Text:",
   "admin.support.termsOfServiceTitle": "Custom Terms of Service",
   "admin.support.termsTitle": "Terms of Use Link:",
-  "admin.system_roles_feature_discovery.copy": "Use System Roles to give designated users read and/or write access to select sections of System Console.",
+  "admin.system_roles_feature_discovery.copy": "Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.",
   "admin.system_roles_feature_discovery.title": "Provide controlled access to the System Console with Mattermost Enterprise",
   "admin.system_users_list.pagination": "Showing {firstPage} - {lastPage} of {totalItems} users",
   "admin.system_users_list.pagination.no_users": "0 users",
@@ -4028,7 +4028,7 @@
   "learn_about_teams": "<a>Learn about teams</a>",
   "learn_more_about_trial.modal.ldapDescription": "Use AD/LDAP groups to organize and apply actions to multiple users at once. Manage team and channel memberships, permissions and more.",
   "learn_more_about_trial.modal.ldapTitle": "Synchronize your Active Directory/LDAP groups",
-  "learn_more_about_trial.modal.systemConsoleDescription": "Use System Roles to give designated users read and/or write access to select sections of System Console.",
+  "learn_more_about_trial.modal.systemConsoleDescription": "Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.",
   "learn_more_about_trial.modal.systemConsoleTitle": "Provide controlled access to the System Console",
   "learn_more_about_trial.modal.useSsoDescription": "Sign on quickly and easily with our SSO feature that works with OpenID, SAML, Google, and O365.",
   "learn_more_about_trial.modal.useSsoTitle": "Use SSO (with OpenID, SAML, Google, O365)",
@@ -5182,7 +5182,7 @@
   "three_days_left_trial.modal.limitsTitle": "Limits",
   "three_days_left_trial.modal.subtitle": "There is still time to explore what our paid plans can help you accomplish.",
   "three_days_left_trial.modal.subtitleLimitsOverpassed": "There are 3 days left on your trial. Upgrade to our Professional or Enterprise plan to avoid exceeding your data limits on the Free plan.",
-  "three_days_left_trial.modal.systemConsoleDescription": "Use System Roles to give designated users read and/or write access to select sections of System Console.",
+  "three_days_left_trial.modal.systemConsoleDescription": "Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.",
   "three_days_left_trial.modal.systemConsoleTitle": "Provide controlled access to the System Console",
   "three_days_left_trial.modal.title": "Your trial ends soon",
   "three_days_left_trial.modal.titleLimitsOverpassed": "Upgrade before the trial ends",
@@ -5200,7 +5200,7 @@
   "trial_benefits.modal.playbooksButton": "Open Playbooks",
   "trial_benefits.modal.playbooksDescription": "Create private playbooks, manage granular permissions schemes, and track custom metrics with a dedicated dashboard.",
   "trial_benefits.modal.playbooksTitle": "Playbooks get superpowers",
-  "trial_benefits.modal.systemConsoleDescription": "Use System Roles to give designated users read and/or write access to select sections of System Console.",
+  "trial_benefits.modal.systemConsoleDescription": "Assign customizable admin roles to give designated users read and/or write access to select sections of System Console.",
   "trial_benefits.modal.systemConsoleTitle": "Provide controlled access to the System Console",
   "trial_benefits.modal.trialStartedDescriptionBody": "You now have access to <guestAccountsLink>guest accounts</guestAccountsLink>, <autoComplianceReportsLink>automated compliance reports</autoComplianceReportsLink>, and <mobileSecureNotificationsLink>mobile secure-ID push notifications</mobileSecureNotificationsLink>, among many other features.",
   "trial_benefits.modal.trialStartedDescriptionIntro": "Welcome to your Mattermost Enterprise trial! It expires on {trialExpirationDate}. ",