Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/app/shared/menu/providers/access-control.menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,29 @@ describe('AccessControlMenuProvider', () => {
done();
});
});

describe('when user has no permissions', () => {
let noPermsProvider: AccessControlMenuProvider;
let noPermsAuthStub = new AuthorizationDataServiceStub();

beforeEach(() => {
spyOn(noPermsAuthStub, 'isAuthorized').and.returnValue(of(false));
TestBed.resetTestingModule();
TestBed.configureTestingModule({
providers: [
AccessControlMenuProvider,
{ provide: AuthorizationDataService, useValue: noPermsAuthStub },
{ provide: ScriptDataService, useClass: ScriptServiceStub },
],
});
noPermsProvider = TestBed.inject(AccessControlMenuProvider);
});

it('getTopSection should return visible false', (done) => {
noPermsProvider.getTopSection().subscribe((section) => {
expect(section.visible).toBeFalse();
done();
});
});
});
});
22 changes: 13 additions & 9 deletions src/app/shared/menu/providers/access-control.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
combineLatest as observableCombineLatest,
map,
Observable,
of,
} from 'rxjs';

import { MenuItemType } from '../menu-item-type.model';
Expand All @@ -37,14 +36,19 @@ export class AccessControlMenuProvider extends AbstractExpandableMenuProvider {
}

public getTopSection(): Observable<PartialMenuSection> {
return of({
model: {
type: MenuItemType.TEXT,
text: 'menu.section.access_control',
},
icon: 'key',
visible: true,
});
return observableCombineLatest([
this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
this.authorizationService.isAuthorized(FeatureID.CanManageGroups),
]).pipe(
map(([isSiteAdmin, canManageGroups]) => ({
model: {
type: MenuItemType.TEXT,
text: 'menu.section.access_control',
},
icon: 'key',
visible: isSiteAdmin || canManageGroups,
})),
);
}

public getSubSections(): Observable<PartialMenuSection[]> {
Expand Down
24 changes: 24 additions & 0 deletions src/app/shared/menu/providers/edit.menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,28 @@ describe('EditMenuProvider', () => {
done();
});
});

describe('when user has no permissions', () => {
let noPermsProvider: EditMenuProvider;
let noPermsAuthStub = new AuthorizationDataServiceStub();

beforeEach(() => {
spyOn(noPermsAuthStub, 'isAuthorized').and.returnValue(of(false));
TestBed.resetTestingModule();
TestBed.configureTestingModule({
providers: [
EditMenuProvider,
{ provide: AuthorizationDataService, useValue: noPermsAuthStub },
],
});
noPermsProvider = TestBed.inject(EditMenuProvider);
});

it('getTopSection should return visible false', (done) => {
noPermsProvider.getTopSection().subscribe((section) => {
expect(section.visible).toBeFalse();
done();
});
});
});
});
13 changes: 8 additions & 5 deletions src/app/shared/menu/providers/edit.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
combineLatest,
map,
Observable,
of,
} from 'rxjs';

import { ThemedEditCollectionSelectorComponent } from '../../dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
Expand All @@ -37,16 +36,20 @@ export class EditMenuProvider extends AbstractExpandableMenuProvider {
}

public getTopSection(): Observable<PartialMenuSection> {
return of(
{
return combineLatest([
this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
this.authorizationService.isAuthorized(FeatureID.CanEditItem),
]).pipe(
map(([isCollectionAdmin, isCommunityAdmin, canEditItem]) => ({
accessibilityHandle: 'edit',
model: {
type: MenuItemType.TEXT,
text: 'menu.section.edit',
},
icon: 'pencil',
visible: true,
},
visible: isCollectionAdmin || isCommunityAdmin || canEditItem,
})),
);
}

Expand Down
25 changes: 25 additions & 0 deletions src/app/shared/menu/providers/export.menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,29 @@ describe('ExportMenuProvider', () => {
done();
});
});

describe('when user has no permissions', () => {
let noPermsProvider: ExportMenuProvider;
let noPermsAuthStub = new AuthorizationDataServiceStub();

beforeEach(() => {
spyOn(noPermsAuthStub, 'isAuthorized').and.returnValue(of(false));
TestBed.resetTestingModule();
TestBed.configureTestingModule({
providers: [
ExportMenuProvider,
{ provide: AuthorizationDataService, useValue: noPermsAuthStub },
{ provide: ScriptDataService, useClass: ScriptServiceStub },
],
});
noPermsProvider = TestBed.inject(ExportMenuProvider);
});

it('getTopSection should return visible false', (done) => {
noPermsProvider.getTopSection().subscribe((section) => {
expect(section.visible).toBeFalse();
done();
});
});
});
});
9 changes: 4 additions & 5 deletions src/app/shared/menu/providers/export.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
combineLatest as observableCombineLatest,
map,
Observable,
of,
} from 'rxjs';

import { ExportBatchSelectorComponent } from '../../dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
Expand All @@ -41,16 +40,16 @@ export class ExportMenuProvider extends AbstractExpandableMenuProvider {
}

public getTopSection(): Observable<PartialMenuSection> {
return of(
{
return this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
map((isSiteAdmin) => ({
accessibilityHandle: 'export',
model: {
type: MenuItemType.TEXT,
text: 'menu.section.export',
},
icon: 'file-export',
visible: true,
},
visible: isSiteAdmin,
})),
);
}

