Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-2142

Author: atarix83

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html

@@ -24,7 +24,7 @@
         <ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
         </ds-comcol-page-content>
       </header>
-        <ds-dso-edit-menu></ds-dso-edit-menu>
+          <ds-context-menu [contextMenuObject]="parentContext" [contextMenuObjectType]="parentContext.type | uppercase"></ds-context-menu>
         </div>
       <!-- Browse-By Links -->
       <ds-themed-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-themed-comcol-page-browse-by>

src/app/browse-by/browse-by.module.ts

@@ -15,6 +15,7 @@ import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.modul
 import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { FormModule } from '../shared/form/form.module';
 import { SharedModule } from '../shared/shared.module';
+import { ContextMenuModule } from '../shared/context-menu/context-menu.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -37,6 +38,7 @@ const ENTRY_COMPONENTS = [
     DsoPageModule,
     FormModule,
     SharedModule,
+    ContextMenuModule,
   ],
   declarations: [
     BrowseBySwitcherComponent,

src/app/lucky-search/search/lucky-search.component.spec.ts

@@ -139,7 +139,7 @@ describe('LuckySearchComponent', () => {
           }
         })
       });
-      spyOn(routerStub, 'parseUrl').and.returnValue(urlTree);
+      routerStub.parseUrl.and.returnValue(urlTree);
       const data = createSuccessfulRemoteDataObject(createPaginatedList([
         firstSearchResult, secondSearchResult
       ]));
@@ -203,7 +203,7 @@ describe('LuckySearchComponent', () => {
       spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
       spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
       spyOn(component, 'redirect');
-      spyOn(routerStub, 'parseUrl').and.returnValue(bitstreamSearchTree);
+      routerStub.parseUrl.and.returnValue(bitstreamSearchTree);
 
       component.resultsRD$.next(data);
 
@@ -266,7 +266,7 @@ describe('LuckySearchComponent', () => {
       spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
       spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
       spyOn(component, 'redirect');
-      spyOn(routerStub, 'parseUrl').and.returnValue(bitstreamSearchTree);
+      routerStub.parseUrl.and.returnValue(bitstreamSearchTree);
 
       component.resultsRD$.next(data);
 

src/app/shared/metric/metric-default/metric-default.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { BaseMetricComponent } from '../metric-loader/base-metric.component';
+import { METRIC_TYPE_DOWNLOAD } from '../metric-embedded/metric-embedded-download/metric-embedded-download.component';
 
 @Component({
   selector: 'ds-metric-default',
@@ -16,5 +17,8 @@ export class MetricDefaultComponent extends BaseMetricComponent implements OnIni
 
   ngOnInit(): void {
     this.url = this.getDetailUrl();
+    if (this.metric.metricType === 'download') {
+      this.url += (this.url.includes('?') ? '&' : '?') + 'reportType=' + METRIC_TYPE_DOWNLOAD;
+    }
   }
 }

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

@@ -18,6 +18,7 @@ export class RouterMock {
   // noinspection TypeScriptUnresolvedFunction
   navigate = jasmine.createSpy('navigate');
   navigateByUrl = jasmine.createSpy('navigateByUrl');
+  parseUrl = jasmine.createSpy('parseUrl');
 
   serializeUrl(url: UrlTree): string {
     return url ? url.toString() : '';
@@ -38,8 +39,4 @@ export class RouterMock {
   get url() {
     return this.routerState.snapshot.url;
   }
-
-  parseUrl(url: string): UrlTree {
-    return null;
-  }
 }

src/styles/_fonts.scss

@@ -130,20 +130,3 @@
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
-@font-face {
-  font-family: 'Nunito';
-  font-style: normal;
-  font-weight: 900; // Black weight
-  font-display: swap;
-  src: url('/assets/fonts/nunito/static/Nunito-Black.ttf') format('truetype');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
-
-@font-face {
-  font-family: 'Nunito';
-  font-style: italic;
-  font-weight: 900; // Black weight
-  font-display: swap;
-  src: url('/assets/fonts/nunito/static/Nunito-BlackItalic.ttf') format('truetype');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}