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

Fix issue with workspaceitem and workflowitem detail search components

Browse Source
This commit is contained in:
Giuseppe Digilio
2021-01-15 14:05:40 +01:00
parent 44454ec378
commit d8df9c46a5
4 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
View File

@@ -10,6 +10,8 @@ import { WorkflowItem } from '../../../../core/submission/models/workflowitem.mo
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
import { getMockLinkService } from '../../../mocks/link-service.mock';
import { LinkService } from '../../../../core/cache/builders/link.service';
let component: WorkflowItemSearchResultDetailElementComponent;
let fixture: ComponentFixture<WorkflowItemSearchResultDetailElementComponent>;
@@ -18,6 +20,7 @@ const compIndex = 1;
const mockResultObject: WorkflowItemSearchResult = new WorkflowItemSearchResult();
mockResultObject.hitHighlights = {};
const linkService = getMockLinkService();
const item = Object.assign(new Item(), {
bundles: observableOf({}),
@@ -58,7 +61,8 @@ describe('WorkflowItemSearchResultDetailElementComponent', () => {
declarations: [WorkflowItemSearchResultDetailElementComponent],
providers: [
{ provide: 'objectElementProvider', useValue: (mockResultObject) },
{ provide: 'indexElementProvider', useValue: (compIndex) }
{ provide: 'indexElementProvider', useValue: (compIndex) },
{ provide: LinkService, useValue: linkService }
],
schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(WorkflowItemSearchResultDetailElementComponent, {

9
src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
View File

@@ -11,6 +11,8 @@ import { find } from 'rxjs/operators';
import { isNotUndefined } from '../../../empty.util';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
import { LinkService } from '../../../../core/cache/builders/link.service';
import { followLink } from '../../../utils/follow-link-config.model';
/**
* This component renders workflowitem object for the search result in the detail view.
@@ -34,11 +36,18 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
*/
public status = MyDspaceItemStatusType.WORKFLOW;
constructor(
protected linkService: LinkService
) {
super();
}
/**
* Initialize all instance variables
*/
ngOnInit() {
super.ngOnInit();
this.linkService.resolveLink(this.dso, followLink('item'));
this.initItem(this.dso.item as Observable<RemoteData<Item>>);
}

6
src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
View File

@@ -10,6 +10,8 @@ import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
import { getMockLinkService } from '../../../mocks/link-service.mock';
import { LinkService } from '../../../../core/cache/builders/link.service';
let component: WorkspaceItemSearchResultDetailElementComponent;
let fixture: ComponentFixture<WorkspaceItemSearchResultDetailElementComponent>;
@@ -18,6 +20,7 @@ const compIndex = 1;
const mockResultObject: WorkflowItemSearchResult = new WorkflowItemSearchResult();
mockResultObject.hitHighlights = {};
const linkService = getMockLinkService();
const item = Object.assign(new Item(), {
bundles: observableOf({}),
@@ -58,7 +61,8 @@ describe('WorkspaceItemSearchResultDetailElementComponent', () => {
declarations: [WorkspaceItemSearchResultDetailElementComponent],
providers: [
{ provide: 'objectElementProvider', useValue: (mockResultObject) },
{ provide: 'indexElementProvider', useValue: (compIndex) }
{ provide: 'indexElementProvider', useValue: (compIndex) },
{ provide: LinkService, useValue: linkService }
],
schemas: [NO_ERRORS_SCHEMA]
}).overrideComponent(WorkspaceItemSearchResultDetailElementComponent, {

9
src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
View File

@@ -12,6 +12,8 @@ import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspa
import { ViewMode } from '../../../../core/shared/view-mode.model';
import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
import { followLink } from '../../../utils/follow-link-config.model';
import { LinkService } from '../../../../core/cache/builders/link.service';
/**
* This component renders workspace item object for the search result in the detail view.
@@ -35,11 +37,18 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
*/
status = MyDspaceItemStatusType.WORKSPACE;
constructor(
protected linkService: LinkService
) {
super();
}
/**
* Initialize all instance variables
*/
ngOnInit() {
super.ngOnInit();
this.linkService.resolveLink(this.dso, followLink('item'));
this.initItem(this.dso.item as Observable<RemoteData<Item>>);
}