Skip to content

Commit

Permalink
review fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaxKless
MaxKless committed Jun 24, 2021
1 parent 3ee8b05 commit 6fd3d9b
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
37 changes: 19 additions & 18 deletions docs/guides/ssr-startup.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 3 additions & 2 deletions src/app/core/utils/multi-site/multi-site.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> {
return this.stateProperties
Expand Down
2 changes: 1 addition & 1 deletion src/app/shell/header/language-switch/language-switch.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ul *ngIf="availableLocales.length">
<ng-container *ngFor="let l of availableLocales">
<li *ngIf="l.lang !== locale.lang">
<a [href]="location | makeHref: { redirect: '1', lang: l.lang } | async"> {{ l.displayName }} </a>
<a [href]="location | makeHref: { lang: l.lang } | async"> {{ l.displayName }} </a>
</li>
</ng-container>
</ul>
Expand Down
1 change: 0 additions & 1 deletion src/environments/environment.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down

1 comment on commit 6fd3d9b

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Azure Demo Servers are available:

Please sign in to comment.