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

Removed view detail button from pool task

Browse Source
This commit is contained in:
Giuseppe Digilio
2019-03-28 14:14:57 +01:00
parent 6b40efdf99
commit c613fb2311
2 changed files with 7 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.html
View File

@@ -4,11 +4,4 @@
[showSubmitter]="true"
[status]="status"></ds-item-list-preview>
<ds-pool-task-actions [object]="dso">
<button type="button"
class="btn btn-primary mt-1 mb-3"
(click)="view()">
<span><i class='fas fa-eye'></i> {{"mydspace.view-btn" | translate}}</span>
</button>
</ds-pool-task-actions>
<ds-pool-task-actions [object]="dso"></ds-pool-task-actions>

45
src/app/shared/object-list/my-dspace-result-list-element/pt-my-dspace-result/pt-my-dspace-result-list-element.component.ts
View File

@@ -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<PoolTaskMyDSpaceResult, PoolTask> implements OnDestroy, OnInit {
export class PoolTaskMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<PoolTaskMyDSpaceResult, PoolTask> 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();
}
}
}