Skip to content

Commit

Permalink
Merge pull request #1181 from ghiscoding/bugfix/draggable-grouping-so…
Browse files Browse the repository at this point in the history 
…rtable-errors

fix(grouping): DraggableGrouping could throw when leaving page, fixes #1180
  • Loading branch information
@ghiscoding
ghiscoding authored Jul 1, 2023
2 parents 570a5ea + 80f9e99 commit d742376
Show file tree
Hide file tree
Showing 6 changed files with 187 additions and 190 deletions.
34 changes: 17 additions & 17 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@
},
"dependencies": {
"@ngx-translate/core": ">=15.0.0 <16.0.0",
"@slickgrid-universal/common": "3.0.0",
"@slickgrid-universal/custom-footer-component": "3.0.0",
"@slickgrid-universal/empty-warning-component": "3.0.0",
"@slickgrid-universal/event-pub-sub": "3.0.0",
"@slickgrid-universal/pagination-component": "3.0.0",
"@slickgrid-universal/row-detail-view-plugin": "3.0.0",
"@slickgrid-universal/rxjs-observable": "3.0.0",
"@slickgrid-universal/common": "3.0.1",
"@slickgrid-universal/custom-footer-component": "3.0.1",
"@slickgrid-universal/empty-warning-component": "3.0.1",
"@slickgrid-universal/event-pub-sub": "3.0.1",
"@slickgrid-universal/pagination-component": "3.0.1",
"@slickgrid-universal/row-detail-view-plugin": "3.0.1",
"@slickgrid-universal/rxjs-observable": "3.0.1",
"dequal": "^2.0.3",
"dompurify": "^3.0.4",
"rxjs": "^7.8.1",
Expand All @@ -82,22 +82,22 @@
"@angular/router": "^16.1.3",
"@faker-js/faker": "^8.0.2",
"@fnando/sparkline": "^0.3.10",
"@ng-select/ng-select": "^10.0.4",
"@ng-select/ng-select": "^11.0.0",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@release-it/conventional-changelog": "^5.1.1",
"@slickgrid-universal/composite-editor-component": "3.0.0",
"@slickgrid-universal/custom-tooltip-plugin": "3.0.0",
"@slickgrid-universal/excel-export": "3.0.0",
"@slickgrid-universal/graphql": "3.0.0",
"@slickgrid-universal/odata": "3.0.0",
"@slickgrid-universal/text-export": "3.0.0",
"@slickgrid-universal/composite-editor-component": "3.0.1",
"@slickgrid-universal/custom-tooltip-plugin": "3.0.1",
"@slickgrid-universal/excel-export": "3.0.1",
"@slickgrid-universal/graphql": "3.0.1",
"@slickgrid-universal/odata": "3.0.1",
"@slickgrid-universal/text-export": "3.0.1",
"@types/dompurify": "^3.0.2",
"@types/flatpickr": "^3.1.2",
"@types/fnando__sparkline": "^0.3.4",
"@types/jest": "^29.5.2",
"@types/moment": "^2.13.0",
"@types/node": "^20.3.2",
"@types/node": "^20.3.3",
"@types/sortablejs": "^1.15.1",
"@types/text-encoding-utf-8": "^1.0.2",
"@typescript-eslint/eslint-plugin": "^5.60.1",
Expand All @@ -107,11 +107,11 @@
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"custom-event-polyfill": "^1.0.7",
"eslint": "^8.43.0",
"eslint": "^8.44.0",
"fetch-jsonp": "^1.2.3",
"font-awesome": "^4.7.0",
"jest": "^29.5.0",
"jest-extended": "^3.2.4",
"jest-extended": "^4.0.0",
"jest-preset-angular": "^13.1.1",
"moment-mini": "^2.29.4",
"ng-packagr": "^16.1.0",
Expand Down
28 changes: 14 additions & 14 deletions test/cypress/e2e/example10.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('#grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 1);
});

Expand All @@ -62,7 +62,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('#grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);
});

Expand Down Expand Up @@ -385,7 +385,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('#grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 1);
});

Expand All @@ -406,7 +406,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);
});

Expand All @@ -423,7 +423,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 1);
});

Expand All @@ -445,7 +445,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);

cy.window().then((win) => {
Expand Down Expand Up @@ -474,7 +474,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);
});

Expand All @@ -491,7 +491,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 1);
});
});
Expand Down Expand Up @@ -536,7 +536,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('[data-test=grid1-selections]')
.contains('Task 300');

cy.get('.slick-cell.l0.r0.slick-cell-checkboxsel.selected.true')
cy.get('.slick-cell.l0.r0.slick-cell-checkboxsel.selected')
.should('exist');

cy.get('[data-test=grid1-selections]')
Expand Down Expand Up @@ -591,7 +591,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);

cy.window().then((win) => {
Expand Down Expand Up @@ -631,7 +631,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);
});

Expand All @@ -648,7 +648,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);
});

Expand All @@ -673,7 +673,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);

cy.window().then((win) => {
Expand Down Expand Up @@ -750,7 +750,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
cy.get('@grid2')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 2);

cy.window().then((win) => {
Expand Down
8 changes: 4 additions & 4 deletions test/cypress/e2e/example12.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,13 @@ describe('Example 12: Localization (i18n)', { retries: 1 }, () => {
cy.get('@grid12')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 1);

cy.get('@grid12')
.find('.slick-row')
.children()
.filter('.slick-cell.selected.true:nth(1)')
.filter('.slick-cell.selected:nth(1)')
.contains('Task 4');
});

Expand All @@ -310,13 +310,13 @@ describe('Example 12: Localization (i18n)', { retries: 1 }, () => {
cy.get('@grid12')
.find('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 1);

cy.get('@grid12')
.find('.slick-row')
.children()
.filter('.slick-cell.selected.true:nth(1)')
.filter('.slick-cell.selected:nth(1)')
.contains('Task 1497');
});

Expand Down
4 changes: 2 additions & 2 deletions test/cypress/e2e/example30.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ describe('Example 30 Composite Editor Modal', { retries: 1 }, () => {
it('should not have any row selected after the mass-selection save is over', () => {
cy.get('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 0);
});

Expand Down Expand Up @@ -506,7 +506,7 @@ describe('Example 30 Composite Editor Modal', { retries: 1 }, () => {
it('should not have any row selected after the mass-update save is over', () => {
cy.get('.slick-row')
.children()
.filter('.slick-cell-checkboxsel.selected.true')
.filter('.slick-cell-checkboxsel.selected')
.should('have.length', 0);
});

Expand Down
10 changes: 1 addition & 9 deletions tsconfig.app.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@
"allowSyntheticDefaultImports": true,
"outDir": "../out-tsc/app",
"baseUrl": "./",
"types": [
"moment"
],
"paths": {
"jszip": [
"../node_modules/jszip/dist/jszip.min.js"
],
"stream": [ "./node_modules/stream-browserify" ]
}
"types": ["moment"]
},
"files": [
"src/main.ts",
Expand Down
Loading

0 comments on commit d742376

Please sign in to comment.