fix: upgrade to v34 of backend api (#446)

* fix: event popup style * fix: use api version 34 * fix: upgrade to latest maps-gl
dhis2 · Feb 12, 2020 · e022516 · e022516
1 parent d8e83b1
commit e022516
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -48,13 +48,13 @@
         "@dhis2/app-runtime": "^2.0.4",
         "@dhis2/d2-i18n": "^1.0.6",
         "@dhis2/d2-ui-analytics": "^0.0.3",
-        "@dhis2/d2-ui-core": "5.2.10",
+        "@dhis2/d2-ui-core": "^5.2.10",
         "@dhis2/d2-ui-file-menu": "5.2.10",
         "@dhis2/d2-ui-interpretations": "6.2.1",
         "@dhis2/d2-ui-org-unit-dialog": "5.2.10",
         "@dhis2/d2-ui-org-unit-tree": "5.2.10",
         "@dhis2/gis-api": "^34.0.11",
-        "@dhis2/maps-gl": "1.0.2",
+        "@dhis2/maps-gl": "^1.0.3",
         "@dhis2/ui-core": "^4.1.1",
         "@dhis2/ui-widgets": "^2.0.5",
         "@material-ui/core": "^3.9.3",

diff --git a/src/app.js b/src/app.js
@@ -32,7 +32,7 @@ getManifest('manifest.webapp')
                 : DHIS_CONFIG.baseUrl;
 
         config.appUrl = baseUrl; // Base url for switching between apps
-        config.baseUrl = `${baseUrl}/api/33`; // Base url for Web API requests
+        config.baseUrl = `${baseUrl}/api/34`; // Base url for Web API requests
 
         config.context = manifest.activities.dhis; // Added temporarily for util/api.js
 

diff --git a/src/components/app/App.js b/src/components/app/App.js
@@ -50,7 +50,7 @@ export class App extends Component {
             <Provider
                 config={{
                     baseUrl: DHIS_CONFIG.baseUrl,
-                    apiVersion: '33',
+                    apiVersion: '34',
                 }}
             >
                 <FatalErrorBoundary>

diff --git a/src/components/map/Popup.css b/src/components/map/Popup.css
@@ -1,4 +1,3 @@
 .dhis2-map-popup-event {
     overflow-x: auto;
-    width: 300px;
 }
diff --git a/src/components/plugin/ContextMenu.css b/src/components/plugin/ContextMenu.css
@@ -1,4 +1,4 @@
-.MapContextMenu {
+.dhis2-map-context-menu {
     position: absolute;
     background: #fff;
     z-index: 1500;
@@ -10,10 +10,10 @@
     padding: 3px 0;
 }
 
-.MapContextMenu div {
+.dhis2-map-context-menu div {
     padding: 0 10px;
 }
 
-.MapContextMenu div:hover {
+.dhis2-map-context-menu div:hover {
     background: #eee;
 }
diff --git a/src/components/plugin/ContextMenu.js b/src/components/plugin/ContextMenu.js
@@ -23,7 +23,7 @@ class ContextMenu extends Component {
         const { hasCoordinatesUp, hasCoordinatesDown } = feature.properties;
 
         return (
-            <div className="MapContextMenu" ref={el => (this.el = el)}>
+            <div className="dhis2-map-context-menu" ref={el => (this.el = el)}>
                 {hasCoordinatesUp && (
                     <div onClick={() => onDrill('up')}>
                         {i18n.t('Drill up one level')}

diff --git a/src/map.js b/src/map.js
@@ -16,7 +16,7 @@ import { translateConfig } from './util/favorites';
 import { defaultBasemaps } from './constants/basemaps';
 import { version } from '../package.json'; // TODO: Remove version logging
 
-const apiVersion = 33;
+const apiVersion = 34;
 
 log.info(`Maps plugin: ${version}`); // TODO: Remove version logging
 

diff --git a/yarn.lock b/yarn.lock
@@ -258,6 +258,16 @@
     lodash "^4.17.10"
     material-ui "^0.20.0"
 
+"@dhis2/d2-ui-core@^5.2.10":
+  version "5.3.11"
+  resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-core/-/d2-ui-core-5.3.11.tgz#68999560ceba95baad211cf0dd76bb195309fe8b"
+  integrity sha512-dMpg/3byCrV9FTmHhM7Xc9vuiEbtpm3Wpxn40PcjyIXXh5vu7yl15H9sISt1nRhOrdoF3W+LxiTrYAvjrcr8HA==
+  dependencies:
+    babel-runtime "^6.26.0"
+    d2 "~31.7"
+    lodash "^4.17.10"
+    material-ui "^0.20.0"
+
 "@dhis2/d2-ui-favorites-dialog@5.2.10":
   version "5.2.10"
   resolved "https://registry.yarnpkg.com/@dhis2/d2-ui-favorites-dialog/-/d2-ui-favorites-dialog-5.2.10.tgz#70be0004c9f65cfdd1eae263bedb42699906a0b3"
@@ -447,10 +457,10 @@
     leaflet.markercluster "^1.4.1"
     whatwg-fetch "^3.0.0"
 
-"@dhis2/maps-gl@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-1.0.2.tgz#af49519d3e5ff96bbe478f7de545c108b85d4de6"
-  integrity sha512-9mQuYYvL5VD6tKVoUyE1lRmAO8om5aXHvau/nIA/aQt+XA6zoVJJ1OLyVRKUlQiLRxxXyvKym0x+LcW1F+QPUw==
+"@dhis2/maps-gl@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@dhis2/maps-gl/-/maps-gl-1.0.3.tgz#67d6131e0e2bec0e6796dddfadc436745bc8b073"
+  integrity sha512-bw37JJr1uUMHszhBSjhGkpqtZ6g0UOPjvcjWTQdfg8r1g1SeMniX1fv7PAcrkziGOQbt46sg2hvA3DDg5nkf8A==
   dependencies:
     "@mapbox/sphericalmercator" "^1.1.0"
     "@turf/area" "^6.0.1"