From acb601cdf99f5854d6f085426ae2ac57fb005a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Wed, 18 Aug 2021 10:37:31 +0200
Subject: [PATCH] show list in feature_list

---
 src/store/index.js                 |  1 -
 src/views/feature/Feature_list.vue | 60 +++++++-----------------------
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index da6ffd7f..80fecbb1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -31,7 +31,6 @@ export default new Vuex.Store({
     map
   },
   state: {
-    status_choices: [],
     logged: false,
     user: false,
     project_slug: null,
diff --git a/src/views/feature/Feature_list.vue b/src/views/feature/Feature_list.vue
index 92b2ce3c..7e8bd550 100644
--- a/src/views/feature/Feature_list.vue
+++ b/src/views/feature/Feature_list.vue
@@ -78,16 +78,16 @@
         <label>Type</label>
         <Dropdown
           :options="form.type.choices"
-          :selected="selected_type"
-          :selection.sync="selected_type"
+          :selected="form.type.value"
+          :selection.sync="form.type.value"
         />
       </div>
       <div class="field wide four column">
         <label>Statut</label>
         <Dropdown
           :options="form.status.choices"
-          :selected="selected_status"
-          :selection.sync="selected_status"
+          :selected="form.status.value"
+          :selection.sync="form.status.value"
         />
       </div>
       <div class="field wide four column">
@@ -95,7 +95,7 @@
         <div class="ui icon input">
           <i class="search icon"></i>
           <div class="ui action input">
-            <input type="text" name="title" :value="request.GET.title" />
+            <input type="text" name="title" v-model="form.title" />
             <button
               type="button"
               class="ui teal icon button"
@@ -106,10 +106,10 @@
           </div>
         </div>
       </div>
-      <!-- map params, updated on map move -->
-      <input type="hidden" name="zoom" :value="request.GET.zoom || ''" />
+      <!-- map params, updated on map move // todo : brancher sur la carte probablement -->
+      <!--  <input type="hidden" name="zoom" :value="request.GET.zoom || ''" />
       <input type="hidden" name="lat" :value="request.GET.lat || ''" />
-      <input type="hidden" name="lng" :value="request.GET.lng || ''" />
+      <input type="hidden" name="lng" :value="request.GET.lng || ''" /> -->
     </form>
 
     <div v-show="showMap" class="ui tab active map-container" data-tab="map">
@@ -122,7 +122,7 @@
       <SidebarLayers />
     </div>
 
-    <div v-show="!showMap" class="ui tab" data-tab="list">
+    <div v-show="!showMap" data-tab="list">
       <table id="table-features" class="ui compact table">
         <thead>
           <tr>
@@ -130,9 +130,7 @@
             <th>Type</th>
             <th>Nom</th>
             <th>Dernière modification</th>
-            {% if user.is_authenticated %}
-            <th>Auteur</th>
-            {% endif %}
+            <th v-if="user">Auteur</th>
           </tr>
         </thead>
         <tbody>
@@ -205,16 +203,7 @@ export default {
 
   data() {
     return {
-      request: {
-        // ? D'où ça doit venir ?
-        GET: {
-          feature_type: null,
-          status: null,
-          title: null,
-          type: null,
-        },
-      },
-      showMap: true,
+      showMap: false,
       showAddSignal: false,
       form: {
         type: {
@@ -230,37 +219,16 @@ export default {
             "Archivé",
           ],
         },
+        title: null,
       },
     };
   },
 
   computed: {
     ...mapGetters(["project"]),
-    ...mapState(["status_choices"]),
+    ...mapState(["user"]),
     ...mapState("feature", ["features"]),
     ...mapState("feature_type", ["feature_types"]),
-    selected_type: {
-      // getter
-      get() {
-        return this.form.type.value;
-      },
-      // setter
-      set(newValue) {
-        this.form.type.value = newValue;
-        //this.updateStore();
-      },
-    },
-    selected_status: {
-      // getter
-      get() {
-        return this.form.status.value;
-      },
-      // setter
-      set(newValue) {
-        this.form.status.value = newValue;
-        //this.updateStore();
-      },
-    },
   },
 
   created() {
@@ -270,7 +238,7 @@ export default {
   },
   mounted() {
     this.$store.dispatch("map/INITIATE_MAP");
-    this.form.type.choices = new Set(
+    this.form.type.choices = new Set( //* use Set to eliminate duplicate values
       ...[this.features.map((el) => el.feature_type.title)]
     );
   },
-- 
GitLab