Merge branch 'dev' into feature/any-all-filtering

src-ui/src/app/data/filter-rule-type.ts

@@ -21,6 +21,11 @@ export const FILTER_DOES_NOT_HAVE_TAG = 17
 
 export const FILTER_ASN_ISNULL = 18
 
+export const FILTER_TITLE_CONTENT = 19
+
+export const FILTER_FULLTEXT_QUERY = 20
+export const FILTER_FULLTEXT_MORELIKE = 21
+
 export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_TITLE, filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
@@ -49,7 +54,13 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
 
   {id: FILTER_MODIFIED_BEFORE, filtervar: "modified__date__lt", datatype: "date", multi: false},
   {id: FILTER_MODIFIED_AFTER, filtervar: "modified__date__gt", datatype: "date", multi: false},
-  {id: FILTER_ASN_ISNULL, filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false}
+  {id: FILTER_ASN_ISNULL, filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false},
+
+  {id: FILTER_TITLE_CONTENT, filtervar: "title_content", datatype: "string", multi: false},
+
+  {id: FILTER_FULLTEXT_QUERY, filtervar: "query", datatype: "string", multi: false},
+
+  {id: FILTER_FULLTEXT_MORELIKE, filtervar: "more_like_id", datatype: "number", multi: false},
 ]
 
 export interface FilterRuleType {

src-ui/src/app/data/filter-rule.ts

@@ -1,16 +1,22 @@
+import { FILTER_FULLTEXT_MORELIKE, FILTER_FULLTEXT_QUERY } from "./filter-rule-type"
+
 export function cloneFilterRules(filterRules: FilterRule[]): FilterRule[] {
   if (filterRules) {
     let newRules: FilterRule[] = []
     for (let rule of filterRules) {
       newRules.push({rule_type: rule.rule_type, value: rule.value})
     }
-    return newRules      
+    return newRules
   } else {
     return null
   }
 }
 
+export function isFullTextFilterRule(filterRules: FilterRule[]): boolean {
+  return filterRules.find(r => r.rule_type == FILTER_FULLTEXT_QUERY || r.rule_type == FILTER_FULLTEXT_MORELIKE) != null
+}
+
 export interface FilterRule {
   rule_type: number
   value: string
-}
+}

src-ui/src/app/data/paperless-correspondent.ts

@@ -1,7 +1,7 @@
 import { MatchingModel } from './matching-model';
 
 export interface PaperlessCorrespondent extends MatchingModel {
-  
+
   last_correspondence?: Date
 
 }

src-ui/src/app/data/paperless-document-metadata.ts

@@ -1,5 +1,5 @@
 export interface PaperlessDocumentMetadata {
-    
+
   original_checksum?: string
 
   archived_checksum?: string
@@ -10,4 +10,4 @@ export interface PaperlessDocumentMetadata {
 
   has_archive_version?: boolean
 
-}
+}

src-ui/src/app/data/paperless-document-suggestions.ts

@@ -0,0 +1,9 @@
+export interface PaperlessDocumentSuggestions {
+
+  tags?: number[]
+
+  correspondents?: number[]
+
+  document_types?: number[]
+
+}

src-ui/src/app/data/paperless-document.ts

@@ -4,6 +4,15 @@ import { PaperlessTag } from './paperless-tag'
 import { PaperlessDocumentType } from './paperless-document-type'
 import { Observable } from 'rxjs'
 
