adds 'Display deleted fields'

src/components/itemsRenderer/ItemsGrid.vue

@@ -70,7 +70,7 @@ export default {
     const data_type = store.data_type
 
     const field_index = computed(() => {
-      return store.user_prefs.field_index
+      return store.field_index
     })
     const highlighted_row = ref(0)
 

src/components/panel/ExportOptions.vue

@@ -47,7 +47,7 @@ export default {
 
     function generateCSV() {
       var columns = []
-      let field_index = store.user_prefs.field_index
+      let field_index = store.field_index
 
       field_index.forEach((field, i) => {
         columns.push(field.label)
@@ -86,7 +86,7 @@ export default {
     function generateJSON() {
       var result = []
       let items = store.itemsToDisplay
-      let field_index = store.user_prefs.field_index
+      let field_index = store.field_index
       items.forEach((item) => {
         var obj = new Object();
         for(let i = 0; i < field_index.length; i++) {

src/components/panel/ItemFilters.vue

@@ -211,7 +211,7 @@ export default {
 
     return {
       filter_text,
-      default_field_index: computed(() => store.default_field_index),
+      default_field_index: store.default_field_index,
 
       order_by: computed(() => store.user_prefs.order_by),
       first_field,

src/components/panel/OtherOptions.vue

@@ -7,30 +7,26 @@ This file is part of LiberaForms.
 
 <template>
 
-  <span v-if="show_options"
-        class="modes">
-
-    <a class="btn btn-sm btn-outline-danger"
-       role="button"
-       :href="endpoint+'/delete-all-items'">
-        {{ $t("Delete all") }}
-    </a>
-
-    <button v-if="has_deleted_fields == true"
-            class="btn btn-sm"
-            :class="show_deleted==true ? 'btn-primary' : 'btn-outline-secondary'"
-            v-on:click="toggle_deleted_fields">
-      {{ $t("Include deleted fields") }}
-    </button>
-
-  </span>
-
-  <button v-if="can_edit == true"
+  <button v-if="available_options"
           class="btn btn-sm"
-          :class="edit_mode==true ? 'btn-primary' : 'btn-outline-primary'"
+          :class="show_options ? 'btn-primary' : 'btn-outline-primary'"
           v-on:click="toggleOptions()">
         {{ $t("Options") }}
-      </button>
+  </button>
+
+  <a v-if="show_options && can_edit"
+     class="btn btn-sm btn-outline-danger modes"
+     role="button"
+     :href="endpoint+'/delete-all-items'">
+      {{ $t("Delete all") }}
+  </a>
+
+  <button v-if="has_deleted_fields"
+          class="btn btn-sm"
+          :class="show_deleted==true ? 'btn-primary' : 'btn-outline-secondary'"
+          v-on:click="displayDeletedFields()">
+    {{ $t("Include deleted fields") }}
+  </button>
 
 </template>
 
@@ -42,7 +38,7 @@ import { dataDisplayStore } from '@/store.js'
 export default {
   name: 'OtherOptions',
   components: {
-    //ArrowLeftIcon,
+
   },
 
   setup() {
@@ -52,12 +48,19 @@ export default {
       store.show_other_options = !store.show_other_options
     }
 
+    function displayDeletedFields() {
+      store.include_deleted_fields = !store.include_deleted_fields
+      store.filtered_items = null
+    }
+
     return {
       can_edit: store.can_edit,
       data_type: store.data_type,
       endpoint: store.endpoint,
+      has_deleted_fields: store.deleted_fields.length,
+      available_options: store.can_edit || store.deleted_fields,
       show_options: computed(() => store.show_other_options),
-      toggleOptions,
+      toggleOptions, displayDeletedFields,
     }
   },
 }

src/store.js

@@ -106,7 +106,7 @@ export const dataDisplayStore = defineStore("dataDisplayStore", {
       return field_value
     },
     getFieldLabel: (state) => (field_name) => {
-      var field = state.user_prefs.field_index.find(x => x.name === field_name)
+      var field = state.field_index.find(x => x.name === field_name)
       if (field !== undefined) {
         return field.label
       }
@@ -127,6 +127,12 @@ export const dataDisplayStore = defineStore("dataDisplayStore", {
       });
       return label
     },
+    field_index: (state) => {
+      if (state.include_deleted_fields && state.deleted_fields.length) {
+        return state.user_prefs.field_index.concat(state.deleted_fields)
+      }
+      return state.user_prefs.field_index
+    },
     getFieldStructure: (state) => (field_name) => {
       return _.findWhere(state.meta.form_structure, {name: field_name})
     },

src/translations/en.json

@@ -29,7 +29,7 @@
   "Cards": "Cards",
   "Options": "Options",
   "Delete all": "Delete all",
-  "Deleted fields": "Deleted fields",
+  "Include deleted fields": "Include deleted fields",
   "True": "True",
   "False": "False",
   "Previous": "Previous",