Merge branch 'dev' into feature/popover-previews

src-ui/src/app/app.module.ts

@@ -72,6 +72,7 @@ import localePt from '@angular/common/locales/pt';
 import localeIt from '@angular/common/locales/it';
 import localeEnGb from '@angular/common/locales/en-GB';
 import localeRo from '@angular/common/locales/ro';
+import localeRu from '@angular/common/locales/ru';
 
 
 registerLocaleData(localeFr)
@@ -81,6 +82,7 @@ registerLocaleData(localePt, "pt-BR")
 registerLocaleData(localeIt)
 registerLocaleData(localeEnGb)
 registerLocaleData(localeRo)
+registerLocaleData(localeRu)
 
 @NgModule({
   declarations: [

src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.scss

@@ -23,7 +23,7 @@ form {
   }
 }
 
-::ng-deep .progress {
+.progress {
   position: absolute;
   top: 0;
   right: 0;

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts

@@ -8,12 +8,13 @@ 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, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
+import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_ASN, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } 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';
 
 const TEXT_FILTER_TARGET_TITLE = "title"
 const TEXT_FILTER_TARGET_TITLE_CONTENT = "title-content"
+const TEXT_FILTER_TARGET_ASN = "asn"
 
 @Component({
   selector: 'app-filter-editor',
@@ -51,6 +52,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
         case FILTER_TITLE:
           return $localize`Title: ${rule.value}`
+
+        case FILTER_ASN:
+          return $localize`ASN: ${rule.value}`
       }
     }
 
@@ -71,7 +75,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
 
   textFilterTargets = [
     {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
-    {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`}
+    {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`},
+    {id: TEXT_FILTER_TARGET_ASN, name: $localize`ASN`}
   ]
 
   textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
@@ -111,6 +116,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
           this._textFilter = rule.value
           this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
           break
+        case FILTER_ASN:
+          this._textFilter = rule.value
+          this.textFilterTarget = TEXT_FILTER_TARGET_ASN
+          break
         case FILTER_CREATED_AFTER:
           this.dateCreatedAfter = rule.value
           break
@@ -147,6 +156,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
     if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) {
       filterRules.push({rule_type: FILTER_TITLE, value: this._textFilter})
     }
+    if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_ASN) {
+      filterRules.push({rule_type: FILTER_ASN, value: this._textFilter})
+    }
     if (this.tagSelectionModel.isNoneSelected()) {
       filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
     } else {

src-ui/src/app/components/search/search.component.html

@@ -3,9 +3,7 @@
 
 <div *ngIf="errorMessage" class="alert alert-danger" i18n>Invalid search query: {{errorMessage}}</div>
 
-<p *ngIf="more_like" i18n>
-    Showing documents similar to <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a>
-</p>
+<p *ngIf="more_like" i18n>Showing documents similar to <a routerLink="/documents/{{more_like}}">{{more_like_doc?.original_file_name}}</a></p>
 
 <p *ngIf="query">
     <ng-container i18n>Search query: <i>{{query}}</i></ng-container>

src-ui/src/app/pipes/custom-date.pipe.ts

@@ -4,8 +4,8 @@ import { SettingsService, SETTINGS_KEYS } from '../services/settings.service';
 
 const FORMAT_TO_ISO_FORMAT = {
   "longDate": "y-MM-dd",
-  "mediumDate": "yy-MM-dd",
-  "shortDate": "yy-MM-dd"
+  "mediumDate": "y-MM-dd",
+  "shortDate": "y-MM-dd"
 }
 
 @Pipe({

src-ui/src/app/services/settings.service.ts

@@ -87,12 +87,13 @@ export class SettingsService {
     return [
       {code: "en-us", name: $localize`English (US)`, englishName: "English (US)", dateInputFormat: "mm/dd/yyyy"},
       {code: "en-gb", name: $localize`English (GB)`, englishName: "English (GB)", dateInputFormat: "dd/mm/yyyy"},
-      {code: "de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"},
-      {code: "nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"},
-      {code: "fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"},
+      {code: "de-de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"},
+      {code: "nl-nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"},
+      {code: "fr-fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"},
       {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"},
-      {code: "it", name: $localize`Italian`, englishName: "Italian", dateInputFormat: "dd/mm/yyyy"},
-      {code: "ro", name: $localize`Romanian`, englishName: "Romanian", dateInputFormat: "dd.mm.yyyy"}
+      {code: "it-it", name: $localize`Italian`, englishName: "Italian", dateInputFormat: "dd/mm/yyyy"},
+      {code: "ro-ro", name: $localize`Romanian`, englishName: "Romanian", dateInputFormat: "dd.mm.yyyy"},
+      {code: "ru-ru", name: $localize`Russian`, englishName: "Russian", dateInputFormat: "dd.mm.yyyy"},
     ]
   }