Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-30317] add MANAGE_REMOTE_CLUSTERS permission #7060

Merged
merged 3 commits into from
Nov 18, 2020
Merged

[MM-30317] add MANAGE_REMOTE_CLUSTERS permission #7060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9272a2
add MANAGE_REMOTE_CLUSTERS permission
isacikgoz Nov 12, 2020
3bbe250
Update i18n/en.json
isacikgoz Nov 13, 2020
962fe10
Merge remote-tracking branch 'origin/master' into MM-30317
isacikgoz Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/admin_console/permission_schemes_settings/permission_schemes_settings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,3 +375,5 @@ t('admin.permissions.group.manage_shared_channels.name');
t('admin.permissions.group.manage_shared_channels.description');
t('admin.permissions.permission.manage_shared_channels.name');
t('admin.permissions.permission.manage_shared_channels.description');
t('admin.permissions.permission.manage_remote_clusters.name');
t('admin.permissions.permission.manage_remote_clusters.description');
1 change: 1 addition & 0 deletions components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export default class PermissionsTree extends React.PureComponent {

if (config.ExperimentalSharedChannels === 'true') {
sharedChannelsGroup.permissions.push(Permissions.MANAGE_SHARED_CHANNELS);
sharedChannelsGroup.permissions.push(Permissions.MANAGE_REMOTE_CLUSTERS);
}
}

Expand Down
4 changes: 3 additions & 1 deletion i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@
"admin.permissions.group.manage_public_channel_members_and_read_groups.description": "Add and remove public channel members.",
"admin.permissions.group.manage_public_channel_members_and_read_groups.name": "Manage Channel Members",
"admin.permissions.group.manage_shared_channels.description": "Manage Shared Channels",
"admin.permissions.group.manage_shared_channels.name": "Manage Shared Channels",
"admin.permissions.group.manage_shared_channels.name": "Shared Channels",
"admin.permissions.group.posts.description": "Write, edit and delete posts.",
"admin.permissions.group.posts.name": "Manage Posts",
"admin.permissions.group.private_channel.description": "Create and archive channels, manage settings and members.",
Expand Down Expand Up @@ -1328,6 +1328,8 @@
"admin.permissions.permission.manage_private_channel_properties.name": "Manage Channel Settings",
"admin.permissions.permission.manage_public_channel_properties.description": "Update public channel names, headers and purposes.",
"admin.permissions.permission.manage_public_channel_properties.name": "Manage Channel Settings",
"admin.permissions.permission.manage_remote_clusters.description": "Add, remove and view remote clusters for shared channels",
"admin.permissions.permission.manage_remote_clusters.name": "Manage Remote Clusters",
"admin.permissions.permission.manage_roles.description": "Manage roles",
"admin.permissions.permission.manage_roles.name": "Manage roles",
"admin.permissions.permission.manage_shared_channels.description": "Share, unshare and invite another instance to sync with a shared channel",
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions utils/constants.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,7 @@ export const PermissionsScope = {
[Permissions.CONVERT_PUBLIC_CHANNEL_TO_PRIVATE]: 'channel_scope',
[Permissions.CONVERT_PRIVATE_CHANNEL_TO_PUBLIC]: 'channel_scope',
[Permissions.MANAGE_SHARED_CHANNELS]: 'system_scope',
[Permissions.MANAGE_REMOTE_CLUSTERS]: 'system_scope',
};

export const DefaultRolePermissions = {
Expand Down