Merge branch 'master' into metadata-and-relationships-combined-in-submission

src/app/core/submission/workflowitem-data.service.ts

@@ -9,13 +9,18 @@ import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { WorkflowItem } from './models/workflowitem.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindListOptions } from '../data/request.models';
+import { DeleteByIDRequest, FindListOptions } from '../data/request.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { Observable } from 'rxjs';
+import { find, map } from 'rxjs/operators';
+import { hasValue } from '../../shared/empty.util';
+import { RequestEntry } from '../data/request.reducer';
+import { RestResponse } from '../cache/response.models';
 
 /**
- * A service that provides methods to make REST requests with workflowitems endpoint.
+ * A service that provides methods to make REST requests with workflow items endpoint.
  */
 @Injectable()
 @dataService(WorkflowItem.type)
@@ -35,4 +40,50 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
     super();
   }
 
+  /**
+   * Delete an existing Workflow Item on the server
+   * @param id The Workflow Item's id to be removed
+   * @return an observable that emits true when the deletion was successful, false when it failed
+   */
+  delete(id: string): Observable<RestResponse> {
+    return this.deleteWFI(id, true)
+  }
+
+  /**
+   * Send an existing Workflow Item back to the workflow on the server
+   * @param id The Workspace Item's id to be sent back
+   * @return an observable that emits true when sending back the item was successful, false when it failed
+   */
+  sendBack(id: string): Observable<boolean> {
+    return this.deleteWFI(id, false).pipe(map((response: RestResponse) => response.isSuccessful));
+  }
+
+  /**
+   * Method to delete a workflow item from the server
+   * @param id The identifier of the server
+   * @param expunge Whether or not to expunge:
+   * When true, the workflow item and its item will be permanently expunged on the server
+   * When false, the workflow item will be removed, but the item will still be available as a workspace item
+   */
+  private deleteWFI(id: string, expunge: boolean): Observable<RestResponse> {
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
+      map((endpoint: string) => this.getIDHref(endpoint, id)),
+      map((endpoint: string) => endpoint + '?expunge=' + expunge)
+    );
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new DeleteByIDRequest(requestId, href, id);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.requestService.getByUUID(requestId).pipe(
+      find((request: RequestEntry) => request.completed),
+      map((request: RequestEntry) => request.response)
+    );
+  }
 }