+
+
+
+
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
new file mode 100644
index 0000000000..e3b2e1f2c1
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -0,0 +1,72 @@
+import { MetadataRegistryComponent } from './metadata-registry.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { SharedModule } from '../../../shared/shared.module';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
+import { HostWindowService } from '../../../shared/host-window.service';
+
+describe('MetadataRegistryComponent', () => {
+ let comp: MetadataRegistryComponent;
+ let fixture: ComponentFixture
+
+
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
new file mode 100644
index 0000000000..7e6064ddff
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -0,0 +1,121 @@
+import { MetadataSchemaComponent } from './metadata-schema.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { CommonModule } from '@angular/common';
+import { ActivatedRoute, Router } from '@angular/router';
+import { By } from '@angular/platform-browser';
+import { MockTranslateLoader } from '../../../shared/testing/mock-translate-loader';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { SharedModule } from '../../../shared/shared.module';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { RouterStub } from '../../../shared/testing/router-stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+
+describe('MetadataSchemaComponent', () => {
+ let comp: MetadataSchemaComponent;
+ let fixture: ComponentFixture
+ *ngVar="(collectionRD$ | async) as collectionRD">
@@ -8,8 +8,8 @@
[name]="collection.name">
-
@@ -38,14 +38,14 @@
-
+
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 4a935b73b9..89567c4a54 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -5,7 +5,6 @@ import { Observable } from 'rxjs/Observable';
import { Subscription } from 'rxjs/Subscription';
import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
import { CollectionDataService } from '../core/data/collection-data.service';
-import { ItemDataService } from '../core/data/item-data.service';
import { PaginatedList } from '../core/data/paginated-list';
import { RemoteData } from '../core/data/remote-data';
@@ -18,6 +17,11 @@ import { Item } from '../core/shared/item.model';
import { fadeIn, fadeInOut } from '../shared/animations/fade';
import { hasValue, isNotEmpty } from '../shared/empty.util';
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { filter, flatMap, map } from 'rxjs/operators';
+import { SearchService } from '../+search-page/search-service/search.service';
+import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
+import { toDSpaceObjectListRD } from '../core/shared/operators';
+import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
@Component({
selector: 'ds-collection-page',
@@ -30,9 +34,9 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp
]
})
export class CollectionPageComponent implements OnInit, OnDestroy {
- collectionRDObs: Observable>;
- itemRDObs: Observable>>;
- logoRDObs: Observable>;
+ collectionRD$: Observable>;
+ itemRD$: Observable>>;
+ logoRD$: Observable>;
paginationConfig: PaginationComponentOptions;
sortConfig: SortOptions;
private subs: Subscription[] = [];
@@ -40,7 +44,7 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
constructor(
private collectionDataService: CollectionDataService,
- private itemDataService: ItemDataService,
+ private searchService: SearchService,
private metadata: MetadataService,
private route: ActivatedRoute
) {
@@ -48,52 +52,41 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
this.paginationConfig.id = 'collection-page-pagination';
this.paginationConfig.pageSize = 5;
this.paginationConfig.currentPage = 1;
- this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
+ this.sortConfig = new SortOptions('dc.date.accessioned', SortDirection.DESC);
}
ngOnInit(): void {
+ this.collectionRD$ = this.route.data.map((data) => data.collection);
+ this.logoRD$ = this.collectionRD$.pipe(
+ map((rd: RemoteData) => rd.payload),
+ filter((collection: Collection) => hasValue(collection)),
+ flatMap((collection: Collection) => collection.logo)
+ );
this.subs.push(
- Observable.combineLatest(
- this.route.params,
- this.route.queryParams,
- (params, queryParams, ) => {
- return Object.assign({}, params, queryParams);
- })
- .subscribe((params) => {
- this.collectionId = params.id;
- this.collectionRDObs = this.collectionDataService.findById(this.collectionId);
- this.metadata.processRemoteData(this.collectionRDObs);
- this.subs.push(this.collectionRDObs
- .map((rd: RemoteData) => rd.payload)
- .filter((collection: Collection) => hasValue(collection))
- .subscribe((collection: Collection) => this.logoRDObs = collection.logo));
-
- const page = +params.page || this.paginationConfig.currentPage;
- const pageSize = +params.pageSize || this.paginationConfig.pageSize;
- const sortDirection = +params.page || this.sortConfig.direction;
- const pagination = Object.assign({},
- this.paginationConfig,
- { currentPage: page, pageSize: pageSize }
- );
- const sort = Object.assign({},
- this.sortConfig,
- { direction: sortDirection, field: params.sortField }
- );
- this.updatePage({
- pagination: pagination,
- sort: sort
- });
- }));
+ this.route.queryParams.subscribe((params) => {
+ this.metadata.processRemoteData(this.collectionRD$);
+ const page = +params.page || this.paginationConfig.currentPage;
+ const pageSize = +params.pageSize || this.paginationConfig.pageSize;
+ const pagination = Object.assign({},
+ this.paginationConfig,
+ { currentPage: page, pageSize: pageSize }
+ );
+ this.updatePage({
+ pagination: pagination,
+ sort: this.sortConfig
+ });
+ }));
}
updatePage(searchOptions) {
- this.itemRDObs = this.itemDataService.findAll({
- scopeID: this.collectionId,
- currentPage: searchOptions.pagination.currentPage,
- elementsPerPage: searchOptions.pagination.pageSize,
- sort: searchOptions.sort
- });
+ this.itemRD$ = this.searchService.search(
+ new PaginatedSearchOptions({
+ scope: this.collectionId,
+ pagination: searchOptions.pagination,
+ sort: searchOptions.sort,
+ dsoType: DSpaceObjectType.ITEM
+ })).pipe(toDSpaceObjectListRD()) as Observable>>;
}
ngOnDestroy(): void {
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index d0bc918b22..85462e67a3 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -5,11 +5,13 @@ import { SharedModule } from '../shared/shared.module';
import { CollectionPageComponent } from './collection-page.component';
import { CollectionPageRoutingModule } from './collection-page-routing.module';
+import { SearchPageModule } from '../+search-page/search-page.module';
@NgModule({
imports: [
CommonModule,
SharedModule,
+ SearchPageModule,
CollectionPageRoutingModule
],
declarations: [
diff --git a/src/app/+collection-page/collection-page.resolver.ts b/src/app/+collection-page/collection-page.resolver.ts
new file mode 100644
index 0000000000..c049901bf2
--- /dev/null
+++ b/src/app/+collection-page/collection-page.resolver.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Collection } from '../core/shared/collection.model';
+import { Observable } from 'rxjs/Observable';
+import { CollectionDataService } from '../core/data/collection-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { getSucceededRemoteData } from '../core/shared/operators';
+
+/**
+ * This class represents a resolver that requests a specific collection before the route is activated
+ */
+@Injectable()
+export class CollectionPageResolver implements Resolve> {
+ constructor(private collectionService: CollectionDataService) {
+ }
+
+ /**
+ * Method for resolving a collection based on the parameters in the current route
+ * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+ * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+ * @returns Observable<> Emits the found collection based on the parameters in the current route
+ */
+ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> {
+ return this.collectionService.findById(route.params.id).pipe(
+ getSucceededRemoteData()
+ );
+ }
+}
diff --git a/src/app/+community-page/community-page-routing.module.ts b/src/app/+community-page/community-page-routing.module.ts
index 6fd5cc8cb5..4cc927d341 100644
--- a/src/app/+community-page/community-page-routing.module.ts
+++ b/src/app/+community-page/community-page-routing.module.ts
@@ -2,12 +2,23 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { CommunityPageComponent } from './community-page.component';
+import { CommunityPageResolver } from './community-page.resolver';
@NgModule({
imports: [
RouterModule.forChild([
- { path: ':id', component: CommunityPageComponent, pathMatch: 'full' }
+ {
+ path: ':id',
+ component: CommunityPageComponent,
+ pathMatch: 'full',
+ resolve: {
+ community: CommunityPageResolver
+ }
+ }
])
+ ],
+ providers: [
+ CommunityPageResolver,
]
})
export class CommunityPageRoutingModule {
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index 976e1091e5..637e37af0c 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,11 +1,11 @@
-
-
{{'collection.page.browse.recent.head' | translate}}
+
diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts
index 605d488820..5fea9b01c9 100644
--- a/src/app/+community-page/community-page.component.ts
+++ b/src/app/+community-page/community-page.component.ts
@@ -22,8 +22,8 @@ import { Observable } from 'rxjs/Observable';
animations: [fadeInOut]
})
export class CommunityPageComponent implements OnInit, OnDestroy {
- communityRDObs: Observable>;
- logoRDObs: Observable>;
+ communityRD$: Observable>;
+ logoRD$: Observable>;
private subs: Subscription[] = [];
constructor(
@@ -35,14 +35,11 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
}
ngOnInit(): void {
- this.route.params.subscribe((params: Params) => {
- this.communityRDObs = this.communityDataService.findById(params.id);
- this.metadata.processRemoteData(this.communityRDObs);
- this.subs.push(this.communityRDObs
- .map((rd: RemoteData) => rd.payload)
- .filter((community: Community) => hasValue(community))
- .subscribe((community: Community) => this.logoRDObs = community.logo));
- });
+ this.communityRD$ = this.route.data.map((data) => data.community);
+ this.logoRD$ = this.communityRD$
+ .map((rd: RemoteData) => rd.payload)
+ .filter((community: Community) => hasValue(community))
+ .flatMap((community: Community) => community.logo);
}
ngOnDestroy(): void {
diff --git a/src/app/+community-page/community-page.resolver.ts b/src/app/+community-page/community-page.resolver.ts
new file mode 100644
index 0000000000..917f37a821
--- /dev/null
+++ b/src/app/+community-page/community-page.resolver.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../core/data/remote-data';
+import { getSucceededRemoteData } from '../core/shared/operators';
+import { Community } from '../core/shared/community.model';
+import { CommunityDataService } from '../core/data/community-data.service';
+
+/**
+ * This class represents a resolver that requests a specific community before the route is activated
+ */
+@Injectable()
+export class CommunityPageResolver implements Resolve> {
+ constructor(private communityService: CommunityDataService) {
+ }
+
+ /**
+ * Method for resolving a community based on the parameters in the current route
+ * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+ * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+ * @returns Observable<> Emits the found community based on the parameters in the current route
+ */
+ resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable> {
+ return this.communityService.findById(route.params.id).pipe(
+ getSucceededRemoteData()
+ );
+ }
+}
diff --git a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
index 8fca66ea79..1915a8ce64 100644
--- a/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.ts
@@ -38,7 +38,7 @@ export class TopLevelCommunityListComponent {
}
updatePage(data) {
- this.communitiesRDObs = this.cds.findAll({
+ this.communitiesRDObs = this.cds.findTop({
currentPage: data.page,
elementsPerPage: data.pageSize,
sort: { field: data.sortField, direction: data.sortDirection }
diff --git a/src/app/+item-page/field-components/collections/collections.component.spec.ts b/src/app/+item-page/field-components/collections/collections.component.spec.ts
index 911a90175c..871018a9d8 100644
--- a/src/app/+item-page/field-components/collections/collections.component.spec.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.spec.ts
@@ -60,7 +60,7 @@ describe('CollectionsComponent', () => {
});
});
- describe('When the requested item request has succeeded', () => {
+ describe('When the requested item request has failed', () => {
beforeEach(() => {
collectionsComponent.item = failedMockItem;
fixture.detectChanges();
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index d79c4cdc34..76dd907870 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,15 +1,15 @@
-
+
-
+
-
| {{metadatum.key}} | {{metadatum.value}} | {{metadatum.language}} | diff --git a/src/app/+item-page/full/full-item-page.component.scss b/src/app/+item-page/full/full-item-page.component.scss index 65b9262338..4fe93bbb7a 100644 --- a/src/app/+item-page/full/full-item-page.component.scss +++ b/src/app/+item-page/full/full-item-page.component.scss @@ -1,7 +1,10 @@ @import '../../../styles/variables.scss'; + :host { div.simple-view-link { text-align: center; - margin: 20px; + a { + min-width: 25%; + } } } \ No newline at end of file diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts index 778478a6b6..fd39631948 100644 --- a/src/app/+item-page/full/full-item-page.component.ts +++ b/src/app/+item-page/full/full-item-page.component.ts @@ -31,9 +31,9 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject'; }) export class FullItemPageComponent extends ItemPageComponent implements OnInit { - itemRDObs: BehaviorSubject