Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ const DefaultAxisSettings = (): AxisSeriesSettings => ({
},
})

/** Deep clone settings to prevent shared references between Y-axis entries */
const cloneSettings = (settings: AxisSeriesSettings): AxisSeriesSettings =>
mergeObject({}, settings) as AxisSeriesSettings

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we are already using lodash.mergeObject here, but structuredClone would probably be the more idiomatic way in this codebase.


const cloneOrDefaultSettings = (settings?: AxisSeriesSettings): AxisSeriesSettings =>
settings ? cloneSettings(settings) : DefaultAxisSettings()

const TRANSPOSED_FIELD_COLUMN_NAME = '__transpose_field__'
const TRANSPOSED_ROW_COLUMN_PREFIX = '__transpose_row__'

Expand Down Expand Up @@ -485,7 +492,7 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
if (node.tableSettings?.columns) {
return node.tableSettings.columns.map((column) => ({
name: column.column,
settings: column.settings ?? DefaultAxisSettings(),
settings: cloneOrDefaultSettings(column.settings),
}))
}
return state
Expand Down Expand Up @@ -561,14 +568,14 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
selectedYAxis: [
(props.query.chartSettings?.yAxis?.map((axis) => ({
name: axis.column,
settings: axis.settings ?? DefaultAxisSettings(),
settings: cloneOrDefaultSettings(axis.settings),
})) ?? null) as (SelectedYAxis | null)[] | null,
{
_setQuery: (state, { node }) => {
if (node.chartSettings?.yAxis) {
return node.chartSettings.yAxis.map((axis) => ({
name: axis.column,
settings: axis.settings ?? DefaultAxisSettings(),
settings: cloneOrDefaultSettings(axis.settings),
}))
}
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Resolved
return state
Expand Down Expand Up @@ -1192,12 +1199,12 @@ export const dataVisualizationLogic = kea<dataVisualizationLogicType>([
...query,
chartSettings: {
...query.chartSettings,
yAxis: yColumns.map((n) => ({ column: n.name, settings: n.settings })),
yAxis: yColumns.map((n) => ({ column: n.name, settings: cloneSettings(n.settings) })),
xAxis: xColumn,
},
tableSettings: {
...query.tableSettings,
columns: columns.map((n) => ({ column: n.name, settings: n.settings })),
columns: columns.map((n) => ({ column: n.name, settings: cloneSettings(n.settings) })),
},
}))
},
Expand Down
Loading