Skip to content

Commit

Permalink
resolved PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
harshmeetTS committed Jul 18, 2024
1 parent a5c84f4 commit e7a234d
Showing 1 changed file with 31 additions and 28 deletions.
59 changes: 31 additions & 28 deletions src/main/custom-chart-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ export type CustomChartContextProps = {
allowedConfigurations?: AllowedConfigurations;
};

export type ValidationFunctions =
| CustomChartContextProps['validateVisualProps']
| CustomChartContextProps['validateConfig'];

/**
* Default configuration options for all the chart context properties
*/
Expand Down Expand Up @@ -491,6 +495,24 @@ export class CustomChartContext {
}
}

private validationsResponseProcessor(
currentValidationState: Partial<ChartModel>,
validationResponse: ValidationResponse,
) {
const visualPropEditorDefinition = this.getVisualPropEditorDefinition(
currentValidationState,
);
const chartConfigEditorDefinition = this.getChartConfigEditorDefinition(
currentValidationState,
);

return {
...validationResponse,
visualPropEditorDefinition,
chartConfigEditorDefinition,
};
}

/**
* Function to emit Chart to TS Events to the TS application.
Expand Down Expand Up @@ -598,20 +620,11 @@ export class CustomChartContext {
const currentVisualState = {
visualProps: payload.visualProps,
};
const visualPropEditorDefinition =
this.getVisualPropEditorDefinition(
currentVisualState,
);
const chartConfigEditorDefinition =
this.getChartConfigEditorDefinition(
currentVisualState,
);

return {
...validationResponse,
visualPropEditorDefinition,
chartConfigEditorDefinition,
};

return this.validationsResponseProcessor(
currentVisualState,
validationResponse,
);
}
return validationResponse;
}
Expand Down Expand Up @@ -645,20 +658,10 @@ export class CustomChartContext {
chartConfig: payload.chartConfig,
},
};
const chartConfigEditorDefinition =
this.getChartConfigEditorDefinition(
currentConfigState,
);

const visualPropEditorDefinition =
this.getVisualPropEditorDefinition(
currentConfigState,
);
return {
...validationResponse,
visualPropEditorDefinition,
chartConfigEditorDefinition,
};
return this.validationsResponseProcessor(
currentConfigState,
validationResponse,
);
}
return validationResponse;
}
Expand Down

0 comments on commit e7a234d

Please sign in to comment.