From fe1b85ca44237ce914df626d6240d6fe8fc2d2e3 Mon Sep 17 00:00:00 2001
From: Sebastian <s.neumair@paragon-data.de>
Date: Tue, 23 Jun 2020 11:03:46 +0200
Subject: [PATCH 1/4] #771 Set Document Title Based on Config

New Title Property in Config | Update AppConfig Interface
---
 apps/sales/src/app/app-configuration.ts       |  1 +
 .../src/assets/config/config.integration.json |  3 ++-
 apps/sales/src/assets/config/config.json      |  3 ++-
 .../src/assets/config/config.production.json  |  3 ++-
 .../src/assets/config/config.staging.json     |  3 ++-
 apps/sales/src/assets/config/config.test.json |  3 ++-
 apps/sales/src/index.html                     | 22 ++++++++++++++-----
 apps/sales/src/main.ts                        | 16 +++++++++-----
 8 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/apps/sales/src/app/app-configuration.ts b/apps/sales/src/app/app-configuration.ts
index e6488371c..083efb8ed 100644
--- a/apps/sales/src/app/app-configuration.ts
+++ b/apps/sales/src/app/app-configuration.ts
@@ -4,6 +4,7 @@ import { AuthConfig } from 'angular-oauth2-oidc';
 @Injectable()
 export class AppConfiguration {
   includeGoogleAnalytics = false;
+  title?: string;
 
   sso: AuthConfig;
 
diff --git a/apps/sales/src/assets/config/config.integration.json b/apps/sales/src/assets/config/config.integration.json
index d52fcc394..8b2e64273 100644
--- a/apps/sales/src/assets/config/config.integration.json
+++ b/apps/sales/src/assets/config/config.integration.json
@@ -1,5 +1,6 @@
 {
   "includeGoogleAnalytics": false,
+  "title": "ISA - integration",
   "sso": {
     "issuer": "https://sso-test.paragon-data.de",
     "clientId": "hug-isa",
@@ -38,4 +39,4 @@
       "print": "https://isa-integration.paragon-data.net/print/v1/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apps/sales/src/assets/config/config.json b/apps/sales/src/assets/config/config.json
index d887258a4..186a8833a 100644
--- a/apps/sales/src/assets/config/config.json
+++ b/apps/sales/src/assets/config/config.json
@@ -1,5 +1,6 @@
 {
   "includeGoogleAnalytics": false,
+  "title": "ISA - local",
   "sso": {
     "issuer": "https://sso-test.paragon-data.de",
     "clientId": "hug-isa",
@@ -38,4 +39,4 @@
       "print": "https://isa-test.paragon-data.net/print/v1/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apps/sales/src/assets/config/config.production.json b/apps/sales/src/assets/config/config.production.json
index 83b30229a..dc9894261 100644
--- a/apps/sales/src/assets/config/config.production.json
+++ b/apps/sales/src/assets/config/config.production.json
@@ -1,5 +1,6 @@
 {
   "includeGoogleAnalytics": true,
+  "title": "ISA",
   "sso": {
     "issuer": "https://sso.paragon-data.de",
     "clientId": "hug-isa",
@@ -38,4 +39,4 @@
       "print": "https://isa.paragon-systems.de/print/v1/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apps/sales/src/assets/config/config.staging.json b/apps/sales/src/assets/config/config.staging.json
index 53d4420ba..ab272d1f9 100644
--- a/apps/sales/src/assets/config/config.staging.json
+++ b/apps/sales/src/assets/config/config.staging.json
@@ -1,5 +1,6 @@
 {
   "includeGoogleAnalytics": true,
+  "title": "ISA - staging",
   "sso": {
     "issuer": "https://sso.paragon-data.de",
     "clientId": "hug-isa",
@@ -38,4 +39,4 @@
       "print": "https://isa-staging.paragon-systems.de/print/v1/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apps/sales/src/assets/config/config.test.json b/apps/sales/src/assets/config/config.test.json
index d887258a4..7c19d6f9e 100644
--- a/apps/sales/src/assets/config/config.test.json
+++ b/apps/sales/src/assets/config/config.test.json
@@ -1,5 +1,6 @@
 {
   "includeGoogleAnalytics": false,
+  "title": "ISA - test",
   "sso": {
     "issuer": "https://sso-test.paragon-data.de",
     "clientId": "hug-isa",
@@ -38,4 +39,4 @@
       "print": "https://isa-test.paragon-data.net/print/v1/"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/apps/sales/src/index.html b/apps/sales/src/index.html
index cccde2e7a..8cb711ee4 100644
--- a/apps/sales/src/index.html
+++ b/apps/sales/src/index.html
@@ -2,14 +2,24 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>Hima</title>
+    <title>ISA</title>
     <base href="/" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
+    />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700" rel="stylesheet" />
-    <link rel="manifest" href="manifest.webmanifest" crossorigin="use-credentials" />
+    <link
+      href="https://fonts.googleapis.com/css?family=Open+Sans:400,600,700"
+      rel="stylesheet"
+    />
+    <link
+      rel="manifest"
+      href="manifest.webmanifest"
+      crossorigin="use-credentials"
+    />
     <meta name="theme-color" content="#1976d2" />
     <style>
       .app-loader {
@@ -47,6 +57,8 @@
     <app-root>
       <img src="/assets/images/Icon_Loading.svg" class="app-loader" />
     </app-root>
-    <noscript>Please enable JavaScript to continue using this application.</noscript>
+    <noscript
+      >Please enable JavaScript to continue using this application.</noscript
+    >
   </body>
 </html>
diff --git a/apps/sales/src/main.ts b/apps/sales/src/main.ts
index 1a47d067f..059fcf9e0 100644
--- a/apps/sales/src/main.ts
+++ b/apps/sales/src/main.ts
@@ -1,4 +1,3 @@
-import { version } from 'package';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
@@ -15,17 +14,24 @@ if ('serviceWorker' in navigator && environment.production) {
   navigator.serviceWorker.register('./ngsw-worker.js');
 }
 
-console.log('ISA Version: ', version);
-
 (async () => {
   try {
     const res = await fetch('/assets/config/config.json');
     const configuration = await res.json();
 
-    platformBrowserDynamic([{ provide: AppConfiguration, useValue: configuration }])
+    if (configuration && configuration.title) {
+      document.title = configuration.title;
+    }
+
+    platformBrowserDynamic([
+      { provide: AppConfiguration, useValue: configuration },
+    ])
       .bootstrapModule(AppModule)
       .catch((err) => console.error(err));
   } catch (error) {
-    console.error('Unable to launch Application. Configuration file "/assets/config/config.json" not found.', error);
+    console.error(
+      'Unable to launch Application. Configuration file "/assets/config/config.json" not found.',
+      error
+    );
   }
 })();

From c696bb4426bf2e80f67b9022ba30314b4a254724 Mon Sep 17 00:00:00 2001
From: Sebastian <s.neumair@paragon-data.de>
Date: Tue, 23 Jun 2020 11:15:38 +0200
Subject: [PATCH 2/4] #771 Re-add Package Version Console Log

---
 apps/sales/src/main.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/sales/src/main.ts b/apps/sales/src/main.ts
index 059fcf9e0..bfe9a20fe 100644
--- a/apps/sales/src/main.ts
+++ b/apps/sales/src/main.ts
@@ -1,3 +1,4 @@
+import { version } from 'package';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
@@ -14,6 +15,8 @@ if ('serviceWorker' in navigator && environment.production) {
   navigator.serviceWorker.register('./ngsw-worker.js');
 }
 
+console.log(`%cISA Version: ${version}`, 'font-weight: bold; font-size: 18px');
+
 (async () => {
   try {
     const res = await fetch('/assets/config/config.json');

From 36a2770d1d7f3290c4db69a7c2b408cc3debdb3a Mon Sep 17 00:00:00 2001
From: Sebastian <s.neumair@paragon-data.de>
Date: Mon, 29 Jun 2020 09:49:33 +0200
Subject: [PATCH 3/4] #788 Hide Truck Icon when primary CtA "In den Warenkorb"
 is dissbled

---
 .../pages/product-details/product-details.component.html     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/sales/src/app/modules/product/pages/product-details/product-details.component.html b/apps/sales/src/app/modules/product/pages/product-details/product-details.component.html
index cf7f90204..1e6467266 100644
--- a/apps/sales/src/app/modules/product/pages/product-details/product-details.component.html
+++ b/apps/sales/src/app/modules/product/pages/product-details/product-details.component.html
@@ -161,7 +161,10 @@
             </div>
           </div>
           <div class="avilability-status" *ngIf="!(showAvLoading | async)">
-            <div class="status-icons" *ngIf="!(isDownload | async)">
+            <div
+              class="status-icons"
+              *ngIf="!(isDownload | async) && !inTheCartButtonDisabled"
+            >
               <div
                 class="align-right ship-icon align-right"
                 *ngIf="(shippingAvailable | async) && !(deliveryError$ | async)"

From 6a34553c9f2cd87d4c00c77549746063e5d97d6a Mon Sep 17 00:00:00 2001
From: Nico Hanus <n.hanus@paragon-data.de>
Date: Tue, 23 Jun 2020 14:32:27 +0200
Subject: [PATCH 4/4] added version in docker to npm package.json

---
 Dockerfile          | 2 ++
 azure-pipelines.yml | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 870eeb1dd..1ee69942c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,11 @@
 #stage 1
 FROM node:10-stretch as node
 ARG IS_PRODUCTION=false
+ARG SEMVERSION=1.0.0
 WORKDIR /app
 COPY . .
 RUN umask 0022
+RUN npm version ${SEMVERSION}
 RUN npm install --always-auth=false
 RUN if [ "${IS_PRODUCTION}" = "true" ] ; then npm run-script build-prod ; else npm run-script build ; fi
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 13c35ee7d..b48a3d061 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -36,6 +36,7 @@ jobs:
           Dockerfile: Dockerfile
           buildContext:
           tags: '$(Build.BuildNumber)-$(Build.SourceVersion)'
+          arguments: '--build-arg SEMVERSION=$(Major).$(Minor).$(Patch)'
 
   - job: cibuild_debug
     displayName: ISAClient CI Debug
@@ -59,7 +60,7 @@ jobs:
           Dockerfile: Dockerfile
           buildContext:
           tags: 'debug-$(Build.BuildNumber)-$(Build.SourceVersion)'
-          arguments: '--no-cache'
+          arguments: '--no-cache --build-arg SEMVERSION=$(Major).$(Minor).$(Patch)'
 
       - task: Docker@2
         displayName: 'push ISAClient Debug'
@@ -103,7 +104,7 @@ jobs:
           Dockerfile: Dockerfile
           buildContext:
           tags: 'prod-$(Build.BuildNumber)-$(Build.SourceVersion)'
-          arguments: '--no-cache --build-arg IS_PRODUCTION=true'
+          arguments: '--no-cache --build-arg IS_PRODUCTION=true --build-arg SEMVERSION=$(Major).$(Minor).$(Patch)'
 
       - task: Docker@2
         displayName: 'push ISAClient Prod'