fix: keep translations during PUT json object when 'skipTranslation=true' is set [DHIS2-10660] #7538
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
…rue' is set [TECH-571]
|
Kudos, SonarCloud Quality Gate passed! |
mortenoh
approved these changes
Mar 8, 2021
jbee
changed the title
vietnguyen
approved these changes
Mar 9, 2021
jenniferarnesen
added a commit
to dhis2/dashboard-app
that referenced
this pull request
Mar 9, 2021
After the switch from d2 to DataQuery, translations were being deleted when a dashboard is saved. This is because the skipTranslation=true param was missing. This and skipSharing=true have been added now, but the api currently has a bug in that it does not observe these params. The backend fix is here: dhis2/dhis2-core#7538 Changes to EditBar: there is no need to set the dashboard display name in the onTranslationsSaved callback, since the display name will be fetched with the updated dashboard when user returns to ViewMode. So code for setting display name in actions and reducers was removed.
dhis2-bot
added a commit
to dhis2/dashboard-app
that referenced
this pull request
Mar 9, 2021
## [31.13.7](v31.13.6...v31.13.7) (2021-03-09) ### Bug Fixes * add scatter icon for ItemSelector ([#1614](#1614)) ([66ac287](66ac287)) * calc fullscreen height of visualization based on window height ([#1621](#1621)) ([13c79b9](13c79b9)) * preserve sharing and translations when saving dashboard ([#1611](#1611)) ([802405d](802405d)), closes [dhis2/dhis2-core#7538](dhis2/dhis2-core#7538) * use window height to determine controlbar height ([#1620](#1620)) ([d7d730f](d7d730f))
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.
Problem
The
PUTJSON object operation in generic CRUD controller does replace (clear) the translations even when using theskipTranslation=trueparameter.Findings
The
skipTranslationflag was not forwarded toMergeParamsperforming the merge between existing and update object.This did however not fix the issue because somewhere during or because of the preheat the translations get lost for the persisted object so that at the point of the merge both the updating and the persisted object do not have translations.
I investigated but this feels like a bigger issue in the preheat, a box I did not want to open but that should be opened in a dedicated ticket.
Instead I used a workaround in the controller for the
PUToperation.When translations should be skipped the persisted object is loaded and the translations copied over to the parsed object so that they appear as part of the source. With this the merge obviously now should not skip translations so the flag is flipped.
Automatic testing
A new test was added to the
AbstractCrudControllerTestwith the following scenario:skipTranslation=true)