diff --git a/resources/i18n/en.json b/resources/i18n/en.json index a1b5be6f33..b9a2478e71 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -609,7 +609,10 @@ "submission.sections.describe.relationship-lookup.select-all": "Select all", "submission.sections.describe.relationship-lookup.select-page": "Select page", "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items", - "submission.sections.describe.relationship-lookup.title": "Select a {{ label }}", + "submission.sections.describe.relationship-lookup.title.Journal Issue": "Select a Journal Issue", + "submission.sections.describe.relationship-lookup.title.Journal Volume": "Select a Journal Volume", + "submission.sections.describe.relationship-lookup.title.Journal": "Select a Journal", + "submission.sections.describe.relationship-lookup.title.Author": "Select an Author", "submission.sections.describe.relationship-lookup.toggle-dropdown": "Toggle dropdown", "submission.sections.general.add-more": "Add more", "submission.sections.general.collection": "Collection", diff --git a/src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts index 91addcca92..2adada582b 100644 --- a/src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts +++ b/src/app/+item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts @@ -31,7 +31,7 @@ describe('ItemPageDateFieldComponent', () => { beforeEach(async(() => { fixture = TestBed.createComponent(ItemPageDateFieldComponent); comp = fixture.componentInstance; - comp.itemRD$ = mockItemWithMetadataFieldAndValue(mockField, mockValue); + comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue); fixture.detectChanges(); })); diff --git a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts index 6c0429a356..2908e12342 100644 --- a/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts +++ b/src/app/+item-page/simple/item-types/publication/publication.component.spec.ts @@ -8,15 +8,14 @@ import { ItemDataService } from '../../../../core/data/item-data.service'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; -import { RemoteData } from '../../../../core/data/remote-data'; import { PaginatedList } from '../../../../core/data/paginated-list'; import { PageInfo } from '../../../../core/shared/page-info.model'; import { By } from '@angular/platform-browser'; import { createRelationshipsObservable } from '../shared/item.component.spec'; import { PublicationComponent } from './publication.component'; -import { of as observableOf } from 'rxjs'; import { MetadataMap } from '../../../../core/shared/metadata.models'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils'; +import { RelationshipService } from '../../../../core/data/relationship.service'; const mockItem: Item = Object.assign(new Item(), { bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])), @@ -40,7 +39,8 @@ describe('PublicationComponent', () => { providers: [ {provide: ITEM, useValue: mockItem}, {provide: ItemDataService, useValue: {}}, - {provide: TruncatableService, useValue: {}} + {provide: TruncatableService, useValue: {}}, + {provide: RelationshipService, useValue: {}} ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts b/src/app/+item-page/simple/item-types/shared/item.component.spec.ts index 90297cf268..940b195400 100644 --- a/src/app/+item-page/simple/item-types/shared/item.component.spec.ts +++ b/src/app/+item-page/simple/item-types/shared/item.component.spec.ts @@ -26,6 +26,7 @@ import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-rep import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models'; import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils'; +import { RelationshipService } from '../../../../core/data/relationship.service'; /** * Create a generic test for an item-page-fields component using a mockItem and the type of component @@ -51,7 +52,8 @@ export function getItemPageFieldsTest(mockItem: Item, component) { providers: [ {provide: ITEM, useValue: mockItem}, {provide: ItemDataService, useValue: {}}, - {provide: TruncatableService, useValue: {}} + {provide: TruncatableService, useValue: {}}, + {provide: RelationshipService, useValue: {}} ], schemas: [NO_ERRORS_SCHEMA] @@ -379,7 +381,8 @@ describe('ItemComponent', () => { }), BrowserAnimationsModule], declarations: [ItemComponent, VarDirective], providers: [ - {provide: ITEM, useValue: mockItem} + {provide: ITEM, useValue: mockItem}, + {provide: RelationshipService, useValue: {}} ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts index 9f8ab3e56c..7037a971f0 100644 --- a/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts +++ b/src/app/+my-dspace-page/my-dspace-configuration.service.spec.ts @@ -38,12 +38,8 @@ describe('MyDSpaceConfigurationService', () => { const roleService: any = new MockRoleService(); - const fixedFilterService = jasmine.createSpyObj('SearchFixedFilterService', { - getQueryByFilterName: observableOf(''), - }); - beforeEach(() => { - service = new MyDSpaceConfigurationService(roleService, fixedFilterService, spy, activatedRoute); + service = new MyDSpaceConfigurationService(roleService, spy, activatedRoute); }); describe('when the scope is called', () => { diff --git a/src/app/core/shared/search/search-configuration.service.spec.ts b/src/app/core/shared/search/search-configuration.service.spec.ts index a84f954b65..b20264493e 100644 --- a/src/app/core/shared/search/search-configuration.service.spec.ts +++ b/src/app/core/shared/search/search-configuration.service.spec.ts @@ -30,14 +30,10 @@ describe('SearchConfigurationService', () => { getRouteParameterValue: observableOf('') }); - const fixedFilterService = jasmine.createSpyObj('SearchFixedFilterService', { - getQueryByFilterName: observableOf(''), - }); - const activatedRoute: any = new ActivatedRouteStub(); beforeEach(() => { - service = new SearchConfigurationService(routeService, fixedFilterService, activatedRoute); + service = new SearchConfigurationService(routeService, activatedRoute); }); describe('when the scope is called', () => { beforeEach(() => { diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts index ce75cb63c4..b7aaf886d9 100644 --- a/src/app/core/shared/search/search-configuration.service.ts +++ b/src/app/core/shared/search/search-configuration.service.ts @@ -72,7 +72,6 @@ export class SearchConfigurationService implements OnDestroy { /** * Initialize the search options * @param {RouteService} routeService - * @param {SearchFixedFilterService} fixedFilterService * @param {ActivatedRoute} route */ constructor(protected routeService: RouteService, diff --git a/src/app/core/utilities/equatable.spec.ts b/src/app/core/utilities/equatable.spec.ts index 897b1339e1..52524360f3 100644 --- a/src/app/core/utilities/equatable.spec.ts +++ b/src/app/core/utilities/equatable.spec.ts @@ -29,7 +29,7 @@ class Owner extends EquatableObject { } -fdescribe('equatable', () => { +describe('equatable', () => { let dogRoger: Dog; let dogMissy: Dog; diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts index c66c3a2462..28420af381 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts @@ -16,6 +16,7 @@ import { JournalComponent } from './journal.component'; import { of as observableOf } from 'rxjs'; import { GenericItemPageFieldComponent } from '../../../../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils'; +import { RelationshipService } from '../../../../core/data/relationship.service'; let comp: JournalComponent; let fixture: ComponentFixture; @@ -57,7 +58,8 @@ describe('JournalComponent', () => { providers: [ {provide: ITEM, useValue: mockItem}, {provide: ItemDataService, useValue: {}}, - {provide: TruncatableService, useValue: {}} + {provide: TruncatableService, useValue: {}}, + {provide: RelationshipService, useValue: {}} ], schemas: [NO_ERRORS_SCHEMA] diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts index 13a9ba4e85..ac2b89fe47 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts @@ -65,6 +65,10 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component'; import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components'; import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component'; +import { Relationship } from '../../../../core/shared/item-relationships/relationship.model'; +import { RelationshipService } from '../../../../core/data/relationship.service'; +import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service'; +import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; describe('DsDynamicFormControlContainerComponent test suite', () => { @@ -95,12 +99,14 @@ describe('DsDynamicFormControlContainerComponent test suite', () => { new DynamicSwitchModel({ id: 'switch' }), new DynamicTextAreaModel({ id: 'textarea' }), new DynamicTimePickerModel({ id: 'timepicker' }), - new DynamicTypeaheadModel({ id: 'typeahead' }), + new DynamicTypeaheadModel({ id: 'typeahead', workspaceItem: new WorkspaceItem(), repeatable: false }), new DynamicScrollableDropdownModel({ id: 'scrollableDropdown', - authorityOptions: authorityOptions + authorityOptions: authorityOptions, + workspaceItem: new WorkspaceItem(), + repeatable: false }), - new DynamicTagModel({ id: 'tag' }), + new DynamicTagModel({ id: 'tag', workspaceItem: new WorkspaceItem(), repeatable: false}), new DynamicListCheckboxGroupModel({ id: 'checkboxList', authorityOptions: authorityOptions, @@ -118,11 +124,13 @@ describe('DsDynamicFormControlContainerComponent test suite', () => { name: 'relationGroup', relationFields: [], scopeUUID: '', - submissionScope: '' + submissionScope: '', + workspaceItem: new WorkspaceItem(), + repeatable: false }), - new DynamicDsDatePickerModel({ id: 'datepicker' }), - new DynamicLookupModel({ id: 'lookup' }), - new DynamicLookupNameModel({ id: 'lookupName' }), + new DynamicDsDatePickerModel({ id: 'datepicker'}), + new DynamicLookupModel({ id: 'lookup', workspaceItem: new WorkspaceItem(), repeatable: false }), + new DynamicLookupNameModel({ id: 'lookupName', workspaceItem: new WorkspaceItem(), repeatable: false }), new DynamicQualdropModel({ id: 'combobox', readOnly: false }) ]; const testModel = formModel[8]; @@ -152,7 +160,12 @@ describe('DsDynamicFormControlContainerComponent test suite', () => { TranslateModule.forRoot(), TextMaskModule ], - providers: [DsDynamicFormControlContainerComponent, DynamicFormService], + providers: [ + DsDynamicFormControlContainerComponent, + DynamicFormService, + { provide: RelationshipService, useValue: {} }, + { provide: SelectableListService, useValue: {} } + ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }).compileComponents().then(() => { diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html index a38f557219..02a93641b7 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html @@ -1,5 +1,5 @@
- +