Frontend handle this change

This commit is contained in:
shamoon
2026-02-20 14:03:38 -08:00
parent 34bdf41931
commit 7bcfcf1e49
5 changed files with 15 additions and 11 deletions

View File

@@ -579,8 +579,6 @@ describe('DocumentListComponent', () => {
expect(savedViewServiceCreate).toHaveBeenCalledWith( expect(savedViewServiceCreate).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
name: 'Foo Bar', name: 'Foo Bar',
show_on_dashboard: false,
show_in_sidebar: false,
owner: permissions.owner, owner: permissions.owner,
set_permissions: permissions.set_permissions, set_permissions: permissions.set_permissions,
}) })

View File

@@ -446,9 +446,6 @@ export class DocumentListComponent
modal.componentInstance.buttonsEnabled = false modal.componentInstance.buttonsEnabled = false
let savedView: SavedView = { let savedView: SavedView = {
name: formValue.name, name: formValue.name,
// Visibility is in per-user UISettings.
show_on_dashboard: false,
show_in_sidebar: false,
filter_rules: this.list.filterRules, filter_rules: this.list.filterRules,
sort_reverse: this.list.sortReverse, sort_reverse: this.list.sortReverse,
sort_field: this.list.sortField, sort_field: this.list.sortField,

View File

@@ -255,12 +255,12 @@ export const SETTINGS: UiSetting[] = [
{ {
key: SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS, key: SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS,
type: 'array', type: 'array',
default: null, default: [],
}, },
{ {
key: SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS, key: SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS,
type: 'array', type: 'array',
default: null, default: [],
}, },
{ {
key: SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER, key: SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER,

View File

@@ -57,6 +57,11 @@ describe(`Additional service tests for SavedViewService`, () => {
let settingsService let settingsService
it('should retrieve saved views and sort them', () => { it('should retrieve saved views and sort them', () => {
jest.spyOn(settingsService, 'get').mockImplementation((key) => {
if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS) return [1, 2, 3]
if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS) return [1, 2, 3]
return []
})
service.reload() service.reload()
const req = httpTestingController.expectOne( const req = httpTestingController.expectOne(
`${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000` `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
@@ -93,7 +98,9 @@ describe(`Additional service tests for SavedViewService`, () => {
it('should sort dashboard views', () => { it('should sort dashboard views', () => {
service['savedViews'] = saved_views service['savedViews'] = saved_views
jest.spyOn(settingsService, 'get').mockImplementation((key) => { jest.spyOn(settingsService, 'get').mockImplementation((key) => {
if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS) return [1, 2, 3]
if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER) return [3, 1, 2] if (key === SETTINGS_KEYS.DASHBOARD_VIEWS_SORT_ORDER) return [3, 1, 2]
return []
}) })
expect(service.dashboardViews).toEqual([ expect(service.dashboardViews).toEqual([
saved_views[2], saved_views[2],
@@ -114,7 +121,9 @@ describe(`Additional service tests for SavedViewService`, () => {
it('should sort sidebar views', () => { it('should sort sidebar views', () => {
service['savedViews'] = saved_views service['savedViews'] = saved_views
jest.spyOn(settingsService, 'get').mockImplementation((key) => { jest.spyOn(settingsService, 'get').mockImplementation((key) => {
if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS) return [1, 2, 3]
if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_SORT_ORDER) return [3, 1, 2] if (key === SETTINGS_KEYS.SIDEBAR_VIEWS_SORT_ORDER) return [3, 1, 2]
return []
}) })
expect(service.sidebarViews).toEqual([ expect(service.sidebarViews).toEqual([
saved_views[2], saved_views[2],

View File

@@ -67,9 +67,9 @@ export class SavedViewService extends AbstractPaperlessService<SavedView> {
return this.savedViews return this.savedViews
} }
private getVisibleViewIds(setting: string): number[] | null { private getVisibleViewIds(setting: string): number[] {
const configured = this.settingsService.get(setting) const configured = this.settingsService.get(setting)
return Array.isArray(configured) ? configured : null return Array.isArray(configured) ? configured : []
} }
private withUserVisibility(view: SavedView): SavedView { private withUserVisibility(view: SavedView): SavedView {
@@ -84,14 +84,14 @@ export class SavedViewService extends AbstractPaperlessService<SavedView> {
const visibleIds = this.getVisibleViewIds( const visibleIds = this.getVisibleViewIds(
SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS SETTINGS_KEYS.DASHBOARD_VIEWS_VISIBLE_IDS
) )
return visibleIds ? visibleIds.includes(view.id) : !!view.show_on_dashboard return visibleIds.includes(view.id)
} }
private isSidebarVisible(view: SavedView): boolean { private isSidebarVisible(view: SavedView): boolean {
const visibleIds = this.getVisibleViewIds( const visibleIds = this.getVisibleViewIds(
SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS SETTINGS_KEYS.SIDEBAR_VIEWS_VISIBLE_IDS
) )
return visibleIds ? visibleIds.includes(view.id) : !!view.show_in_sidebar return visibleIds.includes(view.id)
} }
get sidebarViews(): SavedView[] { get sidebarViews(): SavedView[] {