feat(adapter): don't render headerbar for plugins

dhis2 · Aug 23, 2022 · 4ac6d54 · 4ac6d54
1 parent 9fea158
commit 4ac6d54
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/adapter/src/components/AppWrapper.js b/adapter/src/components/AppWrapper.js
@@ -9,7 +9,7 @@ import { LoadingMask } from './LoadingMask.js'
 import PWAUpdateManager from './PWAUpdateManager.js'
 import { styles } from './styles/AppWrapper.style.js'
 
-export const AppWrapper = ({ appName, children, offlineInterface }) => {
+export const AppWrapper = ({ appName, children, offlineInterface, plugin }) => {
  const { loading: localeLoading } = useCurrentUserLocale()
  const { loading: latestUserLoading } = useVerifyLatestUser()
 
@@ -20,7 +20,7 @@ export const AppWrapper = ({ appName, children, offlineInterface }) => {
  return (
  <div className="app-shell-adapter">
  <style jsx>{styles}</style>
- <HeaderBar appName={appName} />
+ {!plugin && <HeaderBar appName={appName} />}
  <div className="app-shell-app">
  <ErrorBoundary onRetry={() => window.location.reload()}>
  {children}
@@ -36,4 +36,5 @@ AppWrapper.propTypes = {
  appName: PropTypes.string.isRequired,
  offlineInterface: PropTypes.object.isRequired,
  children: PropTypes.node,
+ plugin: PropTypes.bool,
 }
diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -7,15 +7,26 @@ import { ServerVersionProvider } from './components/ServerVersionProvider.js'
 
 const offlineInterface = new OfflineInterface()
 
-const AppAdapter = ({ url, apiVersion, appName, pwaEnabled, children }) => (
+const AppAdapter = ({
+ url,
+ apiVersion,
+ appName,
+ pwaEnabled,
+ plugin,
+ children,
+}) => (
  <ErrorBoundary fullscreen onRetry={checkForSWUpdateAndReload}>
  <ServerVersionProvider
  url={url}
  apiVersion={apiVersion}
  pwaEnabled={pwaEnabled}
  offlineInterface={offlineInterface}
  >
- <AppWrapper appName={appName} offlineInterface={offlineInterface}>
+ <AppWrapper
+ appName={appName}
+ offlineInterface={offlineInterface}
+ plugin={plugin}
+ >
  {children}
  </AppWrapper>
  </ServerVersionProvider>
@@ -26,6 +37,7 @@ AppAdapter.propTypes = {
  appName: PropTypes.string.isRequired,
  apiVersion: PropTypes.number,
  children: PropTypes.element,
+ plugin: PropTypes.bool,
  pwaEnabled: PropTypes.bool,
  url: PropTypes.string,
 }

diff --git a/cli/src/lib/plugin/webpack.config.js b/cli/src/lib/plugin/webpack.config.js
@@ -31,7 +31,7 @@ module.exports = ({ env: webpackEnv, paths }) => {
  process.env.PUBLIC_URL
  )
 
- const shellEnv = getShellEnv({})
+ const shellEnv = getShellEnv({ plugin: 'true' })
 
  // "style" loader turns CSS into JS modules that inject <style> tags.
  // "css" loader resolves paths in CSS and adds assets as dependencies.

diff --git a/shell/src/App.js b/shell/src/App.js
@@ -13,6 +13,7 @@ const appConfig = {
  appName: process.env.REACT_APP_DHIS2_APP_NAME || '',
  apiVersion: parseInt(process.env.REACT_APP_DHIS2_API_VERSION),
  pwaEnabled: process.env.REACT_APP_DHIS2_APP_PWA_ENABLED === 'true',
+ plugin: process.env.REACT_APP_DHIS2_APP_PLUGIN === 'true',
 }
 
 const App = () => (