Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/IIIF-188

Author: FrancescoMolinaro

src/app/bitstream-page/bitstream-download-redirect.guard.ts

@@ -35,6 +35,7 @@ export const bitstreamDownloadRedirectGuard: CanActivateFn = (
 ): Observable<UrlTree | boolean> => {
 
   const bitstreamId = route.params.id;
+  const accessToken: string = route.queryParams.accessToken;
 
   return bitstreamDataService.findById(bitstreamId, true, false, ...BITSTREAM_PAGE_LINKS_TO_FOLLOW).pipe(
     getFirstCompletedRemoteData(),
@@ -67,14 +68,21 @@ export const bitstreamDownloadRedirectGuard: CanActivateFn = (
       if (isAuthorized && isLoggedIn && isNotEmpty(fileLink)) {
         hardRedirectService.redirect(fileLink);
         return false;
-      } else if (isAuthorized && !isLoggedIn) {
+      } else if (isAuthorized && !isLoggedIn && !hasValue(accessToken)) {
         hardRedirectService.redirect(bitstream._links.content.href);
         return false;
-      } else if (!isAuthorized && isLoggedIn) {
-        return router.createUrlTree([getForbiddenRoute()]);
-      } else if (!isAuthorized && !isLoggedIn) {
-        auth.setRedirectUrl(router.url);
-        return router.createUrlTree(['login']);
+      } else if (!isAuthorized) {
+        // Either we have an access token, or we are logged in, or we are not logged in.
+        // For now, the access token does not care if we are logged in or not.
+        if (hasValue(accessToken)) {
+          hardRedirectService.redirect(bitstream._links.content.href + '?accessToken=' + accessToken);
+          return false;
+        } else if (isLoggedIn) {
+          return router.createUrlTree([getForbiddenRoute()]);
+        } else if (!isLoggedIn) {
+          auth.setRedirectUrl(router.url);
+          return router.createUrlTree(['login']);
+        }
       }
     })
   );

src/app/core/auth/server-auth-request.service.ts

