-
Notifications
You must be signed in to change notification settings - Fork 323
Fix missing due date remember icons #7626
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
theoholl
wants to merge
6
commits into
main
Choose a base branch
from
7511-missing-icons-on-shared-boards-dropdown
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+57
−8
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
711373e
Add default icon and load settings lazily
theoholl 8d352dd
Restore shared board reminder labels and lazy-load settings on menu open
theoholl 610d277
Give submenu items regular font weight
theoholl 1c28b03
Merge branch 'main' into 7511-missing-icons-on-shared-boards-dropdown
theoholl 0d0b32d
Fix linting errors
theoholl 0bb7863
Merge branch 'main' into 7511-missing-icons-on-shared-boards-dropdown
theoholl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -252,6 +252,23 @@ | |
| setCurrentCard(state, card) { | ||
| state.currentCard = card | ||
| }, | ||
| setBoardSettings(state, { boardId, settings }) { | ||
| const indexExisting = state.boards.findIndex((board) => board.id === boardId) | ||
|
|
||
| if (indexExisting > -1) { | ||
| Vue.set(state.boards[indexExisting], 'settings', { | ||
| ...(state.boards[indexExisting].settings || {}), | ||
| ...settings, | ||
| }) | ||
| } | ||
|
|
||
| if (state.currentBoard?.id === boardId) { | ||
| Vue.set(state.currentBoard, 'settings', { | ||
| ...(state.currentBoard.settings || {}), | ||
| ...settings, | ||
| }) | ||
| } | ||
| }, | ||
|
|
||
| // label mutators | ||
| removeLabelFromCurrentBoard(state, labelId) { | ||
|
|
@@ -309,6 +326,11 @@ | |
| setFullApp({ commit }, isFullApp) { | ||
| commit('setFullApp', isFullApp) | ||
| }, | ||
| async hydrateBoardSettings({ commit }, boardId) { | ||
| const board = await apiClient.loadById(boardId) | ||
| commit('setBoardSettings', { boardId, settings: board.settings || {} }) | ||
| return board.settings || {} | ||
| }, | ||
| async setConfig({ commit }, config) { | ||
| for (const key in config) { | ||
| try { | ||
|
|
@@ -380,7 +402,7 @@ | |
| commit('addBoard', board) | ||
| }) | ||
| }, | ||
| /** | ||
|
Check warning on line 405 in src/store/main.js
|
||
| * Updates a board API side. | ||
| * | ||
| * @param commit.commit | ||
|
|
||
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.
I wouldn't remove that code, we can still show the correct icon (same for the text).
You can use the @update:menuOpen hook on the NcAppNavigationItem in line 16, so when the menu is opened you can load the settings. I think that's the best option because then we don't show an icon only until the board is loaded and then have the correct one displayed.
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.
Gotcha, should be ok now?