Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(components/ag-grid): add support for AG Grid 31.3.2 #2450

Merged
merged 3 commits into from
Jul 10, 2024
Merged

feat(components/ag-grid): add support for AG Grid 31.3.2 #2450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05961b6
feat(components/ag-grid): add support for AG Grid 31.3.2
johnhwhite Jul 9, 2024
38da5eb
Update peer range
johnhwhite Jul 10, 2024
527d1c6
Merge remote-tracking branch 'origin/10.x.x' into ag-grid-31.3
johnhwhite Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/components/ag-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"@skyux/lookup": "0.0.0-PLACEHOLDER",
"@skyux/popovers": "0.0.0-PLACEHOLDER",
"@skyux/theme": "0.0.0-PLACEHOLDER",
"ag-grid-angular": "~31.2.0",
"ag-grid-community": "~31.2.0"
"ag-grid-angular": "~31.3.2",
"ag-grid-community": "~31.3.2"
},
"dependencies": {
"@skyux/icon": "0.0.0-PLACEHOLDER",
Expand Down
1 change: 1 addition & 0 deletions ...components/ag-grid/src/lib/modules/ag-grid/ag-grid-data-manager-adapter.directive.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ it('should move the horizontal scroll based on enableTopScroll check', async ()
'ag-floating-top',
'ag-body',
'ag-sticky-top',
'ag-sticky-bottom',
'ag-floating-bottom',
'ag-overlay',
]);
Expand Down
4 changes: 4 additions & 0 deletions libs/components/ag-grid/src/lib/modules/ag-grid/ag-grid-wrapper.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ describe('SkyAgGridWrapperComponent via fixture', () => {
'ag-floating-top',
'ag-body',
'ag-sticky-top',
'ag-sticky-bottom',
'ag-floating-bottom',
'ag-overlay',
]);
Expand All @@ -530,6 +531,7 @@ describe('SkyAgGridWrapperComponent via fixture', () => {
'ag-floating-top',
'ag-body',
'ag-sticky-top',
'ag-sticky-bottom',
'ag-floating-bottom',
'ag-body-horizontal-scroll',
'ag-overlay',
Expand All @@ -547,6 +549,7 @@ describe('SkyAgGridWrapperComponent via fixture', () => {
'ag-floating-top',
'ag-body',
'ag-sticky-top',
'ag-sticky-bottom',
'ag-floating-bottom',
'ag-overlay',
]);
Expand All @@ -562,6 +565,7 @@ describe('SkyAgGridWrapperComponent via fixture', () => {
'ag-floating-top',
'ag-body',
'ag-sticky-top',
'ag-sticky-bottom',
'ag-floating-bottom',
'ag-body-horizontal-scroll',
'ag-overlay',
Expand Down
6 changes: 3 additions & 3 deletions libs/components/packages/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
"@skyux/tiles": "0.0.0-PLACEHOLDER",
"@skyux/toast": "0.0.0-PLACEHOLDER",
"@skyux/validation": "0.0.0-PLACEHOLDER",
"ag-grid-angular": "~31.2.0",
"ag-grid-community": "~31.2.0",
"ag-grid-enterprise": "~31.2.0",
"ag-grid-angular": "~31.3.2",
"ag-grid-community": "~31.3.2",
"ag-grid-enterprise": "~31.3.2",
"autonumeric": "^4.10.5"
}
},
Expand Down
2 changes: 1 addition & 1 deletion libs/components/packages/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface TestSetup {
schematic: (options: Schema) => Rule;
}

const UPDATE_TO_VERSION = '31.2.0';
const UPDATE_TO_VERSION = '31.3.2';

describe('ag-grid-migrate.schematic', () => {
async function setupTest(): Promise<TestSetup> {
Expand Down
6 changes: 4 additions & 2 deletions libs/components/packages/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { platform } from 'os';

import { Schema } from './schema';

const AG_GRID_MIGRATIONS = ['31.0.0', '31.1.0', '31.2.0'];
const AG_GRID_MIGRATIONS = ['31.0.0', '31.1.0', '31.2.1', '31.3.2'];
const AG_GRID_VERSION = AG_GRID_MIGRATIONS.slice().pop();

export default function (options: Schema): Rule {
Expand Down Expand Up @@ -42,10 +42,12 @@ export default function (options: Schema): Rule {
},
);
for (const migration of AG_GRID_MIGRATIONS) {
const patchVersionZero =
migration.split('.').slice(0, 2).join('.') + '.0';
const cmdArgs = [
'node_modules/@ag-grid-community/cli/index.cjs',
'migrate',
`--to=${migration}`,
`--to=${patchVersionZero}`,
'--allow-dirty',
...agGridFiles,
];
Expand Down
2 changes: 1 addition & 1 deletion ...components/packages/src/schematics/migrations/update-10/ag-grid/ag-grid.schematic.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import fs from 'fs-extra';
import { joinPathFragments } from 'nx/src/utils/path';
import { workspaceRoot } from 'nx/src/utils/workspace-root';

const UPDATE_TO_VERSION = '31.2.0';
const UPDATE_TO_VERSION = '31.3.2';

describe('ag-grid.schematic', () => {
const runner = new SchematicTestRunner(
Expand Down
2 changes: 1 addition & 1 deletion libs/components/packages/src/schematics/migrations/update-10/ag-grid/ag-grid.schematic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const AG_GRID_ENT = 'ag-grid-enterprise';
const AG_GRID_NG = 'ag-grid-angular';
const AG_GRID_SKY = '@skyux/ag-grid';

const AG_GRID_VERSION = '~31.2.0';
const AG_GRID_VERSION = '~31.3.2';

/**
* Check package.json for AG Grid dependencies.
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
"@blackbaud/skyux-design-tokens": "0.0.28",
"@nx/angular": "19.3.1",
"@skyux/icons": "7.3.0",
"ag-grid-angular": "31.2.0",
"ag-grid-community": "31.2.0",
"ag-grid-angular": "31.3.2",
"ag-grid-community": "31.3.2",
"autonumeric": "4.10.5",
"axe-core": "4.9.0",
"comment-json": "4.2.3",
Expand Down
Loading