feat: provide the app's name & version to the <HeaderBar>

adapter/src/components/AppWrapper.js

@@ -7,7 +7,7 @@ import { ErrorBoundary } from './ErrorBoundary.js'
 import { LoadingMask } from './LoadingMask.js'
 import { styles } from './styles/AppWrapper.style.js'
 
-export const AppWrapper = ({ appName, children }) => {
+export const AppWrapper = ({ appName, appVersion, children }) => {
  const { loading } = useCurrentUserLocale()
 
  if (loading) {
@@ -16,19 +16,23 @@ export const AppWrapper = ({ appName, children }) => {
 
  return (
  <div className="app-shell-adapter">
- <style jsx>{styles}</style>
- <HeaderBar appName={appName} />
+ <HeaderBar appName={appName} appVersion={appVersion} />
+
  <div className="app-shell-app">
  <ErrorBoundary onRetry={() => window.location.reload()}>
  {children}
  </ErrorBoundary>
  </div>
+
  <Alerts />
+
+ <style jsx>{styles}</style>
  </div>
  )
 }
 
 AppWrapper.propTypes = {
  appName: PropTypes.string.isRequired,
+ appVersion: PropTypes.string,
  children: PropTypes.node,
 }

adapter/src/index.js

@@ -7,22 +7,32 @@ import { ServerVersionProvider } from './components/ServerVersionProvider'
 
 const offlineInterface = new OfflineInterface()
 
-const AppAdapter = ({ url, apiVersion, appName, pwaEnabled, children }) => (
+const AppAdapter = ({
+ url,
+ apiVersion,
+ appName,
+ appVersion,
+ pwaEnabled,
+ children,
+}) => (
  <ErrorBoundary fullscreen onRetry={checkForSWUpdateAndReload}>
  <ServerVersionProvider
  url={url}
  apiVersion={apiVersion}
  pwaEnabled={pwaEnabled}
  offlineInterface={offlineInterface}
  >
- <AppWrapper appName={appName}>{children}</AppWrapper>
+ <AppWrapper appName={appName} appVersion={appVersion}>
+ {children}
+ </AppWrapper>
  </ServerVersionProvider>
  </ErrorBoundary>
 )
 
 AppAdapter.propTypes = {
  appName: PropTypes.string.isRequired,
  apiVersion: PropTypes.number,
+ appVersion: PropTypes.number,
  children: PropTypes.element,
  pwaEnabled: PropTypes.bool,
  url: PropTypes.string,

cli/src/lib/shell/getAppInfos.js

@@ -0,0 +1 @@
+module.exports = ({ title, version }) => ({ name: title, version })

cli/src/lib/shell/index.js

@@ -2,6 +2,7 @@ const { exec } = require('@dhis2/cli-helpers-engine')
 const { getPWAEnvVars } = require('../pwa')
 const bootstrap = require('./bootstrap')
 const getEnv = require('./env')
+const getAppInfos = require('./getAppInfos')
 
 module.exports = ({ config, paths }) => ({
  bootstrap: async (args = {}) => {
@@ -16,7 +17,7 @@ module.exports = ({ config, paths }) => ({
  cmd: 'yarn',
  args: ['run', 'build'],
  cwd: paths.shell,
- env: getEnv({ name: config.title, ...getPWAEnvVars(config) }),
+ env: getEnv({ ...getAppInfos(config), ...getPWAEnvVars(config) }),
  pipe: false,
  })
  },
@@ -25,7 +26,11 @@ module.exports = ({ config, paths }) => ({
  cmd: 'yarn',
  args: ['run', 'start'],
  cwd: paths.shell,
- env: getEnv({ name: config.title, port, ...getPWAEnvVars(config) }),
+ env: getEnv({
+ ...getAppInfos(config),
+ port,
+ ...getPWAEnvVars(config),
+ }),
  pipe: false,
  })
  },
@@ -34,7 +39,7 @@ module.exports = ({ config, paths }) => ({
  cmd: 'yarn',
  args: ['run', 'test', '--', '--all'],
  cwd: paths.shell,
- env: getEnv({ name: config.title }),
+ env: getEnv({ ...getAppInfos(config) }),
  pipe: true,
  })
  },

shell/src/App.js

@@ -11,6 +11,7 @@ const appConfig = {
  process.env.REACT_APP_DHIS2_BASE_URL ||
  window.localStorage.DHIS2_BASE_URL,
  appName: process.env.REACT_APP_DHIS2_APP_NAME || '',
+ appVersion: process.env.REACT_APP_DHIS2_APP_VERSION || '',
  apiVersion: parseInt(process.env.REACT_APP_DHIS2_API_VERSION),
  pwaEnabled: process.env.REACT_APP_DHIS2_APP_PWA_ENABLED === 'true',
 }