diff --git a/src/app/change-submitter-page/change-submitter-page.component.html b/src/app/change-submitter-page/change-submitter-page.component.html index 1c9a9b3d7af..b401b3126cf 100644 --- a/src/app/change-submitter-page/change-submitter-page.component.html +++ b/src/app/change-submitter-page/change-submitter-page.component.html @@ -1,15 +1,32 @@
-

{{'share.submission.page.title' | translate}}

- {{'change.submitter.page.message' | translate}} - {{getSubmitterName(sub)}} - ({{sub?.email}}) -
- + {{'change.submitter.page.button.take-it' | translate}} + +
diff --git a/src/app/change-submitter-page/change-submitter-page.component.ts b/src/app/change-submitter-page/change-submitter-page.component.ts index cf84c9f86ba..41c09c1d9a5 100644 --- a/src/app/change-submitter-page/change-submitter-page.component.ts +++ b/src/app/change-submitter-page/change-submitter-page.component.ts @@ -17,10 +17,13 @@ import { isNullOrUndef } from 'chart.js/helpers'; import { HALEndpointService } from '../core/shared/hal-endpoint.service'; import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service'; import { RequestService } from '../core/data/request.service'; -import { PostRequest } from '../core/data/request.models'; +import { GetRequest } from '../core/data/request.models'; import { RemoteData } from '../core/data/remote-data'; import { NotificationsService } from '../shared/notifications/notifications.service'; import { TranslateService } from '@ngx-translate/core'; +import { HttpHeaders } from '@angular/common/http'; +import { HttpOptions } from '../core/dspace-rest/dspace-rest.service'; +import { Item } from '../core/shared/item.model'; @Component({ selector: 'ds-change-submitter-page', @@ -34,11 +37,22 @@ export class ChangeSubmitterPageComponent implements OnInit { */ private shareToken = ''; + /** + * WorkspaceItem id from the url. + * This id is used to get authorization rights to call REST API to change the submitter. + */ + private workspaceitemid = ''; + /** * BehaviorSubject that contains the submitter of the WorkspaceItem. */ submitter: BehaviorSubject = new BehaviorSubject(null); + /** + * BehaviorSubject that contains the Item. + */ + item: BehaviorSubject = new BehaviorSubject(null); + /** * BehaviorSubject that contains the WorkspaceItem. */ @@ -61,6 +75,8 @@ export class ChangeSubmitterPageComponent implements OnInit { ngOnInit(): void { // Load `share_token` param value from the url this.shareToken = this.route.snapshot.queryParams.share_token; + // Load `workspaceitem_id` param value from the url + this.workspaceitemid = this.route.snapshot.queryParams.workspaceitemid; this.loadWorkspaceItemAndAssignSubmitter(this.shareToken); } @@ -70,17 +86,36 @@ export class ChangeSubmitterPageComponent implements OnInit { loadWorkspaceItemAndAssignSubmitter(shareToken: string) { this.findWorkspaceItemByShareToken(shareToken)?.subscribe((workspaceItem: WorkspaceItem) => { this.workspaceItem.next(workspaceItem); + this.loadItemFromWorkspaceItem(workspaceItem); this.loadAndAssignSubmitter(workspaceItem); }); } + /** + * Load the Item from the WorkspaceItem and assign it to the item BehaviorSubject. + */ + loadItemFromWorkspaceItem(workspaceItem: WorkspaceItem) { + if (workspaceItem.item instanceof Observable) { + workspaceItem.item + .pipe(getFirstSucceededRemoteDataPayload()) + .subscribe((item: Item) => { + this.item.next(item); + }); + } + } + /** * Find a WorkspaceItem by its shareToken. */ findWorkspaceItemByShareToken(shareToken: string): Observable { + let requestHeaders = new HttpHeaders(); + const requestOptions: HttpOptions = Object.create({}); + requestHeaders = requestHeaders.append('shareToken', shareToken); + requestOptions.headers = requestHeaders; + return this.workspaceItemService.searchBy('shareToken', { searchParams: [Object.assign(new RequestParam('shareToken', shareToken))] - }, false, false, followLink('submitter')).pipe(getFirstSucceededRemoteListPayload(), + }, false, false, followLink('item'), followLink('submitter')).pipe(getFirstSucceededRemoteListPayload(), map((workspaceItems: WorkspaceItem[]) => workspaceItems?.[0])); } @@ -112,27 +147,28 @@ export class ChangeSubmitterPageComponent implements OnInit { } /** - * Get the name of the submitter using the DSONameService. - * @param submitter + * Get the name of the submitter or item using the DSONameService. */ - getSubmitterName(submitter: EPerson): string { - if (isNullOrUndef(submitter)) { + getName(object: EPerson | Item) { + if (isNullOrUndef(object)) { return ''; } - return this.dsoNameService.getName(submitter); + return this.dsoNameService.getName(object); } /** - * Change the submitter of the WorkspaceItem using the shareToken. This will send a POST request to the backend when + * Change the submitter of the WorkspaceItem using the shareToken. This will send a GET request to the backend when * the submitter of the Item is changed. */ changeSubmitter() { const requestId = this.requestService.generateRequestId(); - const url = this.halService.getRootHref() + '/submission/setOwner?shareToken=' + this.shareToken; - const postRequest = new PostRequest(requestId, url); - // Send POST request - this.requestService.send(postRequest); + const url = this.halService.getRootHref() + '/submission/setOwner?shareToken=' + this.shareToken + + '&workspaceitemid=' + this.workspaceitemid; + + const getRequest = new GetRequest(requestId, url); + // Send GET request + this.requestService.send(getRequest); this.changeSubmitterSpinner = true; // Get response const response = this.rdbService.buildFromRequestUUID(requestId); diff --git a/src/app/login-page/autoregistration/autoregistration.component.ts b/src/app/login-page/autoregistration/autoregistration.component.ts index bfd67f62e85..39775fb641f 100644 --- a/src/app/login-page/autoregistration/autoregistration.component.ts +++ b/src/app/login-page/autoregistration/autoregistration.component.ts @@ -189,7 +189,6 @@ export class AutoregistrationComponent implements OnInit { * Retrieve the `ClarinVerificationToken` object by the `verificationToken` value. */ private loadVerificationToken() { - console.log('I am here'); this.verificationTokenService.searchBy('byToken', this.createSearchOptions(this.verificationToken)) .pipe(getFirstSucceededRemoteListPayload()) .subscribe(res => { diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index 54663333d1d..19a661aea13 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -5764,4 +5764,10 @@ "change.submitter.page.changed-successfully": "Předkladatel byl úspěšně změněn", // "change.submitter.page.changed-error": "An error occurred while changing the submitter", "change.submitter.page.changed-error": "Při změně předkladatele došlo k chybě", + // "change.submitter.page.cannot.see.submitter.message": "You do not have permission to see submitter information.", + "change.submitter.page.cannot.see.submitter.message": "Nemáte oprávnění k zobrazení informací o předkladateli.", + // "change.submitter.page.items.handle.message": "Item's handle: ", + "change.submitter.page.items.handle.message": "Handle záznamu: ", + // "change.submitter.page.items.name.message": "Item's name: ", + "change.submitter.page.items.name.message": "Název záznamu: ", } diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4d7894251ce..76eb19a43f6 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -5964,4 +5964,9 @@ "change.submitter.page.changed-error": "An error occurred while changing the submitter", + "change.submitter.page.cannot.see.submitter.message": "You do not have permission to see submitter information.", + + "change.submitter.page.items.handle.message": "Item's handle: ", + + "change.submitter.page.items.name.message": "Item's name: ", }