-
- {{'admin.registries.bitstream-formats.formats.table.name' | translate}}
- {{'admin.registries.bitstream-formats.formats.table.mimetype' | translate}}
- {{'admin.registries.bitstream-formats.formats.table.supportLevel.head' | translate}}
+ {{'admin.registries.bitstream-formats.table.name' | translate}}
+ {{'admin.registries.bitstream-formats.table.mimetype' | translate}}
+ {{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
- {{bitstreamFormat.shortDescription}}
- {{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.formats.table.internal' | translate}})
- {{'admin.registries.bitstream-formats.formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
+
+
+
+ {{bitstreamFormat.shortDescription}}
+ {{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.table.internal' | translate}})
+ {{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
{{'admin.registries.bitstream-formats.head' | translate}}
+{{'admin.registries.bitstream-formats.head' | translate}}
+ +{{'admin.registries.bitstream-formats.description' | translate}}
+{{'admin.registries.bitstream-formats.create.new' | translate}}
-{{'admin.registries.bitstream-formats.description' | translate}}
- {{'admin.registries.bitstream-formats.formats.no-items' | translate}}
+ {{'admin.registries.bitstream-formats.no-items' | translate}}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
new file mode 100644
index 0000000000..cfa93a15a8
--- /dev/null
+++ b/src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
@@ -0,0 +1,123 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { RouterStub } from '../../../../shared/testing/router-stub';
+import { of as observableOf } from 'rxjs';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service-stub';
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
+import { RestResponse } from '../../../../core/cache/response.models';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
+import { ResourceType } from '../../../../core/shared/resource-type';
+
+describe('EditBitstreamFormatComponent', () => {
+ let comp: EditBitstreamFormatComponent;
+ let fixture: ComponentFixture
+
+
+
+ {{'admin.registries.bitstream-formats.edit.head' | translate:{format: (bitstreamFormatRD$ | async)?.payload.shortDescription} }}
+ +
-
diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
index 927effd303..553bd00f56 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
@@ -23,6 +23,7 @@ import { MockRouter } from '../../shared/mocks/mock-router';
import { ResourceType } from '../../core/shared/resource-type';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { VarDirective } from '../../shared/utils/var.directive';
describe('BrowseByMetadataPageComponent', () => {
let comp: BrowseByMetadataPageComponent;
@@ -86,7 +87,7 @@ describe('BrowseByMetadataPageComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
- declarations: [BrowseByMetadataPageComponent, EnumKeysPipe],
+ declarations: [BrowseByMetadataPageComponent, EnumKeysPipe, VarDirective],
providers: [
{ provide: ActivatedRoute, useValue: activatedRouteStub },
{ provide: BrowseService, useValue: mockBrowseService },
diff --git a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
index 3bc69e5fcb..90623eb3c7 100644
--- a/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
+++ b/src/app/+browse-by/+browse-by-title-page/browse-by-title-page.component.spec.ts
@@ -18,6 +18,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
import { BrowseService } from '../../core/browse/browse.service';
import { MockRouter } from '../../shared/mocks/mock-router';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { VarDirective } from '../../shared/utils/var.directive';
describe('BrowseByTitlePageComponent', () => {
let comp: BrowseByTitlePageComponent;
@@ -64,7 +65,7 @@ describe('BrowseByTitlePageComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
- declarations: [BrowseByTitlePageComponent, EnumKeysPipe],
+ declarations: [BrowseByTitlePageComponent, EnumKeysPipe, VarDirective],
providers: [
{ provide: ActivatedRoute, useValue: activatedRouteStub },
{ provide: BrowseService, useValue: mockBrowseService },
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
new file mode 100644
index 0000000000..af4153220f
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -0,0 +1,57 @@
+;
+
+ let route: ActivatedRoute;
+ let router: Router;
+ let searchConfigService: SearchConfigurationService;
+ let searchService: SearchService;
+ let notificationsService: NotificationsService;
+ let itemDataService: ItemDataService;
+
+ const mockCollection: Collection = Object.assign(new Collection(), {
+ id: 'ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+ name: 'test-collection'
+ });
+ const mockCollectionRD: RemoteData = new RemoteData(false, false, true, null, mockCollection);
+ const mockSearchOptions = of(new PaginatedSearchOptions({
+ pagination: Object.assign(new PaginationComponentOptions(), {
+ id: 'search-page-configuration',
+ pageSize: 10,
+ currentPage: 1
+ }),
+ sort: new SortOptions('dc.title', SortDirection.ASC),
+ scope: mockCollection.id
+ }));
+ const url = 'http://test.url';
+ const urlWithParam = url + '?param=value';
+ const routerStub = Object.assign(new RouterStub(), {
+ url: urlWithParam,
+ navigateByUrl: {},
+ navigate: {}
+ });
+ const searchConfigServiceStub = {
+ paginatedSearchOptions: mockSearchOptions
+ };
+ const itemDataServiceStub = {
+ mapToCollection: () => of(new RestResponse(true, 200, 'OK'))
+ };
+ const activatedRouteStub = new ActivatedRouteStub({}, { collection: mockCollectionRD });
+ const translateServiceStub = {
+ get: () => of('test-message of collection ' + mockCollection.name),
+ onLangChange: new EventEmitter(),
+ onTranslationChange: new EventEmitter(),
+ onDefaultLangChange: new EventEmitter()
+ };
+ const emptyList = new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []));
+ const searchServiceStub = Object.assign(new SearchServiceStub(), {
+ search: () => of(emptyList),
+ /* tslint:disable:no-empty */
+ clearDiscoveryRequests: () => {}
+ /* tslint:enable:no-empty */
+ });
+ const collectionDataServiceStub = {
+ getMappedItems: () => of(emptyList),
+ /* tslint:disable:no-empty */
+ clearMappedItemsRequests: () => {}
+ /* tslint:enable:no-empty */
+ };
+ const routeServiceStub = {
+ getRouteParameterValue: () => {
+ return observableOf('');
+ },
+ getQueryParameterValue: () => {
+ return observableOf('')
+ },
+ getQueryParamsWithPrefix: () => {
+ return observableOf('')
+ }
+ };
+ const fixedFilterServiceStub = {
+ getQueryByFilterName: () => {
+ return observableOf('')
+ }
+ };
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
+ declarations: [CollectionItemMapperComponent, ItemSelectComponent, SearchFormComponent, PaginationComponent, EnumKeysPipe, VarDirective, ErrorComponent, LoadingComponent],
+ providers: [
+ { provide: ActivatedRoute, useValue: activatedRouteStub },
+ { provide: Router, useValue: routerStub },
+ { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
+ { provide: SearchService, useValue: searchServiceStub },
+ { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+ { provide: ItemDataService, useValue: itemDataServiceStub },
+ { provide: CollectionDataService, useValue: collectionDataServiceStub },
+ { provide: TranslateService, useValue: translateServiceStub },
+ { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+ { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub() },
+ { provide: RouteService, useValue: routeServiceStub },
+ { provide: SearchFixedFilterService, useValue: fixedFilterServiceStub }
+ ]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(CollectionItemMapperComponent);
+ comp = fixture.componentInstance;
+ fixture.detectChanges();
+ route = (comp as any).route;
+ router = (comp as any).router;
+ searchConfigService = (comp as any).searchConfigService;
+ searchService = (comp as any).searchService;
+ notificationsService = (comp as any).notificationsService;
+ itemDataService = (comp as any).itemDataService;
+ });
+
+ it('should display the correct collection name', () => {
+ const name: HTMLElement = fixture.debugElement.query(By.css('#collection-name')).nativeElement;
+ expect(name.innerHTML).toContain(mockCollection.name);
+ });
+
+ describe('mapItems', () => {
+ const ids = ['id1', 'id2', 'id3', 'id4'];
+
+ it('should display a success message if at least one mapping was successful', () => {
+ comp.mapItems(ids);
+ expect(notificationsService.success).toHaveBeenCalled();
+ expect(notificationsService.error).not.toHaveBeenCalled();
+ });
+
+ it('should display an error message if at least one mapping was unsuccessful', () => {
+ spyOn(itemDataService, 'mapToCollection').and.returnValue(of(new RestResponse(false, 404, 'Not Found')));
+ comp.mapItems(ids);
+ expect(notificationsService.success).not.toHaveBeenCalled();
+ expect(notificationsService.error).toHaveBeenCalled();
+ });
+ });
+
+ describe('tabChange', () => {
+ beforeEach(() => {
+ spyOn(routerStub, 'navigateByUrl');
+ comp.tabChange({});
+ });
+
+ it('should navigate to the same page to remove parameters', () => {
+ expect(router.navigateByUrl).toHaveBeenCalledWith(url);
+ });
+ });
+
+ describe('buildQuery', () => {
+ const query = 'query';
+ const expected = `-location.coll:\"${mockCollection.id}\" AND ${query}`;
+
+ let result;
+
+ beforeEach(() => {
+ result = comp.buildQuery(mockCollection.id, query);
+ });
+
+ it('should build a solr query to exclude the provided collection', () => {
+ expect(result).toEqual(expected);
+ })
+ });
+
+ describe('onCancel', () => {
+ beforeEach(() => {
+ spyOn(routerStub, 'navigate');
+ comp.onCancel();
+ });
+
+ it('should navigate to the collection page', () => {
+ expect(router.navigate).toHaveBeenCalledWith(['/collections/', mockCollection.id]);
+ });
+ });
+
+});
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
new file mode 100644
index 0000000000..750578cc35
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -0,0 +1,256 @@
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+
+import { ChangeDetectionStrategy, Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { fadeIn, fadeInOut } from '../../shared/animations/fade';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RemoteData } from '../../core/data/remote-data';
+import { Collection } from '../../core/shared/collection.model';
+import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
+import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { map, startWith, switchMap, take, tap } from 'rxjs/operators';
+import { getRemoteDataPayload, getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
+import { SearchService } from '../../+search-page/search-service/search.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { TranslateService } from '@ngx-translate/core';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { isNotEmpty } from '../../shared/empty.util';
+import { RestResponse } from '../../core/cache/response.models';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+
+@Component({
+ selector: 'ds-collection-item-mapper',
+ styleUrls: ['./collection-item-mapper.component.scss'],
+ templateUrl: './collection-item-mapper.component.html',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ animations: [
+ fadeIn,
+ fadeInOut
+ ],
+ providers: [
+ {
+ provide: SEARCH_CONFIG_SERVICE,
+ useClass: SearchConfigurationService
+ }
+ ]
+})
+/**
+ * Component used to map items to a collection
+ */
+export class CollectionItemMapperComponent implements OnInit {
+
+ /**
+ * A view on the tabset element
+ * Used to switch tabs programmatically
+ */
+ @ViewChild('tabs') tabs;
+
+ /**
+ * The collection to map items to
+ */
+ collectionRD$: Observable>;
+
+ /**
+ * Search options
+ */
+ searchOptions$: Observable;
+
+ /**
+ * List of items to show under the "Browse" tab
+ * Items inside the collection
+ */
+ collectionItemsRD$: Observable>>;
+
+ /**
+ * List of items to show under the "Map" tab
+ * Items outside the collection
+ */
+ mappedItemsRD$: Observable>>;
+
+ /**
+ * Sort on title ASC by default
+ * @type {SortOptions}
+ */
+ defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
+
+ /**
+ * Firing this observable (shouldUpdate$.next(true)) forces the two lists to reload themselves
+ * Usually fired after the lists their cache is cleared (to force a new request to the REST API)
+ */
+ shouldUpdate$: BehaviorSubject;
+
+ /**
+ * Track whether at least one search has been performed or not
+ * As soon as at least one search has been performed, we display the search results
+ */
+ performedSearch = false;
+
+ constructor(private route: ActivatedRoute,
+ private router: Router,
+ @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
+ private searchService: SearchService,
+ private notificationsService: NotificationsService,
+ private itemDataService: ItemDataService,
+ private collectionDataService: CollectionDataService,
+ private translateService: TranslateService) {
+ }
+
+ ngOnInit(): void {
+ this.collectionRD$ = this.route.data.pipe(map((data) => data.collection)).pipe(getSucceededRemoteData()) as Observable>;
+ this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
+ this.loadItemLists();
+ }
+
+ /**
+ * Load collectionItemsRD$ with a fixed scope to only obtain the items this collection owns
+ * Load mappedItemsRD$ to only obtain items this collection doesn't own
+ */
+ loadItemLists() {
+ this.shouldUpdate$ = new BehaviorSubject(true);
+ const collectionAndOptions$ = observableCombineLatest(
+ this.collectionRD$,
+ this.searchOptions$,
+ this.shouldUpdate$
+ );
+ this.collectionItemsRD$ = collectionAndOptions$.pipe(
+ switchMap(([collectionRD, options, shouldUpdate]) => {
+ if (shouldUpdate) {
+ return this.collectionDataService.getMappedItems(collectionRD.payload.id, Object.assign(options, {
+ sort: this.defaultSortOptions
+ }))
+ }
+ })
+ );
+ this.mappedItemsRD$ = collectionAndOptions$.pipe(
+ switchMap(([collectionRD, options, shouldUpdate]) => {
+ if (shouldUpdate) {
+ return this.searchService.search(Object.assign(new PaginatedSearchOptions(options), {
+ query: this.buildQuery(collectionRD.payload.id, options.query),
+ scope: undefined,
+ dsoType: DSpaceObjectType.ITEM,
+ sort: this.defaultSortOptions
+ }), 10000).pipe(
+ toDSpaceObjectListRD(),
+ startWith(undefined)
+ );
+ }
+ })
+ );
+ }
+
+ /**
+ * Map/Unmap the selected items to the collection and display notifications
+ * @param ids The list of item UUID's to map/unmap to the collection
+ * @param remove Whether or not it's supposed to remove mappings
+ */
+ mapItems(ids: string[], remove?: boolean) {
+ const responses$ = this.collectionRD$.pipe(
+ getSucceededRemoteData(),
+ map((collectionRD: RemoteData) => collectionRD.payload),
+ switchMap((collection: Collection) =>
+ observableCombineLatest(ids.map((id: string) =>
+ remove ? this.itemDataService.removeMappingFromCollection(id, collection.id) : this.itemDataService.mapToCollection(id, collection.self)
+ ))
+ )
+ );
+
+ this.showNotifications(responses$, remove);
+ }
+
+ /**
+ * Display notifications
+ * @param {Observable} responses$ The responses after adding/removing a mapping
+ * @param {boolean} remove Whether or not the goal was to remove mappings
+ */
+ private showNotifications(responses$: Observable, remove?: boolean) {
+ const messageInsertion = remove ? 'unmap' : 'map';
+
+ responses$.subscribe((responses: RestResponse[]) => {
+ const successful = responses.filter((response: RestResponse) => response.isSuccessful);
+ const unsuccessful = responses.filter((response: RestResponse) => !response.isSuccessful);
+ if (successful.length > 0) {
+ const successMessages = observableCombineLatest(
+ this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.head`),
+ this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.content`, { amount: successful.length })
+ );
+
+ successMessages.subscribe(([head, content]) => {
+ this.notificationsService.success(head, content);
+ });
+ }
+ if (unsuccessful.length > 0) {
+ const unsuccessMessages = observableCombineLatest(
+ this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.head`),
+ this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.content`, { amount: unsuccessful.length })
+ );
+
+ unsuccessMessages.subscribe(([head, content]) => {
+ this.notificationsService.error(head, content);
+ });
+ }
+ // Force an update on all lists and switch back to the first tab
+ this.shouldUpdate$.next(true);
+ this.switchToFirstTab();
+ });
+ }
+
+ /**
+ * Clear url parameters on tab change (temporary fix until pagination is improved)
+ * @param event
+ */
+ tabChange(event) {
+ this.performedSearch = false;
+ this.router.navigateByUrl(this.getCurrentUrl());
+ }
+
+ /**
+ * Get current url without parameters
+ * @returns {string}
+ */
+ getCurrentUrl(): string {
+ if (this.router.url.indexOf('?') > -1) {
+ return this.router.url.substring(0, this.router.url.indexOf('?'));
+ }
+ return this.router.url;
+ }
+
+ /**
+ * Build a query where items that are already mapped to a collection are excluded from
+ * @param collectionId The collection's UUID
+ * @param query The query to add to it
+ */
+ buildQuery(collectionId: string, query: string): string {
+ const excludeColQuery = `-location.coll:\"${collectionId}\"`;
+ if (isNotEmpty(query)) {
+ return `${excludeColQuery} AND ${query}`;
+ } else {
+ return excludeColQuery;
+ }
+ }
+
+ /**
+ * Switch the view to focus on the first tab
+ */
+ switchToFirstTab() {
+ this.tabs.select('browseTab');
+ }
+
+ /**
+ * When a cancel event is fired, return to the collection page
+ */
+ onCancel() {
+ this.collectionRD$.pipe(
+ getSucceededRemoteData(),
+ getRemoteDataPayload(),
+ take(1)
+ ).subscribe((collection: Collection) => {
+ this.router.navigate(['/collections/', collection.id])
+ });
+ }
+
+}
diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts
index ad142e8fcf..2df7997e1e 100644
--- a/src/app/+collection-page/collection-page-routing.module.ts
+++ b/src/app/+collection-page/collection-page-routing.module.ts
@@ -9,6 +9,7 @@ import { CreateCollectionPageGuard } from './create-collection-page/create-colle
import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
import { URLCombiner } from '../core/url-combiner/url-combiner';
import { getCollectionModulePath } from '../app-routing.module';
+import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
export const COLLECTION_PARENT_PARAMETER = 'parent';
@@ -56,6 +57,15 @@ const COLLECTION_EDIT_PATH = ':id/edit';
resolve: {
collection: CollectionPageResolver
}
+ },
+ {
+ path: ':id/edit/mapper',
+ component: CollectionItemMapperComponent,
+ pathMatch: 'full',
+ resolve: {
+ collection: CollectionPageResolver
+ },
+ canActivate: [AuthenticatedGuard]
}
])
],
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 91239de17c..436cd351a0 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -3,18 +3,22 @@
*ngVar="(collectionRD$ | async) as collectionRD">
+ + +
+
+
+
+
-
+
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index f7059deda0..145ff81692 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -9,6 +9,8 @@ import { CreateCollectionPageComponent } from './create-collection-page/create-c
import { CollectionFormComponent } from './collection-form/collection-form.component';
import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
import { SearchService } from '../+search-page/search-service/search.service';
+import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
+import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
@NgModule({
imports: [
@@ -20,13 +22,15 @@ import { SearchService } from '../+search-page/search-service/search.service';
CollectionPageComponent,
CreateCollectionPageComponent,
DeleteCollectionPageComponent,
- CollectionFormComponent
+ CollectionFormComponent,
+ CollectionItemMapperComponent
],
exports: [
CollectionFormComponent
],
providers: [
- SearchService
+ SearchService,
+ SearchFixedFilterService
]
})
export class CollectionPageModule {
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
index 29350a83e0..e223b11c65 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts
@@ -4,7 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { CommonModule } from '@angular/common';
import { RouterTestingModule } from '@angular/router/testing';
import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../shared/services/route.service';
+import { RouteService } from '../../core/services/route.service';
import { SharedModule } from '../../shared/shared.module';
import { CollectionDataService } from '../../core/data/collection-data.service';
import { of as observableOf } from 'rxjs';
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts b/src/app/+collection-page/create-collection-page/create-collection-page.component.ts
index 94229b4932..2cab36d285 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.ts
@@ -1,6 +1,6 @@
import { Component } from '@angular/core';
import { CommunityDataService } from '../../core/data/community-data.service';
-import { RouteService } from '../../shared/services/route.service';
+import { RouteService } from '../../core/services/route.service';
import { Router } from '@angular/router';
import { CreateComColPageComponent } from '../../shared/comcol-forms/create-comcol-page/create-comcol-page.component';
import { Collection } from '../../core/shared/collection.model';
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index e429d224f2..05d0bd1d0e 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,33 +1,38 @@
+
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
new file mode 100644
index 0000000000..50be6f5ad0
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
@@ -0,0 +1 @@
+@import '../../../styles/variables.scss';
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
new file mode 100644
index 0000000000..0bbfb30821
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -0,0 +1,214 @@
+import { CollectionItemMapperComponent } from './collection-item-mapper.component';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { CommonModule } from '@angular/common';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { SearchFormComponent } from '../../shared/search-form/search-form.component';
+import { SearchPageModule } from '../../+search-page/search-page.module';
+import { ObjectCollectionComponent } from '../../shared/object-collection/object-collection.component';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { RouterStub } from '../../shared/testing/router-stub';
+import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
+import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchServiceStub } from '../../shared/testing/search-service-stub';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { FormsModule } from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { Collection } from '../../core/shared/collection.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { EventEmitter, NgModule } from '@angular/core';
+import { HostWindowService } from '../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service-stub';
+import { By } from '@angular/platform-browser';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
+import { ObjectSelectService } from '../../shared/object-select/object-select.service';
+import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service-stub';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { Observable } from 'rxjs/internal/Observable';
+import { of as observableOf, of } from 'rxjs/internal/observable/of';
+import { RestResponse } from '../../core/cache/response.models';
+import { SearchFixedFilterService } from '../../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { RouteService } from '../../core/services/route.service';
+import { ErrorComponent } from '../../shared/error/error.component';
+import { LoadingComponent } from '../../shared/loading/loading.component';
+
+describe('CollectionItemMapperComponent', () => {
+ let comp: CollectionItemMapperComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'collection.edit.item-mapper.head' | translate}}
+ +{{'collection.edit.item-mapper.description' | translate}}
+ +
+
+
+
+
+
+
+
+
+
+
+
+ {{'collection.edit.item-mapper.no-search' | translate}}
+
+
+
+
+
+ [alternateText]="'Collection Logo'">
+
-
-
-
-
+
+
+
+
@@ -23,23 +27,20 @@
+ [title]="'collection.page.news'">
-
-
-
-
-
-
-
- + + +
-
{{'collection.page.browse.recent.head' | translate}}
+
+
- {{'collection.page.browse.recent.head' | translate}}
+ {{'collection.page.browse.recent.empty' | translate}}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
new file mode 100644
index 0000000000..ed9351d5d2
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
@@ -0,0 +1,207 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { CommonModule } from '@angular/common';
+import { ItemCollectionMapperComponent } from './item-collection-mapper.component';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SearchConfigurationService } from '../../../+search-page/search-service/search-configuration.service';
+import { SearchService } from '../../../+search-page/search-service/search.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { RouterStub } from '../../../shared/testing/router-stub';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { EventEmitter } from '@angular/core';
+import { SearchServiceStub } from '../../../shared/testing/search-service-stub';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { FormsModule } from '@angular/forms';
+import { SharedModule } from '../../../shared/shared.module';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
+import { By } from '@angular/platform-browser';
+import { Item } from '../../../core/shared/item.model';
+import { ObjectSelectService } from '../../../shared/object-select/object-select.service';
+import { ObjectSelectServiceStub } from '../../../shared/testing/object-select-service-stub';
+import { Observable } from 'rxjs/internal/Observable';
+import { of } from 'rxjs/internal/observable/of';
+import { RestResponse } from '../../../core/cache/response.models';
+import { CollectionSelectComponent } from '../../../shared/object-select/collection-select/collection-select.component';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { SearchFormComponent } from '../../../shared/search-form/search-form.component';
+import { Collection } from '../../../core/shared/collection.model';
+import { ErrorComponent } from '../../../shared/error/error.component';
+import { LoadingComponent } from '../../../shared/loading/loading.component';
+
+describe('ItemCollectionMapperComponent', () => {
+ let comp: ItemCollectionMapperComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'item.edit.item-mapper.head' | translate}}
+ +{{'item.edit.item-mapper.description' | translate}}
+ +
+
+
+
+
+
+
+
+
+
+
+
+ {{'item.edit.item-mapper.no-search' | translate}}
+
+
-
{{"item.edit.metadata.metadatafield.invalid" | translate}}
diff --git a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
index b8d122d4f6..e07df15651 100644
--- a/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
@@ -10,7 +10,6 @@ import { By } from '@angular/platform-browser';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../../../shared/shared.module';
import { getTestScheduler } from 'jasmine-marbles';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
import { TestScheduler } from 'rxjs/testing';
import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
import { TranslateModule } from '@ngx-translate/core';
@@ -18,6 +17,7 @@ import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
let comp: EditInPlaceFieldComponent;
let fixture: ComponentFixture
+
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
new file mode 100644
index 0000000000..e73b4b6f9a
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -0,0 +1,172 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Item } from '../../../core/shared/item.model';
+import { RouterStub } from '../../../shared/testing/router-stub';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ItemMoveComponent } from './item-move.component';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { SearchService } from '../../../+search-page/search-service/search.service';
+import { of as observableOf } from 'rxjs';
+import { FormsModule } from '@angular/forms';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { RestResponse } from '../../../core/cache/response.models';
+import { Collection } from '../../../core/shared/collection.model';
+
+describe('ItemMoveComponent', () => {
+ let comp: ItemMoveComponent;
+ let fixture: ComponentFixture
+
+
+
+ {{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}
+{{'item.edit.move.description' | translate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
++ {{'item.edit.move.inheritpolicies.description' | translate}} +
+
+
+
+
+{{getRelationshipMessageKey(relationshipLabel) | translate}}
+
+
+
+
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss
new file mode 100644
index 0000000000..808a8344ba
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.scss
@@ -0,0 +1,15 @@
+@import '../../../../../styles/variables.scss';
+
+.btn[disabled] {
+ color: $gray-600;
+ border-color: $gray-600;
+ z-index: 0; // prevent border colors jumping on hover
+}
+
+.relationship-action-buttons {
+ margin: 0;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
new file mode 100644
index 0000000000..e98da94c9d
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
@@ -0,0 +1,179 @@
+import { async, TestBed } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { TranslateModule } from '@ngx-translate/core';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { EditRelationshipComponent } from './edit-relationship.component';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Item } from '../../../../core/shared/item.model';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
+
+let objectUpdatesService: ObjectUpdatesService;
+const url = 'http://test-url.com/test-url';
+
+let item;
+let author1;
+let author2;
+let fieldUpdate1;
+let fieldUpdate2;
+let relationships;
+let relationshipType;
+
+let fixture;
+let comp: EditRelationshipComponent;
+let de;
+let el;
+
+describe('EditRelationshipComponent', () => {
+ beforeEach(async(() => {
+ relationshipType = Object.assign(new RelationshipType(), {
+ id: '1',
+ uuid: '1',
+ leftwardType: 'isAuthorOfPublication',
+ rightwardType: 'isPublicationOfAuthor'
+ });
+
+ relationships = [
+ Object.assign(new Relationship(), {
+ self: url + '/2',
+ id: '2',
+ uuid: '2',
+ leftId: 'author1',
+ rightId: 'publication',
+ relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+ }),
+ Object.assign(new Relationship(), {
+ self: url + '/3',
+ id: '3',
+ uuid: '3',
+ leftId: 'author2',
+ rightId: 'publication',
+ relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+ })
+ ];
+
+ item = Object.assign(new Item(), {
+ self: 'fake-item-url/publication',
+ id: 'publication',
+ uuid: 'publication',
+ relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships)))
+ });
+
+ author1 = Object.assign(new Item(), {
+ id: 'author1',
+ uuid: 'author1'
+ });
+ author2 = Object.assign(new Item(), {
+ id: 'author2',
+ uuid: 'author2'
+ });
+
+ fieldUpdate1 = {
+ field: author1,
+ changeType: undefined
+ };
+ fieldUpdate2 = {
+ field: author2,
+ changeType: FieldChangeType.REMOVE
+ };
+
+ objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
+ {
+ saveChangeFieldUpdate: {},
+ saveRemoveFieldUpdate: {},
+ setEditableFieldUpdate: {},
+ setValidFieldUpdate: {},
+ removeSingleFieldUpdate: {},
+ isEditable: observableOf(false), // should always return something --> its in ngOnInit
+ isValid: observableOf(true) // should always return something --> its in ngOnInit
+ }
+ );
+
+ TestBed.configureTestingModule({
+ imports: [TranslateModule.forRoot()],
+ declarations: [EditRelationshipComponent],
+ providers: [
+ { provide: ObjectUpdatesService, useValue: objectUpdatesService }
+ ], schemas: [
+ NO_ERRORS_SCHEMA
+ ]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(EditRelationshipComponent);
+ comp = fixture.componentInstance;
+ de = fixture.debugElement;
+ el = de.nativeElement;
+
+ comp.url = url;
+ comp.fieldUpdate = fieldUpdate1;
+ comp.item = item;
+
+ fixture.detectChanges();
+ });
+
+ describe('when fieldUpdate has no changeType', () => {
+ beforeEach(() => {
+ comp.fieldUpdate = fieldUpdate1;
+ fixture.detectChanges();
+ });
+
+ describe('canRemove', () => {
+ it('should return true', () => {
+ expect(comp.canRemove()).toBe(true);
+ });
+ });
+
+ describe('canUndo', () => {
+ it('should return false', () => {
+ expect(comp.canUndo()).toBe(false);
+ });
+ });
+ });
+
+ describe('when fieldUpdate has DELETE as changeType', () => {
+ beforeEach(() => {
+ comp.fieldUpdate = fieldUpdate2;
+ fixture.detectChanges();
+ });
+
+ describe('canRemove', () => {
+ it('should return false', () => {
+ expect(comp.canRemove()).toBe(false);
+ });
+ });
+
+ describe('canUndo', () => {
+ it('should return true', () => {
+ expect(comp.canUndo()).toBe(true);
+ });
+ });
+ });
+
+ describe('remove', () => {
+ beforeEach(() => {
+ comp.remove();
+ });
+
+ it('should call saveRemoveFieldUpdate with the correct arguments', () => {
+ expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, item);
+ });
+ });
+
+ describe('undo', () => {
+ beforeEach(() => {
+ comp.undo();
+ });
+
+ it('should call removeSingleFieldUpdate with the correct arguments', () => {
+ expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, item.uuid);
+ });
+ });
+
+});
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
new file mode 100644
index 0000000000..497b06775a
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -0,0 +1,74 @@
+import { Component, Input, OnChanges } from '@angular/core';
+import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer';
+import { cloneDeep } from 'lodash';
+import { Item } from '../../../../core/shared/item.model';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
+import { ItemViewMode } from '../../../../shared/items/item-type-decorator';
+
+@Component({
+ // tslint:disable-next-line:component-selector
+ selector: '[ds-edit-relationship]',
+ styleUrls: ['./edit-relationship.component.scss'],
+ templateUrl: './edit-relationship.component.html',
+})
+export class EditRelationshipComponent implements OnChanges {
+ /**
+ * The current field, value and state of the relationship
+ */
+ @Input() fieldUpdate: FieldUpdate;
+
+ /**
+ * The current url of this page
+ */
+ @Input() url: string;
+
+ /**
+ * The related item of this relationship
+ */
+ item: Item;
+
+ /**
+ * The view-mode we're currently on
+ */
+ viewMode = ItemViewMode.Element;
+
+ constructor(private objectUpdatesService: ObjectUpdatesService) {
+ }
+
+ /**
+ * Sets the current relationship based on the fieldUpdate input field
+ */
+ ngOnChanges(): void {
+ this.item = cloneDeep(this.fieldUpdate.field) as Item;
+ }
+
+ /**
+ * Sends a new remove update for this field to the object updates service
+ */
+ remove(): void {
+ this.objectUpdatesService.saveRemoveFieldUpdate(this.url, this.item);
+ }
+
+ /**
+ * Cancels the current update for this field in the object updates service
+ */
+ undo(): void {
+ this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.item.uuid);
+ }
+
+ /**
+ * Check if a user should be allowed to remove this field
+ */
+ canRemove(): boolean {
+ return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
+ }
+
+ /**
+ * Check if a user should be allowed to cancel the update to this field
+ */
+ canUndo(): boolean {
+ return this.fieldUpdate.changeType >= 0;
+ }
+
+}
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html
new file mode 100644
index 0000000000..4bd0b3df2c
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss
new file mode 100644
index 0000000000..898533a9f0
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.scss
@@ -0,0 +1,22 @@
+@import '../../../../styles/variables.scss';
+
+.button-row {
+ .btn {
+ margin-right: 0.5 * $spacer;
+
+ &:last-child {
+ margin-right: 0;
+ }
+
+ @media screen and (min-width: map-get($grid-breakpoints, sm)) {
+ min-width: $edit-item-button-min-width;
+ }
+ }
+
+ &.top .btn {
+ margin-top: $spacer/2;
+ margin-bottom: $spacer/2;
+ }
+
+
+}
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
new file mode 100644
index 0000000000..48bc28a1b9
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -0,0 +1,233 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ItemRelationshipsComponent } from './item-relationships.component';
+import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { RouterStub } from '../../../shared/testing/router-stub';
+import { TestScheduler } from 'rxjs/testing';
+import { SharedModule } from '../../../shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { GLOBAL_CONFIG } from '../../../../config';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { of as observableOf, combineLatest as observableCombineLatest } from 'rxjs';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
+import { RelationshipService } from '../../../core/data/relationship.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { getTestScheduler } from 'jasmine-marbles';
+import { RestResponse } from '../../../core/cache/response.models';
+import { RequestService } from '../../../core/data/request.service';
+
+let comp: any;
+let fixture: ComponentFixture
+
+
+
{{"login.form.header" | translate}}
-
+ [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+ [ngClass]="{'active': !(isSidebarCollapsed$ | async)}">
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index fe4c301bd5..d072c80628 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -21,7 +21,7 @@ import { SearchFilterService } from './search-filters/search-filter/search-filte
import { SearchConfigurationService } from './search-service/search-configuration.service';
import { RemoteData } from '../core/data/remote-data';
import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
-import { RouteService } from '../shared/services/route.service';
+import { RouteService } from '../core/services/route.service';
import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
import { PaginatedSearchOptions } from './paginated-search-options.model';
import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
@@ -89,11 +89,7 @@ const routeServiceStub = {
return observableOf('')
}
};
-const mockFixedFilterService: SearchFixedFilterService = {
- getQueryByFilterName: (filter: string) => {
- return observableOf(undefined)
- }
-} as SearchFixedFilterService;
+const mockFixedFilterService: SearchFixedFilterService = {} as SearchFixedFilterService;
export function configureSearchComponentTestingModule(compType) {
TestBed.configureTestingModule({
@@ -201,7 +197,7 @@ describe('SearchPageComponent', () => {
beforeEach(() => {
menu = fixture.debugElement.query(By.css('#search-sidebar-sm')).nativeElement;
- comp.isSidebarCollapsed = () => observableOf(true);
+ (comp as any).isSidebarCollapsed$ = observableOf(true);
fixture.detectChanges();
});
@@ -216,7 +212,7 @@ describe('SearchPageComponent', () => {
beforeEach(() => {
menu = fixture.debugElement.query(By.css('#search-sidebar-sm')).nativeElement;
- comp.isSidebarCollapsed = () => observableOf(false);
+ (comp as any).isSidebarCollapsed$ = observableOf(false);
fixture.detectChanges();
});
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index 03433d1da1..0558065142 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -13,7 +13,7 @@ import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
import { hasValue, isNotEmpty } from '../shared/empty.util';
import { SearchConfigurationService } from './search-service/search-configuration.service';
import { getSucceededRemoteData } from '../core/shared/operators';
-import { RouteService } from '../shared/services/route.service';
+import { RouteService } from '../core/services/route.service';
import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
export const SEARCH_ROUTE = '/search';
@@ -91,6 +91,16 @@ export class SearchPageComponent implements OnInit {
@Input()
configuration$: Observable;
+ /**
+ * Link to the search page
+ */
+ searchLink: string;
+
+ /**
+ * Observable for whether or not the sidebar is currently collapsed
+ */
+ isSidebarCollapsed$: Observable;
+
constructor(protected service: SearchService,
protected sidebarService: SearchSidebarService,
protected windowService: HostWindowService,
@@ -107,9 +117,11 @@ export class SearchPageComponent implements OnInit {
* If something changes, update the list of scopes for the dropdown
*/
ngOnInit(): void {
+ this.isSidebarCollapsed$ = this.isSidebarCollapsed();
+ this.searchLink = this.getSearchLink();
this.searchOptions$ = this.getSearchOptions();
this.sub = this.searchOptions$.pipe(
- switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(observableOf(undefined)))))
+ switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(undefined))))
.subscribe((results) => {
this.resultsRD$.next(results);
});
@@ -147,14 +159,14 @@ export class SearchPageComponent implements OnInit {
* Check if the sidebar is collapsed
* @returns {Observable} emits true if the sidebar is currently collapsed, false if it is expanded
*/
- public isSidebarCollapsed(): Observable {
+ private isSidebarCollapsed(): Observable {
return this.sidebarService.isCollapsed;
}
/**
* @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
*/
- public getSearchLink(): string {
+ private getSearchLink(): string {
if (this.inPlaceSearch) {
return './';
}
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index d7d66d854c..6ca449460b 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -30,6 +30,7 @@ import { SearchFacetSelectedOptionComponent } from './search-filters/search-filt
import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
+import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
import { FilteredSearchPageComponent } from './filtered-search-page.component';
@@ -50,6 +51,7 @@ const components = [
SearchFilterComponent,
SearchFacetFilterComponent,
SearchLabelsComponent,
+ SearchLabelComponent,
SearchFacetFilterComponent,
SearchFacetFilterWrapperComponent,
SearchRangeFilterComponent,
@@ -79,7 +81,6 @@ const components = [
SearchFilterService,
SearchFixedFilterService,
ConfigurationSearchPageGuard,
- SearchFilterService,
SearchConfigurationService
],
entryComponents: [
diff --git a/src/app/+search-page/search-service/search-configuration.service.spec.ts b/src/app/+search-page/search-service/search-configuration.service.spec.ts
index fb95ab8d04..f1aedd9fe5 100644
--- a/src/app/+search-page/search-service/search-configuration.service.spec.ts
+++ b/src/app/+search-page/search-service/search-configuration.service.spec.ts
@@ -163,12 +163,4 @@ describe('SearchConfigurationService', () => {
});
});
- describe('when getCurrentFixedFilter is called', () => {
- beforeEach(() => {
- service.getCurrentFixedFilter();
- });
- it('should call getRouteParameterValue on the routeService with parameter name \'filter\'', () => {
- expect((service as any).routeService.getRouteParameterValue).toHaveBeenCalledWith('filter');
- });
- });
});
diff --git a/src/app/+search-page/search-service/search-configuration.service.ts b/src/app/+search-page/search-service/search-configuration.service.ts
index 06efc16be2..5a2343b058 100644
--- a/src/app/+search-page/search-service/search-configuration.service.ts
+++ b/src/app/+search-page/search-service/search-configuration.service.ts
@@ -14,7 +14,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
import { SearchOptions } from '../search-options.model';
import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { RouteService } from '../../shared/services/route.service';
+import { RouteService } from '../../core/services/route.service';
import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
import { RemoteData } from '../../core/data/remote-data';
import { getSucceededRemoteData } from '../../core/shared/operators';
@@ -205,15 +205,6 @@ export class SearchConfigurationService implements OnDestroy {
}));
}
- /**
- * @returns {Observable} Emits the current fixed filter as a string
- */
- getCurrentFixedFilter(): Observable {
- return this.routeService.getRouteParameterValue('filter').pipe(
- switchMap((f) => this.fixedFilterService.getQueryByFilterName(f))
- );
- }
-
/**
* @returns {Observable} Emits the current active filters with their values as they are displayed in the frontend URL
*/
@@ -233,7 +224,6 @@ export class SearchConfigurationService implements OnDestroy {
this.getQueryPart(defaults.query),
this.getDSOTypePart(),
this.getFiltersPart(),
- this.getFixedFilterPart()
).subscribe((update) => {
const currentValue: SearchOptions = this.searchOptions.getValue();
const updatedValue: SearchOptions = Object.assign(currentValue, update);
@@ -255,7 +245,6 @@ export class SearchConfigurationService implements OnDestroy {
this.getQueryPart(defaults.query),
this.getDSOTypePart(),
this.getFiltersPart(),
- this.getFixedFilterPart()
).subscribe((update) => {
const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
const updatedValue: PaginatedSearchOptions = Object.assign(currentValue, update);
@@ -352,16 +341,4 @@ export class SearchConfigurationService implements OnDestroy {
return { filters }
}));
}
-
- /**
- * @returns {Observable} Emits the current fixed filter as a partial SearchOptions object
- */
- private getFixedFilterPart(): Observable {
- return this.getCurrentFixedFilter().pipe(
- isNotEmptyOperator(),
- map((fixedFilter) => {
- return { fixedFilter }
- }),
- );
- }
}
diff --git a/src/app/+search-page/search-service/search.service.spec.ts b/src/app/+search-page/search-service/search.service.spec.ts
index 4ae9876159..798670a0e0 100644
--- a/src/app/+search-page/search-service/search.service.spec.ts
+++ b/src/app/+search-page/search-service/search.service.spec.ts
@@ -26,7 +26,7 @@ import { CommunityDataService } from '../../core/data/community-data.service';
import { ViewMode } from '../../core/shared/view-mode.model';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
import { map } from 'rxjs/operators';
-import { RouteService } from '../../shared/services/route.service';
+import { RouteService } from '../../core/services/route.service';
import { routeServiceStub } from '../../shared/testing/route-service-stub';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts
index 86611cc87b..bedae84eaa 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/+search-page/search-service/search.service.ts
@@ -1,7 +1,7 @@
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
import { Injectable, OnDestroy } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
-import { first, map, switchMap } from 'rxjs/operators';
+import { NavigationExtras, PRIMARY_OUTLET, Router, UrlSegmentGroup } from '@angular/router';
+import { first, map, switchMap, take, tap } from 'rxjs/operators';
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
import {
FacetConfigSuccessResponse,
@@ -23,7 +23,7 @@ import {
getSucceededRemoteData
} from '../../core/shared/operators';
import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import { hasValue, hasValueOperator, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
import { NormalizedSearchResult } from '../normalized-search-result.model';
import { SearchOptions } from '../search-options.model';
import { SearchResult } from '../search-result.model';
@@ -41,7 +41,7 @@ import { Community } from '../../core/shared/community.model';
import { CommunityDataService } from '../../core/data/community-data.service';
import { ViewMode } from '../../core/shared/view-mode.model';
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { RouteService } from '../../shared/services/route.service';
+import { RouteService } from '../../core/services/route.service';
/**
* Service that performs all general actions that have to do with the search page
@@ -100,14 +100,22 @@ export class SearchService implements OnDestroy {
/**
* Method to retrieve a paginated list of search results from the server
* @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
+ * @param responseMsToLive The amount of milliseconds for the response to live in cache
* @returns {Observable>>>} Emits a paginated list with all search results found
*/
- search(searchOptions?: PaginatedSearchOptions): Observable>>> {
- const requestObs = this.halService.getEndpoint(this.searchLinkPath).pipe(
+ search(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number): Observable>>> {
+ const hrefObs = this.halService.getEndpoint(this.searchLinkPath).pipe(
map((url: string) => {
if (hasValue(searchOptions)) {
- url = (searchOptions as PaginatedSearchOptions).toRestUrl(url);
+ return (searchOptions as PaginatedSearchOptions).toRestUrl(url);
+ } else {
+ return url;
}
+ })
+ );
+
+ const requestObs = hrefObs.pipe(
+ map((url: string) => {
const request = new this.request(this.requestService.generateRequestId(), url);
const getResponseParserFn: () => GenericConstructor = () => {
@@ -115,6 +123,7 @@ export class SearchService implements OnDestroy {
};
return Object.assign(request, {
+ responseMsToLive: hasValue(responseMsToLive) ? responseMsToLive : request.responseMsToLive,
getResponseParser: getResponseParserFn
});
}),
@@ -136,10 +145,11 @@ export class SearchService implements OnDestroy {
map((sqr: SearchQueryResponse) => {
return sqr.objects
.filter((nsr: NormalizedSearchResult) => isNotUndefined(nsr.indexableObject))
- .map((nsr: NormalizedSearchResult) => {
- return this.rdb.buildSingle(nsr.indexableObject);
- })
+ .map((nsr: NormalizedSearchResult) => new GetRequest(this.requestService.generateRequestId(), nsr.indexableObject))
}),
+ // Send a request for each item to ensure fresh cache
+ tap((reqs: RestRequest[]) => reqs.forEach((req: RestRequest) => this.requestService.configure(req))),
+ map((reqs: RestRequest[]) => reqs.map((req: RestRequest) => this.rdb.buildSingle(req.href))),
switchMap((input: Array>>) => this.rdb.aggregate(input)),
);
@@ -168,11 +178,20 @@ export class SearchService implements OnDestroy {
const payloadObs = observableCombineLatest(tDomainListObs, pageInfoObs).pipe(
map(([tDomainList, pageInfo]) => {
- return new PaginatedList(pageInfo, tDomainList);
+ return new PaginatedList(pageInfo, tDomainList.filter((obj) => hasValue(obj)));
})
);
- return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+ return observableCombineLatest(hrefObs, tDomainListObs, requestEntryObs).pipe(
+ switchMap(([href, tDomainList, requestEntry]) => {
+ if (tDomainList.indexOf(undefined) > -1 && requestEntry && requestEntry.completed) {
+ this.requestService.removeByHrefSubstring(href);
+ return this.search(searchOptions)
+ } else {
+ return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+ }
+ })
+ );
}
/**
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 86364aca89..e1ddc2b889 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -16,6 +16,12 @@ const COMMUNITY_MODULE_PATH = 'communities';
export function getCommunityModulePath() {
return `/${COMMUNITY_MODULE_PATH}`;
}
+
+const ADMIN_MODULE_PATH = 'admin';
+export function getAdminModulePath() {
+ return `/${ADMIN_MODULE_PATH}`;
+}
+
@NgModule({
imports: [
RouterModule.forRoot([
@@ -27,7 +33,7 @@ export function getCommunityModulePath() {
{ path: 'mydspace', loadChildren: './+my-dspace-page/my-dspace-page.module#MyDSpacePageModule', canActivate: [AuthenticatedGuard] },
{ path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' },
{ path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule' },
- { path: 'admin', loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard] },
+ { path: ADMIN_MODULE_PATH, loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard] },
{ path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
{ path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
{ path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index bd2d832c67..5b78e3462f 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -26,7 +26,7 @@ import { HostWindowResizeAction } from './shared/host-window.actions';
import { MetadataService } from './core/metadata/metadata.service';
import { GLOBAL_CONFIG, ENV_CONFIG } from '../config';
-import { NativeWindowRef, NativeWindowService } from './shared/services/window.service';
+import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
import { MockTranslateLoader } from './shared/mocks/mock-translate-loader';
import { MockMetadataService } from './shared/mocks/mock-metadata-service';
@@ -41,9 +41,11 @@ import { MenuServiceStub } from './shared/testing/menu-service-stub';
import { HostWindowService } from './shared/host-window.service';
import { HostWindowServiceStub } from './shared/testing/host-window-service-stub';
import { ActivatedRoute, Router } from '@angular/router';
-import { RouteService } from './shared/services/route.service';
+import { RouteService } from './core/services/route.service';
import { MockActivatedRoute } from './shared/mocks/mock-active-router';
import { MockRouter } from './shared/mocks/mock-router';
+import { MockCookieService } from './shared/mocks/mock-cookie.service';
+import { CookieService } from './core/services/cookie.service';
let comp: AppComponent;
let fixture: ComponentFixture;
@@ -78,6 +80,7 @@ describe('App component', () => {
{ provide: MenuService, useValue: menuService },
{ provide: CSSVariableService, useClass: CSSVariableServiceStub },
{ provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+ { provide: CookieService, useValue: new MockCookieService()},
AppComponent,
RouteService
],
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 52c169e7bc..50baaf6e57 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -19,11 +19,11 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../config';
import { MetadataService } from './core/metadata/metadata.service';
import { HostWindowResizeAction } from './shared/host-window.actions';
import { HostWindowState } from './shared/host-window.reducer';
-import { NativeWindowRef, NativeWindowService } from './shared/services/window.service';
+import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
import { isAuthenticated } from './core/auth/selectors';
import { AuthService } from './core/auth/auth.service';
import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
-import { RouteService } from './shared/services/route.service';
+import { RouteService } from './core/services/route.service';
import variables from '../styles/_exposed_variables.scss';
import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
import { MenuService } from './shared/menu/menu.service';
@@ -32,6 +32,10 @@ import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
import { slideSidebarPadding } from './shared/animations/slide';
import { HostWindowService } from './shared/host-window.service';
import { Theme } from '../config/theme.inferface';
+import { isNotEmpty } from './shared/empty.util';
+import { CookieService } from './core/services/cookie.service';
+
+export const LANG_COOKIE = 'language_cookie';
@Component({
selector: 'ds-app',
@@ -61,6 +65,7 @@ export class AppComponent implements OnInit, AfterViewInit {
private cssService: CSSVariableService,
private menuService: MenuService,
private windowService: HostWindowService,
+ private cookie: CookieService
) {
// Load all the languages that are defined as active from the config file
translate.addLangs(config.languages.filter((LangConfig) => LangConfig.active === true).map((a) => a.code));
@@ -68,11 +73,20 @@ export class AppComponent implements OnInit, AfterViewInit {
// Load the default language from the config file
translate.setDefaultLang(config.defaultLanguage);
- // Attempt to get the browser language from the user
- if (translate.getLangs().includes(translate.getBrowserLang())) {
- translate.use(translate.getBrowserLang());
+ // Attempt to get the language from a cookie
+ const lang = cookie.get(LANG_COOKIE);
+ if (isNotEmpty(lang)) {
+ // Cookie found
+ // Use the language from the cookie
+ translate.use(lang);
} else {
- translate.use(config.defaultLanguage);
+ // Cookie not found
+ // Attempt to get the browser language from the user
+ if (translate.getLangs().includes(translate.getBrowserLang())) {
+ translate.use(translate.getBrowserLang());
+ } else {
+ translate.use(config.defaultLanguage);
+ }
}
metadata.listenForRouteChange();
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index ce5a2d78a2..916788df8c 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -39,6 +39,7 @@ import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/e
import { NavbarModule } from './navbar/navbar.module';
import { JournalEntitiesModule } from './entity-groups/journal-entities/journal-entities.module';
import { ResearchEntitiesModule } from './entity-groups/research-entities/research-entities.module';
+import { ClientCookieService } from './core/services/client-cookie.service';
export function getConfig() {
return ENV_CONFIG;
@@ -97,7 +98,8 @@ const PROVIDERS = [
{
provide: RouterStateSerializer,
useClass: DSpaceRouterStateSerializer
- }
+ },
+ ClientCookieService
];
const DECLARATIONS = [
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index ea2512a974..bc84f961fb 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -23,6 +23,11 @@ import { hasValue } from './shared/empty.util';
import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/sass-helper.reducer';
import { menusReducer, MenusState } from './shared/menu/menu.reducer';
import { historyReducer, HistoryState } from './shared/history/history.reducer';
+import {
+ bitstreamFormatReducer,
+ BitstreamFormatRegistryState
+} from './+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { ObjectSelectionListState, objectSelectionReducer } from './shared/object-select/object-select.reducer';
export interface AppState {
router: fromRouter.RouterReducerState;
@@ -30,12 +35,14 @@ export interface AppState {
hostWindow: HostWindowState;
forms: FormState;
metadataRegistry: MetadataRegistryState;
+ bitstreamFormats: BitstreamFormatRegistryState;
notifications: NotificationsState;
searchSidebar: SearchSidebarState;
searchFilter: SearchFiltersState;
truncatable: TruncatablesState;
cssVariables: CSSVariablesState;
menus: MenusState;
+ objectSelection: ObjectSelectionListState;
}
export const appReducers: ActionReducerMap = {
@@ -44,12 +51,14 @@ export const appReducers: ActionReducerMap = {
hostWindow: hostWindowReducer,
forms: formReducer,
metadataRegistry: metadataRegistryReducer,
+ bitstreamFormats: bitstreamFormatReducer,
notifications: notificationsReducer,
searchSidebar: sidebarReducer,
searchFilter: filterReducer,
truncatable: truncatableReducer,
cssVariables: cssVariablesReducer,
menus: menusReducer,
+ objectSelection: objectSelectionReducer
};
export const routerStateSelector = (state: AppState) => state.router;
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index e766a45e48..5084dc8596 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -7,12 +7,12 @@ import { REQUEST } from '@nguniversal/express-engine/tokens';
import { of as observableOf } from 'rxjs';
import { authReducer, AuthState } from './auth.reducer';
-import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service';
+import { NativeWindowRef, NativeWindowService } from '../services/window.service';
import { AuthService } from './auth.service';
import { RouterStub } from '../../shared/testing/router-stub';
import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
-import { CookieService } from '../../shared/services/cookie.service';
+import { CookieService } from '../services/cookie.service';
import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service-stub';
import { AuthRequestService } from './auth-request.service';
import { AuthStatus } from './models/auth-status.model';
@@ -20,14 +20,17 @@ import { AuthTokenInfo } from './models/auth-token-info.model';
import { EPerson } from '../eperson/models/eperson.model';
import { EPersonMock } from '../../shared/testing/eperson-mock';
import { AppState } from '../../app.reducer';
-import { ClientCookieService } from '../../shared/services/client-cookie.service';
+import { ClientCookieService } from '../services/client-cookie.service';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { getMockRemoteDataBuildService } from '../../shared/mocks/mock-remote-data-build.service';
+import { routeServiceStub } from '../../shared/testing/route-service-stub';
+import { RouteService } from '../services/route.service';
describe('AuthService test', () => {
let mockStore: Store;
let authService: AuthService;
+ let routeServiceMock: RouteService;
let authRequest;
let window;
let routerStub;
@@ -74,6 +77,7 @@ describe('AuthService test', () => {
{ provide: NativeWindowService, useValue: window },
{ provide: REQUEST, useValue: {} },
{ provide: Router, useValue: routerStub },
+ { provide: RouteService, useValue: routeServiceStub },
{ provide: ActivatedRoute, useValue: routeStub },
{ provide: Store, useValue: mockStore },
{ provide: RemoteDataBuildService, useValue: rdbService },
@@ -138,6 +142,7 @@ describe('AuthService test', () => {
{ provide: AuthRequestService, useValue: authRequest },
{ provide: REQUEST, useValue: {} },
{ provide: Router, useValue: routerStub },
+ { provide: RouteService, useValue: routeServiceStub },
{ provide: RemoteDataBuildService, useValue: rdbService },
CookieService,
AuthService
@@ -145,13 +150,13 @@ describe('AuthService test', () => {
}).compileComponents();
}));
- beforeEach(inject([CookieService, AuthRequestService, Store, Router], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router) => {
+ beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService) => {
store
.subscribe((state) => {
(state as any).core = Object.create({});
(state as any).core.auth = authenticatedState;
});
- authService = new AuthService({}, window, undefined, authReqService, router, cookieService, store, rdbService);
+ authService = new AuthService({}, window, undefined, authReqService, router, routeService, cookieService, store, rdbService);
}));
it('should return true when user is logged in', () => {
@@ -189,6 +194,7 @@ describe('AuthService test', () => {
{ provide: AuthRequestService, useValue: authRequest },
{ provide: REQUEST, useValue: {} },
{ provide: Router, useValue: routerStub },
+ { provide: RouteService, useValue: routeServiceStub },
{ provide: RemoteDataBuildService, useValue: rdbService },
ClientCookieService,
CookieService,
@@ -197,7 +203,7 @@ describe('AuthService test', () => {
}).compileComponents();
}));
- beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store, router: Router) => {
+ beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store, router: Router, routeService: RouteService) => {
const expiredToken: AuthTokenInfo = new AuthTokenInfo('test_token');
expiredToken.expires = Date.now() - (1000 * 60 * 60);
authenticatedState = {
@@ -212,11 +218,14 @@ describe('AuthService test', () => {
(state as any).core = Object.create({});
(state as any).core.auth = authenticatedState;
});
- authService = new AuthService({}, window, undefined, authReqService, router, cookieService, store, rdbService);
+ authService = new AuthService({}, window, undefined, authReqService, router, routeService, cookieService, store, rdbService);
storage = (authService as any).storage;
+ routeServiceMock = TestBed.get(RouteService);
+ routerStub = TestBed.get(Router);
spyOn(storage, 'get');
spyOn(storage, 'remove');
spyOn(storage, 'set');
+
}));
it('should throw false when token is not valid', () => {
@@ -238,5 +247,32 @@ describe('AuthService test', () => {
expect(storage.remove).toHaveBeenCalled();
});
+ it ('should set redirect url to previous page', () => {
+ spyOn(routeServiceMock, 'getHistory').and.callThrough();
+ authService.redirectAfterLoginSuccess(true);
+ expect(routeServiceMock.getHistory).toHaveBeenCalled();
+ expect(routerStub.navigate).toHaveBeenCalledWith(['/collection/123']);
+ });
+
+ it ('should set redirect url to current page', () => {
+ spyOn(routeServiceMock, 'getHistory').and.callThrough();
+ authService.redirectAfterLoginSuccess(false);
+ expect(routeServiceMock.getHistory).toHaveBeenCalled();
+ expect(routerStub.navigate).toHaveBeenCalledWith(['/home']);
+ });
+
+ it ('should redirect to / and not to /login', () => {
+ spyOn(routeServiceMock, 'getHistory').and.returnValue(observableOf(['/login', '/login']));
+ authService.redirectAfterLoginSuccess(true);
+ expect(routeServiceMock.getHistory).toHaveBeenCalled();
+ expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
+ });
+
+ it ('should redirect to / when no redirect url is found', () => {
+ spyOn(routeServiceMock, 'getHistory').and.returnValue(observableOf(['']));
+ authService.redirectAfterLoginSuccess(true);
+ expect(routeServiceMock.getHistory).toHaveBeenCalled();
+ expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
+ });
});
});
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index a01768e687..5287e537ee 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -15,13 +15,14 @@ import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
import { AuthStatus } from './models/auth-status.model';
import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model';
import { isEmpty, isNotEmpty, isNotNull, isNotUndefined } from '../../shared/empty.util';
-import { CookieService } from '../../shared/services/cookie.service';
+import { CookieService } from '../services/cookie.service';
import { getAuthenticationToken, getRedirectUrl, isAuthenticated, isTokenRefreshing } from './selectors';
import { AppState, routerStateSelector } from '../../app.reducer';
import { ResetAuthenticationMessagesAction, SetRedirectUrlAction } from './auth.actions';
-import { NativeWindowRef, NativeWindowService } from '../../shared/services/window.service';
+import { NativeWindowRef, NativeWindowService } from '../services/window.service';
import { Base64EncodeUrl } from '../../shared/utils/encode-decode.util';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import {RouteService} from '../services/route.service';
export const LOGIN_ROUTE = '/login';
export const LOGOUT_ROUTE = '/logout';
@@ -45,6 +46,7 @@ export class AuthService {
protected authRequestService: AuthRequestService,
@Optional() @Inject(RESPONSE) private response: any,
protected router: Router,
+ protected routeService: RouteService,
protected storage: CookieService,
protected store: Store,
protected rdbService: RemoteDataBuildService
@@ -337,7 +339,7 @@ export class AuthService {
/**
* Redirect to the route navigated before the login
*/
- public redirectToPreviousUrl() {
+ public redirectAfterLoginSuccess(isStandalonePage: boolean) {
this.getRedirectUrl().pipe(
take(1))
.subscribe((redirectUrl) => {
@@ -346,18 +348,39 @@ export class AuthService {
this.clearRedirectUrl();
this.router.onSameUrlNavigation = 'reload';
const url = decodeURIComponent(redirectUrl);
- this.router.navigateByUrl(url);
- /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
- // this._window.nativeWindow.location.href = url;
+ this.navigateToRedirectUrl(url);
} else {
- this.router.navigate(['/']);
- /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
- // this._window.nativeWindow.location.href = '/';
+ // If redirectUrl is empty use history.
+ this.routeService.getHistory().pipe(
+ take(1)
+ ).subscribe((history) => {
+ let redirUrl;
+ if (isStandalonePage) {
+ // For standalone login pages, use the previous route.
+ redirUrl = history[history.length - 2] || '';
+ } else {
+ redirUrl = history[history.length - 1] || '';
+ }
+ this.navigateToRedirectUrl(redirUrl);
+ });
}
- })
+ });
}
+ protected navigateToRedirectUrl(url: string) {
+ // in case the user navigates directly to /login (via bookmark, etc), or the route history is not found.
+ if (isEmpty(url) || url.startsWith(LOGIN_ROUTE)) {
+ this.router.navigate(['/']);
+ /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
+ // this._window.nativeWindow.location.href = '/';
+ } else {
+ /* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
+ // this._window.nativeWindow.location.href = url;
+ this.router.navigate([url]);
+ }
+ }
+
/**
* Refresh route navigated
*/
@@ -400,4 +423,5 @@ export class AuthService {
this.store.dispatch(new SetRedirectUrlAction(''));
this.storage.remove(REDIRECT_COOKIE);
}
+
}
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index c344683e38..cf4d4a658e 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -1,12 +1,12 @@
-import { map, switchMap, take } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpHeaders } from '@angular/common/http';
import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
import { AuthStatus } from './models/auth-status.model';
-import { isNotEmpty } from '../../shared/empty.util';
-import { AuthService } from './auth.service';
+import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { AuthService, LOGIN_ROUTE } from './auth.service';
import { AuthTokenInfo } from './models/auth-token-info.model';
import { CheckAuthenticationTokenAction } from './auth.actions';
import { EPerson } from '../eperson/models/eperson.model';
@@ -54,7 +54,7 @@ export class ServerAuthService extends AuthService {
/**
* Redirect to the route navigated before the login
*/
- public redirectToPreviousUrl() {
+ public redirectAfterLoginSuccess(isStandalonePage: boolean) {
this.getRedirectUrl().pipe(
take(1))
.subscribe((redirectUrl) => {
@@ -67,10 +67,15 @@ export class ServerAuthService extends AuthService {
const url = decodeURIComponent(redirectUrl);
this.router.navigateByUrl(url);
} else {
- this.router.navigate(['/']);
+ // If redirectUrl is empty use history. For ssr the history array should contain the requested url.
+ this.routeService.getHistory().pipe(
+ filter((history) => history.length > 0),
+ take(1)
+ ).subscribe((history) => {
+ this.navigateToRedirectUrl(history[history.length - 1] || '');
+ });
}
})
-
}
}
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 85ba7636b6..a9fd699af2 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -82,8 +82,8 @@ export class RemoteDataBuildService {
toRemoteDataObservable(requestEntry$: Observable, payload$: Observable) {
return observableCombineLatest(requestEntry$, payload$).pipe(
map(([reqEntry, payload]) => {
- const requestPending = hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
- const responsePending = hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
+ const requestPending = hasValue(reqEntry) && hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
+ const responsePending = hasValue(reqEntry) && hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
let isSuccessful: boolean;
let error: RemoteDataError;
if (hasValue(reqEntry) && hasValue(reqEntry.response)) {
diff --git a/src/app/core/cache/models/items/normalized-relationship-type.model.ts b/src/app/core/cache/models/items/normalized-relationship-type.model.ts
index 800b27cd7e..23c3333a9b 100644
--- a/src/app/core/cache/models/items/normalized-relationship-type.model.ts
+++ b/src/app/core/cache/models/items/normalized-relationship-type.model.ts
@@ -23,7 +23,7 @@ export class NormalizedRelationshipType extends NormalizedObject
* The level of support the system offers for this Bitstream Format
*/
@autoserialize
- supportLevel: SupportLevel;
+ supportLevel: BitstreamFormatSupportLevel;
/**
* True if the Bitstream Format is used to store system information, rather than the content of items in the system
@@ -46,7 +46,7 @@ export class NormalizedBitstreamFormat extends NormalizedObject
* String representing this Bitstream Format's file extension
*/
@autoserialize
- extensions: string;
+ extensions: string[];
/**
* Identifier for this Bitstream Format
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index e18ff3b3a4..11f3a6ce3e 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -4,7 +4,7 @@ import { applyPatch, Operation } from 'fast-json-patch';
import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
import { distinctUntilChanged, filter, map, mergeMap, take, } from 'rxjs/operators';
-import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
+import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
import { CoreState } from '../core.reducers';
import { coreSelector } from '../core.selectors';
import { RestRequestMethod } from '../data/rest-request-method';
@@ -68,8 +68,8 @@ export class ObjectCacheService {
* @param href
* The unique href of the object to be removed
*/
- remove(uuid: string): void {
- this.store.dispatch(new RemoveFromObjectCacheAction(uuid));
+ remove(href: string): void {
+ this.store.dispatch(new RemoveFromObjectCacheAction(href));
}
/**
@@ -224,6 +224,18 @@ export class ObjectCacheService {
return result;
}
+ /**
+ * Create an observable that emits a new value whenever the availability of the cached object changes.
+ * The value it emits is a boolean stating if the object exists in cache or not.
+ * @param selfLink The self link of the object to observe
+ */
+ hasBySelfLinkObservable(selfLink: string): Observable {
+ return this.store.pipe(
+ select(entryFromSelfLinkSelector(selfLink)),
+ map((entry: ObjectCacheEntry) => this.isValid(entry))
+ );
+ }
+
/**
* Check whether an ObjectCacheEntry should still be cached
*
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index 1aa5d2d0b1..0eabfc5dc8 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -5,7 +5,7 @@ import { AuthEffects } from './auth/auth.effects';
import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.effects';
import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
-import { RouteEffects } from '../shared/services/route.effects';
+import { RouteEffects } from './services/route.effects';
export const coreEffects = [
RequestEffects,
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index fe46bf88aa..041687aa08 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -14,7 +14,7 @@ import { coreReducers } from './core.reducers';
import { isNotEmpty } from '../shared/empty.util';
-import { ApiService } from '../shared/services/api.service';
+import { ApiService } from './services/api.service';
import { BrowseEntriesResponseParsingService } from './data/browse-entries-response-parsing.service';
import { CollectionDataService } from './data/collection-data.service';
import { CommunityDataService } from './data/community-data.service';
@@ -34,12 +34,12 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp
import { RemoteDataBuildService } from './cache/builders/remote-data-build.service';
import { RequestService } from './data/request.service';
import { EndpointMapResponseParsingService } from './data/endpoint-map-response-parsing.service';
-import { ServerResponseService } from '../shared/services/server-response.service';
-import { NativeWindowFactory, NativeWindowService } from '../shared/services/window.service';
+import { ServerResponseService } from './services/server-response.service';
+import { NativeWindowFactory, NativeWindowService } from './services/window.service';
import { BrowseService } from './browse/browse.service';
import { BrowseResponseParsingService } from './data/browse-response-parsing.service';
import { ConfigResponseParsingService } from './config/config-response-parsing.service';
-import { RouteService } from '../shared/services/route.service';
+import { RouteService } from './services/route.service';
import { SubmissionDefinitionsConfigService } from './config/submission-definitions-config.service';
import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
import { SubmissionSectionsConfigService } from './config/submission-sections-config.service';
@@ -101,12 +101,14 @@ import { NormalizedSubmissionFormsModel } from './config/models/normalized-confi
import { NormalizedSubmissionSectionModel } from './config/models/normalized-config-submission-section.model';
import { NormalizedAuthStatus } from './auth/models/normalized-auth-status.model';
import { NormalizedAuthorityValue } from './integration/models/normalized-authority-value.model';
+import { RelationshipService } from './data/relationship.service';
import { RoleService } from './roles/role.service';
import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
import { ClaimedTaskDataService } from './tasks/claimed-task-data.service';
import { PoolTaskDataService } from './tasks/pool-task-data.service';
import { TaskResponseParsingService } from './tasks/task-response-parsing.service';
+import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
import { NormalizedClaimedTask } from './tasks/models/normalized-claimed-task-object.model';
import { NormalizedTaskObject } from './tasks/models/normalized-task-object.model';
import { NormalizedPoolTask } from './tasks/models/normalized-pool-task-object.model';
@@ -118,6 +120,8 @@ import { NormalizedSubmissionUploadsModel } from './config/models/normalized-con
import { NormalizedBrowseEntry } from './shared/normalized-browse-entry.model';
import { BrowseDefinition } from './shared/browse-definition.model';
import { ContentSourceResponseParsingService } from './data/content-source-response-parsing.service';
+import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service';
+import { ObjectSelectService } from '../shared/object-select/object-select.service';
const IMPORTS = [
CommonModule,
@@ -154,6 +158,7 @@ const PROVIDERS = [
PaginationComponentOptions,
ResourcePolicyService,
RegistryService,
+ BitstreamFormatDataService,
NormalizedObjectBuildService,
RemoteDataBuildService,
RequestService,
@@ -164,6 +169,7 @@ const PROVIDERS = [
RegistryMetadataschemasResponseParsingService,
RegistryMetadatafieldsResponseParsingService,
RegistryBitstreamformatsResponseParsingService,
+ MappedCollectionsReponseParsingService,
DebugResponseParsingService,
SearchResponseParsingService,
MyDSpaceResponseParsingService,
@@ -195,10 +201,12 @@ const PROVIDERS = [
DSpaceObjectDataService,
DSOChangeAnalyzer,
DefaultChangeAnalyzer,
+ ObjectSelectService,
CSSVariableService,
MenuService,
ObjectUpdatesService,
SearchService,
+ RelationshipService,
MyDSpaceGuard,
RoleService,
TaskResponseParsingService,
diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts
index 7aecb91a7a..4fcf36f9cc 100644
--- a/src/app/core/core.reducers.ts
+++ b/src/app/core/core.reducers.ts
@@ -13,7 +13,7 @@ import {
objectUpdatesReducer,
ObjectUpdatesState
} from './data/object-updates/object-updates.reducer';
-import { routeReducer, RouteState } from '../shared/services/route.reducer';
+import { routeReducer, RouteState } from './services/route.reducer';
export interface CoreState {
'cache/object': ObjectCacheState,
diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts
new file mode 100644
index 0000000000..f3ce478236
--- /dev/null
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -0,0 +1,293 @@
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { RequestEntry } from './request.reducer';
+import { RestResponse } from '../cache/response.models';
+import { Observable, of as observableOf } from 'rxjs';
+import { Action, Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { async } from '@angular/core/testing';
+import {
+ BitstreamFormatsRegistryDeselectAction,
+ BitstreamFormatsRegistryDeselectAllAction,
+ BitstreamFormatsRegistrySelectAction
+} from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { TestScheduler } from 'rxjs/testing';
+
+describe('BitstreamFormatDataService', () => {
+ let service: BitstreamFormatDataService;
+ let requestService;
+ let scheduler: TestScheduler;
+
+ const bitstreamFormatsEndpoint = 'https://rest.api/core/bitstream-formats';
+ const bitstreamFormatsIdEndpoint = 'https://rest.api/core/bitstream-formats/format-id';
+
+ const responseCacheEntry = new RequestEntry();
+ responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+ responseCacheEntry.completed = true;
+
+ const store = {
+ dispatch(action: Action) {
+ // Do Nothing
+ }
+ } as Store;
+
+ const objectCache = {} as ObjectCacheService;
+ const halEndpointService = {
+ getEndpoint(linkPath: string): Observable {
+ return cold('a', {a: bitstreamFormatsEndpoint});
+ }
+ } as HALEndpointService;
+
+ const notificationsService = {} as NotificationsService;
+ const http = {} as HttpClient;
+ const comparator = {} as any;
+ const dataBuildService = {} as NormalizedObjectBuildService;
+ const rdbService = {} as RemoteDataBuildService;
+
+ function initTestService(halService) {
+ return new BitstreamFormatDataService(
+ requestService,
+ rdbService,
+ dataBuildService,
+ store,
+ objectCache,
+ halService,
+ notificationsService,
+ http,
+ comparator
+ );
+ }
+
+ describe('getBrowseEndpoint', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ }));
+ it('should get the browse endpoint', () => {
+ const result = service.getBrowseEndpoint();
+ const expected = cold('b', {b: bitstreamFormatsEndpoint});
+
+ expect(result).toBeObservable(expected);
+ });
+ });
+
+ describe('getUpdateEndpoint', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ }));
+ it('should get the update endpoint', () => {
+ const formatId = 'format-id';
+
+ const result = service.getUpdateEndpoint(formatId);
+ const expected = cold('b', {b: bitstreamFormatsIdEndpoint});
+
+ expect(result).toBeObservable(expected);
+ });
+ });
+
+ describe('getCreateEndpoint', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ }));
+ it('should get the create endpoint ', () => {
+
+ const result = service.getCreateEndpoint();
+ const expected = cold('b', {b: bitstreamFormatsEndpoint});
+
+ expect(result).toBeObservable(expected);
+ });
+ });
+
+ describe('updateBitstreamFormat', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ }));
+ it('should update the bitstream format', () => {
+ const updatedBistreamFormat = new BitstreamFormat();
+ updatedBistreamFormat.uuid = 'updated-uuid';
+
+ const expected = cold('(b)', {b: new RestResponse(true, 200, 'Success')});
+ const result = service.updateBitstreamFormat(updatedBistreamFormat);
+
+ expect(result).toBeObservable(expected);
+
+ });
+ });
+
+ describe('createBitstreamFormat', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ }));
+ it('should create a new bitstream format', () => {
+ const newFormat = new BitstreamFormat();
+ newFormat.uuid = 'new-uuid';
+
+ const expected = cold('(b)', {b: new RestResponse(true, 200, 'Success')});
+ const result = service.createBitstreamFormat(newFormat);
+
+ expect(result).toBeObservable(expected);
+ });
+ });
+
+ describe('clearBitStreamFormatRequests', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ const halService = {
+ getEndpoint(linkPath: string): Observable {
+ return observableOf(bitstreamFormatsEndpoint);
+ }
+ } as HALEndpointService;
+ service = initTestService(halService);
+ service.clearBitStreamFormatRequests().subscribe();
+ }));
+ it('should remove the bitstream format hrefs in the request service', () => {
+ expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(bitstreamFormatsEndpoint);
+ });
+ });
+
+ describe('selectBitstreamFormat', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ spyOn(store, 'dispatch');
+ }));
+ it('should add a selected bitstream to the store', () => {
+ const format = new BitstreamFormat();
+ format.uuid = 'uuid';
+
+ service.selectBitstreamFormat(format);
+ expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistrySelectAction(format));
+ });
+ });
+
+ describe('deselectBitstreamFormat', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ spyOn(store, 'dispatch');
+ }));
+ it('should remove a bitstream from the store', () => {
+ const format = new BitstreamFormat();
+ format.uuid = 'uuid';
+
+ service.deselectBitstreamFormat(format);
+ expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAction(format));
+ });
+ });
+
+ describe('deselectAllBitstreamFormats', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: cold('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ service = initTestService(halEndpointService);
+ spyOn(store, 'dispatch');
+
+ }));
+ it('should remove all bitstreamFormats from the store', () => {
+ service.deselectAllBitstreamFormats();
+ expect(store.dispatch).toHaveBeenCalledWith(new BitstreamFormatsRegistryDeselectAllAction());
+ });
+ });
+
+ describe('delete', () => {
+ beforeEach(async(() => {
+ scheduler = getTestScheduler();
+ requestService = jasmine.createSpyObj('requestService', {
+ configure: {},
+ getByHref: observableOf(responseCacheEntry),
+ getByUUID: hot('a', {a: responseCacheEntry}),
+ generateRequestId: 'request-id',
+ removeByHrefSubstring: {}
+ });
+ const halService = {
+ getEndpoint(linkPath: string): Observable {
+ return observableOf(bitstreamFormatsEndpoint);
+ }
+ } as HALEndpointService;
+ service = initTestService(halService);
+ }));
+ it('should delete a bitstream format', () => {
+ const format = new BitstreamFormat();
+ format.uuid = 'format-uuid';
+ format.id = 'format-id';
+
+ const expected = cold('(b|)', {b: true});
+ const result = service.delete(format);
+
+ expect(result).toBeObservable(expected);
+ });
+ });
+});
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
new file mode 100644
index 0000000000..a5638183c0
--- /dev/null
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -0,0 +1,183 @@
+import { Injectable } from '@angular/core';
+import { DataService } from './data.service';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
+import { createSelector, select, Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { DeleteByIDRequest, FindAllOptions, PostRequest, PutRequest } from './request.models';
+import { Observable } from 'rxjs';
+import { find, map, tap } from 'rxjs/operators';
+import { configureRequest, getResponseFromEntry } from '../shared/operators';
+import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
+import { RestResponse } from '../cache/response.models';
+import { AppState } from '../../app.reducer';
+import { BitstreamFormatRegistryState } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import {
+ BitstreamFormatsRegistryDeselectAction,
+ BitstreamFormatsRegistryDeselectAllAction,
+ BitstreamFormatsRegistrySelectAction
+} from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { hasValue } from '../../shared/empty.util';
+import { RequestEntry } from './request.reducer';
+
+const bitstreamFormatsStateSelector = (state: AppState) => state.bitstreamFormats;
+const selectedBitstreamFormatSelector = createSelector(bitstreamFormatsStateSelector,
+ (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats);
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the bitstreamformats endpoint
+ */
+@Injectable()
+export class BitstreamFormatDataService extends DataService {
+
+ protected linkPath = 'bitstreamformats';
+ protected forceBypassCache = false;
+
+ constructor(
+ protected requestService: RequestService,
+ protected rdbService: RemoteDataBuildService,
+ protected dataBuildService: NormalizedObjectBuildService,
+ protected store: Store,
+ protected objectCache: ObjectCacheService,
+ protected halService: HALEndpointService,
+ protected notificationsService: NotificationsService,
+ protected http: HttpClient,
+ protected comparator: DefaultChangeAnalyzer) {
+ super();
+ }
+
+ /**
+ * Get the endpoint for browsing bitstream formats
+ * @param {FindAllOptions} options
+ * @returns {Observable}
+ */
+ getBrowseEndpoint(options: FindAllOptions = {}, linkPath?: string): Observable {
+ return this.halService.getEndpoint(this.linkPath);
+ }
+
+ /**
+ * Get the endpoint to update an existing bitstream format
+ * @param formatId
+ */
+ public getUpdateEndpoint(formatId: string): Observable {
+ return this.getBrowseEndpoint().pipe(
+ map((endpoint: string) => this.getIDHref(endpoint, formatId))
+ );
+ }
+
+ /**
+ * Get the endpoint to create a new bitstream format
+ */
+ public getCreateEndpoint(): Observable {
+ return this.getBrowseEndpoint();
+ }
+
+ /**
+ * Update an existing bitstreamFormat
+ * @param bitstreamFormat
+ */
+ updateBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable {
+ const requestId = this.requestService.generateRequestId();
+
+ this.getUpdateEndpoint(bitstreamFormat.id).pipe(
+ distinctUntilChanged(),
+ map((endpointURL: string) =>
+ new PutRequest(requestId, endpointURL, bitstreamFormat)),
+ configureRequest(this.requestService)).subscribe();
+
+ return this.requestService.getByUUID(requestId).pipe(
+ getResponseFromEntry()
+ );
+
+ }
+
+ /**
+ * Create a new BitstreamFormat
+ * @param BitstreamFormat
+ */
+ public createBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable {
+ const requestId = this.requestService.generateRequestId();
+
+ this.getCreateEndpoint().pipe(
+ map((endpointURL: string) => {
+ return new PostRequest(requestId, endpointURL, bitstreamFormat);
+ }),
+ configureRequest(this.requestService)
+ ).subscribe();
+
+ return this.requestService.getByUUID(requestId).pipe(
+ getResponseFromEntry()
+ );
+ }
+
+ /**
+ * Clears the cache of the list of BitstreamFormats
+ */
+ public clearBitStreamFormatRequests(): Observable {
+ return this.getBrowseEndpoint().pipe(
+ tap((href: string) => this.requestService.removeByHrefSubstring(href))
+ );
+ }
+
+ /**
+ * Gets all the selected BitstreamFormats from the store
+ */
+ public getSelectedBitstreamFormats(): Observable {
+ return this.store.pipe(select(selectedBitstreamFormatSelector));
+ }
+
+ /**
+ * Adds a BistreamFormat to the selected BitstreamFormats in the store
+ * @param bitstreamFormat
+ */
+ public selectBitstreamFormat(bitstreamFormat: BitstreamFormat) {
+ this.store.dispatch(new BitstreamFormatsRegistrySelectAction(bitstreamFormat));
+ }
+
+ /**
+ * Removes a BistreamFormat from the list of selected BitstreamFormats in the store
+ * @param bitstreamFormat
+ */
+ public deselectBitstreamFormat(bitstreamFormat: BitstreamFormat) {
+ this.store.dispatch(new BitstreamFormatsRegistryDeselectAction(bitstreamFormat));
+ }
+
+ /**
+ * Removes all BitstreamFormats from the list of selected BitstreamFormats in the store
+ */
+ public deselectAllBitstreamFormats() {
+ this.store.dispatch(new BitstreamFormatsRegistryDeselectAllAction());
+ }
+
+ /**
+ * Delete an existing DSpace Object on the server
+ * @param format The DSpace Object to be removed
+ * Return an observable that emits true when the deletion was successful, false when it failed
+ */
+ delete(format: BitstreamFormat): Observable {
+ const requestId = this.requestService.generateRequestId();
+
+ const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
+ map((endpoint: string) => this.getIDHref(endpoint, format.id)));
+
+ hrefObs.pipe(
+ find((href: string) => hasValue(href)),
+ map((href: string) => {
+ const request = new DeleteByIDRequest(requestId, href, format.id);
+ this.requestService.configure(request);
+ })
+ ).subscribe();
+
+ return this.requestService.getByUUID(requestId).pipe(
+ find((request: RequestEntry) => request.completed),
+ map((request: RequestEntry) => request.response.isSuccessful)
+ );
+ }
+}
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index f0d3f63910..f66548cc18 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -6,11 +6,13 @@ import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-servic
import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub';
import { getMockTranslateService } from '../../shared/mocks/mock-translate.service';
import { fakeAsync, tick } from '@angular/core/testing';
-import { ContentSourceRequest, RequestError, UpdateContentSourceRequest } from './request.models';
+import { ContentSourceRequest, GetRequest, RequestError, UpdateContentSourceRequest } from './request.models';
import { ContentSource } from '../shared/content-source.model';
import { of as observableOf } from 'rxjs/internal/observable/of';
import { RequestEntry } from './request.reducer';
import { ErrorResponse, RestResponse } from '../cache/response.models';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
const url = 'fake-url';
const collectionId = 'fake-collection-id';
@@ -21,6 +23,8 @@ describe('CollectionDataService', () => {
let requestService: RequestService;
let translate: TranslateService;
let notificationsService: any;
+ let rdbService: RemoteDataBuildService;
+ let objectCache: ObjectCacheService;
let halService: any;
describe('when the requests are successful', () => {
@@ -57,6 +61,19 @@ describe('CollectionDataService', () => {
expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(UpdateContentSourceRequest), undefined);
}));
});
+
+ describe('getMappedItems', () => {
+ let result;
+
+ beforeEach(() => {
+ result = service.getMappedItems('collection-id');
+ });
+
+ it('should configure a GET request', () => {
+ expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(GetRequest), undefined);
+ });
+ });
+
});
describe('when the requests are unsuccessful', () => {
@@ -99,11 +116,17 @@ describe('CollectionDataService', () => {
*/
function createService(requestEntry$?) {
requestService = getMockRequestService(requestEntry$);
+ rdbService = jasmine.createSpyObj('rdbService', {
+ buildList: jasmine.createSpy('buildList')
+ });
+ objectCache = jasmine.createSpyObj('objectCache', {
+ remove: jasmine.createSpy('remove')
+ });
halService = new HALEndpointServiceStub(url);
notificationsService = new NotificationsServiceStub();
translate = getMockTranslateService();
- service = new CollectionDataService(requestService, null, null, null, null, null, halService, notificationsService, null, null, translate);
+ service = new CollectionDataService(requestService, rdbService, null, null, null, objectCache, halService, notificationsService, null, null, translate);
}
});
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 435bee21b0..94860e5df7 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, take, tap } from 'rxjs/operators';
import { Store } from '@ngrx/store';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -16,7 +16,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
import { Observable } from 'rxjs/internal/Observable';
-import { ContentSourceRequest, FindAllOptions, RestRequest, UpdateContentSourceRequest } from './request.models';
+import { ContentSourceRequest, FindAllOptions, RestRequest, UpdateContentSourceRequest, GetRequest } from './request.models';
import { RemoteData } from './remote-data';
import { PaginatedList } from './paginated-list';
import { ContentSource } from '../shared/content-source.model';
@@ -32,6 +32,12 @@ import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.seriali
import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
import { TranslateService } from '@ngx-translate/core';
+import { SearchParam } from '../cache/models/search-param.model';
+import { DSOResponseParsingService } from './dso-response-parsing.service';
+import { ResponseParsingService } from './parsing.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
@Injectable()
export class CollectionDataService extends ComColDataService {
@@ -56,6 +62,36 @@ export class CollectionDataService extends ComColDataService {
super();
}
+ /**
+ * Get all collections the user is authorized to submit to
+ *
+ * @param options The [[FindAllOptions]] object
+ * @return Observable>>
+ * collection list
+ */
+ getAuthorizedCollection(options: FindAllOptions = {}): Observable>> {
+ const searchHref = 'findAuthorized';
+
+ return this.searchBy(searchHref, options).pipe(
+ filter((collections: RemoteData>) => !collections.isResponsePending));
+ }
+
+ /**
+ * Get all collections the user is authorized to submit to, by community
+ *
+ * @param communityId The community id
+ * @param options The [[FindAllOptions]] object
+ * @return Observable>>
+ * collection list
+ */
+ getAuthorizedCollectionByCommunity(communityId: string, options: FindAllOptions = {}): Observable>> {
+ const searchHref = 'findAuthorizedByCommunity';
+ options.searchParams = [new SearchParam('uuid', communityId)];
+
+ return this.searchBy(searchHref, options).pipe(
+ filter((collections: RemoteData>) => !collections.isResponsePending));
+ }
+
/**
* Find whether there is a collection whom user has authorization to submit to
*
@@ -147,4 +183,46 @@ export class CollectionDataService extends ComColDataService {
})
);
}
+
+ /**
+ * Fetches the endpoint used for mapping items to a collection
+ * @param collectionId The id of the collection to map items to
+ */
+ getMappedItemsEndpoint(collectionId): Observable {
+ return this.halService.getEndpoint(this.linkPath).pipe(
+ map((endpoint: string) => this.getIDHref(endpoint, collectionId)),
+ map((endpoint: string) => `${endpoint}/mappedItems`)
+ );
+ }
+
+ /**
+ * Fetches a list of items that are mapped to a collection
+ * @param collectionId The id of the collection
+ * @param searchOptions Search options to sort or filter out items
+ */
+ getMappedItems(collectionId: string, searchOptions?: PaginatedSearchOptions): Observable>> {
+ const requestUuid = this.requestService.generateRequestId();
+
+ const href$ = this.getMappedItemsEndpoint(collectionId).pipe(
+ isNotEmptyOperator(),
+ distinctUntilChanged(),
+ map((endpoint: string) => hasValue(searchOptions) ? searchOptions.toRestUrl(endpoint) : endpoint)
+ );
+
+ href$.pipe(
+ map((endpoint: string) => {
+ const request = new GetRequest(requestUuid, endpoint);
+ return Object.assign(request, {
+ responseMsToLive: 0,
+ getResponseParser(): GenericConstructor {
+ return DSOResponseParsingService;
+ }
+ });
+ }),
+ configureRequest(this.requestService)
+ ).subscribe();
+
+ return this.rdbService.buildList(href$);
+ }
+
}
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index 3553a63af4..36b8e6b3c5 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -7,7 +7,14 @@ import { CoreState } from '../core.reducers';
import { ItemDataService } from './item-data.service';
import { RequestService } from './request.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions, RestRequest } from './request.models';
+import {
+ DeleteRequest,
+ FindAllOptions,
+ GetRequest,
+ MappedCollectionsRequest,
+ PostRequest,
+ RestRequest
+} from './request.models';
import { ObjectCacheService } from '../cache/object-cache.service';
import { Observable } from 'rxjs';
import { RestResponse } from '../cache/response.models';
@@ -16,12 +23,13 @@ import { NormalizedObjectBuildService } from '../cache/builders/normalized-objec
import { HttpClient } from '@angular/common/http';
import { RequestEntry } from './request.reducer';
import { of as observableOf } from 'rxjs';
+import { getMockRequestService } from '../../shared/mocks/mock-request.service';
describe('ItemDataService', () => {
let scheduler: TestScheduler;
let service: ItemDataService;
let bs: BrowseService;
- const requestService = {
+ const requestService = Object.assign(getMockRequestService(), {
generateRequestId(): string {
return scopeID;
},
@@ -32,9 +40,14 @@ describe('ItemDataService', () => {
const responseCacheEntry = new RequestEntry();
responseCacheEntry.response = new RestResponse(true, 200, 'OK');
return observableOf(responseCacheEntry);
+ },
+ removeByHrefSubstring(href: string) {
+ // Do nothing
}
- } as RequestService;
- const rdbService = {} as RemoteDataBuildService;
+ }) as RequestService;
+ const rdbService = jasmine.createSpyObj('rdbService', {
+ toRemoteDataObservable: observableOf({})
+ });
const store = {} as Store;
const objectCache = {} as ObjectCacheService;
@@ -162,4 +175,32 @@ describe('ItemDataService', () => {
});
});
+ describe('removeMappingFromCollection', () => {
+ let result;
+
+ beforeEach(() => {
+ service = initTestService();
+ spyOn(requestService, 'configure');
+ result = service.removeMappingFromCollection('item-id', 'collection-id');
+ });
+
+ it('should configure a DELETE request', () => {
+ result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(DeleteRequest), undefined));
+ });
+ });
+
+ describe('mapToCollection', () => {
+ let result;
+
+ beforeEach(() => {
+ service = initTestService();
+ spyOn(requestService, 'configure');
+ result = service.mapToCollection('item-id', 'collection-href');
+ });
+
+ it('should configure a POST request', () => {
+ result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest), undefined));
+ });
+ });
+
});
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index f6adbb23c2..de05dad0c1 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -1,8 +1,8 @@
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
+import { distinctUntilChanged, filter, find, map, switchMap, take } from 'rxjs/operators';
import { Injectable } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
-import { isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
import { BrowseService } from '../browse/browse.service';
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
import { CoreState } from '../core.reducers';
@@ -12,14 +12,31 @@ import { URLCombiner } from '../url-combiner/url-combiner';
import { DataService } from './data.service';
import { RequestService } from './request.service';
import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions, PatchRequest, RestRequest } from './request.models';
+import {
+ DeleteRequest,
+ FindAllOptions,
+ MappedCollectionsRequest,
+ PatchRequest,
+ PostRequest, PutRequest,
+ RestRequest
+} from './request.models';
import { ObjectCacheService } from '../cache/object-cache.service';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
-import { configureRequest, getRequestFromRequestHref } from '../shared/operators';
+import {
+ configureRequest,
+ filterSuccessfulResponses,
+ getRequestFromRequestHref,
+ getResponseFromEntry
+} from '../shared/operators';
import { RequestEntry } from './request.reducer';
+import { GenericSuccessResponse, RestResponse } from '../cache/response.models';
+import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { Collection } from '../shared/collection.model';
+import { RemoteData } from './remote-data';
+import { PaginatedList } from './paginated-list';
@Injectable()
export class ItemDataService extends DataService- {
@@ -57,6 +74,80 @@ export class ItemDataService extends DataService
- {
distinctUntilChanged(),);
}
+ /**
+ * Fetches the endpoint used for mapping an item to a collection,
+ * or for fetching all collections the item is mapped to if no collection is provided
+ * @param itemId The item's id
+ * @param collectionId The collection's id (optional)
+ */
+ public getMappedCollectionsEndpoint(itemId: string, collectionId?: string): Observable
{
+ return this.halService.getEndpoint(this.linkPath).pipe(
+ map((endpoint: string) => this.getIDHref(endpoint, itemId)),
+ map((endpoint: string) => `${endpoint}/mappedCollections${collectionId ? `/${collectionId}` : ''}`)
+ );
+ }
+
+ /**
+ * Removes the mapping of an item from a collection
+ * @param itemId The item's id
+ * @param collectionId The collection's id
+ */
+ public removeMappingFromCollection(itemId: string, collectionId: string): Observable {
+ return this.getMappedCollectionsEndpoint(itemId, collectionId).pipe(
+ isNotEmptyOperator(),
+ distinctUntilChanged(),
+ map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
+ configureRequest(this.requestService),
+ switchMap((request: RestRequest) => this.requestService.getByUUID(request.uuid)),
+ getResponseFromEntry()
+ );
+ }
+
+ /**
+ * Maps an item to a collection
+ * @param itemId The item's id
+ * @param collectionHref The collection's self link
+ */
+ public mapToCollection(itemId: string, collectionHref: string): Observable {
+ return this.getMappedCollectionsEndpoint(itemId).pipe(
+ isNotEmptyOperator(),
+ distinctUntilChanged(),
+ map((endpointURL: string) => {
+ const options: HttpOptions = Object.create({});
+ let headers = new HttpHeaders();
+ headers = headers.append('Content-Type', 'text/uri-list');
+ options.headers = headers;
+ return new PostRequest(this.requestService.generateRequestId(), endpointURL, collectionHref, options);
+ }),
+ configureRequest(this.requestService),
+ switchMap((request: RestRequest) => this.requestService.getByUUID(request.uuid)),
+ getResponseFromEntry()
+ );
+ }
+
+ /**
+ * Fetches all collections the item is mapped to
+ * @param itemId The item's id
+ */
+ public getMappedCollections(itemId: string): Observable>> {
+ const request$ = this.getMappedCollectionsEndpoint(itemId).pipe(
+ isNotEmptyOperator(),
+ distinctUntilChanged(),
+ map((endpointURL: string) => new MappedCollectionsRequest(this.requestService.generateRequestId(), endpointURL)),
+ configureRequest(this.requestService)
+ );
+
+ const requestEntry$ = request$.pipe(
+ switchMap((request: RestRequest) => this.requestService.getByHref(request.href))
+ );
+ const payload$ = requestEntry$.pipe(
+ filterSuccessfulResponses(),
+ map((response: GenericSuccessResponse>) => response.payload)
+ );
+
+ return this.rdbService.toRemoteDataObservable(requestEntry$, payload$);
+ }
+
/**
* Get the endpoint for item withdrawal and reinstatement
* @param itemId
@@ -118,4 +209,43 @@ export class ItemDataService extends DataService- {
map((requestEntry: RequestEntry) => requestEntry.response)
);
}
+
+ /**
+ * Get the endpoint to move the item
+ * @param itemId
+ */
+ public getMoveItemEndpoint(itemId: string): Observable
{
+ return this.halService.getEndpoint(this.linkPath).pipe(
+ map((endpoint: string) => this.getIDHref(endpoint, itemId)),
+ map((endpoint: string) => `${endpoint}/owningCollection`)
+ );
+ }
+
+ /**
+ * Move the item to a different owning collection
+ * @param itemId
+ * @param collection
+ */
+ public moveToCollection(itemId: string, collection: Collection): Observable {
+ const options: HttpOptions = Object.create({});
+ let headers = new HttpHeaders();
+ headers = headers.append('Content-Type', 'text/uri-list');
+ options.headers = headers;
+
+ const requestId = this.requestService.generateRequestId();
+ const hrefObs = this.getMoveItemEndpoint(itemId);
+
+ hrefObs.pipe(
+ find((href: string) => hasValue(href)),
+ map((href: string) => {
+ const request = new PutRequest(requestId, href, collection.self, options);
+ this.requestService.configure(request);
+ })
+ ).subscribe();
+
+ return this.requestService.getByUUID(requestId).pipe(
+ find((request: RequestEntry) => request.completed),
+ map((request: RequestEntry) => request.response)
+ );
+ }
}
diff --git a/src/app/core/data/mapped-collections-reponse-parsing.service.ts b/src/app/core/data/mapped-collections-reponse-parsing.service.ts
new file mode 100644
index 0000000000..bf8ed036e3
--- /dev/null
+++ b/src/app/core/data/mapped-collections-reponse-parsing.service.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './request.models';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { PaginatedList } from './paginated-list';
+import { PageInfo } from '../shared/page-info.model';
+import { ErrorResponse, GenericSuccessResponse, RestResponse } from '../cache/response.models';
+
+@Injectable()
+/**
+ * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a GenericSuccessResponse
+ * containing a PaginatedList of mapped collections
+ */
+export class MappedCollectionsReponseParsingService implements ResponseParsingService {
+ parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+ const payload = data.payload;
+
+ if (payload._embedded && payload._embedded.mappedCollections) {
+ const mappedCollections = payload._embedded.mappedCollections;
+ // TODO: When the API supports it, change this to fetch a paginated list, instead of creating static one
+ // Reason: Pagination is currently not supported on the mappedCollections endpoint
+ const paginatedMappedCollections = new PaginatedList(Object.assign(new PageInfo(), {
+ elementsPerPage: mappedCollections.length,
+ totalElements: mappedCollections.length,
+ totalPages: 1,
+ currentPage: 1
+ }), mappedCollections);
+ return new GenericSuccessResponse(paginatedMappedCollections, data.statusCode, data.statusText);
+ } else {
+ return new ErrorResponse(
+ Object.assign(
+ new Error('Unexpected response from mappedCollections endpoint'), data
+ )
+ );
+ }
+ }
+}
diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index 2b96cb378a..3bbb3960b6 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -107,6 +107,27 @@ export class ObjectUpdatesService {
}))
}
+ /**
+ * Method that combines the state's updates (excluding updates that aren't part of the initialFields) with
+ * the initial values (when there's no update) to create a FieldUpdates object
+ * @param url The URL of the page for which the FieldUpdates should be requested
+ * @param initialFields The initial values of the fields
+ */
+ getFieldUpdatesExclusive(url: string, initialFields: Identifiable[]): Observable {
+ const objectUpdates = this.getObjectEntry(url);
+ return objectUpdates.pipe(map((objectEntry) => {
+ const fieldUpdates: FieldUpdates = {};
+ for (const object of initialFields) {
+ let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
+ if (isEmpty(fieldUpdate)) {
+ fieldUpdate = { field: object, changeType: undefined };
+ }
+ fieldUpdates[object.uuid] = fieldUpdate;
+ }
+ return fieldUpdates;
+ }))
+ }
+
/**
* Method to check if a specific field is currently editable in the store
* @param url The URL of the page on which the field resides
diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
new file mode 100644
index 0000000000..31513bb779
--- /dev/null
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -0,0 +1,156 @@
+import { RelationshipService } from './relationship.service';
+import { RequestService } from './request.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/mock-remote-data-build.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { RequestEntry } from './request.reducer';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { Relationship } from '../shared/item-relationships/relationship.model';
+import { RemoteData } from './remote-data';
+import { getMockRequestService } from '../../shared/mocks/mock-request.service';
+import { Item } from '../shared/item.model';
+import { PaginatedList } from './paginated-list';
+import { PageInfo } from '../shared/page-info.model';
+import { DeleteRequest } from './request.models';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { Observable } from 'rxjs/internal/Observable';
+
+describe('RelationshipService', () => {
+ let service: RelationshipService;
+ let requestService: RequestService;
+
+ const restEndpointURL = 'https://rest.api/';
+ const relationshipsEndpointURL = `${restEndpointURL}/relationships`;
+ const halService: any = new HALEndpointServiceStub(restEndpointURL);
+ const rdbService = getMockRemoteDataBuildService();
+ const objectCache = Object.assign({
+ /* tslint:disable:no-empty */
+ remove: () => {}
+ /* tslint:enable:no-empty */
+ }) as ObjectCacheService;
+
+ const relationshipType = Object.assign(new RelationshipType(), {
+ id: '1',
+ uuid: '1',
+ leftwardType: 'isAuthorOfPublication',
+ rightwardType: 'isPublicationOfAuthor'
+ });
+
+ const relationship1 = Object.assign(new Relationship(), {
+ self: relationshipsEndpointURL + '/2',
+ id: '2',
+ uuid: '2',
+ relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+ });
+ const relationship2 = Object.assign(new Relationship(), {
+ self: relationshipsEndpointURL + '/3',
+ id: '3',
+ uuid: '3',
+ relationshipType: observableOf(new RemoteData(false, false, true, undefined, relationshipType))
+ });
+
+ const relationships = [ relationship1, relationship2 ];
+
+ const item = Object.assign(new Item(), {
+ self: 'fake-item-url/publication',
+ id: 'publication',
+ uuid: 'publication',
+ relationships: observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(new PageInfo(), relationships)))
+ });
+
+ const relatedItem1 = Object.assign(new Item(), {
+ id: 'author1',
+ uuid: 'author1'
+ });
+ const relatedItem2 = Object.assign(new Item(), {
+ id: 'author2',
+ uuid: 'author2'
+ });
+ relationship1.leftItem = getRemotedataObservable(relatedItem1);
+ relationship1.rightItem = getRemotedataObservable(item);
+ relationship2.leftItem = getRemotedataObservable(relatedItem2);
+ relationship2.rightItem = getRemotedataObservable(item);
+ const relatedItems = [relatedItem1, relatedItem2];
+
+ const itemService = jasmine.createSpyObj('itemService', {
+ findById: (uuid) => new RemoteData(false, false, true, undefined, relatedItems.filter((relatedItem) => relatedItem.id === uuid)[0])
+ });
+
+ function initTestService() {
+ return new RelationshipService(
+ requestService,
+ halService,
+ rdbService,
+ itemService,
+ objectCache
+ );
+ }
+
+ const getRequestEntry$ = (successful: boolean) => {
+ return observableOf({
+ response: { isSuccessful: successful, payload: relationships } as any
+ } as RequestEntry)
+ };
+
+ beforeEach(() => {
+ requestService = getMockRequestService(getRequestEntry$(true));
+ service = initTestService();
+ });
+
+ describe('deleteRelationship', () => {
+ beforeEach(() => {
+ spyOn(service, 'findById').and.returnValue(getRemotedataObservable(relationship1));
+ spyOn(objectCache, 'remove');
+ service.deleteRelationship(relationships[0].uuid).subscribe();
+ });
+
+ it('should send a DeleteRequest', () => {
+ const expected = new DeleteRequest(requestService.generateRequestId(), relationshipsEndpointURL + '/' + relationship1.uuid);
+ expect(requestService.configure).toHaveBeenCalledWith(expected, undefined);
+ });
+
+ it('should clear the related items their cache', () => {
+ expect(objectCache.remove).toHaveBeenCalledWith(relatedItem1.self);
+ expect(objectCache.remove).toHaveBeenCalledWith(item.self);
+ expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(relatedItem1.self);
+ expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(item.self);
+ });
+ });
+
+ describe('getItemRelationshipsArray', () => {
+ it('should return the item\'s relationships in the form of an array', () => {
+ service.getItemRelationshipsArray(item).subscribe((result) => {
+ expect(result).toEqual(relationships);
+ });
+ });
+ });
+
+ describe('getItemRelationshipLabels', () => {
+ it('should return the correct labels', () => {
+ service.getItemRelationshipLabels(item).subscribe((result) => {
+ expect(result).toEqual([relationshipType.rightwardType]);
+ });
+ });
+ });
+
+ describe('getRelatedItems', () => {
+ it('should return the related items', () => {
+ service.getRelatedItems(item).subscribe((result) => {
+ expect(result).toEqual(relatedItems);
+ });
+ });
+ });
+
+ describe('getRelatedItemsByLabel', () => {
+ it('should return the related items by label', () => {
+ service.getRelatedItemsByLabel(item, relationshipType.rightwardType).subscribe((result) => {
+ expect(result).toEqual(relatedItems);
+ });
+ });
+ })
+
+});
+
+function getRemotedataObservable(obj: any): Observable> {
+ return observableOf(new RemoteData(false, false, true, undefined, obj));
+}
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
new file mode 100644
index 0000000000..b07e4b714c
--- /dev/null
+++ b/src/app/core/data/relationship.service.ts
@@ -0,0 +1,235 @@
+import { Injectable } from '@angular/core';
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/empty.util';
+import { distinctUntilChanged, filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
+import {
+ configureRequest,
+ filterSuccessfulResponses,
+ getRemoteDataPayload, getResponseFromEntry,
+ getSucceededRemoteData
+} from '../shared/operators';
+import { DeleteRequest, RestRequest } from './request.models';
+import { Observable } from 'rxjs/internal/Observable';
+import { RestResponse } from '../cache/response.models';
+import { Item } from '../shared/item.model';
+import { Relationship } from '../shared/item-relationships/relationship.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { RemoteData } from './remote-data';
+import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
+import { zip as observableZip } from 'rxjs';
+import { PaginatedList } from './paginated-list';
+import { ItemDataService } from './item-data.service';
+import {
+ compareArraysUsingIds, filterRelationsByTypeLabel,
+ relationsToItems
+} from '../../+item-page/simple/item-types/shared/item-relationships-utils';
+import { ObjectCacheService } from '../cache/object-cache.service';
+
+/**
+ * The service handling all relationship requests
+ */
+@Injectable()
+export class RelationshipService {
+ protected linkPath = 'relationships';
+
+ constructor(protected requestService: RequestService,
+ protected halService: HALEndpointService,
+ protected rdbService: RemoteDataBuildService,
+ protected itemService: ItemDataService,
+ protected objectCache: ObjectCacheService) {
+ }
+
+ /**
+ * Get the endpoint for a relationship by ID
+ * @param uuid
+ */
+ getRelationshipEndpoint(uuid: string) {
+ return this.halService.getEndpoint(this.linkPath).pipe(
+ map((href: string) => `${href}/${uuid}`)
+ );
+ }
+
+ /**
+ * Find a relationship by its UUID
+ * @param uuid
+ */
+ findById(uuid: string): Observable> {
+ const href$ = this.getRelationshipEndpoint(uuid);
+ return this.rdbService.buildSingle(href$);
+ }
+
+ /**
+ * Send a delete request for a relationship by ID
+ * @param uuid
+ */
+ deleteRelationship(uuid: string): Observable {
+ return this.getRelationshipEndpoint(uuid).pipe(
+ isNotEmptyOperator(),
+ distinctUntilChanged(),
+ map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
+ configureRequest(this.requestService),
+ switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
+ getResponseFromEntry(),
+ tap(() => this.clearRelatedCache(uuid))
+ );
+ }
+
+ /**
+ * Get a combined observable containing an array of all relationships in an item, as well as an array of the relationships their types
+ * This is used for easier access of a relationship's type because they exist as observables
+ * @param item
+ */
+ getItemResolvedRelsAndTypes(item: Item): Observable<[Relationship[], RelationshipType[]]> {
+ return observableCombineLatest(
+ this.getItemRelationshipsArray(item),
+ this.getItemRelationshipTypesArray(item)
+ );
+ }
+
+ /**
+ * Get a combined observable containing an array of all the item's relationship's left- and right-side items, as well as an array of the relationships their types
+ * This is used for easier access of a relationship's type and left and right items because they exist as observables
+ * @param item
+ */
+ getItemResolvedRelatedItemsAndTypes(item: Item): Observable<[Item[], Item[], RelationshipType[]]> {
+ return observableCombineLatest(
+ this.getItemLeftRelatedItemArray(item),
+ this.getItemRightRelatedItemArray(item),
+ this.getItemRelationshipTypesArray(item)
+ );
+ }
+
+ /**
+ * Get a combined observable containing an array of all the item's relationship's left- and right-side items, as well as an array of the relationships themselves
+ * This is used for easier access of the relationship and their left and right items because they exist as observables
+ * @param item
+ */
+ getItemResolvedRelatedItemsAndRelationships(item: Item): Observable<[Item[], Item[], Relationship[]]> {
+ return observableCombineLatest(
+ this.getItemLeftRelatedItemArray(item),
+ this.getItemRightRelatedItemArray(item),
+ this.getItemRelationshipsArray(item)
+ );
+ }
+
+ /**
+ * Get an item their relationships in the form of an array
+ * @param item
+ */
+ getItemRelationshipsArray(item: Item): Observable {
+ return item.relationships.pipe(
+ getSucceededRemoteData(),
+ getRemoteDataPayload(),
+ map((rels: PaginatedList) => rels.page),
+ hasValueOperator(),
+ distinctUntilChanged(compareArraysUsingIds())
+ );
+ }
+
+ /**
+ * Get an item their relationship types in the form of an array
+ * @param item
+ */
+ getItemRelationshipTypesArray(item: Item): Observable {
+ return this.getItemRelationshipsArray(item).pipe(
+ flatMap((rels: Relationship[]) =>
+ observableZip(...rels.map((rel: Relationship) => rel.relationshipType)).pipe(
+ map(([...arr]: Array>) => arr.map((d: RemoteData) => d.payload).filter((type) => hasValue(type))),
+ filter((arr) => arr.length === rels.length)
+ )
+ ),
+ distinctUntilChanged(compareArraysUsingIds())
+ );
+ }
+
+ /**
+ * Get an item his relationship's left-side related items in the form of an array
+ * @param item
+ */
+ getItemLeftRelatedItemArray(item: Item): Observable {
+ return this.getItemRelationshipsArray(item).pipe(
+ flatMap((rels: Relationship[]) => observableZip(...rels.map((rel: Relationship) => rel.leftItem)).pipe(
+ map(([...arr]: Array>) => arr.map((rd: RemoteData- ) => rd.payload).filter((i) => hasValue(i))),
+ filter((arr) => arr.length === rels.length)
+ )),
+ distinctUntilChanged(compareArraysUsingIds())
+ );
+ }
+
+ /**
+ * Get an item his relationship's right-side related items in the form of an array
+ * @param item
+ */
+ getItemRightRelatedItemArray(item: Item): Observable
{
+ return this.getItemRelationshipsArray(item).pipe(
+ flatMap((rels: Relationship[]) => observableZip(...rels.map((rel: Relationship) => rel.rightItem)).pipe(
+ map(([...arr]: Array>) => arr.map((rd: RemoteData- ) => rd.payload).filter((i) => hasValue(i))),
+ filter((arr) => arr.length === rels.length)
+ )),
+ distinctUntilChanged(compareArraysUsingIds())
+ );
+ }
+
+ /**
+ * Get an array of an item their unique relationship type's labels
+ * The array doesn't contain any duplicate labels
+ * @param item
+ */
+ getItemRelationshipLabels(item: Item): Observable
{
+ return this.getItemResolvedRelatedItemsAndTypes(item).pipe(
+ map(([leftItems, rightItems, relTypesCurrentPage]) => {
+ return relTypesCurrentPage.map((type, index) => {
+ if (leftItems[index].uuid === item.uuid) {
+ return type.leftwardType;
+ } else {
+ return type.rightwardType;
+ }
+ });
+ }),
+ map((labels: string[]) => Array.from(new Set(labels)))
+ )
+ }
+
+ /**
+ * Resolve a given item's relationships into related items and return the items as an array
+ * @param item
+ */
+ getRelatedItems(item: Item): Observable {
+ return this.getItemRelationshipsArray(item).pipe(
+ relationsToItems(item.uuid)
+ );
+ }
+
+ /**
+ * Resolve a given item's relationships into related items, filtered by a relationship label
+ * and return the items as an array
+ * @param item
+ * @param label
+ */
+ getRelatedItemsByLabel(item: Item, label: string): Observable {
+ return this.getItemResolvedRelsAndTypes(item).pipe(
+ filterRelationsByTypeLabel(label),
+ relationsToItems(item.uuid)
+ );
+ }
+
+ /**
+ * Clear object and request caches of the items related to a relationship (left and right items)
+ * @param uuid
+ */
+ clearRelatedCache(uuid: string) {
+ this.findById(uuid).pipe(
+ getSucceededRemoteData(),
+ flatMap((rd: RemoteData) => observableCombineLatest(rd.payload.leftItem.pipe(getSucceededRemoteData()), rd.payload.rightItem.pipe(getSucceededRemoteData()))),
+ take(1)
+ ).subscribe(([leftItem, rightItem]) => {
+ this.objectCache.remove(leftItem.payload.self);
+ this.objectCache.remove(rightItem.payload.self);
+ this.requestService.removeByHrefSubstring(leftItem.payload.self);
+ this.requestService.removeByHrefSubstring(rightItem.payload.self);
+ });
+ }
+
+}
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index f25b084af7..18389a98fd 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -19,6 +19,7 @@ import { MetadatafieldParsingService } from './metadatafield-parsing.service';
import { URLCombiner } from '../url-combiner/url-combiner';
import { TaskResponseParsingService } from '../tasks/task-response-parsing.service';
import { ContentSourceResponseParsingService } from './content-source-response-parsing.service';
+import { MappedCollectionsReponseParsingService } from './mapped-collections-reponse-parsing.service';
/* tslint:disable:max-classes-per-file */
@@ -186,6 +187,17 @@ export class BrowseItemsRequest extends GetRequest {
}
}
+/**
+ * Request to fetch the mapped collections of an item
+ */
+export class MappedCollectionsRequest extends GetRequest {
+ public responseMsToLive = 10000;
+
+ getResponseParser(): GenericConstructor {
+ return MappedCollectionsReponseParsingService;
+ }
+}
+
export class ConfigRequest extends GetRequest {
constructor(uuid: string, href: string, public options?: HttpOptions) {
super(uuid, href, null, options);
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 83071382ed..0980d48537 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -3,7 +3,7 @@ import { HttpHeaders } from '@angular/common/http';
import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
import { Observable, race as observableRace } from 'rxjs';
-import { filter, find, map, mergeMap, take } from 'rxjs/operators';
+import { filter, map, mergeMap, take } from 'rxjs/operators';
import { cloneDeep, remove } from 'lodash';
import { AppState } from '../../app.reducer';
@@ -65,8 +65,7 @@ const uuidsFromHrefSubstringSelector =
const getUuidsFromHrefSubstring = (state: IndexState, href: string): string[] => {
let result = [];
if (isNotEmpty(state)) {
- result = Object.values(state)
- .filter((value: string) => value.startsWith(href));
+ result = Object.keys(state).filter((key) => key.startsWith(href)).map((key) => state[key]);
}
return result;
};
@@ -263,12 +262,13 @@ export class RequestService {
*/
private clearRequestsOnTheirWayToTheStore(request: GetRequest) {
this.getByHref(request.href).pipe(
- find((re: RequestEntry) => hasValue(re)))
- .subscribe((re: RequestEntry) => {
- if (!re.responsePending) {
- remove(this.requestsOnTheirWayToTheStore, (item) => item === request.href);
- }
- });
+ filter((re: RequestEntry) => hasValue(re)),
+ take(1)
+ ).subscribe((re: RequestEntry) => {
+ if (!re.responsePending) {
+ remove(this.requestsOnTheirWayToTheStore, (item) => item === request.href);
+ }
+ });
}
/**
@@ -315,4 +315,15 @@ export class RequestService {
return result;
}
+ /**
+ * Create an observable that emits a new value whenever the availability of the cached request changes.
+ * The value it emits is a boolean stating if the request exists in cache or not.
+ * @param href The href of the request to observe
+ */
+ hasByHrefObservable(href: string): Observable {
+ return this.getByHref(href).pipe(
+ map((requestEntry: RequestEntry) => this.isValid(requestEntry))
+ );
+ }
+
}
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 309dfd8890..2b1cf4ffc1 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -2,7 +2,6 @@ import {
catchError,
distinctUntilKeyChanged,
filter,
- find,
first,
map,
take
diff --git a/src/app/core/registry/mock-bitstream-format.model.ts b/src/app/core/registry/mock-bitstream-format.model.ts
deleted file mode 100644
index f5811e367c..0000000000
--- a/src/app/core/registry/mock-bitstream-format.model.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export class BitstreamFormat {
- shortDescription: string;
- description: string;
- mimetype: string;
- supportLevel: number;
- internal: boolean;
- extensions: string;
-}
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index 47e306d624..455a8043da 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -12,7 +12,6 @@ import { PageInfo } from '../shared/page-info.model';
import { getMockRequestService } from '../../shared/mocks/mock-request.service';
import {
- RegistryBitstreamformatsSuccessResponse,
RegistryMetadatafieldsSuccessResponse,
RegistryMetadataschemasSuccessResponse,
RestResponse
@@ -20,7 +19,6 @@ import {
import { Component } from '@angular/core';
import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
import { map } from 'rxjs/operators';
import { Store, StoreModule } from '@ngrx/store';
import { MockStore } from '../../shared/testing/mock-store';
@@ -44,7 +42,7 @@ import { MetadataSchema } from '../metadata/metadata-schema.model';
import { MetadataField } from '../metadata/metadata-field.model';
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
-@Component({ template: '' })
+@Component({template: ''})
class DummyComponent {
}
@@ -127,7 +125,7 @@ describe('RegistryService', () => {
toRemoteDataObservable: (requestEntryObs: Observable, payloadObs: Observable) => {
return observableCombineLatest(requestEntryObs,
payloadObs).pipe(map(([req, pay]) => {
- return { req, pay };
+ return {req, pay};
})
);
},
@@ -143,11 +141,11 @@ describe('RegistryService', () => {
DummyComponent
],
providers: [
- { provide: RequestService, useValue: getMockRequestService() },
- { provide: RemoteDataBuildService, useValue: rdbStub },
- { provide: HALEndpointService, useValue: halServiceStub },
- { provide: Store, useClass: MockStore },
- { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+ {provide: RequestService, useValue: getMockRequestService()},
+ {provide: RemoteDataBuildService, useValue: rdbStub},
+ {provide: HALEndpointService, useValue: halServiceStub},
+ {provide: Store, useClass: MockStore},
+ {provide: NotificationsService, useValue: new NotificationsServiceStub()},
RegistryService
]
});
@@ -162,7 +160,7 @@ describe('RegistryService', () => {
page: pageInfo
});
const response = new RegistryMetadataschemasSuccessResponse(queryResponse, 200, 'OK', pageInfo);
- const responseEntry = Object.assign(new RequestEntry(), { response: response });
+ const responseEntry = Object.assign(new RequestEntry(), {response: response});
beforeEach(() => {
(registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
@@ -191,7 +189,7 @@ describe('RegistryService', () => {
page: pageInfo
});
const response = new RegistryMetadataschemasSuccessResponse(queryResponse, 200, 'OK', pageInfo);
- const responseEntry = Object.assign(new RequestEntry(), { response: response });
+ const responseEntry = Object.assign(new RequestEntry(), {response: response});
beforeEach(() => {
(registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
@@ -220,7 +218,7 @@ describe('RegistryService', () => {
page: pageInfo
});
const response = new RegistryMetadatafieldsSuccessResponse(queryResponse, 200, 'OK', pageInfo);
- const responseEntry = Object.assign(new RequestEntry(), { response: response });
+ const responseEntry = Object.assign(new RequestEntry(), {response: response});
beforeEach(() => {
(registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
@@ -243,35 +241,6 @@ describe('RegistryService', () => {
});
});
- describe('when requesting bitstreamformats', () => {
- const queryResponse = Object.assign(new RegistryBitstreamformatsResponse(), {
- bitstreamformats: mockFieldsList,
- page: pageInfo
- });
- const response = new RegistryBitstreamformatsSuccessResponse(queryResponse, 200, 'OK', pageInfo);
- const responseEntry = Object.assign(new RequestEntry(), { response: response });
-
- beforeEach(() => {
- (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
- /* tslint:disable:no-empty */
- registryService.getBitstreamFormats(pagination).subscribe((value) => {
- });
- /* tslint:enable:no-empty */
- });
-
- it('should call getEndpoint on the halService', () => {
- expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
- });
-
- it('should send out the request on the request service', () => {
- expect((registryService as any).requestService.configure).toHaveBeenCalled();
- });
-
- it('should call getByHref on the request service with the correct request url', () => {
- expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(endpointWithParams);
- });
- });
-
describe('when dispatching to the store', () => {
beforeEach(() => {
spyOn(mockStore, 'dispatch');
@@ -284,7 +253,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryEditSchemaAction with the correct schema', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryEditSchemaAction(mockSchemasList[0]));
- })
+ });
});
describe('when calling cancelEditMetadataSchema', () => {
@@ -294,7 +263,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryCancelSchemaAction', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryCancelSchemaAction());
- })
+ });
});
describe('when calling selectMetadataSchema', () => {
@@ -304,7 +273,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistrySelectSchemaAction with the correct schema', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistrySelectSchemaAction(mockSchemasList[0]));
- })
+ });
});
describe('when calling deselectMetadataSchema', () => {
@@ -314,7 +283,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryDeselectSchemaAction with the correct schema', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectSchemaAction(mockSchemasList[0]));
- })
+ });
});
describe('when calling deselectAllMetadataSchema', () => {
@@ -324,7 +293,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryDeselectAllSchemaAction', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectAllSchemaAction());
- })
+ });
});
describe('when calling editMetadataField', () => {
@@ -334,7 +303,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryEditFieldAction with the correct Field', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryEditFieldAction(mockFieldsList[0]));
- })
+ });
});
describe('when calling cancelEditMetadataField', () => {
@@ -344,7 +313,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryCancelFieldAction', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryCancelFieldAction());
- })
+ });
});
describe('when calling selectMetadataField', () => {
@@ -354,7 +323,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistrySelectFieldAction with the correct Field', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistrySelectFieldAction(mockFieldsList[0]));
- })
+ });
});
describe('when calling deselectMetadataField', () => {
@@ -364,7 +333,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryDeselectFieldAction with the correct Field', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectFieldAction(mockFieldsList[0]));
- })
+ });
});
describe('when calling deselectAllMetadataField', () => {
@@ -374,7 +343,7 @@ describe('RegistryService', () => {
it('should dispatch a MetadataRegistryDeselectAllFieldAction', () => {
expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectAllFieldAction());
- })
+ });
});
});
@@ -417,7 +386,7 @@ describe('RegistryService', () => {
result.subscribe((response: RestResponse) => {
expect(response.isSuccessful).toBe(true);
});
- })
+ });
});
describe('when deleteMetadataField is called', () => {
@@ -431,7 +400,7 @@ describe('RegistryService', () => {
result.subscribe((response: RestResponse) => {
expect(response.isSuccessful).toBe(true);
});
- })
+ });
});
describe('when clearMetadataSchemaRequests is called', () => {
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index d816c5eab8..206426588e 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -3,13 +3,13 @@ import { Injectable } from '@angular/core';
import { RemoteData } from '../data/remote-data';
import { PaginatedList } from '../data/paginated-list';
import { PageInfo } from '../shared/page-info.model';
-import { BitstreamFormat } from './mock-bitstream-format.model';
import {
CreateMetadataFieldRequest,
CreateMetadataSchemaRequest,
DeleteRequest,
GetRequest,
- RestRequest, UpdateMetadataFieldRequest,
+ RestRequest,
+ UpdateMetadataFieldRequest,
UpdateMetadataSchemaRequest
} from '../data/request.models';
import { GenericConstructor } from '../shared/generic-constructor';
@@ -19,24 +19,19 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
import { RequestService } from '../data/request.service';
import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
import {
- ErrorResponse, MetadatafieldSuccessResponse, MetadataschemaSuccessResponse,
- RegistryBitstreamformatsSuccessResponse,
+ MetadatafieldSuccessResponse,
+ MetadataschemaSuccessResponse,
RegistryMetadatafieldsSuccessResponse,
- RegistryMetadataschemasSuccessResponse, RestResponse
+ RegistryMetadataschemasSuccessResponse,
+ RestResponse
} from '../cache/response.models';
import { HALEndpointService } from '../shared/hal-endpoint.service';
import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { hasValue, hasNoValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
import { URLCombiner } from '../url-combiner/url-combiner';
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service';
-import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
-import {
- configureRequest,
- getResponseFromEntry,
- getSucceededRemoteData
-} from '../shared/operators';
+import { configureRequest, getResponseFromEntry } from '../shared/operators';
import { createSelector, select, Store } from '@ngrx/store';
import { AppState } from '../../app.reducer';
import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
@@ -52,9 +47,8 @@ import {
MetadataRegistrySelectFieldAction,
MetadataRegistrySelectSchemaAction
} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { distinctUntilChanged, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
+import { distinctUntilChanged, flatMap, map, take, tap } from 'rxjs/operators';
import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { ResourceType } from '../shared/resource-type';
import { NormalizedMetadataSchema } from '../metadata/normalized-metadata-schema.model';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
@@ -79,7 +73,8 @@ export class RegistryService {
private metadataSchemasPath = 'metadataschemas';
private metadataFieldsPath = 'metadatafields';
- private bitstreamFormatsPath = 'bitstreamformats';
+
+ // private bitstreamFormatsPath = 'bitstreamformats';
constructor(protected requestService: RequestService,
private rdb: RemoteDataBuildService,
@@ -197,7 +192,7 @@ export class RegistryService {
*/
public getAllMetadataFields(pagination?: PaginationComponentOptions): Observable>> {
if (hasNoValue(pagination)) {
- pagination = { currentPage: 1, pageSize: 10000 } as any;
+ pagination = {currentPage: 1, pageSize: 10000} as any;
}
const requestObs = this.getMetadataFieldsRequestObs(pagination);
@@ -231,41 +226,7 @@ export class RegistryService {
return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
}
- /**
- * Retrieves all bitstream formats
- * @param pagination The pagination info used to retrieve the bitstream formats
- */
- public getBitstreamFormats(pagination: PaginationComponentOptions): Observable>> {
- const requestObs = this.getBitstreamFormatsRequestObs(pagination);
-
- const requestEntryObs = requestObs.pipe(
- flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
- );
-
- const rbrObs: Observable = requestEntryObs.pipe(
- getResponseFromEntry(),
- map((response: RegistryBitstreamformatsSuccessResponse) => response.bitstreamformatsResponse)
- );
-
- const bitstreamformatsObs: Observable = rbrObs.pipe(
- map((rbr: RegistryBitstreamformatsResponse) => rbr.bitstreamformats)
- );
-
- const pageInfoObs: Observable = requestEntryObs.pipe(
- getResponseFromEntry(),
- map((response: RegistryBitstreamformatsSuccessResponse) => response.pageInfo)
- );
-
- const payloadObs = observableCombineLatest(bitstreamformatsObs, pageInfoObs).pipe(
- map(([bitstreamformats, pageInfo]) => {
- return new PaginatedList(pageInfo, bitstreamformats);
- })
- );
-
- return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
- }
-
- private getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable {
+ public getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable {
return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
map((url: string) => {
const args: string[] = [];
@@ -327,30 +288,6 @@ export class RegistryService {
);
}
- private getBitstreamFormatsRequestObs(pagination: PaginationComponentOptions): Observable {
- return this.halService.getEndpoint(this.bitstreamFormatsPath).pipe(
- map((url: string) => {
- const args: string[] = [];
- args.push(`size=${pagination.pageSize}`);
- args.push(`page=${pagination.currentPage - 1}`);
- if (isNotEmpty(args)) {
- url = new URLCombiner(url, `?${args.join('&')}`).toString();
- }
- const request = new GetRequest(this.requestService.generateRequestId(), url);
- return Object.assign(request, {
- getResponseParser(): GenericConstructor {
- return RegistryBitstreamformatsResponseParsingService;
- }
- });
- }),
- tap((request: RestRequest) => this.requestService.configure(request)),
- );
- }
-
- /**
- * Method to start editing a metadata schema, dispatches an edit schema action
- * @param schema The schema that's being edited
- */
public editMetadataSchema(schema: MetadataSchema) {
this.store.dispatch(new MetadataRegistryEditSchemaAction(schema));
}
@@ -374,7 +311,7 @@ export class RegistryService {
* @param schema The schema that's being selected
*/
public selectMetadataSchema(schema: MetadataSchema) {
- this.store.dispatch(new MetadataRegistrySelectSchemaAction(schema))
+ this.store.dispatch(new MetadataRegistrySelectSchemaAction(schema));
}
/**
@@ -382,14 +319,14 @@ export class RegistryService {
* @param schema The schema that's it being deselected
*/
public deselectMetadataSchema(schema: MetadataSchema) {
- this.store.dispatch(new MetadataRegistryDeselectSchemaAction(schema))
+ this.store.dispatch(new MetadataRegistryDeselectSchemaAction(schema));
}
/**
* Method to deselect all currently selected metadata schema, dispatches a deselect all schema action
*/
public deselectAllMetadataSchema() {
- this.store.dispatch(new MetadataRegistryDeselectAllSchemaAction())
+ this.store.dispatch(new MetadataRegistryDeselectAllSchemaAction());
}
/**
@@ -423,20 +360,20 @@ export class RegistryService {
* @param field The field that's being selected
*/
public selectMetadataField(field: MetadataField) {
- this.store.dispatch(new MetadataRegistrySelectFieldAction(field))
+ this.store.dispatch(new MetadataRegistrySelectFieldAction(field));
}
/**
* Method to deselect a metadata field, dispatches a deselect field action
* @param field The field that's it being deselected
*/
public deselectMetadataField(field: MetadataField) {
- this.store.dispatch(new MetadataRegistryDeselectFieldAction(field))
+ this.store.dispatch(new MetadataRegistryDeselectFieldAction(field));
}
/**
* Method to deselect all currently selected metadata fields, dispatches a deselect all field action
*/
public deselectAllMetadataField() {
- this.store.dispatch(new MetadataRegistryDeselectAllFieldAction())
+ this.store.dispatch(new MetadataRegistryDeselectAllFieldAction());
}
/**
@@ -494,7 +431,7 @@ export class RegistryService {
this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
}
} else {
- this.showNotifications(true, isUpdate, false, { prefix: schema.prefix });
+ this.showNotifications(true, isUpdate, false, {prefix: schema.prefix});
return response;
}
}),
@@ -521,7 +458,7 @@ export class RegistryService {
public clearMetadataSchemaRequests(): Observable {
return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
tap((href: string) => this.requestService.removeByHrefSubstring(href))
- )
+ );
}
/**
@@ -571,7 +508,7 @@ export class RegistryService {
}
} else {
const fieldString = `${field.schema.prefix}.${field.element}${field.qualifier ? `.${field.qualifier}` : ''}`;
- this.showNotifications(true, isUpdate, true, { field: fieldString });
+ this.showNotifications(true, isUpdate, true, {field: fieldString});
return response;
}
}),
@@ -597,7 +534,7 @@ export class RegistryService {
public clearMetadataFieldRequests(): Observable {
return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
tap((href: string) => this.requestService.removeByHrefSubstring(href))
- )
+ );
}
private delete(path: string, id: number): Observable {
@@ -633,9 +570,9 @@ export class RegistryService {
);
messages.subscribe(([head, content]) => {
if (success) {
- this.notificationsService.success(head, content)
+ this.notificationsService.success(head, content);
} else {
- this.notificationsService.error(head, content)
+ this.notificationsService.error(head, content);
}
});
}
diff --git a/src/app/shared/services/api.service.ts b/src/app/core/services/api.service.ts
similarity index 100%
rename from src/app/shared/services/api.service.ts
rename to src/app/core/services/api.service.ts
diff --git a/src/app/shared/services/client-cookie.service.ts b/src/app/core/services/client-cookie.service.ts
similarity index 100%
rename from src/app/shared/services/client-cookie.service.ts
rename to src/app/core/services/client-cookie.service.ts
diff --git a/src/app/shared/services/cookie.service.spec.ts b/src/app/core/services/cookie.service.spec.ts
similarity index 100%
rename from src/app/shared/services/cookie.service.spec.ts
rename to src/app/core/services/cookie.service.spec.ts
diff --git a/src/app/shared/services/cookie.service.ts b/src/app/core/services/cookie.service.ts
similarity index 100%
rename from src/app/shared/services/cookie.service.ts
rename to src/app/core/services/cookie.service.ts
diff --git a/src/app/shared/services/route.actions.ts b/src/app/core/services/route.actions.ts
similarity index 100%
rename from src/app/shared/services/route.actions.ts
rename to src/app/core/services/route.actions.ts
diff --git a/src/app/shared/services/route.effects.ts b/src/app/core/services/route.effects.ts
similarity index 100%
rename from src/app/shared/services/route.effects.ts
rename to src/app/core/services/route.effects.ts
diff --git a/src/app/shared/services/route.reducer.ts b/src/app/core/services/route.reducer.ts
similarity index 100%
rename from src/app/shared/services/route.reducer.ts
rename to src/app/core/services/route.reducer.ts
diff --git a/src/app/shared/services/route.service.spec.ts b/src/app/core/services/route.service.spec.ts
similarity index 97%
rename from src/app/shared/services/route.service.spec.ts
rename to src/app/core/services/route.service.spec.ts
index c6003521a7..ae31f28384 100644
--- a/src/app/shared/services/route.service.spec.ts
+++ b/src/app/core/services/route.service.spec.ts
@@ -6,9 +6,9 @@ import { Store } from '@ngrx/store';
import { getTestScheduler, hot } from 'jasmine-marbles';
import { RouteService } from './route.service';
-import { MockRouter } from '../mocks/mock-router';
+import { MockRouter } from '../../shared/mocks/mock-router';
import { TestScheduler } from 'rxjs/testing';
-import { AddUrlToHistoryAction } from '../history/history.actions';
+import { AddUrlToHistoryAction } from '../../shared/history/history.actions';
describe('RouteService', () => {
let scheduler: TestScheduler;
diff --git a/src/app/shared/services/route.service.ts b/src/app/core/services/route.service.ts
similarity index 95%
rename from src/app/shared/services/route.service.ts
rename to src/app/core/services/route.service.ts
index dc626484c1..65aa858945 100644
--- a/src/app/shared/services/route.service.ts
+++ b/src/app/core/services/route.service.ts
@@ -12,12 +12,12 @@ import { combineLatest, Observable } from 'rxjs';
import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
import { isEqual } from 'lodash';
-import { AddUrlToHistoryAction } from '../history/history.actions';
-import { historySelector } from '../history/selectors';
+import { AddUrlToHistoryAction } from '../../shared/history/history.actions';
+import { historySelector } from '../../shared/history/selectors';
import { SetParametersAction, SetQueryParametersAction } from './route.actions';
-import { CoreState } from '../../core/core.reducers';
-import { hasValue } from '../empty.util';
-import { coreSelector } from '../../core/core.selectors';
+import { CoreState } from '../core.reducers';
+import { hasValue } from '../../shared/empty.util';
+import { coreSelector } from '../core.selectors';
/**
* Selector to select all route parameters from the store
diff --git a/src/app/shared/services/server-cookie.service.ts b/src/app/core/services/server-cookie.service.ts
similarity index 100%
rename from src/app/shared/services/server-cookie.service.ts
rename to src/app/core/services/server-cookie.service.ts
diff --git a/src/app/shared/services/server-response.service.ts b/src/app/core/services/server-response.service.ts
similarity index 100%
rename from src/app/shared/services/server-response.service.ts
rename to src/app/core/services/server-response.service.ts
diff --git a/src/app/shared/services/window.service.ts b/src/app/core/services/window.service.ts
similarity index 100%
rename from src/app/shared/services/window.service.ts
rename to src/app/core/services/window.service.ts
diff --git a/src/app/core/shared/bitstream-format-support-level.ts b/src/app/core/shared/bitstream-format-support-level.ts
new file mode 100644
index 0000000000..d92aac7708
--- /dev/null
+++ b/src/app/core/shared/bitstream-format-support-level.ts
@@ -0,0 +1,5 @@
+export enum BitstreamFormatSupportLevel {
+ Known = 'KNOWN',
+ Unknown = 'UNKNOWN',
+ Supported = 'SUPPORTED'
+}
diff --git a/src/app/core/shared/bitstream-format.model.ts b/src/app/core/shared/bitstream-format.model.ts
index bf50cd832f..0e1279e978 100644
--- a/src/app/core/shared/bitstream-format.model.ts
+++ b/src/app/core/shared/bitstream-format.model.ts
@@ -1,6 +1,6 @@
-
import { CacheableObject, TypedObject } from '../cache/object-cache.reducer';
import { ResourceType } from './resource-type';
+import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
/**
* Model class for a Bitstream Format
@@ -27,7 +27,7 @@ export class BitstreamFormat implements CacheableObject {
/**
* The level of support the system offers for this Bitstream Format
*/
- supportLevel: number;
+ supportLevel: BitstreamFormatSupportLevel;
/**
* True if the Bitstream Format is used to store system information, rather than the content of items in the system
@@ -37,7 +37,7 @@ export class BitstreamFormat implements CacheableObject {
/**
* String representing this Bitstream Format's file extension
*/
- extensions: string;
+ extensions: string[];
/**
* The link to the rest endpoint where this Bitstream Format can be found
@@ -49,4 +49,11 @@ export class BitstreamFormat implements CacheableObject {
*/
uuid: string;
+ /**
+ * Identifier for this Bitstream Format
+ * Note that this ID is unique for bitstream formats,
+ * but might not be unique across different object types
+ */
+ id: string;
+
}
diff --git a/src/app/core/shared/item-relationships/relationship-type.model.ts b/src/app/core/shared/item-relationships/relationship-type.model.ts
index 98454bc000..06ac94b041 100644
--- a/src/app/core/shared/item-relationships/relationship-type.model.ts
+++ b/src/app/core/shared/item-relationships/relationship-type.model.ts
@@ -33,7 +33,7 @@ export class RelationshipType implements CacheableObject {
/**
* The label that describes the Relation to the left of this RelationshipType
*/
- leftLabel: string;
+ leftwardType: string;
/**
* The maximum amount of Relationships allowed to the left of this RelationshipType
@@ -48,7 +48,7 @@ export class RelationshipType implements CacheableObject {
/**
* The label that describes the Relation to the right of this RelationshipType
*/
- rightLabel: string;
+ rightwardType: string;
/**
* The maximum amount of Relationships allowed to the right of this RelationshipType
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 515ea3cd69..a3e625c022 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -5,10 +5,11 @@ import { DSpaceObject } from './dspace-object.model';
import { Collection } from './collection.model';
import { RemoteData } from '../data/remote-data';
import { Bitstream } from './bitstream.model';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { PaginatedList } from '../data/paginated-list';
import { Relationship } from './item-relationships/relationship.model';
import { ResourceType } from './resource-type';
+import { getSucceededRemoteData } from './operators';
export class Item extends DSpaceObject {
static type = new ResourceType('item');
@@ -97,7 +98,7 @@ export class Item extends DSpaceObject {
*/
getBitstreamsByBundleName(bundleName: string): Observable {
return this.bitstreams.pipe(
- filter((rd: RemoteData>) => !rd.isResponsePending && isNotUndefined(rd.payload)),
+ getSucceededRemoteData(),
map((rd: RemoteData>) => rd.payload.page),
filter((bitstreams: Bitstream[]) => hasValue(bitstreams)),
take(1),
diff --git a/src/app/core/shared/operators.spec.ts b/src/app/core/shared/operators.spec.ts
index 56b5d5db7e..548a3f1339 100644
--- a/src/app/core/shared/operators.spec.ts
+++ b/src/app/core/shared/operators.spec.ts
@@ -103,7 +103,7 @@ describe('Core Module - RxJS Operators', () => {
scheduler.schedule(() => source.pipe(getRequestFromRequestUUID(requestService)).subscribe());
scheduler.flush();
- expect(requestService.getByUUID).toHaveBeenCalledWith(testRequestUUID)
+ expect(requestService.getByUUID).toHaveBeenCalledWith(testRequestUUID);
});
it('shouldn\'t return anything if there is no request matching the request uuid', () => {
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index ae46691e39..d46c688e68 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -91,7 +91,7 @@ export const toDSpaceObjectListRD = () =>
source.pipe(
filter((rd: RemoteData>>) => rd.hasSucceeded),
map((rd: RemoteData>>) => {
- const dsoPage: T[] = rd.payload.page.map((searchResult: SearchResult) => searchResult.indexableObject);
+ const dsoPage: T[] = rd.payload.page.filter((result) => hasValue(result)).map((searchResult: SearchResult) => searchResult.indexableObject);
const payload = Object.assign(rd.payload, { page: dsoPage }) as PaginatedList;
return Object.assign(rd, { payload: payload });
})
diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index a0811c8f2d..de7d683d91 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -128,7 +128,10 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
// Iterate over all workspaceitem's sections
Object.keys(item.sections)
.forEach((sectionId) => {
- if (typeof item.sections[sectionId] === 'object' && isNotEmpty(item.sections[sectionId])) {
+ if (typeof item.sections[sectionId] === 'object' && (isNotEmpty(item.sections[sectionId]) &&
+ // When Upload section is disabled, add to submission only if there are files
+ (!item.sections[sectionId].hasOwnProperty('files') || isNotEmpty((item.sections[sectionId] as any).files)))) {
+
const normalizedSectionData = Object.create({});
// Iterate over all sections property
Object.keys(item.sections[sectionId])
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
new file mode 100644
index 0000000000..3aa79fc70a
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
@@ -0,0 +1,30 @@
+
+
+
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.scss b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
new file mode 100644
index 0000000000..d13feda406
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
@@ -0,0 +1,50 @@
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { Item } from '../../../../core/shared/item.model';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getEntityGridElementTestComponent } from '../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec';
+import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+
+const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithMetadata.hitHighlights = {};
+mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'creativework.datePublished': [
+ {
+ language: null,
+ value: '2015-06-26'
+ }
+ ],
+ 'journal.title': [
+ {
+ language: 'en_US',
+ value: 'The journal title'
+ }
+ ]
+ }
+});
+
+const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithoutMetadata.hitHighlights = {};
+mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ]
+ }
+});
+
+describe('JournalIssueGridElementComponent', getEntityGridElementTestComponent(JournalIssueGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'journal-title']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
new file mode 100644
index 0000000000..06c27ebacf
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
@@ -0,0 +1,17 @@
+import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
+import { Component } from '@angular/core';
+import { focusShadow } from '../../../../shared/animations/focus';
+import { TypedItemSearchResultGridElementComponent } from '../../../../shared/object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
+
+@rendersItemType('JournalIssue', ItemViewMode.Card)
+@Component({
+ selector: 'ds-journal-issue-grid-element',
+ styleUrls: ['./journal-issue-grid-element.component.scss'],
+ templateUrl: './journal-issue-grid-element.component.html',
+ animations: [focusShadow]
+})
+/**
+ * The component for displaying a grid element for an item of the type Journal Issue
+ */
+export class JournalIssueGridElementComponent extends TypedItemSearchResultGridElementComponent {
+}
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
new file mode 100644
index 0000000000..b2b251f550
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
@@ -0,0 +1,30 @@
+
+
+
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.scss b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
new file mode 100644
index 0000000000..8c854aeb77
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
@@ -0,0 +1,50 @@
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { Item } from '../../../../core/shared/item.model';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getEntityGridElementTestComponent } from '../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec';
+import { JournalVolumeGridElementComponent } from './journal-volume-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+
+const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithMetadata.hitHighlights = {};
+mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'creativework.datePublished': [
+ {
+ language: null,
+ value: '2015-06-26'
+ }
+ ],
+ 'dc.description': [
+ {
+ language: 'en_US',
+ value: 'A description for the journal volume'
+ }
+ ]
+ }
+});
+
+const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithoutMetadata.hitHighlights = {};
+mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ]
+ }
+});
+
+describe('JournalVolumeGridElementComponent', getEntityGridElementTestComponent(JournalVolumeGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'description']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
new file mode 100644
index 0000000000..e5183536ef
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
@@ -0,0 +1,17 @@
+import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
+import { Component } from '@angular/core';
+import { focusShadow } from '../../../../shared/animations/focus';
+import { TypedItemSearchResultGridElementComponent } from '../../../../shared/object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
+
+@rendersItemType('JournalVolume', ItemViewMode.Card)
+@Component({
+ selector: 'ds-journal-volume-grid-element',
+ styleUrls: ['./journal-volume-grid-element.component.scss'],
+ templateUrl: './journal-volume-grid-element.component.html',
+ animations: [focusShadow]
+})
+/**
+ * The component for displaying a grid element for an item of the type Journal Volume
+ */
+export class JournalVolumeGridElementComponent extends TypedItemSearchResultGridElementComponent {
+}
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
new file mode 100644
index 0000000000..af0739004c
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
@@ -0,0 +1,35 @@
+
+
+
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.scss b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
new file mode 100644
index 0000000000..0d0f77842a
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
@@ -0,0 +1,56 @@
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { Item } from '../../../../core/shared/item.model';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getEntityGridElementTestComponent } from '../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec';
+import { JournalGridElementComponent } from './journal-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+
+const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithMetadata.hitHighlights = {};
+mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'creativework.editor': [
+ {
+ language: 'en_US',
+ value: 'Smith, Donald'
+ }
+ ],
+ 'creativework.publisher': [
+ {
+ language: 'en_US',
+ value: 'A company'
+ }
+ ],
+ 'dc.description': [
+ {
+ language: 'en_US',
+ value: 'This is the description'
+ }
+ ]
+ }
+});
+
+const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithoutMetadata.hitHighlights = {};
+mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ]
+ }
+});
+
+describe('JournalGridElementComponent', getEntityGridElementTestComponent(JournalGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['editor', 'publisher', 'description']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
new file mode 100644
index 0000000000..7f23211538
--- /dev/null
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
@@ -0,0 +1,17 @@
+import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
+import { Component } from '@angular/core';
+import { focusShadow } from '../../../../shared/animations/focus';
+import { TypedItemSearchResultGridElementComponent } from '../../../../shared/object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
+
+@rendersItemType('Journal', ItemViewMode.Card)
+@Component({
+ selector: 'ds-journal-grid-element',
+ styleUrls: ['./journal-grid-element.component.scss'],
+ templateUrl: './journal-grid-element.component.html',
+ animations: [focusShadow]
+})
+/**
+ * The component for displaying a grid element for an item of the type Journal
+ */
+export class JournalGridElementComponent extends TypedItemSearchResultGridElementComponent {
+}
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index 50ec160650..4033645e1b 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -9,6 +9,9 @@ import { JournalListElementComponent } from './item-list-elements/journal/journa
import { JournalIssueListElementComponent } from './item-list-elements/journal-issue/journal-issue-list-element.component';
import { JournalVolumeListElementComponent } from './item-list-elements/journal-volume/journal-volume-list-element.component';
import { TooltipModule } from 'ngx-bootstrap';
+import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
+import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
+import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
const ENTRY_COMPONENTS = [
JournalComponent,
@@ -16,7 +19,10 @@ const ENTRY_COMPONENTS = [
JournalVolumeComponent,
JournalListElementComponent,
JournalIssueListElementComponent,
- JournalVolumeListElementComponent
+ JournalVolumeListElementComponent,
+ JournalIssueGridElementComponent,
+ JournalVolumeGridElementComponent,
+ JournalGridElementComponent
];
@NgModule({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
new file mode 100644
index 0000000000..a4765c4e8f
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
@@ -0,0 +1,35 @@
+
+
+
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.scss b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts
new file mode 100644
index 0000000000..15c7b75bf5
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts
@@ -0,0 +1,56 @@
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { Item } from '../../../../core/shared/item.model';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getEntityGridElementTestComponent } from '../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec';
+import { OrgunitGridElementComponent } from './orgunit-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+
+const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithMetadata.hitHighlights = {};
+mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'organization.foundingDate': [
+ {
+ language: null,
+ value: '2015-06-26'
+ }
+ ],
+ 'organization.address.addressCountry': [
+ {
+ language: 'en_US',
+ value: 'Belgium'
+ }
+ ],
+ 'organization.address.addressLocality': [
+ {
+ language: 'en_US',
+ value: 'Brussels'
+ }
+ ]
+ }
+});
+
+const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithoutMetadata.hitHighlights = {};
+mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ]
+ }
+});
+
+describe('OrgunitGridElementComponent', getEntityGridElementTestComponent(OrgunitGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'country', 'city']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.ts
new file mode 100644
index 0000000000..0effc22027
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.ts
@@ -0,0 +1,17 @@
+import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
+import { Component } from '@angular/core';
+import { focusShadow } from '../../../../shared/animations/focus';
+import { TypedItemSearchResultGridElementComponent } from '../../../../shared/object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
+
+@rendersItemType('OrgUnit', ItemViewMode.Card)
+@Component({
+ selector: 'ds-orgunit-grid-element',
+ styleUrls: ['./orgunit-grid-element.component.scss'],
+ templateUrl: './orgunit-grid-element.component.html',
+ animations: [focusShadow]
+})
+/**
+ * The component for displaying a grid element for an item of the type Organisation Unit
+ */
+export class OrgunitGridElementComponent extends TypedItemSearchResultGridElementComponent {
+}
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
new file mode 100644
index 0000000000..331c2bd520
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
@@ -0,0 +1,30 @@
+
+
+
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.scss b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
new file mode 100644
index 0000000000..25268261e1
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
@@ -0,0 +1,50 @@
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { Item } from '../../../../core/shared/item.model';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getEntityGridElementTestComponent } from '../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec';
+import { PersonGridElementComponent } from './person-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+
+const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithMetadata.hitHighlights = {};
+mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'person.email': [
+ {
+ language: 'en_US',
+ value: 'Smith-Donald@gmail.com'
+ }
+ ],
+ 'person.jobTitle': [
+ {
+ language: 'en_US',
+ value: 'Web Developer'
+ }
+ ]
+ }
+});
+
+const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithoutMetadata.hitHighlights = {};
+mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ]
+ }
+});
+
+describe('PersonGridElementComponent', getEntityGridElementTestComponent(PersonGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['email', 'jobtitle']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
new file mode 100644
index 0000000000..bf7b8aa119
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
@@ -0,0 +1,17 @@
+import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
+import { Component } from '@angular/core';
+import { TypedItemSearchResultGridElementComponent } from '../../../../shared/object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
+import { focusShadow } from '../../../../shared/animations/focus';
+
+@rendersItemType('Person', ItemViewMode.Card)
+@Component({
+ selector: 'ds-person-grid-element',
+ styleUrls: ['./person-grid-element.component.scss'],
+ templateUrl: './person-grid-element.component.html',
+ animations: [focusShadow]
+})
+/**
+ * The component for displaying a grid element for an item of the type Person
+ */
+export class PersonGridElementComponent extends TypedItemSearchResultGridElementComponent {
+}
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
new file mode 100644
index 0000000000..889276b29b
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
@@ -0,0 +1,25 @@
+
+
+
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.scss b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
new file mode 100644
index 0000000000..969912976c
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
@@ -0,0 +1,44 @@
+import { ItemSearchResult } from '../../../../shared/object-collection/shared/item-search-result.model';
+import { Item } from '../../../../core/shared/item.model';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { getEntityGridElementTestComponent } from '../../../../shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec';
+import { ProjectGridElementComponent } from './project-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../core/data/paginated-list';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+
+const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithMetadata.hitHighlights = {};
+mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'dc.description': [
+ {
+ language: 'en_US',
+ value: 'The project description'
+ }
+ ]
+ }
+});
+
+const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
+mockItemWithoutMetadata.hitHighlights = {};
+mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
+ bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ]
+ }
+});
+
+describe('ProjectGridElementComponent', getEntityGridElementTestComponent(ProjectGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['description']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
new file mode 100644
index 0000000000..15d525fcf2
--- /dev/null
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
@@ -0,0 +1,17 @@
+import { ItemViewMode, rendersItemType } from '../../../../shared/items/item-type-decorator';
+import { Component } from '@angular/core';
+import { focusShadow } from '../../../../shared/animations/focus';
+import { TypedItemSearchResultGridElementComponent } from '../../../../shared/object-grid/item-grid-element/item-types/typed-item-search-result-grid-element.component';
+
+@rendersItemType('Project', ItemViewMode.Card)
+@Component({
+ selector: 'ds-project-grid-element',
+ styleUrls: ['./project-grid-element.component.scss'],
+ templateUrl: './project-grid-element.component.html',
+ animations: [focusShadow]
+})
+/**
+ * The component for displaying a grid element for an item of the type Project
+ */
+export class ProjectGridElementComponent extends TypedItemSearchResultGridElementComponent {
+}
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index ba28f174df..099fa2a6a3 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -11,6 +11,9 @@ import { PersonMetadataListElementComponent } from './item-list-elements/person/
import { PersonListElementComponent } from './item-list-elements/person/person-list-element.component';
import { ProjectListElementComponent } from './item-list-elements/project/project-list-element.component';
import { TooltipModule } from 'ngx-bootstrap';
+import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
+import { OrgunitGridElementComponent } from './item-grid-elements/orgunit/orgunit-grid-element.component';
+import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
const ENTRY_COMPONENTS = [
OrgunitComponent,
@@ -20,7 +23,10 @@ const ENTRY_COMPONENTS = [
OrgUnitMetadataListElementComponent,
PersonListElementComponent,
PersonMetadataListElementComponent,
- ProjectListElementComponent
+ ProjectListElementComponent,
+ PersonGridElementComponent,
+ OrgunitGridElementComponent,
+ ProjectGridElementComponent
];
@NgModule({
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index 4d25bd0d43..70c66f119d 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -8,3 +8,14 @@
background-image: none !important;
line-height: 1.5;
}
+
+.navbar ::ng-deep {
+ a {
+ color: $header-icon-color;
+
+ &:hover, &focus {
+ color: darken($header-icon-color, 15%);
+ }
+ }
+}
+
diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts
index 6e173b4139..b11de58269 100644
--- a/src/app/pagenotfound/pagenotfound.component.ts
+++ b/src/app/pagenotfound/pagenotfound.component.ts
@@ -1,4 +1,4 @@
-import { ServerResponseService } from '../shared/services/server-response.service';
+import { ServerResponseService } from '../core/services/server-response.service';
import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
import { AuthService } from '../core/auth/auth.service';
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index b560283ad5..4df07880d8 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -3,7 +3,8 @@
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index bad9f3fe8c..c4b235f277 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,5 +1,5 @@
-
{{title | translate}}
+{{title | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 6c4bc78213..230b0bc136 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -26,6 +26,10 @@ export class BrowseByComponent implements OnInit {
*/
@Input() title: string;
+ /**
+ * The parent name
+ */
+ @Input() parentname: string;
/**
* The list of objects to display
*/
diff --git a/src/app/shared/chips/models/chips-item.model.ts b/src/app/shared/chips/models/chips-item.model.ts
index 540f94166f..913232fa71 100644
--- a/src/app/shared/chips/models/chips-item.model.ts
+++ b/src/app/shared/chips/models/chips-item.model.ts
@@ -2,6 +2,7 @@ import { isObject, uniqueId } from 'lodash';
import { hasValue, isNotEmpty } from '../../empty.util';
import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
import { ConfidenceType } from '../../../core/integration/models/confidence-type';
+import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
export interface ChipsItemIcon {
metadata: string;
@@ -62,7 +63,7 @@ export class ChipsItem {
if (this._item.hasOwnProperty(icon.metadata)
&& (((typeof this._item[icon.metadata] === 'string') && hasValue(this._item[icon.metadata]))
|| (this._item[icon.metadata] as FormFieldMetadataValueObject).hasValue())
- && !(this._item[icon.metadata] as FormFieldMetadataValueObject).hasPlaceholder()) {
+ && !this.hasPlaceholder(this._item[icon.metadata])) {
if ((icon.visibleWhenAuthorityEmpty
|| (this._item[icon.metadata] as FormFieldMetadataValueObject).confidence !== ConfidenceType.CF_UNSET)
&& isNotEmpty(icon.style)) {
@@ -109,4 +110,9 @@ export class ChipsItem {
this.display = value;
}
+
+ private hasPlaceholder(value: any) {
+ return (typeof value === 'string') ? (value === PLACEHOLDER_PARENT_METADATA) :
+ (value as FormFieldMetadataValueObject).hasPlaceholder()
+ }
}
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
index 6a96892b06..8d1d5c1dca 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
@@ -9,6 +9,7 @@ import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynami
import { TranslateService } from '@ngx-translate/core';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { MetadataMap, MetadataValue } from '../../../core/shared/metadata.models';
+import { ResourceType } from '../../../core/shared/resource-type';
import { isNotEmpty } from '../../empty.util';
import { Community } from '../../../core/shared/community.model';
@@ -29,7 +30,7 @@ export class ComColFormComponent implements OnInit {
/**
* Type of DSpaceObject that the form represents
*/
- protected type;
+ protected type: ResourceType;
/**
* @type {string} Key prefix used to generate form labels
@@ -110,11 +111,11 @@ export class ComColFormComponent implements OnInit {
private updateFieldTranslations() {
this.formModel.forEach(
(fieldModel: DynamicInputModel) => {
- fieldModel.label = this.translate.instant(this.type + this.LABEL_KEY_PREFIX + fieldModel.id);
+ fieldModel.label = this.translate.instant(this.type.value + this.LABEL_KEY_PREFIX + fieldModel.id);
if (isNotEmpty(fieldModel.validators)) {
fieldModel.errorMessages = {};
Object.keys(fieldModel.validators).forEach((key) => {
- fieldModel.errorMessages[key] = this.translate.instant(this.type + this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
+ fieldModel.errorMessages[key] = this.translate.instant(this.type.value + this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
});
}
}
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
index 08f15ad052..6ad2e5b5e1 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
@@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { CommunityDataService } from '../../../core/data/community-data.service';
-import { RouteService } from '../../services/route.service';
+import { RouteService } from '../../../core/services/route.service';
import { Router } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs';
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
index c9fcfecb97..e07f2a5a0a 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Community } from '../../../core/shared/community.model';
import { CommunityDataService } from '../../../core/data/community-data.service';
import { Observable } from 'rxjs';
-import { RouteService } from '../../services/route.service';
+import { RouteService } from '../../../core/services/route.service';
import { Router } from '@angular/router';
import { RemoteData } from '../../../core/data/remote-data';
import { isNotEmpty, isNotUndefined } from '../../empty.util';
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
index 1c73fbb3df..504d9f4bcd 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,6 +1,24 @@
-;
+
+ constructor(
+ @Inject(GLOBAL_CONFIG) public config: GlobalConfig,
+ private route: ActivatedRoute,
+ private router: Router) {
}
ngOnInit(): void {
- this.types = this.config.browseBy.types;
+ this.allOptions = this.config.browseBy.types
+ .map((config: BrowseByTypeConfig) => ({
+ id: config.id,
+ label: `browse.comcol.by.${config.id}`,
+ routerLink: `/browse/${config.id}`,
+ params: { scope: this.id }
+ }));
+
+ if (this.contentType === 'collection') {
+ this.allOptions = [ {
+ id: this.id,
+ label: 'collection.page.browse.recent.head',
+ routerLink: getCollectionPageRoute(this.id)
+ }, ...this.allOptions ];
+ } else if (this.contentType === 'community') {
+ this.allOptions = [{
+ id: this.id,
+ label: 'community.all-lists.head',
+ routerLink: getCommunityPageRoute(this.id)
+ }, ...this.allOptions ];
+ }
+
+ this.currentOptionId$ = this.route.url.pipe(
+ filter((urlSegments: UrlSegment[]) => hasValue(urlSegments)),
+ map((urlSegments: UrlSegment[]) => urlSegments[urlSegments.length - 1].path)
+ );
}
+ onSelectChange(newId: string) {
+ const selectedOption = this.allOptions
+ .find((option: ComColPageNavOption) => option.id === newId);
+
+ this.router.navigate([selectedOption.routerLink], { queryParams: selectedOption.params });
+ }
}
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol-page-handle/comcol-page-handle.component.html
new file mode 100644
index 0000000000..b3ca75bf94
--- /dev/null
+++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.html
@@ -0,0 +1,4 @@
+
{{'browse.comcol.head' | translate}}
- +{{'browse.comcol.head' | translate}}
+ diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index dcc7840bb4..1bc83d74a5 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -1,6 +1,27 @@ -import { Component, Inject, Input, OnInit } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + Inject, + Input, NgZone, + OnDestroy, + OnInit +} from '@angular/core'; +import { Observable } from 'rxjs/internal/Observable'; +import { Subscription } from 'rxjs/internal/Subscription'; +import { filter, map, startWith, tap } from 'rxjs/operators'; +import { getCollectionPageRoute } from '../../+collection-page/collection-page-routing.module'; +import { getCommunityPageRoute } from '../../+community-page/community-page-routing.module'; import { GLOBAL_CONFIG, GlobalConfig } from '../../../config'; +import { Router, ActivatedRoute, RouterModule, UrlSegment } from '@angular/router'; import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interface'; +import { hasValue } from '../empty.util'; + +export interface ComColPageNavOption { + id: string; + label: string, + routerLink: string + params?: any; +}; /** * A component to display the "Browse By" section of a Community or Collection page @@ -8,24 +29,63 @@ import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interf */ @Component({ selector: 'ds-comcol-page-browse-by', - templateUrl: './comcol-page-browse-by.component.html', + styleUrls: ['./comcol-page-browse-by.component.scss'], + templateUrl: './comcol-page-browse-by.component.html' }) export class ComcolPageBrowseByComponent implements OnInit { /** * The ID of the Community or Collection */ @Input() id: string; - + @Input() contentType: string; /** * List of currently active browse configurations */ types: BrowseByTypeConfig[]; - constructor(@Inject(GLOBAL_CONFIG) public config: GlobalConfig) { + allOptions: ComColPageNavOption[]; + + currentOptionId$: Observable
+
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.scss b/src/app/shared/comcol-page-handle/comcol-page-handle.component.scss
new file mode 100644
index 0000000000..5d7bac26c7
--- /dev/null
+++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.scss
@@ -0,0 +1,5 @@
+div {
+ word-break: break-word;
+ word-wrap: break-word;
+ overflow-wrap: break-word;
+}
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts
new file mode 100644
index 0000000000..3a2ab307be
--- /dev/null
+++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts
@@ -0,0 +1,29 @@
+import { Component, Input, Inject, Injectable } from '@angular/core';
+import { GlobalConfig } from '../../../config/global-config.interface';
+import { GLOBAL_CONFIG } from '../../../config';
+import { UIURLCombiner } from '../../core/url-combiner/ui-url-combiner';
+/**
+ * This component builds a URL from the value of "handle"
+ */
+
+@Component({
+ selector: 'ds-comcol-page-handle',
+ styleUrls: ['./comcol-page-handle.component.scss'],
+ templateUrl: './comcol-page-handle.component.html'
+})
+
+@Injectable()
+export class ComcolPageHandleComponent {
+
+ // Optional title
+ @Input() title: string;
+
+ // The value of "handle"
+ @Input() content: string;
+
+ constructor(@Inject(GLOBAL_CONFIG) private EnvConfig: GlobalConfig) {
+ }
+ public getHandle(): string {
+ return new UIURLCombiner(this.EnvConfig, '/handle/', this.content).toString();
+ }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index cead04f797..52a924604f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -14,7 +14,8 @@
{{ title | translate }}
+ +
{{ message | translate:model.validators }}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
index fc618023f9..66bdf97dad 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
@@ -1,4 +1,7 @@
import { DynamicFormControlLayout, DynamicFormGroupModel, DynamicFormGroupModelConfig, serializable } from '@ng-dynamic-forms/core';
+
+import { Subject } from 'rxjs';
+
import { isNotEmpty } from '../../../../empty.util';
import { DsDynamicInputModel } from './ds-dynamic-input.model';
import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
@@ -16,12 +19,16 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
@serializable() separator: string;
@serializable() hasLanguages = false;
isCustomGroup = true;
+ valueUpdates: Subject;
constructor(config: DynamicConcatModelConfig, layout?: DynamicFormControlLayout) {
super(config, layout);
this.separator = config.separator + ' ';
+
+ this.valueUpdates = new Subject();
+ this.valueUpdates.subscribe((value: string) => this.value = value);
}
get value() {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
index 860c481820..4e4a944319 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
@@ -28,6 +28,7 @@ export class DsDynamicInputModel extends DynamicInputModel {
constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) {
super(config, layout);
+ this.hint = config.hint;
this.readOnly = config.readOnly;
this.value = config.value;
this.language = config.language;
@@ -57,11 +58,7 @@ export class DsDynamicInputModel extends DynamicInputModel {
}
get hasLanguages(): boolean {
- if (this.languageCodes && this.languageCodes.length > 1) {
- return true;
- } else {
- return false;
- }
+ return this.languageCodes && this.languageCodes.length > 1;
}
get language(): string {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
index 6bd5a604a0..5d2cbc58b7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
@@ -1,5 +1,5 @@
-import { DynamicFormControlLayout, DynamicFormGroupModel, DynamicInputModelConfig, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from './ds-dynamic-input.model';
+import { DynamicFormControlLayout, DynamicFormGroupModel, serializable } from '@ng-dynamic-forms/core';
+import { DsDynamicInputModel } from './ds-dynamic-input.model';
import { Subject } from 'rxjs';
import { DynamicFormGroupModelConfig } from '@ng-dynamic-forms/core/src/model/form-group/dynamic-form-group.model';
import { LanguageCode } from '../../models/form-field-language-value.model';
@@ -12,6 +12,7 @@ export interface DsDynamicQualdropModelConfig extends DynamicFormGroupModelConfi
languageCodes?: LanguageCode[];
language?: string;
readOnly: boolean;
+ hint?: string;
}
export class DynamicQualdropModel extends DynamicFormGroupModel {
@@ -20,6 +21,7 @@ export class DynamicQualdropModel extends DynamicFormGroupModel {
@serializable() languageUpdates: Subject;
@serializable() hasLanguages = false;
@serializable() readOnly: boolean;
+ @serializable() hint: string;
isCustomGroup = true;
constructor(config: DsDynamicQualdropModelConfig, layout?: DynamicFormControlLayout) {
@@ -33,6 +35,8 @@ export class DynamicQualdropModel extends DynamicFormGroupModel {
this.languageUpdates.subscribe((lang: string) => {
this.language = lang;
});
+
+ this.hint = config.hint;
}
get value() {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index cb2d1fe217..3cfb5980c6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -20,11 +20,10 @@
[disabled]="isInputDisabled()"
[placeholder]="model.placeholder | translate"
[readonly]="model.readOnly"
- (change)="$event.preventDefault()"
+ (change)="onChange($event)"
(blur)="onBlurEvent($event); $event.stopPropagation(); sdRef.close();"
(focus)="onFocusEvent($event); $event.stopPropagation(); sdRef.close();"
- (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();"
- (input)="onInput($event)">
+ (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();">
@@ -40,11 +39,10 @@
[disabled]="firstInputValue.length === 0 || isInputDisabled()"
[placeholder]="model.secondPlaceholder | translate"
[readonly]="model.readOnly"
- (change)="$event.preventDefault()"
+ (change)="onChange($event)"
(blur)="onBlurEvent($event); $event.stopPropagation(); sdRef.close();"
(focus)="onFocusEvent($event); $event.stopPropagation(); sdRef.close();"
- (click)="$event.stopPropagation(); sdRef.close();"
- (input)="onInput($event)">
+ (click)="$event.stopPropagation(); sdRef.close();">