@@ -17,10 +17,13 @@ import { isNullOrUndef } from 'chart.js/helpers';
1717import { HALEndpointService } from '../core/shared/hal-endpoint.service' ;
1818import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service' ;
1919import { RequestService } from '../core/data/request.service' ;
20- import { PostRequest } from '../core/data/request.models' ;
20+ import { GetRequest } from '../core/data/request.models' ;
2121import { RemoteData } from '../core/data/remote-data' ;
2222import { NotificationsService } from '../shared/notifications/notifications.service' ;
2323import { TranslateService } from '@ngx-translate/core' ;
24+ import { HttpHeaders } from '@angular/common/http' ;
25+ import { HttpOptions } from '../core/dspace-rest/dspace-rest.service' ;
26+ import { Item } from '../core/shared/item.model' ;
2427
2528@Component ( {
2629 selector : 'ds-change-submitter-page' ,
@@ -34,11 +37,22 @@ export class ChangeSubmitterPageComponent implements OnInit {
3437 */
3538 private shareToken = '' ;
3639
40+ /**
41+ * WorkspaceItem id from the url.
42+ * This id is used to get authorization rights to call REST API to change the submitter.
43+ */
44+ private workspaceitemid = '' ;
45+
3746 /**
3847 * BehaviorSubject that contains the submitter of the WorkspaceItem.
3948 */
4049 submitter : BehaviorSubject < EPerson > = new BehaviorSubject ( null ) ;
4150
51+ /**
52+ * BehaviorSubject that contains the Item.
53+ */
54+ item : BehaviorSubject < Item > = new BehaviorSubject ( null ) ;
55+
4256 /**
4357 * BehaviorSubject that contains the WorkspaceItem.
4458 */
@@ -61,6 +75,8 @@ export class ChangeSubmitterPageComponent implements OnInit {
6175 ngOnInit ( ) : void {
6276 // Load `share_token` param value from the url
6377 this . shareToken = this . route . snapshot . queryParams . share_token ;
78+ // Load `workspaceitem_id` param value from the url
79+ this . workspaceitemid = this . route . snapshot . queryParams . workspaceitemid ;
6480 this . loadWorkspaceItemAndAssignSubmitter ( this . shareToken ) ;
6581 }
6682
@@ -70,17 +86,36 @@ export class ChangeSubmitterPageComponent implements OnInit {
7086 loadWorkspaceItemAndAssignSubmitter ( shareToken : string ) {
7187 this . findWorkspaceItemByShareToken ( shareToken ) ?. subscribe ( ( workspaceItem : WorkspaceItem ) => {
7288 this . workspaceItem . next ( workspaceItem ) ;
89+ this . loadItemFromWorkspaceItem ( workspaceItem ) ;
7390 this . loadAndAssignSubmitter ( workspaceItem ) ;
7491 } ) ;
7592 }
7693
94+ /**
95+ * Load the Item from the WorkspaceItem and assign it to the item BehaviorSubject.
96+ */
97+ loadItemFromWorkspaceItem ( workspaceItem : WorkspaceItem ) {
98+ if ( workspaceItem . item instanceof Observable < Item > ) {
99+ workspaceItem . item
100+ . pipe ( getFirstSucceededRemoteDataPayload ( ) )
101+ . subscribe ( ( item : Item ) => {
102+ this . item . next ( item ) ;
103+ } ) ;
104+ }
105+ }
106+
77107 /**
78108 * Find a WorkspaceItem by its shareToken.
79109 */
80110 findWorkspaceItemByShareToken ( shareToken : string ) : Observable < WorkspaceItem > {
111+ let requestHeaders = new HttpHeaders ( ) ;
112+ const requestOptions : HttpOptions = Object . create ( { } ) ;
113+ requestHeaders = requestHeaders . append ( 'shareToken' , shareToken ) ;
114+ requestOptions . headers = requestHeaders ;
115+
81116 return this . workspaceItemService . searchBy ( 'shareToken' , {
82117 searchParams : [ Object . assign ( new RequestParam ( 'shareToken' , shareToken ) ) ]
83- } , false , false , followLink ( 'submitter' ) ) . pipe ( getFirstSucceededRemoteListPayload ( ) ,
118+ } , false , false , followLink ( 'item' ) , followLink ( ' submitter') ) . pipe ( getFirstSucceededRemoteListPayload ( ) ,
84119 map ( ( workspaceItems : WorkspaceItem [ ] ) => workspaceItems ?. [ 0 ] ) ) ;
85120 }
86121
@@ -112,27 +147,28 @@ export class ChangeSubmitterPageComponent implements OnInit {
112147 }
113148
114149 /**
115- * Get the name of the submitter using the DSONameService.
116- * @param submitter
150+ * Get the name of the submitter or item using the DSONameService.
117151 */
118- getSubmitterName ( submitter : EPerson ) : string {
119- if ( isNullOrUndef ( submitter ) ) {
152+ getName ( object : EPerson | Item ) {
153+ if ( isNullOrUndef ( object ) ) {
120154 return '' ;
121155 }
122- return this . dsoNameService . getName ( submitter ) ;
156+ return this . dsoNameService . getName ( object ) ;
123157 }
124158
125159 /**
126- * Change the submitter of the WorkspaceItem using the shareToken. This will send a POST request to the backend when
160+ * Change the submitter of the WorkspaceItem using the shareToken. This will send a GET request to the backend when
127161 * the submitter of the Item is changed.
128162 */
129163 changeSubmitter ( ) {
130164 const requestId = this . requestService . generateRequestId ( ) ;
131165
132- const url = this . halService . getRootHref ( ) + '/submission/setOwner?shareToken=' + this . shareToken ;
133- const postRequest = new PostRequest ( requestId , url ) ;
134- // Send POST request
135- this . requestService . send ( postRequest ) ;
166+ const url = this . halService . getRootHref ( ) + '/submission/setOwner?shareToken=' + this . shareToken +
167+ '&workspaceitemid=' + this . workspaceitemid ;
168+
169+ const getRequest = new GetRequest ( requestId , url ) ;
170+ // Send GET request
171+ this . requestService . send ( getRequest ) ;
136172 this . changeSubmitterSpinner = true ;
137173 // Get response
138174 const response = this . rdbService . buildFromRequestUUID ( requestId ) ;
0 commit comments