From 964423c35c0ae7b1ee180d76893c425dde205910 Mon Sep 17 00:00:00 2001
From: NatashaKab <133793701+NatashaKab@users.noreply.github.com>
Date: Thu, 3 Aug 2023 11:20:49 -0400
Subject: [PATCH] Icu 10368 use hds table in desktop targets list (#1817)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 💡 Use HDS tables in user accounts

* refactor: 💡 Use HDS tables in desktop targets list

* refactor: 💡 Fixed indentantion problem suggested by cameron
---
 .../scopes/scope/projects/targets/index.hbs   | 117 +++++++++---------
 .../tests/acceptance/projects/targets-test.js |   2 +-
 ui/desktop/tests/acceptance/scopes-test.js    |   2 +-
 3 files changed, 62 insertions(+), 59 deletions(-)

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 6001e9289..243d15edd 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
@@ -97,75 +97,78 @@
     {{/if}}
 
     {{#if @model}}
-      <Rose::Table as |table|>
-        <table.header as |header|>
-          <header.row as |row|>
-            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-            <row.headerCell>{{t 'resources.project.title'}}</row.headerCell>
-            <row.headerCell />
-          </header.row>
-        </table.header>
-        <table.body as |body|>
-          {{#each @model as |model|}}
-            <body.row as |row|>
-              <row.headerCell>
-                {{#if (can 'read model' model)}}
+
+      <Hds::Table
+        @model={{@model}}
+        @columns={{array
+          (hash label=(t 'form.name.label'))
+          (hash label=(t 'form.id.label'))
+          (hash label=(t 'form.type.label'))
+          (hash label=(t 'resources.project.title'))
+          (hash label='')
+        }}
+        @valign='middle'
+      >
+        <:body as |B|>
+          <B.Tr>
+            <B.Td>
+              <span class='hds-font-weight-semibold'>
+                {{#if (can 'read model' B.data)}}
                   <LinkTo
                     @route='scopes.scope.projects.targets.target'
-                    @model={{model.id}}
+                    @model={{B.data.id}}
                   >
-                    {{model.displayName}}
+                    {{B.data.displayName}}
                   </LinkTo>
                 {{else}}
-                  {{model.displayName}}
+                  {{B.data.displayName}}
                 {{/if}}
-                {{#if model.description}}
-                  <p>{{model.description}}</p>
+                {{#if B.data.description}}
+                  <p>{{B.data.description}}</p>
                 {{/if}}
-              </row.headerCell>
-              <row.cell>
+              </span>
+            </B.Td>
+            <B.Td>
+              <Copyable
+                @text={{B.data.id}}
+                @buttonText={{t 'actions.copy-to-clipboard'}}
+                @acknowledgeText={{t 'states.copied'}}
+              >
+                <code>{{B.data.id}}</code>
+              </Copyable>
+            </B.Td>
+            <B.Td>
+              {{#if B.data.type}}
+                <Hds::Badge
+                  @text={{t (concat 'resources.target.types.' B.data.type)}}
+                />
+              {{/if}}
+            </B.Td>
+            <B.Td>
+              <div>
                 <Copyable
-                  @text={{model.id}}
+                  @text={{B.data.project.id}}
                   @buttonText={{t 'actions.copy-to-clipboard'}}
                   @acknowledgeText={{t 'states.copied'}}
                 >
-                  <code>{{model.id}}</code>
+                  <code>{{B.data.project.id}}</code>
                 </Copyable>
-              </row.cell>
-              <row.cell>
-                {{#if model.type}}
-                  <Hds::Badge
-                    @text={{t (concat 'resources.target.types.' model.type)}}
-                  />
-                {{/if}}
-              </row.cell>
-              <row.cell>
-                <div>
-                  <Copyable
-                    @text={{model.project.id}}
-                    @buttonText={{t 'actions.copy-to-clipboard'}}
-                    @acknowledgeText={{t 'states.copied'}}
-                  >
-                    <code>{{model.project.id}}</code>
-                  </Copyable>
-                </div>
-                <Hds::Badge @color='neutral' @text={{model.project.name}} />
-              </row.cell>
-              <row.cell>
-                {{#if (can 'connect target' model)}}
-                  <Hds::Button
-                    @text={{t 'resources.session.actions.connect'}}
-                    @color='secondary'
-                    {{on 'click' (route-action 'connect' model)}}
-                  />
-                {{/if}}
-              </row.cell>
-            </body.row>
-          {{/each}}
-        </table.body>
-      </Rose::Table>
+              </div>
+              <Hds::Badge @color='neutral' @text={{B.data.project.name}} />
+            </B.Td>
+            <B.Td>
+              {{#if (can 'connect target' B.data)}}
+                <Hds::Button
+                  @text={{t 'resources.session.actions.connect'}}
+                  @color='secondary'
+                  {{on 'click' (route-action 'connect' B.data)}}
+                />
+              {{/if}}
+            </B.Td>
+          </B.Tr>
+        </:body>
+      </Hds::Table>
+
     {{else}}
 
       <Rose::Layout::Centered>
diff --git a/ui/desktop/tests/acceptance/projects/targets-test.js b/ui/desktop/tests/acceptance/projects/targets-test.js
index 5c48b697a..51cb15134 100644
--- a/ui/desktop/tests/acceptance/projects/targets-test.js
+++ b/ui/desktop/tests/acceptance/projects/targets-test.js
@@ -179,7 +179,7 @@ module('Acceptance | projects | targets', function (hooks) {
   test('visiting a target', async function (assert) {
     assert.expect(1);
     await visit(urls.targets);
-    await click('tbody tr th a');
+    await click('tbody tr td span a');
     assert.strictEqual(currentURL(), urls.sessions);
   });
 
diff --git a/ui/desktop/tests/acceptance/scopes-test.js b/ui/desktop/tests/acceptance/scopes-test.js
index 1a8c2970f..7a1e45cf9 100644
--- a/ui/desktop/tests/acceptance/scopes-test.js
+++ b/ui/desktop/tests/acceptance/scopes-test.js
@@ -232,7 +232,7 @@ module('Acceptance | scopes', function (hooks) {
   test('visiting a target', async function (assert) {
     assert.expect(1);
     await visit(urls.targets);
-    await click('tbody tr th a');
+    await click('tbody tr td span a');
     assert.strictEqual(currentURL(), urls.targetSessions);
   });