From ca8160f571141b71318301aa9f01c0fe748b80a1 Mon Sep 17 00:00:00 2001
From: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue, 14 Sep 2021 15:57:12 +0200
Subject: [PATCH] Merge pull request #92 in TEA/mina-sidor-fa-web from
 feature/version-number to develop

Squashed commit of the following:

commit 2b0f98a4151d3afddd6e717cf3495dd4f78fb79e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 14 15:56:22 2021 +0200

    Removed unused files

commit 0c308eea737b181bb56628c964d6a15f8f142712
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 14 15:52:34 2021 +0200

    Implemented version number so it is saved in environments file upon build
---
 apps/mina-sidor-fa/src/app/app.component.ts     | 10 ++++++++--
 .../components/footer/footer.component.html     |  2 +-
 .../components/footer/footer.component.ts       |  3 ++-
 .../layout/components/footer/footer.module.ts   |  3 +--
 .../src/app/shared/models/environment.model.ts  |  1 +
 .../src/environments/environment.acc.ts         |  1 +
 .../src/environments/environment.api.ts         |  1 +
 .../src/environments/environment.prod.ts        |  1 +
 .../src/environments/environment.ts             |  1 +
 tools/build-os.sh                               | 17 ++++++-----------
 tools/serve-os.sh                               | 15 +++++++--------
 11 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/app.component.ts b/apps/mina-sidor-fa/src/app/app.component.ts
