diff --git a/src/components/Feature/Detail/FeatureTable.vue b/src/components/Feature/Detail/FeatureTable.vue index bfb939f9ff74921a3d7b15359c69e37cf996db97..ce19426b2854da96502073c75f30a52f06c90b76 100644 --- a/src/components/Feature/Detail/FeatureTable.vue +++ b/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': diff --git a/src/components/FeatureType/FeatureTypeLink.vue b/src/components/FeatureType/FeatureTypeLink.vue index d39330e1439d31d42c6e6efa2b121e04f8d7166f..0a247d114fe15454a03f2802de77f87d717ecbcc 100644 --- a/src/components/FeatureType/FeatureTypeLink.vue +++ b/src/components/FeatureType/FeatureTypeLink.vue @@ -1,5 +1,6 @@ <template> <router-link + v-if="featureType && featureType.slug" :to="{ name: 'details-type-signalement', params: { feature_type_slug: featureType.slug }, diff --git a/src/views/Feature/FeatureDetail.vue b/src/views/Feature/FeatureDetail.vue index 0e6f85f9b94ea4fcf7303d30f94e94bb3d5a2f4e..d88beb3d1fa3686253b8034762bdc15c4e6c8fab 100644 --- a/src/views/Feature/FeatureDetail.vue +++ b/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) {