feat: use new headerbar with online status indicator (#626)

* chore(deps): use latest UI * feat: add pwaEnabled to app config for headerbar
dhis2 · Aug 30, 2021 · 3bd7d37 · 3bd7d37
1 parent c087f09
commit 3bd7d37
Show file tree

Hide file tree

Showing 5 changed files with 410 additions and 389 deletions.
diff --git a/adapter/src/components/ServerVersionProvider.js b/adapter/src/components/ServerVersionProvider.js
@@ -10,6 +10,7 @@ export const ServerVersionProvider = ({
     url,
     apiVersion,
     offlineInterface,
+    pwaEnabled,
     children,
 }) => {
     const [{ loading, error, systemInfo }, setState] = useState({
@@ -55,6 +56,7 @@ export const ServerVersionProvider = ({
                 apiVersion: apiVersion || realApiVersion,
                 serverVersion,
                 systemInfo,
+                pwaEnabled,
             }}
             offlineInterface={offlineInterface}
         >
@@ -67,5 +69,6 @@ ServerVersionProvider.propTypes = {
     apiVersion: PropTypes.number,
     children: PropTypes.element,
     offlineInterface: PropTypes.shape({}),
+    pwaEnabled: PropTypes.bool,
     url: PropTypes.string,
 }
diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -7,11 +7,12 @@ import { ServerVersionProvider } from './components/ServerVersionProvider'
 
 const offlineInterface = new OfflineInterface()
 
-const AppAdapter = ({ url, apiVersion, appName, children }) => (
+const AppAdapter = ({ url, apiVersion, appName, pwaEnabled, children }) => (
     <ErrorBoundary fullscreen onRetry={checkForSWUpdateAndReload}>
         <ServerVersionProvider
             url={url}
             apiVersion={apiVersion}
+            pwaEnabled={pwaEnabled}
             offlineInterface={offlineInterface}
         >
             <AppWrapper appName={appName}>{children}</AppWrapper>
@@ -23,6 +24,7 @@ AppAdapter.propTypes = {
     appName: PropTypes.string.isRequired,
     apiVersion: PropTypes.number,
     children: PropTypes.element,
+    pwaEnabled: PropTypes.bool,
     url: PropTypes.string,
 }
 

diff --git a/shell/package.json b/shell/package.json
@@ -14,9 +14,9 @@
     "dependencies": {
         "@dhis2/app-adapter": "7.3.0-alpha.3",
         "@dhis2/app-runtime": "^2.10.0-pwa.3",
-        "@dhis2/pwa": "7.3.0-alpha.3",
         "@dhis2/d2-i18n": "^1.1.0",
-        "@dhis2/ui": "^6.10.5",
+        "@dhis2/pwa": "7.3.0-alpha.3",
+        "@dhis2/ui": "^6.19.0",
         "classnames": "^2.2.6",
         "moment": "^2.29.1",
         "prop-types": "^15.7.2",

diff --git a/shell/src/App.js b/shell/src/App.js
@@ -12,6 +12,7 @@ const appConfig = {
         window.localStorage.DHIS2_BASE_URL,
     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',
 }
 
 const App = () => (