Desktop: Fixes #4411: Count tags based on showCompletedTodos setting #4957
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
JackGruber
changed the title
laurent22
changed the title
laurent22
reviewed
May 18, 2021
| @@ -448,7 +448,7 @@ class SidebarComponent extends React.Component<Props, State> { | |||
|
|
|||
| renderTag(tag: any, selected: boolean) { | |||
| const anchorRef = this.anchorItemRef('tag', tag.id); | |||
| const noteCount = Setting.value('showNoteCounts') ? this.renderNoteCount(tag.note_count) : ''; | |||
| const noteCount = Setting.value('showNoteCounts') ? Setting.value('showCompletedTodos') ? this.renderNoteCount(tag.note_count) : this.renderNoteCount(tag.note_count - tag.todo_completed_count) : ''; | |||
There was a problem hiding this comment.
Could you refactor this logic to avoid the nested ternary operators? This is to clarify a bit the logic.
packages/app-cli/tests/models_Tag.ts
Outdated
| @@ -123,21 +133,25 @@ describe('models_Tag', function() { | |||
| expect(commonTags.length).toBe(0); | |||
|
|
|||
| commonTags = await Tag.commonTagsByNoteIds([note0.id, note1.id, note2.id, note3.id]); | |||
| // @ts-ignore | |||
There was a problem hiding this comment.
Why do we need ts-ignore here?
There was a problem hiding this comment.
I can't figure out why I added the ts-ignore, I have removed them.
|
Ok I have made the performance test on Android, with the following items count: No difference was noticeable on my Motorola X4, 5 second with screen with the DB version 37 and 5-6 seconds during the upgrade from 37 to 38. |
laurent22
reviewed
May 19, 2021
packages/app-cli/tests/models_Tag.ts
Outdated
Comment on lines
135
to
155
| commonTags = await Tag.commonTagsByNoteIds([note0.id, note1.id, note2.id, note3.id]); | ||
|
|
||
| let commonTagIds = commonTags.map(t => t.id); | ||
| expect(commonTagIds.length).toBe(0); | ||
|
|
||
| commonTags = await Tag.commonTagsByNoteIds([note1.id, note2.id, note3.id]); | ||
|
|
||
| commonTagIds = commonTags.map(t => t.id); | ||
| expect(commonTagIds.length).toBe(1); | ||
| expect(commonTagIds.includes(taga.id)).toBe(true); | ||
|
|
||
| commonTags = await Tag.commonTagsByNoteIds([note2.id, note3.id]); | ||
|
|
||
| commonTagIds = commonTags.map(t => t.id); | ||
| expect(commonTagIds.length).toBe(2); | ||
| expect(commonTagIds.includes(taga.id)).toBe(true); | ||
| expect(commonTagIds.includes(tagb.id)).toBe(true); | ||
|
|
||
| commonTags = await Tag.commonTagsByNoteIds([note3.id]); | ||
|
|
||
| commonTagIds = commonTags.map(t => t.id); |
There was a problem hiding this comment.
It's a small thing, but you could you remove the white space changes please? Just to keep the diff and blame history simpler.
|
Looks good now, thanks @JackGruber! |
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.
Count the completed todos at the tag sidebar based on the showCompletedTodos setting.