From 37c2051e01d9e171e253c9086e9171b4392f1a0d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sun, 20 Dec 2020 00:37:37 -0800 Subject: [PATCH] Typos & code fixes --- .../filterable-dropdown.component.ts | 4 ++-- .../bulk-editor/bulk-editor.component.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index 10713cc00..bec6e1bef 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -67,7 +67,7 @@ export class FilterableDropdownComponent { types = FilterableDropdownType @Input() - tingular: boolean = false + singular: boolean = false @Output() toggle = new EventEmitter() @@ -92,7 +92,7 @@ export class FilterableDropdownComponent { constructor(private filterPipe: FilterPipe) { } toggleItem(toggleableItem: ToggleableItem): void { - if (this.tingular && toggleableItem.state == ToggleableItemState.Selected) { + if (this.singular && toggleableItem.state == ToggleableItemState.Selected) { this._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected) } this.toggle.emit(toggleableItem.item) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 66ad265de..053af8157 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -118,39 +118,39 @@ export class BulkEditorComponent { } tagsDropdownOpen() { - this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tsi => tsi.state == ToggleableItemState.Selected) + this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tti => tti.state == ToggleableItemState.Selected) } correspondentsDropdownOpen() { - this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(csi => csi.state == ToggleableItemState.Selected) + this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(cti => cti.state == ToggleableItemState.Selected) } documentTypesDropdownOpen() { - this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtsi => dtsi.state == ToggleableItemState.Selected) + this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtti => dtti.state == ToggleableItemState.Selected) } applyTags(selectedTags: PaperlessTag[]) { let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems) if (!unchanged) this.setTags.emit(selectedTags) - this.initiallySelectedTagsToggleableItems = null + this.initiallySelectedTagsToggleableItems = [] } applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) { let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems) if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null) - this.initiallySelectedCorrespondentsToggleableItems = null + this.initiallySelectedCorrespondentsToggleableItems = [] } applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) { let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems) if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null) - this.initiallySelectedDocumentTypesToggleableItems = null + this.initiallySelectedDocumentTypesToggleableItems = [] } equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean { // either both empty or all items must in toggleableItems and vice-versa return (toggleableItems.length == 0 && items.length == 0) || - (items.every(i => toggleableItems.find(si => si.item.id == i.id) !== undefined) && toggleableItems.every(si => items.find(i => i.id == si.item.id) !== undefined)) + (items.every(i => toggleableItems.find(ti => ti.item.id == i.id) !== undefined) && toggleableItems.every(ti => items.find(i => i.id == ti.item.id) !== undefined)) } applyDelete() {