diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.html b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.html deleted file mode 100644 index 8403e632db..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.html +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.spec.ts deleted file mode 100644 index a2461bffda..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.spec.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { TranslateModule } from '@ngx-translate/core'; -import { Observable } from 'rxjs/internal/Observable'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { Bitstream } from '../../../../../core/shared/bitstream.model'; -import { Item } from '../../../../../core/shared/item.model'; -import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; -import { SharedModule } from '../../../../../shared/shared.module'; -import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils'; -import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; -import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { RouterTestingModule } from '@angular/router/testing'; -import { TaskAdminWorkflowSearchResultGridElementComponent } from './task-admin-workflow-search-result-grid-element.component'; -import { TaskObject } from '../../../../../core/tasks/models/task-object.model'; -import { SearchResult } from '../../../../../shared/search/search-result.model'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { getMockLinkService } from '../../../../../shared/mocks/mock-link-service'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { followLink } from '../../../../../shared/utils/follow-link-config.model'; - -describe('TaskAdminWorkflowSearchResultGridElementComponent', () => { - let component: TaskAdminWorkflowSearchResultGridElementComponent; - let fixture: ComponentFixture; - let id; - let searchResult; - let linkService; - - const mockBitstreamDataService = { - getThumbnailFor(item: Item): Observable> { - return createSuccessfulRemoteDataObject$(new Bitstream()); - } - }; - - function init() { - id = '780b2588-bda5-4112-a1cd-0b15000a5339'; - searchResult = new SearchResult(); - searchResult.indexableObject = new TaskObject(); - searchResult.indexableObject.workflowitem = createSuccessfulRemoteDataObject$(new WorkflowItem()); - searchResult.indexableObject.uuid = id; - linkService = getMockLinkService(); - } - - beforeEach(async(() => { - init(); - TestBed.configureTestingModule( - { - declarations: [TaskAdminWorkflowSearchResultGridElementComponent], - imports: [ - NoopAnimationsModule, - TranslateModule.forRoot(), - RouterTestingModule.withRoutes([]), - SharedModule - ], - providers: [ - { provide: TruncatableService, useValue: mockTruncatableService }, - { provide: BitstreamDataService, useValue: mockBitstreamDataService }, - { provide: LinkService, useValue: linkService }, - ], - schemas: [NO_ERRORS_SCHEMA] - }) - .compileComponents(); - })); - - beforeEach(() => { - linkService.resolveLink.and.callFake((a) => a); - fixture = TestBed.createComponent(TaskAdminWorkflowSearchResultGridElementComponent); - component = fixture.componentInstance; - component.object = searchResult; - component.linkTypes = CollectionElementLinkType; - component.index = 0; - component.viewModes = ViewMode; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should retrieve the workflow item using the link service', () => { - expect(linkService.resolveLink).toHaveBeenCalledWith(searchResult.indexableObject, followLink('workflowitem')); - }); -}); diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.ts deleted file mode 100644 index cc002c87c0..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { Context } from '../../../../../core/shared/context.model'; -import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; -import { PoolTaskSearchResult } from '../../../../../shared/object-collection/shared/pool-task-search-result.model'; -import { Observable } from 'rxjs'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators'; -import { SearchResult } from '../../../../../shared/search/search-result.model'; -import { TaskObject } from '../../../../../core/tasks/models/task-object.model'; -import { ClaimedTaskSearchResult } from '../../../../../shared/object-collection/shared/claimed-task-search-result.model'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; -import { followLink } from '../../../../../shared/utils/follow-link-config.model'; -import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; - -@listableObjectComponent(PoolTaskSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch) -@listableObjectComponent(ClaimedTaskSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch) -@Component({ - selector: 'ds-task-admin-workflow-search-result-grid-element', - styleUrls: ['./task-admin-workflow-search-result-grid-element.component.scss'], - templateUrl: './task-admin-workflow-search-result-grid-element.component.html' -}) -/** - * The component for displaying a list element for an task search result on the admin workflow search page - */ -export class TaskAdminWorkflowSearchResultGridElementComponent extends SearchResultGridElementComponent, TaskObject> implements OnInit { - /** - * The workflow item linked to the task object - */ - public wfi$: Observable; - - constructor(private linkService: LinkService, protected truncatableService: TruncatableService, protected bitstreamService: BitstreamDataService) { - super(truncatableService, bitstreamService); - } - - /** - * Initialize the workflow item - */ - ngOnInit(): void { - super.ngOnInit(); - this.dso = this.linkService.resolveLink(this.dso, followLink('workflowitem')); - this.wfi$ = (this.dso.workflowitem as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); - } -} diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.html b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html similarity index 75% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.html rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html index d6b76c0a8d..87bae0c261 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.html +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html @@ -7,6 +7,6 @@
  • - +
diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.scss b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.scss similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component.scss rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.scss diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts similarity index 81% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.spec.ts rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts index 4d064444e5..e27a35654b 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.spec.ts +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.spec.ts @@ -7,7 +7,7 @@ import { TruncatableService } from '../../../../../shared/truncatable/truncatabl import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { RouterTestingModule } from '@angular/router/testing'; -import { WorkflowItemAdminWorkflowGridElementComponent } from './workflow-item-admin-workflow-grid-element.component'; +import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './workflow-item-search-result-admin-workflow-grid-element.component'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { getMockLinkService } from '../../../../../shared/mocks/mock-link-service'; @@ -18,8 +18,8 @@ import { PublicationGridElementComponent } from '../../../../../shared/object-gr import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive'; describe('WorkflowItemAdminWorkflowGridElementComponent', () => { - let component: WorkflowItemAdminWorkflowGridElementComponent; - let fixture: ComponentFixture; + let component: WorkflowItemSearchResultAdminWorkflowGridElementComponent; + let fixture: ComponentFixture; let id; let wfi; let itemRD$; @@ -37,7 +37,7 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => { init(); TestBed.configureTestingModule( { - declarations: [WorkflowItemAdminWorkflowGridElementComponent, PublicationGridElementComponent, ListableObjectDirective], + declarations: [WorkflowItemSearchResultAdminWorkflowGridElementComponent, PublicationGridElementComponent, ListableObjectDirective], imports: [ NoopAnimationsModule, TranslateModule.forRoot(), @@ -49,7 +49,7 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => { ], schemas: [NO_ERRORS_SCHEMA] }) - .overrideComponent(WorkflowItemAdminWorkflowGridElementComponent, { + .overrideComponent(WorkflowItemSearchResultAdminWorkflowGridElementComponent, { set: { entryComponents: [PublicationGridElementComponent] } @@ -59,7 +59,7 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => { beforeEach(() => { linkService.resolveLink.and.callFake((a) => a); - fixture = TestBed.createComponent(WorkflowItemAdminWorkflowGridElementComponent); + fixture = TestBed.createComponent(WorkflowItemSearchResultAdminWorkflowGridElementComponent); component = fixture.componentInstance; component.object = wfi; component.linkTypes = CollectionElementLinkType; diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts similarity index 69% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.ts rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts index 2139590e6e..7abe99cf52 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.ts +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts @@ -1,44 +1,32 @@ -import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild, ViewContainerRef } from '@angular/core'; +import { Component, ComponentFactoryResolver, ElementRef, ViewChild } from '@angular/core'; import { Item } from '../../../../../core/shared/item.model'; import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { getListableObjectComponent, listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; import { Context } from '../../../../../core/shared/context.model'; -import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; -import { getItemEditPath } from '../../../../../+item-page/item-page-routing.module'; -import { URLCombiner } from '../../../../../core/url-combiner/url-combiner'; -import { - ITEM_EDIT_DELETE_PATH, - ITEM_EDIT_MOVE_PATH, - ITEM_EDIT_PRIVATE_PATH, - ITEM_EDIT_PUBLIC_PATH, - ITEM_EDIT_REINSTATE_PATH, - ITEM_EDIT_WITHDRAW_PATH -} from '../../../../../+item-page/edit-item-page/edit-item-page.routing.module'; import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service'; import { GenericConstructor } from '../../../../../core/shared/generic-constructor'; import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive'; -import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; import { Observable } from 'rxjs'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { followLink } from '../../../../../shared/utils/follow-link-config.model'; import { RemoteData } from '../../../../../core/data/remote-data'; import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators'; import { take } from 'rxjs/operators'; +import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; -@listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch) +@listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch) @Component({ - selector: 'ds-workflow-item-admin-workflow-grid-element', - styleUrls: ['./workflow-item-admin-workflow-grid-element.component.scss'], - templateUrl: './workflow-item-admin-workflow-grid-element.component.html' + selector: 'ds-workflow-item-search-result-admin-workflow-grid-element', + styleUrls: ['./workflow-item-search-result-admin-workflow-grid-element.component.scss'], + templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html' }) /** * The component for displaying a grid element for an workflow item on the admin workflow search page */ -export class WorkflowItemAdminWorkflowGridElementComponent extends AbstractListableElementComponent { +export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends SearchResultGridElementComponent { /** * Directive used to render the dynamic component in */ @@ -59,8 +47,13 @@ export class WorkflowItemAdminWorkflowGridElementComponent extends AbstractLista */ public item$: Observable; - constructor(private componentFactoryResolver: ComponentFactoryResolver, private linkService: LinkService) { - super(); + constructor( + private componentFactoryResolver: ComponentFactoryResolver, + private linkService: LinkService, + protected truncatableService: TruncatableService, + protected bitstreamDataService: BitstreamDataService + ) { + super(truncatableService, bitstreamDataService); } /** @@ -68,8 +61,9 @@ export class WorkflowItemAdminWorkflowGridElementComponent extends AbstractLista * Initialize the item object from the workflow item */ ngOnInit(): void { - this.object = this.linkService.resolveLink(this.object, followLink('item')); - this.item$ = (this.object.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); + super.ngOnInit(); + this.dso = this.linkService.resolveLink(this.dso, followLink('item')); + this.item$ = (this.dso.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); this.item$.pipe(take(1)).subscribe((item: Item) => { const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent(item)); diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.html b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.html deleted file mode 100644 index c60347b08a..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.html +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.scss b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.spec.ts deleted file mode 100644 index f67e653ea4..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.spec.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; -import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils'; -import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; -import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { RouterTestingModule } from '@angular/router/testing'; -import { TaskAdminWorkflowSearchResultListElementComponent } from './task-admin-workflow-search-result-list-element.component'; -import { SearchResult } from '../../../../../shared/search/search-result.model'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { getMockLinkService } from '../../../../../shared/mocks/mock-link-service'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { TaskObject } from '../../../../../core/tasks/models/task-object.model'; -import { followLink } from '../../../../../shared/utils/follow-link-config.model'; - -describe('TaskAdminWorkflowSearchResultListElementComponent', () => { - let component: TaskAdminWorkflowSearchResultListElementComponent; - let fixture: ComponentFixture; - let id; - let searchResult; - let linkService; - - function init() { - id = '780b2588-bda5-4112-a1cd-0b15000a5339'; - searchResult = new SearchResult(); - searchResult.indexableObject = new TaskObject(); - searchResult.indexableObject.workflowitem = createSuccessfulRemoteDataObject$(new WorkflowItem()); - searchResult.indexableObject.uuid = id; - linkService = getMockLinkService(); - } - - beforeEach(async(() => { - init(); - TestBed.configureTestingModule({ - imports: [ - TranslateModule.forRoot(), - RouterTestingModule.withRoutes([]) - ], - declarations: [TaskAdminWorkflowSearchResultListElementComponent], - providers: [{ provide: TruncatableService, useValue: {} }, - { provide: LinkService, useValue: linkService } - ], - schemas: [NO_ERRORS_SCHEMA] - }) - .compileComponents(); - })); - - beforeEach(() => { - linkService.resolveLink.and.callFake((a) => a); - fixture = TestBed.createComponent(TaskAdminWorkflowSearchResultListElementComponent); - component = fixture.componentInstance; - component.object = searchResult; - component.linkTypes = CollectionElementLinkType; - component.index = 0; - component.viewModes = ViewMode; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should retrieve the workflow item using the link service', () => { - expect(linkService.resolveLink).toHaveBeenCalledWith(searchResult.indexableObject, followLink('workflowitem')); - }); -}); diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.ts deleted file mode 100644 index 04951f59eb..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { Component } from '@angular/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { Context } from '../../../../../core/shared/context.model'; -import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; -import { PoolTaskSearchResult } from '../../../../../shared/object-collection/shared/pool-task-search-result.model'; -import { Observable, pipe } from 'rxjs'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators'; -import { ClaimedTaskSearchResult } from '../../../../../shared/object-collection/shared/claimed-task-search-result.model'; -import { TaskObject } from '../../../../../core/tasks/models/task-object.model'; -import { SearchResult } from '../../../../../shared/search/search-result.model'; -import { followLink } from '../../../../../shared/utils/follow-link-config.model'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; - -@listableObjectComponent(PoolTaskSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch) -@listableObjectComponent(ClaimedTaskSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch) -@Component({ - selector: 'ds-task-admin-workflow-search-result-list-element', - styleUrls: ['./task-admin-workflow-search-result-list-element.component.scss'], - templateUrl: './task-admin-workflow-search-result-list-element.component.html' -}) -/** - * The component for displaying a grid element for an task search result on the admin workflow search page - */ -export class TaskAdminWorkflowSearchResultListElementComponent extends SearchResultListElementComponent, TaskObject> { - /** - * The workflow item linked to the task object - */ - public wfi$: Observable; - - constructor(private linkService: LinkService, protected truncatableService: TruncatableService) { - super(truncatableService); - } - - /** - * Initialize the workflow item - */ - ngOnInit(): void { - super.ngOnInit(); - this.dso = this.linkService.resolveLink(this.dso, followLink('workflowitem')); - this.wfi$ = (this.dso.workflowitem as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); - } -} diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.scss b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.ts deleted file mode 100644 index 835d6acfbb..0000000000 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ViewMode } from '../../../../../core/shared/view-mode.model'; -import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; -import { Context } from '../../../../../core/shared/context.model'; -import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component'; -import { Observable } from 'rxjs'; -import { LinkService } from '../../../../../core/cache/builders/link.service'; -import { followLink } from '../../../../../shared/utils/follow-link-config.model'; -import { RemoteData } from '../../../../../core/data/remote-data'; -import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators'; -import { Item } from '../../../../../core/shared/item.model'; - -@listableObjectComponent(WorkflowItem, ViewMode.ListElement, Context.AdminWorkflowSearch) -@Component({ - selector: 'ds-workflow-item-admin-workflow-list-element', - styleUrls: ['./workflow-item-admin-workflow-list-element.component.scss'], - templateUrl: './workflow-item-admin-workflow-list-element.component.html' -}) -/** - * The component for displaying a list element for an workflow item on the admin workflow search page - */ -export class WorkflowItemAdminWorkflowListElementComponent extends AbstractListableElementComponent implements OnInit { - - /** - * The item linked to the workflow item - */ - public item$: Observable; - - constructor(private linkService: LinkService) { - super(); - } - - /** - * Initialize the item object from the workflow item - */ - ngOnInit(): void { - this.object = this.linkService.resolveLink(this.object, followLink('item')); - this.item$ = (this.object.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); - } -} diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.html b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html similarity index 80% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.html rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html index f3502fe0ab..192cc751f2 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.html +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html @@ -7,4 +7,4 @@ [index]="index" [linkType]="linkType" [listID]="listID"> - + diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.scss b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.scss similarity index 100% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component.scss rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.scss diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.spec.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts similarity index 85% rename from src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.spec.ts rename to src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts index 10a05a8b30..5fb736c1fd 100644 --- a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component.spec.ts +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.spec.ts @@ -10,7 +10,7 @@ import { CollectionElementLinkType } from '../../../../../shared/object-collecti import { ViewMode } from '../../../../../core/shared/view-mode.model'; import { RouterTestingModule } from '@angular/router/testing'; import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; -import { WorkflowItemAdminWorkflowListElementComponent } from './workflow-item-admin-workflow-list-element.component'; +import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './workflow-item-search-result-admin-workflow-list-element.component'; import { LinkService } from '../../../../../core/cache/builders/link.service'; import { getMockLinkService } from '../../../../../shared/mocks/mock-link-service'; import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils'; @@ -20,8 +20,8 @@ import { PublicationGridElementComponent } from '../../../../../shared/object-gr import { AdminSidebarSectionComponent } from '../../../../admin-sidebar/admin-sidebar-section/admin-sidebar-section.component'; describe('WorkflowItemAdminWorkflowListElementComponent', () => { - let component: WorkflowItemAdminWorkflowListElementComponent; - let fixture: ComponentFixture; + let component: WorkflowItemSearchResultAdminWorkflowListElementComponent; + let fixture: ComponentFixture; let id; let wfi; let itemRD$; @@ -39,7 +39,7 @@ describe('WorkflowItemAdminWorkflowListElementComponent', () => { init(); TestBed.configureTestingModule( { - declarations: [WorkflowItemAdminWorkflowListElementComponent], + declarations: [WorkflowItemSearchResultAdminWorkflowListElementComponent], imports: [ NoopAnimationsModule, TranslateModule.forRoot(), @@ -56,7 +56,7 @@ describe('WorkflowItemAdminWorkflowListElementComponent', () => { beforeEach(() => { linkService.resolveLink.and.callFake((a) => a); - fixture = TestBed.createComponent(WorkflowItemAdminWorkflowListElementComponent); + fixture = TestBed.createComponent(WorkflowItemSearchResultAdminWorkflowListElementComponent); component = fixture.componentInstance; component.object = wfi; component.linkTypes = CollectionElementLinkType; diff --git a/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts new file mode 100644 index 0000000000..80225db09f --- /dev/null +++ b/src/app/+admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts @@ -0,0 +1,44 @@ +import { Component, OnInit } from '@angular/core'; +import { ViewMode } from '../../../../../core/shared/view-mode.model'; +import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator'; +import { Context } from '../../../../../core/shared/context.model'; +import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model'; +import { Observable } from 'rxjs'; +import { LinkService } from '../../../../../core/cache/builders/link.service'; +import { followLink } from '../../../../../shared/utils/follow-link-config.model'; +import { RemoteData } from '../../../../../core/data/remote-data'; +import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators'; +import { Item } from '../../../../../core/shared/item.model'; +import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component'; +import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; +import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model'; + +@listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch) +@Component({ + selector: 'ds-workflow-item-search-result-admin-workflow-list-element', + styleUrls: ['./workflow-item-search-result-admin-workflow-list-element.component.scss'], + templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html' +}) +/** + * The component for displaying a list element for an workflow item on the admin workflow search page + */ +export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends SearchResultListElementComponent implements OnInit { + + /** + * The item linked to the workflow item + */ + public item$: Observable; + + constructor(private linkService: LinkService, protected truncatableService: TruncatableService) { + super(truncatableService); + } + + /** + * Initialize the item object from the workflow item + */ + ngOnInit(): void { + super.ngOnInit(); + this.dso = this.linkService.resolveLink(this.dso, followLink('item')); + this.item$ = (this.dso.item as Observable>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload()); + } +} diff --git a/src/app/+admin/admin.module.ts b/src/app/+admin/admin.module.ts index cd10aad1ca..25b8bd4648 100644 --- a/src/app/+admin/admin.module.ts +++ b/src/app/+admin/admin.module.ts @@ -12,12 +12,10 @@ import { ItemAdminSearchResultGridElementComponent } from './admin-search-page/a import { CommunityAdminSearchResultGridElementComponent } from './admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component'; import { CollectionAdminSearchResultGridElementComponent } from './admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component'; import { ItemAdminSearchResultActionsComponent } from './admin-search-page/admin-search-results/item-admin-search-result-actions.component'; -import { WorkflowItemAdminWorkflowGridElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-admin-workflow-grid-element.component'; +import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component'; import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component'; -import { WorkflowItemAdminWorkflowListElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-admin-workflow-list-element.component'; +import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component'; import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component'; -import { TaskAdminWorkflowSearchResultGridElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/task-search-result/task-admin-workflow-search-result-grid-element.component'; -import { TaskAdminWorkflowSearchResultListElementComponent } from './admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/task-item-search-result/task-admin-workflow-search-result-list-element.component'; @NgModule({ imports: [ @@ -38,12 +36,10 @@ import { TaskAdminWorkflowSearchResultListElementComponent } from './admin-workf CollectionAdminSearchResultGridElementComponent, ItemAdminSearchResultActionsComponent, - WorkflowItemAdminWorkflowListElementComponent, - WorkflowItemAdminWorkflowGridElementComponent, - WorkflowItemAdminWorkflowActionsComponent, + WorkflowItemSearchResultAdminWorkflowListElementComponent, + WorkflowItemSearchResultAdminWorkflowGridElementComponent, + WorkflowItemAdminWorkflowActionsComponent - TaskAdminWorkflowSearchResultGridElementComponent, - TaskAdminWorkflowSearchResultListElementComponent, ], entryComponents: [ ItemAdminSearchResultListElementComponent, @@ -54,12 +50,9 @@ import { TaskAdminWorkflowSearchResultListElementComponent } from './admin-workf CollectionAdminSearchResultGridElementComponent, ItemAdminSearchResultActionsComponent, - WorkflowItemAdminWorkflowListElementComponent, - WorkflowItemAdminWorkflowGridElementComponent, - WorkflowItemAdminWorkflowActionsComponent, - - TaskAdminWorkflowSearchResultGridElementComponent, - TaskAdminWorkflowSearchResultListElementComponent, + WorkflowItemSearchResultAdminWorkflowListElementComponent, + WorkflowItemSearchResultAdminWorkflowGridElementComponent, + WorkflowItemAdminWorkflowActionsComponent ] }) export class AdminModule {