Allow use of totalItems for in-memory paging

fixes #115
michaelbromley · Feb 23, 2017 · 43ca1fe · 43ca1fe
1 parent 44f42f2
commit 43ca1fe
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changelog
+
+## 2.0.1 (in progress)
+* Fix exception when config object uses accessors for itemsPerPage and currentPage ([#128])[https://github.com/michaelbromley/ng2-pagination/issues/128])
+* In-memory paging works even when `totalItems` is specified, fixes [#115](https://github.com/michaelbromley/ng2-pagination/issues/115)
+
 # 2.0.0 (2017-01-12)
 
 #### Breaking Changes

diff --git a/src/paginate.pipe.spec.ts b/src/paginate.pipe.spec.ts
@@ -49,7 +49,6 @@ describe('PaginatePipe:', () => {
         expect(instance.itemsPerPage).toBe(50);
     });
 
-
     it('should use default id if none specified', () => {
         let config = {
             itemsPerPage: 10,
@@ -61,6 +60,19 @@ describe('PaginatePipe:', () => {
         expect(paginationService.getInstance()).toBeDefined();
     });
 
+    it('should not break when totalItems is specified for in-memory paging', () => {
+        let config = {
+            itemsPerPage: 10,
+            currentPage: 1,
+            totalItems: 100
+        };
+
+        let result = pipe.transform(collection, [config]);
+        expect(result.length).toBe(10);
+        expect(result[0]).toBe('item 1');
+        expect(result[9]).toBe('item 10');
+    });
+
     describe('collection modification', () => {
         it('should detect simple push or splice without insert', () => {
             let config = {
@@ -126,51 +138,50 @@ describe('PaginatePipe:', () => {
         expect(result2.length).toBe(50);
         expect(result2[0]).toBe('item 51');
         expect(result2[49]).toBe('item 100');
+    });
 
 
-        describe('server-side pagination', () => {
-            let config: PaginationInstance;
-
-            beforeEach(() => {
-                config = {
-                    itemsPerPage: 10,
-                    currentPage: 1,
-                    totalItems: 500
-                };
-            });
+    describe('server-side pagination', () => {
+        let config: PaginationInstance;
 
-            it('should truncate collection', () => {
-                collection = collection.slice(0, 10);
-                let result = pipe.transform(collection, [config]);
-
-                expect(result.length).toBe(10);
-                expect(result[0]).toBe('item 1');
-                expect(result[9]).toBe('item 10');
-            });
+        beforeEach(() => {
+            config = {
+                itemsPerPage: 10,
+                currentPage: 1,
+                totalItems: 500
+            };
+        });
 
-            it('should display page 2', () => {
-                collection = collection.slice(10, 10);
-                config.currentPage = 2;
-                let result = pipe.transform(collection, [config]);
+        it('should truncate collection', () => {
+            collection = collection.slice(0, 10);
+            let result = pipe.transform(collection, [config]);
 
-                expect(result.length).toBe(10);
-                expect(result[0]).toBe('item 11');
-                expect(result[9]).toBe('item 20');
-            });
+            expect(result.length).toBe(10);
+            expect(result[0]).toBe('item 1');
+            expect(result[9]).toBe('item 10');
         });
 
-        it('should return identical array for the same input values', () => {
-            let config = {
-                id: 'first_one',
-                itemsPerPage: 10,
-                currentPage: 1
-            };
-            let result1 = pipe.transform(collection, [config]);
-            let result2 = pipe.transform(collection, [config]);
+        it('should display page 2', () => {
+            collection = collection.slice(10, 20);
+            config.currentPage = 2;
+            let result = pipe.transform(collection, [config]);
 
-            expect(result1 === result2).toBe(true);
+            expect(result.length).toBe(10);
+            expect(result[0]).toBe('item 11');
+            expect(result[9]).toBe('item 20');
         });
+    });
+
+    it('should return identical array for the same input values', () => {
+        let config = {
+            id: 'first_one',
+            itemsPerPage: 10,
+            currentPage: 1
+        };
+        let result1 = pipe.transform(collection, [config]);
+        let result2 = pipe.transform(collection, [config]);
 
+        expect(result1 === result2).toBe(true);
     });
 
     describe('unexpected input:', () => {

diff --git a/src/paginate.pipe.ts b/src/paginate.pipe.ts
@@ -43,7 +43,7 @@ export class PaginatePipe {
             }
         }
 
-        let serverSideMode = args.totalItems !== undefined;
+        let serverSideMode = args.totalItems && args.totalItems !== collection.length;
         let instance = this.createInstance(collection, args);
         let id = instance.id;
         let start, end;