Typos & code fixes

This commit is contained in:
Michael Shamoon 2020-12-20 00:37:37 -08:00
parent 3561935e1b
commit 37c2051e01
2 changed files with 9 additions and 9 deletions

View File

@ -67,7 +67,7 @@ export class FilterableDropdownComponent {
types = FilterableDropdownType types = FilterableDropdownType
@Input() @Input()
tingular: boolean = false singular: boolean = false
@Output() @Output()
toggle = new EventEmitter() toggle = new EventEmitter()
@ -92,7 +92,7 @@ export class FilterableDropdownComponent {
constructor(private filterPipe: FilterPipe) { } constructor(private filterPipe: FilterPipe) { }
toggleItem(toggleableItem: ToggleableItem): void { 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._toggleableItems.filter(ti => ti.item.id !== toggleableItem.item.id).forEach(ti => ti.state = ToggleableItemState.NotSelected)
} }
this.toggle.emit(toggleableItem.item) this.toggle.emit(toggleableItem.item)

View File

@ -118,39 +118,39 @@ export class BulkEditorComponent {
} }
tagsDropdownOpen() { tagsDropdownOpen() {
this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tsi => tsi.state == ToggleableItemState.Selected) this.initiallySelectedTagsToggleableItems = this.tagsToggleableItems.filter(tti => tti.state == ToggleableItemState.Selected)
} }
correspondentsDropdownOpen() { correspondentsDropdownOpen() {
this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(csi => csi.state == ToggleableItemState.Selected) this.initiallySelectedCorrespondentsToggleableItems = this.correspondentsToggleableItems.filter(cti => cti.state == ToggleableItemState.Selected)
} }
documentTypesDropdownOpen() { documentTypesDropdownOpen() {
this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtsi => dtsi.state == ToggleableItemState.Selected) this.initiallySelectedDocumentTypesToggleableItems = this.documentTypesToggleableItems.filter(dtti => dtti.state == ToggleableItemState.Selected)
} }
applyTags(selectedTags: PaperlessTag[]) { applyTags(selectedTags: PaperlessTag[]) {
let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems) let unchanged = this.equateItemsToToggleableItems(selectedTags, this.initiallySelectedTagsToggleableItems)
if (!unchanged) this.setTags.emit(selectedTags) if (!unchanged) this.setTags.emit(selectedTags)
this.initiallySelectedTagsToggleableItems = null this.initiallySelectedTagsToggleableItems = []
} }
applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) { applyCorrespondent(selectedCorrespondents: PaperlessCorrespondent[]) {
let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems) let unchanged = this.equateItemsToToggleableItems(selectedCorrespondents, this.initiallySelectedCorrespondentsToggleableItems)
if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null) if (!unchanged) this.setCorrespondent.emit(selectedCorrespondents?.length > 0 ? selectedCorrespondents.shift() : null)
this.initiallySelectedCorrespondentsToggleableItems = null this.initiallySelectedCorrespondentsToggleableItems = []
} }
applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) { applyDocumentType(selectedDocumentTypes: PaperlessDocumentType[]) {
let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems) let unchanged = this.equateItemsToToggleableItems(selectedDocumentTypes, this.initiallySelectedDocumentTypesToggleableItems)
if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null) if (!unchanged) this.setDocumentType.emit(selectedDocumentTypes.length > 0 ? selectedDocumentTypes.shift() : null)
this.initiallySelectedDocumentTypesToggleableItems = null this.initiallySelectedDocumentTypesToggleableItems = []
} }
equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean { equateItemsToToggleableItems(items: ObjectWithId[], toggleableItems: ToggleableItem[]): boolean {
// either both empty or all items must in toggleableItems and vice-versa // either both empty or all items must in toggleableItems and vice-versa
return (toggleableItems.length == 0 && items.length == 0) || 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() { applyDelete() {