+
{{ getFileTypeExtension(filetype) }} ({{getFileTypePercent(filetype) | number: '1.0-1'}}%)
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
index 48ca50a10..f5f930190 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
@@ -9,8 +9,10 @@ import { RouterTestingModule } from '@angular/router/testing'
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
import { Subject } from 'rxjs'
import { routes } from 'src/app/app-routing.module'
+import { FILTER_MIME_TYPE } from 'src/app/data/filter-rule-type'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
import { PermissionsGuard } from 'src/app/guards/permissions.guard'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
import {
FileStatus,
WebsocketStatusService,
@@ -24,6 +26,7 @@ describe('StatisticsWidgetComponent', () => {
let fixture: ComponentFixture
let httpTestingController: HttpTestingController
let websocketStatusService: WebsocketStatusService
+ let documentListViewService: DocumentListViewService
const fileStatusSubject = new Subject()
beforeEach(async () => {
@@ -48,6 +51,7 @@ describe('StatisticsWidgetComponent', () => {
jest
.spyOn(websocketStatusService, 'onDocumentConsumptionFinished')
.mockReturnValue(fileStatusSubject)
+ documentListViewService = TestBed.inject(DocumentListViewService)
component = fixture.componentInstance
httpTestingController = TestBed.inject(HttpTestingController)
@@ -231,4 +235,26 @@ describe('StatisticsWidgetComponent', () => {
'CurrentASN:'
)
})
+
+ it('should support quick filter by mime type', () => {
+ const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
+ component.filterByFileType({
+ mime_type: 'application/pdf',
+ mime_type_count: 160,
+ })
+ expect(qfSpy).toHaveBeenCalledWith([
+ {
+ rule_type: FILTER_MIME_TYPE,
+ value: 'application/pdf',
+ },
+ ])
+
+ qfSpy.mockClear()
+ component.filterByFileType({
+ mime_type: 'Other',
+ mime_type_count: 160,
+ is_other: true,
+ })
+ expect(qfSpy).not.toHaveBeenCalled()
+ })
})
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
index 0669a3666..95bd4e6ce 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
@@ -6,7 +6,10 @@ import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
import * as mimeTypeNames from 'mime-names'
import { first, Subject, Subscription, takeUntil } from 'rxjs'
import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component'
-import { FILTER_HAS_TAGS_ANY } from 'src/app/data/filter-rule-type'
+import {
+ FILTER_HAS_TAGS_ANY,
+ FILTER_MIME_TYPE,
+} from 'src/app/data/filter-rule-type'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
@@ -29,6 +32,7 @@ export interface Statistics {
interface DocumentFileType {
mime_type: string
mime_type_count: number
+ is_other?: boolean
}
@Component({
@@ -77,6 +81,7 @@ export class StatisticsWidgetComponent
statistics.document_file_type_counts.slice(0, fileTypeMax)
statistics.document_file_type_counts.push({
mime_type: $localize`Other`,
+ is_other: true,
mime_type_count: others.reduce(
(currentValue, documentFileType) =>
documentFileType.mime_type_count + currentValue,
@@ -132,4 +137,14 @@ export class StatisticsWidgetComponent
},
])
}
+
+ filterByFileType(filetype: DocumentFileType) {
+ if (filetype.is_other) return
+ this.documentListViewService.quickFilter([
+ {
+ rule_type: FILTER_MIME_TYPE,
+ value: filetype.mime_type,
+ },
+ ])
+ }
}
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
index 3a5cedccb..c4528637b 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
@@ -60,6 +60,7 @@ import {
FILTER_HAS_STORAGE_PATH_ANY,
FILTER_HAS_TAGS_ALL,
FILTER_HAS_TAGS_ANY,
+ FILTER_MIME_TYPE,
FILTER_OWNER,
FILTER_OWNER_ANY,
FILTER_OWNER_DOES_NOT_INCLUDE,
@@ -389,6 +390,18 @@ describe('FilterEditorComponent', () => {
expect(component.textFilterModifier).toEqual('less') // TEXT_FILTER_MODIFIER_LT
}))
+ it('should ingest text filter rules for mime type', fakeAsync(() => {
+ expect(component.textFilter).toEqual(null)
+ component.filterRules = [
+ {
+ rule_type: FILTER_MIME_TYPE,
+ value: 'pdf',
+ },
+ ]
+ expect(component.textFilter).toEqual('pdf')
+ expect(component.textFilterTarget).toEqual('mime-type') // TEXT_FILTER_TARGET_MIME_TYPE
+ }))
+
it('should ingest text filter rules for fulltext query', fakeAsync(() => {
expect(component.textFilter).toEqual(null)
component.filterRules = [
@@ -1222,12 +1235,30 @@ describe('FilterEditorComponent', () => {
])
}))
+ it('should convert user input to correct filter rules on mime type', fakeAsync(() => {
+ component.textFilterInput.nativeElement.value = 'pdf'
+ component.textFilterInput.nativeElement.dispatchEvent(new Event('input'))
+ const textFieldTargetDropdown = fixture.debugElement.queryAll(
+ By.directive(NgbDropdownItem)
+ )[4]
+ textFieldTargetDropdown.triggerEventHandler('click') // TEXT_FILTER_TARGET_MIME_TYPE
+ fixture.detectChanges()
+ tick(400)
+ expect(component.textFilterTarget).toEqual('mime-type')
+ expect(component.filterRules).toEqual([
+ {
+ rule_type: FILTER_MIME_TYPE,
+ value: 'pdf',
+ },
+ ])
+ }))
+
it('should convert user input to correct filter rules on full text query', fakeAsync(() => {
component.textFilterInput.nativeElement.value = 'foo'
component.textFilterInput.nativeElement.dispatchEvent(new Event('input'))
const textFieldTargetDropdown = fixture.debugElement.queryAll(
By.directive(NgbDropdownItem)
- )[4]
+ )[5]
textFieldTargetDropdown.triggerEventHandler('click') // TEXT_FILTER_TARGET_ASN
fixture.detectChanges()
tick(400)
@@ -1594,7 +1625,7 @@ describe('FilterEditorComponent', () => {
component.textFilterInput.nativeElement.dispatchEvent(new Event('input'))
const textFieldTargetDropdown = fixture.debugElement.queryAll(
By.directive(NgbDropdownItem)
- )[4]
+ )[5]
textFieldTargetDropdown.triggerEventHandler('click')
fixture.detectChanges()
tick(400)
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 2179efaf4..0916d9c0d 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
@@ -66,6 +66,7 @@ import {
FILTER_HAS_STORAGE_PATH_ANY,
FILTER_HAS_TAGS_ALL,
FILTER_HAS_TAGS_ANY,
+ FILTER_MIME_TYPE,
FILTER_OWNER,
FILTER_OWNER_ANY,
FILTER_OWNER_DOES_NOT_INCLUDE,
@@ -126,6 +127,7 @@ const TEXT_FILTER_TARGET_ASN = 'asn'
const TEXT_FILTER_TARGET_FULLTEXT_QUERY = 'fulltext-query'
const TEXT_FILTER_TARGET_FULLTEXT_MORELIKE = 'fulltext-morelike'
const TEXT_FILTER_TARGET_CUSTOM_FIELDS = 'custom-fields'
+const TEXT_FILTER_TARGET_MIME_TYPE = 'mime-type'
const TEXT_FILTER_MODIFIER_EQUALS = 'equals'
const TEXT_FILTER_MODIFIER_NULL = 'is null'
@@ -165,6 +167,7 @@ const DEFAULT_TEXT_FILTER_TARGET_OPTIONS = [
id: TEXT_FILTER_TARGET_CUSTOM_FIELDS,
name: $localize`Custom fields`,
},
+ { id: TEXT_FILTER_TARGET_MIME_TYPE, name: $localize`File type` },
{
id: TEXT_FILTER_TARGET_FULLTEXT_QUERY,
name: $localize`Advanced search`,
@@ -416,6 +419,10 @@ export class FilterEditorComponent
this._textFilter = rule.value
this.textFilterTarget = TEXT_FILTER_TARGET_CUSTOM_FIELDS
break
+ case FILTER_MIME_TYPE:
+ this.textFilterTarget = TEXT_FILTER_TARGET_MIME_TYPE
+ this._textFilter = rule.value
+ break
case FILTER_FULLTEXT_QUERY:
let allQueryArgs = rule.value.split(',')
let textQueryArgs = []
@@ -729,6 +736,15 @@ export class FilterEditorComponent
value: this._textFilter,
})
}
+ if (
+ this._textFilter &&
+ this.textFilterTarget == TEXT_FILTER_TARGET_MIME_TYPE
+ ) {
+ filterRules.push({
+ rule_type: FILTER_MIME_TYPE,
+ value: this._textFilter,
+ })
+ }
if (
this._textFilter &&
this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_QUERY
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index dd9d8731a..bb2bf762c 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -62,6 +62,8 @@ export const FILTER_HAS_ANY_CUSTOM_FIELDS = 41
export const FILTER_CUSTOM_FIELDS_QUERY = 42
+export const FILTER_MIME_TYPE = 47
+
export const FILTER_RULE_TYPES: FilterRuleType[] = [
{
id: FILTER_TITLE,
@@ -354,6 +356,12 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
datatype: 'string',
multi: false,
},
+ {
+ id: FILTER_MIME_TYPE,
+ filtervar: 'mime_type',
+ datatype: 'string',
+ multi: false,
+ },
]
export interface FilterRuleType {
diff --git a/src/documents/filters.py b/src/documents/filters.py
index fab029312..21a9422ad 100644
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -215,6 +215,14 @@ class CustomFieldsFilter(Filter):
return qs
+class MimeTypeFilter(Filter):
+ def filter(self, qs, value):
+ if value:
+ return qs.filter(mime_type__icontains=value)
+ else:
+ return qs
+
+
class SelectField(serializers.CharField):
def __init__(self, custom_field: CustomField):
self._options = custom_field.extra_data["select_options"]
@@ -710,6 +718,8 @@ class DocumentFilterSet(FilterSet):
shared_by__id = SharedByUser()
+ mime_type = MimeTypeFilter()
+
class Meta:
model = Document
fields = {
diff --git a/src/documents/migrations/1062_alter_savedviewfilterrule_rule_type.py b/src/documents/migrations/1062_alter_savedviewfilterrule_rule_type.py
index 0b0e3cba3..c5a6bb90e 100644
--- a/src/documents/migrations/1062_alter_savedviewfilterrule_rule_type.py
+++ b/src/documents/migrations/1062_alter_savedviewfilterrule_rule_type.py
@@ -62,6 +62,7 @@ class Migration(migrations.Migration):
(44, "created from"),
(45, "added to"),
(46, "added from"),
+ (47, "mime type is"),
],
verbose_name="rule type",
),
diff --git a/src/documents/models.py b/src/documents/models.py
index 25e3c62fd..4c644c14c 100644
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -526,6 +526,7 @@ class SavedViewFilterRule(models.Model):
(44, _("created from")),
(45, _("added to")),
(46, _("added from")),
+ (47, _("mime type is")),
]
saved_view = models.ForeignKey(
diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py
index b7a4f4e2f..7010c5095 100644
--- a/src/documents/tests/test_api_documents.py
+++ b/src/documents/tests/test_api_documents.py
@@ -639,6 +639,13 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
self.assertEqual(len(results), 1)
self.assertEqual(results[0]["id"], doc3.id)
+ response = self.client.get(
+ "/api/documents/?mime_type=pdf",
+ )
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
+ results = response.data["results"]
+ self.assertEqual(len(results), 3)
+
def test_custom_field_select_filter(self):
"""
GIVEN: