Skip to content

Commit 464db96

Browse files
committed
[DSC-648] fix issue with refactoring
1 parent 297c99e commit 464db96

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { ActivatedRoute, Router } from '@angular/router';
66
import { Item } from '../../../../core/shared/item.model';
77
import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
88
import { BehaviorSubject } from 'rxjs';
9-
import { tap } from 'rxjs/operators';
109
import { isNotNull } from '../../../../shared/empty.util';
1110

1211
/**
@@ -114,7 +113,6 @@ export abstract class CrisLayoutTabsComponent {
114113
if (isNotNull(this.route.snapshot.paramMap.get('tab'))) {
115114
this.location.replaceState(getItemPageRoute(this.item) + '/' + tab.shortname);
116115
}
117-
// this.router.navigateByUrl(getItemPageRoute(this.item) + '/' + tab.shortname);
118116
}
119117

120118
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ import { By } from '@angular/platform-browser';
1313
import { boxMetrics } from '../../../../../shared/testing/box.mock';
1414
import { TextComponent } from '../metadata/rendering-types/text/text.component';
1515
import { SharedModule } from '../../../../../shared/shared.module';
16-
import { CrisLayoutMetricsBoxComponent, MetricRow } from './cris-layout-metrics-box.component';
16+
import { CrisLayoutMetricsBoxComponent } from './cris-layout-metrics-box.component';
1717
import { metricsComponent } from '../../../../../shared/testing/metrics-components.mock';
1818
import { MetricsComponent } from '../../../../../core/layout/models/metrics-component.model';
1919
import { MetricsComponentsDataService } from '../../../../../core/layout/metrics-components-data.service';
2020
import { Metric } from '../../../../../core/shared/metric.model';
2121
import { ItemDataService } from '../../../../../core/data/item-data.service';
22+
import { CrisLayoutMetricRow } from '../../../../../core/layout/models/tab.model';
2223

2324
export const metric1Mock = {
2425
acquisitionDate: new Date(),
@@ -65,7 +66,7 @@ class MetricsComponentsDataServiceMock {
6566
createSuccessfulRemoteDataObject(metricsComponent)
6667
);
6768
}
68-
getMatchingMetrics(metrics: Metric[], maxColumn: number, metricTypes: string[]): MetricRow[] {
69+
getMatchingMetrics(metrics: Metric[], maxColumn: number, metricTypes: string[]): CrisLayoutMetricRow[] {
6970
return metricRowsMock as any;
7071
}
7172
}

0 commit comments

Comments
 (0)