fix: smart tags

This commit is contained in:
Baptiste Grob
2020-09-09 16:56:38 +02:00
parent 553f057dbf
commit 9a9d2c4085
3 changed files with 9 additions and 26 deletions

View File

@@ -851,7 +851,7 @@ class EditorViewCtrl extends PureViewCtrl<{}, EditorState> {
for (const tag of removeTags) {
await this.application.changeItem(tag.uuid, (mutator) => {
mutator.removeItemAsRelationship(note);
})
});
}
const newRelationships: SNTag[] = [];
for (const title of strings) {

View File

@@ -13,7 +13,6 @@ export enum NoteSortKey {
export function notePassesFilter(
note: SNNote,
selectedTag: SNTag,
showArchived: boolean,
hidePinned: boolean,
filterText: string
@@ -21,17 +20,6 @@ export function notePassesFilter(
let canShowArchived = showArchived;
const canShowPinned = !hidePinned;
if (!selectedTag.isTrashTag && note.trashed) {
return false;
}
const isSmartTag = selectedTag.isSmartTag();
if (isSmartTag) {
canShowArchived = (
canShowArchived ||
selectedTag.isArchiveTag ||
selectedTag.isTrashTag
);
}
if (
(note.archived && !canShowArchived) ||
(note.pinned && !canShowPinned)
@@ -79,4 +67,4 @@ function stringIsUuid(text: string) {
);
// eslint-disable-next-line no-unneeded-ternary
return matches ? true : false;
}
}

View File

@@ -11,7 +11,6 @@ import {
WebPrefKey,
findInArray,
CollectionSort,
SNSmartTag
} from 'snjs';
import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
import { AppStateEvent } from '@/ui_models/app_state';
@@ -331,23 +330,19 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
*/
private reloadNotesDisplayOptions() {
const tag = this.appState.selectedTag!;
this.application.setDisplayOptions(
ContentType.Note,
this.getState().sortBy! as CollectionSort,
this.getState().sortReverse! ? 'asc' : 'dsc',
this.application!.setNotesDisplayOptions(
tag,
this.state.sortBy! as CollectionSort,
this.state.sortReverse! ? 'asc' : 'dsc',
(note: SNNote) => {
const matchesTag = tag.isSmartTag()
? note.satisfiesPredicate((tag as SNSmartTag).predicate)
: tag.hasRelationshipWithItem(note);
return matchesTag && notePassesFilter(
return notePassesFilter(
note,
this.appState.selectedTag!,
this.getState().showArchived!,
this.getState().hidePinned!,
this.getState().noteFilter.text.toLowerCase()
)
);
}
)
);
}
currentTagCanHavePlaceholderNotes() {