Removes most of unecessary requests for metadata endpoint on filters creation hook.

src/admin/components/other/checkbox-radio-modal.vue

@@ -301,7 +301,7 @@
                 default: false,
             },
             metadatum_type: String,
-            metadatum_object: Object,
+            query: Object,
             isRepositoryLevel: Boolean,
             isCheckbox: {
                 type: Boolean,

src/classes/filter-types/autocomplete/Autocomplete.vue

@@ -51,7 +51,6 @@
                 results:'',
                 selected:'',
                 options: [],
-                metadatum_object: {},
                 label: ''
             }
         },

src/classes/filter-types/checkbox/Checkbox.vue

@@ -39,46 +39,27 @@
 </template>
 
 <script>
-    import { tainacan as axios, isCancel } from '../../../js/axios/axios';
+    import { isCancel } from '../../../js/axios/axios';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     import CheckboxRadioModal from '../../../admin/components/other/checkbox-radio-modal.vue';
 
     export default {
-        created(){
+        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
-            let endpoint = '/collection/' + this.collectionId + '/metadata/' +  this.metadatumId +'?nopaging=1';
-
-            if (this.isRepositoryLevel || this.collectionId == 'default')
-                endpoint = '/metadata?nopaging=1';
-
-            axios.get(endpoint)
-                .then( res => {
-                    let result = res.data;
-                    if ( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                    
-                        if (!this.isUsingElasticSearch)
-                            this.loadOptions();
-
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-        },
         data(){
             return {
                 options: [],
-                selected: [],
+                selected: []
-                metadatum_object: {}
             }
         },
-        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         watch: {
             selected: function(){
-                //this.selected = val;
                 this.onSelect();
             }
         },
+        mounted() {
+            if (!this.isUsingElasticSearch)
+                this.loadOptions();
+        },
         methods: {
             loadOptions(skipSelected) {
                 let promise = null;
@@ -164,7 +145,6 @@
                         //taxonomy: this.taxonomy,
                         collectionId: this.collectionId,
                         metadatum_type: this.metadatumType,
-                        metadatum_object: this.metadatum_object,
                         isRepositoryLevel: this.isRepositoryLevel,
                         query: this.query
                     },

src/classes/filter-types/custom-interval/CustomInterval.vue

@@ -77,23 +77,8 @@
             dateInter, 
             filterTypeMixin
         ],
-        created() {
+        mounted() {
-            let endpoint = '/collection/' + this.collectionId + '/metadata/' +  this.metadatumId;
+            this.selectedValues();
-
-            if (this.isRepositoryLevel || this.collectionId == 'default')
-                endpoint = '/metadata/'+ this.metadatumId;
-            
-            axios.get(endpoint)
-                .then( res => {
-                    let result = res.data;
-                    if( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
         },
         data(){
             return {
@@ -104,8 +89,7 @@
                 isTouched: false,
                 isValid: false,
                 clear: false,
-                type: 'numeric',
+                type: 'numeric'
-                metadatum_object: {}
             }
         },
         watch: {

src/classes/filter-types/date/Date.vue

@@ -121,31 +121,12 @@
             dateInter,
             filterTypeMixin
         ],
-        created() {
-            let endpoint = '/collection/' + this.collectionId + '/metadata/' +  this.metadatumId;
-
-            if (this.isRepositoryLevel || this.collectionId == 'default')
-                endpoint = '/metadata/'+ this.metadatumId;
-        
-            axios.get(endpoint)
-                .then( res => {
-                    let result = res.data;
-                    if ( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-        },
         mounted() {
             this.selectedValues();
         },
         data(){
             return {
                 value: null,
-                metadatum_object: {},
                 comparator: '=', // =, !=, >, >=, <, <=
             }
         },

src/classes/filter-types/filter-types-mixin.js

@@ -75,7 +75,7 @@ export const dynamicFilterTypeMixin = {
             if (isInCheckboxModal || search || !this.isUsingElasticSearch) {
 
                 const source = axios.CancelToken.source();
-
+ 
                 let currentQuery  = JSON.parse(JSON.stringify(this.query));
                 if (currentQuery.fetch_only != undefined) {
                     delete currentQuery.fetch_only;

src/classes/filter-types/numeric/Numeric.vue

@@ -79,26 +79,6 @@
             wpAjax,
             filterTypeMixin
         ],
-        created() {
-            this.filterTypeOptions = this.filter.filter_type_options;
-
-            let endpoint = '/collection/' + this.collectionId + '/metadata/' +  this.metadatumId;
-
-            if (this.isRepositoryLevel || this.collectionId == 'default')
-                endpoint = '/metadata/'+ this.metadatumId;
-        
-            axios.get(endpoint)
-                .then( res => {
-                    let result = res.data;
-                    if ( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-        },
         mounted() {
             this.selectedValues();
         },
@@ -106,7 +86,6 @@
             return {
                 value: null,
                 filterTypeOptions: [],
-                metadatum_object: {},
                 comparator: '=' // =, !=, >, >=, <, <=
             }
         },

src/classes/filter-types/selectbox/Selectbox.vue

@@ -29,32 +29,12 @@
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
 
     export default {
-        created(){
+        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
-            let endpoint = '/collection/' + this.collectionId + '/metadata/' +  this.metadatumId;
-
-            if (this.isRepositoryLevel || this.collectionId == 'default')
-                endpoint = '/metadata/'+ this.metadatumId;
-
-            axios.get(endpoint)
-                .then( res => {
-                    let result = res.data;
-                    if( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        
-                        if (!this.isUsingElasticSearch)
-                            this.loadOptions();
-                    }
-                })
-                .catch(error => {
-                    this.$console.error(error);
-                });
-        },
         data(){
             return {
                 options: []
             }
         },
-        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         watch: {
             selected(value) {
                 if (value)
@@ -74,6 +54,10 @@
                 return undefined;
             }
         }, 
+        mounted(){           
+            if (!this.isUsingElasticSearch)
+                this.loadOptions();
+        },
         methods: {
             loadOptions(){
                 // Cancels previous Request