Expand Down
25 changes: 25 additions & 0 deletions src/app/shared/menu/providers/import.menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,29 @@ describe('ImportMenuProvider', () => {
done();
});
});

describe('when user has no permissions', () => {
let noPermsProvider: ImportMenuProvider;
let noPermsAuthStub = new AuthorizationDataServiceStub();

beforeEach(() => {
spyOn(noPermsAuthStub, 'isAuthorized').and.returnValue(of(false));
TestBed.resetTestingModule();
TestBed.configureTestingModule({
providers: [
ImportMenuProvider,
{ provide: AuthorizationDataService, useValue: noPermsAuthStub },
{ provide: ScriptDataService, useClass: ScriptServiceStub },
],
});
noPermsProvider = TestBed.inject(ImportMenuProvider);
});

it('getTopSection should return visible false', (done) => {
noPermsProvider.getTopSection().subscribe((section) => {
expect(section.visible).toBeFalse();
done();
});
});
});
});
9 changes: 4 additions & 5 deletions src/app/shared/menu/providers/import.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
combineLatest as observableCombineLatest,
map,
Observable,
of,
} from 'rxjs';

import { MenuItemType } from '../menu-item-type.model';
Expand All @@ -39,15 +38,15 @@ export class ImportMenuProvider extends AbstractExpandableMenuProvider {
}

public getTopSection(): Observable<PartialMenuSection> {
return of(
{
return this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
map((isSiteAdmin) => ({
model: {
type: MenuItemType.TEXT,
text: 'menu.section.import',
},
icon: 'file-import',
visible: true,
},
visible: isSiteAdmin,
})),
);
}

Expand Down
24 changes: 24 additions & 0 deletions src/app/shared/menu/providers/new.menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,28 @@ describe('NewMenuProvider', () => {
done();
});
});

describe('when user has no permissions', () => {
let noPermsProvider: NewMenuProvider;
let noPermsAuthStub = new AuthorizationDataServiceStub();

beforeEach(() => {
spyOn(noPermsAuthStub, 'isAuthorized').and.returnValue(of(false));
TestBed.resetTestingModule();
TestBed.configureTestingModule({
providers: [
NewMenuProvider,
{ provide: AuthorizationDataService, useValue: noPermsAuthStub },
],
});
noPermsProvider = TestBed.inject(NewMenuProvider);
});

it('getTopSection should return visible false', (done) => {
noPermsProvider.getTopSection().subscribe((section) => {
expect(section.visible).toBeFalse();
done();
});
});
});
});
15 changes: 10 additions & 5 deletions src/app/shared/menu/providers/new.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
combineLatest,
map,
Observable,
of,
} from 'rxjs';

import { ThemedCreateCollectionParentSelectorComponent } from '../../dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
Expand All @@ -39,16 +38,22 @@ export class NewMenuProvider extends AbstractExpandableMenuProvider {
}

public getTopSection(): Observable<PartialMenuSection> {
return of(
{
return combineLatest([
this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
this.authorizationService.isAuthorized(FeatureID.CanSubmit),
this.authorizationService.isAuthorized(FeatureID.CoarNotifyEnabled),
]).pipe(
map(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, isCoarNotifyEnabled]) => ({
accessibilityHandle: 'new',
model: {
type: MenuItemType.TEXT,
text: 'menu.section.new',
} as TextMenuItemModel,
icon: 'plus',
visible: true,
},
visible: isCollectionAdmin || isCommunityAdmin || isSiteAdmin || canSubmit || isCoarNotifyEnabled,
})),
);
}

Expand Down
25 changes: 25 additions & 0 deletions src/app/shared/menu/providers/registries.menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,29 @@ describe('RegistriesMenuProvider', () => {
done();
});
});

describe('when user has no permissions', () => {
let noPermsProvider: RegistriesMenuProvider;
let noPermsAuthStub = new AuthorizationDataServiceStub();

beforeEach(() => {
spyOn(noPermsAuthStub, 'isAuthorized').and.returnValue(of(false));
TestBed.resetTestingModule();
TestBed.configureTestingModule({
providers: [
RegistriesMenuProvider,
{ provide: AuthorizationDataService, useValue: noPermsAuthStub },
{ provide: ScriptDataService, useClass: ScriptServiceStub },
],
});
noPermsProvider = TestBed.inject(RegistriesMenuProvider);
});

it('getTopSection should return visible false', (done) => {
noPermsProvider.getTopSection().subscribe((section) => {
expect(section.visible).toBeFalse();
done();
});
});
});
});
9 changes: 4 additions & 5 deletions src/app/shared/menu/providers/registries.menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
combineLatest,
map,
Observable,
of,
} from 'rxjs';

import { MenuItemType } from '../menu-item-type.model';
Expand All @@ -36,15 +35,15 @@ export class RegistriesMenuProvider extends AbstractExpandableMenuProvider {
}

public getTopSection(): Observable<PartialMenuSection> {
return of(
{
return this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
map((isSiteAdmin) => ({
model: {
type: MenuItemType.TEXT,
text: 'menu.section.registries',
},
icon: 'list',
visible: true,
},
visible: isSiteAdmin,
})),
);
}

Expand Down
Loading