Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
55 changes: 2 additions & 53 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ on:
type: boolean
default: false
required: true
skip_bundle_size:
description: 'Skip bundle size tests'
type: boolean
default: true
required: true
run_package_tests:
description: 'Run package tests'
type: boolean
Expand Down Expand Up @@ -245,48 +240,6 @@ jobs:
path: |
reports/

bundle_size:
runs-on: ubuntu-latest
name: Bundle Size Tests
needs: calc_matrix
if: (needs.init.outputs.build_type == 'latest' && needs.calc_matrix.result == 'success' && !inputs.skip_bundle_size) || (needs.init.outputs.build_type == 'release' && inputs.run_bundle_tests)
strategy:
matrix: ${{ fromJson(needs.calc_matrix.outputs.bundle_test_matrix )}}
fail-fast: false
env:
NX_PARALLEL: 1
NX_BASE: ${{ needs.init.outputs.nx_base }}
steps:
- name: Checkout
id: checkout
uses: actions/checkout@v4
with:
fetch-depth: 1 # shallow copy

- name: Setup
id: setup
uses: ./.github/actions/setup-nx
with:
cache_mode: ro

# Disable now that module size tests are reported on PRs
# - name: module-size tests (non-sharded)
# if: matrix.shard == 0
# id: test-no-shard
# run: yarn nx ${{ github.event.inputs.nx_command || 'affected' }} -t test:e2e -c staging --exclude '!tag:module-size' --exclude 'tag:sharding' --exclude all
# - name: module-size tests
# if: matrix.shard != 0
# id: test
# run: yarn nx ${{ github.event.inputs.nx_command || 'affected' }} -t test:e2e -c staging --exclude '!tag:module-size' --exclude 'tag:non-sharding' --exclude all --shard=${{ matrix.shard }}/$((${{ strategy.job-total }} - 1))

- name: Persist test results
if: always() && matrix.shard != 0
uses: actions/upload-artifact@v4
with:
name: test-results-bundle-shard-${{matrix.shard}}
path: |
reports/

format_lint_build:
runs-on: ubuntu-latest
name: Format, Lint and Build
Expand Down Expand Up @@ -420,7 +373,7 @@ jobs:

report:
runs-on: ubuntu-24.04
needs: [ init, test, e2e, format_lint_build, docs, calc_matrix, bundle_size, fw_pkg_test, sonar_community, sonar_enterprise ]
needs: [ init, test, e2e, format_lint_build, docs, calc_matrix, fw_pkg_test, sonar_community, sonar_enterprise ]
if: cancelled() != true && github.event.pull_request.draft == false
permissions:
contents: write
Expand Down Expand Up @@ -461,8 +414,7 @@ jobs:
- name: Test Report
uses: dorny/test-reporter@v1
if: needs.test.result == 'success' || needs.test.result == 'failure' ||
needs.e2e.result == 'success' || needs.e2e.result == 'failure' ||
needs.bundle_size.result == 'success' || needs.bundle_size.result == 'failure'
needs.e2e.result == 'success' || needs.e2e.result == 'failure'
id: testReport
continue-on-error: true
with:
Expand All @@ -489,8 +441,6 @@ jobs:
WORKFLOW_STATUS="failure"
elif [ "${{ needs.fw_pkg_test.result }}" == "failure" ] ; then
WORKFLOW_STATUS="failure"
elif [ "${{ needs.bundle_size.result }}" == "failure" ] ; then
WORKFLOW_STATUS="failure"
elif [ "${{ needs.sonar_community.result }}" == "failure" ] ; then
WORKFLOW_STATUS="failure"
elif [ "${{ needs.sonar_enterprise.result }}" == "failure" ] ; then
Expand Down Expand Up @@ -568,7 +518,6 @@ jobs:
"FW_Pkg": "${{ needs.fw_pkg_test.result }}",
"e2e": "${{ needs.e2e.result }}",
"Docs": "${{ needs.docs.result }}",
"Bundle": "${{ needs.bundle_size.result }}",
"SonarCommunity": "${{ needs.sonar_community.result }}",
"SonarEnterprise": "${{ needs.sonar_enterprise.result }}"
}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/module-size-vs-release.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: Module Size vs Release

