hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

79768: Fix tag: citation_abstract_html_url

Browse Source
This commit is contained in:
Yura Bondarenko
2021-06-04 14:08:20 +02:00
parent 67f8ce7849
commit 304d8f7386
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/core/metadata/metadata.service.spec.ts
View File

@@ -230,7 +230,6 @@ describe('MetadataService', () => {
tick(); tick();
expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document'); expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher'); expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher');
expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual([environment.ui.baseUrl, router.url].join(''));
expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download'); expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
})); }));
@@ -273,6 +272,22 @@ describe('MetadataService', () => {
}); });
describe('citation_abstract_html_url', () => {
it('should use dc.identifier.uri if available', fakeAsync(() => {
spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock, 'https://ddg.gg')));
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick();
expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('https://ddg.gg');
}));
it('should use current route as fallback', fakeAsync(() => {
spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock)));
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick();
expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
}));
});
describe('citation_pdf_url', () => { describe('citation_pdf_url', () => {
it('should link to primary Bitstream URL regardless of format', fakeAsync(() => { it('should link to primary Bitstream URL regardless of format', fakeAsync(() => {
spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock)); spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
@@ -328,6 +343,12 @@ describe('MetadataService', () => {
return publishedMockItem; return publishedMockItem;
}; };
const mockUri = (mockItem: Item, uri?: string): Item => {
const publishedMockItem = Object.assign(new Item(), mockItem) as Item;
publishedMockItem.metadata['dc.identifier.uri'] = [{ value: uri }] as MetadataValue[];
return publishedMockItem;
};
const mockBundleRD$ = (bitstreams: Bitstream[], primary?: Bitstream): Observable<RemoteData<Bundle>> => { const mockBundleRD$ = (bitstreams: Bitstream[], primary?: Bitstream): Observable<RemoteData<Bundle>> => {
return createSuccessfulRemoteDataObject$( return createSuccessfulRemoteDataObject$(
Object.assign(new Bundle(), { Object.assign(new Bundle(), {

7
src/app/core/metadata/metadata.service.ts
View File

@@ -274,8 +274,11 @@ export class MetadataService {
*/ */
private setCitationAbstractUrlTag(): void { private setCitationAbstractUrlTag(): void {
if (this.currentObject.value instanceof Item) { if (this.currentObject.value instanceof Item) {
const value = [environment.ui.baseUrl, this.router.url].join(''); let url = this.getMetaTagValue('dc.identifier.uri');
this.addMetaTag('citation_abstract_html_url', value); if (hasNoValue(url)) {
url = this.router.url; // Google should handle relative URL
}
this.addMetaTag('citation_abstract_html_url', url);
} }
} }