Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-1860_new

Author: atarix83

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html

@@ -5,6 +5,7 @@
        [attr.aria-labelledby]="'sidebarName-' + section.id"
        [title]="('menu.section.icon.' + section.id) | translate"
        [routerLink]="itemModel.link"
+       [queryParams]="itemModel.queryParams"
        (keyup.space)="navigate($event)"
        (keyup.enter)="navigate($event)"
        href="javascript:void(0);"
@@ -21,3 +22,4 @@
       </div>
     </a>
 </div>
+

src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts

@@ -49,7 +49,10 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   navigate(event: any): void {
     event.preventDefault();
     if (!this.isDisabled) {
-      this.router.navigate(this.itemModel.link);
+      const extras = {
+        queryParams: this.itemModel.queryParams
+      };
+      this.router.navigate(this.itemModel.link, extras);
     }
   }
 }

src/app/item-page/item.resolver.ts

@@ -20,6 +20,7 @@ export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
   ),
   followLink('relationships'),
   followLink('version', {}, followLink('versionhistory')),
+  followLink('bundles', {}, followLink('bitstreams')),
   followLink('thumbnail'),
   followLink('metrics')
 ];
@@ -45,7 +46,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
-      true,
+      false,
       false,
       ...ITEM_PAGE_LINKS_TO_FOLLOW
     ).pipe(

src/app/menu.resolver.spec.ts

@@ -19,6 +19,7 @@ import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
 import { createPaginatedList } from './shared/testing/utils.test';
 import { SectionDataService } from './core/layout/section-data.service';
 import createSpy = jasmine.createSpy;
+import { ConfigurationDataService } from './core/data/configuration-data.service';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -68,6 +69,7 @@ describe('MenuResolver', () => {
   let sectionsService;
   let authorizationService;
   let scriptService;
+  let configService;
 
   beforeEach(waitForAsync(() => {
     menuService = new MenuServiceStub();
@@ -83,6 +85,9 @@ describe('MenuResolver', () => {
     scriptService = jasmine.createSpyObj('scriptService', {
       scriptWithNameExistsAndCanExecute: observableOf(true)
     });
+    configService = jasmine.createSpyObj('ConfigurationDataService', {
+      findByPropertyName: observableOf({})
+    });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
@@ -92,6 +97,7 @@ describe('MenuResolver', () => {
         { provide: SectionDataService, useValue: sectionsService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
+        { provide: ConfigurationDataService, useValue: configService },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/

src/app/menu.resolver.ts

@@ -11,7 +11,7 @@ import { RemoteData } from './core/data/remote-data';
 import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
 import { MenuService } from './shared/menu/menu.service';
 import { filter, find, map, switchMap, take } from 'rxjs/operators';
-import { hasValue } from './shared/empty.util';
+import { hasValue, isNotEmpty } from './shared/empty.util';
 import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
   ThemedCreateCommunityParentSelectorComponent
@@ -52,6 +52,8 @@ import { environment } from '../environments/environment';
 import { SectionDataService } from './core/layout/section-data.service';
 import { Section } from './core/layout/models/section.model';
 import { NOTIFICATIONS_RECITER_SUGGESTION_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { ConfigurationDataService } from './core/data/configuration-data.service';
+import { ConfigurationProperty } from './core/shared/configuration-property.model';
 
 /**
  * Creates all of the app's menus
@@ -70,6 +72,7 @@ export class MenuResolver implements Resolve<boolean> {
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
     protected sectionDataService: SectionDataService,
+    protected configService: ConfigurationDataService,
   ) {
   }
 
@@ -254,6 +257,7 @@ export class MenuResolver implements Resolve<boolean> {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
+    this.createDLExporterMenuItem();
 
     return this.waitForMenu$(MenuID.ADMIN);
   }
@@ -528,11 +532,11 @@ export class MenuResolver implements Resolve<boolean> {
     ];
     menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection));
 
-    observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)
-    ]).pipe(
-      filter(([authorized, metadataExportScriptExists]: boolean[]) => authorized && metadataExportScriptExists),
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((authorized: boolean) => authorized),
+      take(1),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)),
+      filter((metadataExportScriptExists: boolean) => metadataExportScriptExists),
       take(1)
     ).subscribe(() => {
       // Hides the export menu for unauthorised people
@@ -609,6 +613,44 @@ export class MenuResolver implements Resolve<boolean> {
     });
   }
 
+  /**
+   * Add the DL Exporter menu item to the admin menu
+   */
+  createDLExporterMenuItem() {
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((authorized: boolean) => authorized),
+      take(1),
+      switchMap(() => observableCombineLatest([
+        this.getDLExporterURL(),
+        this.getDLExporterAccessToken()
+      ])),
+      filter(([url, accesstoken]) => isNotEmpty(url) && isNotEmpty(accesstoken)),
+      take(1)
+    ).subscribe(([url, accesstoken]) => {
+      const urlSegments = url.split('?');
+      const queryParamSegments = urlSegments[1].split('=');
+      this.menuService.addSection(MenuID.ADMIN,
+        {
+          id: 'loginmiur_dlexporter_url',
+          index: 15,
+          active: false,
+          visible: true,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.loginmiur_dlexporter_url',
+            disabled: false,
+            link: urlSegments[0],
+            queryParams: {
+              [queryParamSegments[0]]: queryParamSegments[1]
+            }
+          } as LinkMenuItemModel,
+          icon: 'fa-solid fa-arrows-spin',
+          shouldPersistOnRouteChange: true
+        }
+      );
+    });
+  }
+
   /**
    * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not
    * the import scripts exist and the current user is allowed to execute them
@@ -617,11 +659,11 @@ export class MenuResolver implements Resolve<boolean> {
     const menuList = [];
     menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection));
 
-    observableCombineLatest([
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)
-    ]).pipe(
-      filter(([authorized, metadataImportScriptExists]: boolean[]) => authorized && metadataImportScriptExists),
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((authorized: boolean) => authorized),
+      take(1),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)),
+      filter((metadataImportScriptExists: boolean) => metadataImportScriptExists),
       take(1)
     ).subscribe(() => {
       // Hides the import menu for unauthorised people
@@ -974,4 +1016,25 @@ export class MenuResolver implements Resolve<boolean> {
     const object = data.site ? data.site : data.dso?.payload;
     return object?._links?.self?.href;
   }
+
+  /**
+   * Get the DL Exporter URL from the configuration
+   */
+  getDLExporterURL(): Observable<string> {
+   return this.configService.findByPropertyName('loginmiur.dlexporter.url').pipe(
+      getFirstCompletedRemoteData(),
+      map((res: RemoteData<ConfigurationProperty>) => {
+        return res?.payload?.values[0];
+      })
+    );
+  }
+
+  private getDLExporterAccessToken() {
+    return this.configService.findByPropertyName('loginmiur.dlexporter.accesstoken').pipe(
+      getFirstCompletedRemoteData(),
+      map((res: RemoteData<ConfigurationProperty>) => {
+        return res?.payload?.values[0];
+      })
+    );
+  }
 }

src/app/search-page/search-page.component.html

@@ -1 +1 @@
-<ds-themed-search [renderOnServerSide]="false" [showCharts]="true" [showCsvExport]="false" [showExport]="true" [trackStatistics]="true"></ds-themed-search>
+<ds-themed-search [showCharts]="true" [showCsvExport]="false" [showExport]="true" [trackStatistics]="true"></ds-themed-search>

src/app/shared/browse-most-elements/abstract-browse-elements.component.ts

@@ -55,7 +55,7 @@ export abstract class AbstractBrowseElementsComponent implements OnInit, OnChang
   }
 
   ngOnInit() {
-    const followLinks = this.followThumbnailLink ? [followLink('thumbnail')] : [];
+    const followLinks = this.followThumbnailLink ? [followLink('thumbnail'), followLink('metrics')] : [followLink('metrics')];
     this.paginatedSearchOptionsBS = new BehaviorSubject<PaginatedSearchOptions>(this.paginatedSearchOptions);
     this.searchResults$ = this.paginatedSearchOptionsBS.asObservable().pipe(
       mergeMap((paginatedSearchOptions) =>

src/app/shared/browse-most-elements/default-browse-elements/default-browse-elements.component.ts

@@ -20,5 +20,5 @@ export class DefaultBrowseElementsComponent extends AbstractBrowseElementsCompon
 
   @Input() showLabel: boolean;
 
-  protected followThumbnailLink = true;
+  protected followThumbnailLink = this.appConfig.browseBy.showThumbnails;
 }

src/app/shared/cookies/browser-klaro.service.ts

@@ -3,7 +3,7 @@ import { BehaviorSubject, combineLatest as observableCombineLatest, Observable,
 import { AuthService } from '../../core/auth/auth.service';
 import { TranslateService } from '@ngx-translate/core';
 import { environment } from '../../../environments/environment';
-import { map, switchMap, take } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { CookieConsents, KlaroService } from './klaro.service';
 import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
@@ -65,9 +65,6 @@ export class BrowserKlaroService extends KlaroService {
   private readonly REGISTRATION_VERIFICATION_ENABLED_KEY = 'registration.verification.enabled';
 
   private readonly GOOGLE_ANALYTICS_SERVICE_NAME = 'google-analytics';
-
-  private lastCookiesConsents: CookieConsents;
-
   /**
    * Initial Klaro configuration
    */
@@ -77,8 +74,21 @@ export class BrowserKlaroService extends KlaroService {
    * Subject to emit updates in the consents
    */
   consentsUpdates$:  BehaviorSubject<CookieConsents> = new BehaviorSubject<CookieConsents>(null);
+  /**
+   * Subject to emit initialization
+   */
+  initialized$:  BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
-
+  /**
+   * Boolean to check if a new watch method from the manager needs to be fired
+   * @private
+   */
+  private isKlaroManagerWatching = false;
+  /**
+   * Boolean to check if service has been initialized
+   * @private
+   */
+  private initialized = false;
   constructor(
     private translateService: TranslateService,
     private authService: AuthService,
@@ -180,8 +190,16 @@ export class BrowserKlaroService extends KlaroService {
         this.translateConfiguration();
 
         this.klaroConfig.services = this.filterConfigServices(servicesToHide);
-        this.lazyKlaro.then(({ setup }) => setup(this.klaroConfig));
+        this.lazyKlaro.then(({ setup }) => {
+          setup(this.klaroConfig);
+          this.initialized = true;
+          this.initialized$.next(this.initialized);
+        });
       });
+
+    this.consentsUpdates$.pipe(
+      filter(() => this.initialized)
+    ).subscribe((consents) => this.isKlaroManagerWatching = hasValue(consents));
   }
 
   /**
@@ -366,15 +384,18 @@ export class BrowserKlaroService extends KlaroService {
   }
 
   watchConsentUpdates(): void {
+    if (this.isKlaroManagerWatching || !this.initialized) {
+      return;
+    }
+
     this.lazyKlaro.then(({getManager}) => {
       const manager = getManager(this.klaroConfig);
       const consentsSubject$ = this.consentsUpdates$;
-      let lastCookiesConsents = this.lastCookiesConsents;
+      let lastCookiesConsents;
 
       consentsSubject$.next(manager.consents);
       manager.watch({
         update(_, eventName, consents) {
-
           if (eventName === 'consents' && !isEqual(consents, lastCookiesConsents)) {
             lastCookiesConsents = deepClone(consents);
             consentsSubject$.next(consents);

src/app/shared/cookies/klaro.service.ts

@@ -33,4 +33,8 @@ export abstract class KlaroService {
    * Subject to emit updates in the consents
    */
   abstract consentsUpdates$:  BehaviorSubject<CookieConsents>;
+  /**
+   * Subject to emit initialization
+   */
+  abstract initialized$:  BehaviorSubject<boolean>;
 }