Merge branch 'redmine-issues/14266' into 'develop'

REDMINE_ISSUE-14266|Système de défilement des signalements - Mauvais affichage de la géométrie et du type

See merge request !433

src/components/Feature/Detail/FeatureTable.vue

@@ -5,12 +5,12 @@
       aria-describedby="Table des données du signalement"
     >
       <tbody>
-        <tr v-if="feature_type || featureType">
+        <tr v-if="featureType">
           <td>
             <strong> Type de signalement </strong>
           </td>
           <td>
-            <FeatureTypeLink :feature-type="feature_type || featureType" />
+            <FeatureTypeLink :feature-type="featureType" />
           </td>
         </tr>
         <tr
@@ -108,7 +108,7 @@
 
 <script>
 
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import FeatureTypeLink from '@/components/FeatureType/FeatureTypeLink';
 import { statusChoices } from '@/utils';
 
@@ -141,10 +141,6 @@ export default {
       'linked_features',
     ]),
 
-    ...mapGetters('feature-type', [
-      'feature_type',
-    ]),
-
     statusIcon() {
       switch (this.currentFeature.status) {
       case 'archived':

src/components/FeatureType/FeatureTypeLink.vue

 <template>
   <router-link
+    v-if="featureType && featureType.slug"
     :to="{
       name: 'details-type-signalement',
       params: { feature_type_slug: featureType.slug },

src/views/Feature/FeatureDetail.vue

@@ -147,7 +147,8 @@ export default {
       'project'
     ]),
     ...mapState('feature-type', [
-      'feature_types'
+      'feature_types',
+      'feature_type',
     ]),
     ...mapState('feature', [
       'currentFeature'
@@ -196,6 +197,7 @@ export default {
     async getPageInfo() {
       if (this.$route.params.slug_signal) { // if coming from the route with an id
         this.slugSignal = this.$route.params.slug_signal;
+        this.featureType = this.feature_type;
       } //* else it would be retrieve after fetchFilteredFeature with offset
       this.DISPLAY_LOADER('Recherche du signalement');
       let promises = [];
@@ -206,7 +208,7 @@ export default {
           this.GET_PROJECT_INFO(this.$route.params.slug),
         );
       }
-      //* changement de requête selon s'il y a un id ou un offset
+      //* changement de requête selon s'il y a un id ou un offset(dans le cas du parcours des signalements filtrés)
       if (this.$route.query.offset >= 0) {
         promises.push(this.fetchFilteredFeature());
       } else if (!this.currentFeature || this.currentFeature.feature_id !== this.slugSignal) {