@@ -336,87 +342,6 @@
-
-
- Saved views
-
-
- Settings
-
-
- Views
-
-
- @for (view of savedViews; track view) {
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @if (displayFields) {
-
- }
-
-
- }
-
- @if (savedViews && savedViews.length === 0) {
- -
-
No saved views defined.
-
- }
-
- @if (!savedViews) {
- -
-
-
Loading...
-
- }
-
-
-
-
-
diff --git a/src-ui/src/app/components/admin/settings/settings.component.spec.ts b/src-ui/src/app/components/admin/settings/settings.component.spec.ts
index bd9fe5664..b6f863163 100644
--- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts
+++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts
@@ -15,7 +15,6 @@ import {
import { NgSelectModule } from '@ng-select/ng-select'
import { of, throwError } from 'rxjs'
import { routes } from 'src/app/app-routing.module'
-import { SavedView } from 'src/app/data/saved-view'
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
import { PermissionsGuard } from 'src/app/guards/permissions.guard'
@@ -52,10 +51,6 @@ import { DragDropSelectComponent } from '../../common/input/drag-drop-select/dra
import { DragDropModule } from '@angular/cdk/drag-drop'
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-const savedViews = [
- { id: 1, name: 'view1', show_in_sidebar: true, show_on_dashboard: true },
- { id: 2, name: 'view2', show_in_sidebar: false, show_on_dashboard: false },
-]
const users = [
{ id: 1, username: 'user1', is_superuser: false },
{ id: 2, username: 'user2', is_superuser: false },
@@ -70,7 +65,6 @@ describe('SettingsComponent', () => {
let fixture: ComponentFixture
let router: Router
let settingsService: SettingsService
- let savedViewService: SavedViewService
let activatedRoute: ActivatedRoute
let viewportScroller: ViewportScroller
let toastService: ToastService
@@ -139,7 +133,6 @@ describe('SettingsComponent', () => {
.spyOn(permissionsService, 'currentUserOwnsObject')
.mockReturnValue(true)
groupService = TestBed.inject(GroupService)
- savedViewService = TestBed.inject(SavedViewService)
})
function completeSetup(excludeService = null) {
@@ -161,15 +154,6 @@ describe('SettingsComponent', () => {
})
)
}
- if (excludeService !== savedViewService) {
- jest.spyOn(savedViewService, 'listAll').mockReturnValue(
- of({
- all: savedViews.map((v) => v.id),
- count: savedViews.length,
- results: (savedViews as SavedView[]).concat([]),
- })
- )
- }
fixture = TestBed.createComponent(SettingsComponent)
component = fixture.componentInstance
@@ -184,8 +168,6 @@ describe('SettingsComponent', () => {
expect(navigateSpy).toHaveBeenCalledWith(['settings', 'permissions'])
tabButtons[2].nativeElement.dispatchEvent(new MouseEvent('click'))
expect(navigateSpy).toHaveBeenCalledWith(['settings', 'notifications'])
- tabButtons[3].nativeElement.dispatchEvent(new MouseEvent('click'))
- expect(navigateSpy).toHaveBeenCalledWith(['settings', 'savedviews'])
const initSpy = jest.spyOn(component, 'initialize')
component.isDirty = true // mock dirty
@@ -213,90 +195,8 @@ describe('SettingsComponent', () => {
expect(scrollSpy).toHaveBeenCalledWith('#notifications')
})
- it('should enable organizing of sidebar saved views even on direct navigation', () => {
- completeSetup()
- jest
- .spyOn(activatedRoute, 'paramMap', 'get')
- .mockReturnValue(of(convertToParamMap({ section: 'savedviews' })))
- activatedRoute.snapshot.fragment = '#savedviews'
- component.ngOnInit()
- expect(component.activeNavID).toEqual(4) // Saved Views
- component.ngAfterViewInit()
- expect(settingsService.organizingSidebarSavedViews).toBeTruthy()
- })
-
- it('should support save saved views, show error', () => {
- completeSetup()
-
- const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavLink))
- tabButtons[3].nativeElement.dispatchEvent(new MouseEvent('click'))
- fixture.detectChanges()
-
- const toastErrorSpy = jest.spyOn(toastService, 'showError')
- const toastSpy = jest.spyOn(toastService, 'show')
- const savedViewPatchSpy = jest.spyOn(savedViewService, 'patchMany')
-
- const toggle = fixture.debugElement.query(
- By.css('.form-check.form-switch input')
- )
- toggle.nativeElement.checked = true
- toggle.nativeElement.dispatchEvent(new Event('change'))
-
- // saved views error first
- savedViewPatchSpy.mockReturnValueOnce(
- throwError(() => new Error('unable to save saved views'))
- )
- component.saveSettings()
- expect(toastErrorSpy).toHaveBeenCalled()
- expect(savedViewPatchSpy).toHaveBeenCalled()
- toastSpy.mockClear()
- toastErrorSpy.mockClear()
- savedViewPatchSpy.mockClear()
-
- // succeed saved views
- savedViewPatchSpy.mockReturnValueOnce(of(savedViews as SavedView[]))
- component.saveSettings()
- expect(toastErrorSpy).not.toHaveBeenCalled()
- expect(savedViewPatchSpy).toHaveBeenCalled()
- })
-
- it('should update only patch saved views that have changed', () => {
- completeSetup()
-
- const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavLink))
- tabButtons[3].nativeElement.dispatchEvent(new MouseEvent('click'))
- fixture.detectChanges()
-
- const patchSpy = jest.spyOn(savedViewService, 'patchMany')
- component.saveSettings()
- expect(patchSpy).not.toHaveBeenCalled()
-
- const view = savedViews[0]
- const toggle = fixture.debugElement.query(
- By.css('.form-check.form-switch input')
- )
- toggle.nativeElement.checked = true
- toggle.nativeElement.dispatchEvent(new Event('change'))
- // register change
- component.savedViewGroup.get(view.id.toString()).value[
- 'show_on_dashboard'
- ] = !view.show_on_dashboard
- fixture.detectChanges()
-
- component.saveSettings()
- expect(patchSpy).toHaveBeenCalledWith([
- {
- id: view.id,
- name: view.name,
- show_in_sidebar: view.show_in_sidebar,
- show_on_dashboard: !view.show_on_dashboard,
- },
- ])
- })
-
it('should support save local settings updating appearance settings and calling API, show error', () => {
completeSetup()
- jest.spyOn(savedViewService, 'patchMany').mockReturnValue(of([]))
const toastErrorSpy = jest.spyOn(toastService, 'showError')
const toastSpy = jest.spyOn(toastService, 'show')
const storeSpy = jest.spyOn(settingsService, 'storeSettings')
@@ -326,7 +226,6 @@ describe('SettingsComponent', () => {
it('should offer reload if settings changes require', () => {
completeSetup()
- jest.spyOn(savedViewService, 'patchMany').mockReturnValue(of([]))
let toast: Toast
toastService.getToasts().subscribe((t) => (toast = t[0]))
component.initialize(true) // reset
@@ -361,18 +260,6 @@ describe('SettingsComponent', () => {
component.clearThemeColor()
})
- it('should support delete saved view', () => {
- completeSetup()
- const toastSpy = jest.spyOn(toastService, 'showInfo')
- const deleteSpy = jest.spyOn(savedViewService, 'delete')
- deleteSpy.mockReturnValue(of(true))
- component.deleteSavedView(savedViews[0] as SavedView)
- expect(deleteSpy).toHaveBeenCalled()
- expect(toastSpy).toHaveBeenCalledWith(
- `Saved view "${savedViews[0].name}" deleted.`
- )
- })
-
it('should show errors on load if load users failure', () => {
const toastErrorSpy = jest.spyOn(toastService, 'showError')
jest
diff --git a/src-ui/src/app/components/admin/settings/settings.component.ts b/src-ui/src/app/components/admin/settings/settings.component.ts
index c08a869e2..de6d34a2a 100644
--- a/src-ui/src/app/components/admin/settings/settings.component.ts
+++ b/src-ui/src/app/components/admin/settings/settings.component.ts
@@ -26,7 +26,6 @@ import {
tap,
} from 'rxjs'
import { Group } from 'src/app/data/group'
-import { SavedView } from 'src/app/data/saved-view'
import { GlobalSearchType, SETTINGS_KEYS } from 'src/app/data/ui-settings'
import { User } from 'src/app/data/user'
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
@@ -36,7 +35,6 @@ import {
PermissionType,
} from 'src/app/services/permissions.service'
import { GroupService } from 'src/app/services/rest/group.service'
-import { SavedViewService } from 'src/app/services/rest/saved-view.service'
import { UserService } from 'src/app/services/rest/user.service'
import {
SettingsService,
@@ -50,7 +48,6 @@ import {
SystemStatusItemStatus,
SystemStatus,
} from 'src/app/data/system-status'
-import { DisplayMode } from 'src/app/data/document'
enum SettingsNavIDs {
General = 1,
@@ -75,9 +72,6 @@ export class SettingsComponent
implements OnInit, AfterViewInit, OnDestroy, DirtyComponent
{
activeNavID: number
- DisplayMode = DisplayMode
-
- savedViewGroup = new FormGroup({})
settingsForm = new FormGroup({
bulkEditConfirmationDialogs: new FormControl(null),
@@ -110,14 +104,9 @@ export class SettingsComponent
notificationsConsumerSuppressOnDashboard: new FormControl(null),
savedViewsWarnOnUnsavedChange: new FormControl(null),
- savedViews: this.savedViewGroup,
})
- savedViews: SavedView[]
SettingsNavIDs = SettingsNavIDs
- get displayFields() {
- return this.settings.allDisplayFields
- }
store: BehaviorSubject
storeSub: Subscription
@@ -152,7 +141,6 @@ export class SettingsComponent
}
constructor(
- public savedViewService: SavedViewService,
private documentListViewService: DocumentListViewService,
private toastService: ToastService,
private settings: SettingsService,
@@ -214,18 +202,6 @@ export class SettingsComponent
})
}
- if (
- this.permissionsService.currentUserCan(
- PermissionAction.View,
- PermissionType.SavedView
- )
- ) {
- this.savedViewService.listAll().subscribe((r) => {
- this.savedViews = r.results
- this.initialize(false)
- })
- }
-
this.activatedRoute.paramMap.subscribe((paramMap) => {
const section = paramMap.get('section')
if (section) {
@@ -235,9 +211,6 @@ export class SettingsComponent
if (navIDKey) {
this.activeNavID = SettingsNavIDs[navIDKey]
}
- if (this.activeNavID === SettingsNavIDs.SavedViews) {
- this.settings.organizingSidebarSavedViews = true
- }
}
})
}
@@ -314,7 +287,6 @@ export class SettingsComponent
),
searchDbOnly: this.settings.get(SETTINGS_KEYS.SEARCH_DB_ONLY),
searchLink: this.settings.get(SETTINGS_KEYS.SEARCH_FULL_TYPE),
- savedViews: {},
}
}
@@ -327,15 +299,11 @@ export class SettingsComponent
this.router
.navigate(['settings', foundNavIDkey.toLowerCase()])
.then((navigated) => {
- this.settings.organizingSidebarSavedViews = false
if (!navigated && this.isDirty) {
this.activeNavID = navChangeEvent.activeId
} else if (navigated && this.isDirty) {
this.initialize()
}
- if (this.activeNavID === SettingsNavIDs.SavedViews) {
- this.settings.organizingSidebarSavedViews = true
- }
})
}
@@ -346,34 +314,6 @@ export class SettingsComponent
let storeData = this.getCurrentSettings()
- if (this.savedViews) {
- this.emptyGroup(this.savedViewGroup)
-
- for (let view of this.savedViews) {
- storeData.savedViews[view.id.toString()] = {
- id: view.id,
- name: view.name,
- show_on_dashboard: view.show_on_dashboard,
- show_in_sidebar: view.show_in_sidebar,
- page_size: view.page_size,
- display_mode: view.display_mode,
- display_fields: view.display_fields,
- }
- this.savedViewGroup.addControl(
- view.id.toString(),
- new FormGroup({
- id: new FormControl(null),
- name: new FormControl(null),
- show_on_dashboard: new FormControl(null),
- show_in_sidebar: new FormControl(null),
- page_size: new FormControl(null),
- display_mode: new FormControl(null),
- display_fields: new FormControl([]),
- })
- )
- }
- }
-
this.store = new BehaviorSubject(storeData)
this.storeSub = this.store.asObservable().subscribe((state) => {
@@ -413,32 +353,12 @@ export class SettingsComponent
}
}
- private emptyGroup(group: FormGroup) {
- Object.keys(group.controls).forEach((key) => group.removeControl(key))
- }
-
ngOnDestroy() {
if (this.isDirty) this.settings.updateAppearanceSettings() // in case user changed appearance but didn't save
this.storeSub && this.storeSub.unsubscribe()
- this.settings.organizingSidebarSavedViews = false
}
- deleteSavedView(savedView: SavedView) {
- this.savedViewService.delete(savedView).subscribe(() => {
- this.savedViewGroup.removeControl(savedView.id.toString())
- this.savedViews.splice(this.savedViews.indexOf(savedView), 1)
- this.toastService.showInfo(
- $localize`Saved view "${savedView.name}" deleted.`
- )
- this.savedViewService.clearCache()
- this.savedViewService.listAll().subscribe((r) => {
- this.savedViews = r.results
- this.initialize(true)
- })
- })
- }
-
- private saveLocalSettings() {
+ public saveSettings() {
this.savePending = true
const reloadRequired =
this.settingsForm.value.displayLanguage !=
@@ -600,31 +520,6 @@ export class SettingsComponent
return new Date()
}
- saveSettings() {
- // only patch views that have actually changed
- const changed: SavedView[] = []
- Object.values(this.savedViewGroup.controls)
- .filter((g: FormGroup) => !g.pristine)
- .forEach((group: FormGroup) => {
- changed.push(group.value)
- })
- if (changed.length > 0) {
- this.savedViewService.patchMany(changed).subscribe({
- next: () => {
- this.saveLocalSettings()
- },
- error: (error) => {
- this.toastService.showError(
- $localize`Error while storing settings on server.`,
- error
- )
- },
- })
- } else {
- this.saveLocalSettings()
- }
- }
-
reset() {
this.settingsForm.patchValue(this.store.getValue())
}
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index f69b5246a..c9192df6a 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -199,6 +199,13 @@
Custom Fields
+
+
+ Saved Views
+
+
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index ebe3536e5..fdf3e24ed 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -90,6 +90,7 @@
}