From c613fb231138b2eebb94a322c20b96b6eb452d26 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 28 Mar 2019 14:14:57 +0100 Subject: [PATCH] Removed view detail button from pool task --- ...-dspace-result-list-element.component.html | 9 +--- ...my-dspace-result-list-element.component.ts | 45 +++---------------- 2 files changed, 7 insertions(+), 47 deletions(-) diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.html index 13f1e83962..b6771db087 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.html @@ -4,11 +4,4 @@ [showSubmitter]="true" [status]="status"> - - - - + diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.ts index c3c27a53ae..123032b86f 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.ts @@ -1,20 +1,19 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; -import { find, first } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { find } from 'rxjs/operators'; import { renderElementsFor } from '../../../object-collection/shared/dso-element-decorator'; import { MyDSpaceResultListElementComponent, } from '../my-dspace-result-list-element.component'; import { ViewMode } from '../../../../core/shared/view-mode.model'; import { RemoteData } from '../../../../core/data/remote-data'; -import { hasValue, isNotUndefined } from '../../../empty.util'; +import { isNotUndefined } from '../../../empty.util'; import { ListableObject } from '../../../object-collection/shared/listable-object.model'; import { Workflowitem } from '../../../../core/submission/models/workflowitem.model'; import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { PoolTaskMyDSpaceResult } from '../../../object-collection/shared/pool-task-my-dspace-result.model'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type'; -import { MYDSPACE_ROUTE } from '../../../../+my-dspace-page/my-dspace-page.component'; @Component({ selector: 'ds-pooltask-my-dspace-result-list-element', @@ -24,11 +23,9 @@ import { MYDSPACE_ROUTE } from '../../../../+my-dspace-page/my-dspace-page.compo @renderElementsFor(PoolTaskMyDSpaceResult, ViewMode.List) @renderElementsFor(PoolTask, ViewMode.List) -export class PoolTaskMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent implements OnDestroy, OnInit { +export class PoolTaskMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent implements OnInit { public status = MyDspaceItemStatusType.WAITING_CONTROLLER; public workFlow: Workflowitem; - public viewMode: ViewMode = ViewMode.List; - private sub: Subscription; constructor(@Inject('objectElementProvider') public listable: ListableObject, @Inject('indexElementProvider') public index: number, @@ -48,34 +45,4 @@ export class PoolTaskMyDSpaceResultListElementComponent extends MyDSpaceResultLi this.workFlow = rd.payload; }); } - - switchView() { - this.viewMode = (this.viewMode === ViewMode.List) ? ViewMode.Detail : ViewMode.List; - } - - view() { - this.sub = this.route.queryParams.pipe( - first() - ).subscribe((params) => { - const pageSize = params.pageSize || 1; - const page = (pageSize * this.dsoIndex ) + 1; - - const navigationExtras: NavigationExtras = { - queryParams: { - view: ViewMode.Detail, - page, - pageSize - }, - queryParamsHandling: 'merge' - }; - this.router.navigate([MYDSPACE_ROUTE], navigationExtras); - }); - } - - ngOnDestroy() { - if (hasValue(this.sub)) { - this.sub.unsubscribe(); - } - } - }