From 6fd3d9b1938640a03e4df854d2a3df952cc14d91 Mon Sep 17 00:00:00 2001 From: "max.kless@googlemail.com" Date: Thu, 24 Jun 2021 17:25:01 +0200 Subject: [PATCH] review fixes --- docs/guides/ssr-startup.md | 37 ++++++++++--------- .../utils/multi-site/multi-site.service.ts | 5 ++- .../language-switch.component.html | 2 +- src/environments/environment.model.ts | 1 - 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/docs/guides/ssr-startup.md b/docs/guides/ssr-startup.md index d8ac0ba03f..03ebd65b7b 100644 --- a/docs/guides/ssr-startup.md +++ b/docs/guides/ssr-startup.md @@ -34,24 +34,25 @@ If the format is _switch_, the property is switched on by supplying `on`, `1`, ` All parameters are **case sensitive**. Make sure to use them as written in the table below. -| | parameter | format | comment | -| ------------------- | --------------------- | -------------------- | ------------------------------------------------------------ | -| **SSR Specific** | PORT | number | Port for running the application | -| | SSL | any | Enables SSL/TLS | -| **General** | ICM_BASE_URL | string | Sets the base URL for the ICM | -| | ICM_CHANNEL | string | Overrides the default channel | -| | ICM_APPLICATION | string | Overrides the default application | -| | FEATURES | comma-separated list | Overrides active features | -| | THEME | string | Overrides the default theme | -| **Debug** :warning: | TRUST_ICM | any | Use this if ICM is deployed with an insecure certificate | -| | LOGGING | switch | Enables extra log output | -| **Hybrid Approach** | SSR_HYBRID | any | Enables running PWA and ICM in [Hybrid Mode][concept-hybrid] | -| | PROXY_ICM | any \| URL | Proxy ICM via `/INTERSHOP` (enabled if SSR_HYBRID is active) | -| **Third party** | GTM_TOKEN | string | Token for Google Tag Manager | -| | SENTRY_DSN | string | Sentry DSN URL for using Sentry Error Monitor | -| | PROMETHEUS | switch | Exposes Prometheus metrics | -| | ICM_IDENTITY_PROVIDER | string | ID of Identity Provider for [SSO][concept-sso] | -| | IDENTITY_PROVIDERS | JSON | Configuration of Identity Providers for [SSO][concept-sso] | +| | parameter | format | comment | +| ------------------- | --------------------- | -------------------- | -------------------------------------------------------------------------------------------- | +| **SSR Specific** | PORT | number | Port for running the application | +| | SSL | any | Enables SSL/TLS | +| **General** | ICM_BASE_URL | string | Sets the base URL for the ICM | +| | ICM_CHANNEL | string | Overrides the default channel | +| | ICM_APPLICATION | string | Overrides the default application | +| | FEATURES | comma-separated list | Overrides active features | +| | THEME | string | Overrides the default theme | +| | MULTI_SITE_LOCALE_MAP | JSON | Used to map locales to [url modification parameters](../guides/multi-site-configurations.md) | +| **Debug** :warning: | TRUST_ICM | any | Use this if ICM is deployed with an insecure certificate | +| | LOGGING | switch | Enables extra log output | +| **Hybrid Approach** | SSR_HYBRID | any | Enables running PWA and ICM in [Hybrid Mode][concept-hybrid] | +| | PROXY_ICM | any \| URL | Proxy ICM via `/INTERSHOP` (enabled if SSR_HYBRID is active) | +| **Third party** | GTM_TOKEN | string | Token for Google Tag Manager | +| | SENTRY_DSN | string | Sentry DSN URL for using Sentry Error Monitor | +| | PROMETHEUS | switch | Exposes Prometheus metrics | +| | ICM_IDENTITY_PROVIDER | string | ID of Identity Provider for [SSO][concept-sso] | +| | IDENTITY_PROVIDERS | JSON | Configuration of Identity Providers for [SSO][concept-sso] | ## Running with https diff --git a/src/app/core/utils/multi-site/multi-site.service.ts b/src/app/core/utils/multi-site/multi-site.service.ts index b17bbca596..85a5f55752 100644 --- a/src/app/core/utils/multi-site/multi-site.service.ts +++ b/src/app/core/utils/multi-site/multi-site.service.ts @@ -13,8 +13,9 @@ export class MultiSiteService { /** * returns the current url, modified to fit the locale parameter if the environment parameter "multiSiteLocaleMap" is set * @param locale the locale which the new url should fit - * @param location the current location - * @returns the current url, modified to fit the locale parameter + * @param url the current url + * @param baseHref the current baseHref which needs to be replaced + * @returns the modified url */ getLangUpdatedUrl(locale: string, url: string, baseHref: string): Observable { return this.stateProperties diff --git a/src/app/shell/header/language-switch/language-switch.component.html b/src/app/shell/header/language-switch/language-switch.component.html index 42b98918be..27b62d184d 100644 --- a/src/app/shell/header/language-switch/language-switch.component.html +++ b/src/app/shell/header/language-switch/language-switch.component.html @@ -17,7 +17,7 @@ diff --git a/src/environments/environment.model.ts b/src/environments/environment.model.ts index ef01eb773f..9ea9bd8a8f 100644 --- a/src/environments/environment.model.ts +++ b/src/environments/environment.model.ts @@ -145,7 +145,6 @@ export const ENVIRONMENT_DEFAULTS: Environment = { de_DE: '/de', fr_FR: '/fr', }, - // tslint:enable: use-camel-case-environment-properties cookieConsentOptions: { options: { required: {