diff --git a/config/environment.default.js b/config/environment.default.js index 4f3aee5f0e..d5e29845f3 100644 --- a/config/environment.default.js +++ b/config/environment.default.js @@ -8,13 +8,19 @@ module.exports = { nameSpace: '/' }, // The REST API server settings. - rest: { - ssl: true, - host: 'dspace7.4science.it', - port: 443, - // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript - nameSpace: '/dspace-spring-rest/api' - }, + // rest: { + // ssl: true, + // host: 'dspace7.4science.it', + // port: 443, + // // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript + // nameSpace: '/dspace-spring-rest/api' + // }, + rest: { + ssl: false, + host: 'dspace7-internal.atmire.com', + port: 443, + nameSpace: '/rest/api' + }, // Caching settings cache: { // NOTE: how long should objects be cached for by default diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html index b04e93ff71..12c2578d9c 100644 --- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html +++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html @@ -2,7 +2,7 @@
{{collection.name}}
{{collection.shortDescription}}
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index fc69719896..aed2b69a30 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -6,6 +6,7 @@ import { Collection } from '../../core/shared/collection.model';
import { Community } from '../../core/shared/community.model';
import { fadeIn } from '../../shared/animations/fade';
+import { PaginatedList } from '../../core/data/paginated-list';
@Component({
selector: 'ds-community-page-sub-collection-list',
@@ -15,7 +16,7 @@ import { fadeIn } from '../../shared/animations/fade';
})
export class CommunityPageSubCollectionListComponent implements OnInit {
@Input() community: Community;
- subCollectionsRDObs: Observable
';
+
+ }));
+
+ describe('When the requested item request has succeeded', () => {
+ beforeEach(() => {
+ collectionsComponent.item = succeededMockItem;
+ fixture.detectChanges();
+ });
+
+ it('should show the collection', () => {
+ const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
+ expect(collectionField).not.toBeNull();
+ });
+ });
+
+ describe('When the requested item request has succeeded', () => {
+ beforeEach(() => {
+ collectionsComponent.item = failedMockItem;
+ fixture.detectChanges();
+ });
+
+ it('should not show the collection', () => {
+ const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
+ expect(collectionField).toBeNull();
+ });
+ });
+});
diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/+item-page/field-components/collections/collections.component.ts
index 8b7b5d7f58..83bb0d464d 100644
--- a/src/app/+item-page/field-components/collections/collections.component.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.ts
@@ -38,4 +38,8 @@ export class CollectionsComponent implements OnInit {
this.collections = this.item.owner.map((rd: RemoteData{{'search.filters.filter.' + filter.name + '.head'| translate}}