Skip to content

Commit 317b152

Browse files
DSC-1413 fix circular dependency
1 parent 663f6fc commit 317b152

4 files changed

Lines changed: 6 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
55
import { environment } from '../../../environments/environment';
66
import { map, switchMap, take } from 'rxjs/operators';
77
import { EPerson } from '../../core/eperson/models/eperson.model';
8-
import { KlaroService } from './klaro.service';
8+
import { CookieConsents, KlaroService } from './klaro.service';
99
import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
1010
import { CookieService } from '../../core/services/cookie.service';
1111
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
@@ -18,9 +18,6 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser
1818
import { CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
1919
import isEqual from 'lodash/isEqual';
2020

21-
export interface CookieConsents {
22-
[key: string]: boolean;
23-
}
2421
/**
2522
* Metadata field to store a user's cookie consent preferences in
2623
*/

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Injectable } from '@angular/core';
22

33
import { BehaviorSubject, Observable } from 'rxjs';
4-
import { CookieConsents } from './browser-klaro.service';
5-
4+
export interface CookieConsents {
5+
[key: string]: boolean;
6+
}
67
/**
78
* Abstract class representing a service for handling Klaro consent preferences and UI
89
*/

src/app/shared/metric/metric-loader/metric-loader.component.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import { MetricLoaderService } from './metric-loader.service';
88
import { metric1Mock } from '../../../cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metrics/cris-layout-metrics-box.component.spec';
99
import { MetricStyleConfigPipe } from '../pipes/metric-style-config/metric-style-config.pipe';
1010
import SpyObj = jasmine.SpyObj;
11-
import { KlaroService } from '../../cookies/klaro.service';
12-
import { CookieConsents } from '../../cookies/browser-klaro.service';
11+
import { CookieConsents, KlaroService } from '../../cookies/klaro.service';
1312
import { BaseMetricComponent } from './base-metric.component';
1413

1514

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import { Metric } from '../../../core/shared/metric.model';
1414
import { BaseMetricComponent } from './base-metric.component';
1515
import { MetricLoaderService } from './metric-loader.service';
1616
import { hasValue } from '../../empty.util';
17-
import { CookieConsents } from '../../cookies/browser-klaro.service';
18-
import { KlaroService } from '../../cookies/klaro.service';
17+
import { CookieConsents, KlaroService } from '../../cookies/klaro.service';
1918
import { startWith } from 'rxjs/operators';
2019

2120
@Component({

0 commit comments

Comments
 (0)