fix: allow env var override of api version (#67)

dhis2 · Sep 25, 2019 · dc1b6df · dc1b6df
1 parent b737b14
commit dc1b6df
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/examples/simple-app/yarn.lock b/examples/simple-app/yarn.lock
@@ -923,7 +923,7 @@
  integrity sha512-+Rmw+QshbgiBielN7UH4VXfEeSnSj1N3d4HGqf3iekyUXCNdpZX2bD9QrH43KvdfH+lDp71Uh7y3FKEhzSbRLA==
 
 "@dhis2/cli-app-scripts@file:../../cli":
- version "1.4.1"
+ version "1.4.2"
  dependencies:
  "@babel/core" "^7.6.0"
  "@babel/plugin-proposal-class-properties" "^7.4.4"

diff --git a/shell/adapter/src/AuthBoundary/index.js b/shell/adapter/src/AuthBoundary/index.js
@@ -5,13 +5,15 @@ import i18n from '../locales'
 import { ScreenCover, CircularLoader } from '@dhis2/ui-core'
 import { LoginModal } from './LoginModal'
 
+const settingsQuery = {
+ userSettings: {
+ resource: 'userSettings',
+ },
+}
+
 export const AuthBoundary = ({ url, children }) => {
  i18n.changeLanguage(window.navigator.language)
- const { loading, error, data } = useDataQuery({
- userSettings: {
- resource: 'userSettings',
- },
- })
+ const { loading, error, data } = useDataQuery(settingsQuery)
 
  if (loading) {
  return (

diff --git a/shell/adapter/src/index.js b/shell/adapter/src/index.js
@@ -4,9 +4,9 @@ import { DataProvider } from '@dhis2/app-runtime'
 import { FatalErrorBoundary } from './FatalErrorBoundary'
 import { AuthBoundary } from './AuthBoundary'
 
-const App = ({ url, appName, children }) => (
+const App = ({ url, apiVersion, appName, children }) => (
  <FatalErrorBoundary>
- <DataProvider baseUrl={url} apiVersion={32}>
+ <DataProvider baseUrl={url} apiVersion={apiVersion}>
  <HeaderBar appName={appName} />
  <AuthBoundary url={url}>{children}</AuthBoundary>
  </DataProvider>

diff --git a/shell/adapter/yarn.lock b/shell/adapter/yarn.lock
@@ -851,7 +851,7 @@
  integrity sha512-+Rmw+QshbgiBielN7UH4VXfEeSnSj1N3d4HGqf3iekyUXCNdpZX2bD9QrH43KvdfH+lDp71Uh7y3FKEhzSbRLA==
 
 "@dhis2/cli-app-scripts@file:../../cli":
- version "1.4.1"
+ version "1.4.2"
  dependencies:
  "@babel/core" "^7.6.0"
  "@babel/plugin-proposal-class-properties" "^7.4.4"

diff --git a/shell/src/App.js b/shell/src/App.js
@@ -10,6 +10,7 @@ const D2App = React.lazy(() =>
 const appConfig = {
  url: process.env.REACT_APP_DHIS2_BASE_URL || 'http:https://localhost:8080',
  appName: process.env.REACT_APP_DHIS2_APP_NAME || '',
+ apiVersion: parseInt(process.env.REACT_APP_DHIS2_API_VERSION) || 32,
 }
 
 const App = () => (

diff --git a/shell/src/current-d2-app/App.js → shell/src/current-d2-app/app.js b/shell/src/current-d2-app/App.js → shell/src/current-d2-app/app.js