From 6a00d5e08ab79bb27c0e13ac45a5a68d674dbdb0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 25 Oct 2022 12:45:15 -0700 Subject: [PATCH 1/4] Implement relative date querying --- .../date-dropdown.component.html | 10 ++- .../date-dropdown.component.scss | 5 ++ .../date-dropdown/date-dropdown.component.ts | 88 +++++++++++++------ .../filter-editor.component.html | 8 +- .../filter-editor/filter-editor.component.ts | 80 ++++++++++++++++- 5 files changed, 160 insertions(+), 31 deletions(-) diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index 6e5a7d928..0327ee963 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -1,10 +1,18 @@
-
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 d5295f697..734242be1 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 @@ -57,6 +57,9 @@ const TEXT_FILTER_MODIFIER_NOTNULL = 'not null' const TEXT_FILTER_MODIFIER_GT = 'greater' const TEXT_FILTER_MODIFIER_LT = 'less' +const RELATIVE_DATE_QUERY_REGEXP_CREATED = /created:\[([^\]]+)\]/g +const RELATIVE_DATE_QUERY_REGEXP_ADDED = /added:\[([^\]]+)\]/g + @Component({ selector: 'app-filter-editor', templateUrl: './filter-editor.component.html', @@ -197,6 +200,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { dateCreatedAfter: string dateAddedBefore: string dateAddedAfter: string + dateCreatedQuery: string + dateAddedQuery: string _unmodifiedFilterRules: FilterRule[] = [] _filterRules: FilterRule[] = [] @@ -228,6 +233,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.dateAddedAfter = null this.dateCreatedBefore = null this.dateCreatedAfter = null + this.dateCreatedQuery = null + this.dateAddedQuery = null this.textFilterModifier = TEXT_FILTER_MODIFIER_EQUALS value.forEach((rule) => { @@ -245,7 +252,30 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.textFilterTarget = TEXT_FILTER_TARGET_ASN break case FILTER_FULLTEXT_QUERY: - this._textFilter = rule.value + let queryArgs = rule.value.split(',') + queryArgs.forEach((arg) => { + if (arg.match(RELATIVE_DATE_QUERY_REGEXP_CREATED)) { + ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_CREATED)].forEach( + (match) => { + if (match[1]?.length) { + this.dateCreatedQuery = match[1] + } + } + ) + queryArgs.splice(queryArgs.indexOf(arg), 1) + } + if (arg.match(RELATIVE_DATE_QUERY_REGEXP_ADDED)) { + ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_ADDED)].forEach( + (match) => { + if (match[1]?.length) { + this.dateAddedQuery = match[1] + } + } + ) + queryArgs.splice(queryArgs.indexOf(arg), 1) + } + }) + this._textFilter = queryArgs.join(',') this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY break case FILTER_FULLTEXT_MORELIKE: @@ -471,6 +501,52 @@ export class FilterEditorComponent implements OnInit, OnDestroy { value: this.dateAddedAfter, }) } + if (this.dateAddedQuery || this.dateCreatedQuery) { + let queryArgs: Array = [] + if (this.dateCreatedQuery) + queryArgs.push(`created:[${this.dateCreatedQuery}]`) + if (this.dateAddedQuery) queryArgs.push(`added:[${this.dateAddedQuery}]`) + const existingRule = filterRules.find( + (fr) => fr.rule_type == FILTER_FULLTEXT_QUERY + ) + if (existingRule) { + let existingRuleArgs = existingRule.value.split(',') + if (this.dateCreatedQuery) { + queryArgs = existingRuleArgs + .filter((arg) => !arg.includes('created:')) + .concat(queryArgs) + } + if (this.dateAddedQuery) { + queryArgs = existingRuleArgs + .filter((arg) => !arg.includes('added:')) + .concat(queryArgs) + } + existingRule.value = queryArgs.join(',') + } else { + filterRules.push({ + rule_type: FILTER_FULLTEXT_QUERY, + value: queryArgs.join(','), + }) + } + } + if (!this.dateAddedQuery && !this.dateCreatedQuery) { + const existingRule = filterRules.find( + (fr) => fr.rule_type == FILTER_FULLTEXT_QUERY + ) + if ( + existingRule?.value.includes('created:') || + existingRule?.value.includes('added:') + ) { + // remove any existing date query + existingRule.value = existingRule.value + .replace(RELATIVE_DATE_QUERY_REGEXP_CREATED, '') + .replace(RELATIVE_DATE_QUERY_REGEXP_ADDED, '') + if (existingRule.value.replace(',', '').trim() === '') { + // if its empty now, remove it entirely + filterRules.splice(filterRules.indexOf(existingRule), 1) + } + } + } return filterRules } @@ -584,6 +660,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { target != TEXT_FILTER_TARGET_FULLTEXT_MORELIKE ) { this._textFilter = '' + this.dateAddedQuery = '' + this.dateCreatedQuery = '' } this.textFilterTarget = target this.textFilterInput.nativeElement.focus() From b52cb193e16d604f36e39077c9bdca35be149dd1 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 25 Oct 2022 13:34:36 -0700 Subject: [PATCH 2/4] Remove relative date query strings from dropdown --- .../date-dropdown.component.html | 6 +- .../date-dropdown/date-dropdown.component.ts | 62 +++++------- .../filter-editor.component.html | 4 +- .../filter-editor/filter-editor.component.ts | 97 ++++++++++++++----- 4 files changed, 98 insertions(+), 71 deletions(-) diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index 0327ee963..c99c71cda 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -7,13 +7,13 @@
-
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 734242be1..0c4cc37cb 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 @@ -44,6 +44,7 @@ import { DocumentService } from 'src/app/services/rest/document.service' import { PaperlessDocument } from 'src/app/data/paperless-document' import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path' import { StoragePathService } from 'src/app/services/rest/storage-path.service' +import { RelativeDate } from '../../common/date-dropdown/date-dropdown.component' const TEXT_FILTER_TARGET_TITLE = 'title' const TEXT_FILTER_TARGET_TITLE_CONTENT = 'title-content' @@ -59,6 +60,24 @@ const TEXT_FILTER_MODIFIER_LT = 'less' const RELATIVE_DATE_QUERY_REGEXP_CREATED = /created:\[([^\]]+)\]/g const RELATIVE_DATE_QUERY_REGEXP_ADDED = /added:\[([^\]]+)\]/g +const RELATIVE_DATE_QUERYSTRINGS = [ + { + relativeDate: RelativeDate.LAST_7_DAYS, + dateQuery: '-1 week to now', + }, + { + relativeDate: RelativeDate.LAST_MONTH, + dateQuery: '-1 month to now', + }, + { + relativeDate: RelativeDate.LAST_3_MONTHS, + dateQuery: '-3 month to now', + }, + { + relativeDate: RelativeDate.LAST_YEAR, + dateQuery: '-1 year to now', + }, +] @Component({ selector: 'app-filter-editor', @@ -200,8 +219,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { dateCreatedAfter: string dateAddedBefore: string dateAddedAfter: string - dateCreatedQuery: string - dateAddedQuery: string + dateCreatedRelativeDate: RelativeDate + dateAddedRelativeDate: RelativeDate _unmodifiedFilterRules: FilterRule[] = [] _filterRules: FilterRule[] = [] @@ -233,8 +252,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.dateAddedAfter = null this.dateCreatedBefore = null this.dateCreatedAfter = null - this.dateCreatedQuery = null - this.dateAddedQuery = null + this.dateCreatedRelativeDate = null + this.dateAddedRelativeDate = null this.textFilterModifier = TEXT_FILTER_MODIFIER_EQUALS value.forEach((rule) => { @@ -258,7 +277,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy { ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_CREATED)].forEach( (match) => { if (match[1]?.length) { - this.dateCreatedQuery = match[1] + this.dateCreatedRelativeDate = + RELATIVE_DATE_QUERYSTRINGS.find( + (qS) => qS.dateQuery == match[1] + )?.relativeDate } } ) @@ -268,7 +290,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy { ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_ADDED)].forEach( (match) => { if (match[1]?.length) { - this.dateAddedQuery = match[1] + this.dateAddedRelativeDate = + RELATIVE_DATE_QUERYSTRINGS.find( + (qS) => qS.dateQuery == match[1] + )?.relativeDate } } ) @@ -501,26 +526,45 @@ export class FilterEditorComponent implements OnInit, OnDestroy { value: this.dateAddedAfter, }) } - if (this.dateAddedQuery || this.dateCreatedQuery) { + if ( + this.dateAddedRelativeDate !== null || + this.dateCreatedRelativeDate !== null + ) { let queryArgs: Array = [] - if (this.dateCreatedQuery) - queryArgs.push(`created:[${this.dateCreatedQuery}]`) - if (this.dateAddedQuery) queryArgs.push(`added:[${this.dateAddedQuery}]`) const existingRule = filterRules.find( (fr) => fr.rule_type == FILTER_FULLTEXT_QUERY ) + let existingRuleArgs = existingRule?.value.split(',') + if (this.dateCreatedRelativeDate !== null) { + queryArgs.push( + `created:[${ + RELATIVE_DATE_QUERYSTRINGS.find( + (qS) => qS.relativeDate == this.dateCreatedRelativeDate + ).dateQuery + }]` + ) + if (existingRule) { + queryArgs = existingRuleArgs + .filter((arg) => !arg.match(RELATIVE_DATE_QUERY_REGEXP_CREATED)) + .concat(queryArgs) + } + } + if (this.dateAddedRelativeDate !== null) { + queryArgs.push( + `added:[${ + RELATIVE_DATE_QUERYSTRINGS.find( + (qS) => qS.relativeDate == this.dateAddedRelativeDate + ).dateQuery + }]` + ) + if (existingRule) { + queryArgs = existingRuleArgs + .filter((arg) => !arg.match(RELATIVE_DATE_QUERY_REGEXP_ADDED)) + .concat(queryArgs) + } + } + if (existingRule) { - let existingRuleArgs = existingRule.value.split(',') - if (this.dateCreatedQuery) { - queryArgs = existingRuleArgs - .filter((arg) => !arg.includes('created:')) - .concat(queryArgs) - } - if (this.dateAddedQuery) { - queryArgs = existingRuleArgs - .filter((arg) => !arg.includes('added:')) - .concat(queryArgs) - } existingRule.value = queryArgs.join(',') } else { filterRules.push({ @@ -529,13 +573,16 @@ export class FilterEditorComponent implements OnInit, OnDestroy { }) } } - if (!this.dateAddedQuery && !this.dateCreatedQuery) { + if ( + this.dateCreatedRelativeDate == null && + this.dateAddedRelativeDate == null + ) { const existingRule = filterRules.find( (fr) => fr.rule_type == FILTER_FULLTEXT_QUERY ) if ( - existingRule?.value.includes('created:') || - existingRule?.value.includes('added:') + existingRule?.value.match(RELATIVE_DATE_QUERY_REGEXP_CREATED) || + existingRule?.value.match(RELATIVE_DATE_QUERY_REGEXP_ADDED) ) { // remove any existing date query existingRule.value = existingRule.value @@ -660,8 +707,6 @@ export class FilterEditorComponent implements OnInit, OnDestroy { target != TEXT_FILTER_TARGET_FULLTEXT_MORELIKE ) { this._textFilter = '' - this.dateAddedQuery = '' - this.dateCreatedQuery = '' } this.textFilterTarget = target this.textFilterInput.nativeElement.focus() From 84b3fee0f98aeef4573930c0b1527cabb7927855 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 25 Oct 2022 13:43:13 -0700 Subject: [PATCH 3/4] Fix losing search when adding relative date --- .../document-list/filter-editor/filter-editor.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 0c4cc37cb..e5163c7e0 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 @@ -300,8 +300,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy { queryArgs.splice(queryArgs.indexOf(arg), 1) } }) - this._textFilter = queryArgs.join(',') - this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY + if (queryArgs.length) { + this._textFilter = queryArgs.join(',') + this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY + } break case FILTER_FULLTEXT_MORELIKE: this._moreLikeId = +rule.value From 8652b7ddb08e769a9b22f9ae5dbe2b27cb5c52a2 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 25 Oct 2022 15:31:01 -0700 Subject: [PATCH 4/4] Fix switch from title_content search --- .../filter-editor/filter-editor.component.ts | 33 ++++++++++++++----- src-ui/src/styles.scss | 4 +++ 2 files changed, 28 insertions(+), 9 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 e5163c7e0..14643875f 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 @@ -271,8 +271,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.textFilterTarget = TEXT_FILTER_TARGET_ASN break case FILTER_FULLTEXT_QUERY: - let queryArgs = rule.value.split(',') - queryArgs.forEach((arg) => { + let allQueryArgs = rule.value.split(',') + let textQueryArgs = [] + allQueryArgs.forEach((arg) => { if (arg.match(RELATIVE_DATE_QUERY_REGEXP_CREATED)) { ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_CREATED)].forEach( (match) => { @@ -284,9 +285,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } } ) - queryArgs.splice(queryArgs.indexOf(arg), 1) - } - if (arg.match(RELATIVE_DATE_QUERY_REGEXP_ADDED)) { + } else if (arg.match(RELATIVE_DATE_QUERY_REGEXP_ADDED)) { ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_ADDED)].forEach( (match) => { if (match[1]?.length) { @@ -297,11 +296,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } } ) - queryArgs.splice(queryArgs.indexOf(arg), 1) + } else { + textQueryArgs.push(arg) } }) - if (queryArgs.length) { - this._textFilter = queryArgs.join(',') + if (textQueryArgs.length) { + this._textFilter = textQueryArgs.join(',') this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY } break @@ -533,9 +533,24 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.dateCreatedRelativeDate !== null ) { let queryArgs: Array = [] - const existingRule = filterRules.find( + let existingRule = filterRules.find( (fr) => fr.rule_type == FILTER_FULLTEXT_QUERY ) + + // if had a title / content search and added a relative date we need to carry it over... + if ( + !existingRule && + this._textFilter?.length > 0 && + (this.textFilterTarget == TEXT_FILTER_TARGET_TITLE_CONTENT || + this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) + ) { + existingRule = filterRules.find( + (fr) => + fr.rule_type == FILTER_TITLE_CONTENT || fr.rule_type == FILTER_TITLE + ) + existingRule.rule_type = FILTER_FULLTEXT_QUERY + } + let existingRuleArgs = existingRule?.value.split(',') if (this.dateCreatedRelativeDate !== null) { queryArgs.push( diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index f096e7a33..4efbf4937 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -372,6 +372,10 @@ textarea, &:hover, &:focus { background-color: var(--bs-body-bg); } + + &:focus { + color: var(--bs-body-color); + } } .dropdown-menu {