[FIX] figure,chart: Enforce unicity of figure ids #2157
Closed
Conversation
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
pro-odoo
reviewed
Mar 3, 2023
rrahir
force-pushed
the
15.0-fix-charts-rar
branch
from
69422fd
to
acf96cf
Compare
LucasLefevre
reviewed
Mar 3, 2023
| @@ -239,7 +242,7 @@ export class ChartPanel extends Component<Props, SpreadsheetEnv> { | |||
| private updateChart(definition: ChartUIDefinitionUpdate): DispatchResult { | |||
| return this.env.dispatch("UPDATE_CHART", { | |||
| id: this.props.figure.id, | |||
| sheetId: this.getters.getActiveSheetId(), | |||
| sheetId: this.state.chartSheetId, | |||
There was a problem hiding this comment.
sheetId in this command is still unused, right ?
There was a problem hiding this comment.
not here ,but it's actually used starting v16.0
| this.state.chart = this.env.getters.getChartDefinitionUI( | ||
| this.env.getters.getActiveSheetId(), | ||
| this.state.chartSheetId, |
There was a problem hiding this comment.
why is it in the state ?
There was a problem hiding this comment.
no good reason , no need for reactivity as it changes with the figure - you're right
src/migrations/data.ts
Outdated
| @@ -343,6 +385,55 @@ function dropCommands(initialMessages, commandType: string) { | |||
| return messages; | |||
| } | |||
|
|
|||
| function fixUpdateChart(data: Partial<WorkbookData>, initialMessages: StateUpdateMessage[]) { | |||
There was a problem hiding this comment.
I don't understand why it's needed since cmd.sheetId is unused anyway
(and should be eventually removed)
There was a problem hiding this comment.
again, used in 16.0+ atm
rrahir
force-pushed
the
15.0-fix-charts-rar
branch
2 times, most recently
from
a1a1d02
to
dc9c259
Compare
The issue of duplicated chart ids was first addressed in PR #2102 by trying to defined chart ids per sheet (just like figures) Unfortunately, the fix was not appropriate for several reasons: 1. Some commands in Odoo were not dispatching the sheetId along with the chartId, making the mapping sheetId, chartId hazardous 2. There was absolutely 0 verification that the commands targeting a chartId were also providing a sheet Id that matched. So the said commands cannot be trusted either This commit is exploring the other solution that is forcing the unicity of a figure id. The data are adapted so that figures with a duplicated id well have the latter updated to ensure unicity. This commit also tries to solve the wrong `sheetId` parameter in `UPDATE_CHART` by simply ignoring it in the commands. It's not necesarry since we now have the unicity of figure ids.
rrahir
force-pushed
the
15.0-fix-charts-rar
branch
from
dc9c259
to
0227135
Compare
robodoo
pushed a commit
that referenced
this pull request
Mar 3, 2023
The issue of duplicated chart ids was first addressed in PR #2102 by trying to defined chart ids per sheet (just like figures) Unfortunately, the fix was not appropriate for several reasons: 1. Some commands in Odoo were not dispatching the sheetId along with the chartId, making the mapping sheetId, chartId hazardous 2. There was absolutely 0 verification that the commands targeting a chartId were also providing a sheet Id that matched. So the said commands cannot be trusted either This commit is exploring the other solution that is forcing the unicity of a figure id. The data are adapted so that figures with a duplicated id well have the latter updated to ensure unicity. This commit also tries to solve the wrong `sheetId` parameter in `UPDATE_CHART` by simply ignoring it in the commands. It's not necesarry since we now have the unicity of figure ids. closes #2157 Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
This was referenced Mar 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description:
The issue of duplicated chart ids was first addressed in PR #2102 by
trying to defined chart ids per sheet (just like figures)
Unfortunately, the fix was not appropriate for several reasons:
chartId, making the mapping sheetId, chartId hazardous
chartId were also providing a sheet Id that matched. So the said
commands cannot be trusted either
This commit is exploring the other solution that is forcing the unicity
of a figure id. The data are adapted so that figures with a duplicated
id well have the latter updated to ensure unicity.
This commit also tries to solve the wrong
sheetIdparameter inUPDATE_CHARTby simply ignoring it in the commands. It's not necesarrysince we now have the unicity of figure ids.
15.0-fix-charts-rar (#2157)
description of this task, what is implemented and why it is implemented that way.
Odoo task ID : TASK_ID
review checklist