OBPIH-4277 Add option to make separate dashboard pages #3374
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
awalkowiak
requested changes
Jul 22, 2022
There was a problem hiding this comment.
@kchelstowski Overall code looks good, I found one issue that needs to be resolved.
| // If the size is different, that mean that the config has changed | ||
| if (userConfigSize != configSize) { | ||
| return config | ||
| if (userConfigSize != resultConfigSize) { |
There was a problem hiding this comment.
If the userConfig (which is based on the main dashboard) will have the same size as for example supplier dashboard stored in the resultConfig, then the user config will be returned instead of another dashboard by id.
| def getDashboardConfig(User user, String id) { | ||
| def fullConfig = grailsApplication.config.openboxes.dashboardConfig | ||
| def resultConfig = [ | ||
| dashboards: fullConfig.dashboards[id ?: "mainDashboard"], |
There was a problem hiding this comment.
This could be now singular (dashboard).
| def resultConfig = [ | ||
| dashboards: fullConfig.dashboards[id ?: "mainDashboard"], | ||
| dashboardWidgets: fullConfig.dashboardWidgets | ||
| ] | ||
| def userConfig = user.deserializeDashboardConfig() | ||
| Boolean configChanged = false |
There was a problem hiding this comment.
I think this boolean has no sense right now. Could you remove it?
awalkowiak
approved these changes
Jul 22, 2022
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.
Best to test locally.