fix(Paginator): simple mode no longer shows total count

ISSUES CLOSED: #2031
GetTerminus · Feb 18, 2020 · e8421d5 · e8421d5
1 parent 8fd1294
commit e8421d5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/terminus-ui/paginator/src/paginator.component.spec.ts b/terminus-ui/paginator/src/paginator.component.spec.ts
@@ -50,7 +50,6 @@ describe(`TsPaginatorComponent`, function() {
 
       const titleEl = fixture.debugElement.query(By.css('.qa-paginator-current-page-menu .c-button__content')).nativeElement as HTMLElement;
       expect(titleEl.textContent).toContain('1 - 20 of 100');
-
     });
 
     test(`should be hidden when set`, () => {
@@ -342,6 +341,24 @@ describe(`TsPaginatorComponent`, function() {
 
   });
 
+  describe(`simple mode`, () => {
+    let fixture: ComponentFixture<TestComponents.SimpleMode>;
+    let hostComponent: TestComponents.SimpleMode;
+
+    beforeEach(() => {
+      fixture = createComponent(TestComponents.SimpleMode);
+      hostComponent = fixture.componentInstance;
+      fixture.detectChanges();
+    });
+
+    test(`should output the correct, shortened, current page message`, fakeAsync(() => {
+      tick(1000);
+      fixture.detectChanges();
+      const titleEl = fixture.debugElement.query(By.css('.c-paginator__current-page')).nativeElement as HTMLElement;
+      expect(titleEl.textContent).toContain('1 - 10');
+    }));
+  });
+
 });
 
 

diff --git a/terminus-ui/paginator/src/paginator.component.ts b/terminus-ui/paginator/src/paginator.component.ts
@@ -364,6 +364,7 @@ export class TsPaginatorComponent implements OnChanges, AfterViewInit {
     const destinationIsValid: boolean = destinationPage >= this.firstPageIndex && destinationPage <= pages.length;
     const notAlreadyOnPage: boolean = destinationPage !== currentPage;
 
+    // istanbul ignore else
     if (destinationIsValid && notAlreadyOnPage) {
       const foundPage: TsPaginatorMenuItem | undefined = pages.find((page: TsPaginatorMenuItem): boolean => page.value === destinationPage);
 
@@ -492,6 +493,9 @@ export class TsPaginatorComponent implements OnChanges, AfterViewInit {
     }
 
     // '1 - 10 of 243'
+    if (this.isSimpleMode) {
+      return `${foundPage.name}`;
+    }
     return `${foundPage.name} of ${totalRecords}`;
   }
 

diff --git a/terminus-ui/paginator/testing/src/test-components.ts b/terminus-ui/paginator/testing/src/test-components.ts
@@ -78,7 +78,7 @@ export class ZeroBased {
   `,
 })
 export class SimpleMode {
-  public isSimple = false;
+  public isSimple = true;
   public totalRecords = 100;
 }