fix: set alerts to undefined (#440)

* fix: set alerts to undefined by default * fix: base url needed for header bar in production builds
dhis2 · Feb 6, 2020 · d7ab7e6 · d7ab7e6
1 parent fa9cf81
commit d7ab7e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/loaders/boundaryLoader.js b/src/loaders/boundaryLoader.js
@@ -66,7 +66,7 @@ const boundaryLoader = async config => {
         name: layerName,
         alerts: !features.length
             ? [createAlert(i18n.t('Alert'), i18n.t('No boundaries found'))]
-            : null,
+            : undefined,
         isLoaded: true,
         isExpanded: true,
         isVisible: true,

diff --git a/src/reducers/map.js b/src/reducers/map.js
@@ -145,7 +145,7 @@ const layer = (state, action) => {
         case types.ALERTS_CLEAR:
             return {
                 ...state,
-                alerts: null,
+                alerts: undefined,
             };
 
         case types.MAP_EARTH_ENGINE_VALUE_SHOW:
@@ -324,7 +324,7 @@ const map = (state = defaultState, action) => {
         case types.ALERTS_CLEAR:
             return {
                 ...state,
-                alerts: null,
+                alerts: undefined,
                 mapViews: state.mapViews.map(l => layer(l, action)),
             };
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -129,7 +129,9 @@ if (!isDevBuild) {
         // Replace any occurance of process.env.NODE_ENV with the string 'production'
         new webpack.DefinePlugin({
             'process.env': { NODE_ENV: JSON.stringify('production') },
-            DHIS_CONFIG: JSON.stringify({}),
+            DHIS_CONFIG: JSON.stringify({
+                baseUrl: '../',
+            }),
         })
     );
     webpackConfig.plugins.push(new webpack.optimize.OccurrenceOrderPlugin());