on:
push:
branches:
- 'latest'
- 'b[0-9][0-9]?.[0-9][0-9]?.[0-9][0-9]?'
workflow_dispatch:
inputs:
release_tag:
description: 'Release tag to compare against (e.g., b35.1.0)'
type: string
required: true
schedule:
# Run weekly on Monday at 9am UTC
- cron: '0 9 * * 1'

env:
NX_NO_CLOUD: true
Expand Down
7 changes: 1 addition & 6 deletions documentation/ag-grid-docs/astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import agLinkChecker from '../../external/ag-website-shared/plugins/agLinkChecke
import buildTime from './plugins/agBuildTime';
import agHotModuleReload from './plugins/agHotModuleReload';
import agHtaccessGen from './plugins/agHtaccessGen';
import agMergeSitemap from './plugins/agMergeSitemap';
import agRedirectsChecker from './plugins/agRedirectsChecker';
import { getSitemapConfig } from './src/utils/sitemap';
import { urlWithBaseUrl } from './src/utils/urlWithBaseUrl';
Expand Down Expand Up @@ -198,15 +197,11 @@ export default defineConfig({
buildTime(),
react(),
markdoc(),
sitemap(getSitemapConfig()),
sitemap(getSitemapConfig({ chartsSitemap: CHARTS_SITEMAP_INDEX_URL })),
agHtaccessGen({ include: HTACCESS === 'true' }),
agRedirectsChecker({
skip: CHECK_REDIRECTS !== 'true',
}),
agLinkChecker({ include: CHECK_LINKS === 'true' }),
agMergeSitemap({
// Merge charts sitemap
sitemapIndexUrl: CHARTS_SITEMAP_INDEX_URL,
}),
],
});
1 change: 0 additions & 1 deletion documentation/ag-grid-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"codesandbox-import-utils": "2.2.3",
"dompurify": "^3.2.6",
"downshift": "^9.0.6",
"fast-xml-parser": "^4.4.1",
"gif-frames": "^1.0.1",
"he": "^1.2.0",
"history": "^5.3.0",
Expand Down
66 changes: 0 additions & 66 deletions documentation/ag-grid-docs/plugins/agMergeSitemap.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import { Video } from '@ag-website-shared/components/video/Video';
import { InstallText } from '@ag-website-shared/components/install-text';
import { AutomatedIntegratedCharts } from '@ag-website-shared/components/automated-examples/AutomatedIntegratedCharts';
import { TrialButton } from '@ag-website-shared/components/trial-licence-modal/TrialButton';
import { EnterpriseTrial } from '@ag-website-shared/components/license-pricing/EnterpriseTrial';

// Site-specific components
import { getHeadingWithLogo } from '@utils/framework-landing-page-utils';
Expand Down
5 changes: 3 additions & 2 deletions documentation/ag-grid-docs/src/content.config.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { FRAMEWORKS } from '@constants';
import { ALL_INTERNAL_FRAMEWORKS, FRAMEWORKS } from '@constants';
// NOTE: Use glob, instead of file for single object files unless the file is an
// array of objects
import { glob } from 'astro/loaders';
import { defineCollection, z } from 'astro:content';

const framework = z.enum(FRAMEWORKS as any);
const internalFramework = z.enum(ALL_INTERNAL_FRAMEWORKS as any);