index ec08cfc..6e39a83 100644
--- a/apps/mina-sidor-fa/src/app/app.component.ts
+++ b/apps/mina-sidor-fa/src/app/app.component.ts
@@ -1,4 +1,6 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { environment } from '@msfa-environment';
 
 @Component({
   selector: 'msfa-root',
@@ -6,4 +8,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
   styleUrls: ['./app.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AppComponent {}
+export class AppComponent {
+  constructor(@Inject(DOCUMENT) private document: Document) {
+    this.document.body.dataset.version = environment.version;
+  }
+}
diff --git a/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.html b/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.html
index dc76cda..68bd795 100644
--- a/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.html
+++ b/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.html
@@ -3,7 +3,7 @@
     <digi-logo af-color="secondary"></digi-logo>
     <dl class="footer__version" *ngIf="versionInfoVisible">
       <dt>Aktuell version</dt>
-      <dd><markdown src="assets/VERSION.md"></markdown></dd>
+      <dd>{{version}}</dd>
     </dl>
   </div>
   <nav class="footer__nav">
diff --git a/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.ts b/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.ts
index eb8e433..7c87714 100644
--- a/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.ts
+++ b/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.component.ts
@@ -10,9 +10,10 @@ import { environment } from '@msfa-environment';
 })
 export class FooterComponent {
   activeFeatures: Feature[] = environment.activeFeatures;
+  version: string = environment.version;
 
   get versionInfoVisible(): boolean {
-    return this.activeFeatures.includes(Feature.VERSION_INFO);
+    return this.version && this.activeFeatures.includes(Feature.VERSION_INFO);
   }
   get releasesVisible(): boolean {
     return this.activeFeatures.includes(Feature.RELEASES);
diff --git a/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.module.ts b/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.module.ts
index 2fe9045..555cb70 100644
--- a/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.module.ts
+++ b/apps/mina-sidor-fa/src/app/shared/components/layout/components/footer/footer.module.ts
@@ -1,13 +1,12 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { MarkdownModule } from 'ngx-markdown';
 import { FooterComponent } from './footer.component';
 
 @NgModule({
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   declarations: [FooterComponent],
-  imports: [CommonModule, MarkdownModule.forChild(), RouterModule],
+  imports: [CommonModule, RouterModule],
   exports: [FooterComponent],
 })
 export class FooterModule {}
diff --git a/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts b/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts
index 6f58896..5f33498 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts
@@ -2,6 +2,7 @@ import { Feature } from '@msfa-enums/feature.enum';
 
 export interface Environment {
   environment: 'api' | 'local' | 'acc' | 'prod';
+  version?: string;
   clientId: string;
   loginUrl: string;
   logoutUrl: string;
diff --git a/apps/mina-sidor-fa/src/environments/environment.acc.ts b/apps/mina-sidor-fa/src/environments/environment.acc.ts
index 5101c78..806fdad 100644
--- a/apps/mina-sidor-fa/src/environments/environment.acc.ts
+++ b/apps/mina-sidor-fa/src/environments/environment.acc.ts
@@ -4,6 +4,7 @@ import { CIAM_TEST } from './ciam';
 
 export const environment: Environment = {
   environment: 'acc',
+  version: 'acc',
   production: true,
   api: {
     url: '/api',
diff --git a/apps/mina-sidor-fa/src/environments/environment.api.ts b/apps/mina-sidor-fa/src/environments/environment.api.ts
index 1aaa187..4ead057 100644
--- a/apps/mina-sidor-fa/src/environments/environment.api.ts
+++ b/apps/mina-sidor-fa/src/environments/environment.api.ts
@@ -4,6 +4,7 @@ import { CIAM_TEST } from './ciam';
 
 export const environment: Environment = {
   environment: 'api',
+  version: 'api',
   production: false,
   api: {
     url: '/api',
diff --git a/apps/mina-sidor-fa/src/environments/environment.prod.ts b/apps/mina-sidor-fa/src/environments/environment.prod.ts
index acfcffd..9f4fae2 100644
--- a/apps/mina-sidor-fa/src/environments/environment.prod.ts
+++ b/apps/mina-sidor-fa/src/environments/environment.prod.ts
@@ -4,6 +4,7 @@ import { CIAM_PROD } from './ciam';
 
 export const environment: Environment = {
   environment: 'prod',
+  version: 'prod',
   production: true,
   api: {
     url: '/api',
diff --git a/apps/mina-sidor-fa/src/environments/environment.ts b/apps/mina-sidor-fa/src/environments/environment.ts
index 1e57013..44055eb 100644
--- a/apps/mina-sidor-fa/src/environments/environment.ts
+++ b/apps/mina-sidor-fa/src/environments/environment.ts
@@ -5,6 +5,7 @@ import { CIAM_MOCK } from './ciam';
 
 export const environment: Environment = {
   environment: 'local',
+  version: 'local',
   production: false,
   api: {
     url: '/api',
diff --git a/tools/build-os.sh b/tools/build-os.sh
index b195dc7..85edde8 100644
--- a/tools/build-os.sh
+++ b/tools/build-os.sh
@@ -14,11 +14,7 @@ ORANGE='\033[0;33m'
 CYAN='\033[0;36m'
 YELLOW='\033[1;33m'
 
-
-
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
-version=${version:-$BRANCH}
-config=${config:-prod}
 
 while [ $# -gt 0 ]; do
 
@@ -31,20 +27,19 @@ while [ $# -gt 0 ]; do
   shift
 done
 
+config=${config:-prod}
+version=${version:-$config}
+
 # ----------------------------------
 # UPDATING VERSION
 # ----------------------------------
-echo -e "${CYAN}Setting VERSION to ${version} inside assets directory${NOCOLOR}"
-rm -f apps/mina-sidor-fa/src/assets/VERSION.md
-touch apps/mina-sidor-fa/src/assets/VERSION.md
-echo $version > apps/mina-sidor-fa/src/assets/VERSION.md
-echo -e "${GREEN}VERSION set to ${version}${NOCOLOR}"
+echo -e "${CYAN}Setting version to ${version} inside environments.${config}.ts${NOCOLOR}"
+sed "s/version:.*',/version: '${version}',/" apps/mina-sidor-fa/src/environments/environment.$config.ts > temp.txt && mv temp.txt apps/mina-sidor-fa/src/environments/environment.$config.ts
+echo -e "${GREEN}Version set to ${version}${NOCOLOR}"
 
 # ----------------------------------
 # BUILD APPLICATION
 # ----------------------------------
-
-
 if [ $config = "prod" ]; then
   echo -e "${CYAN}Running npm run build -- --prod${NOCOLOR}"
   npm run build -- --prod
diff --git a/tools/serve-os.sh b/tools/serve-os.sh
index aa6630c..5901c1c 100644
--- a/tools/serve-os.sh
+++ b/tools/serve-os.sh
@@ -14,10 +14,7 @@ ORANGE='\033[0;33m'
 CYAN='\033[0;36m'
 YELLOW='\033[1;33m'
 
-
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
-version=${version:-$BRANCH}
-config=${config:-prod}
 
 while [ $# -gt 0 ]; do
 
@@ -30,14 +27,16 @@ while [ $# -gt 0 ]; do
   shift
 done
 
+config=${config:-prod}
+version=${version:-$config}
+
+
 # ----------------------------------
 # UPDATING VERSION
 # ----------------------------------
-echo -e "${CYAN}Setting VERSION to ${version} inside assets directory${NOCOLOR}"
-rm -f apps/mina-sidor-fa/src/assets/VERSION.md
-touch apps/mina-sidor-fa/src/assets/VERSION.md
-echo $version > apps/mina-sidor-fa/src/assets/VERSION.md
-echo -e "${GREEN}VERSION set to ${version}${NOCOLOR}"
+echo -e "${CYAN}Setting version to ${version} inside environments.${config}.ts${NOCOLOR}"
+sed "s/version:.*',/version: '${version}',/" apps/mina-sidor-fa/src/environments/environment.$config.ts > temp.txt && mv temp.txt apps/mina-sidor-fa/src/environments/environment.$config.ts
+echo -e "${GREEN}Version set to ${version}${NOCOLOR}"
 
 # ----------------------------------
 # BUILD APPLICATION