diff --git a/src-ui/src/app/components/manage/settings/settings.component.spec.ts b/src-ui/src/app/components/manage/settings/settings.component.spec.ts
index fb8f0a7f4..1bcbe37f8 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.spec.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.spec.ts
@@ -13,10 +13,11 @@ import { RouterTestingModule } from '@angular/router/testing'
import {
NgbModal,
NgbModule,
+ NgbAlertModule,
NgbNavLink,
NgbModalRef,
- NgbAlertModule,
} from '@ng-bootstrap/ng-bootstrap'
+import { NgSelectModule } from '@ng-select/ng-select'
import { of, throwError } from 'rxjs'
import { routes } from 'src/app/app-routing.module'
import { PaperlessMailAccount } from 'src/app/data/paperless-mail-account'
@@ -26,6 +27,7 @@ import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
import { PermissionsGuard } from 'src/app/guards/permissions.guard'
import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
+import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
import { PermissionsService } from 'src/app/services/permissions.service'
import { GroupService } from 'src/app/services/rest/group.service'
import { MailAccountService } from 'src/app/services/rest/mail-account.service'
@@ -41,15 +43,15 @@ import { MailRuleEditDialogComponent } from '../../common/edit-dialog/mail-rule-
import { UserEditDialogComponent } from '../../common/edit-dialog/user-edit-dialog/user-edit-dialog.component'
import { CheckComponent } from '../../common/input/check/check.component'
import { ColorComponent } from '../../common/input/color/color.component'
+import { NumberComponent } from '../../common/input/number/number.component'
+import { PasswordComponent } from '../../common/input/password/password.component'
+import { PermissionsGroupComponent } from '../../common/input/permissions/permissions-group/permissions-group.component'
+import { PermissionsUserComponent } from '../../common/input/permissions/permissions-user/permissions-user.component'
+import { SelectComponent } from '../../common/input/select/select.component'
+import { TagsComponent } from '../../common/input/tags/tags.component'
+import { TextComponent } from '../../common/input/text/text.component'
import { PageHeaderComponent } from '../../common/page-header/page-header.component'
import { SettingsComponent } from './settings.component'
-import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
-import { SelectComponent } from '../../common/input/select/select.component'
-import { TextComponent } from '../../common/input/text/text.component'
-import { PasswordComponent } from '../../common/input/password/password.component'
-import { NumberComponent } from '../../common/input/number/number.component'
-import { TagsComponent } from '../../common/input/tags/tags.component'
-import { NgSelectModule } from '@ng-select/ng-select'
const savedViews = [
{ id: 1, name: 'view1' },
@@ -106,6 +108,8 @@ describe('SettingsComponent', () => {
TagsComponent,
MailAccountEditDialogComponent,
MailRuleEditDialogComponent,
+ PermissionsUserComponent,
+ PermissionsGroupComponent,
],
providers: [CustomDatePipe, DatePipe, PermissionsGuard],
imports: [
@@ -125,6 +129,7 @@ describe('SettingsComponent', () => {
viewportScroller = TestBed.inject(ViewportScroller)
toastService = TestBed.inject(ToastService)
settingsService = TestBed.inject(SettingsService)
+ settingsService.currentUser = { id: 99, username: 'user99' }
userService = TestBed.inject(UserService)
permissionsService = TestBed.inject(PermissionsService)
jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
@@ -247,11 +252,11 @@ describe('SettingsComponent', () => {
)
expect(component.mailAccounts).not.toBeUndefined()
- expect(component.users).toBeUndefined()
+ expect(component.groups).toBeUndefined()
tabButtons[4].nativeElement.dispatchEvent(
new MouseEvent('mouseover', { bubbles: true })
)
- expect(component.users).not.toBeUndefined()
+ expect(component.groups).not.toBeUndefined()
})
it('should support save saved views, show error', () => {
@@ -301,7 +306,7 @@ describe('SettingsComponent', () => {
expect(toastErrorSpy).toHaveBeenCalled()
expect(storeSpy).toHaveBeenCalled()
expect(appearanceSettingsSpy).not.toHaveBeenCalled()
- expect(setSpy).toHaveBeenCalledTimes(19)
+ expect(setSpy).toHaveBeenCalledTimes(24)
// succeed
storeSpy.mockReturnValueOnce(of(true))
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts
index 9d5937c09..520cd9520 100644
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@ -48,6 +48,7 @@ import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component'
import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
import {
PermissionAction,
+ PermissionType,
PermissionsService,
} from 'src/app/services/permissions.service'
@@ -93,6 +94,11 @@ export class SettingsComponent
dateFormat: new FormControl(null),
notesEnabled: new FormControl(null),
updateCheckingEnabled: new FormControl(null),
+ defaultPermsOwner: new FormControl(null),
+ defaultPermsViewUsers: new FormControl(null),
+ defaultPermsViewGroups: new FormControl(null),
+ defaultPermsEditUsers: new FormControl(null),
+ defaultPermsEditGroups: new FormControl(null),
notificationsConsumerNewDocument: new FormControl(null),
notificationsConsumerSuccess: new FormControl(null),
@@ -159,6 +165,16 @@ export class SettingsComponent
this.activatedRoute.paramMap.subscribe((paramMap) => {
const section = paramMap.get('section')
+ if (section === null) {
+ if (
+ this.permissionsService.currentUserCan(
+ PermissionAction.View,
+ PermissionType.User
+ )
+ ) {
+ this.getUsers()
+ }
+ }
if (section) {
const navIDKey: string = Object.keys(SettingsNavIDs).find(
(navID) => navID.toLowerCase() == section
@@ -222,6 +238,19 @@ export class SettingsComponent
savedViewsWarnOnUnsavedChange: this.settings.get(
SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE
),
+ defaultPermsOwner: this.settings.get(SETTINGS_KEYS.DEFAULT_PERMS_OWNER),
+ defaultPermsViewUsers: this.settings.get(
+ SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS
+ ),
+ defaultPermsViewGroups: this.settings.get(
+ SETTINGS_KEYS.DEFAULT_PERMS_VIEW_GROUPS
+ ),
+ defaultPermsEditUsers: this.settings.get(
+ SETTINGS_KEYS.DEFAULT_PERMS_EDIT_USERS
+ ),
+ defaultPermsEditGroups: this.settings.get(
+ SETTINGS_KEYS.DEFAULT_PERMS_EDIT_GROUPS
+ ),
usersGroup: {},
groupsGroup: {},
savedViews: {},
@@ -256,33 +285,21 @@ export class SettingsComponent
this.initialize(false)
})
} else if (
- navID == SettingsNavIDs.UsersGroups &&
+ (navID == SettingsNavIDs.UsersGroups ||
+ navID == SettingsNavIDs.General) &&
(!this.users || !this.groups)
) {
- this.usersService
+ if (!this.users) this.getUsers()
+ this.groupsService
.listAll()
.pipe(first())
.subscribe({
next: (r) => {
- this.users = r.results
- this.groupsService
- .listAll()
- .pipe(first())
- .subscribe({
- next: (r) => {
- this.groups = r.results
- this.initialize(false)
- },
- error: (e) => {
- this.toastService.showError(
- $localize`Error retrieving groups`,
- e
- )
- },
- })
+ this.groups = r.results
+ this.initialize(false)
},
error: (e) => {
- this.toastService.showError($localize`Error retrieving users`, e)
+ this.toastService.showError($localize`Error retrieving groups`, e)
},
})
} else if (
@@ -322,6 +339,20 @@ export class SettingsComponent
}
}
+ private getUsers() {
+ this.usersService
+ .listAll()
+ .pipe(first())
+ .subscribe({
+ next: (r) => {
+ this.users = r.results
+ },
+ error: (e) => {
+ this.toastService.showError($localize`Error retrieving users`, e)
+ },
+ })
+ }
+
initialize(resetSettings: boolean = true) {
this.unsubscribeNotifier.next(true)
@@ -611,6 +642,26 @@ export class SettingsComponent
SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE,
this.settingsForm.value.savedViewsWarnOnUnsavedChange
)
+ this.settings.set(
+ SETTINGS_KEYS.DEFAULT_PERMS_OWNER,
+ this.settingsForm.value.defaultPermsOwner
+ )
+ this.settings.set(
+ SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS,
+ this.settingsForm.value.defaultPermsViewUsers
+ )
+ this.settings.set(
+ SETTINGS_KEYS.DEFAULT_PERMS_VIEW_GROUPS,
+ this.settingsForm.value.defaultPermsViewGroups
+ )
+ this.settings.set(
+ SETTINGS_KEYS.DEFAULT_PERMS_EDIT_USERS,
+ this.settingsForm.value.defaultPermsEditUsers
+ )
+ this.settings.set(
+ SETTINGS_KEYS.DEFAULT_PERMS_EDIT_GROUPS,
+ this.settingsForm.value.defaultPermsEditGroups
+ )
this.settings.setLanguage(this.settingsForm.value.displayLanguage)
this.settings
.storeSettings()
diff --git a/src-ui/src/app/data/paperless-uisettings.ts b/src-ui/src/app/data/paperless-uisettings.ts
index c06aa405d..064ebcf33 100644
--- a/src-ui/src/app/data/paperless-uisettings.ts
+++ b/src-ui/src/app/data/paperless-uisettings.ts
@@ -42,6 +42,11 @@ export const SETTINGS_KEYS = {
SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE:
'general-settings:saved-views:warn-on-unsaved-change',
TOUR_COMPLETE: 'general-settings:tour-complete',
+ DEFAULT_PERMS_OWNER: 'general-settings:permissions:default-owner',
+ DEFAULT_PERMS_VIEW_USERS: 'general-settings:permissions:default-view-users',
+ DEFAULT_PERMS_VIEW_GROUPS: 'general-settings:permissions:default-view-groups',
+ DEFAULT_PERMS_EDIT_USERS: 'general-settings:permissions:default-edit-users',
+ DEFAULT_PERMS_EDIT_GROUPS: 'general-settings:permissions:default-edit-groups',
}
export const SETTINGS: PaperlessUiSetting[] = [
@@ -150,4 +155,29 @@ export const SETTINGS: PaperlessUiSetting[] = [
type: 'boolean',
default: false,
},
+ {
+ key: SETTINGS_KEYS.DEFAULT_PERMS_OWNER,
+ type: 'number',
+ default: undefined,
+ },
+ {
+ key: SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS,
+ type: 'array',
+ default: [],
+ },
+ {
+ key: SETTINGS_KEYS.DEFAULT_PERMS_VIEW_GROUPS,
+ type: 'array',
+ default: [],
+ },
+ {
+ key: SETTINGS_KEYS.DEFAULT_PERMS_EDIT_USERS,
+ type: 'array',
+ default: [],
+ },
+ {
+ key: SETTINGS_KEYS.DEFAULT_PERMS_EDIT_GROUPS,
+ type: 'array',
+ default: [],
+ },
]
diff --git a/src-ui/src/app/services/settings.service.spec.ts b/src-ui/src/app/services/settings.service.spec.ts
index e074612b3..c0ba16d74 100644
--- a/src-ui/src/app/services/settings.service.spec.ts
+++ b/src-ui/src/app/services/settings.service.spec.ts
@@ -1,21 +1,25 @@
-import { TestBed } from '@angular/core/testing'
-import { SettingsService } from './settings.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ HttpClientTestingModule,
} from '@angular/common/http/testing'
-import { RouterTestingModule } from '@angular/router/testing'
-import { environment } from 'src/environments/environment'
-import { Subscription } from 'rxjs'
-import { PaperlessUiSettings } from '../data/paperless-uisettings'
-import { SETTINGS_KEYS } from '../data/paperless-uisettings'
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import { TestBed } from '@angular/core/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { RouterTestingModule } from '@angular/router/testing'
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import { CookieService } from 'ngx-cookie-service'
+import { Subscription } from 'rxjs'
+import { environment } from 'src/environments/environment'
import { AppModule } from '../app.module'
+import {
+ PaperlessUiSettings,
+ SETTINGS_KEYS,
+} from '../data/paperless-uisettings'
+import { SettingsService } from './settings.service'
describe('SettingsService', () => {
let httpTestingController: HttpTestingController
let settingsService: SettingsService
+ let cookieService: CookieService
let subscription: Subscription
const ui_settings: PaperlessUiSettings = {
@@ -46,6 +50,13 @@ describe('SettingsService', () => {
saved_views: { warn_on_unsaved_change: true },
notes_enabled: true,
tour_complete: false,
+ permissions: {
+ default_owner: null,
+ default_view_users: [1],
+ default_view_groups: [2],
+ default_edit_users: [3],
+ default_edit_groups: [4],
+ },
},
permissions: [],
}
@@ -53,7 +64,7 @@ describe('SettingsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [],
- providers: [SettingsService],
+ providers: [SettingsService, CookieService],
imports: [
HttpClientTestingModule,
RouterTestingModule,
@@ -65,6 +76,7 @@ describe('SettingsService', () => {
})
httpTestingController = TestBed.inject(HttpTestingController)
+ cookieService = TestBed.inject(CookieService)
settingsService = TestBed.inject(SettingsService)
})
@@ -136,7 +148,52 @@ describe('SettingsService', () => {
expect(settingsService.get(SETTINGS_KEYS.THEME_COLOR)).toEqual('#000000')
})
- it('updates appearnce settings', () => {
+ it('sets django cookie for languages', () => {
+ httpTestingController
+ .expectOne(`${environment.apiBaseUrl}ui_settings/`)
+ .flush(ui_settings)
+ const cookieSetSpy = jest.spyOn(cookieService, 'set')
+ settingsService.initializeSettings().subscribe(() => {})
+ const req = httpTestingController.expectOne(
+ `${environment.apiBaseUrl}ui_settings/`
+ )
+ ui_settings.settings['language'] = 'foobar'
+ req.flush(ui_settings)
+ expect(cookieSetSpy).toHaveBeenCalledWith('django_language', 'foobar')
+ const cookieDeleteSpy = jest.spyOn(cookieService, 'delete')
+ settingsService.setLanguage('')
+ expect(cookieDeleteSpy).toHaveBeenCalled()
+ })
+
+ it('should support null values for settings if set, undefined if not', () => {
+ httpTestingController
+ .expectOne(`${environment.apiBaseUrl}ui_settings/`)
+ .flush(ui_settings)
+ expect(settingsService.get('foo')).toEqual(undefined)
+ expect(settingsService.get(SETTINGS_KEYS.DEFAULT_PERMS_OWNER)).toEqual(null)
+ })
+
+ it('should support array values', () => {
+ httpTestingController
+ .expectOne(`${environment.apiBaseUrl}ui_settings/`)
+ .flush(ui_settings)
+ expect(settingsService.get(SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS)).toEqual(
+ [1]
+ )
+ })
+
+ it('should support default permissions values', () => {
+ delete ui_settings.settings['permissions']
+ httpTestingController
+ .expectOne(`${environment.apiBaseUrl}ui_settings/`)
+ .flush(ui_settings)
+ expect(settingsService.get(SETTINGS_KEYS.DEFAULT_PERMS_OWNER)).toEqual(1)
+ expect(settingsService.get(SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS)).toEqual(
+ []
+ )
+ })
+
+ it('updates appearance settings', () => {
const req = httpTestingController.expectOne(
`${environment.apiBaseUrl}ui_settings/`
)
diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts
index 7a237586c..bd6404106 100644
--- a/src-ui/src/app/services/settings.service.ts
+++ b/src-ui/src/app/services/settings.service.ts
@@ -372,7 +372,7 @@ export class SettingsService {
}
private getSettingRawValue(key: string): any {
- let value = null
+ let value = undefined
// parse key:key:key into nested object
const keys = key.replace('general-settings:', '').split(':')
let settingObj = this.settings
@@ -389,12 +389,20 @@ export class SettingsService {
let setting = SETTINGS.find((s) => s.key == key)
if (!setting) {
- return null
+ return undefined
}
let value = this.getSettingRawValue(key)
- if (value != null) {
+ // special case to fallback
+ if (key === SETTINGS_KEYS.DEFAULT_PERMS_OWNER && value === undefined) {
+ return this.currentUser.id
+ }
+
+ if (value !== undefined) {
+ if (value === null) {
+ return null
+ }
switch (setting.type) {
case 'boolean':
return JSON.parse(value)
@@ -424,7 +432,7 @@ export class SettingsService {
private settingIsSet(key: string): boolean {
let value = this.getSettingRawValue(key)
- return value != null
+ return value != undefined
}
storeSettings(): Observable
{