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

* feat(components/ag-grid): add support for AG Grid 31.3.2 * Update peer range
blackbaud · Jul 10, 2024 · cea996d · cea996d
1 parent 4d2d70a
commit cea996d
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 22 deletions.
diff --git a/libs/components/ag-grid/package.json b/libs/components/ag-grid/package.json
@@ -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",

diff --git a/...components/ag-grid/src/lib/modules/ag-grid/ag-grid-data-manager-adapter.directive.spec.ts b/...components/ag-grid/src/lib/modules/ag-grid/ag-grid-data-manager-adapter.directive.spec.ts
@@ -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',
   ]);

diff --git a/libs/components/ag-grid/src/lib/modules/ag-grid/ag-grid-wrapper.component.spec.ts b/libs/components/ag-grid/src/lib/modules/ag-grid/ag-grid-wrapper.component.spec.ts
@@ -509,6 +509,7 @@ describe('SkyAgGridWrapperComponent via fixture', () => {
       'ag-floating-top',
       'ag-body',
       'ag-sticky-top',
+      'ag-sticky-bottom',
       'ag-floating-bottom',
       'ag-overlay',
     ]);
@@ -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',
@@ -547,6 +549,7 @@ describe('SkyAgGridWrapperComponent via fixture', () => {
       'ag-floating-top',
       'ag-body',
       'ag-sticky-top',
+      'ag-sticky-bottom',
       'ag-floating-bottom',
       'ag-overlay',
     ]);
@@ -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',

diff --git a/libs/components/packages/package.json b/libs/components/packages/package.json
@@ -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"
     }
   },

diff --git a/libs/components/packages/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.spec.ts b/libs/components/packages/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.spec.ts
@@ -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> {

diff --git a/libs/components/packages/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.ts b/libs/components/packages/src/schematics/ag-grid-migrate/ag-grid-migrate.schematic.ts
@@ -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 {
@@ -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,
       ];

diff --git a/...components/packages/src/schematics/migrations/update-10/ag-grid/ag-grid.schematic.spec.ts b/...components/packages/src/schematics/migrations/update-10/ag-grid/ag-grid.schematic.spec.ts
@@ -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(
@@ -70,7 +70,7 @@ describe('ag-grid.schematic', () => {
     await runner.runSchematic('ag-grid', {}, tree);
     expect(JSON.parse(tree.readText('/package.json'))).toEqual({
       dependencies: {
-        'ag-grid-community': `~${UPDATE_TO_VERSION}`,
+        'ag-grid-community': `^${UPDATE_TO_VERSION}`,
         'ag-grid-angular': UPDATE_TO_VERSION,
       },
     });

diff --git a/libs/components/packages/src/schematics/migrations/update-10/ag-grid/ag-grid.schematic.ts b/libs/components/packages/src/schematics/migrations/update-10/ag-grid/ag-grid.schematic.ts
@@ -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.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",