-
{{"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..e2b24200df 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, 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
@@ -103,11 +103,18 @@ export class SearchService implements OnDestroy {
* @returns {Observable>>>} Emits a paginated list with all search results found
*/
search(searchOptions?: PaginatedSearchOptions): Observable>>> {
- const requestObs = this.halService.getEndpoint(this.searchLinkPath).pipe(
+ 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 = () => {
@@ -136,10 +143,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 +176,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.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 46da97e8f6..4967379b03 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';
import { ShibbolethTargetPageComponent } from './+login-page/shibbolethTargetPage/shibboleth-target-page.component';
export function getConfig() {
@@ -77,7 +78,6 @@ const ENTITY_IMPORTS = [
IMPORTS.push(
StoreDevtoolsModule.instrument({
maxAge: 100,
- // logOnly: false,
logOnly: ENV_CONFIG.production,
})
);
@@ -99,7 +99,8 @@ const PROVIDERS = [
{
provide: RouterStateSerializer,
useClass: DSpaceRouterStateSerializer
- }
+ },
+ ClientCookieService
];
const DECLARATIONS = [
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index 5d55e15adc..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,16 +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 {GlobalConfig} from '../../../config/global-config.interface';
-import {GLOBAL_CONFIG} from '../../../config';
+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;
@@ -76,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 },
@@ -140,19 +142,21 @@ describe('AuthService test', () => {
{ provide: AuthRequestService, useValue: authRequest },
{ provide: REQUEST, useValue: {} },
{ provide: Router, useValue: routerStub },
- CookieService,
- AuthService,
+ { provide: RouteService, useValue: routeServiceStub },
+ { provide: RemoteDataBuildService, useValue: rdbService },
+ CookieService,
+ AuthService
]
}).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(undefined, {}, 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', () => {
@@ -190,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,
@@ -198,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 = {
@@ -213,11 +218,14 @@ describe('AuthService test', () => {
(state as any).core = Object.create({});
(state as any).core.auth = authenticatedState;
});
- authService = new AuthService(undefined, {}, 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', () => {
@@ -239,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 e93c39e7ed..24b4d82ed4 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -1,27 +1,28 @@
-import {Inject, Injectable, Optional} from '@angular/core';
-import {PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree} from '@angular/router';
-import {HttpHeaders} from '@angular/common/http';
-import {REQUEST, RESPONSE} from '@nguniversal/express-engine/tokens';
+import { Inject, Injectable, Optional } from '@angular/core';
+import { PRIMARY_OUTLET, Router, UrlSegmentGroup, UrlTree } from '@angular/router';
+import { HttpHeaders } from '@angular/common/http';
+import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
-import {Observable, of as observableOf} from 'rxjs';
-import {distinctUntilChanged, filter, map, startWith, switchMap, take, withLatestFrom} from 'rxjs/operators';
-import {RouterReducerState} from '@ngrx/router-store';
-import {select, Store} from '@ngrx/store';
-import {CookieAttributes} from 'js-cookie';
+import { Observable, of as observableOf } from 'rxjs';
+import { distinctUntilChanged, filter, map, startWith, switchMap, take, withLatestFrom } from 'rxjs/operators';
+import { RouterReducerState } from '@ngrx/router-store';
+import { select, Store } from '@ngrx/store';
+import { CookieAttributes } from 'js-cookie';
-import {EPerson} from '../eperson/models/eperson.model';
-import {AuthRequestService} from './auth-request.service';
-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 {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 {Base64EncodeUrl} from '../../shared/utils/encode-decode.util';
-import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
+import { EPerson } from '../eperson/models/eperson.model';
+import { AuthRequestService } from './auth-request.service';
+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 '../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 '../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';
import {GlobalConfig} from '../../../config/global-config.interface';
import {GLOBAL_CONFIG} from '../../../config';
import {AuthMethodModel} from './models/auth-method.model';
@@ -43,16 +44,15 @@ export class AuthService {
*/
protected _authenticated: boolean;
- constructor(
- @Inject(GLOBAL_CONFIG) public config: GlobalConfig,
- @Inject(REQUEST) protected req: any,
- @Inject(NativeWindowService) protected _window: NativeWindowRef,
- protected authRequestService: AuthRequestService,
- @Optional() @Inject(RESPONSE) private response: any,
- protected router: Router,
- protected storage: CookieService,
- protected store: Store,
- protected rdbService: RemoteDataBuildService
+ constructor(@Inject(REQUEST) protected req: any,
+ @Inject(NativeWindowService) protected _window: NativeWindowRef,
+ protected authRequestService: AuthRequestService,
+ @Optional() @Inject(RESPONSE) private response: any,
+ protected router: Router,
+ protected routeService: RouteService,
+ protected storage: CookieService,
+ protected store: Store,
+ protected rdbService: RemoteDataBuildService
) {
this.store.pipe(
select(isAuthenticated),
@@ -115,19 +115,6 @@ export class AuthService {
}
- shibbolethAuthenticate(location: string) {
- // implement a call to the backend here
- console.log('location: ', location);
- /*return this.authRequestService.postToEndpoint('login').pipe(
- map((status: AuthStatus) => {
- if (status.authenticated) {
- return status;
- } else {
- throw(new Error('Shibboleth login failed'));
- }
- }))*/
- }
-
public startShibbAuth(): Observable {
return this.authRequestService.postToEndpoint('login').pipe(
@@ -260,7 +247,7 @@ export class AuthService {
// Send a request that sign end the session
let headers = new HttpHeaders();
headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
- const options: HttpOptions = Object.create({headers, responseType: 'text'});
+ const options: HttpOptions = Object.create({ headers, responseType: 'text' });
return this.authRequestService.getRequest('logout', options).pipe(
map((status: AuthStatus) => {
if (!status.authenticated) {
@@ -336,7 +323,7 @@ export class AuthService {
// Set the cookie expire date
const expires = new Date(expireDate);
- const options: CookieAttributes = {expires: expires};
+ const options: CookieAttributes = { expires: expires };
// Save cookie with the token
return this.storage.set(TOKENITEM, token, options);
@@ -384,7 +371,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) => {
@@ -393,18 +380,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
*/
@@ -435,7 +443,7 @@ export class AuthService {
// Set the cookie expire date
const expires = new Date(expireDate);
- const options: CookieAttributes = {expires: expires};
+ const options: CookieAttributes = { expires: expires };
this.storage.set(REDIRECT_COOKIE, url, options);
this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
}
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/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 {
+ 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 60d1bce3b8..f4d4dcb269 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,6 +101,7 @@ 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';
@@ -200,6 +201,7 @@ const PROVIDERS = [
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/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 993954a360..04e483604c 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -19,6 +19,7 @@ import { Observable } from 'rxjs/internal/Observable';
import { FindAllOptions } from './request.models';
import { RemoteData } from './remote-data';
import { PaginatedList } from './paginated-list';
+import { SearchParam } from '../cache/models/search-param.model';
@Injectable()
export class CollectionDataService extends ComColDataService {
@@ -40,6 +41,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
*
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index f6adbb23c2..07d8ed8405 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 } 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 } 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,17 @@ 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 { FindAllOptions, PatchRequest, 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 { RequestEntry } from './request.reducer';
+import { RestResponse } from '../cache/response.models';
+import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { Collection } from '../shared/collection.model';
@Injectable()
export class ItemDataService extends DataService- {
@@ -118,4 +121,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/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index 22d5fd3e77..08745f9223 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -105,6 +105,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/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/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.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 8456264631..7a64eb5e9f 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,6 +3,8 @@
{{ 'nav.login' | 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();">