diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.scss b/src/app/+search-page/search-sidebar/search-sidebar.component.scss index 960a8dfa8c..35ce5eebce 100644 --- a/src/app/+search-page/search-sidebar/search-sidebar.component.scss +++ b/src/app/+search-page/search-sidebar/search-sidebar.component.scss @@ -8,11 +8,12 @@ ds-view-mode-switch { margin-bottom: $spacer; } - ds-search-switch-configuration { - margin-bottom: 2*$spacer !important; - } - .sidebar-content > *:not(:last-child) { + .sidebar-content > *:not(:last-child):not(ds-search-switch-configuration) { margin-bottom: 4*$spacer; display: block; } + ds-search-switch-configuration { + margin-bottom: 2*$spacer; + display: block; + } } diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts index 57cd8c2cb9..9466b6e812 100644 --- a/src/app/core/data/base-response-parsing.service.ts +++ b/src/app/core/data/base-response-parsing.service.ts @@ -162,8 +162,6 @@ export abstract class BaseResponseParsingService { } protected isSuccessStatus(statusCode: number) { - return (statusCode === 201 - || statusCode === 200 - || statusCode === 204) + return statusCode >= 200 && statusCode < 300; } } diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts index 207a09225b..753ce2ddd5 100644 --- a/src/app/core/tasks/tasks.service.spec.ts +++ b/src/app/core/tasks/tasks.service.spec.ts @@ -117,7 +117,7 @@ describe('TasksService', () => { describe('deleteById', () => { - it('should configure a new TaskPostRequest', () => { + it('should configure a new TaskDeleteRequest', () => { const scopeId = '1234'; const expected = new TaskDeleteRequest(requestService.generateRequestId(), `${taskEndpoint}/${linkPath}/${scopeId}`, null); scheduler.schedule(() => service.deleteById('testTask', scopeId).subscribe()); diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html index 35ebb5f1bf..47674025ca 100644 --- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html +++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html @@ -1,3 +1,3 @@
- {{'submission.workflow.tasks.generic.submitter' | translate}} : {{(submitter$ | async)?.name}} + {{'submission.workflow.tasks.generic.submitter' | translate}} : {{(submitter$ | async)?.name}}
diff --git a/src/app/shared/object-detail/object-detail.component.scss b/src/app/shared/object-detail/object-detail.component.scss index 19de7e6b30..9a077e3e08 100644 --- a/src/app/shared/object-detail/object-detail.component.scss +++ b/src/app/shared/object-detail/object-detail.component.scss @@ -6,23 +6,4 @@ ds-wrapper-detail-element ::ng-deep { height: $card-thumbnail-height; width: 100%; } - .card-title { - line-height: $headings-line-height; - height: ($headings-line-height*3) +em; - overflow: hidden; - text-overflow: ellipsis; - } - .item-abstract { - line-height: $line-height-base; - height: ($line-height-base*5)+em; - overflow: hidden; - text-overflow: ellipsis; - } - .item-authors{ - line-height: $line-height-base; - height: ($line-height-base*1.5)+em; - } - div.card { - margin-bottom: 20px; - } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html index b2fc3812cd..c5b3f086f9 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html @@ -3,17 +3,17 @@ -

+

( - ) + [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"> + ) - {{'mydspace.results.no-authors' | translate}} - + {{'mydspace.results.no-authors' | translate}} + @@ -22,8 +22,8 @@ - +
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index a92939b85e..13876ab46a 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -3,7 +3,6 @@ import { Component, Input } from '@angular/core'; import { Item } from '../../../../core/shared/item.model'; import { fadeInOut } from '../../../animations/fade'; import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type'; -import { Metadata } from '../../../../core/shared/metadata.utils'; import { MyDSpaceResult } from '../../../../+my-dspace-page/my-dspace-result.model'; /** @@ -37,24 +36,4 @@ export class ItemListPreviewComponent { */ @Input() showSubmitter = false; - /** - * 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.item.metadata], keyOrKeys); - } - - /** - * 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.item.metadata], keyOrKeys); - } - }