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

fix: remove recursive tag deletion

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-06-16 12:28:32 -03:00
parent a85d2b9676
commit 124f7779c3
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/ui_models/app_state/note_tags_state.ts
View File

@@ -198,15 +198,9 @@ export class NoteTagsState {
async removeTagFromActiveNote(tag: SNTag): Promise<void> { async removeTagFromActiveNote(tag: SNTag): Promise<void> {
const { activeNote } = this; const { activeNote } = this;
if (activeNote) { if (activeNote) {
const descendantTags = this.application.getTagDescendants(tag); await this.application.changeItem(tag.uuid, (mutator) => {
const tagsToRemove = [...descendantTags, tag]; mutator.removeItemAsRelationship(activeNote);
await Promise.all( });
tagsToRemove.map(async (tag) => {
await this.application.changeItem(tag.uuid, (mutator) => {
mutator.removeItemAsRelationship(activeNote);
});
})
);
this.application.sync(); this.application.sync();
this.reloadTags(); this.reloadTags();
} }

16
app/assets/javascripts/ui_models/app_state/notes_state.ts
View File

@@ -346,17 +346,11 @@ export class NotesState {
async removeTagFromSelectedNotes(tag: SNTag): Promise<void> { async removeTagFromSelectedNotes(tag: SNTag): Promise<void> {
const selectedNotes = Object.values(this.selectedNotes); const selectedNotes = Object.values(this.selectedNotes);
const descendantTags = this.application.getTagDescendants(tag); await this.application.changeItem(tag.uuid, (mutator) => {
const tagsToRemove = [...descendantTags, tag]; for (const note of selectedNotes) {
await Promise.all( mutator.removeItemAsRelationship(note);
tagsToRemove.map(async (tag) => { }
await this.application.changeItem(tag.uuid, (mutator) => { });
for (const note of selectedNotes) {
mutator.removeItemAsRelationship(note);
}
});
})
);
this.application.sync(); this.application.sync();
} }