Merged in task/dspace-cris-2023_02_x/DSC-1917 (pull request DSpace#2210)

Task/dspace cris 2023 02 x/DSC-1917

Approved-by: Giuseppe Digilio

Author: alisaismailati

src/app/app.component.ts

@@ -134,7 +134,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       ))
     ).subscribe(([currentUrl, event]: [string, RouterEvent]) => {
       if (event instanceof NavigationStart) {
-        if (!(currentUrl.startsWith(getEditItemPageRoute()) || currentUrl.startsWith(getWorkspaceItemModuleRoute()) || currentUrl.startsWith(getWorkflowItemModuleRoute()))) {
+        if (!(currentUrl.startsWith('/entities' || getEditItemPageRoute()) || currentUrl.startsWith(getWorkspaceItemModuleRoute()) || currentUrl.startsWith(getWorkflowItemModuleRoute()))) {
           distinctNext(this.isRouteLoading$, true);
         }
         // distinctNext(this.isRouteLoading$, true);

src/app/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.spec.ts

@@ -21,6 +21,7 @@ describe('CrisLayoutNavbarComponent', () => {
   let component: CrisLayoutNavbarComponent;
   let fixture: ComponentFixture<CrisLayoutNavbarComponent>;
   let de: DebugElement;
+  let router: RouterStub;
 
   const windowServiceStub = new HostWindowServiceStub(1000);
 
@@ -62,13 +63,15 @@ describe('CrisLayoutNavbarComponent', () => {
         { provide: HostWindowService, useValue: windowServiceStub },
         { provide: Router, useClass: RouterStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-      ]
+      ],
     })
       .compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CrisLayoutNavbarComponent);
+    router = TestBed.inject(Router) as unknown as RouterStub;
+    router.setNavigateReturnValue(true);
     component = fixture.componentInstance;
     component.item = mockItem;
     component.tabs = [];

src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts

@@ -112,9 +112,13 @@ export abstract class CrisLayoutTabsComponent {
     this.activeTab$.next(tab);
     this.emitSelected(tab);
     if (this.tabs[0].shortname === tab.shortname) {
-      this.location.replaceState(itemPageRoute);
+      this.router.navigate([], { queryParams: {}, replaceUrl: true, skipLocationChange: true }).then(() => {
+        this.location.replaceState(itemPageRoute);
+      });
     } else {
-      this.location.replaceState(itemPageRoute + '/' + tab.shortname);
+      this.router.navigate([], { queryParams: {}, replaceUrl: true, skipLocationChange: true  }).then(() => {
+        this.location.replaceState(itemPageRoute + '/' + tab.shortname);
+      });
     }
   }
 

src/app/shared/mocks/router.mock.ts

@@ -1,5 +1,5 @@
 import {of as observableOf} from 'rxjs';
-import {UrlTree} from '@angular/router';
+import { UrlTree} from '@angular/router';
 
 /**
  * Mock for [[RouterService]]

src/app/shared/testing/router.stub.ts

@@ -15,4 +15,8 @@ export class RouterStub {
   serializeUrl(commands, navExtras = {}) {
     return '/testing-url';
   }
+
+  public setNavigateReturnValue(value = true) {
+    this.navigate.and.returnValue(Promise.resolve(value));
+  }
 }

src/app/submission/submission.service.spec.ts

@@ -45,6 +45,7 @@ import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/subm
 import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
 import { NotificationOptions } from '../shared/notifications/models/notification-options.model';
 import { SubmissionVisibilityValue } from '../core/config/models/config-submission-section.model';
+import {NativeWindowRef, NativeWindowService} from '../core/services/window.service';
 
 describe('SubmissionService test suite', () => {
   const collectionId = '43fe1f8c-09a6-4fcf-9c78-5d4fed8f2c8f';
@@ -402,6 +403,7 @@ describe('SubmissionService test suite', () => {
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestServce },
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsService },
+        { provide: NativeWindowService, useValue: new NativeWindowRef() },
         ScrollToService,
         NotificationsService,
         RouteService,