From d68dde74a8bcf494613fecabb677280b6d90a16e Mon Sep 17 00:00:00 2001
From: Cilibiu Bogdan <pionnegru@users.noreply.github.com>
Date: Wed, 14 Mar 2018 11:46:45 +0200
Subject: [PATCH] [ACA-1213] About - release version (#231)

* get release version

* use versions value
---
 src/app/components/about/about.component.html |  2 +-
 src/app/components/about/about.component.ts   | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/app/components/about/about.component.html b/src/app/components/about/about.component.html
index 0142c6069..c7503db12 100644
--- a/src/app/components/about/about.component.html
+++ b/src/app/components/about/about.component.html
@@ -22,7 +22,7 @@
 
         <article class="padding">
             <header class="header padding-left">Alfresco Content Application</header>
-            <p class="padding-left"> version: 1.0 </p>
+            <p class="padding-left"> version: {{ releaseVersion }} </p>
         </article>
 
         <article *ngIf="githubUrlCommitAlpha" class="padding">
diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts
index 2912748b9..0177273fc 100644
--- a/src/app/components/about/about.component.ts
+++ b/src/app/components/about/about.component.ts
@@ -40,7 +40,7 @@ export class AboutComponent implements OnInit {
     license: ObjectDataTableAdapter;
     modules: ObjectDataTableAdapter;
     githubUrlCommitAlpha = 'https://github.com/Alfresco/alfresco-content-app/commits';
-
+    releaseVersion = '';
 
     constructor(
         private discovery: DiscoveryApiService,
@@ -79,20 +79,24 @@ export class AboutComponent implements OnInit {
             ]);
         });
 
-        this.http.get('/versions.json').subscribe(response => {
-            const regexp = new RegExp('^(@alfresco|alfresco-)');
+        this.http.get('/versions.json')
+            .map(response => response.json())
+            .subscribe(response => {
+                const regexp = new RegExp('^(@alfresco|alfresco-)');
 
-            const alfrescoPackagesTableRepresentation = Object.keys(response.json().dependencies)
-                .filter((val) => regexp.test(val))
-                .map((val) => ({
-                    name: val,
-                    version: response.json().dependencies[val].version
-                }));
+                const alfrescoPackagesTableRepresentation = Object.keys(response.dependencies)
+                    .filter((val) => regexp.test(val))
+                    .map((val) => ({
+                        name: val,
+                        version: response.dependencies[val].version
+                    }));
 
-            this.data = new ObjectDataTableAdapter(alfrescoPackagesTableRepresentation, [
-                {type: 'text', key: 'name', title: 'Name', sortable: true},
-                {type: 'text', key: 'version', title: 'Version', sortable: true}
-            ]);
-        });
+                this.data = new ObjectDataTableAdapter(alfrescoPackagesTableRepresentation, [
+                    {type: 'text', key: 'name', title: 'Name', sortable: true},
+                    {type: 'text', key: 'version', title: 'Version', sortable: true}
+                ]);
+
+                this.releaseVersion = response.version;
+            });
     }
 }