diff --git a/ui/core/app/components/form/target/add-host-sets/index.hbs b/ui/core/app/components/form/target/add-host-sets/index.hbs index 46fc66308..5ad080dee 100644 --- a/ui/core/app/components/form/target/add-host-sets/index.hbs +++ b/ui/core/app/components/form/target/add-host-sets/index.hbs @@ -17,7 +17,7 @@ {{t 'form.id.label'}} {{t 'form.name.label'}} {{t 'form.type.label'}} - {{t 'resources.host-catalog'}} + {{t 'resources.host-catalog.title_plural'}} diff --git a/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs.js b/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs.js index e323437e8..5e90268a0 100644 --- a/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs.js +++ b/ui/core/app/controllers/scopes/scope/projects/project/host-catalogs.js @@ -12,6 +12,6 @@ export default class ScopesScopeProjectsProjectHostCatalogsController extends Co * @type {string} */ get breadCrumb() { - return this.intl.t('resources.host-catalogs'); + return this.intl.t('resources.host-catalog.title_plural'); } } diff --git a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs b/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs index a3913f3a5..30441e047 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/_sidebar.hbs @@ -6,6 +6,6 @@ {{t "resources.targets"}} - {{t "resources.host-catalogs"}} + {{t "resources.host-catalog.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs.hbs index 6ad0035fb..abbb6702e 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs.hbs @@ -1,3 +1,3 @@ -{{title (t "resources.host-catalogs")}} +{{title (t "resources.host-catalog.title_plural")}} {{outlet}} diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs index e9bdb8c81..271a98d73 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog.hbs @@ -1,3 +1,5 @@ +{{title @model.displayName}} + diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs index 655ecb273..65dddb9f1 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/-header.hbs @@ -1,2 +1,2 @@ -

{{t "resources.host-catalog"}}

-

{{t "resources.descriptions.host-catalog"}}

\ No newline at end of file +

{{t "resources.host-catalog.title"}}

+

{{t "resources.host-catalog.description"}}

diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs index dda201a70..e19459843 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs @@ -5,8 +5,8 @@
-

{{t "resources.host-catalogs"}}

-

{{t "resources.descriptions.host-catalogs"}}

+

{{t "resources.host-catalog.title_plural"}}

+

{{t "resources.host-catalog.description"}}

@@ -57,9 +57,9 @@ {{else}} - + - {{t "descriptions.host-catalogs-welcome"}} + {{t "resources.host-catalog.description"}} diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index ba39b23c4..815f6cdc2 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -25,7 +25,6 @@ titles: empty-set: No Items Yet orgs-welcome: Welcome to Orgs projects-welcome: Welcome to Projects - host-catalogs-welcome: Welcome to Host Catalogs host-sets-welcome: Welcome to Host Sets hosts-welcome: Welcome to Hosts users-welcome: Welcome to Users @@ -46,11 +45,9 @@ titles: no-available-users: No Users Available actions: Actions descriptions: - host-catalogs: Overview of collections of hosts and host sets. empty-set: There are no items to display yet. You may be able to add items or try back later. orgs-welcome: Create your orgs here. projects-welcome: Projects allow you to create and manage host catalogs. To start, create a project. - host-catalogs-welcome: Host catalogs allow you to configure to collect and create hosts and host sets. To start, create a host catalog. host-sets-welcome: Configure a static host set in this host catalog. hosts-welcome: Configure a static host in this host catalog. users-welcome: Users are authorized to access Boundary. diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml index e7615fcc3..921c15124 100644 --- a/ui/core/translations/resources/en-us.yaml +++ b/ui/core/translations/resources/en-us.yaml @@ -44,6 +44,13 @@ group: description: Select users to add users to this group. actions: add-members: Add Members +host-catalog: + title: Host Catalog + title_plural: Host Catalogs + description: A host catalog is a collection of hosts and host sets. + messages: + welcome: + title: Welcome to Host Catalogs session: title: Session title_plural: Sessions @@ -60,8 +67,6 @@ orgs: Orgs org: Org projects: Projects project: Project -host-catalog: Host Catalog -host-catalogs: Host Catalogs host-set: Host Set host-sets: Host Sets host: Host @@ -79,8 +84,6 @@ descriptions: orgs: An Organization is a top-level container, and owns zero to many Projects and zero to many Authentication Methods. An Organization inherits from Scope ("is-a" Scope) allowing it to own zero to many Groups, Roles, Targets, or Host Catalogs. The lifecycle of an Organization is not tied to anything else. A Role at the Organization level can grant permissions at the Project level. project: When a Project is deleted, all resources owned by it are also deleted. The lifecycle of a Project is not tied to any resource it contains. projects: A project is a child scope of an organization and is owned by an Organization. A Project inherits from Scope ("is-a" Scope) allowing it to own zero to many Groups, Roles, Targets, or Host Catalogs. A Project also inherits from Principal ("is-a" Principal) allowing it to be associated with zero or more Roles. A Project has no additional relationships beyond those defined in Scope and Principal. A Project is deleted when the Organization it belongs to is deleted. - host-catalog: A host catalog is a permission boundary modeled as a container. - host-catalogs: A host catalog is a permission boundary modeled as a container. 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.