REDMINE_ISSUE-18160 | Duplication des champs dans le formulaire de visualisation

filter out conditional custom field display in feature detail when not in fast edition

src/components/Feature/Detail/FeatureTable.vue

@@ -17,38 +17,40 @@
           v-for="field in featureFields"
           :key="field.name"
         >
-          <td v-if="!field.isDeactivated">
-            <strong :class="{ required: field.is_mandatory }">
-              {{ field.label }}
-            </strong>
-          </td>
-          <td v-if="!field.isDeactivated">
-            <strong class="ui form">
-              <span
-                v-if="fastEditionMode && canEditFeature && extra_forms.length > 0"
-                :id="field.label"
-              >
-                <FeatureExtraForm
-                  ref="extraForm"
-                  :field="field"
+          <template v-if="!field.isDeactivated">
+            <td>
+              <strong :class="{ required: field.is_mandatory }">
+                {{ field.label }}
+              </strong>
+            </td>
+            <td>
+              <strong class="ui form">
+                <span
+                  v-if="fastEditionMode && canEditFeature && extra_forms.length > 0"
+                  :id="field.label"
+                >
+                  <FeatureExtraForm
+                    ref="extraForm"
+                    :field="field"
+                  />
+                </span>
+                <i
+                  v-else-if="field.field_type === 'boolean'"
+                  :class="[
+                    'icon',
+                    field.value ? 'olive check' : 'grey times',
+                  ]"
+                  aria-hidden="true"
                 />
-              </span>
-              <i
-                v-else-if="field.field_type === 'boolean'"
-                :class="[
-                  'icon',
-                  field.value ? 'olive check' : 'grey times',
-                ]"
-                aria-hidden="true"
-              />
-              <span v-else-if="field.value && field.field_type === 'multi_choices_list'">
-                {{ field.value.join(', ') }}
-              </span>
-              <span v-else>
-                {{ field.value && field.value.label ? field.value.label : field.value }}
-              </span>
-            </strong>
-          </td>
+                <span v-else-if="field.value && field.field_type === 'multi_choices_list'">
+                  {{ field.value.join(', ') }}
+                </span>
+                <span v-else>
+                  {{ field.value && field.value.label ? field.value.label : field.value }}
+                </span>
+              </strong>
+            </td>
+          </template>
         </tr>
         <tr>
           <td>
@@ -142,7 +144,7 @@ import { mapState } from 'vuex';
 import FeatureTypeLink from '@/components/FeatureType/FeatureTypeLink';
 import FeatureEditStatusField from '@/components/Feature/FeatureEditStatusField';
 import FeatureExtraForm from '@/components/Feature/Edit/FeatureExtraForm';
-import { statusChoices, formatStringDate } from '@/utils';
+import { statusChoices, formatStringDate, checkDeactivatedValues } from '@/utils';
 
 export default {
 
@@ -213,12 +215,15 @@ export default {
 
     featureData() {
       if (this.currentFeature.properties && this.featureType) {
-        return this.featureType.customfield_set.map((xtraForm) => {
+        // retrieve value for each feature type custom field within feature data
+        const extraFieldsWithValue = this.featureType.customfield_set.map((xtraField) => {
           return {
-            ...xtraForm,
-            value: this.currentFeature.properties[xtraForm.name]
+            ...xtraField,
+            value: this.currentFeature.properties[xtraField.name]
           };
         });
+        // filter out fields not meeting condition to be activated
+        return checkDeactivatedValues(extraFieldsWithValue);
       }
       return [];
     },