From b0d760c1c4bf3289d5bc03d4a42eedfcd63a1de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bouget?= Date: Fri, 16 Feb 2024 14:41:17 +0100 Subject: [PATCH] Update ag grid major version --- package.json | 6 +-- .../khiops-covisualization.module.ts | 2 +- .../components/ag-grid/ag-grid.component.ts | 24 +++++---- .../checkbox-cell/checkbox-cell.component.ts | 5 +- .../ag-grid/icon-cell/icon-cell.component.ts | 7 +-- .../khiops-library/khiops-library.module.ts | 2 +- .../khiops-visualization.module.ts | 2 +- yarn.lock | 54 ++++++------------- 8 files changed, 41 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index cb970d3e..412f373b 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,9 @@ "singleQuote": true }, "dependencies": { - "@ag-grid-community/all-modules": "27.3.0", - "@ag-grid-community/angular": "27.3.0", - "@ag-grid-community/core": "27.3.0", + "@ag-grid-community/angular": "28.2.1", + "@ag-grid-community/core": "28.2.1", + "@ag-grid-community/client-side-row-model": "28.2.1", "@angular/animations": "15.2.0", "@angular/cdk": "15.2.0", "@angular/common": "15.2.0", diff --git a/src/app/khiops-covisualization/khiops-covisualization.module.ts b/src/app/khiops-covisualization/khiops-covisualization.module.ts index acf32b2b..8798ad33 100644 --- a/src/app/khiops-covisualization/khiops-covisualization.module.ts +++ b/src/app/khiops-covisualization/khiops-covisualization.module.ts @@ -71,7 +71,7 @@ export function setupTranslateFactory(service: TranslateService) { KhiopsLibraryModule, FlexLayoutModule, FormsModule, - AgGridModule.withComponents([]), + AgGridModule, HttpClientModule, AngularSplitModule, TranslateModule.forChild(), diff --git a/src/app/khiops-library/components/ag-grid/ag-grid.component.ts b/src/app/khiops-library/components/ag-grid/ag-grid.component.ts index 5e4db4f6..ededdc5b 100644 --- a/src/app/khiops-library/components/ag-grid/ag-grid.component.ts +++ b/src/app/khiops-library/components/ag-grid/ag-grid.component.ts @@ -17,21 +17,23 @@ import { SelectableComponent } from '@khiops-library/components/selectable/selec import { SelectableService } from '@khiops-library/components/selectable/selectable.service'; import { TranslateService } from '@ngstack/translate'; import { KhiopsLibraryService } from '@khiops-library/providers/khiops-library.service'; -import { - Module, - GridOptions, - ClientSideRowModelModule, - RowNode, - ColDef, - ColumnResizedEvent, - Column, -} from '@ag-grid-community/all-modules'; import { UtilsService } from '@khiops-library/providers/utils.service'; import _ from 'lodash'; import { ConfigService } from '@khiops-library/providers/config.service'; import { TYPES } from '@khiops-library/enum/types'; import { GridColumnsI } from '@khiops-library/interfaces/grid-columns'; import { MatCheckboxChange } from '@angular/material/checkbox'; +import { + Module, + ColDef, + GridOptions, + RowNode, + ColumnResizedEvent, + Column, +} from '@ag-grid-community/core'; +import { ModuleRegistry } from '@ag-grid-community/core'; +import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model'; +ModuleRegistry.registerModules([ClientSideRowModelModule]); @Component({ selector: 'kl-ag-grid', @@ -310,7 +312,7 @@ export class AgGridComponent if (this.agGrid) { if (!this.showHeader) { - this.agGrid.api.sizeColumnsToFit(); + this.agGrid?.api?.sizeColumnsToFit(); } else { this.resizeColumnsToFit(); } @@ -716,7 +718,7 @@ export class AgGridComponent */ setTimeout(() => { if (!this.cellsSizes[this.id]) { - this.agGrid.api.sizeColumnsToFit(); + this.agGrid?.api?.sizeColumnsToFit(); } }); } diff --git a/src/app/khiops-library/components/ag-grid/checkbox-cell/checkbox-cell.component.ts b/src/app/khiops-library/components/ag-grid/checkbox-cell/checkbox-cell.component.ts index 1b032427..06106129 100644 --- a/src/app/khiops-library/components/ag-grid/checkbox-cell/checkbox-cell.component.ts +++ b/src/app/khiops-library/components/ag-grid/checkbox-cell/checkbox-cell.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; + +import { AgRendererComponent } from '@ag-grid-community/angular'; import { ICellRendererParams, IAfterGuiAttachedParams, -} from '@ag-grid-community/all-modules'; -import { AgRendererComponent } from '@ag-grid-community/angular'; +} from '@ag-grid-community/core'; @Component({ selector: 'kl-checkbox-cell', diff --git a/src/app/khiops-library/components/ag-grid/icon-cell/icon-cell.component.ts b/src/app/khiops-library/components/ag-grid/icon-cell/icon-cell.component.ts index eb4a9593..7cfefb00 100644 --- a/src/app/khiops-library/components/ag-grid/icon-cell/icon-cell.component.ts +++ b/src/app/khiops-library/components/ag-grid/icon-cell/icon-cell.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; + +import { AgRendererComponent } from '@ag-grid-community/angular'; import { - ICellRendererParams, IAfterGuiAttachedParams, -} from '@ag-grid-community/all-modules'; -import { AgRendererComponent } from '@ag-grid-community/angular'; + ICellRendererParams, +} from '@ag-grid-community/core'; @Component({ selector: 'kl-icon-cell', diff --git a/src/app/khiops-library/khiops-library.module.ts b/src/app/khiops-library/khiops-library.module.ts index 386bf508..5b5a0c95 100644 --- a/src/app/khiops-library/khiops-library.module.ts +++ b/src/app/khiops-library/khiops-library.module.ts @@ -93,7 +93,7 @@ import EnTransaltion from '../../i18n/en.json'; MatPaginatorModule, MatRippleModule, MatSliderModule, - AgGridModule.withComponents([]), + AgGridModule, FormsModule, MatButtonToggleModule, MatDialogModule, diff --git a/src/app/khiops-visualization/khiops-visualization.module.ts b/src/app/khiops-visualization/khiops-visualization.module.ts index a79b470e..fe553a02 100644 --- a/src/app/khiops-visualization/khiops-visualization.module.ts +++ b/src/app/khiops-visualization/khiops-visualization.module.ts @@ -97,7 +97,7 @@ const providers = [ BrowserModule, BrowserAnimationsModule, KhiopsLibraryModule, - AgGridModule.withComponents([]), + AgGridModule, FlexLayoutModule, FormsModule, HttpClientModule, diff --git a/yarn.lock b/yarn.lock index 4b35fc6c..a79686c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,48 +7,24 @@ resolved "https://registry.yarnpkg.com/@aduh95/viz.js/-/viz.js-3.7.0.tgz#a20d86c5fc8f6abebdc39b96a4326e10375d77c0" integrity sha512-20Pk2Z98fbPLkECcrZSJszKos/OgtvJJR3NcbVfgCJ6EQjDNzW2P1BKqImOz3tJ952dvO2DWEhcLhQ1Wz1e9ng== -"@ag-grid-community/all-modules@27.3.0": - version "27.3.0" - resolved "https://registry.yarnpkg.com/@ag-grid-community/all-modules/-/all-modules-27.3.0.tgz#5f3883c7316112e2b7145b2b5987bc581980d900" - integrity sha512-yH5jH+sJ6niUR5N4MiyOYDUnldcjCRwpDeL82JyGh7/rsxACH026KcxEO+7Gk22CnSeMwUZidGorU2Dj/Na8rg== +"@ag-grid-community/angular@28.2.1": + version "28.2.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/angular/-/angular-28.2.1.tgz#4b8f085d38d13110a352874d0da99c138d0c0c11" + integrity sha512-IHS8HVZT0Z+2kQBRG7LIioa0fa3pH/f58dXmPqUjkBhAlbvmlMzsB0cZB09KKKKDkBHFfSk/r7JPEY510TeNmg== dependencies: - "@ag-grid-community/client-side-row-model" "~27.3.0" - "@ag-grid-community/core" "~27.3.0" - "@ag-grid-community/csv-export" "~27.3.0" - "@ag-grid-community/infinite-row-model" "~27.3.0" - -"@ag-grid-community/angular@27.3.0": - version "27.3.0" - resolved "https://registry.yarnpkg.com/@ag-grid-community/angular/-/angular-27.3.0.tgz#a8e8003bda7cfe461b364e5310d96f773d355d34" - integrity sha512-ICXcWCVyiTlFQvO4qj3LQPGdElba7Y4Fvzlv9KQZUOW/qwD7LTu6hprBCXOCGOyediEv3HZvU+TgXBMswVxmaA== - dependencies: - tslib "^1.10.0" - -"@ag-grid-community/client-side-row-model@~27.3.0": - version "27.3.0" - resolved "https://registry.yarnpkg.com/@ag-grid-community/client-side-row-model/-/client-side-row-model-27.3.0.tgz#5dec1f59d85e9682c46a3b695d31ecd7a4df5cbd" - integrity sha512-t6ggg/SvESsGEC75z62rD/zFeo2DZCKFxw5e0qKweHR106CjBUNMlnfXIIG81qOSXUWGnbbWlrijBbKbyt8aTA== - dependencies: - "@ag-grid-community/core" "~27.3.0" - -"@ag-grid-community/core@27.3.0", "@ag-grid-community/core@~27.3.0": - version "27.3.0" - resolved "https://registry.yarnpkg.com/@ag-grid-community/core/-/core-27.3.0.tgz#04599cff5c35d26b970153ec3db66b945f053e57" - integrity sha512-77/bE2KdFlFI/ywEP46aSspXtgBteY/OPQyzU/lWqYrG2wC6cLfPSUB60t9e0FiqElwM/Vdcjz0TAjRwhZOPkw== + tslib "^2.3.0" -"@ag-grid-community/csv-export@~27.3.0": - version "27.3.0" - resolved "https://registry.yarnpkg.com/@ag-grid-community/csv-export/-/csv-export-27.3.0.tgz#6b2fc9090180aa00696b8f1aaf1f0b31f43088b0" - integrity sha512-7pR05jEqTdUPAoqEMHxXGh6j0KViGmqLa4uwKmriKzfZOvwlq6umjDmXvPFCRCWfswb9KOqS1iZlGhcWufKApQ== +"@ag-grid-community/client-side-row-model@28.2.1": + version "28.2.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/client-side-row-model/-/client-side-row-model-28.2.1.tgz#faa74e225f2f27f38e6473c5e0d47514db4aac58" + integrity sha512-JLLNVNAtSbVjg/h0+JqNxbRGzHR9xl3YHO4kVt8Bu0UO1XQLfGLT8wkzqQTcEOiq0pEfFTee7/BGT3oHOQfUQg== dependencies: - "@ag-grid-community/core" "~27.3.0" + "@ag-grid-community/core" "~28.2.1" -"@ag-grid-community/infinite-row-model@~27.3.0": - version "27.3.0" - resolved "https://registry.yarnpkg.com/@ag-grid-community/infinite-row-model/-/infinite-row-model-27.3.0.tgz#055539af2ecfa999885e52c8fe089ae6da0ba1b3" - integrity sha512-hUWQ6YdRrNCDAvSn1bbxvnklIqPx8QGXMjmLVfR47+Gp1aoA1i9OxtA39SlzsZnRqDxZE5eKgwb5uy2+C4vKhA== - dependencies: - "@ag-grid-community/core" "~27.3.0" +"@ag-grid-community/core@28.2.1", "@ag-grid-community/core@~28.2.1": + version "28.2.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/core/-/core-28.2.1.tgz#a74f5b724c89c0f69ef4af72964a274a25b93089" + integrity sha512-qGhqZhY8KbPlr3cJBVkNjGKu+cOyFc8IGvPcvlm0pjNC9cdxO/ct9Sa1Dg+k3ACCEroMEt1apBvnoOgurpvewQ== "@ampproject/remapping@2.2.0", "@ampproject/remapping@^2.2.0": version "2.2.0" @@ -9329,7 +9305,7 @@ tslib@2.6.2: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@^1.10.0, tslib@^1.9.0: +tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==