From 9bc5dee4c7e90ef7a6cef36bd9f8cdaa236cec11 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Tue, 9 Jun 2020 14:17:56 -0400
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Remove=20text=20attr?=
 =?UTF-8?q?ibute=20in=20table=20cell=20rose=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of providing table cell content using `<row.cell
@text="something" />`, update allows for content to be defined within
tags `<row.cell>something</row.cell>`
---
 .../addon/components/rose/table.stories.mdx   | 36 +++++++++----------
 .../templates/components/rose/table/cell.hbs  |  2 --
 .../rose/tests/dummy/app/templates/index.hbs  | 18 +++++-----
 .../components/rose/table/cell-test.js        |  7 ++++
 4 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/addons/rose/addon/components/rose/table.stories.mdx b/addons/rose/addon/components/rose/table.stories.mdx
index 353980423..0af8d7d0b 100644
--- a/addons/rose/addon/components/rose/table.stories.mdx
+++ b/addons/rose/addon/components/rose/table.stories.mdx
@@ -13,23 +13,23 @@ A table component to display data in structure of rows and columns. It supports
 <Rose::Table as |table|>
   <table.header as |header|>
     <header.row as |row|>
-      <row.cell @text="Address" />
-      <row.cell @text="Host Set" />
-      <row.cell @text="Name" />
-      <row.cell @text="Description" />
+      <row.cell>Address</row.cell>
+      <row.cell>Host Set</row.cell>
+      <row.cell>Name</row.cell>
+      <row.cell>Description</row.cell>
     </header.row>
   </table.header>
   <table.body as |body|>
     <body.row as |row|>
-      <row.cell @text="1.1.1.1" />
-      <row.cell @text="host-set-1, host-set-2" />
-      <row.cell @text="optional name" />
-      <row.cell @text="description" />
+      <row.cell>1.1.1.1</row.cell>
+      <row.cell>host-set-1, host-set-2</row.cell>
+      <row.cell>optional name</row.cell>
+      <row.cell>description</row.cell>
     </body.row>
   </table.body>
   <table.footer as |footer|>
     <footer.row as |row|>
-      <row.cell @text="Footer" />
+      <row.cell>Footer</row.cell>
     </footer.row>
   </table.footer>
 </Rose::Table>
@@ -41,23 +41,23 @@ A table component to display data in structure of rows and columns. It supports
     <Rose::Table as |table|>
       <table.header as |header|>
         <header.row as |row|>
-          <row.cell @text="Address" />
-          <row.cell @text="Host Set" />
-          <row.cell @text="Name" />
-          <row.cell @text="Description" />
+          <row.cell>Address</row.cell>
+          <row.cell>Host Set</row.cell>
+          <row.cell>Name</row.cell>
+          <row.cell>Description</row.cell>
         </header.row>
       </table.header>
       <table.body as |body|>
         <body.row as |row|>
-          <row.cell @text="1.1.1.1" />
-          <row.cell @text="host-set-1, host-set-2" />
-          <row.cell @text="optional name" />
-          <row.cell @text="description" />
+          <row.cell>1.1.1.1</row.cell>
+          <row.cell>host-set-1, host-set-2</row.cell>
+          <row.cell>optional name</row.cell>
+          <row.cell>description</row.cell>
         </body.row>
       </table.body>
       <table.footer as |footer|>
         <footer.row as |row|>
-          <row.cell @text="Footer" />
+          <row.cell>Footer</row.cell>
         </footer.row>
       </table.footer>
     </Rose::Table>
diff --git a/addons/rose/addon/templates/components/rose/table/cell.hbs b/addons/rose/addon/templates/components/rose/table/cell.hbs
index 211909d86..5cfc41c8d 100644
--- a/addons/rose/addon/templates/components/rose/table/cell.hbs
+++ b/addons/rose/addon/templates/components/rose/table/cell.hbs
@@ -1,11 +1,9 @@
 {{#if @header}}
   <th ...attributes class="rose-table-cell rose-table-header-cell">
-    {{@text}}
     {{yield}}
   </th>
 {{else}}
   <td ...attributes class="{{concat "rose-table-cell" (if @footer " rose-table-footer-cell" " rose-table-body-cell")}}">
-    {{@text}}
     {{yield}}
   </td>
 {{/if}}
diff --git a/addons/rose/tests/dummy/app/templates/index.hbs b/addons/rose/tests/dummy/app/templates/index.hbs
index cd1600429..3554ea5f2 100644
--- a/addons/rose/tests/dummy/app/templates/index.hbs
+++ b/addons/rose/tests/dummy/app/templates/index.hbs
@@ -1,23 +1,23 @@
 <Rose::Table as |table|>
   <table.header as |header|>
     <header.row as |row|>
-      <row.cell @text="Address" />
-      <row.cell @text="Host Set" />
-      <row.cell @text="Name" />
-      <row.cell @text="Description" />
+      <row.cell>Address</row.cell>
+      <row.cell>Host Set</row.cell>
+      <row.cell>Name</row.cell>
+      <row.cell>Description</row.cell>
     </header.row>
   </table.header>
   <table.body as |body|>
     <body.row as |row|>
-      <row.cell @text="1.1.1.1" />
-      <row.cell @text="host-set-1, host-set-2" />
-      <row.cell @text="optional name" />
-      <row.cell @text="description" />
+      <row.cell>1.1.1.1</row.cell>
+      <row.cell>host-set-1, host-set-2</row.cell>
+      <row.cell>optional name</row.cell>
+      <row.cell>description</row.cell>
     </body.row>
   </table.body>
   <table.footer as |footer|>
     <footer.row as |row|>
-      <row.cell @text="Footer" />
+      <row.cell>Footer</row.cell>
     </footer.row>
   </table.footer>
 </Rose::Table>
diff --git a/addons/rose/tests/integration/components/rose/table/cell-test.js b/addons/rose/tests/integration/components/rose/table/cell-test.js
index 10a88e890..aeec60376 100644
--- a/addons/rose/tests/integration/components/rose/table/cell-test.js
+++ b/addons/rose/tests/integration/components/rose/table/cell-test.js
@@ -18,6 +18,13 @@ module('Integration | Component | rose/table/cell', function (hooks) {
     assert.ok(find('#cell'));
   });
 
+  test('it renders with content', async function (assert) {
+    await render(hbs`<Rose::Table::Cell>
+      Cell content
+    </Rose::Table::Cell>`);
+    assert.equal(find('.rose-table-cell').textContent.trim(), 'Cell content');
+  });
+
   test('it renders as header cell', async function (assert) {
     await render(hbs`<Rose::Table::Cell @header={{true}}/>`);
     assert.ok(find('.rose-table-cell'));