diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7178cf97f1..9b9e36ac11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,7 +104,7 @@ jobs: run: npm run check-circ-deps - name: Run build - run: npm run build:prod-e2e + run: npm run build:prod - name: Run specs (unit tests) run: npm run test:headless diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts index 0a9e861970..2310ca2c14 100644 --- a/src/app/core/log/log.interceptor.spec.ts +++ b/src/app/core/log/log.interceptor.spec.ts @@ -16,12 +16,12 @@ import { appReducers, storeModuleConfig, } from '../../app.reducer'; +import { CorrelationIdService } from '../../correlation-id/correlation-id.service'; +import { OrejimeService } from '../../shared/cookies/orejime.service'; import { CORRELATION_ID_COOKIE, - CorrelationIdService, -} from '../../correlation-id/correlation-id.service'; -import { OrejimeService } from '../../shared/cookies/orejime.service'; -import { CORRELATION_ID_OREJIME_KEY } from '../../shared/cookies/orejime-configuration'; + CORRELATION_ID_OREJIME_KEY, +} from '../../shared/cookies/orejime-configuration'; import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock'; import { RouterStub } from '../../shared/testing/router.stub'; import { RestRequestMethod } from '../data/rest-request-method'; diff --git a/src/app/correlation-id/correlation-id.service.spec.ts b/src/app/correlation-id/correlation-id.service.spec.ts index 9a458644fc..709ade04ee 100644 --- a/src/app/correlation-id/correlation-id.service.spec.ts +++ b/src/app/correlation-id/correlation-id.service.spec.ts @@ -12,12 +12,10 @@ import { storeModuleConfig, } from '../app.reducer'; 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 { SetCorrelationIdAction } from './correlation-id.actions'; -import { - CORRELATION_ID_COOKIE, - CorrelationIdService, -} from './correlation-id.service'; +import { CorrelationIdService } from './correlation-id.service'; describe('CorrelationIdService', () => { let service: CorrelationIdService; diff --git a/src/app/correlation-id/correlation-id.service.ts b/src/app/correlation-id/correlation-id.service.ts index bb8b19d708..25d8f40923 100644 --- a/src/app/correlation-id/correlation-id.service.ts +++ b/src/app/correlation-id/correlation-id.service.ts @@ -16,13 +16,14 @@ import { } from '../core/services/window.service'; import { UUIDService } from '../core/shared/uuid.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 { SetCorrelationIdAction } from './correlation-id.actions'; 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 */ diff --git a/src/app/shared/cookies/orejime-configuration.ts b/src/app/shared/cookies/orejime-configuration.ts index 5e8f961087..c7c616121a 100644 --- a/src/app/shared/cookies/orejime-configuration.ts +++ b/src/app/shared/cookies/orejime-configuration.ts @@ -9,7 +9,6 @@ import { } from '../../core/google-recaptcha/google-recaptcha.service'; import { LANG_COOKIE } from '../../core/locale/locale.service'; import { NativeWindowRef } from '../../core/services/window.service'; -import { CORRELATION_ID_COOKIE } from '../../correlation-id/correlation-id.service'; /** * 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_COOKIE = 'CORRELATION-ID'; + /** * Orejime configuration * For more information see https://github.com/empreinte-digitale/orejime