Addressed Review Issues

Author: dtaylor113

src/pagination/pagination.component.js

@@ -141,14 +141,14 @@ angular.module('patternfly.pagination').component('pfPagination', {
     };
 
     ctrl.getStartIndex = function () {
-      return ctrl.pageSize * (ctrl.pageNumber - 1) + 1;
+      return ctrl.numTotalItems ? ctrl.pageSize * (ctrl.pageNumber - 1) + 1 : 0;
     };
 
     ctrl.getEndIndex = function () {
       var numFullPages = Math.floor(ctrl.numTotalItems / ctrl.pageSize);
       var numItemsOnLastPage = ctrl.numTotalItems - (numFullPages * ctrl.pageSize) || ctrl.pageSize;
       var numItemsOnPage = isLastPage() ? numItemsOnLastPage : ctrl.pageSize;
-      return ctrl.getStartIndex() + numItemsOnPage - 1;
+      return ctrl.numTotalItems ? ctrl.getStartIndex() + numItemsOnPage - 1 : 0;
     };
 
     function updatePageNumber (newPageNumber) {

src/table/table.less

@@ -29,7 +29,7 @@ table.dataTable {
   tbody {
     tr.selected {
       span a {
-        color: white;
+        color: @color-pf-white;
       }
     }
     th {

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

@@ -177,7 +177,9 @@ angular.module('patternfly.table').component('pfTableView', {
     ctrl.updatePageNumber = function (event) {
       if (ctrl.dtInstance) {
         ctrl.pageConfig.pageNumber = event.pageNumber;
-        ctrl.dtInstance.dataTable.fnPageChange(ctrl.pageConfig.pageNumber - 1);
+        if (ctrl.dtInstance && ctrl.dtInstance.dataTable) {
+          ctrl.dtInstance.dataTable.fnPageChange(ctrl.pageConfig.pageNumber - 1);
+        }
       }
     };
 

test/pagination/pagination.spec.js

@@ -130,15 +130,47 @@ describe('Component: pfPagination', function () {
     var htmlTmp = '<pf-pagination page-size="pageSize" page-number="pageNumber" num-total-items="numTotalItems"></pf-pagination>';
     compileHTML(htmlTmp, $scope);
 
+    var ctrl = element.isolateScope().$ctrl;
+    spyOn(ctrl, 'updatePageNumber');
+
     // On first page, goto prev and first page buttons should be disabled
     expect(element.find('.disabled').length).toBe(2);
 
     angular.element(element.find('.pagination-pf-page ')).val('7').trigger('input').blur();
     $scope.$digest();
 
+    expect(ctrl.updatePageNumber).toHaveBeenCalled();
     expect(angular.element(element.find('.pagination-pf-items-current')).text().trim()).toBe('61-70');
     expect(angular.element(element.find('.pagination-pf-items-total')).text().trim()).toBe('126');
     expect(angular.element(element.find('.pagination-pf-page')).val().trim()).toBe('7');
     expect(angular.element(element.find('.pagination-pf-pages')).text().trim()).toBe('13');
   });
+
+  it('should change the page size when selected from dropdown', function() {
+    $scope.pageSize = 10;
+    $scope.pageNumber = 1;
+    $scope.numTotalItems = 126;
+    var htmlTmp = '<pf-pagination page-size="pageSize" page-number="pageNumber" num-total-items="numTotalItems"></pf-pagination>';
+    compileHTML(htmlTmp, $scope);
+
+    var ctrl = element.isolateScope().$ctrl;
+    spyOn(ctrl, 'updatePageSize');
+
+    //Get pageSizeDropdown
+    var pageSizeDropdown = element.find('div[uib-dropdown]');
+    expect(pageSizeDropdown.length).toBe(1);
+
+    //Change pageSizeDropdown to 10
+    pageSizeDropdown.find('button').click();
+    var pageSizeLinks = pageSizeDropdown.find('a');
+    expect(pageSizeLinks.length).toBe(6);
+    pageSizeLinks[2].click();  // switch to 20 items per page
+    $scope.$digest();
+
+    expect(ctrl.updatePageSize).toHaveBeenCalled();
+    expect(angular.element(element.find('.pagination-pf-items-current')).text().trim()).toBe('1-20');
+    expect(angular.element(element.find('.pagination-pf-items-total')).text().trim()).toBe('126');
+    expect(angular.element(element.find('.pagination-pf-page')).val().trim()).toBe('1');
+    expect(angular.element(element.find('.pagination-pf-pages')).text().trim()).toBe('7');
+  });
 });

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

@@ -162,4 +162,38 @@ describe('Component: pfTableView', function () {
     expect(angular.element(element.find('.pagination-pf-page')).val().trim()).toBe('2');
     expect(angular.element(element.find('.pagination-pf-pages')).text().trim()).toBe('4');
   });
+
+  it('should goto a specific page when inputted', function () {
+    paginationSetup();
+
+    var ctrl = element.isolateScope().$ctrl;
+    spyOn(ctrl, 'updatePageNumber');
+
+    angular.element(element.find('.pagination-pf-page ')).val('3').trigger('input').blur();
+    $scope.$digest();
+
+    expect(ctrl.updatePageNumber).toHaveBeenCalled();
+    expect(angular.element(element.find('.pagination-pf-items-current')).text().trim()).toBe('5-6');
+    expect(angular.element(element.find('.pagination-pf-items-total')).text().trim()).toBe('7');
+    expect(angular.element(element.find('.pagination-pf-page')).val().trim()).toBe('3');
+    expect(angular.element(element.find('.pagination-pf-pages')).text().trim()).toBe('4');
+  });
+
+  it('should change the page size when selected from dropdown', function() {
+    var ctrl = element.isolateScope().$ctrl;
+    spyOn(ctrl, 'updatePageSize');
+
+    //Get pageSizeDropdown
+    var pageSizeDropdown = element.find('div[uib-dropdown]');
+    expect(pageSizeDropdown.length).toBe(1);
+
+    //Change pageSizeDropdown to 10
+    pageSizeDropdown.find('button').click();
+    var pageSizeLinks = pageSizeDropdown.find('a');
+    expect(pageSizeLinks.length).toBe(3);
+    pageSizeLinks[1].click();  // switch to 10 items per page
+    $scope.$digest();
+
+    expect(ctrl.updatePageSize).toHaveBeenCalled();
+  });
 });