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

Fix visualization order of the metrics boxes in the item page

Approved-by: Andrea Barbasso

Author: atarix83

src/app/core/core.module.ts

@@ -162,7 +162,7 @@ import { EditItemMode } from './submission/models/edititem-mode.model';
 import { AuditDataService } from './audit/audit-data.service';
 import { Audit } from './audit/model/audit.model';
 import { ItemExportFormat } from './itemexportformat/model/item-export-format.model';
-import { MetricsComponentsDataService } from './layout/metrics-components-data.service';
+import { MetricsComponentsService } from './layout/metrics-components.service';
 import { MetricsComponent } from './layout/models/metrics-component.model';
 import { Metric } from './shared/metric.model';
 import { MetricsDataService } from './data/metrics-data.service';
@@ -354,7 +354,7 @@ const PROVIDERS = [
   FilteredDiscoveryPageResponseParsingService,
   { provide: NativeWindowService, useFactory: NativeWindowFactory },
   TabDataService,
-  MetricsComponentsDataService,
+  MetricsComponentsService,
   MetricsDataService,
   VocabularyService,
   VocabularyDataService,

…/metrics-components-data.service.spec.ts …ayout/metrics-components.service.spec.tssrc/app/core/layout/metrics-components-data.service.spec.ts renamed to src/app/core/layout/metrics-components.service.spec.ts src/app/core/layout/metrics-components-data.service.spec.ts renamed to src/app/core/layout/metrics-components.service.spec.ts

@@ -1,12 +1,12 @@
 import { Metric } from '../shared/metric.model';
-import { MetricsComponentsDataService } from './metrics-components-data.service';
+import { MetricsComponentsService } from './metrics-components.service';
 
-describe('MetricsComponentsDataService', () => {
+describe('MetricsComponentsService', () => {
 
-  let service: MetricsComponentsDataService;
+  let service: MetricsComponentsService;
 
   beforeEach(() => {
-    service = new MetricsComponentsDataService();
+    service = new MetricsComponentsService();
 
   });
 
@@ -44,8 +44,8 @@ describe('MetricsComponentsDataService', () => {
 
       expect(result.length).toBe(1);
       expect(result[0].metrics.length).toBe(2);
-      expect(result[0].metrics[0].metricType).toBe('views');
-      expect(result[0].metrics[1].metricType).toBe('downloads');
+      expect(result[0].metrics[0].metricType).toBe('downloads');
+      expect(result[0].metrics[1].metricType).toBe('views');
 
     });
 

…ayout/metrics-components-data.service.ts …ore/layout/metrics-components.service.tssrc/app/core/layout/metrics-components-data.service.ts renamed to src/app/core/layout/metrics-components.service.ts src/app/core/layout/metrics-components-data.service.ts renamed to src/app/core/layout/metrics-components.service.ts

@@ -4,7 +4,7 @@ import { CrisLayoutMetricRow } from './models/tab.model';
 /**
  * A service responsible for managing metrics objects
  */
-export class MetricsComponentsDataService {
+export class MetricsComponentsService {
 
   /**
    * Get matching metrics for item.
@@ -20,17 +20,13 @@ export class MetricsComponentsDataService {
 
   computeMetricsRows(itemMetrics: Metric[], maxColumn, metricTypes: string[]): CrisLayoutMetricRow[] {
 
-    // support
-    const typeMap = {};
-    metricTypes.forEach((type) => typeMap[type] = type);
-
     // filter, enrich, order
-    const metrics = itemMetrics
-      .filter((metric) => typeMap[metric.metricType])
-      .map((metric) => {
-        return { ...metric, position: typeMap[metric.metricType].position };
+    const metrics: Metric[] = itemMetrics
+      .filter((metric: Metric) => metricTypes.includes(metric.metricType))
+      .map((metric: Metric) => {
+        return { ...metric, position: metricTypes.indexOf(metric.metricType) };
       })
-      .sort((metric) => metric.position);
+      .sort((metricA, metricB ) => metricA.position - metricB.position);
 
     // chunker
     const totalRow = Math.ceil(metrics.length / maxColumn);

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.spec.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { Observable, of } from 'rxjs';
 import { RemoteData } from '../../../../../core/data/remote-data';
@@ -16,7 +16,7 @@ import { SharedModule } from '../../../../../shared/shared.module';
 import { CrisLayoutMetricsBoxComponent } from './cris-layout-metrics-box.component';
 import { metricsComponent } from '../../../../../shared/testing/metrics-components.mock';
 import { MetricsComponent } from '../../../../../core/layout/models/metrics-component.model';
-import { MetricsComponentsDataService } from '../../../../../core/layout/metrics-components-data.service';
+import { MetricsComponentsService } from '../../../../../core/layout/metrics-components.service';
 import { Metric } from '../../../../../core/shared/metric.model';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { CrisLayoutMetricRow } from '../../../../../core/layout/models/tab.model';
@@ -78,7 +78,7 @@ describe('CrisLayoutMetricsBoxComponent', () => {
   let component: CrisLayoutMetricsBoxComponent;
   let fixture: ComponentFixture<CrisLayoutMetricsBoxComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
 
     itemDataService = jasmine.createSpyObj('ItemDataService', {
       getMetrics: jasmine.createSpy('getMetrics')
@@ -94,7 +94,7 @@ describe('CrisLayoutMetricsBoxComponent', () => {
         BrowserAnimationsModule,
         SharedModule],
       providers: [
-        { provide: MetricsComponentsDataService, useClass: MetricsComponentsDataServiceMock },
+        { provide: MetricsComponentsService, useClass: MetricsComponentsDataServiceMock },
         { provide: ItemDataService, useValue: itemDataService },
         { provide: 'boxProvider', useClass: boxMetrics },
         { provide: 'itemProvider', useClass: { metrics: [metric1Mock, metric2Mock] } },

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.ts

@@ -8,7 +8,7 @@ import { RenderCrisLayoutBoxFor } from '../../../../decorators/cris-layout-box.d
 import { LayoutBox } from '../../../../enums/layout-box.enum';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { hasValue } from '../../../../../shared/empty.util';
-import { MetricsComponentsDataService } from '../../../../../core/layout/metrics-components-data.service';
+import { MetricsComponentsService } from '../../../../../core/layout/metrics-components.service';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { CrisLayoutBox, MetricsBoxConfiguration, } from '../../../../../core/layout/models/box.model';
 import { Item } from '../../../../../core/shared/item.model';
@@ -51,7 +51,7 @@ export class CrisLayoutMetricsBoxComponent extends CrisLayoutBoxModelComponent i
   subs: Subscription[] = [];
 
   constructor(
-    protected metricsComponentService: MetricsComponentsDataService,
+    protected metricsComponentService: MetricsComponentsService,
     protected itemService: ItemDataService,
     protected translateService: TranslateService,
     @Inject('boxProvider') public boxProvider: CrisLayoutBox,