Fix #522 - pfTableView: values added to wrong columns

Author: abkieling

src/table/tableview/examples/table-view-basic.js

@@ -298,24 +298,28 @@
               state: "New York"
               },
               {
+              status: "ok",
               name: "Mike Bird",
               address: "50 Forth Street",
               city: "New York",
               state: "New York"
               },
               {
+              status: "ok",
               name: "Cheryl Taylor",
               address: "2 Main Street",
               city: "New York",
               state: "New York"
               },
               {
+              status: "ok",
               name: "Ren DiLorenzo",
               address: "10 Chase Lane",
               city: "Boston",
               state: "Massacusetts"
               },
               {
+              status: "ok",
               name: "Kim Livingston",
               address: "5 Tree Hill Lane",
               city: "Boston",

src/table/tableview/table-view.component.js

@@ -334,17 +334,6 @@ angular.module('patternfly.table').component('pfTableView', {
       }
     };
 
-    ctrl.isColItemFld = function (key) {
-      var retVal = false;
-      var tableCol = $filter('filter')(ctrl.columns, {itemField: key});
-
-      if (tableCol && tableCol.length === 1) {
-        retVal = true;
-      }
-
-      return retVal;
-    };
-
     ctrl.hasHTMLTemplate = function (key) {
       var htmlTemplate = this.getHTMLTemplate(key);
       return htmlTemplate.length > 0;

src/table/tableview/table-view.html

@@ -17,7 +17,7 @@
         <input type="checkbox" value="item.selected" ng-model="item.selected" ng-change="$ctrl.toggleOne(item)"/>
       </td>
 
-      <td ng-repeat="(key, value) in item" ng-if="$ctrl.isColItemFld(key)">
+      <td ng-repeat="col in $ctrl.columns" ng-init="key = col.itemField; value = item[key]">
         <span ng-if="!$ctrl.hasHTMLTemplate(key)">{{value}}</span>
         <span ng-if="$ctrl.hasHTMLTemplate(key)" ng-include="$ctrl.getHTMLTemplate(key)"></span>
       </td>

test/table/tableview/table-view.spec.js

@@ -40,11 +40,11 @@ describe('Component: pfTableView', function () {
     ];
 
     $scope.items = [
-      {uuid: '1', name: 'One', size: 291445030, capacity: 8200000000},
-      {uuid: '2', name: 'Two', size: 1986231544, capacity: 8700000000},
-      {uuid: '3', name: 'Three', size: 7864632, capacity: 7800000000},
-      {uuid: '4', name: 'Four', size: 8162410, capacity: 3200000000},
-      {uuid: '5', name: 'Five', size: 6781425410, capacity: 7600000000}
+      {name: 'One', capacity: 8200000000, uuid: '1', size: 291445030},
+      {name: 'Two', capacity: 8700000000, uuid: '2', size: 1986231544},
+      {name: 'Three', capacity: 7800000000, uuid: '3', size: 7864632},
+      {name: 'Four', capacity: 3200000000, uuid: '4', size: 8162410},
+      {name: 'Five', capacity: 7600000000, uuid: '5', size: 6781425410}
     ];
 
     var htmlTmp = '<pf-table-view config="config" columns="columns" items="items"></pf-table-view>' +
@@ -78,6 +78,19 @@ describe('Component: pfTableView', function () {
     expect(rows.length).toBe($scope.items.length);
   });
 
+  it('should populate cells with correct data', function () {
+    var i, j, item, selector, expectedValue;
+    for (i = 0; i < $scope.items.length; i++) {
+      item = $scope.items[i];
+      for (j = 0; j < $scope.columns.length; j++) {
+        selector = '.table > tbody > tr:eq(' + i + ') > td:eq(' + (j + 1) + ')';
+        cellValue = element.find(selector).text().trim();
+        expectedValue = item[$scope.columns[j].itemField].toString();
+        expect(cellValue).toBe(expectedValue);
+      }
+    }
+  });
+
   it('should show checkboxes for row selection', function () {
     var headerCheckbox = element.find('.table > thead > tr > th > input[type="checkbox"]');
     var bodyCheckboxes = element.find('.table > tbody > tr > td > input[type="checkbox"]');