diff --git a/src-ui/src/app/components/common/preview-popup/preview-popup.component.scss b/src-ui/src/app/components/common/preview-popup/preview-popup.component.scss
index 1ce4585c4..c44e29f43 100644
--- a/src-ui/src/app/components/common/preview-popup/preview-popup.component.scss
+++ b/src-ui/src/app/components/common/preview-popup/preview-popup.component.scss
@@ -17,7 +17,7 @@
background-color: #e7e7e7;
}
- object {
+ object:not(.pdf) {
mix-blend-mode: difference;
&.p-2 {
padding: 0 !important;
From 56d296f04bc1d7800001918706057f5820c0ef43 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:21:01 -0700
Subject: [PATCH 03/17] Fix: use static object for activedisplayfields to
prevent changes (#8120)
---
.../document-list-view.service.spec.ts | 7 +++-
.../services/document-list-view.service.ts | 37 +++++++++++++------
src-ui/src/app/services/settings.service.ts | 6 +--
3 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src-ui/src/app/services/document-list-view.service.spec.ts b/src-ui/src/app/services/document-list-view.service.spec.ts
index 74ef8e5a1..26455f8c0 100644
--- a/src-ui/src/app/services/document-list-view.service.spec.ts
+++ b/src-ui/src/app/services/document-list-view.service.spec.ts
@@ -599,14 +599,17 @@ describe('DocumentListViewService', () => {
it('should not filter out custom fields if settings not initialized', () => {
const customFields = ['custom_field_1', 'custom_field_2']
documentListViewService.displayFields = customFields as any
- settingsService.displayFieldsInitialized = false
expect(documentListViewService.displayFields).toEqual(customFields)
jest.spyOn(settingsService, 'allDisplayFields', 'get').mockReturnValue([
{ id: DisplayField.ADDED, name: 'Added' },
{ id: DisplayField.TITLE, name: 'Title' },
{ id: 'custom_field_1', name: 'Custom Field 1' },
] as any)
- settingsService.displayFieldsInitialized = true
+ settingsService.displayFieldsInit.emit(true)
+ expect(documentListViewService.displayFields).toEqual(['custom_field_1'])
+
+ // will now filter on set
+ documentListViewService.displayFields = customFields as any
expect(documentListViewService.displayFields).toEqual(['custom_field_1'])
})
})
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 3867376de..eee8daea1 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -20,6 +20,10 @@ import { paramsFromViewState, paramsToViewState } from '../utils/query-params'
import { DocumentService, SelectionData } from './rest/document.service'
import { SettingsService } from './settings.service'
+const LIST_DEFAULT_DISPLAY_FIELDS: DisplayField[] = DEFAULT_DISPLAY_FIELDS.map(
+ (f) => f.id
+).filter((f) => f !== DisplayField.ADDED)
+
/**
* Captures the current state of the list view.
*/
@@ -102,6 +106,8 @@ export class DocumentListViewService {
private _activeSavedViewId: number = null
+ private displayFieldsInitialized: boolean = false
+
get activeSavedViewId() {
return this._activeSavedViewId
}
@@ -134,6 +140,19 @@ export class DocumentListViewService {
localStorage.removeItem(DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG)
}
}
+
+ this.settings.displayFieldsInit.subscribe(() => {
+ this.displayFieldsInitialized = true
+ if (this.activeListViewState.displayFields) {
+ this.activeListViewState.displayFields =
+ this.activeListViewState.displayFields.filter(
+ (field) =>
+ this.settings.allDisplayFields.find((f) => f.id === field) !==
+ undefined
+ )
+ this.saveDocumentListView()
+ }
+ })
}
private defaultListViewState(): ListViewState {
@@ -415,23 +434,17 @@ export class DocumentListViewService {
}
get displayFields(): DisplayField[] {
- let fields =
- this.activeListViewState.displayFields ??
- DEFAULT_DISPLAY_FIELDS.map((f) => f.id)
- if (!this.activeListViewState.displayFields) {
- fields = fields.filter((f) => f !== DisplayField.ADDED)
- }
- return this.settings.displayFieldsInitialized
- ? fields.filter(
+ return this.activeListViewState.displayFields ?? LIST_DEFAULT_DISPLAY_FIELDS
+ }
+
+ set displayFields(fields: DisplayField[]) {
+ this.activeListViewState.displayFields = this.displayFieldsInitialized
+ ? fields?.filter(
(field) =>
this.settings.allDisplayFields.find((f) => f.id === field) !==
undefined
)
: fields
- }
-
- set displayFields(fields: DisplayField[]) {
- this.activeListViewState.displayFields = fields
this.saveDocumentListView()
}
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index c3ea3f856..5005a2865 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -274,7 +274,7 @@ export class SettingsService {
public get allDisplayFields(): Array<{ id: DisplayField; name: string }> {
return this._allDisplayFields
}
- public displayFieldsInitialized: boolean = false
+ public displayFieldsInit: EventEmitter
= new EventEmitter()
constructor(
rendererFactory: RendererFactory2,
@@ -382,10 +382,10 @@ export class SettingsService {
}
})
)
- this.displayFieldsInitialized = true
+ this.displayFieldsInit.emit(true)
})
} else {
- this.displayFieldsInitialized = true
+ this.displayFieldsInit.emit(true)
}
}
From e22ccbda2675e4317954077f4f82e6c35f58ca17 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:43:02 -0700
Subject: [PATCH 04/17] Fix: dont use filters for inverted thumbnails (#8121)
---
.../document-card-large.component.html | 2 +-
.../document-card-large.component.scss | 14 +---------
.../document-card-small.component.html | 4 +--
.../document-card-small.component.scss | 12 ---------
src-ui/src/styles.scss | 26 ++++++++++++++++---
src-ui/src/theme.scss | 20 +++++++++++++-
6 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index c8adc759d..a433a6198 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -1,6 +1,6 @@
-
+
![]()
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
index 35f6f53b1..44c112378 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss
@@ -2,7 +2,7 @@
overflow-wrap: anywhere;
}
-.doc-img-background {
+.doc-img-container {
position: relative;
}
@@ -49,18 +49,6 @@
display: block;
}
-.card-selected {
- border-color: var(--bs-primary);
-
- .document-card-check {
- display: block;
- }
-}
-
-.doc-img-background-selected {
- background-color: var(--pngx-primary-faded);
-}
-
.card-info {
line-height: 1;
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
index 1dbb7c308..4885212ad 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
@@ -1,7 +1,7 @@
-
-
![]()
+
+
![]()