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

Commit d742376

Browse files
ghiscodingghiscoding
authored
Merge pull request #1181 from ghiscoding/bugfix/draggable-grouping-sortable-errors
fix(grouping): DraggableGrouping could throw when leaving page, fixes #1180
2 parents 570a5ea + 80f9e99 commit d742376

File tree

6 files changed

+187
-190
lines changed

6 files changed

+187
-190
lines changed

‎package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
},
5151
"dependencies": {
5252
"@ngx-translate/core": ">=15.0.0 <16.0.0",
53-
"@slickgrid-universal/common": "3.0.0",
54-
"@slickgrid-universal/custom-footer-component": "3.0.0",
55-
"@slickgrid-universal/empty-warning-component": "3.0.0",
56-
"@slickgrid-universal/event-pub-sub": "3.0.0",
57-
"@slickgrid-universal/pagination-component": "3.0.0",
58-
"@slickgrid-universal/row-detail-view-plugin": "3.0.0",
59-
"@slickgrid-universal/rxjs-observable": "3.0.0",
53+
"@slickgrid-universal/common": "3.0.1",
54+
"@slickgrid-universal/custom-footer-component": "3.0.1",
55+
"@slickgrid-universal/empty-warning-component": "3.0.1",
56+
"@slickgrid-universal/event-pub-sub": "3.0.1",
57+
"@slickgrid-universal/pagination-component": "3.0.1",
58+
"@slickgrid-universal/row-detail-view-plugin": "3.0.1",
59+
"@slickgrid-universal/rxjs-observable": "3.0.1",
6060
"dequal": "^2.0.3",
6161
"dompurify": "^3.0.4",
6262
"rxjs": "^7.8.1",
@@ -82,22 +82,22 @@
8282
"@angular/router": "^16.1.3",
8383
"@faker-js/faker": "^8.0.2",
8484
"@fnando/sparkline": "^0.3.10",
85-
"@ng-select/ng-select": "^10.0.4",
85+
"@ng-select/ng-select": "^11.0.0",
8686
"@ngx-translate/core": "^15.0.0",
8787
"@ngx-translate/http-loader": "^8.0.0",
8888
"@release-it/conventional-changelog": "^5.1.1",
89-
"@slickgrid-universal/composite-editor-component": "3.0.0",
90-
"@slickgrid-universal/custom-tooltip-plugin": "3.0.0",
91-
"@slickgrid-universal/excel-export": "3.0.0",
92-
"@slickgrid-universal/graphql": "3.0.0",
93-
"@slickgrid-universal/odata": "3.0.0",
94-
"@slickgrid-universal/text-export": "3.0.0",
89+
"@slickgrid-universal/composite-editor-component": "3.0.1",
90+
"@slickgrid-universal/custom-tooltip-plugin": "3.0.1",
91+
"@slickgrid-universal/excel-export": "3.0.1",
92+
"@slickgrid-universal/graphql": "3.0.1",
93+
"@slickgrid-universal/odata": "3.0.1",
94+
"@slickgrid-universal/text-export": "3.0.1",
9595
"@types/dompurify": "^3.0.2",
9696
"@types/flatpickr": "^3.1.2",
9797
"@types/fnando__sparkline": "^0.3.4",
9898
"@types/jest": "^29.5.2",
9999
"@types/moment": "^2.13.0",
100-
"@types/node": "^20.3.2",
100+
"@types/node": "^20.3.3",
101101
"@types/sortablejs": "^1.15.1",
102102
"@types/text-encoding-utf-8": "^1.0.2",
103103
"@typescript-eslint/eslint-plugin": "^5.60.1",
@@ -107,11 +107,11 @@
107107
"copyfiles": "^2.4.1",
108108
"cross-env": "^7.0.3",
109109
"custom-event-polyfill": "^1.0.7",
110-
"eslint": "^8.43.0",
110+
"eslint": "^8.44.0",
111111
"fetch-jsonp": "^1.2.3",
112112
"font-awesome": "^4.7.0",
113113
"jest": "^29.5.0",
114-
"jest-extended": "^3.2.4",
114+
"jest-extended": "^4.0.0",
115115
"jest-preset-angular": "^13.1.1",
116116
"moment-mini": "^2.29.4",
117117
"ng-packagr": "^16.1.0",

‎test/cypress/e2e/example10.cy.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
4444
cy.get('#grid2')
4545
.find('.slick-row')
4646
.children()
47-
.filter('.slick-cell-checkboxsel.selected.true')
47+
.filter('.slick-cell-checkboxsel.selected')
4848
.should('have.length', 1);
4949
});
5050

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

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

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

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

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

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

@@ -491,7 +491,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
491491
cy.get('@grid2')
492492
.find('.slick-row')
493493
.children()
494-
.filter('.slick-cell-checkboxsel.selected.true')
494+
.filter('.slick-cell-checkboxsel.selected')
495495
.should('have.length', 1);
496496
});
497497
});
@@ -536,7 +536,7 @@ describe('Example 10 - Multiple Grids with Row Selection', { retries: 1 }, () =>
536536
cy.get('[data-test=grid1-selections]')
537537
.contains('Task 300');
538538

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

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

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

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

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

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

756756
cy.window().then((win) => {

‎test/cypress/e2e/example12.cy.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,13 @@ describe('Example 12: Localization (i18n)', { retries: 1 }, () => {
285285
cy.get('@grid12')
286286
.find('.slick-row')
287287
.children()
288-
.filter('.slick-cell-checkboxsel.selected.true')
288+
.filter('.slick-cell-checkboxsel.selected')
289289
.should('have.length', 1);
290290

291291
cy.get('@grid12')
292292
.find('.slick-row')
293293
.children()
294-
.filter('.slick-cell.selected.true:nth(1)')
294+
.filter('.slick-cell.selected:nth(1)')
295295
.contains('Task 4');
296296
});
297297

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

316316
cy.get('@grid12')
317317
.find('.slick-row')
318318
.children()
319-
.filter('.slick-cell.selected.true:nth(1)')
319+
.filter('.slick-cell.selected:nth(1)')
320320
.contains('Task 1497');
321321
});
322322

‎test/cypress/e2e/example30.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ describe('Example 30 Composite Editor Modal', { retries: 1 }, () => {
449449
it('should not have any row selected after the mass-selection save is over', () => {
450450
cy.get('.slick-row')
451451
.children()
452-
.filter('.slick-cell-checkboxsel.selected.true')
452+
.filter('.slick-cell-checkboxsel.selected')
453453
.should('have.length', 0);
454454
});
455455

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

‎tsconfig.app.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,7 @@
44
"allowSyntheticDefaultImports": true,
55
"outDir": "../out-tsc/app",
66
"baseUrl": "./",
7-
"types": [
8-
"moment"
9-
],
10-
"paths": {
11-
"jszip": [
12-
"../node_modules/jszip/dist/jszip.min.js"
13-
],
14-
"stream": [ "./node_modules/stream-browserify" ]
15-
}
7+
"types": ["moment"]
168
},
179
"files": [
1810
"src/main.ts",

0 commit comments

Comments
 (0)