@@ -17,6 +17,7 @@ import {
 import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { XSRFService } from '../xsrf/xsrf.service';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
 
 /**
  * Server side version of the service to send authentication requests
@@ -41,8 +42,8 @@ export class ServerAuthRequestService extends AuthRequestService {
    * @protected
    */
   protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
-    // First do a call to the root endpoint in order to get an XSRF token
-    return this.httpClient.get(this.halService.getRootHref(), { observe: 'response' }).pipe(
+    // First do a call to the csrf endpoint in order to get an XSRF token
+    return this.httpClient.get(new RESTURLCombiner('/security/csrf').toString(), { observe: 'response' }).pipe(
       // retrieve the XSRF token from the response header
       map((response: HttpResponse<any>) => response.headers.get(XSRF_RESPONSE_HEADER)),
       map((xsrfToken: string) => {

src/app/core/data/bitstream-data.service.ts

@@ -174,7 +174,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     const searchParams = [];
     searchParams.push(new RequestParam('handle', handle));
     if (hasValue(sequenceId)) {
-      searchParams.push(new RequestParam('sequenceId', sequenceId));
+      searchParams.push(new RequestParam('sequence', sequenceId));
     }
     if (hasValue(filename)) {
       searchParams.push(new RequestParam('filename', filename));

src/app/core/data/feature-authorization/feature-id.ts

@@ -39,4 +39,5 @@ export enum FeatureID {
   EPersonForgotPassword = 'epersonForgotPassword',
   ShowClaimItem = 'showClaimItem',
   CanCorrectItem = 'canCorrectItem',
+  CanViewInWorkflowSinceStatistics = 'canViewInWorkflowSinceStatistics',
 }

src/app/my-dspace-page/my-dspace-page.component.html

@@ -14,11 +14,11 @@
   [selectionConfig]="{ repeatable: true, listId: listId }"
   (deselectObject)="onDeselectObject($event)"
   (selectObject)="onSelectObject($event)"
->
-  <ds-my-dspace-bulk-action
+  [showWorkflowStatistics]="true">
+  <!-- Using *ngIf breaks the projection, so we are using hidden instead -->
+  <ds-my-dspace-bulk-action [hidden]="(currentConfiguration$ | async) !== workflowType"
     bulkActions
     [listId]="listId"
-    *ngIf="(currentConfiguration$ | async) === workflowType"
   ></ds-my-dspace-bulk-action>
   <ds-my-dspace-new-bulk-import additionalSearchFormOptions></ds-my-dspace-new-bulk-import>
 </ds-search>

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts

@@ -269,6 +269,25 @@ describe('VocabularyTreeviewService test suite', () => {
       expect(serviceAsAny.dataChange.value).toEqual(treeNodeListWithChildren);
     });
 
+    it('should not add more children if already present and is loadAll is true and onlyFirstTime is true', () => {
+      pageInfo = Object.assign(new PageInfo(), {
+        elementsPerPage: 1,
+        totalElements: 2,
+        totalPages: 2,
+        currentPage: 2
+      });
+      spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
+        a: buildPaginatedList(pageInfo, [])
+      }));
+
+      serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
+      serviceAsAny.nodeMap = nodeMapWithChildren;
+      scheduler.schedule(() => service.loadMore(item, [], true, true));
+      scheduler.flush();
+
+      expect(serviceAsAny.getChildrenNodesByParent).not.toHaveBeenCalled();
+    });
+
     it('should add loadMore node properly', () => {
       pageInfo = Object.assign(new PageInfo(), {
         elementsPerPage: 1,

src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts

@@ -146,6 +146,10 @@ export class VocabularyTreeviewService {
     }
     const parent: TreeviewNode = this.nodeMap.get(item.otherInformation.id)!;
     const children = this.nodeMap.get(item.otherInformation.id)!.children || [];
+    // If there are children and is invoked with loadAll true we skip the call as it means the node has loaded already all the children
+    if (children.length && loadAll && onlyFirstTime) {
+      return;
+    }
     this.getChildrenNodesByParent(item.otherInformation.id, parent.pageInfo, (loadAll && selectedItems.length > 0)).subscribe((list: PaginatedList<VocabularyEntryDetail>) => {
       if (onlyFirstTime && parent.children!.length > 0 && !loadAll) {
         return;

src/app/shared/loading/loading.component.ts

@@ -8,7 +8,7 @@ import { AlertType } from '../alert/alert-type';
 import { Router } from '@angular/router';
 import { isPlatformBrowser, Location } from '@angular/common';
 
-enum MessageType {
+export enum MessageType {
   LOADING = 'loading',
   WARNING = 'warning',
   ERROR = 'error'

src/app/shared/object-collection/object-collection.component.html

@@ -12,6 +12,7 @@
                 [showPaginator]="showPaginator"
                 [showThumbnails]="showThumbnails"
                 [showCorrection]="showCorrection"
+                [showWorkflowStatistics]="showWorkflowStatistics"
                 (paginationChange)="onPaginationChange($event)"
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"
@@ -43,6 +44,7 @@
                 [showMetrics]="showMetrics"
                 [showPaginator]="showPaginator"
                 [showThumbnails]="showThumbnails"
+                [showWorkflowStatistics]="showWorkflowStatistics"
                 (paginationChange)="onPaginationChange($event)"
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"
@@ -62,6 +64,7 @@
                   [showMetrics]="showMetrics"
                   [showPaginator]="showPaginator"
                   [showThumbnails]="showThumbnails"
+                  [showWorkflowStatistics]="showWorkflowStatistics"
                   (contentChange)="contentChange.emit($event)"
                   *ngIf="(currentMode$ | async) === viewModeEnum.DetailedListElement">
 </ds-object-detail>

src/app/shared/object-collection/object-collection.component.ts

@@ -135,6 +135,11 @@ export class ObjectCollectionComponent implements OnInit {
    */
   @Input() showCorrection = false;
 
+  /**
+   * A boolean representing if to show workflow statistics
+   */
+  @Input() showWorkflowStatistics;
+
   /**
    * Whether or not to show an alert for hidden related items
    */