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

Merge remote-tracking branch 'upstream/main' into retrieve-name-with-dsonameservice-main

Browse Source 
# Conflicts:
#	src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
This commit is contained in:
Alexandre Vryghem
2023-05-19 15:00:24 +02:00
parent af7d99a987 8218ed595a
commit b878f28db6
127 changed files with 4738 additions and 4369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
View File

@@ -3,7 +3,7 @@ import {
rendersAdvancedWorkflowTaskOption
} from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
import { FormGroup, FormControl, Validators } from '@angular/forms';
import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model';
@@ -22,13 +22,13 @@ export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction';
})
export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActionComponent implements OnInit {
ratingForm: FormGroup;
ratingForm: UntypedFormGroup;
ngOnInit(): void {
super.ngOnInit();
this.ratingForm = new FormGroup({
review: new FormControl(''),
rating: new FormControl(0, Validators.min(1)),
this.ratingForm = new UntypedFormGroup({
review: new UntypedFormControl(''),
rating: new UntypedFormControl(0, Validators.min(1)),
});
}

4
src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core';
import { FormBuilder } from '@angular/forms';
import { UntypedFormBuilder } from '@angular/forms';
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
@@ -57,7 +57,7 @@ export class ReviewersListComponent extends MembersListComponent implements OnIn
public ePersonDataService: EPersonDataService,
protected translateService: TranslateService,
protected notificationsService: NotificationsService,
protected formBuilder: FormBuilder,
protected formBuilder: UntypedFormBuilder,
protected paginationService: PaginationService,
protected router: Router,
public dsoNameService: DSONameService,

4
src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Location } from '@angular/common';
import { Observable, forkJoin } from 'rxjs';
import { Observable, combineLatest } from 'rxjs';
import { map, switchMap, take } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { WorkflowItem } from '../core/submission/models/workflowitem.model';
@@ -52,7 +52,7 @@ export abstract class WorkflowItemActionPageComponent implements OnInit {
* Performs the action and shows a notification based on the outcome of the action
*/
performAction() {
forkJoin([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe(
combineLatest([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe(
take(1),
switchMap(([wfi]) => this.sendRequest(wfi.id))
).subscribe((successful: boolean) => {

7
src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
View File

@@ -1,5 +1,5 @@
import { URLCombiner } from '../core/url-combiner/url-combiner';
import { getWorkflowItemModuleRoute } from '../app-routing-paths';
import { getWorkflowItemModuleRoute, getWorkspaceItemModuleRoute } from '../app-routing-paths';
export function getWorkflowItemPageRoute(wfiId: string) {
return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString();
@@ -24,8 +24,13 @@ export function getAdvancedWorkflowRoute(wfiId: string) {
return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, ADVANCED_WORKFLOW_PATH).toString();
}
export function getWorkspaceItemDeleteRoute(wsiId: string) {
return new URLCombiner(getWorkspaceItemModuleRoute(), wsiId, WORKSPACE_ITEM_DELETE_PATH).toString();
}
export const WORKFLOW_ITEM_EDIT_PATH = 'edit';
export const WORKFLOW_ITEM_DELETE_PATH = 'delete';
export const WORKFLOW_ITEM_VIEW_PATH = 'view';
export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback';
export const ADVANCED_WORKFLOW_PATH = 'advanced';
export const WORKSPACE_ITEM_DELETE_PATH = 'delete';