diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html index eea93b937..447f9cfb7 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -132,7 +132,46 @@ -

Permissions

+

Update checking

+ +
+
+

+ Update checking works by pinging the public GitHub API for the latest release to determine whether a new version is available.
+ Actual updating of the app must still be performed manually. +

+

+ No tracking data is collected by the app in any way. +

+ +
+
+ +

Bulk editing

+ +
+
+ + +
+
+ +

Notes

+ +
+
+ +
+
+ + + + +
  • + Permissions + + +

    Default Permissions

    @@ -207,39 +246,6 @@
    - -

    Update checking

    - -
    -
    -

    - Update checking works by pinging the public GitHub API for the latest release to determine whether a new version is available.
    - Actual updating of the app must still be performed manually. -

    -

    - No tracking data is collected by the app in any way. -

    - -
    -
    - -

    Bulk editing

    - -
    -
    - - -
    -
    - -

    Notes

    - -
    -
    - -
    -
    -
  • 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 c93532443..b7e0c0ed3 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 @@ -153,8 +153,10 @@ describe('SettingsComponent', () => { const navigateSpy = jest.spyOn(router, 'navigate') const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavLink)) tabButtons[1].nativeElement.dispatchEvent(new MouseEvent('click')) - expect(navigateSpy).toHaveBeenCalledWith(['settings', 'notifications']) + 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') @@ -178,7 +180,7 @@ describe('SettingsComponent', () => { activatedRoute.snapshot.fragment = '#notifications' const scrollSpy = jest.spyOn(viewportScroller, 'scrollToAnchor') component.ngOnInit() - expect(component.activeNavID).toEqual(2) // Users & Groups + expect(component.activeNavID).toEqual(3) // Users & Groups component.ngAfterViewInit() expect(scrollSpy).toHaveBeenCalledWith('#notifications') }) 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 85376792b..78992a32c 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core' import { FormGroup, FormControl } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router' -import { NgbModal, NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap' +import { NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap' import { DirtyComponent, dirtyCheck } from '@ngneat/dirty-check-forms' import { TourService } from 'ngx-ui-tour-ng-bootstrap' import { @@ -40,16 +40,13 @@ import { LanguageOption, } from 'src/app/services/settings.service' import { ToastService, Toast } from 'src/app/services/toast.service' -import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' -import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component' -import { GroupEditDialogComponent } from '../../common/edit-dialog/group-edit-dialog/group-edit-dialog.component' -import { UserEditDialogComponent } from '../../common/edit-dialog/user-edit-dialog/user-edit-dialog.component' import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component' enum SettingsNavIDs { General = 1, - Notifications = 2, - SavedViews = 3, + Permissions = 2, + Notifications = 3, + SavedViews = 4, } @Component({