const docs = defineCollection({
loader: glob({ pattern: '**/[^_]*.mdoc', base: './src/content/docs' }),
Expand Down Expand Up @@ -328,7 +329,7 @@ const landingPages = defineCollection({
title: z.string(),
description: z.string(),
}),
framework: z.string().optional(),
framework: internalFramework.optional(),
packageName: z.string().optional(),
docsPath: z.string(),
analyticsPrefix: z.string(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "AG Grid Enterprise: Advanced Data Grid Features for Professional Applications",
"description": "Unlock AG Grid's full potential with Enterprise features including AI Toolkit, Server-Side Row Model, Row Grouping, Master/Detail, and Integrated Charts. Start your free trial today."
},
"framework": "react",
"framework": "reactFunctionalTs",
"packageName": "ag-grid-enterprise",
"docsPath": "data-grid",
"analyticsPrefix": "enterprise",
Expand Down
11 changes: 6 additions & 5 deletions documentation/ag-grid-docs/src/utils/sitemap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ export const isTestPage = (page: string) => {
const isRedirectPage = (page: string) => {
return (
page.endsWith('/documentation/') ||
page.endsWith('/react-data-grid/') ||
page.endsWith('/angular-data-grid/') ||
page.endsWith('/javascript-data-grid/') ||
page.endsWith('/vue-data-grid/') ||
(!page.endsWith('/landing-pages/react-data-grid/') && page.endsWith('/react-data-grid/')) ||
(!page.endsWith('/landing-pages/angular-data-grid/') && page.endsWith('/angular-data-grid/')) ||
(!page.endsWith('/landing-pages/javascript-data-grid/') && page.endsWith('/javascript-data-grid/')) ||
(!page.endsWith('/landing-pages/vue-data-grid/') && page.endsWith('/vue-data-grid/')) ||
page.includes(`/${FRAMEWORK_REDIRECT_PATH}/`)
);
};
Expand All @@ -60,8 +60,9 @@ const filterIgnoredPages = (page: string) => {
);
};

export function getSitemapConfig() {
export function getSitemapConfig({ chartsSitemap }: { chartsSitemap?: string }) {
return {
customSitemaps: chartsSitemap ? [chartsSitemap] : [],
filter: filterIgnoredPages,
changefreq: 'daily',
priority: 0.7,
Expand Down
1 change: 1 addition & 0 deletions packages/ag-grid-community/src/edit/editApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export function startEditingCell(beans: BeanCollection, params: StartEditingCell
{
event: key ? new KeyboardEvent('keydown', { key }) : undefined,
source: 'api',
editable: true,
}
);
}
Expand Down
4 changes: 3 additions & 1 deletion packages/ag-grid-community/src/edit/editService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,16 @@ export class EditService extends BeanStub implements NamedBean, IEditService {

this.strategy ??= this.createStrategy();

if (!this.isCellEditable(position, 'api')) {
const editable = params.editable ?? this.isCellEditable(position, 'api');
if (!editable) {
return;
}

// because of async in React, the cellComp may not be set yet, if no cellComp then we are
// yet to initialise the cell, so we re-schedule this operation for when celLComp is attached
const cellCtrl = _getCellCtrl(this.beans, position)!;
if (cellCtrl && !cellCtrl.comp) {
params.editable = undefined; // So we re-evaluate editable later
cellCtrl.onCompAttachedFuncs.push(() => this.startEditing(position, params));
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,13 @@ export class FullRowEditStrategy extends BaseEditStrategy {
if (suppressStartEditOnTab) {
nextCell.focusCell(true, event);
} else {
this.editSvc.startEditing(nextCell, { startedEdit: true, event, source, ignoreEventKey: true });
this.editSvc.startEditing(nextCell, {
startedEdit: true,
event,
source,
ignoreEventKey: true,
editable: nextEditable || undefined,
});
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,13 @@ export class SingleCellEditStrategy extends BaseEditStrategy {
if (suppressStartEditOnTab) {
nextCell.focusCell(true, event);
} else {
this.editSvc.startEditing(nextCell, { startedEdit: true, event, source, ignoreEventKey: true });
this.editSvc.startEditing(nextCell, {
startedEdit: true,
event,
source,
ignoreEventKey: true,
editable: nextEditable,
});
}
}

Expand Down
Loading
Loading