feat: Add SWB version and date to top bar (#432)

awslabs · Apr 12, 2021 · 7d38236 · 7d38236
1 parent fd7c3ff
commit 7d38236
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.2.0] - 2021-04-12
+
+### Added
+- feat: Display SWB Version in UI's Top Bar
 
 ## [2.1.5] - 2021-04-08
 

diff --git a/addons/addon-base-ui/packages/base-ui/src/helpers/settings.js b/addons/addon-base-ui/packages/base-ui/src/helpers/settings.js
@@ -34,4 +34,16 @@ const branding = {
   },
 };
 
-export { awsRegion, apiPath, isLocalDev, websiteUrl, stage, region, branding, autoLogoutTimeoutInMinutes };
+const versionAndDate = process.env.REACT_APP_VERSION_AND_DATE;
+
+export {
+  awsRegion,
+  apiPath,
+  isLocalDev,
+  websiteUrl,
+  stage,
+  region,
+  branding,
+  autoLogoutTimeoutInMinutes,
+  versionAndDate,
+};
diff --git a/addons/addon-base-ui/packages/base-ui/src/parts/MainLayout.js b/addons/addon-base-ui/packages/base-ui/src/parts/MainLayout.js
@@ -22,7 +22,7 @@ import { Menu, Icon, Image } from 'semantic-ui-react';
 
 import { createLink } from '../helpers/routing';
 import { displayError } from '../helpers/notification';
-import { branding } from '../helpers/settings';
+import { branding, versionAndDate } from '../helpers/settings';
 
 // expected props
 // - userStore (via injection)
@@ -87,6 +87,7 @@ class MainLayout extends React.Component {
             style={{ height: '40px', width: 'auto' }}
           />
           <span style={{ paddingLeft: '5px' }}>{branding.main.title}</span>
+          <span style={{ paddingLeft: '20px' }}>{versionAndDate}</span>
         </Menu.Item>
         <Menu.Menu position="right">
           <Menu.Item>

diff --git a/main/config/settings/.defaults.yml b/main/config/settings/.defaults.yml
@@ -172,4 +172,10 @@ auditQldbName: ${self:custom.settings.namespace}-audit
 createServiceCatalogPortfolio: true
 
 # Version number of current release
-customUserAgent: AwsLabs/SO0144/2.1.4
+versionNumber: '2.2.0'
+
+# Release date of current release
+versionDate: '2021-04-12'
+
+# Metadata provided with AWS SDK calls
+customUserAgent: 'AwsLabs/SO0144/${self:custom.settings.versionNumber}'
diff --git a/main/solution/ui/config/environment/env-template.yml b/main/solution/ui/config/environment/env-template.yml
@@ -16,6 +16,7 @@ REACT_APP_BRAND_LOGIN_SUBTITLE: ${self:custom.settings.brandLoginSubtitle}
 REACT_APP_AUTO_LOGOUT_TIMEOUT_IN_MINUTES: ${self:custom.settings.autoLogoutTimeoutInMinutes}
 REACT_APP_ENV_MGMT_ROLE_NAME: ${self:custom.settings.envMgmtRoleName}
 REACT_APP_ENABLE_BUILT_IN_WORKSPACES: ${self:custom.settings.enableBuiltInWorkspaces}
+REACT_APP_VERSION_AND_DATE: ${self:custom.settings.versionAndDate}
 
 # ========================================================================
 # Overrides for .env.local

diff --git a/main/solution/ui/config/settings/.defaults.yml b/main/solution/ui/config/settings/.defaults.yml
@@ -22,6 +22,8 @@ brandMainTitle: 'Service Workbench on AWS (${self:custom.settings.envName}/${sel
 brandLoginTitle: 'Service Workbench'
 brandLoginSubtitle: 'Service Workbench on AWS (${self:custom.settings.envName}/${self:custom.settings.awsRegion})'
 
+versionAndDate:  'Version ${self:custom.settings.versionNumber} (${self:custom.settings.versionDate})'
+
 # After how many minutes should the auto logout dialog be displayed? once displayed the user has 1 minute to dismiss
 # the dialog, otherwise they will be automatically logged out
 autoLogoutTimeoutInMinutes: 30