[DSC-648] fix metrics circular dependencies

Author: atarix83

src/app/core/layout/metrics-components-data.service.ts

@@ -17,7 +17,7 @@ import { RemoteData } from '../data/remote-data';
 import { METRICSCOMPONENT } from './models/metrics-component.resource-type';
 import { MetricsComponent } from './models/metrics-component.model';
 import { Metric } from '../shared/metric.model';
-import { MetricRow } from '../../cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component';
+import { CrisLayoutMetricRow } from './models/tab.model';
 
 class DataServiceImpl extends DataService<MetricsComponent> {
   protected linkPath = 'boxmetricsconfigurations';
@@ -68,7 +68,7 @@ export class MetricsComponentsDataService {
   /**
    * Get matching metrics for item.
    */
-  getMatchingMetrics(metrics: Metric[], maxColumn: number, metricTypes: string[]): MetricRow[] {
+  getMatchingMetrics(metrics: Metric[], maxColumn: number, metricTypes: string[]): CrisLayoutMetricRow[] {
     if (maxColumn == null || maxColumn <= 0) {
       maxColumn = 3;
     }
@@ -77,7 +77,7 @@ export class MetricsComponentsDataService {
     return metricRows;
   }
 
-  computeMetricsRows(itemMetrics: Metric[], maxColumn, metricTypes: string[]): MetricRow[] {
+  computeMetricsRows(itemMetrics: Metric[], maxColumn, metricTypes: string[]): CrisLayoutMetricRow[] {
 
     // support
     const typeMap = {};

src/app/core/layout/models/box.model.ts

@@ -1,95 +1,96 @@
 export interface MetadataGroup {
-    leading: string;
-    elements: LayoutField[];
+  leading: string;
+  elements: LayoutField[];
 }
 
 export interface LayoutBitstream {
-    bundle: string;
-    metadataField: string;
-    metadataValue: string;
+  bundle: string;
+  metadataField: string;
+  metadataValue: string;
 }
 
 export enum LayoutFieldType {
   METADATA = 'METADATA',
   METADATAGROUP = 'METADATAGROUP',
   BITSTREAM = 'BITSTREAM'
 }
+
 export interface LayoutField {
-    metadata?: string;
-    bitstream?: LayoutBitstream;
-    label?: string;
-    rendering: string;
-    fieldType: LayoutFieldType|string;
-    style?: string;
-    styleLabel?: string;
-    styleValue?: string;
-    metadataGroup?: MetadataGroup;
-    labelAsHeading: boolean;
-    valuesInline: boolean;
+  metadata?: string;
+  bitstream?: LayoutBitstream;
+  label?: string;
+  rendering: string;
+  fieldType: LayoutFieldType | string;
+  style?: string;
+  styleLabel?: string;
+  styleValue?: string;
+  metadataGroup?: MetadataGroup;
+  labelAsHeading: boolean;
+  valuesInline: boolean;
 }
 
 export interface MetadataBoxConfiguration extends BoxConfiguration {
-    id: string;
-    rows: MetadataBoxRow[];
+  id: string;
+  rows: MetadataBoxRow[];
 }
 
 export interface BoxConfiguration {
-    type: string;
+  type: string;
 }
 
 export interface RelationBoxConfiguration extends BoxConfiguration {
-    'discovery-configuration': string;
+  'discovery-configuration': string;
 }
 
 export interface MetricsBoxConfiguration extends BoxConfiguration {
-    maxColumns: null;
-    metrics: string[];
+  maxColumns: null;
+  metrics: string[];
 }
 
 export interface MetadataBoxCell {
-    style: string;
-    fields: LayoutField[];
+  style: string;
+  fields: LayoutField[];
 }
 
 export interface MetadataBoxRow {
-    style: string;
-    cells: MetadataBoxCell[];
+  style: string;
+  cells: MetadataBoxCell[];
 }
 
 /**
  * Describes the CrisLayoutBox model
  */
 export class CrisLayoutBox {
 
-    /**
-     * The identifier of this CrisLayoutBox
-     */
-    id: number;
+  /**
+   * The identifier of this CrisLayoutBox
+   */
+  id: number;
 
-    shortname: string;
+  shortname: string;
 
-    header: string;
+  header: string;
 
-    entityType: string;
+  entityType: string;
 
-    collapsed: boolean;
+  collapsed: boolean;
 
-    minor: boolean;
+  minor: boolean;
 
-    style: string;
+  style: string;
 
-    clear: boolean;
+  clear: boolean;
 
-    maxColumn: number;
+  maxColumn: number;
 
-    container: boolean;
+  container: boolean;
 
-    metadataSecurityFields?: string[];
+  metadataSecurityFields?: string[];
 
-    security: number;
+  security: number;
 
-    boxType: string;
+  boxType: string;
 
-    configuration?: RelationBoxConfiguration | MetadataBoxConfiguration | MetricsBoxConfiguration;
+  configuration?: RelationBoxConfiguration | MetadataBoxConfiguration | MetricsBoxConfiguration;
 
 }

src/app/core/layout/models/tab.model.ts

@@ -7,6 +7,7 @@ import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ResourceType } from '../../shared/resource-type';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { CrisLayoutBox } from './box.model';
+import { Metric } from '../../shared/metric.model';
 
 /**
  * Describes a type of CrisLayoutTab
@@ -85,9 +86,11 @@ export interface CrisLayoutRow {
   cells: CrisLayoutCell[];
 }
 
-
-
 export interface CrisLayoutCell {
   style: string;
   boxes: CrisLayoutBox[];
 }
+
+export interface CrisLayoutMetricRow {
+  metrics: Metric[];
+}

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

@@ -9,14 +9,10 @@ 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 { Metric } from '../../../../../core/shared/metric.model';
 import { ItemDataService } from '../../../../../core/data/item-data.service';
 import { CrisLayoutBox, MetricsBoxConfiguration, } from '../../../../../core/layout/models/box.model';
 import { Item } from '../../../../../core/shared/item.model';
-
-export interface MetricRow {
-  metrics: Metric[];
-}
+import { CrisLayoutMetricRow } from '../../../../../core/layout/models/tab.model';
 
 /**
  * This component renders the metadata boxes of items
@@ -41,7 +37,7 @@ export class CrisLayoutMetricsBoxComponent extends CrisLayoutBoxModelComponent i
   /**
    * Computed metric rows for the item and the current box
    */
-  metricRows: BehaviorSubject<MetricRow[]> = new BehaviorSubject<MetricRow[]>([]);
+  metricRows: BehaviorSubject<CrisLayoutMetricRow[]> = new BehaviorSubject<CrisLayoutMetricRow[]>([]);
 
   /**
    * true if the item has a thumbnail, false otherwise

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

@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { MetricRow } from '../cris-layout-metrics-box.component';
+import { CrisLayoutMetricRow } from '../../../../../../core/layout/models/tab.model';
 
 /**
  * This component renders the rows of metadata boxes
@@ -14,5 +14,5 @@ export class MetricRowComponent {
   /**
    * Current row configuration
    */
-  @Input() metricRow: MetricRow;
+  @Input() metricRow: CrisLayoutMetricRow;
 }