when table columns are implicit, do not set the display name [#153234…

…166] Signed-off-by: Reid Mitchell <rmitchell@pivotal.io>
pivotal-cf · Nov 30, 2017 · d2542d0 · d2542d0
1 parent a9280d6
commit d2542d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/spec/pivotal-ui-react/table/table_spec.js b/spec/pivotal-ui-react/table/table_spec.js
@@ -282,9 +282,9 @@ describe('Table', () => {
     });
 
     it('renders the data keys as column headers', () => {
-      expect('table thead tr th:eq(0)').toHaveText('Attr1');
-      expect('table thead tr th:eq(1)').toHaveText('Attr2');
-      expect('table thead tr th:eq(2)').toHaveText('Attr3');
+      expect('table thead tr th:eq(0)').toHaveText('attr1');
+      expect('table thead tr th:eq(1)').toHaveText('attr2');
+      expect('table thead tr th:eq(2)').toHaveText('attr3');
     });
   });
 });
diff --git a/src/react/table/table.js b/src/react/table/table.js
@@ -16,16 +16,11 @@ export class Table extends TablePlugin {
 
     let dataColumns;
 
-    if (!columns) {
-      const dataKeys = {};
-      data.forEach(row => Object.keys(row).forEach(attr => dataKeys[attr] = true));
-      dataColumns = Object.keys(dataKeys).map(dataKey => ({
-        attribute: dataKey,
-        displayName: dataKey[0].toUpperCase() + dataKey.slice(1)
-      }));
+    if (!columns && data.length > 0) {
+      dataColumns = Object.keys(data[0]).map(attribute => ({attribute}));
     }
 
-    const renderedColumns = columns || dataColumns;
+    const renderedColumns = columns || dataColumns || [];
 
     const headers = renderedColumns.map((column, key) => {
       const Th = this.plugTag('th', 'th');