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 f48b2a895..98a449ae8 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,45 +1,36 @@ {{page-title (t 'resources.host-set.title_plural')}} {{#if @model.hosts}} - {{#each @model.hosts as |host|}} - {{#if host.isStatic}} - - - {{host.displayName}} -

{{host.description}}

-
- - - {{host.id}} - - - {{host.attributes.address}} - - {{t - (concat 'resources.host.types.' host.type) - }} - - - - {{t 'resources.session.actions.connect'}} - - -
- {{/if}} + + + {{host.displayName}} +

{{host.description}}

+
+ + + {{host.id}} + + + {{host.attributes.address}} + + + {{t 'resources.session.actions.connect'}} + + +
{{/each}}
- {{else}} diff --git a/ui/desktop/tests/acceptance/projects/targets/hosts-test.js b/ui/desktop/tests/acceptance/projects/targets/hosts-test.js index f54c33d2b..3b6fda1ea 100644 --- a/ui/desktop/tests/acceptance/projects/targets/hosts-test.js +++ b/ui/desktop/tests/acceptance/projects/targets/hosts-test.js @@ -173,14 +173,7 @@ module('Acceptance | projects | targets | hosts', function (hooks) { test('visiting index', async function (assert) { assert.expect(2); - // Because we are generating host with different types but just showing on the list - // the type = static, we have to apply a filter here - const rawHostsList = this.server.schema.hosts.all(); - const filteredHostsList = rawHostsList.filter((host) => { - if (host.type === 'static') { - return host; - } - }).length; + const hostsCount = this.server.schema.hosts.all().models.length; // This later/cancelTimers technique allows us to test a page with // active polling. Normally an acceptance test waits for all runloop timers // to stop before returning from an awaited test, but polling means that @@ -190,7 +183,7 @@ module('Acceptance | projects | targets | hosts', function (hooks) { run.cancelTimers(); // await a11yAudit(); assert.equal(currentURL(), urls.hosts); - assert.equal(findAll('tbody tr').length, filteredHostsList); + assert.equal(findAll('tbody tr').length, hostsCount); }, 750); await visit(urls.hosts); });