diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index ff2dce9eb..e670a70d7 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -95,6 +95,9 @@ host: none: title: No Hosts description: No hosts available in this scope. + none-friendly: + title: No Hosts Available + description: No hosts available to display yet. actions: add: Add Host create: New Host @@ -110,6 +113,12 @@ session: none: title: No Sessions description: There are no active sessions within the current scope. + none-friendly: + title: No Sessions Available + description: No sessions available to display yet. + none-active-friendly: + title: No Active Sessions Available + description: No active sessions available to display yet. actions: connect: Connect org: @@ -195,6 +204,9 @@ target: messages: welcome: title: Welcome to Targets + none: + title: No Targets Available + description: No Targets to display yet. Contact your Boundary admin if you don't see a Target you expect access to. actions: create: New Target delete: Delete Target diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 3f6dccb72..fc6e412c2 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -83,9 +83,9 @@ {{else}} - + - {{t "resources.session.messages.none.description"}} + {{t "resources.session.messages.none-friendly.description"}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs index af224473c..46ba29ed8 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs @@ -7,74 +7,86 @@ - - - - {{t "form.name.label"}} - {{t "form.id.label"}} - {{t "form.type.label"}} - {{t "resources.project.title"}} - - - - - {{#each @model as |model|}} - - - - {{model.displayName}} - - {{#if model.target.description}} -

{{model.target.description}}

- {{/if}} - {{#if model.target.isActive}} - - {{t "states.active"}} - - {{/if}} -
- - - {{model.id}} - - - - {{#if model.type}} - - {{t (concat "resources.target.types." model.type)}} - - {{/if}} - - -
+ {{#if @model}} + + + + {{t "form.name.label"}} + {{t "form.id.label"}} + {{t "form.type.label"}} + {{t "resources.project.title"}} + + + + + {{#each @model as |model|}} + + + + {{model.displayName}} + + {{#if model.target.description}} +

{{model.target.description}}

+ {{/if}} + {{#if model.target.isActive}} + + {{t "states.active"}} + + {{/if}} +
+ - {{model.project.id}} + {{model.id}} -
- - {{model.project.name}} - -
- - - {{t "resources.session.actions.connect"}} - - -
- {{/each}} -
-
+ + + {{#if model.type}} + + {{t (concat "resources.target.types." model.type)}} + + {{/if}} + + +
+ + {{model.target.id}} + +
+ + {{model.project.name}} + +
+ + + {{t "resources.session.actions.connect"}} + + + + {{/each}} + + + {{else}} + + + + + {{t "resources.target.messages.none.description"}} + + + + + {{/if}}
diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs index bb76d5e56..92ae3eebe 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs @@ -1,32 +1,46 @@ {{page-title (t "resources.host-set.title_plural")}} - - - {{#each @model.hosts as |host|}} - - - {{host.displayName}} -

{{host.description}}

-
- - - {{host.id}} - - - {{host.attributes.address}} - - {{t (concat 'resources.host.types.' host.type)}} - - - - {{t "resources.session.actions.connect"}} - - -
- {{/each}} -
-
+{{#if @model.hosts}} + + + + {{#each @model.hosts as |host|}} + + + {{host.displayName}} +

{{host.description}}

+
+ + + {{host.id}} + + + {{host.attributes.address}} + + {{t (concat 'resources.host.types.' host.type)}} + + + + {{t "resources.session.actions.connect"}} + + +
+ {{/each}} +
+
+ +{{else}} + + + + + {{t "resources.host.messages.none-friendly.description"}} + + + + +{{/if}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs index 008e5dfb0..fa93594e3 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs @@ -1,60 +1,59 @@ - - - {{#each this.selfActiveSessions as |session|}} - - - - - {{session.id}} - - - - {{!-- - Two if's here because: - 1) Local proxy info is only relevant if the session is - active or pending (aka isCancelable). Once the session - is canceled or in the process thereof, the local proxy - may no longer be used. - 2) The session actually has proxy information associated - with it. It's possible for the user to start sessions - from other devices (or even another tab), in which case we - won't have the local proxy info available here. - --}} - {{#if session.isCancelable}} - {{#if session.proxy}} - - {{session.proxy}} - +{{#if this.selfActiveSessions}} + + + {{#each this.selfActiveSessions as |session|}} + + + + + {{session.id}} + + + + {{!-- + Two if's here because: + 1) Local proxy info is only relevant if the session is + active or pending (aka isCancelable). Once the session + is canceled or in the process thereof, the local proxy + may no longer be used. + 2) The session actually has proxy information associated + with it. It's possible for the user to start sessions + from other devices (or even another tab), in which case we + won't have the local proxy info available here. + --}} + {{#if session.isCancelable}} + {{#if session.proxy}} + + {{session.proxy}} + + {{/if}} {{/if}} - {{/if}} - - - - - - {{session.status}} - - - {{#if session.isCancelable}} - - {{t "actions.cancel"}} - - {{/if}} - - - {{/each}} - - + + + {{/each}} + + + +{{else}} + + + + + {{t "resources.session.messages.none-active-friendly.description"}} + + + + +{{/if}} +