From 69a4eb53b997d814c21842ef7f8a4b69ac2f6fa1 Mon Sep 17 00:00:00 2001 From: Devon Anderson Date: Tue, 12 Dec 2023 14:52:31 -0500 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Refactor=20workers?= =?UTF-8?q?=20list=20to=20use=20`Hds::Table`=20(#2038)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 💡 Refactor workers list to use `Hds::Table` Refactor workers list to use `Hds::Table` instead of `Rose`. ✅ Closes: https://hashicorp.atlassian.net/browse/ICU-11734 * Refactored `workers-list` table to use `margin-top` custom css instead of removing the background from `Rose::Toolbar` --- ui/admin/app/styles/app.scss | 3 +- .../templates/scopes/scope/workers/index.hbs | 115 +++++++++--------- .../tests/acceptance/workers/read-test.js | 4 +- 3 files changed, 59 insertions(+), 63 deletions(-) diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 46bbf5f8a..699de8ac1 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -739,7 +739,8 @@ margin-bottom: 1rem; } -.auth-methods-list-table { +.auth-methods-list-table, +.workers-list-table { margin-top: 1rem; } diff --git a/ui/admin/app/templates/scopes/scope/workers/index.hbs b/ui/admin/app/templates/scopes/scope/workers/index.hbs index 265b6165e..55e2670fd 100644 --- a/ui/admin/app/templates/scopes/scope/workers/index.hbs +++ b/ui/admin/app/templates/scopes/scope/workers/index.hbs @@ -90,67 +90,62 @@ - - - - {{t 'resources.worker.title'}} - {{t 'form.id.label'}} - {{t - 'resources.worker.table.session_count' - }} - {{t - 'resources.worker.table.release_version' - }} - {{t - 'resources.worker.table.ip_address' - }} - - - - {{#each @model as |worker|}} - - - {{#if (and (can 'read worker' worker) worker.isPki)}} - - {{worker.displayName}} - - {{else}} - {{worker.displayName}} - {{/if}} - {{#if worker.description}} -

{{worker.description}}

- {{/if}} - {{#if worker.tagCount}} -
- -
- {{/if}} -
- - + <:body as |B|> + + + {{#if (and (can 'read worker' B.data) B.data.isPki)}} + - {{worker.id}} - - - {{worker.active_connection_count}} - {{worker.release_version}} - {{worker.address}} -
- {{/each}} -
-
+ {{B.data.displayName}} + + {{else}} + {{B.data.displayName}} + {{/if}} + {{#if B.data.description}} +

{{B.data.description}}

+ {{/if}} + + + {{#if B.data.tagCount}} + + {{/if}} + + {{B.data.active_connection_count}} + {{B.data.release_version}} + {{B.data.address}} + + + {{B.data.id}} + + + + + {{else}}