Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit ed447c1

Browse files
authored
Merge pull request #274 from ghiscoding/bugfix/backend-disable-pagination
fix(backend): query should not include pagination option when disabled, fixes #272
2 parents 8257e69 + 4ed5a29 commit ed447c1

File tree

6 files changed

+367
-27
lines changed

6 files changed

+367
-27
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
44
[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](http://www.typescriptlang.org/)
55
[![npm version](https://badge.fury.io/js/angular-slickgrid.svg)](//npmjs.com/package/angular-slickgrid)
6-
[![NPM downloads](https://img.shields.io/npm/dt/angular-slickgrid.svg)](https://npmjs.org/package/angular-slickgrid)
6+
[![NPM downloads](https://img.shields.io/npm/dy/angular-slickgrid.svg)](https://npmjs.org/package/angular-slickgrid)
77
[![gzip size](http://img.badgesize.io/https://npmcdn.com/angular-slickgrid/bundles/angular-slickgrid.umd.js?compression=gzip)](https://npmcdn.com/angular-slickgrid/bundles/angular-slickgrid.umd.js)
88
[![CircleCI](https://circleci.com/gh/ghiscoding/Angular-Slickgrid/tree/master.svg?style=shield)](https://circleci.com/gh/ghiscoding/workflows/Angular-Slickgrid/tree/master)
99
[![codecov](https://codecov.io/gh/ghiscoding/Angular-Slickgrid/branch/master/graph/badge.svg)](https://codecov.io/gh/ghiscoding/Angular-Slickgrid)
10+
[![jest](https://jestjs.io/img/jest-badge.svg)](https://github.com/facebook/jest)
1011

1112
### Brief introduction
1213
One of the best javascript datagrid [SlickGrid](https://github.com/mleibman/SlickGrid) which was originally developed by @mleibman is now available to Angular. I have used a few datagrids and SlickGrid beats most of them in terms of functionalities and performance (it can easily deal with even a million row). We will be using the [6pac/SlickGrid](https://github.com/6pac/SlickGrid/) fork, this is the most active fork since the original @mleibman fork was closed some time ago by his author for personal reasons. Also worth to know, I also contributed a lot to the 6pac/SlickGrid fork for the benefit of Angular-Slickgrid.

src/app/modules/angular-slickgrid/filters/__tests__/selectFilter.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,12 +402,12 @@ describe('SelectFilter', () => {
402402
expect(filterListElm[1].textContent).toBe('male');
403403
});
404404

405-
it('should create the multi-select filter with a value/label pair collection that is inside an object when "collectionInObjectProperty" is defined with a dot notation', () => {
405+
it('should create the multi-select filter with a value/label pair collection that is inside an object when "collectionInsideObjectProperty" is defined with a dot notation', () => {
406406
mockColumn.filter = {
407407
// @ts-ignore
408408
collection: { deep: { myCollection: [{ value: 'other', description: 'other' }, { value: 'male', description: 'male' }, { value: 'female', description: 'female' }] } },
409409
collectionOptions: {
410-
collectionInObjectProperty: 'deep.myCollection'
410+
collectionInsideObjectProperty: 'deep.myCollection'
411411
},
412412
customStructure: {
413413
value: 'value',
@@ -426,11 +426,11 @@ describe('SelectFilter', () => {
426426
expect(filterListElm[2].textContent).toBe('female');
427427
});
428428

429-
it('should create the multi-select filter with a value/label pair collectionAsync that is inside an object when "collectionInObjectProperty" is defined with a dot notation', (done) => {
429+
it('should create the multi-select filter with a value/label pair collectionAsync that is inside an object when "collectionInsideObjectProperty" is defined with a dot notation', (done) => {
430430
mockColumn.filter = {
431431
collectionAsync: of({ deep: { myCollection: [{ value: 'other', description: 'other' }, { value: 'male', description: 'male' }, { value: 'female', description: 'female' }] } }),
432432
collectionOptions: {
433-
collectionInObjectProperty: 'deep.myCollection'
433+
collectionInsideObjectProperty: 'deep.myCollection'
434434
},
435435
customStructure: {
436436
value: 'value',

0 commit comments

Comments
 (0)