From 8bd86e16569e025738982df03830e3f43b00eb4a Mon Sep 17 00:00:00 2001 From: suubi-joshua Date: Mon, 2 Jun 2025 11:36:39 +0300 Subject: [PATCH 1/3] Adding config to enable implementors add version number --- .../apps/esm-login-app/__mocks__/config.mock.ts | 2 ++ packages/apps/esm-login-app/src/config-schema.ts | 14 +++++++++++++- .../apps/esm-login-app/src/footer.component.tsx | 8 +++++++- packages/apps/esm-login-app/src/footer.scss | 7 +++++++ packages/apps/esm-login-app/translations/en.json | 2 +- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/packages/apps/esm-login-app/__mocks__/config.mock.ts b/packages/apps/esm-login-app/__mocks__/config.mock.ts index c125a1ca8..a0607407e 100644 --- a/packages/apps/esm-login-app/__mocks__/config.mock.ts +++ b/packages/apps/esm-login-app/__mocks__/config.mock.ts @@ -21,6 +21,8 @@ export const mockConfig: ConfigSchema = { }, footer: { additionalLogos: [], + version: '3.0.0', + showVersion: true, }, showPasswordOnSeparateScreen: true, }; diff --git a/packages/apps/esm-login-app/src/config-schema.ts b/packages/apps/esm-login-app/src/config-schema.ts index 70c6e195f..82e644d3c 100644 --- a/packages/apps/esm-login-app/src/config-schema.ts +++ b/packages/apps/esm-login-app/src/config-schema.ts @@ -72,7 +72,7 @@ export const configSchema = { _type: Type.String, _required: true, _description: 'The source URL of the logo image', - _validations: [validators.isUrl], + _validators: [validators.isUrl], }, alt: { _type: Type.String, @@ -84,6 +84,16 @@ export const configSchema = { _default: [], _description: 'An array of logos to be displayed in the footer next to the OpenMRS logo.', }, + version: { + _type: Type.String, + _default: null, + _description: 'Version number to display in the footer (e.g., "3.0.0")', + }, + showVersion: { + _type: Type.Boolean, + _default: true, + _description: 'Whether to display the version information in the footer.', + }, }, showPasswordOnSeparateScreen: { _type: Type.Boolean, @@ -105,6 +115,8 @@ export interface ConfigSchema { alt: string; src: string; }>; + version: string; + showVersion: boolean; }; links: { loginSuccess: string; diff --git a/packages/apps/esm-login-app/src/footer.component.tsx b/packages/apps/esm-login-app/src/footer.component.tsx index 667d3a415..a347c6dbf 100644 --- a/packages/apps/esm-login-app/src/footer.component.tsx +++ b/packages/apps/esm-login-app/src/footer.component.tsx @@ -28,8 +28,14 @@ const Footer: React.FC = () => { - {t('poweredBySubtext', 'An open-source medical record system and global community')} + {t('poweredBySubtext', 'An open-source medical record system and global community.')} + {/* Only show version section if enabled in config and version is provided */} + {config.footer.showVersion && config.footer.version && ( + + {t('version', 'Version')} {config.footer.version} + + )} Date: Thu, 5 Jun 2025 12:32:22 +0300 Subject: [PATCH 2/3] Set version display to false by default --- packages/apps/esm-login-app/__mocks__/config.mock.ts | 2 +- packages/apps/esm-login-app/src/config-schema.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apps/esm-login-app/__mocks__/config.mock.ts b/packages/apps/esm-login-app/__mocks__/config.mock.ts index a0607407e..942d0fd03 100644 --- a/packages/apps/esm-login-app/__mocks__/config.mock.ts +++ b/packages/apps/esm-login-app/__mocks__/config.mock.ts @@ -22,7 +22,7 @@ export const mockConfig: ConfigSchema = { footer: { additionalLogos: [], version: '3.0.0', - showVersion: true, + showVersion: false, }, showPasswordOnSeparateScreen: true, }; diff --git a/packages/apps/esm-login-app/src/config-schema.ts b/packages/apps/esm-login-app/src/config-schema.ts index 82e644d3c..702feb030 100644 --- a/packages/apps/esm-login-app/src/config-schema.ts +++ b/packages/apps/esm-login-app/src/config-schema.ts @@ -91,7 +91,7 @@ export const configSchema = { }, showVersion: { _type: Type.Boolean, - _default: true, + _default: false, _description: 'Whether to display the version information in the footer.', }, }, From 162da1df86c9a26e457b3761e7e48389ad3b74ae Mon Sep 17 00:00:00 2001 From: suubi-joshua Date: Thu, 5 Jun 2025 12:33:29 +0300 Subject: [PATCH 3/3] Translation of of version --- packages/apps/esm-login-app/translations/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/apps/esm-login-app/translations/en.json b/packages/apps/esm-login-app/translations/en.json index a348d3e35..a196def45 100644 --- a/packages/apps/esm-login-app/translations/en.json +++ b/packages/apps/esm-login-app/translations/en.json @@ -37,5 +37,6 @@ "submitting": "Submitting", "username": "Username", "validValueRequired": "A valid value is required", + "version": "Version", "welcome": "Welcome" }