From 861b2efb1d9c2789da0ce5189d1e55824def7c70 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 15:21:41 -0800 Subject: [PATCH 01/21] Add support for 'any' ('OR') of tags when filtering --- .../filterable-dropdown.component.html | 10 ++++++++++ .../filterable-dropdown.component.scss | 19 +++++++++++++++++++ .../filterable-dropdown.component.ts | 3 ++- .../filter-editor/filter-editor.component.ts | 13 +++++++++---- .../manage/tag-list/tag-list.component.ts | 4 ++-- src-ui/src/app/data/filter-rule-type.ts | 6 ++++-- 6 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index fc74eb4e9..df9aa9a5a 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -12,6 +12,16 @@
+
+
+ + +
+
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss index 40c93838f..918b6118e 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss @@ -12,3 +12,22 @@ overflow-y: scroll; } } + +.btn-group-xs { + > .btn { + padding: 0.2rem 0.25rem; + font-size: 0.675rem; + line-height: 1.2; + border-radius: 0.15rem; + } + + > .btn:not(:first-child) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + + > .btn:not(:last-child) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } +} 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 3481b1227..55526ae7b 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 @@ -15,6 +15,7 @@ export class FilterableDropdownSelectionModel { changed = new Subject() multiple = false + logicalOperator = 'and' items: MatchingModel[] = [] @@ -83,7 +84,7 @@ export class FilterableDropdownSelectionModel { if (fireEvent) { this.changed.next(this) } - + } private getNonTemporary(id: number) { diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index a9111bc9f..ae0b63884 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -8,7 +8,7 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service import { TagService } from 'src/app/services/rest/tag.service'; import { CorrespondentService } from 'src/app/services/rest/correspondent.service'; import { FilterRule } from 'src/app/data/filter-rule'; -import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE } from 'src/app/data/filter-rule-type'; +import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAGS_ALL, FILTER_HAS_TAGS_ANY, FILTER_TITLE } from 'src/app/data/filter-rule-type'; import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component'; import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; @@ -38,7 +38,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { return $localize`Without document type` } - case FILTER_HAS_TAG: + case FILTER_HAS_TAGS_ALL: return $localize`Tag: ${this.tags.find(t => t.id == +rule.value)?.name}` case FILTER_HAS_ANY_TAG: @@ -101,7 +101,11 @@ export class FilterEditorComponent implements OnInit, OnDestroy { case FILTER_ADDED_BEFORE: this.dateAddedBefore = rule.value break - case FILTER_HAS_TAG: + case FILTER_HAS_TAGS_ALL: + this.tagSelectionModel.set(rule.value ? +rule.value : null, ToggleableItemState.Selected, false) + break + case FILTER_HAS_TAGS_ANY: + this.tagSelectionModel.logicalOperator = 'or' this.tagSelectionModel.set(rule.value ? +rule.value : null, ToggleableItemState.Selected, false) break case FILTER_HAS_ANY_TAG: @@ -125,8 +129,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy { if (this.tagSelectionModel.isNoneSelected()) { filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"}) } else { + const tagFilterType = this.tagSelectionModel.logicalOperator == 'and' ? FILTER_HAS_TAGS_ALL : FILTER_HAS_TAGS_ANY this.tagSelectionModel.getSelectedItems().filter(tag => tag.id).forEach(tag => { - filterRules.push({rule_type: FILTER_HAS_TAG, value: tag.id?.toString()}) + filterRules.push({rule_type: tagFilterType, value: tag.id?.toString()}) }) } this.correspondentSelectionModel.getSelectedItems().forEach(correspondent => { diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index f9d0678ab..45862b017 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { FILTER_HAS_TAG } from 'src/app/data/filter-rule-type'; +import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type'; import { TAG_COLOURS, PaperlessTag } from 'src/app/data/paperless-tag'; import { DocumentListViewService } from 'src/app/services/document-list-view.service'; import { TagService } from 'src/app/services/rest/tag.service'; @@ -31,7 +31,7 @@ export class TagListComponent extends GenericListComponent { } filterDocuments(object: PaperlessTag) { - this.list.quickFilter([{rule_type: FILTER_HAS_TAG, value: object.id.toString()}]) + this.list.quickFilter([{rule_type: FILTER_HAS_TAGS_ALL, value: object.id.toString()}]) } } diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index 4669b548e..0df7e5f5a 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -4,8 +4,9 @@ export const FILTER_ASN = 2 export const FILTER_CORRESPONDENT = 3 export const FILTER_DOCUMENT_TYPE = 4 export const FILTER_IS_IN_INBOX = 5 -export const FILTER_HAS_TAG = 6 +export const FILTER_HAS_TAGS_ALL = 6 export const FILTER_HAS_ANY_TAG = 7 +export const FILTER_HAS_TAGS_ANY = 19 export const FILTER_CREATED_BEFORE = 8 export const FILTER_CREATED_AFTER = 9 export const FILTER_CREATED_YEAR = 10 @@ -31,7 +32,8 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ {id: FILTER_DOCUMENT_TYPE, filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false}, {id: FILTER_IS_IN_INBOX, filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true}, - {id: FILTER_HAS_TAG, filtervar: "tags__id__all", datatype: "tag", multi: true}, + {id: FILTER_HAS_TAGS_ALL, filtervar: "tags__id__all", datatype: "tag", multi: true}, + {id: FILTER_HAS_TAGS_ANY, filtervar: "tags__id__in", datatype: "tag", multi: true}, {id: FILTER_DOES_NOT_HAVE_TAG, filtervar: "tags__id__none", datatype: "tag", multi: true}, {id: FILTER_HAS_ANY_TAG, filtervar: "is_tagged", datatype: "boolean", multi: false, default: true}, From 79059b9aa76b7078b652ebd3d5adffe9c490a2fe Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 16:21:12 -0800 Subject: [PATCH 02/21] changed event for toggling operator --- .../filterable-dropdown.component.html | 2 +- .../filterable-dropdown.component.ts | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index df9aa9a5a..46fcf2164 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -13,7 +13,7 @@
-
+
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 55526ae7b..a0a3ba459 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 @@ -15,7 +15,8 @@ export class FilterableDropdownSelectionModel { changed = new Subject() multiple = false - logicalOperator = 'and' + private _logicalOperator = 'and' + temporaryLogicalOperator = this._logicalOperator items: MatchingModel[] = [] @@ -91,6 +92,18 @@ export class FilterableDropdownSelectionModel { return this.selectionStates.get(id) || ToggleableItemState.NotSelected } + get logicalOperator(): string { + return this.temporaryLogicalOperator + } + + set logicalOperator(operator: string) { + this.temporaryLogicalOperator = operator + } + + toggleOperator() { + this.changed.next(this) + } + get(id: number) { return this.temporarySelectionStates.get(id) || ToggleableItemState.NotSelected } @@ -111,6 +124,8 @@ export class FilterableDropdownSelectionModel { return true } else if (!Array.from(this.selectionStates.keys()).every(id => this.selectionStates.get(id) == this.temporarySelectionStates.get(id))) { return true + } else if (this.temporaryLogicalOperator !== this._logicalOperator) { + return true } else { return false } @@ -130,6 +145,7 @@ export class FilterableDropdownSelectionModel { this.temporarySelectionStates.forEach((value, key) => { this.selectionStates.set(key, value) }) + this._logicalOperator = this.temporaryLogicalOperator } reset() { From 893dcd9f2893d10093212e384e9c9abd24f407eb Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 18:35:03 -0800 Subject: [PATCH 03/21] Update API filters for "any" tag_id --- src/documents/filters.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/documents/filters.py b/src/documents/filters.py index 2201298f3..5a58c2f18 100755 --- a/src/documents/filters.py +++ b/src/documents/filters.py @@ -37,9 +37,10 @@ class DocumentTypeFilterSet(FilterSet): class TagsFilter(Filter): - def __init__(self, exclude=False): + def __init__(self, exclude=False, in_list=False): super(TagsFilter, self).__init__() self.exclude = exclude + self.in_list = in_list def filter(self, qs, value): if not value: @@ -50,11 +51,14 @@ class TagsFilter(Filter): except ValueError: return qs - for tag_id in tag_ids: - if self.exclude: - qs = qs.exclude(tags__id=tag_id) - else: - qs = qs.filter(tags__id=tag_id) + if self.in_list: + qs = qs.filter(tags__id__in=tag_ids).distinct() + else: + for tag_id in tag_ids: + if self.exclude: + qs = qs.exclude(tags__id=tag_id) + else: + qs = qs.filter(tags__id=tag_id) return qs @@ -83,6 +87,8 @@ class DocumentFilterSet(FilterSet): tags__id__none = TagsFilter(exclude=True) + tags__id__in = TagsFilter(in_list=True) + is_in_inbox = InboxFilter() class Meta: From 8f08201633ea845973d24a0eda598eb960004fa3 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 18:38:49 -0800 Subject: [PATCH 04/21] Fix resetting any vs all --- .../common/filterable-dropdown/filterable-dropdown.component.ts | 1 + 1 file changed, 1 insertion(+) 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 a0a3ba459..a63183575 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 @@ -114,6 +114,7 @@ export class FilterableDropdownSelectionModel { clear(fireEvent = true) { this.temporarySelectionStates.clear() + this.temporaryLogicalOperator = this._logicalOperator = 'and' if (fireEvent) { this.changed.next(this) } From 3766d8687fb693f798676880f5bd33f9c8745483 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:33:54 -0800 Subject: [PATCH 05/21] Disable any/all toggle when not needed --- .../filterable-dropdown/filterable-dropdown.component.html | 4 ++-- .../filterable-dropdown/filterable-dropdown.component.scss | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 46fcf2164..fbba66818 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -15,10 +15,10 @@
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss index 918b6118e..a937291f3 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss @@ -31,3 +31,7 @@ border-bottom-right-radius: 0; } } + +.btn-group > label.disabled { + filter: brightness(0.5); +} From ff8eb7fbced293e5a701336186a363fb2265d37c Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:36:47 -0800 Subject: [PATCH 06/21] Remove unused interface --- .../toggleable-dropdown-button.component.ts | 6 ------ src-ui/src/app/pipes/filter.pipe.ts | 1 - 2 files changed, 7 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index f082dfe67..8e9507238 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -1,12 +1,6 @@ import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'; import { MatchingModel } from 'src/app/data/matching-model'; -export interface ToggleableItem { - item: MatchingModel, - state: ToggleableItemState, - count: number -} - export enum ToggleableItemState { NotSelected = 0, Selected = 1, diff --git a/src-ui/src/app/pipes/filter.pipe.ts b/src-ui/src/app/pipes/filter.pipe.ts index d83ccc07a..0be1be507 100644 --- a/src-ui/src/app/pipes/filter.pipe.ts +++ b/src-ui/src/app/pipes/filter.pipe.ts @@ -1,5 +1,4 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ToggleableItem } from 'src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'; import { MatchingModel } from '../data/matching-model'; @Pipe({ From cde867c9c619dc74f203a26fbcd692a0c0591623 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:40:40 -0800 Subject: [PATCH 07/21] Clicking card tag/dt/corresp should always add that item, never remove it --- .../document-list/filter-editor/filter-editor.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index ae0b63884..c76a6cf1b 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -204,15 +204,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } toggleTag(tagId: number) { - this.tagSelectionModel.toggle(tagId) + this.tagSelectionModel.set(tagId, ToggleableItemState.Selected) } toggleCorrespondent(correspondentId: number) { - this.correspondentSelectionModel.toggle(correspondentId) + this.correspondentSelectionModel.set(correspondentId, ToggleableItemState.Selected) } toggleDocumentType(documentTypeId: number) { - this.documentTypeSelectionModel.toggle(documentTypeId) + this.documentTypeSelectionModel.set(documentTypeId, ToggleableItemState.Selected) } onTagsDropdownOpen() { From 3e0c3c0bb2bb3b5a40e1c444d555f2c635389b36 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:44:50 -0800 Subject: [PATCH 08/21] refactor --- .../app/components/document-list/document-list.component.ts | 6 +++--- .../document-list/filter-editor/filter-editor.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 509c0a735..a74d9ee92 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -168,21 +168,21 @@ export class DocumentListComponent implements OnInit { clickTag(tagID: number) { this.list.selectNone() setTimeout(() => { - this.filterEditor.toggleTag(tagID) + this.filterEditor.addTag(tagID) }) } clickCorrespondent(correspondentID: number) { this.list.selectNone() setTimeout(() => { - this.filterEditor.toggleCorrespondent(correspondentID) + this.filterEditor.addCorrespondent(correspondentID) }) } clickDocumentType(documentTypeID: number) { this.list.selectNone() setTimeout(() => { - this.filterEditor.toggleDocumentType(documentTypeID) + this.filterEditor.addDocumentType(documentTypeID) }) } diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index c76a6cf1b..b12fe00f0 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -203,15 +203,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.reset.next() } - toggleTag(tagId: number) { + addTag(tagId: number) { this.tagSelectionModel.set(tagId, ToggleableItemState.Selected) } - toggleCorrespondent(correspondentId: number) { + addCorrespondent(correspondentId: number) { this.correspondentSelectionModel.set(correspondentId, ToggleableItemState.Selected) } - toggleDocumentType(documentTypeId: number) { + addDocumentType(documentTypeId: number) { this.documentTypeSelectionModel.set(documentTypeId, ToggleableItemState.Selected) } From 29a77378293447b20663b7aebabe69bba9b735ae Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 21 Jan 2021 10:59:53 -0800 Subject: [PATCH 09/21] Support excluding tags --- .../filterable-dropdown.component.html | 2 +- .../filterable-dropdown.component.ts | 33 +++++++++++++++++-- .../toggleable-dropdown-button.component.html | 8 +++-- .../toggleable-dropdown-button.component.ts | 17 ++++++++-- .../filter-editor/filter-editor.component.ts | 8 ++++- 5 files changed, 58 insertions(+), 10 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index fc74eb4e9..db87e801c 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -19,7 +19,7 @@
- +
- + {{item.name}}
{{item.document_count}}
From c926e0242ac87cd3620bbfea82b3012f12e0139e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 21 Jan 2021 11:30:29 -0800 Subject: [PATCH 12/21] Add UI hint for option-click --- .../filterable-dropdown.component.html | 9 ++++++++- .../filterable-dropdown.component.scss | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 45a8fdc4f..e2c1cb7da 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -23,11 +23,18 @@
+
+ Use + + + + + click to exclude items. +
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss index 40c93838f..5863cc5b6 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss @@ -12,3 +12,15 @@ overflow-y: scroll; } } + +small > svg { + margin-top: -2px; +} + +.list-group-item-note { + line-height: 1; + + small { + font-size: 70%; + } +} From d7cefabe98398f3916a5db6c33027c2d77d12b59 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 21 Jan 2021 14:25:50 -0800 Subject: [PATCH 13/21] Fix unable to save ANY views --- src/documents/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/documents/models.py b/src/documents/models.py index 928b8aa4d..0920f9e47 100755 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -393,6 +393,7 @@ class SavedViewFilterRule(models.Model): (15, _("modified before")), (16, _("modified after")), (17, _("does not have tag")), + (19, _("has tags in")), ] saved_view = models.ForeignKey( From a73ff4ffa64f3acade5116b26c9b58ec36a04583 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 21 Jan 2021 14:41:11 -0800 Subject: [PATCH 14/21] return key works too --- .../filterable-dropdown/filterable-dropdown.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 0bcfd4500..7d3b8dab4 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -43,7 +43,7 @@ - + click to exclude items. + + click / reutrn to exclude items.
From a6bd118f5e77c291e52cf518a812151f9053c0e7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 21 Jan 2021 14:42:05 -0800 Subject: [PATCH 15/21] Disable any / all toggle when excluded items --- .../filterable-dropdown/filterable-dropdown.component.html | 4 ++-- .../filterable-dropdown/filterable-dropdown.component.ts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 7d3b8dab4..25e9020dc 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -15,10 +15,10 @@
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 090385fac..413f2fdb6 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 @@ -95,6 +95,7 @@ export class FilterableDropdownSelectionModel { let state = this.temporarySelectionStates.get(id) if (state == null || state != ToggleableItemState.Excluded) { this.temporarySelectionStates.set(id, ToggleableItemState.Excluded) + this.temporaryLogicalOperator = this._logicalOperator = 'and' } else if (state == ToggleableItemState.Excluded) { this.temporarySelectionStates.delete(id) } @@ -270,6 +271,10 @@ export class FilterableDropdownComponent { @Output() open = new EventEmitter() + get operatorToggleEnabled(): boolean { + return this.selectionModel.selectionSize() > 1 && this.selectionModel.getExcludedItems().length == 0 + } + constructor(private filterPipe: FilterPipe) { this.selectionModel = new FilterableDropdownSelectionModel() } From a5edbcf9efc0cb2b8b909c5a217be1afe3692dc7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Sat, 23 Jan 2021 11:52:05 -0800 Subject: [PATCH 16/21] Shrink dropdown note font size to fit on one line --- .../filterable-dropdown/filterable-dropdown.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss index 51c42b859..ef6090212 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss @@ -44,6 +44,6 @@ small > svg { line-height: 1; small { - font-size: 70%; + font-size: 65%; } } From da361e9d64cac6eae1f0f52e2f9725c89ceaad9b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 14 Feb 2022 22:23:39 -0800 Subject: [PATCH 17/21] Update filter-rule-type.ts --- src-ui/src/app/data/filter-rule-type.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index 209365af1..c72997618 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -6,7 +6,7 @@ export const FILTER_DOCUMENT_TYPE = 4 export const FILTER_IS_IN_INBOX = 5 export const FILTER_HAS_TAGS_ALL = 6 export const FILTER_HAS_ANY_TAG = 7 -export const FILTER_HAS_TAGS_ANY = 19 +export const FILTER_HAS_TAGS_ANY = 22 export const FILTER_CREATED_BEFORE = 8 export const FILTER_CREATED_AFTER = 9 export const FILTER_CREATED_YEAR = 10 From 250575acb91344c9e769131b4c2c297c16640dd0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 16 Feb 2022 00:29:04 -0800 Subject: [PATCH 18/21] Fix spelling error --- .../filterable-dropdown/filterable-dropdown.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 25e9020dc..04af125a9 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -43,7 +43,7 @@ - + click / reutrn to exclude items. + + click / return to exclude items. From 1ba1df2529f3b4bedd572d00e5c3a923de251703 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 18 Feb 2022 19:35:02 -0800 Subject: [PATCH 19/21] Change alt-click to second click --- .../filterable-dropdown/filterable-dropdown.component.html | 6 +----- .../toggleable-dropdown-button.component.ts | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 04af125a9..976ed2a12 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -39,11 +39,7 @@
- Use - - - - + click / return to exclude items. + Click again to exclude items.
diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index 65e050976..a30f1863d 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -35,7 +35,7 @@ export class ToggleableDropdownButtonComponent { } toggleItem(event: MouseEvent): void { - if (event.altKey) { + if (this.state == ToggleableItemState.Selected) { this.exclude.emit() } else { this.toggle.emit() From 0b6c749b6076d10e13ae1024034d23685ec24d34 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 19 Feb 2022 09:20:41 -0800 Subject: [PATCH 20/21] Hide double-click note on non-multiple dropdowns --- .../filterable-dropdown/filterable-dropdown.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 976ed2a12..fa4497573 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -38,7 +38,7 @@ -
+
Click again to exclude items.
From c945b90b64d5264bff3ea1b739d67c6cc95b7133 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 19 Feb 2022 14:03:55 -0800 Subject: [PATCH 21/21] Indicate disabled but active All button --- .../filterable-dropdown/filterable-dropdown.component.html | 6 +++--- .../filterable-dropdown/filterable-dropdown.component.scss | 7 +++++++ src-ui/src/theme_dark.scss | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index fa4497573..3cc116171 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -13,12 +13,12 @@
-
+
diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss index ef6090212..e728ca16b 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.scss @@ -1,3 +1,5 @@ +@import "/src/theme"; + .badge-corner { position: absolute; top: -8px; @@ -34,8 +36,13 @@ .btn-group > label.disabled { filter: brightness(0.5); + + &.active { + background-color: lighten($primary, 30%); + } } + small > svg { margin-top: -2px; } diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index 25abac773..4735eb3a9 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -231,6 +231,10 @@ $border-color-dark-mode: #47494f; border-color: darken($primary-dark-mode, 10%); color: $text-color-dark-mode-accent; } + + &.disabled.active { + background-color: darken($primary-dark-mode, 10%); + } } .btn-outline-secondary {