diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.tsx.snap index 44f4fa4e54e..dfd509ad3f4 100644 --- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.tsx.snap +++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/__snapshots__/permissions_tree.test.tsx.snap @@ -64,7 +64,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -82,7 +81,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", @@ -260,7 +258,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -278,7 +275,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", @@ -483,7 +479,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -501,7 +496,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", @@ -695,7 +689,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -713,7 +706,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", @@ -918,7 +910,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -936,7 +927,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", @@ -1141,7 +1131,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -1159,7 +1148,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", @@ -1371,7 +1359,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_public_channel", "manage_public_channel_properties", - "manage_public_channel_auto_translation", Object { "combined": true, "id": "manage_public_channel_members_and_read_groups", @@ -1389,7 +1376,6 @@ exports[`components/admin_console/permission_schemes_settings/permission_tree sh "permissions": Array [ "create_private_channel", "manage_private_channel_properties", - "manage_private_channel_auto_translation", Object { "combined": true, "id": "manage_private_channel_members_and_read_groups", diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx index bcfd9da391a..e78f260f7d0 100644 --- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx +++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx @@ -206,4 +206,52 @@ describe('components/admin_console/permission_schemes_settings/permission_tree', })); }); }); + + describe('should show auto translation permissions', () => { + describe('for non-enterprise-advanced license', () => { + ['', LicenseSkus.E10, LicenseSkus.Starter, LicenseSkus.Professional, LicenseSkus.Enterprise, LicenseSkus.E20].forEach((licenseSku) => test(licenseSku, () => { + const props = { + ...defaultProps, + license: { + isLicensed: licenseSku === '' ? 'false' : 'true', + SkuShortName: licenseSku, + }, + }; + + const wrapper = shallow( + , + ); + const groups = wrapper.find(PermissionGroup).first().prop('permissions') as Array; + expect(groups[1].permissions).not.toContain('manage_public_channel_auto_translation'); + expect(groups[1].permissions).not.toContain('manage_private_channel_auto_translation'); + expect(groups[2].permissions).not.toContain('manage_public_channel_auto_translation'); + expect(groups[2].permissions).not.toContain('manage_private_channel_auto_translation'); + })); + }); + + describe('for enterprise-advanced license', () => { + [LicenseSkus.Entry, LicenseSkus.EnterpriseAdvanced].forEach((licenseSku) => test(licenseSku, () => { + const props = { + ...defaultProps, + license: { + isLicensed: 'true', + SkuShortName: licenseSku, + }, + }; + + const wrapper = shallow( + , + ); + const groups = wrapper.find(PermissionGroup).first().prop('permissions') as Array; + expect(groups[1].permissions).toContain('manage_public_channel_auto_translation'); + expect(groups[1].permissions).not.toContain('manage_private_channel_auto_translation'); + expect(groups[2].permissions).not.toContain('manage_public_channel_auto_translation'); + expect(groups[2].permissions).toContain('manage_private_channel_auto_translation'); + })); + }); + }); }); diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx index b41a889b64e..8589004c26c 100644 --- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx +++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx @@ -87,7 +87,6 @@ export default class PermissionsTree extends React.PureComponent { permissions: [ Permissions.CREATE_PUBLIC_CHANNEL, Permissions.MANAGE_PUBLIC_CHANNEL_PROPERTIES, - Permissions.MANAGE_PUBLIC_CHANNEL_AUTO_TRANSLATION, { id: 'manage_public_channel_members_and_read_groups', combined: true, @@ -105,7 +104,6 @@ export default class PermissionsTree extends React.PureComponent { permissions: [ Permissions.CREATE_PRIVATE_CHANNEL, Permissions.MANAGE_PRIVATE_CHANNEL_PROPERTIES, - Permissions.MANAGE_PRIVATE_CHANNEL_AUTO_TRANSLATION, { id: 'manage_private_channel_members_and_read_groups', combined: true, @@ -322,7 +320,9 @@ export default class PermissionsTree extends React.PureComponent { if (isMinimumEnterpriseAdvancedLicense(license)) { publicChannelsGroup.permissions.push(Permissions.MANAGE_PUBLIC_CHANNEL_BANNER); + publicChannelsGroup.permissions.push(Permissions.MANAGE_PUBLIC_CHANNEL_AUTO_TRANSLATION); privateChannelsGroup.permissions.push(Permissions.MANAGE_PRIVATE_CHANNEL_BANNER); + privateChannelsGroup.permissions.push(Permissions.MANAGE_PRIVATE_CHANNEL_AUTO_TRANSLATION); privateChannelsGroup.permissions.push(Permissions.MANAGE_CHANNEL_ACCESS_RULES); } diff --git a/webapp/channels/src/utils/constants.tsx b/webapp/channels/src/utils/constants.tsx index 1c9d006e089..8ef6254a824 100644 --- a/webapp/channels/src/utils/constants.tsx +++ b/webapp/channels/src/utils/constants.tsx @@ -1308,6 +1308,8 @@ export const DefaultRolePermissions = { Permissions.ORDER_BOOKMARK_PRIVATE_CHANNEL, Permissions.MANAGE_PUBLIC_CHANNEL_BANNER, Permissions.MANAGE_PRIVATE_CHANNEL_BANNER, + Permissions.MANAGE_PUBLIC_CHANNEL_AUTO_TRANSLATION, + Permissions.MANAGE_PRIVATE_CHANNEL_AUTO_TRANSLATION, Permissions.MANAGE_CHANNEL_ACCESS_RULES, ], team_admin: [