Dynamic configuration and visual props #29
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,10 @@ | |
| * Copyright: ThoughtSpot Inc. 2023 | ||
| */ | ||
|
|
||
| import { | ||
| ValidationResponse, | ||
| VisualPropEditorDefinition, | ||
| } from '@thoughtspot/ts-chart-sdk'; | ||
| import { | ||
| ChartColumn, | ||
| ChartConfig, | ||
|
|
@@ -21,7 +25,9 @@ import { | |
| Query, | ||
| VisualProps, | ||
| } from '@thoughtspot/ts-chart-sdk'; | ||
| import { ChartConfigEditorDefinition } from '@thoughtspot/ts-chart-sdk/src'; | ||
| import Chart from 'chart.js/auto'; | ||
| import { toDimension } from 'chart.js/dist/helpers/helpers.core'; | ||
| import ChartDataLabels from 'chartjs-plugin-datalabels'; | ||
| import _ from 'lodash'; | ||
|
|
||
|
|
@@ -37,22 +43,9 @@ const visualPropKeyMap = { | |
| 2: 'accordion.datalabels', | ||
| }; | ||
|
|
||
| function getDataForColumn(column: ChartColumn, dataArr: DataPointsArray) { | ||
| const idx = _.findIndex(dataArr.columns, (colId) => column.id === colId); | ||
| return _.map(dataArr.dataValue, (row) => row[idx]); | ||
| } | ||
|
|
||
| function getColumnDataModel( | ||
|
|
@@ -151,6 +144,11 @@ function render(ctx: CustomChartContext) { | |
| visualPropKeyMap[2], | ||
| false, | ||
| ); | ||
| const labelColor = _.get( | ||
| chartModel.visualProps, | ||
| visualPropKeyMap[1], | ||
| availableColor[0], | ||
| ); | ||
| if (!dataModel) { | ||
| return; | ||
| } | ||
|
|
@@ -174,11 +172,8 @@ function render(ctx: CustomChartContext) { | |
| plugins: { | ||
| // Change options for ALL labels of THIS CHART | ||
| datalabels: { | ||
|
Comment on lines
-178
to
-181
There was a problem hiding this comment. how are these properties working today? |
||
| display: allowLabels, | ||
|
There was a problem hiding this comment. display takes true now? There was a problem hiding this comment. https://chartjs-plugin-datalabels.netlify.app/guide/positioning.html#rotation will depend on implementation, true is also a valid value as mentioned above in the documentation |
||
| color: labelColor, | ||
| labels: { | ||
| title: { | ||
| font: { | ||
|
|
@@ -268,12 +263,12 @@ const renderChart = async (ctx: CustomChartContext): Promise<void> => { | |
|
|
||
| const measureColumns = _.filter( | ||
| cols, | ||
| (col) => col.type === ColumnType.MEASURE, | ||
| ); | ||
|
|
||
| const attributeColumns = _.filter( | ||
| cols, | ||
| (col) => col.type === ColumnType.ATTRIBUTE, | ||
| ); | ||
|
|
||
| const axisConfig: ChartConfig = { | ||
|
|
@@ -311,35 +306,77 @@ const renderChart = async (ctx: CustomChartContext): Promise<void> => { | |
| ); | ||
| return queries; | ||
| }, | ||
| renderChart: (ctx) => renderChart(ctx), | ||
| validateConfig: ( | ||
| updatedConfig: any[], | ||
| chartModel: any, | ||
| ): ValidationResponse => { | ||
| if (updatedConfig.length <= 0) { | ||
| return { | ||
| isValid: false, | ||
| validationErrorMessage: ['Invalid config. no config found'], | ||
| }; | ||
| } else { | ||
| return { | ||
| isValid: true, | ||
| }; | ||
| } | ||
| }, | ||
| chartConfigEditorDefinition: ( | ||
|
There was a problem hiding this comment. for backward compatibility verification should we keep this as it is? There was a problem hiding this comment. I have checked the backwards compatibilty it is working for both object and function we can keep it like this for a sample chart. |
||
| currentChartConfig: ChartModel, | ||
| ctx: CustomChartContext, | ||
| ): ChartConfigEditorDefinition[] => { | ||
| const { config, visualProps } = currentChartConfig; | ||
|
|
||
| const yColumns = config?.chartConfig?.[0]?.dimensions.find( | ||
| (dimension) => dimension.key === 'y' && dimension.columns, | ||
| ); | ||
|
|
||
| const configDefinition = [ | ||
| { | ||
| key: 'column', | ||
| label: 'Custom Column', | ||
| descriptionText: | ||
| 'X Axis can only have attributes, Y Axis can only have measures, Color can only have attributes. ' + | ||
| 'Should have just 1 column in Y axis with colors columns.', | ||
| columnSections: [ | ||
| { | ||
| key: 'x', | ||
| label: 'Custom X Axis', | ||
| allowAttributeColumns: true, | ||
| allowMeasureColumns: false, | ||
| allowTimeSeriesColumns: true, | ||
| maxColumnCount: 1, | ||
| }, | ||
| { | ||
| key: 'y', | ||
| label: 'Custom Y Axis', | ||
| allowAttributeColumns: false, | ||
| allowMeasureColumns: true, | ||
| allowTimeSeriesColumns: false, | ||
| }, | ||
| ], | ||
| }, | ||
| ]; | ||
| if (yColumns?.columns.length) { | ||
| for (let i = 0; i < yColumns.columns.length; i++) { | ||
| configDefinition[0].columnSections.push({ | ||
|
There was a problem hiding this comment. where are we using this? There was a problem hiding this comment. This I have added for an example purpose, when we are adding measures to y-axis, a new layer will be created with the same. |
||
| key: `layers${i}`, | ||
| label: `Measures layer${i}`, | ||
| allowAttributeColumns: false, | ||
| allowMeasureColumns: true, | ||
| allowTimeSeriesColumns: false, | ||
| }); | ||
| } | ||
| } | ||
| return configDefinition; | ||
| }, | ||
| visualPropEditorDefinition: ( | ||
| currentVisualProps: ChartModel, | ||
| ctx: CustomChartContext, | ||
| ): VisualPropEditorDefinition => { | ||
| const { visualProps } = currentVisualProps; | ||
| const elements = [ | ||
| { | ||
| key: 'color', | ||
| type: 'radio', | ||
|
|
@@ -352,13 +389,6 @@ const renderChart = async (ctx: CustomChartContext): Promise<void> => { | |
| key: 'accordion', | ||
| label: 'Accordion', | ||
| children: [ | ||
| { | ||
| key: 'datalabels', | ||
| type: 'toggle', | ||
|
|
@@ -367,7 +397,19 @@ const renderChart = async (ctx: CustomChartContext): Promise<void> => { | |
| }, | ||
| ], | ||
| }, | ||
| ]; | ||
| if (visualProps?.length !== 0) { | ||
|
There was a problem hiding this comment. this is not an array but an object right? There was a problem hiding this comment. element is an array, visualPropEditordefinition is an Object |
||
| if (visualProps?.accordion?.datalabels) { | ||
|
There was a problem hiding this comment. whats the value in this change? I see no difference? |
||
| elements[1].children?.push({ | ||
| key: 'Color2', | ||
| type: 'radio', | ||
| defaultValue: 'blue', | ||
| values: ['blue', 'white', 'red'], | ||
| label: 'Color2', | ||
| }); | ||
| } | ||
| } | ||
| return { elements }; | ||
| }, | ||
| }); | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we seem to have removed a lot of properties... is this working as expected?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is working