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

Jump to bottom

AG-9042 - Disable complex object handling for Integrated case. #6946

Closed
wants to merge 1 commit into from
Closed

AG-9042 - Disable complex object handling for Integrated case. #6946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts-community-modules/ag-charts-community/src/chart/chart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ export abstract class Chart extends Observable implements AgChartInstance {
this.assignSeriesToAxes();
}

const dataController = new DataController();
const dataController = new DataController(this.mode);
const seriesPromises = this.series.map((s) => s.processData(dataController));
await dataController.execute();
await Promise.all(seriesPromises);
Expand Down
4 changes: 2 additions & 2 deletions charts-community-modules/ag-charts-community/src/chart/data/dataController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class DataController {
private requested: RequestedProcessing<any, any, any>[] = [];
private status: 'setup' | 'executed' = 'setup';

public constructor() {}
public constructor(private readonly mode: 'standalone' | 'integrated') {}

public async request<
D extends object,
Expand Down Expand Up @@ -72,7 +72,7 @@ export class DataController {

for (const { opts, data, resultCbs, rejects, ids } of merged) {
try {
const dataModel = new DataModel<any>(opts);
const dataModel = new DataModel<any>({ ...opts, mode: this.mode });
const processedData = dataModel.processData(data);
if (processedData && processedData.partialValidDataCount === 0) {
resultCbs.forEach((cb) => cb({ dataModel, processedData }));
Expand Down
12 changes: 10 additions & 2 deletions charts-community-modules/ag-charts-community/src/chart/data/dataModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,15 @@ export class DataModel<
private readonly propertyProcessors: (PropertyValueProcessorDefinition<D> & InternalDefinition)[];
private readonly reducers: (ReducerOutputPropertyDefinition<any> & InternalDefinition)[];
private readonly processors: (ProcessorOutputPropertyDefinition<any> & InternalDefinition)[];
private readonly mode: 'standalone' | 'integrated';

public constructor(opts: DataModelOptions<K, Grouped>) {
const { props } = opts;
public constructor(
opts: DataModelOptions<K, Grouped> & {
readonly mode?: 'standalone' | 'integrated';
}
) {
const { props, mode = 'standalone' } = opts;
this.mode = mode;

// Validate that keys appear before values in the definitions, as output ordering depends
// on configuration ordering, but we process keys before values.
Expand Down Expand Up @@ -915,6 +921,8 @@ export class DataModel<

buildAccessors(...defs: { property: string }[]) {
const result: Record<string, (d: any) => any> = {};
if (this.mode === 'integrated') return result;

for (const def of defs) {
const isPath = def.property.indexOf('.') >= 0 || def.property.indexOf('[') >= 0;
if (!isPath) continue;
Expand Down