rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: smart tag selection issue

Browse Source
This commit is contained in:
Mo Bitar
2021-03-06 11:25:12 -06:00
parent 01c35e46a5
commit af1a369e63
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/views/notes/notes_view.ts
View File

@@ -328,7 +328,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
* an index is roughly O(n^2). * an index is roughly O(n^2).
*/ */
private reloadNotesDisplayOptions() { private reloadNotesDisplayOptions() {
const tag = this.appState.selectedTag!; const tag = this.appState.selectedTag;
const searchText = this.getState().noteFilter.text.toLowerCase(); const searchText = this.getState().noteFilter.text.toLowerCase();
const searchQuery = searchText ? { const searchQuery = searchText ? {
query: searchText, query: searchText,
@@ -337,7 +337,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesState> {
const criteria = NotesDisplayCriteria.Create({ const criteria = NotesDisplayCriteria.Create({
sortProperty: this.state.sortBy! as CollectionSort, sortProperty: this.state.sortBy! as CollectionSort,
sortDirection: this.state.sortReverse! ? 'asc' : 'dsc', sortDirection: this.state.sortReverse! ? 'asc' : 'dsc',
tags: [tag], tags: tag ? [tag] : [],
includeArchived: this.getState().showArchived!, includeArchived: this.getState().showArchived!,
includePinned: !this.getState().hidePinned!, includePinned: !this.getState().hidePinned!,
searchQuery: searchQuery searchQuery: searchQuery

8
app/assets/javascripts/views/tags/tags_view.ts
View File

@@ -246,12 +246,8 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
this.selectTag(tag as SNTag); this.selectTag(tag as SNTag);
} }
} else if (data.item!.content_type === ContentType.SmartTag) { } else if (data.item!.content_type === ContentType.SmartTag) {
this.application.createTemplateItem( const matchingTag = this.getState().smartTags.find(t => t.uuid === data.item!.uuid);
ContentType.SmartTag, this.selectTag(matchingTag as SNSmartTag);
data.item!.content as PayloadContent
).then(smartTag => {
this.selectTag(smartTag as SNSmartTag);
});
} }
} else if (action === ComponentAction.ClearSelection) { } else if (action === ComponentAction.ClearSelection) {
this.selectTag(this.getState().smartTags[0]); this.selectTag(this.getState().smartTags[0]);