hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issues

Browse Source
This commit is contained in:
Yana De Pauw
2025-01-02 14:17:06 +01:00
parent 1c1bcc704a
commit 4729ae950d
14 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/shared/menu/providers/access-control.menu.spec.ts
View File

@@ -8,7 +8,6 @@
import { TestBed } from '@angular/core/testing';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
@@ -16,8 +15,10 @@ import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
import { AccessControlMenuProvider } from './access-control.menu';
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
import { ScriptServiceStub } from '../../testing/script-service.stub';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.access_control',
@@ -25,7 +26,7 @@ const expectedTopSection: MenuTopSection = {
icon: 'key'
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {

2
src/app/shared/menu/providers/admin-search.menu.spec.ts
View File

@@ -7,12 +7,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { AdminSearchMenuProvider } from './admin-search.menu';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{

7
src/app/shared/menu/providers/browse.menu.spec.ts
View File

@@ -9,7 +9,6 @@
import { TestBed } from '@angular/core/testing';
import { BrowseMenuProvider } from './browse.menu';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { BrowseService } from '../../../core/browse/browse.service';
import { BrowseServiceStub } from '../../testing/browse-service.stub';
import { ObjectCacheService } from '../../../core/cache/object-cache.service';
@@ -17,8 +16,10 @@ import { getMockObjectCacheService } from '../../mocks/object-cache.service.mock
import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
import { createPaginatedList } from '../../testing/utils.test';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.browse_global',
@@ -26,7 +27,7 @@ const expectedTopSection: MenuTopSection = {
icon: 'globe',
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {

2
src/app/shared/menu/providers/community-list.menu.spec.ts
View File

@@ -8,8 +8,8 @@
import { TestBed } from '@angular/core/testing';
import { CommunityListMenuProvider } from './community-list.menu';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{

2
src/app/shared/menu/providers/curation.menu.spec.ts
View File

@@ -7,12 +7,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { CurationMenuProvider } from './curation.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{

7
src/app/shared/menu/providers/edit.menu.spec.ts
View File

@@ -8,14 +8,15 @@
import { TestBed } from '@angular/core/testing';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
import { EditMenuProvider } from './edit.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.edit'
@@ -23,7 +24,7 @@ const expectedTopSection: MenuTopSection = {
icon: 'pencil',
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {

10
src/app/shared/menu/providers/export.menu.spec.ts
View File

@@ -8,24 +8,24 @@
import { TestBed } from '@angular/core/testing';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
import { ScriptServiceStub } from '../../testing/script-service.stub';
import { ExportMenuProvider } from './export.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.export',
},
icon: 'file-export',
shouldPersistOnRouteChange: true,
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {
@@ -33,7 +33,6 @@ const expectedSubSections: MenuSubSection[] = [
text: 'menu.section.export_metadata',
function: jasmine.any(Function) as any,
},
shouldPersistOnRouteChange: true,
},
{
visible: true,
@@ -42,7 +41,6 @@ const expectedSubSections: MenuSubSection[] = [
text: 'menu.section.export_batch',
function: jasmine.any(Function) as any,
},
shouldPersistOnRouteChange: true,
}
];

2
src/app/shared/menu/providers/health.menu.spec.ts
View File

@@ -7,12 +7,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { HealthMenuProvider } from './health.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{

8
src/app/shared/menu/providers/import.menu.spec.ts
View File

@@ -8,24 +8,24 @@
import { TestBed } from '@angular/core/testing';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { ImportMenuProvider } from './import.menu';
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
import { ScriptServiceStub } from '../../testing/script-service.stub';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.import',
},
icon: 'file-import',
shouldPersistOnRouteChange: true,
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {

7
src/app/shared/menu/providers/new.menu.spec.ts
View File

@@ -8,14 +8,15 @@
import { TestBed } from '@angular/core/testing';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { NewMenuProvider } from './new.menu';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.new'
@@ -23,7 +24,7 @@ const expectedTopSection: MenuTopSection = {
icon: 'plus',
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {

2
src/app/shared/menu/providers/processes.menu.spec.ts
View File

@@ -7,12 +7,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { ProcessesMenuProvider } from './processes.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{

7
src/app/shared/menu/providers/registries.menu.spec.ts
View File

@@ -8,15 +8,16 @@
import { TestBed } from '@angular/core/testing';
import { MenuItemType } from '../menu-item-type.model';
import { MenuSubSection, MenuTopSection } from './expandable-menu-provider';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { ScriptDataService } from '../../../core/data/processes/script-data.service';
import { ScriptServiceStub } from '../../testing/script-service.stub';
import { RegistriesMenuProvider } from './registries.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedTopSection: MenuTopSection = {
const expectedTopSection: PartialMenuSection = {
visible: true,
model: {
type: MenuItemType.TEXT,
text: 'menu.section.registries',
@@ -24,7 +25,7 @@ const expectedTopSection: MenuTopSection = {
icon: 'list',
};
const expectedSubSections: MenuSubSection[] = [
const expectedSubSections: PartialMenuSection[] = [
{
visible: true,
model: {

2
src/app/shared/menu/providers/system-wide-alert.menu.spec.ts
View File

@@ -7,12 +7,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { SystemWideAlertMenuProvider } from './system-wide-alert.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{

2
src/app/shared/menu/providers/workflow.menu.spec.ts
View File

@@ -7,12 +7,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { PartialMenuSection } from '../menu-provider';
import { MenuItemType } from '../menu-item-type.model';
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
import { of as observableOf } from 'rxjs';
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
import { WorkflowMenuProvider } from './workflow.menu';
import { PartialMenuSection } from '../menu-provider.model';
const expectedSections: PartialMenuSection[] = [
{