+export interface SearchHit {
+
+  score?: number
+  rank?: number
+
+  highlights?: string
+
+}
+
 export interface PaperlessDocument extends ObjectWithId {
 
     correspondent$?: Observable<PaperlessCorrespondent>
@@ -40,4 +49,6 @@ export interface PaperlessDocument extends ObjectWithId {
 
     archive_serial_number?: number
 
+    __search_hit__?: SearchHit
+
 }

src-ui/src/app/data/paperless-log.ts

@@ -1,27 +0,0 @@
-export const LOG_LEVEL_DEBUG = 10
-export const LOG_LEVEL_INFO = 20
-export const LOG_LEVEL_WARNING = 30
-export const LOG_LEVEL_ERROR = 40
-export const LOG_LEVEL_CRITICAL = 50
-
-export const LOG_LEVELS = [
-  {id: LOG_LEVEL_DEBUG, name: "DEBUG"},
-  {id: LOG_LEVEL_INFO, name: "INFO"},
-  {id: LOG_LEVEL_WARNING, name: "WARNING"},
-  {id: LOG_LEVEL_ERROR, name: "ERROR"},
-  {id: LOG_LEVEL_CRITICAL, name: "CRITICAL"}
-]
-
-export interface PaperlessLog {
-
-  id?: number
-
-  group?: string
-
-  message?: string
-
-  created?: Date
-
-  level?: number
-
-}

src-ui/src/app/data/paperless-saved-view.ts

@@ -15,4 +15,4 @@ export interface PaperlessSavedView extends ObjectWithId {
 
   filter_rules: FilterRule[]
 
-}
+}

src-ui/src/app/data/paperless-tag.ts

@@ -1,26 +1,10 @@
-import { MatchingModel } from './matching-model';
-import { ObjectWithId } from './object-with-id';
-
-
-export const TAG_COLOURS = [
-    {id: 1, value: "#a6cee3", name: $localize`Light blue`, textColor: "#000000"},
-    {id: 2, value: "#1f78b4", name: $localize`Blue`, textColor: "#ffffff"},
-    {id: 3, value: "#b2df8a", name: $localize`Light green`, textColor: "#000000"},
-    {id: 4, value: "#33a02c", name: $localize`Green`, textColor: "#ffffff"},
-    {id: 5, value: "#fb9a99", name: $localize`Light red`, textColor: "#000000"},
-    {id: 6, value: "#e31a1c", name: $localize`Red `, textColor: "#ffffff"},
-    {id: 7, value: "#fdbf6f", name: $localize`Light orange`, textColor: "#000000"},
-    {id: 8, value: "#ff7f00", name: $localize`Orange`, textColor: "#000000"},
-    {id: 9, value: "#cab2d6", name: $localize`Light violet`, textColor: "#000000"},
-    {id: 10, value: "#6a3d9a", name: $localize`Violet`, textColor: "#ffffff"},
-    {id: 11, value: "#b15928", name: $localize`Brown`, textColor: "#ffffff"},
-    {id: 12, value: "#000000", name: $localize`Black`, textColor: "#ffffff"},
-    {id: 13, value: "#cccccc", name: $localize`Light grey`, textColor: "#000000"}
-]
+import { MatchingModel } from "./matching-model";
 
 export interface PaperlessTag extends MatchingModel {
 
-    colour?: number
+    color?: string
+
+    text_color?: string
 
     is_inbox_tag?: boolean
 

src-ui/src/app/data/results.ts

@@ -3,5 +3,5 @@ export interface Results<T> {
   count: number
 
   results: T[]
-  
+
 }

src-ui/src/app/data/search-result.ts

@@ -1,29 +0,0 @@
-import { PaperlessDocument } from './paperless-document'
-
-export class SearchHitHighlight {
-  text?: string
-  term?: number
-}
-
-export interface SearchHit {
-  id?: number
-  title?: string
-  score?: number
-  rank?: number
-
-  highlights?: SearchHitHighlight[][]
-  document?: PaperlessDocument
-}
-
-export interface SearchResult {
-
-  count?: number
-  page?: number
-  page_count?: number
-
-  corrected_query?: string
-
-  results?: SearchHit[]
-
-
-}

src-ui/src/app/data/websocket-consumer-status-message.ts

@@ -0,0 +1,11 @@
+export interface WebsocketConsumerStatusMessage {
+
+  filename?: string
+  task_id?: string
+  current_progress?: number
+  max_progress?: number
+  status?: string
+  message?: string
+  document_id: number
+
+}