From 8802d017cc09c26de1646e68e00f48974a035f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Fri, 14 Jan 2022 18:39:39 +0100
Subject: [PATCH] fix features import in projects without moderation(undefined
 value without error log)

---
 src/store/modules/feature_type.js              | 6 ++----
 src/views/feature_type/Feature_type_detail.vue | 9 +++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/feature_type.js b/src/store/modules/feature_type.js
index 4c6c95f3..046d784a 100644
--- a/src/store/modules/feature_type.js
+++ b/src/store/modules/feature_type.js
@@ -167,13 +167,12 @@ const feature_type = {
       let { feature_type_slug, geojson } = payload;
       //* check if geojson then build a file
       if(!geojson && !state.fileToImport && state.fileToImport.size === 0 ) return
-
       let formData = new FormData();
       let fileToImport;
       const {name, type} = geojson || state.fileToImport;
 
       if (!rootGetters.project.moderation) {
-        if (state.fileToImport.size > 0) { //* if data in a binary file, read it as text
+        if (state.fileToImport && state.fileToImport.size > 0) { //* if data in a binary file, read it as text
           const textFile = await state.fileToImport.text();
           geojson = JSON.parse(textFile);
         }
@@ -183,7 +182,7 @@ const feature_type = {
         };
       }
       fileToImport = new File([JSON.stringify(geojson)], name, {type});
-        
+
       formData.append('json_file', geojson ? fileToImport : state.fileToImport);
       formData.append('feature_type_slug', feature_type_slug);
       let url =
@@ -206,7 +205,6 @@ const feature_type = {
         .catch((error) => {
           throw (error);
         });
-     // }
     },
 
     GET_IMPORTS({ commit }, { project_slug, feature_type }) {
diff --git a/src/views/feature_type/Feature_type_detail.vue b/src/views/feature_type/Feature_type_detail.vue
index c43b14d1..517fb08d 100644
--- a/src/views/feature_type/Feature_type_detail.vue
+++ b/src/views/feature_type/Feature_type_detail.vue
@@ -359,7 +359,7 @@ export default {
 
     importFeatureTypeData: {
       deep: true,
-      handler(newValue) {
+      handler(newValue, oldValue) {
         if (newValue && newValue.some(el => el.status === 'pending')) {
           setTimeout(() => {
             this.reloadingImport = true;
@@ -371,6 +371,8 @@ export default {
               }, 1000);
             })
           }, this.$store.state.configuration.VUE_APP_RELOAD_INTERVAL);
+        } else if (oldValue && oldValue.some(el => el.status === 'pending')) {
+          this.getFeatures();
         }
       }
     },
@@ -503,8 +505,11 @@ export default {
         }
       if (this.$route.params.geojson) {
         payload["geojson"] = this.$route.params.geojson
-      } else {
+      } else if (this.fileToImport && !this.fileToImport.name) {
         payload["fileToImport"] = this.fileToImport;
+      } else {
+        this.importError = "La ressource n'a pas pu être récupéré."
+        return
       }
       this.$store.dispatch('feature_type/SEND_FEATURES_FROM_GEOJSON', payload)
         .then(() => {
-- 
GitLab