Backport: #641 + some other minor UX improvements (#649)

* update version info * Fixes invalid attempt to destructure non-iterable instance when "Add geometry to feature response" is enabled on QGIS project (#641) * 🐛 Use right variable to get x and y * ✨ Show only four decimal numbers on query or query bbox coordinates * ✨ Show only four decimal numbers , if map in degrees, or two decimal numer if in meter, on query or query bbox coordinates * Clean code - spaces * Handle reset of strictly nested dependencies (search inputs) (#643) * Fix #642 in v3.8.x * remove useful "has_select" + comments * 🐛 Aligned with afa5af6 * Remove f mispelling --------- Co-authored-by: Raruto <[email protected]> * 3.10.1-alpha.0 * 🐛 Ux sidebar open on mobile #648 * 💄 center Layer name and layer tools on layer header result * ✨ Show relation feature form structure in new content intead inside table. --------- Co-authored-by: Raruto <[email protected]>
g3w-suite · Aug 6, 2024 · 455fe64 · 455fe64
1 parent 690b3f6
commit 455fe64
Show file tree

Hide file tree

Showing 32 changed files with 955 additions and 969 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# G3W-CLIENT v3.10.0
+# G3W-CLIENT v3.10.1-alpha.0
 
 [![License](https://img.shields.io/badge/license-MPL%202-blue.svg?style=flat)](LICENSE)
 
@@ -357,8 +357,8 @@ All notable changes to this project are documented in the [releases](https://git
 ---
 
 **Compatibile with:**
-[![g3w-admin version](https://img.shields.io/badge/g3w--admin-3.7-1EB300.svg?style=flat)](https://github.com/g3w-suite/g3w-admin/tree/v.3.7.x)
-[![g3w-suite-docker version](https://img.shields.io/badge/g3w--suite--docker-3.7-1EB300.svg?style=flat)](https://github.com/g3w-suite/g3w-suite-docker/tree/v3.7.x)
+[![g3w-admin version](https://img.shields.io/badge/g3w--admin-3.8-1EB300.svg?style=flat)](https://github.com/g3w-suite/g3w-admin/tree/v.3.8.x)
+[![g3w-suite-docker version](https://img.shields.io/badge/g3w--suite--docker-3.8-1EB300.svg?style=flat)](https://github.com/g3w-suite/g3w-suite-docker/tree/v3.8.x)
 
 ---
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "g3w-client",
-  "version": "3.10.0",
+  "version": "3.10.1-alpha.0",
   "description": "Gis3W WebGIS Client",
   "main": "index.js",
   "scripts": {

diff --git a/src/app/constant.js b/src/app/constant.js
@@ -60,7 +60,7 @@ export const DOWNLOAD_FORMATS = {
   },
   download_pdf: {
     format: 'pdf',
-    url: 'pdf'
+    url:    'pdf'
   },
 };
 
@@ -402,12 +402,8 @@ export const TOC_THEMES_INIT_STATUS = 'collapsed';
  */
 export const VIEWPORT = {
   resize: {
-    map: {
-      min: 200
-    },
-    content: {
-      min: 200
-    }
+    map:     { min: 200 },
+    content: { min: 200 },
   }
 };
 

diff --git a/src/app/core/layers/features/featuresstore.js b/src/app/core/layers/features/featuresstore.js
@@ -204,7 +204,7 @@ proto._updateFeature = function(feature) {
   });
 };
 
-proto.setFeatures = function(features) {
+proto.setFeatures = function(features = []) {
   this._features = features;
 };
 

diff --git a/src/app/core/layers/features/olfeaturesstore.js b/src/app/core/layers/features/olfeaturesstore.js
@@ -16,8 +16,12 @@ proto.getLength = function() {
 };
 
 //overwrite
-proto.setFeatures = function(features=[]) {
-  features.forEach(feature => this._features.push(feature));
+proto.setFeatures = function(features = []) {
+  //remove features
+  this._features.clear();
+  //add new features
+  this.addFeatures(features);
+  this._features.dispatchEvent('change');
 };
 // overwrite
 proto.readFeatures = function() {

diff --git a/src/app/gui/fields/fields.js b/src/app/gui/fields/fields.js
@@ -7,13 +7,13 @@ import VueField from 'components/FieldVue.vue';
 
 const Fields = {
   simple_field: Text,
-  text_field: Text,
-  link_field: Link,
-  image_field: Image,
-  geo_field: Geo,
-  photo_field: Image,
-  media_field: Media,
-  vue_field: VueField
+  text_field:   Text,
+  link_field:   Link,
+  image_field:  Image,
+  geo_field:    Geo,
+  photo_field:  Image,
+  media_field:  Media,
+  vue_field:    VueField
 };
 
 module.exports = Fields;
diff --git a/src/app/gui/fields/fieldsservice.js b/src/app/gui/fields/fieldsservice.js
@@ -7,15 +7,15 @@ const URLPattern   = /^(https?:\/\/[^\s]+)/g;
 const PhotoPattern = /[^\s]+.(png|jpg|jpeg|gif)$/g;
 
 const FieldType = {
-  SIMPLE:'simple',
-  GEO:'geo',
-  LINK:'link',
-  PHOTO: 'photo',
-  PHOTOLINK: "photolink",
-  IMAGE:'image',
-  POINTLINK:'pointlink',
-  ROUTE: 'route',
-  VUE: 'vue'
+  SIMPLE:    'simple',
+  GEO:       'geo',
+  LINK:      'link',
+  PHOTO:     'photo',
+  PHOTOLINK: 'photolink',
+  IMAGE:     'image',
+  POINTLINK: 'pointlink',
+  ROUTE:     'route',
+  VUE:       'vue'
 };
 
 module.exports  = {
@@ -27,9 +27,9 @@ module.exports  = {
    */
   getType(field) {
     let type = field.type;
-    if (type !== 'vue'){
+    if ('vue' !== type){
       const fieldValue = field.value;
-      const value = fieldValue && toRawType(fieldValue) === 'Object' && !fieldValue.coordinates && !fieldValue.vue ? fieldValue.value : fieldValue;
+      const value = fieldValue && 'Object' === toRawType(fieldValue) && !fieldValue.coordinates && !fieldValue.vue ? fieldValue.value : fieldValue;
       if (!value) {
         type = FieldType.SIMPLE;
       } else if (value && typeof value == 'object') {
-Original file line number
+Diff line change
@@ Expand Up / @@ -204,7 +204,7 @@ proto._updateFeature = function(feature) { @@
       });
     };
-    proto.setFeatures = function(features) {
+    proto.setFeatures = function(features = []) {
       this._features = features;
     };
@@ Expand Down @@