diff --git a/ui/core/app/components/form/role/add-principals/index.hbs b/ui/core/app/components/form/role/add-principals/index.hbs index 29e1a460c..0787766ab 100644 --- a/ui/core/app/components/form/role/add-principals/index.hbs +++ b/ui/core/app/components/form/role/add-principals/index.hbs @@ -31,7 +31,7 @@ {{principal.name}} - {{t (concat 'resources.' principal.constructor.modelName)}} + {{t (concat 'resources.role.principal.types.' principal.constructor.modelName)}} {{/each}} @@ -43,9 +43,9 @@ {{#unless this.hasAvailablePrincipals}} - + - {{t "descriptions.no-principals-available"}} + {{t "resources.role.principal.messages.none.description"}} diff --git a/ui/core/app/components/form/role/grants/index.hbs b/ui/core/app/components/form/role/grants/index.hbs index d4fc71207..8b5e97f28 100644 --- a/ui/core/app/components/form/role/grants/index.hbs +++ b/ui/core/app/components/form/role/grants/index.hbs @@ -14,7 +14,7 @@ @value={{this.newGrantString}} as |input|> - {{t "titles.new-grant"}} + {{t "resources.role.grant.actions.create"}} diff --git a/ui/core/app/controllers/scopes/scope/roles.js b/ui/core/app/controllers/scopes/scope/roles.js index bbd84249e..ec27b87ca 100644 --- a/ui/core/app/controllers/scopes/scope/roles.js +++ b/ui/core/app/controllers/scopes/scope/roles.js @@ -13,6 +13,6 @@ export default class ScopesScopeRolesController extends Controller { * @type {string} */ get breadCrumb() { - return this.intl.t('resources.roles'); + return this.intl.t('resources.role.title_plural'); } } diff --git a/ui/core/app/controllers/scopes/scope/roles/role/add-principals.js b/ui/core/app/controllers/scopes/scope/roles/role/add-principals.js index 1d64b6362..48dc430b0 100644 --- a/ui/core/app/controllers/scopes/scope/roles/role/add-principals.js +++ b/ui/core/app/controllers/scopes/scope/roles/role/add-principals.js @@ -13,6 +13,6 @@ export default class ScopesScopeRolesRoleAddPrincipalsController extends Control * @type {string} */ get breadCrumb() { - return this.intl.t('actions.add-principals'); + return this.intl.t('resources.role.principal.actions.add-principals'); } } diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 5c94400c2..04b437e4d 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -17,7 +17,7 @@ {{t "resources.group.title_plural"}} - {{t "resources.roles"}} + {{t "resources.role.title_plural"}} {{t "resources.auth-method.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/roles.hbs b/ui/core/app/templates/scopes/scope/roles.hbs index 6d511b7f7..05a8f7a37 100644 --- a/ui/core/app/templates/scopes/scope/roles.hbs +++ b/ui/core/app/templates/scopes/scope/roles.hbs @@ -1,3 +1,3 @@ -{{title (t "resources.roles")}} +{{title (t "resources.role.title_plural")}} {{outlet}} diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs index cf9ae52ca..588970e37 100644 --- a/ui/core/app/templates/scopes/scope/roles/index.hbs +++ b/ui/core/app/templates/scopes/scope/roles/index.hbs @@ -5,8 +5,10 @@ -

{{t "resources.roles"}}

-

{{t "resources.descriptions.roles"}}

+

{{t "resources.role.title_plural"}}

+ {{#if @model}} +

{{t "resources.role.description"}}

+ {{/if}}
@@ -49,9 +51,9 @@ {{else}} - + - {{t 'descriptions.roles-welcome'}} + {{t 'resources.role.description'}} diff --git a/ui/core/app/templates/scopes/scope/roles/role/-actions.hbs b/ui/core/app/templates/scopes/scope/roles/role/-actions.hbs index 576a6a8fb..073f082db 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/-actions.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/-actions.hbs @@ -1,12 +1,12 @@ - {{t 'actions.add-principals'}} + {{t 'resources.role.principal.actions.add-principals'}} - {{t 'actions.delete-role'}} + {{t 'resources.role.actions.delete'}} diff --git a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs index 96ed6300a..93f645dfa 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/-header.hbs @@ -1,2 +1,2 @@ -

{{t "resources.role"}}

-

{{t "resources.descriptions.role"}}

+

{{t "resources.role.title"}}

+

{{t "resources.role.description"}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/-navigation.hbs b/ui/core/app/templates/scopes/scope/roles/role/-navigation.hbs index 5498f5733..023542087 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/-navigation.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/-navigation.hbs @@ -3,9 +3,9 @@ {{t 'titles.settings'}}
- {{t 'titles.principals'}} + {{t 'resources.role.principal.title_plural'}} - {{t 'titles.grants'}} + {{t 'resources.role.grant.title_plural'}} diff --git a/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs index 5110dbec0..afe17ef59 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs @@ -1,4 +1,4 @@ -{{title (t "actions.add-principals")}} +{{title (t "resources.role.principal.actions.add-principals")}} {{t "actions.add-principals"}} \ No newline at end of file +

{{t "resources.role.principal.messages.add-principals.title"}}

+

{{t "resources.role.principal.messages.add-principals.description"}}

\ No newline at end of file diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants.hbs index edb0faf13..9551c3614 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/grants.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/grants.hbs @@ -1,4 +1,4 @@ -{{title (t 'titles.grants')}} +{{title (t 'resources.role.grant.title_plural')}} {{t "resources.role"}} -

{{t "resources.descriptions.grants"}}

+

{{t "resources.role.title"}}

+

{{t "resources.role.grant.description"}}

diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs index 2acc62cd0..5d6b375fd 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs @@ -1,4 +1,4 @@ -{{title (t 'titles.principals')}} +{{title (t 'resources.role.principal.title_plural')}} {{#if @model}} @@ -18,7 +18,7 @@ {{principal.model.displayName}} - {{t (concat 'resources.' principal.type)}} + {{t (concat 'resources.role.principal.types.' principal.type)}} {{principal.model.id}} @@ -47,10 +47,14 @@ {{else}} - + - {{t "descriptions.role-principals-welcome"}} + {{t "resources.role.principal.messages.welcome.description"}} + + + {{t 'resources.role.principal.actions.add-principals'}} + diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs index a549d9a8b..9d7156902 100644 --- a/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs +++ b/ui/core/app/templates/scopes/scope/roles/role/principals/-header.hbs @@ -1,2 +1,2 @@ -

{{t "resources.role"}}

-

{{t "resources.descriptions.principals"}}

+

{{t "resources.role.title"}}

+

{{t "resources.role.principal.description"}}

diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index a158daeb8..6561047d6 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -25,31 +25,22 @@ titles: empty-set: No Items Yet host-sets-welcome: Welcome to Host Sets hosts-welcome: Welcome to Hosts - roles-welcome: Welcome to Roles targets-welcome: Create your first Target target-host-sets-welcome: No Host Sets Associated - grants: Permissions - new-grant: New Grant - principals: Principals host-sets: Host Sets hosts: Hosts targets: Targets global: Global no-host-set-hosts: No Hosts Available no-host-sets-for-target: No Host Sets Available - role-principals-welcome: No Principals Associated - no-principals-available: No Principals Available no-available-users: No Users Available actions: Actions descriptions: empty-set: There are no items to display yet. You may be able to add items or try back later. host-sets-welcome: Configure a static host set in this host catalog. hosts-welcome: Configure a static host in this host catalog. - roles-welcome: Roles are collections of capabilities that can be granted to user and/or groups. targets-welcome: Targets provide Users the means to connect to and interact networked services. A Target contains a collection of Hosts and a collection of Credentials. target-host-sets-welcome: Add Host Sets to this target to provide access. no-host-set-hosts: Before associating hosts with this host set, create hosts within the host catalog. no-host-sets-for-target: No host sets are available to add to this target. - role-principals-welcome: No principals are available in this role. - no-principals-available: Principals are not available for assignment. no-available-users: No users are available to add to this group. diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml index a0c4df6c7..1c1287707 100644 --- a/ui/core/translations/resources/en-us.yaml +++ b/ui/core/translations/resources/en-us.yaml @@ -80,8 +80,41 @@ user: messages: welcome: title: Welcome to Users -role: Role -roles: Roles +role: + title: Role + title_plural: Roles + description: Roles are collections of capability grants and the principals (users and groups) assigned to them. + messages: + welcome: + title: Welcome to Roles + actions: + create: Create Role + delete: Delete Role + principal: + title: Principal + title_plural: Principals + description: Principals are the users and groups assigned to a role and bounded by a role’s grants. + messages: + welcome: + title: Welcome to Principals + description: Principals are not assigned in this role. + none: + title: No Principals Available + description: Principals are not available for assignment. + add-principals: + title: Add Principals + description: Select users and groups to assign to this role. + types: + user: User + group: Group + actions: + add-principals: Add Principals + grant: + title: Grant + title_plural: Grants + description: Grants are permissions which allow roles to take actions and access resources + actions: + create: New Grant host-set: Host Set host-sets: Host Sets host: Host @@ -89,10 +122,6 @@ hosts: Hosts target: Target targets: Targets descriptions: - role: A Role can be assigned to zero or more Principals. A Principal assigned a Role receives all capabilities granted by any Direct Grant owned by the Role. A Role is deleted when the Scope it belongs to is deleted. All Direct Grants owned by a Role are deleted when the Role is deleted. - roles: A role is a collection of capabilities granted to any Principal the Role is assigned to. A Role belongs to one and only one Scope. A Role owns zero or more Direct Grants. The lifecycle of a Role is not tied to the lifecycle of any Principal. - grants: A grant represents a set of capabilities granted to a role. It couples a set of Actions to either a set of Resource Types or an individual Resource. A Direct Grant belongs exclusively to one and only one Role. However, equivalent Direct Grants may exist across different Roles. A Direct Grant references one or more Actions and either one or more Resource types or one specific Resource. A Direct Grant is deleted when the Role it belongs to is deleted. A Direct Grant is also deleted if it is associated with a specific Resource and that Resource itself is deleted. The lifecycle of a Direct Grant is not tied to the lifecycle of any Action or Resource Type. - principals: A principal is any entity which can be assigned capabilities. Principal is abstract. User, Group, and Project are concrete Principals. A Principal can be assigned to zero or more Roles. host-set: Host Set is abstract. A Host Set is deleted when the Host Catalog it belongs to is deleted. host-sets: A host set is a resource which provides a subset of Hosts from the set of Hosts of the Host Catalog it belongs to. A Host Set belongs to one and only one Host Catalog. A Host Set can contain zero or more Hosts. A Host Set can be contained by zero or more Targets. The lifecycle of a Host Set is not tied to the lifecycle of any Targets or Hosts. host: Host is abstract. A Host is deleted when the Host Catalog it belongs to is deleted.