rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move new restricted admin to login access roles 

rancher/rancher#29315
This commit is contained in:
Westly Wright 2020-10-01 16:44:37 -07:00
parent 02e31e6d28
commit b51b28f5cc
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/global-admin/addon/components/form-global-roles/component.js
View File

@ -10,6 +10,7 @@ import { isArray } from '@ember/array';
const USER = 'user'; const USER = 'user';
const ADMIN = 'admin'; const ADMIN = 'admin';
const RESTRICTED_ADMIN = 'restricted-admin';
const BASE = 'user-base'; const BASE = 'user-base';
const LOGIN_ACCESS_ROLES = [ const LOGIN_ACCESS_ROLES = [
{ {
@ -22,6 +23,11 @@ const LOGIN_ACCESS_ROLES = [
translationKey: 'formGlobalRoles.mode.admin.label', translationKey: 'formGlobalRoles.mode.admin.label',
descriptionTranslationKey: 'formGlobalRoles.mode.admin.detail', descriptionTranslationKey: 'formGlobalRoles.mode.admin.detail',
}, },
{
name: RESTRICTED_ADMIN,
translationKey: 'formGlobalRoles.mode.restrictedAdmin.label',
descriptionTranslationKey: 'formGlobalRoles.mode.restrictedAdmin.detail',
},
{ {
name: BASE, name: BASE,
translationKey: 'formGlobalRoles.mode.userBase.label', translationKey: 'formGlobalRoles.mode.userBase.label',
@ -66,7 +72,7 @@ export default Component.extend({
baseRoles: computed('allRoles.[]', function() { baseRoles: computed('allRoles.[]', function() {
const { allRoles } = this; const { allRoles } = this;
return [ADMIN, USER, BASE].map((r) => allRoles.findBy('id', r)).compact(); return [ADMIN, RESTRICTED_ADMIN, USER, BASE].map((r) => allRoles.findBy('id', r)).compact();
}), }),
make(role) { make(role) {
@ -120,7 +126,7 @@ export default Component.extend({
initRoles() { initRoles() {
setProperties(this, { setProperties(this, {
baseRoles: this.baseRoles.map(this.roleMapper.bind(this)), baseRoles: this.baseRoles.map(this.roleMapper.bind(this)),
additionalRoles: this.allRoles.filterBy('isHidden', false).filterBy('builtin').map(this.roleMapper.bind(this)), additionalRoles: this.allRoles.filterBy('isHidden', false).filterBy('builtin').filter((role) => role.id !== 'restricted-admin').map(this.roleMapper.bind(this)),
userRoles: this.allRoles.filterBy('isHidden', false).filterBy('builtin', false).map(this.roleMapper.bind(this)) userRoles: this.allRoles.filterBy('isHidden', false).filterBy('builtin', false).map(this.roleMapper.bind(this))
}); });

3
translations/en-us.yaml
View File

@ -6349,6 +6349,9 @@ formGlobalRoles:
custom: custom:
label: Built-in label: Built-in
detail: Additional roles to define more fine-grain permissions model. detail: Additional roles to define more fine-grain permissions model.
restrictedAdmin:
label: Restricted Administrator
detail: Restricted Admins have full control over all resources in all downstream clusters but no access to the local cluster.
role: role:
clusters-create: clusters-create:
label: Create new Clusters label: Create new Clusters