hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-309] fix circular dependency

Browse Source
This commit is contained in:
Andrea Barbasso
2025-05-14 17:38:50 +02:00
parent f1a1aebe33
commit 887bf0d266
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -104,7 +104,7 @@ jobs:
run: npm run check-circ-deps run: npm run check-circ-deps
- name: Run build - name: Run build
run: npm run build:prod-e2e run: npm run build:prod
- name: Run specs (unit tests) - name: Run specs (unit tests)
run: npm run test:headless run: npm run test:headless

8
src/app/core/log/log.interceptor.spec.ts
View File

@@ -16,12 +16,12 @@ import {
appReducers, appReducers,
storeModuleConfig, storeModuleConfig,
} from '../../app.reducer'; } from '../../app.reducer';
import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
import { OrejimeService } from '../../shared/cookies/orejime.service';
import { import {
CORRELATION_ID_COOKIE, CORRELATION_ID_COOKIE,
CorrelationIdService, CORRELATION_ID_OREJIME_KEY,
} from '../../correlation-id/correlation-id.service'; } from '../../shared/cookies/orejime-configuration';
import { OrejimeService } from '../../shared/cookies/orejime.service';
import { CORRELATION_ID_OREJIME_KEY } from '../../shared/cookies/orejime-configuration';
import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock'; import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
import { RouterStub } from '../../shared/testing/router.stub'; import { RouterStub } from '../../shared/testing/router.stub';
import { RestRequestMethod } from '../data/rest-request-method'; import { RestRequestMethod } from '../data/rest-request-method';

6
src/app/correlation-id/correlation-id.service.spec.ts
View File

@@ -12,12 +12,10 @@ import {
storeModuleConfig, storeModuleConfig,
} from '../app.reducer'; } from '../app.reducer';
import { UUIDService } from '../core/shared/uuid.service'; import { UUIDService } from '../core/shared/uuid.service';
import { CORRELATION_ID_COOKIE } from '../shared/cookies/orejime-configuration';
import { CookieServiceMock } from '../shared/mocks/cookie.service.mock'; import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
import { SetCorrelationIdAction } from './correlation-id.actions'; import { SetCorrelationIdAction } from './correlation-id.actions';
import { import { CorrelationIdService } from './correlation-id.service';
CORRELATION_ID_COOKIE,
CorrelationIdService,
} from './correlation-id.service';
describe('CorrelationIdService', () => { describe('CorrelationIdService', () => {
let service: CorrelationIdService; let service: CorrelationIdService;

7
src/app/correlation-id/correlation-id.service.ts
View File

@@ -16,13 +16,14 @@ import {
} from '../core/services/window.service'; } from '../core/services/window.service';
import { UUIDService } from '../core/shared/uuid.service'; import { UUIDService } from '../core/shared/uuid.service';
import { OrejimeService } from '../shared/cookies/orejime.service'; import { OrejimeService } from '../shared/cookies/orejime.service';
import { CORRELATION_ID_OREJIME_KEY } from '../shared/cookies/orejime-configuration'; import {
CORRELATION_ID_COOKIE,
CORRELATION_ID_OREJIME_KEY,
} from '../shared/cookies/orejime-configuration';
import { isEmpty } from '../shared/empty.util'; import { isEmpty } from '../shared/empty.util';
import { SetCorrelationIdAction } from './correlation-id.actions'; import { SetCorrelationIdAction } from './correlation-id.actions';
import { correlationIdSelector } from './correlation-id.selector'; import { correlationIdSelector } from './correlation-id.selector';
export const CORRELATION_ID_COOKIE = 'CORRELATION-ID';
/** /**
* Service to manage the correlation id, an id used to give context to server side logs * Service to manage the correlation id, an id used to give context to server side logs
*/ */

3
src/app/shared/cookies/orejime-configuration.ts
View File

@@ -9,7 +9,6 @@ import {
} from '../../core/google-recaptcha/google-recaptcha.service'; } from '../../core/google-recaptcha/google-recaptcha.service';
import { LANG_COOKIE } from '../../core/locale/locale.service'; import { LANG_COOKIE } from '../../core/locale/locale.service';
import { NativeWindowRef } from '../../core/services/window.service'; import { NativeWindowRef } from '../../core/services/window.service';
import { CORRELATION_ID_COOKIE } from '../../correlation-id/correlation-id.service';
/** /**
* Cookie for has_agreed_end_user * Cookie for has_agreed_end_user
@@ -26,6 +25,8 @@ export const MATOMO_COOKIE = 'dsMatomo';
export const CORRELATION_ID_OREJIME_KEY = 'correlation-id'; export const CORRELATION_ID_OREJIME_KEY = 'correlation-id';
export const CORRELATION_ID_COOKIE = 'CORRELATION-ID';
/** /**
* Orejime configuration * Orejime configuration
* For more information see https://github.com/empreinte-digitale/orejime * For more information see https://github.com/empreinte-digitale/orejime