Added mydspace results components

This commit is contained in:
Giuseppe Digilio
2019-03-08 17:49:37 +01:00
parent d7ba427fc7
commit f0a6d7ac3d
59 changed files with 1175 additions and 12 deletions

View File

@@ -0,0 +1,7 @@
<ds-item-list-preview *ngIf="workFlow"
[item]="(workFlow.item | async)?.payload"
[object]="object"
[showSubmitter]="showSubmitter"
[status]="status"></ds-item-list-preview>
<ds-claimed-task-actions *ngIf="workFlow" [object]="dso"></ds-claimed-task-actions>

View File

@@ -0,0 +1,42 @@
import { Component } from '@angular/core';
import { Location, LocationStrategy, PathLocationStrategy } from '@angular/common';
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 { isNotUndefined } from '../../../empty.util';
import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
import { ClaimedTaskMyDSpaceResult } from '../../../object-collection/shared/claimed-task-my-dspace-result.model';
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
@Component({
selector: 'ds-claimtask-my-dspace-result-list-element',
styleUrls: ['../my-dspace-result-list-element.component.scss'],
templateUrl: './ct-my-dspace-result-list-element.component.html',
providers: [Location, { provide: LocationStrategy, useClass: PathLocationStrategy }]
})
@renderElementsFor(ClaimedTaskMyDSpaceResult, ViewMode.List)
@renderElementsFor(ClaimedTask, ViewMode.List)
export class ClaimedTaskMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<ClaimedTaskMyDSpaceResult, ClaimedTask> {
public showSubmitter = true;
public status = MyDspaceItemStatusType.VALIDATION;
public workFlow: Workflowitem;
ngOnInit() {
this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<Workflowitem>>);
}
initWorkflowItem(wfi$: Observable<RemoteData<Workflowitem>>) {
wfi$.pipe(
find((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
).subscribe((rd: RemoteData<Workflowitem>) => {
this.workFlow = rd.payload;
});
}
}

View File

@@ -0,0 +1,5 @@
<ds-item-list-preview [item]="dso"
[object]="object"
[status]="status"></ds-item-list-preview>
<ds-item-actions [object]="dso"></ds-item-actions>

View File

@@ -0,0 +1,21 @@
import { Component } from '@angular/core';
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 { Item } from '../../../../core/shared/item.model';
import { ItemMyDSpaceResult } from '../../../object-collection/shared/item-my-dspace-result.model';
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
@Component({
selector: 'ds-workspaceitem-my-dspace-result-list-element',
styleUrls: ['../my-dspace-result-list-element.component.scss', './item-my-dspace-result-list-element.component.scss'],
templateUrl: './item-my-dspace-result-list-element.component.html'
})
@renderElementsFor(ItemMyDSpaceResult, ViewMode.List)
export class ItemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<ItemMyDSpaceResult, Item> {
public status = MyDspaceItemStatusType.ACCEPTED;
}

View File

@@ -0,0 +1 @@
@import '../search-result-list-element/search-result-list-element.component.scss';

View File

@@ -0,0 +1,46 @@
import { Component, Inject } from '@angular/core';
import { MyDSpaceResult } from '../../../+my-dspace-page/my-dspace-result.model';
import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
import { DSpaceObject } from '../../../core/shared/dspace-object.model';
import { Metadata } from '../../../core/shared/metadata.model';
import { TruncatableService } from '../../truncatable/truncatable.service';
@Component({
selector: 'ds-my-dspace-result-list-element',
template: ``
})
export class MyDSpaceResultListElementComponent<T extends MyDSpaceResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> {
dso: K;
dsoIndex: number;
public constructor(@Inject('objectElementProvider') public listable: ListableObject,
@Inject('indexElementProvider') public index: number) {
super(listable);
this.dso = this.object.dspaceObject;
this.dsoIndex = this.index;
}
/**
* 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.dso.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.dso.metadata], keyOrKeys);
}
}

View File

@@ -0,0 +1,14 @@
<ds-item-list-preview *ngIf="workFlow"
[item]="(workFlow.item | async)?.payload"
[object]="object"
[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>{{"mydspace.view-btn" | translate}}</span>
</button>
</ds-pool-task-actions>

View File

@@ -0,0 +1,81 @@
import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
import { Observable, Subscription } from 'rxjs';
import { find, first } 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 { 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 { 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',
styleUrls: ['../my-dspace-result-list-element.component.scss'],
templateUrl: './pt-my-dspace-result-list-element.component.html',
})
@renderElementsFor(PoolTaskMyDSpaceResult, ViewMode.List)
@renderElementsFor(PoolTask, ViewMode.List)
export class PoolTaskMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<PoolTaskMyDSpaceResult, PoolTask> implements OnDestroy, 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,
private route: ActivatedRoute,
private router: Router) {
super(listable, index);
}
ngOnInit() {
this.initWorkflowItem(this.dso.workflowitem as Observable<RemoteData<Workflowitem>>);
}
initWorkflowItem(wfi$: Observable<RemoteData<Workflowitem>>) {
wfi$.pipe(
find((rd: RemoteData<Workflowitem>) => (rd.hasSucceeded && isNotUndefined(rd.payload)))
).subscribe((rd: RemoteData<Workflowitem>) => {
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();
}
}
}

View File

@@ -0,0 +1,6 @@
<ds-item-list-preview [item]="item"
[object]="object"
[status]="status"></ds-item-list-preview>
<ds-workflowitem-actions [object]="dso"></ds-workflowitem-actions>

View File

@@ -0,0 +1,40 @@
import { Component } from '@angular/core';
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 { isNotUndefined } from '../../../empty.util';
import { WorkflowitemMyDSpaceResult } from '../../../object-collection/shared/workflowitem-my-dspace-result.model';
import { Workflowitem } from '../../../../core/submission/models/workflowitem.model';
import { Item } from '../../../../core/shared/item.model';
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
@Component({
selector: 'ds-workflowitem-my-dspace-result-list-element',
styleUrls: ['../my-dspace-result-list-element.component.scss'],
templateUrl: './wfi-my-dspace-result-list-element.component.html',
})
@renderElementsFor(WorkflowitemMyDSpaceResult, ViewMode.List)
@renderElementsFor(Workflowitem, ViewMode.List)
export class WorkflowitemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<WorkflowitemMyDSpaceResult, Workflowitem> {
public item: Item;
public status = MyDspaceItemStatusType.WORKFLOW;
ngOnInit() {
this.initItem(this.dso.item as Observable<RemoteData<Item>>);
}
initItem(item$: Observable<RemoteData<Item>>) {
item$.pipe(
find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload))
).subscribe((rd: RemoteData<Item>) => {
this.item = rd.payload;
});
}
}

View File

@@ -0,0 +1,7 @@
<ds-item-list-preview
*ngIf="status && item"
[item]="item"
[object]="object"
[status]="status"></ds-item-list-preview>
<ds-workspaceitem-actions [object]="dso"></ds-workspaceitem-actions>

View File

@@ -0,0 +1,20 @@
@import '../../../../../styles/variables';
::-webkit-scrollbar-track
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
background-color: #F5F5F5;
}
::-webkit-scrollbar
{
width: 12px;
background-color: #F5F5F5;
}
::-webkit-scrollbar-thumb
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
background-color: #555;
}

View File

@@ -0,0 +1,39 @@
import { Component } from '@angular/core';
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 { Workspaceitem } from '../../../../core/submission/models/workspaceitem.model';
import { WorkspaceitemMyDSpaceResult } from '../../../object-collection/shared/workspaceitem-my-dspace-result.model';
import { RemoteData } from '../../../../core/data/remote-data';
import { isNotUndefined } from '../../../empty.util';
import { Item } from '../../../../core/shared/item.model';
import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
@Component({
selector: 'ds-workspaceitem-my-dspace-result-list-element',
styleUrls: ['../my-dspace-result-list-element.component.scss', './wsi-my-dspace-result-list-element.component.scss'],
templateUrl: './wsi-my-dspace-result-list-element.component.html',
})
@renderElementsFor(WorkspaceitemMyDSpaceResult, ViewMode.List)
export class WorkspaceitemMyDSpaceResultListElementComponent extends MyDSpaceResultListElementComponent<WorkspaceitemMyDSpaceResult, Workspaceitem> {
item: Item;
status = MyDspaceItemStatusType.IN_PROGRESS;
ngOnInit() {
this.initItem(this.dso.item as Observable<RemoteData<Item>>);
}
initItem(item$: Observable<RemoteData<Item>>) {
item$.pipe(
find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload))
).subscribe((rd: RemoteData<Item>) => {
this.item = rd.payload;
});
}
}