diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/helpers.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/helpers.js index 1cb2b8ab2e..788b8fb03e 100644 --- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/helpers.js +++ b/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 diff --git a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/user_management/user_management_admin_control_spec.js b/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/user_management/user_management_admin_control_spec.js index 2ff80c4101..7d0c5c60c1 100644 --- a/e2e-tests/cypress/tests/integration/channels/enterprise/system_console/user_management/user_management_admin_control_spec.js +++ b/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 diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_cloud_spec.js index 72aae691a0..7be120a661 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_cloud_spec.js +++ b/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'}, diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_not_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_not_cloud_spec.js index 449dad2d0d..3c0ac39f9e 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_not_cloud_spec.js +++ b/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'}, diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_spec.js index 2a7312bd70..a5ca785490 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/feature_discovery_spec.js +++ b/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'}, diff --git a/e2e-tests/cypress/tests/utils/admin_console.js b/e2e-tests/cypress/tests/utils/admin_console.js index d4c0f1a9ce..68aaf9bf34 100644 --- a/e2e-tests/cypress/tests/utils/admin_console.js +++ b/e2e-tests/cypress/tests/utils/admin_console.js @@ -80,8 +80,8 @@ export const adminConsoleNavigation = [ }, { type: ['team', 'e20', 'cloud_enterprise'], - header: 'System Roles', - sidebar: 'System Roles', + header: 'Delegated Granular Administration', + sidebar: 'Delegated Granular Administration', url: 'admin_console/user_management/system_roles', }, { diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx index 187451ae43..8c94880fcb 100644 --- a/webapp/channels/src/components/admin_console/admin_definition.tsx +++ b/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', diff --git a/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap b/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap index 1c56ac47f4..2d1cdc5ca2 100644 --- a/webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap +++ b/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={ } @@ -3539,7 +3539,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f name="user_management/system_roles" title={ } @@ -4421,7 +4421,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an } title={ } diff --git a/webapp/channels/src/components/admin_console/feature_discovery/features/system_roles.tsx b/webapp/channels/src/components/admin_console/feature_discovery/features/system_roles.tsx index 0f02abf43a..cb17a81b10 100644 --- a/webapp/channels/src/components/admin_console/feature_discovery/features/system_roles.tsx +++ b/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={} diff --git a/webapp/channels/src/components/admin_console/system_roles/__snapshots__/system_roles.test.tsx.snap b/webapp/channels/src/components/admin_console/system_roles/__snapshots__/system_roles.test.tsx.snap index 648ab5c953..d2382a2c1d 100644 --- a/webapp/channels/src/components/admin_console/system_roles/__snapshots__/system_roles.test.tsx.snap +++ b/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`] = ` > diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/strings.tsx b/webapp/channels/src/components/admin_console/system_roles/system_role/strings.tsx index 0138608797..45cdfda659 100644 --- a/webapp/channels/src/components/admin_console/system_roles/system_role/strings.tsx +++ b/webapp/channels/src/components/admin_console/system_roles/system_role/strings.tsx @@ -105,7 +105,7 @@ export const sectionStrings: Record> = 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({ diff --git a/webapp/channels/src/components/admin_console/system_roles/system_roles.tsx b/webapp/channels/src/components/admin_console/system_roles/system_roles.tsx index 2287438858..183d73a12e 100644 --- a/webapp/channels/src/components/admin_console/system_roles/system_roles.tsx +++ b/webapp/channels/src/components/admin_console/system_roles/system_roles.tsx @@ -82,7 +82,7 @@ export default class SystemRoles extends React.PureComponent {
diff --git a/webapp/channels/src/components/learn_more_trial_modal/learn_more_trial_modal.tsx b/webapp/channels/src/components/learn_more_trial_modal/learn_more_trial_modal.tsx index e508070c80..8fcf217090 100644 --- a/webapp/channels/src/components/learn_more_trial_modal/learn_more_trial_modal.tsx +++ b/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: ( Learn about teams", "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 guest accounts, automated compliance reports, and mobile secure-ID push notifications, among many other features.", "trial_benefits.modal.trialStartedDescriptionIntro": "Welcome to your Mattermost Enterprise trial! It expires on {trialExpirationDate}. ",