From ba55081de3e094c1ee7377df0a7d40bb98b6a463 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Sat, 30 Nov 2024 15:13:33 -0500 Subject: [PATCH 1/3] fix: update Slickgrid-Universal to fix a few UI issues --- package.json | 26 +-- src/app/examples/rowdetail-view.component.ts | 23 +-- .../models/gridOption.interface.ts | 5 +- test/cypress/e2e/example10.cy.ts | 24 ++- yarn.lock | 170 +++++++++--------- 5 files changed, 136 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index bd019e814..3c96d5219 100644 --- a/package.json +++ b/package.json @@ -51,13 +51,13 @@ }, "dependencies": { "@ngx-translate/core": "^15.0.0", - "@slickgrid-universal/common": "~5.10.1", - "@slickgrid-universal/custom-footer-component": "~5.10.1", - "@slickgrid-universal/empty-warning-component": "~5.10.1", - "@slickgrid-universal/event-pub-sub": "~5.9.0", - "@slickgrid-universal/pagination-component": "~5.10.1", - "@slickgrid-universal/row-detail-view-plugin": "~5.10.1", - "@slickgrid-universal/rxjs-observable": "~5.10.1", + "@slickgrid-universal/common": "~5.10.2", + "@slickgrid-universal/custom-footer-component": "~5.10.2", + "@slickgrid-universal/empty-warning-component": "~5.10.2", + "@slickgrid-universal/event-pub-sub": "~5.10.2", + "@slickgrid-universal/pagination-component": "~5.10.2", + "@slickgrid-universal/row-detail-view-plugin": "~5.10.2", + "@slickgrid-universal/rxjs-observable": "~5.10.2", "dequal": "^2.0.3", "rxjs": "^7.8.1" }, @@ -90,12 +90,12 @@ "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", "@release-it/conventional-changelog": "^9.0.3", - "@slickgrid-universal/composite-editor-component": "~5.10.1", - "@slickgrid-universal/custom-tooltip-plugin": "~5.10.1", - "@slickgrid-universal/excel-export": "~5.10.1", - "@slickgrid-universal/graphql": "~5.10.1", - "@slickgrid-universal/odata": "~5.10.1", - "@slickgrid-universal/text-export": "~5.10.1", + "@slickgrid-universal/composite-editor-component": "~5.10.2", + "@slickgrid-universal/custom-tooltip-plugin": "~5.10.2", + "@slickgrid-universal/excel-export": "~5.10.2", + "@slickgrid-universal/graphql": "~5.10.2", + "@slickgrid-universal/odata": "~5.10.2", + "@slickgrid-universal/text-export": "~5.10.2", "@types/fnando__sparkline": "^0.3.7", "@types/jest": "^29.5.14", "@types/node": "^22.10.1", diff --git a/src/app/examples/rowdetail-view.component.ts b/src/app/examples/rowdetail-view.component.ts index a52f267e6..4821e9792 100644 --- a/src/app/examples/rowdetail-view.component.ts +++ b/src/app/examples/rowdetail-view.component.ts @@ -2,6 +2,18 @@ import { Component } from '@angular/core'; import { SlickDataView, SlickGrid } from '../modules/angular-slickgrid'; import { GridRowDetailComponent } from './grid-rowdetail.component'; +interface Item { + assignee: string; + duration: Date; + percentComplete: number; + reporter: string; + start: Date; + finish: Date; + effortDriven: boolean; + title: string; + rowId: number; +} + @Component({ styles: [ '.detail-label { display: inline-flex; align-items: center; gap: 4px; padding: 4px; }', @@ -10,16 +22,7 @@ import { GridRowDetailComponent } from './grid-rowdetail.component'; templateUrl: './rowdetail-view.component.html' }) export class RowDetailViewComponent { - model!: { - duration: Date; - percentComplete: number; - reporter: string; - start: Date; - finish: Date; - effortDriven: boolean; - assignee: string; - title: string; - }; + model!: Item; // you also have access to the following objects (it must match the exact property names shown below) addon: any; // row detail addon instance diff --git a/src/app/modules/angular-slickgrid/models/gridOption.interface.ts b/src/app/modules/angular-slickgrid/models/gridOption.interface.ts index 5e801e754..3f6bf17d1 100644 --- a/src/app/modules/angular-slickgrid/models/gridOption.interface.ts +++ b/src/app/modules/angular-slickgrid/models/gridOption.interface.ts @@ -1,9 +1,12 @@ import type { TranslateService } from '@ngx-translate/core'; -import type { Column, GridOption as UniversalGridOption } from '@slickgrid-universal/common'; +import type { BasePaginationComponent, Column, GridOption as UniversalGridOption } from '@slickgrid-universal/common'; import type { RowDetailView } from './rowDetailView.interface'; export interface GridOption extends UniversalGridOption { + /** External Custom Pagination Component that can be provided by the user */ + customPaginationComponent?: typeof BasePaginationComponent; + /** ngx-translate i18n translation service instance */ i18n?: TranslateService; diff --git a/test/cypress/e2e/example10.cy.ts b/test/cypress/e2e/example10.cy.ts index be2ec564a..3fa54954c 100644 --- a/test/cypress/e2e/example10.cy.ts +++ b/test/cypress/e2e/example10.cy.ts @@ -596,7 +596,13 @@ describe('Example 10 - Multiple Grids with Row Selection', () => { cy.window().then((win) => { expect(win.console.log).to.be.calledWith('Grid State changed:: ', { newValues: { gridRowIndexes: [1, 0], dataContextIds: [1, 12, 13, 3, 522], filteredDataContextIds: [3, 13] }, type: 'rowSelection' }); - expect(win.console.log).to.be.calledWith('Grid State changed:: ', { newValues: [{ columnId: 'title', operator: 'Contains', searchTerms: ['3'], targetSelector: 'input.form-control.filter-title.search-filter.filled' }], type: 'filter' }); + expect(win.console.log).to.be.calledWith('Grid State changed:: ', { + newValues: [{ + columnId: 'title', operator: 'Contains', searchTerms: ['3'], + targetSelector: 'input.form-control.filter-title.search-filter.slick-filter.filled' + }], + type: 'filter' + }); }); }); @@ -679,7 +685,13 @@ describe('Example 10 - Multiple Grids with Row Selection', () => { cy.window().then((win) => { expect(win.console.log).to.have.callCount(4); expect(win.console.log).to.be.calledWith('Grid State changed:: ', { newValues: { gridRowIndexes: [1, 0], dataContextIds: [1, 12, 13, 3, 522], filteredDataContextIds: [3, 13] }, type: 'rowSelection' }); - expect(win.console.log).to.be.calledWith('Grid State changed:: ', { newValues: [{ columnId: 'title', operator: 'Contains', searchTerms: ['3'], targetSelector: 'input.form-control.filter-title.search-filter.filled' }], type: 'filter' }); + expect(win.console.log).to.be.calledWith('Grid State changed:: ', { + newValues: [{ + columnId: 'title', operator: 'Contains', searchTerms: ['3'], + targetSelector: 'input.form-control.filter-title.search-filter.slick-filter.filled' + }], + type: 'filter' + }); }); }); @@ -756,7 +768,13 @@ describe('Example 10 - Multiple Grids with Row Selection', () => { cy.window().then((win) => { expect(win.console.log).to.have.callCount(4); expect(win.console.log).to.be.calledWith('Grid State changed:: ', { newValues: { gridRowIndexes: [1, 0], dataContextIds: [1, 12, 13, 3, 522], filteredDataContextIds: [3, 13] }, type: 'rowSelection' }); - expect(win.console.log).to.be.calledWith('Grid State changed:: ', { newValues: [{ columnId: 'title', operator: 'Contains', searchTerms: ['3'], targetSelector: 'input.form-control.filter-title.search-filter.filled' }], type: 'filter' }); + expect(win.console.log).to.be.calledWith('Grid State changed:: ', { + newValues: [{ + columnId: 'title', operator: 'Contains', searchTerms: ['3'], + targetSelector: 'input.form-control.filter-title.search-filter.slick-filter.filled' + }], + type: 'filter' + }); }); cy.get('@grid2') diff --git a/yarn.lock b/yarn.lock index ff6391780..bf0a5b82b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2990,21 +2990,21 @@ dependencies: "@sinonjs/commons" "^3.0.0" -"@slickgrid-universal/binding@~5.9.0": - version "5.9.0" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/binding/-/binding-5.9.0.tgz#c78948f323e26619efcad1fe360a15363b32fae8" - integrity sha512-u3tP6UMbDdG+bBuOrxajN18l/KI0qMN6QoMkY/JjFNgV9E/Iq/EYa0QafZyV6DJnwdQD2ZlBb2nBqFj1MEIP4w== +"@slickgrid-universal/binding@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/binding/-/binding-5.10.2.tgz#3f5515c2445bbc891fa5bde61b08ce62591d48a4" + integrity sha512-Hfn6ooFE28W9JOCLAOPDqlnrBJ1bfIkkXmV04bToCZk3SyKhUr6uYkmJMaMzs3S4U3a2aEe7srILPpLjfOmfmw== -"@slickgrid-universal/common@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/common/-/common-5.10.1.tgz#67679260cbbad5d56af4449e78c12612945a2ee7" - integrity sha512-tmyUqg/oFv/qlE61635WVuUG1CnXr4wqD6ggU1TC03tXGQmySpu49xgLNB/FeVdwUONOEaH4Ake9LMGLz6945Q== +"@slickgrid-universal/common@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/common/-/common-5.10.2.tgz#0b968df471344d9f4dd1581b9fc7538d2ad5bd50" + integrity sha512-yE6yw+23xC8LcA5+aPkcF/mexKFzX7qgWl4iGkDPDTA3RQaEYVWiv25XQWjwomti9CH9pnsBTRjLduEDm2NDDw== dependencies: "@excel-builder-vanilla/types" "^3.0.14" "@formkit/tempo" "^0.1.2" - "@slickgrid-universal/binding" "~5.9.0" - "@slickgrid-universal/event-pub-sub" "~5.9.0" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/binding" "~5.10.2" + "@slickgrid-universal/event-pub-sub" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" "@types/sortablejs" "^1.15.8" "@types/trusted-types" "^2.0.7" autocompleter "^9.3.2" @@ -3014,108 +3014,108 @@ un-flatten-tree "^2.0.12" vanilla-calendar-pro "^2.9.10" -"@slickgrid-universal/composite-editor-component@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/composite-editor-component/-/composite-editor-component-5.10.1.tgz#4111c3f07502bc40893e079c65ccb09a405aee7c" - integrity sha512-SWsKqSQPPmn02JRr9/Z1ezJBv8+Qk6ArtrDW098A+42qTguW059bz8fO4MPtxa4UR3Ke50BFj7Z1mqfIkciFTg== +"@slickgrid-universal/composite-editor-component@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/composite-editor-component/-/composite-editor-component-5.10.2.tgz#7ba7a37ea86beb5794b1d7cf6a3576a68867b4e8" + integrity sha512-7pi3AmB2GiQzA0GHJnu+bp+sfB7i51Td2fUNrLlxxSrJu5YpoHhMye52MFKA6Tv/fTnePvnOBEyml+psrjIdLQ== dependencies: - "@slickgrid-universal/binding" "~5.9.0" - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/binding" "~5.10.2" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" -"@slickgrid-universal/custom-footer-component@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/custom-footer-component/-/custom-footer-component-5.10.1.tgz#a0be09c68675aa797314d0dc2c210e09cf7c337b" - integrity sha512-Vr9i4EhrjGoyEKNWl0qynlEyp9+QRk9OH/QTaJ4Z0VODi4Vn7QLPz0im0Ff4yyHOyvMjjfMXVizwsY8zDLgP1g== +"@slickgrid-universal/custom-footer-component@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/custom-footer-component/-/custom-footer-component-5.10.2.tgz#8c133048c5cde8d30db195cea63e0022ffb28522" + integrity sha512-MgQr7N6gzs6pomrzBpvCxptS+faq4rs5WNITppw/uHa/bjprJltr80/dzvxlsGQHsug+ikspOuK8lxkKESxC/A== dependencies: "@formkit/tempo" "^0.1.2" - "@slickgrid-universal/binding" "~5.9.0" - "@slickgrid-universal/common" "~5.10.1" + "@slickgrid-universal/binding" "~5.10.2" + "@slickgrid-universal/common" "~5.10.2" -"@slickgrid-universal/custom-tooltip-plugin@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/custom-tooltip-plugin/-/custom-tooltip-plugin-5.10.1.tgz#efdc25c551f30da7e4728e8373c2d04fe06cc9f8" - integrity sha512-RnugS8O/XtmsBmLl/YoI1YoHgOR9Jqfv0K/qh0VxWFP4X55z450ysHEfuxZ3cyLBxy+s6Wo3Uz2CjeV0nTDKUQ== +"@slickgrid-universal/custom-tooltip-plugin@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/custom-tooltip-plugin/-/custom-tooltip-plugin-5.10.2.tgz#205ad1aa7977ec505c1636cd403542c040e0f57c" + integrity sha512-xzN1fqAH5ma8vnmHIITGbx1C57famagvTZbW60Lh+Nqpd+WfseEAXSG9iwBGnZg7irdZLNzIwC6TadbYfNGTZQ== dependencies: - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" -"@slickgrid-universal/empty-warning-component@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/empty-warning-component/-/empty-warning-component-5.10.1.tgz#0c7cecd4b9e86506eb973f51221a3b7e48fb231c" - integrity sha512-BuSV6uZwtVjGxpM9vXCIKK8d3mij4SqsOYLvygKw/Sh4hH9ISqm1LoR4XOLfTCP05hlOGRuMwVmi7+tNesjayw== +"@slickgrid-universal/empty-warning-component@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/empty-warning-component/-/empty-warning-component-5.10.2.tgz#8cd2218eaf12f9e3c7ba73d3b60946be8d4e9e0e" + integrity sha512-LSXzWcyypK6xirZZDTrKIxY2HS0jCr90CTL7V4c9Vb1B8Nv0CGte4L686cwNxg6MK8oT9SLgMqLgtjSSa7g1Dg== dependencies: - "@slickgrid-universal/common" "~5.10.1" + "@slickgrid-universal/common" "~5.10.2" -"@slickgrid-universal/event-pub-sub@~5.9.0": - version "5.9.0" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/event-pub-sub/-/event-pub-sub-5.9.0.tgz#47aa780d6ec3b1d40c63d38ffefbcf1207e32db1" - integrity sha512-KnpY/WCTIwm6jWrX2RDKmDb1ifT2u4xs+1CPGWOWY6qQ/J0Fl9Ah25sZj/mM20BZvmg5/oCu7c9F62TdSiU3Zg== +"@slickgrid-universal/event-pub-sub@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/event-pub-sub/-/event-pub-sub-5.10.2.tgz#d5a773d719ce64473ce3811e43833878d38a0ffe" + integrity sha512-3l0rAZEf2CX2ApaXv4VCFVlExJSTu6VjDiWsNuZ9dh7+auWtiihsX4QZS8zskQIqEVrHtuJAlV8fq/l/XcwS+g== dependencies: - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/utils" "~5.10.2" -"@slickgrid-universal/excel-export@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/excel-export/-/excel-export-5.10.1.tgz#a0d915b45bf401becd7727e469bd45d6be17b3e3" - integrity sha512-n6eWezCW1Pv+TMkUyMTK+O8zncpCzROuwwuEhsM/TwB3J5NsdFyo5rkekAUHkqrAX4MNJIB3SLE/q0elkrwWpQ== +"@slickgrid-universal/excel-export@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/excel-export/-/excel-export-5.10.2.tgz#025345148c451ab457ce83b84b33805deaca2c48" + integrity sha512-x6YtYpTdJcI9u98B4xU25L+DzVvOvk/8W63/qerLcap0hUUTjcTOotamglcGL41WI67UJ8vKAJEDLtErm8hQ+Q== dependencies: - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" excel-builder-vanilla "^3.0.14" -"@slickgrid-universal/graphql@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/graphql/-/graphql-5.10.1.tgz#16571064f05e1cadb5168c5f1b92979cbfd38553" - integrity sha512-1+dHVDoQPUnOXL0ryM1Jl/HR3klKp3MGHesNLZWt/q9EXa0YyA2vk36CqQoT31m7o2QcYzAwUyl68lPWgiTFEA== +"@slickgrid-universal/graphql@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/graphql/-/graphql-5.10.2.tgz#b643680856261eacfa6752b37535ed8e344fd8c7" + integrity sha512-06zVCdL3fWmtXkccVVUtvSmwcNgsJ4JASxUk0hLWRJ8mRR0MtU4AWRRynND8tlxbDSo/VWPkPxrx3tcbBCROrA== dependencies: - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" -"@slickgrid-universal/odata@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/odata/-/odata-5.10.1.tgz#09ae6c8c6c432917370cfc899c427ea8fa2fcee2" - integrity sha512-UwuEM9heBuENU6aOrOk2I5wAPgcnAC5H1FbNxqPJmntx6nlsZm+p8jpCjGcw/YX0WEuXHp7U/y2N7vG6ZDN+FQ== +"@slickgrid-universal/odata@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/odata/-/odata-5.10.2.tgz#5a471bf42da57373f8f3ce1ac04f26b1bdc3f8db" + integrity sha512-yfWc2VJ7pwjTPG56cRefeDALHkxQSkMJ8YP6eq7ZWqg14/m30pCAkq2w7N15JMokw63+G2CXwP/KU2xFy/AH4g== dependencies: - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" -"@slickgrid-universal/pagination-component@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/pagination-component/-/pagination-component-5.10.1.tgz#767046526ad569a93cb345590c098dcbf0445af9" - integrity sha512-/IfOyBTtw4GcG/Sn+9xlFQkPkT+3Fn8pDA4oCiMAJfwfApBuaenHUS114XMIgZG3X+bEtf5NSzX2iZZRpY+5Ug== +"@slickgrid-universal/pagination-component@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/pagination-component/-/pagination-component-5.10.2.tgz#66935752a2fd2702a67ad96b0dc59956125adf6f" + integrity sha512-rhspG1Lh5+ZUl96609p+NooDbAdzMMpkFsXxNW9jJWV9MnLQfg78FNDBG4zg/mLuVMW2SqNQ5p+N9TJS9TWbZg== dependencies: - "@slickgrid-universal/binding" "~5.9.0" - "@slickgrid-universal/common" "~5.10.1" + "@slickgrid-universal/binding" "~5.10.2" + "@slickgrid-universal/common" "~5.10.2" -"@slickgrid-universal/row-detail-view-plugin@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/row-detail-view-plugin/-/row-detail-view-plugin-5.10.1.tgz#60fbd91c40890baec2ce7738a81f50fc34a0d857" - integrity sha512-yZtSgfvStN8CSvVsy+3Oz7h8xur+OYLUGzUhoBWyhi5L0y3CYcb9Ezv8qoDtfib/PspwJs0xCQ2eTtBHC8OCWw== +"@slickgrid-universal/row-detail-view-plugin@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/row-detail-view-plugin/-/row-detail-view-plugin-5.10.2.tgz#f2490ae246f226869441836c1ea4f87a6c030a29" + integrity sha512-XKwaHun1hhShguadz9OgzxvqFKkUFHdA1rEFJXC5t60cuTa4J0j7xWe9HWrNcu4d+ywmXvhWZWW4QPyXEb7f7g== dependencies: - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" -"@slickgrid-universal/rxjs-observable@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/rxjs-observable/-/rxjs-observable-5.10.1.tgz#ef61fe0869a6be34f79c2f30ca0885ae2baedab8" - integrity sha512-1H8C6f0phZK3F51sJYS6hoi3pDPSm5M7J+sDG6PYYfq1BUfZs0QuePTTE14mCIdrlCDWrfnW020/rbw42+cgZg== +"@slickgrid-universal/rxjs-observable@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/rxjs-observable/-/rxjs-observable-5.10.2.tgz#d82b748da601eaf481b27de1b76c0dfee76b2d79" + integrity sha512-4D/XvaWYCj7kL8a2SNQaSIG99W7dzb/qjo4rYv6M3YfqMI22LxkcRW53gBBTl48QuGPM7W4uEH7Y4qqb5rxH8g== dependencies: - "@slickgrid-universal/common" "~5.10.1" + "@slickgrid-universal/common" "~5.10.2" rxjs "^7.8.1" -"@slickgrid-universal/text-export@~5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/text-export/-/text-export-5.10.1.tgz#0d7c616b8780e49fc7680b0d69d8a10fa3c42372" - integrity sha512-qQz15Mum6we1fe3YxyG2Dg2F5vs5YASMRJmqzZcJfpS4ryp6H7Dn5RfSEflIJC2VDWmtq4Z+Cq3ve5nSqBPkdg== +"@slickgrid-universal/text-export@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/text-export/-/text-export-5.10.2.tgz#6f22ee2c7e9ba71ab4d68b987dd384a2b525f119" + integrity sha512-H+pyyiwArkBfFhMqPpSzqIzADlIZLkJuyQFVlSsxsegmTa9wHp9qGL+Y4ugfs77oQXZ5isRaUS53TW6ByRjtIg== dependencies: - "@slickgrid-universal/common" "~5.10.1" - "@slickgrid-universal/utils" "~5.9.0" + "@slickgrid-universal/common" "~5.10.2" + "@slickgrid-universal/utils" "~5.10.2" text-encoding-utf-8 "^1.0.2" -"@slickgrid-universal/utils@~5.9.0": - version "5.9.0" - resolved "https://registry.yarnpkg.com/@slickgrid-universal/utils/-/utils-5.9.0.tgz#639925da241014f62a677384485a3e01250d7421" - integrity sha512-2A/OoTvautUZ4FR86E9npoIA6f0iFSEqqiXivmKdQK3Ed0UAQEGak639p1dkFAHfbJxd7U7l6Gx0n0vtgjNu/Q== +"@slickgrid-universal/utils@~5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@slickgrid-universal/utils/-/utils-5.10.2.tgz#2a2a30bc94d306bb47af82a310900ed74f98ff88" + integrity sha512-cijV2/u3xKnfdUinaJeQNcoZuLy+9J4EgYSfUpNX22kanp948uKOICQxVrlb7Lj82Ki0U+vtuQ+fS59KQD3YOQ== "@tootallnate/once@2": version "2.0.0" From 0e44168883bcbc73677647acc98ca035efe39f80 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Sat, 30 Nov 2024 15:27:52 -0500 Subject: [PATCH 2/3] chore: fix jest angular preset deprecation --- test/setup-jest.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/setup-jest.ts b/test/setup-jest.ts index 1be94b2fa..52afd64c2 100644 --- a/test/setup-jest.ts +++ b/test/setup-jest.ts @@ -1,2 +1,6 @@ -import 'jest-preset-angular/setup-jest'; -import './jest-global-mocks'; \ No newline at end of file +import { setupZonelessTestEnv } from 'jest-preset-angular/setup-env/zoneless'; +import './jest-global-mocks'; + +setupZonelessTestEnv({ + //...options +}); \ No newline at end of file From 37d87e78742b6d7af2f9fb0d06085d831b03f2c7 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Sat, 30 Nov 2024 15:55:28 -0500 Subject: [PATCH 3/3] chore: fix failing Cypress test --- src/app/examples/grid-tree-data-parent-child.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/examples/grid-tree-data-parent-child.component.html b/src/app/examples/grid-tree-data-parent-child.component.html index 2314e646b..e614af394 100644 --- a/src/app/examples/grid-tree-data-parent-child.component.html +++ b/src/app/examples/grid-tree-data-parent-child.component.html @@ -95,6 +95,7 @@

[columnDefinitions]="columnDefinitions" [gridOptions]="gridOptions" [dataset]="dataset" + (onGridStateChanged)="handleOnGridStateChanged($event.detail)" (onAngularGridCreated)="angularGridReady($event.detail)" (onBeforeFilterChange)="showSpinner()" (onFilterChanged)="hideSpinner()"