From e60d11eddd109d34935060a0a67fd86ade83fd62 Mon Sep 17 00:00:00 2001 From: NatashaKab <133793701+NatashaKab@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:39:57 -0400 Subject: [PATCH] Icu 10178 use hds table in groups list view (#1768) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 🤖 Retire rose form textarea ✅ Closes: ICU-9425 * refactor: 💡 Added the disabled feature requested by Dharini * refactor: 💡 Rose tables to HDS tables in Users * refactor: 💡 Removed implementation of rose tables in users * refactor: 💡 use hds table in groups list view * refactor: 💡 Removed the group list class Dharini mentioned * refactor: 💡 Resolved the conflicts in user list table and group --------- Co-authored-by: Dharini Jeeva --- .../templates/scopes/scope/groups/index.hbs | 68 +++++++++---------- .../templates/scopes/scope/users/index.hbs | 1 - 2 files changed, 32 insertions(+), 37 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs index 205b36c26..bda145550 100644 --- a/ui/admin/app/templates/scopes/scope/groups/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs @@ -31,42 +31,38 @@ {{#if @model}} - - - - {{t 'form.name.label'}} - {{t 'form.id.label'}} - - - - {{#each @model as |group|}} - - - {{#if (can 'read model' group)}} - - {{group.displayName}} - - {{else}} - {{group.displayName}} - {{/if}} -

{{group.description}}

-
- - - {{group.id}} - - -
- {{/each}} -
-
+ + <:body as |B|> + + + {{#if (can 'read group' B.data)}} + + {{B.data.displayName}} + + {{else}} + {{B.data.displayName}} + {{/if}} +

{{B.data.description}}

+
+ + + {{B.data.id}} + + +
+ +
{{else}} diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index 47ceeea25..ce7a5a5b8 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -34,7 +34,6 @@ {{#if @model}}