From decb7dd9fefb6bff852c216eaf7324bf68defbfb Mon Sep 17 00:00:00 2001 From: Shekar Siri Date: Tue, 28 May 2024 16:32:54 +0200 Subject: [PATCH] change(ui): version tag from api --- .../Header/HealthStatus/HealthWidget.tsx | 8 ++------ frontend/app/components/Header/VersionTag.tsx | 19 +++++++++++++++++++ frontend/app/types/account/account.ts | 4 +++- 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 frontend/app/components/Header/VersionTag.tsx diff --git a/frontend/app/components/Header/HealthStatus/HealthWidget.tsx b/frontend/app/components/Header/HealthStatus/HealthWidget.tsx index 92d846106..24cf22e54 100644 --- a/frontend/app/components/Header/HealthStatus/HealthWidget.tsx +++ b/frontend/app/components/Header/HealthStatus/HealthWidget.tsx @@ -4,8 +4,7 @@ import ServiceCategory from 'Components/Header/HealthStatus/ServiceCategory'; import cn from 'classnames'; import { IServiceStats } from './HealthStatus'; import { Divider, Space } from 'antd'; - -const Logo = require('../../../svg/logo-gray.svg').default; +import VersionTag from "Components/Header/VersionTag"; function HealthWidget({ healthResponse, @@ -43,10 +42,7 @@ function HealthWidget({ return (
- - -
{`v${window.env.VERSION}`}
-
+
+ +
{`v${version}`}
+ + ); +} + +export default connect((state: any) => ({ + version: state.getIn(['user', 'account', 'versionNumber']) +}), {updateModule})(VersionTag) diff --git a/frontend/app/types/account/account.ts b/frontend/app/types/account/account.ts index e06713f98..1ac4ccdf6 100644 --- a/frontend/app/types/account/account.ts +++ b/frontend/app/types/account/account.ts @@ -21,6 +21,7 @@ export interface IAccount extends IMember { tenantKey: string edition: string optOut: string + versionNumber: string } export default Member.extend({ @@ -42,10 +43,11 @@ export default Member.extend({ tenantName: undefined, edition: undefined, optOut: false, + versionNumber: undefined, }, { fromJS: ({ ...account})=> ({ ...account, id: account.id || account.userId, expirationDate: account.expirationDate > 0 && DateTime.fromMillis(account.expirationDate || 0), }) -}); \ No newline at end of file +});