diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
index ecc218f11d..0103fa5c49 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
@@ -17,37 +17,43 @@ const truncatableServiceStub: any = {
};
const mockItemWithAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithAuthorAndDate.hitHighlights = [];
+mockItemWithAuthorAndDate.hitHighlights = {};
mockItemWithAuthorAndDate.dspaceObject = Object.assign(new Item(), {
bitstreams: observableOf({}),
- metadata: [
- {
- key: 'dc.contributor.author',
- language: 'en_US',
- value: 'Smith, Donald'
- },
- {
- key: 'dc.date.issued',
- language: null,
- value: '2015-06-26'
- }]
+ metadata: {
+ 'dc.contributor.author': [
+ {
+ language: 'en_US',
+ value: 'Smith, Donald'
+ }
+ ],
+ 'dc.date.issued': [
+ {
+ language: null,
+ value: '2015-06-26'
+ }
+ ]
+ }
});
const mockItemWithoutAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutAuthorAndDate.hitHighlights = [];
+mockItemWithoutAuthorAndDate.hitHighlights = {};
mockItemWithoutAuthorAndDate.dspaceObject = Object.assign(new Item(), {
bitstreams: observableOf({}),
- metadata: [
- {
- key: 'dc.title',
- language: 'en_US',
- value: 'This is just another title'
- },
- {
- key: 'dc.type',
- language: null,
- value: 'Article'
- }]
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'dc.type': [
+ {
+ language: null,
+ value: 'Article'
+ }
+ ]
+ }
});
describe('ItemSearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index 5fd1c87edd..0901b7b8cc 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -2,12 +2,11 @@ import { Component, Inject } from '@angular/core';
import { SearchResult } from '../../../+search-page/search-result.model';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Metadatum } from '../../../core/shared/metadatum.model';
-import { isEmpty, hasNoValue, hasValue } from '../../empty.util';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
import { TruncatableService } from '../../truncatable/truncatable.service';
import { Observable } from 'rxjs';
+import { Metadata } from '../../../core/shared/metadata.model';
@Component({
selector: 'ds-search-result-grid-element',
@@ -22,39 +21,24 @@ export class SearchResultGridElementComponent
, K exten
this.dso = this.object.dspaceObject;
}
- getValues(keys: string[]): string[] {
- const results: string[] = new Array();
- this.object.hitHighlights.forEach(
- (md: Metadatum) => {
- if (keys.indexOf(md.key) > -1) {
- results.push(md.value);
- }
- }
- );
- if (isEmpty(results)) {
- this.dso.filterMetadata(keys).forEach(
- (md: Metadatum) => {
- results.push(md.value);
- }
- );
- }
- return results;
+ /**
+ * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {string[]} the matching string values or an empty array.
+ */
+ allMetadataValues(keyOrKeys: string | string[]): string[] {
+ return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
- getFirstValue(key: string): string {
- let result: string;
- this.object.hitHighlights.some(
- (md: Metadatum) => {
- if (key === md.key) {
- result = md.value;
- return true;
- }
- }
- );
- if (hasNoValue(result)) {
- result = this.dso.findMetadata(key);
- }
- return result;
+ /**
+ * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {string} the first matching string value, or `undefined`.
+ */
+ firstMetadataValue(keyOrKeys: string | string[]): string {
+ return Metadata.firstValue([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
isCollapsed(): Observable {
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
index de53f2e095..54b58e131a 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
import { By } from '@angular/platform-browser';
import { TruncatePipe } from '../../utils/truncate.pipe';
-import { Metadatum } from '../../../core/shared/metadatum.model';
import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
import { BrowseEntry } from '../../../core/shared/browse-entry.model';
@@ -33,7 +32,7 @@ describe('MetadataListElementComponent', () => {
browseEntryListElementComponent = fixture.componentInstance;
}));
- describe('When the metadatum is loaded', () => {
+ describe('When the metadata is loaded', () => {
beforeEach(() => {
browseEntryListElementComponent.object = mockValue;
fixture.detectChanges();
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
index a31af1e50c..bde6b4b97a 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
@@ -8,21 +8,25 @@ let collectionListElementComponent: CollectionListElementComponent;
let fixture: ComponentFixture;
const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
- metadata: [
- {
- key: 'dc.description.abstract',
- language: 'en_US',
- value: 'Short description'
- }]
+ metadata: {
+ 'dc.description.abstract': [
+ {
+ language: 'en_US',
+ value: 'Short description'
+ }
+ ]
+ }
});
const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
- metadata: [
- {
- key: 'dc.title',
- language: 'en_US',
- value: 'Test title'
- }]
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'Test title'
+ }
+ ]
+ }
});
describe('CollectionListElementComponent', () => {
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
index 08147d8573..46ba27eb00 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
@@ -8,21 +8,25 @@ let communityListElementComponent: CommunityListElementComponent;
let fixture: ComponentFixture;
const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
- metadata: [
- {
- key: 'dc.description.abstract',
- language: 'en_US',
- value: 'Short description'
- }]
+ metadata: {
+ 'dc.description.abstract': [
+ {
+ language: 'en_US',
+ value: 'Short description'
+ }
+ ]
+ }
});
const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
- metadata: [
- {
- key: 'dc.title',
- language: 'en_US',
- value: 'Test title'
- }]
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'Test title'
+ }
+ ]
+ }
});
describe('CommunityListElementComponent', () => {
diff --git a/src/app/shared/object-list/item-list-element/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-list-element.component.html
index 711ce19037..8179b77629 100644
--- a/src/app/shared/object-list/item-list-element/item-list-element.component.html
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.html
@@ -1,23 +1,23 @@
- {{object.findMetadata("dc.title")}}
+ {{object.firstMetadataValue("dc.title")}}
-
- {{authorMd.value}}
+ {{author}}
;
- ({{object.findMetadata("dc.publisher")}}, {{object.findMetadata("dc.date.issued")}})
+ ({{object.firstMetadataValue("dc.publisher")}}, {{object.firstMetadataValue("dc.date.issued")}})
-
- {{object.findMetadata("dc.description.abstract")}}
+
+ {{object.firstMetadataValue("dc.description.abstract")}}
+
+ [innerHTML]="firstMetadataValue('dc.description.abstract')">
-
\ No newline at end of file
+
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
index bdc8ebcecf..8567fc1782 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
@@ -17,37 +17,43 @@ const truncatableServiceStub: any = {
};
const mockItemWithAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithAuthorAndDate.hitHighlights = [];
+mockItemWithAuthorAndDate.hitHighlights = {};
mockItemWithAuthorAndDate.dspaceObject = Object.assign(new Item(), {
bitstreams: observableOf({}),
- metadata: [
- {
- key: 'dc.contributor.author',
- language: 'en_US',
- value: 'Smith, Donald'
- },
- {
- key: 'dc.date.issued',
- language: null,
- value: '2015-06-26'
- }]
+ metadata: {
+ 'dc.contributor.author': [
+ {
+ language: 'en_US',
+ value: 'Smith, Donald'
+ }
+ ],
+ 'dc.date.issued': [
+ {
+ language: null,
+ value: '2015-06-26'
+ }
+ ]
+ }
});
const mockItemWithoutAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutAuthorAndDate.hitHighlights = [];
+mockItemWithoutAuthorAndDate.hitHighlights = {};
mockItemWithoutAuthorAndDate.dspaceObject = Object.assign(new Item(), {
bitstreams: observableOf({}),
- metadata: [
- {
- key: 'dc.title',
- language: 'en_US',
- value: 'This is just another title'
- },
- {
- key: 'dc.type',
- language: null,
- value: 'Article'
- }]
+ metadata: {
+ 'dc.title': [
+ {
+ language: 'en_US',
+ value: 'This is just another title'
+ }
+ ],
+ 'dc.type': [
+ {
+ language: null,
+ value: 'Article'
+ }
+ ]
+ }
});
describe('ItemSearchResultListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index 6a3b698dd6..2a16b0b754 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -3,11 +3,10 @@ import { Observable } from 'rxjs';
import { SearchResult } from '../../../+search-page/search-result.model';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Metadatum } from '../../../core/shared/metadatum.model';
-import { hasNoValue, isEmpty } from '../../empty.util';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
import { TruncatableService } from '../../truncatable/truncatable.service';
+import { Metadata } from '../../../core/shared/metadata.model';
@Component({
selector: 'ds-search-result-list-element',
@@ -22,39 +21,24 @@ export class SearchResultListElementComponent
, K exten
this.dso = this.object.dspaceObject;
}
- getValues(keys: string[]): string[] {
- const results: string[] = new Array();
- this.object.hitHighlights.forEach(
- (md: Metadatum) => {
- if (keys.indexOf(md.key) > -1) {
- results.push(md.value);
- }
- }
- );
- if (isEmpty(results)) {
- this.dso.filterMetadata(keys).forEach(
- (md: Metadatum) => {
- results.push(md.value);
- }
- );
- }
- return results;
+ /**
+ * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {string[]} the matching string values or an empty array.
+ */
+ allMetadataValues(keyOrKeys: string | string[]): string[] {
+ return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
- getFirstValue(key: string): string {
- let result: string;
- this.object.hitHighlights.some(
- (md: Metadatum) => {
- if (key === md.key) {
- result = md.value;
- return true;
- }
- }
- );
- if (hasNoValue(result)) {
- result = this.dso.findMetadata(key);
- }
- return result;
+ /**
+ * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+ *
+ * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+ * @returns {string} the first matching string value, or `undefined`.
+ */
+ firstMetadataValue(keyOrKeys: string | string[]): string {
+ return Metadata.firstValue([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
}
isCollapsed(): Observable {
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 004d0c5b21..b164abee1f 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -30,6 +30,7 @@ describe('SearchFormComponent', () => {
});
it('should display scopes when available with default and all scopes', () => {
+
comp.scopes = objects;
fixture.detectChanges();
const select: HTMLElement = de.query(By.css('select')).nativeElement;
@@ -121,33 +122,38 @@ export const objects: DSpaceObject[] = [
id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
type: ResourceType.Community,
- metadata: [
- {
- key: 'dc.description',
- language: null,
- value: ''
- },
- {
- key: 'dc.description.abstract',
- language: null,
- value: 'This is a test community to hold content for the OR2017 demostration'
- },
- {
- key: 'dc.description.tableofcontents',
- language: null,
- value: ''
- },
- {
- key: 'dc.rights',
- language: null,
- value: ''
- },
- {
- key: 'dc.title',
- language: null,
- value: 'OR2017 - Demonstration'
- }
- ]
+ metadata: {
+ 'dc.description': [
+ {
+ language: null,
+ value: ''
+ }
+ ],
+ 'dc.description.abstract': [
+ {
+ language: null,
+ value: 'This is a test community to hold content for the OR2017 demostration'
+ }
+ ],
+ 'dc.description.tableofcontents': [
+ {
+ language: null,
+ value: ''
+ }
+ ],
+ 'dc.rights': [
+ {
+ language: null,
+ value: ''
+ }
+ ],
+ 'dc.title': [
+ {
+ language: null,
+ value: 'OR2017 - Demonstration'
+ }
+ ]
+ }
}),
Object.assign(new Community(),
{
@@ -170,33 +176,38 @@ export const objects: DSpaceObject[] = [
id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
type: ResourceType.Community,
- metadata: [
- {
- key: 'dc.description',
- language: null,
- value: 'This is the introductory text for the Sample Community on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).
\r\nDSpace Communities may contain one or more Sub-Communities or Collections (of Items).
\r\nThis particular Community has its own logo (the DuraSpace logo).
'
- },
- {
- key: 'dc.description.abstract',
- language: null,
- value: 'This is a sample top-level community'
- },
- {
- key: 'dc.description.tableofcontents',
- language: null,
- value: 'This is the news section for this Sample Community. System or Community Administrators (of this Community) can edit this News field.
'
- },
- {
- key: 'dc.rights',
- language: null,
- value: 'If this Community had special copyright text to display, it would be displayed here.
'
- },
- {
- key: 'dc.title',
- language: null,
- value: 'Sample Community'
- }
- ]
+ metadata: {
+ 'dc.description': [
+ {
+ language: null,
+ value: 'This is the introductory text for the Sample Community on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).
\r\nDSpace Communities may contain one or more Sub-Communities or Collections (of Items).
\r\nThis particular Community has its own logo (the DuraSpace logo).
'
+ }
+ ],
+ 'dc.description.abstract': [
+ {
+ language: null,
+ value: 'This is a sample top-level community'
+ }
+ ],
+ 'dc.description.tableofcontents': [
+ {
+ language: null,
+ value: 'This is the news section for this Sample Community. System or Community Administrators (of this Community) can edit this News field.
'
+ }
+ ],
+ 'dc.rights': [
+ {
+ language: null,
+ value: 'If this Community had special copyright text to display, it would be displayed here.
'
+ }
+ ],
+ 'dc.title': [
+ {
+ language: null,
+ value: 'Sample Community'
+ }
+ ]
+ }
}
)
];