Merge pull request #18 from kartoza/issue_476

Fix headers GGMN attribute table
kartoza · Feb 23, 2022 · 2f5649e · 2f5649e
2 parents 276e9d8 + 54250f2
commit 2f5649e
Show file tree

Hide file tree

Showing 66 changed files with 21 additions and 19 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.12-kartoza
+2.0.13-kartoza
diff --git a/geonode_mapstore_client/client/js/api.js b/geonode_mapstore_client/client/js/api.js
@@ -126,27 +126,29 @@ window.initMapstore2Api = function(config, resolve) {
     let layerAttributes = {};
     let layerAttributeFetched = 0;
 
-    if (currentUrl.includes('groundwater-well') || currentUrl.includes('well-and-monitoring-data')) {
+    if (currentUrl.includes('groundwater-well') || currentUrl.includes('well-and-monitoring-data') || currentUrl.includes('view/ggmn')) {
         axios.get(uuidUrl, {}).then((response) => {
             setConfigProp('viewparams', `uuid:${response.data['uuid']}`);
             if (response.data['extent']) {
                 setConfigProp('groundwater_extent', response.data['extent']);
                 ms2_config.map.maxExtent = ol.proj.transformExtent(response.data.extent,  'EPSG:4326', 'EPSG:3857');
             }
             const layers = ms2_config.map.layers || [];
-            layers.forEach((_layer, index) => {
-                let attributesUrl = `/api/layer/${_layer.name}/attributes`;
+            for (let _layer of layers) {
+                if (!_layer.id || !_layer.id.toLowerCase().includes('groundwater_well')) {
+                    continue;
+                }
+                let layerName = _layer.name;
+                layerName = layerName.replace('groundwater:Groundwater_Well_GGMN', 'groundwater:Groundwater_Well');
+                let attributesUrl = `/api/layer/${layerName}/attributes`;
                 axios.get(attributesUrl, {}).then((_response) => {
                     layerAttributes[_layer.name] = _response.data;
                 }).catch((error) => {
                 }).finally(() => {
-                    layerAttributeFetched += 1;
-                    if (layerAttributeFetched === layers.length) {
-                        setConfigProp('layerattributes', layerAttributes);
-                        _initMapstore2Api(config, resolve);
-                    }
+                    setConfigProp('layerattributes', layerAttributes);
+                    _initMapstore2Api(config, resolve);
                 });
-            });
+            }
         });
     } else {
         _initMapstore2Api(config, resolve);

diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geonode-mapstore-client",
-  "version": "2.0.12-kartoza",
+  "version": "2.0.13-kartoza",
   "description": "MapStore 2 Api bundle specific to geonode framework",
   "main": "api.js",
   "eslintConfig": {

diff --git a/geonode_mapstore_client/client/version.txt b/geonode_mapstore_client/client/version.txt
@@ -1 +1 @@
-geonode-mapstore-client-v2.0.12-kartoza-51ea37d569d09c0cfe1ef519856afe79209d001d
+geonode-mapstore-client-v2.0.13-kartoza-7dd3f28dd859221e3c840831bcfaac9037b75f69
diff --git a/...tore/dist/0.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/0.4738f2117f8dabb0999a.chunk.js b/...tore/dist/0.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/0.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/1.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/1.4738f2117f8dabb0999a.chunk.js b/...tore/dist/1.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/1.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/10.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/10.4738f2117f8dabb0999a.chunk.js b/...ore/dist/10.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/10.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/11.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/11.4738f2117f8dabb0999a.chunk.js b/...ore/dist/11.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/11.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/12.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/12.4738f2117f8dabb0999a.chunk.js b/...ore/dist/12.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/12.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/13.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/13.4738f2117f8dabb0999a.chunk.js b/...ore/dist/13.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/13.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/14.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/14.4738f2117f8dabb0999a.chunk.js b/...ore/dist/14.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/14.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/15.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/15.4738f2117f8dabb0999a.chunk.js b/...ore/dist/15.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/15.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/16.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/16.4738f2117f8dabb0999a.chunk.js b/...ore/dist/16.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/16.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/17.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/17.4738f2117f8dabb0999a.chunk.js b/...ore/dist/17.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/17.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/18.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/18.4738f2117f8dabb0999a.chunk.js b/...ore/dist/18.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/18.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/19.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/19.4738f2117f8dabb0999a.chunk.js b/...ore/dist/19.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/19.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/2.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/2.4738f2117f8dabb0999a.chunk.js b/...tore/dist/2.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/2.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/20.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/20.4738f2117f8dabb0999a.chunk.js b/...ore/dist/20.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/20.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/21.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/21.4738f2117f8dabb0999a.chunk.js b/...ore/dist/21.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/21.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/22.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/22.4738f2117f8dabb0999a.chunk.js b/...ore/dist/22.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/22.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/23.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/23.4738f2117f8dabb0999a.chunk.js b/...ore/dist/23.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/23.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/24.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/24.4738f2117f8dabb0999a.chunk.js b/...ore/dist/24.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/24.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/25.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/25.4738f2117f8dabb0999a.chunk.js b/...ore/dist/25.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/25.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/26.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/26.4738f2117f8dabb0999a.chunk.js b/...ore/dist/26.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/26.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/27.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/27.4738f2117f8dabb0999a.chunk.js b/...ore/dist/27.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/27.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/28.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/28.4738f2117f8dabb0999a.chunk.js b/...ore/dist/28.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/28.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/29.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/29.4738f2117f8dabb0999a.chunk.js b/...ore/dist/29.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/29.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/3.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/3.4738f2117f8dabb0999a.chunk.js b/...tore/dist/3.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/3.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/30.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/30.4738f2117f8dabb0999a.chunk.js b/...ore/dist/30.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/30.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/31.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/31.4738f2117f8dabb0999a.chunk.js b/...ore/dist/31.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/31.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/32.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/32.4738f2117f8dabb0999a.chunk.js b/...ore/dist/32.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/32.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/33.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/33.4738f2117f8dabb0999a.chunk.js b/...ore/dist/33.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/33.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/34.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/34.4738f2117f8dabb0999a.chunk.js b/...ore/dist/34.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/34.4738f2117f8dabb0999a.chunk.js
diff --git a/...ore/dist/35.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/35.4738f2117f8dabb0999a.chunk.js b/...ore/dist/35.5f1a4d9d7274920b739b.chunk.js → ...ore/dist/35.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/4.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/4.4738f2117f8dabb0999a.chunk.js b/...tore/dist/4.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/4.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/5.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/5.4738f2117f8dabb0999a.chunk.js b/...tore/dist/5.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/5.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/6.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/6.4738f2117f8dabb0999a.chunk.js b/...tore/dist/6.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/6.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/7.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/7.4738f2117f8dabb0999a.chunk.js b/...tore/dist/7.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/7.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/8.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/8.4738f2117f8dabb0999a.chunk.js b/...tore/dist/8.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/8.4738f2117f8dabb0999a.chunk.js
diff --git a/...tore/dist/9.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/9.4738f2117f8dabb0999a.chunk.js b/...tore/dist/9.5f1a4d9d7274920b739b.chunk.js → ...tore/dist/9.4738f2117f8dabb0999a.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/gn-geostory.js b/geonode_mapstore_client/static/mapstore/dist/gn-geostory.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/gn-home.js b/geonode_mapstore_client/static/mapstore/dist/gn-home.js
diff --git a/...y-cesium-js.5f1a4d9d7274920b739b.chunk.js → ...y-cesium-js.4738f2117f8dabb0999a.chunk.js b/...y-cesium-js.5f1a4d9d7274920b739b.chunk.js → ...y-cesium-js.4738f2117f8dabb0999a.chunk.js
diff --git a/...-leaflet-js.5f1a4d9d7274920b739b.chunk.js → ...-leaflet-js.4738f2117f8dabb0999a.chunk.js b/...-leaflet-js.5f1a4d9d7274920b739b.chunk.js → ...-leaflet-js.4738f2117f8dabb0999a.chunk.js
diff --git a/...enlayers-js.5f1a4d9d7274920b739b.chunk.js → ...enlayers-js.4738f2117f8dabb0999a.chunk.js b/...enlayers-js.5f1a4d9d7274920b739b.chunk.js → ...enlayers-js.4738f2117f8dabb0999a.chunk.js
diff --git a/...ary-sink-js.5f1a4d9d7274920b739b.chunk.js → ...ary-sink-js.4738f2117f8dabb0999a.chunk.js b/...ary-sink-js.5f1a4d9d7274920b739b.chunk.js → ...ary-sink-js.4738f2117f8dabb0999a.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/ms2-geonode-api.js b/geonode_mapstore_client/static/mapstore/dist/ms2-geonode-api.js
diff --git a/...menu-plugin.5f1a4d9d7274920b739b.chunk.js → ...menu-plugin.4738f2117f8dabb0999a.chunk.js b/...menu-plugin.5f1a4d9d7274920b739b.chunk.js → ...menu-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...itor-plugin.5f1a4d9d7274920b739b.chunk.js → ...itor-plugin.4738f2117f8dabb0999a.chunk.js b/...itor-plugin.5f1a4d9d7274920b739b.chunk.js → ...itor-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...tion-plugin.5f1a4d9d7274920b739b.chunk.js → ...tion-plugin.4738f2117f8dabb0999a.chunk.js b/...tion-plugin.5f1a4d9d7274920b739b.chunk.js → ...tion-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...hare-plugin.5f1a4d9d7274920b739b.chunk.js → ...hare-plugin.4738f2117f8dabb0999a.chunk.js b/...hare-plugin.5f1a4d9d7274920b739b.chunk.js → ...hare-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...tory-plugin.5f1a4d9d7274920b739b.chunk.js → ...tory-plugin.4738f2117f8dabb0999a.chunk.js b/...tory-plugin.5f1a4d9d7274920b739b.chunk.js → ...tory-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...itor-plugin.5f1a4d9d7274920b739b.chunk.js → ...itor-plugin.4738f2117f8dabb0999a.chunk.js b/...itor-plugin.5f1a4d9d7274920b739b.chunk.js → ...itor-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...data-plugin.5f1a4d9d7274920b739b.chunk.js → ...data-plugin.4738f2117f8dabb0999a.chunk.js b/...data-plugin.5f1a4d9d7274920b739b.chunk.js → ...data-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...ions-plugin.5f1a4d9d7274920b739b.chunk.js → ...ions-plugin.4738f2117f8dabb0999a.chunk.js b/...ions-plugin.5f1a4d9d7274920b739b.chunk.js → ...ions-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...-bar-plugin.5f1a4d9d7274920b739b.chunk.js → ...-bar-plugin.4738f2117f8dabb0999a.chunk.js b/...-bar-plugin.5f1a4d9d7274920b739b.chunk.js → ...-bar-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...e-as-plugin.5f1a4d9d7274920b739b.chunk.js → ...e-as-plugin.4738f2117f8dabb0999a.chunk.js b/...e-as-plugin.5f1a4d9d7274920b739b.chunk.js → ...e-as-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...save-plugin.5f1a4d9d7274920b739b.chunk.js → ...save-plugin.4738f2117f8dabb0999a.chunk.js b/...save-plugin.5f1a4d9d7274920b739b.chunk.js → ...save-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...hare-plugin.5f1a4d9d7274920b739b.chunk.js → ...hare-plugin.4738f2117f8dabb0999a.chunk.js b/...hare-plugin.5f1a4d9d7274920b739b.chunk.js → ...hare-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...y-cesium-js.5f1a4d9d7274920b739b.chunk.js → ...y-cesium-js.4738f2117f8dabb0999a.chunk.js b/...y-cesium-js.5f1a4d9d7274920b739b.chunk.js → ...y-cesium-js.4738f2117f8dabb0999a.chunk.js
diff --git a/...ug~5a52f4ec.5f1a4d9d7274920b739b.chunk.js → ...ug~5a52f4ec.4738f2117f8dabb0999a.chunk.js b/...ug~5a52f4ec.5f1a4d9d7274920b739b.chunk.js → ...ug~5a52f4ec.4738f2117f8dabb0999a.chunk.js
diff --git a/...pdfjsWorker.5f1a4d9d7274920b739b.chunk.js → ...pdfjsWorker.4738f2117f8dabb0999a.chunk.js b/...pdfjsWorker.5f1a4d9d7274920b739b.chunk.js → ...pdfjsWorker.4738f2117f8dabb0999a.chunk.js
diff --git a/.../m~99cc38b2.5f1a4d9d7274920b739b.chunk.js → .../m~99cc38b2.4738f2117f8dabb0999a.chunk.js b/.../m~99cc38b2.5f1a4d9d7274920b739b.chunk.js → .../m~99cc38b2.4738f2117f8dabb0999a.chunk.js
diff --git a/...tion-plugin.5f1a4d9d7274920b739b.chunk.js → ...tion-plugin.4738f2117f8dabb0999a.chunk.js b/...tion-plugin.5f1a4d9d7274920b739b.chunk.js → ...tion-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/...data-plugin.5f1a4d9d7274920b739b.chunk.js → ...data-plugin.4738f2117f8dabb0999a.chunk.js b/...data-plugin.5f1a4d9d7274920b739b.chunk.js → ...data-plugin.4738f2117f8dabb0999a.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/version.txt b/geonode_mapstore_client/static/mapstore/version.txt
@@ -1 +1 @@
-geonode-mapstore-client-v2.0.12-kartoza-51ea37d569d09c0cfe1ef519856afe79209d001d
+geonode-mapstore-client-v2.0.13-kartoza-7dd3f28dd859221e3c840831bcfaac9037b75f69