Updates to filters getting information from metadat_type_object.

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

@@ -49,7 +49,8 @@
             return {
                 selected:'',
                 options: [],
-                label: ''
+                label: '',
+                relatedCollectionId: ''
             }
         },
         watch: {
@@ -57,6 +58,15 @@
                 this.updateSelectedValues();
             },
         },
+        created() {
+            if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' && 
+                this.filter.metadatum && 
+                this.filter.metadatum.metadata_type_object && 
+                this.filter.metadatum.metadata_type_object.options &&
+                this.filter.metadatum.metadata_type_object.options.collection_id) {
+                    this.relatedCollectionId = this.filter.metadatum.metadata_type_object.options.collection_id;
+                }
+        },
         mounted() {
             this.updateSelectedValues();
         },
@@ -122,7 +132,12 @@
 
                     if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship') {
                         
-                        axios.get('/items/' + metadata.value + '?fetch_only=title,thumbnail')
+                        let endpoint = '/items/' + metadata.value + '?fetch_only=title,thumbnail';
+
+                        if (this.relatedCollectionId != '')
+                            endpoint = '/collection/' + this.relatedCollectionId + endpoint; 
+
+                        axios.get(endpoint)
                             .then( res => {
                                 let item = res.data;
                                 this.label = item.title;

src/classes/filter-types/taginput/Taginput.vue

@@ -54,7 +54,8 @@
             return {
                 results:'',
                 selected:[],
-                options: []
+                options: [],
+                relatedCollectionId: ''
             }
         },
         watch: {
@@ -62,6 +63,15 @@
                 this.updateSelectedValues();
             }
         },
+        created() {
+            if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' && 
+                this.filter.metadatum && 
+                this.filter.metadatum.metadata_type_object && 
+                this.filter.metadatum.metadata_type_object.options &&
+                this.filter.metadatum.metadata_type_object.options.collection_id) {
+                    this.relatedCollectionId = this.filter.metadatum.metadata_type_object.options.collection_id;
+                }
+        },
         mounted() {
             this.updateSelectedValues();
         },
@@ -106,8 +116,12 @@
 
                     if ( this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' ) {
                         let query = qs.stringify({ postin: metadata.value, fetch_only: 'title,thumbnail', fetch_only_meta: '' });
-            
+                        let endpoint = '/items/' + metadata.value;
-                        axios.get('/items?' + query)
+
+                        if (this.relatedCollectionId != '')
+                            endpoint = '/collection/' + this.relatedCollectionId + endpoint; 
+
+                        axios.get(endpoint + query)
                             .then( res => {
                                 if (res.data.items) {
                                     this.selected = [];

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

@@ -60,7 +60,7 @@
                 options: [],
                 selected: [],
                 taxonomy: '',
-                taxonomy_id: Number
+                taxonomyId: ''
             }
         },
         watch: {
@@ -80,6 +80,16 @@
                 this.loadOptions();
             }
         },    
+        created() {
+            if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' && 
+                this.filter.metadatum && 
+                this.filter.metadatum.metadata_type_object && 
+                this.filter.metadatum.metadata_type_object.options &&
+                this.filter.metadatum.metadata_type_object.options.taxonomy_id) {
+                    this.taxonomyId = this.filter.metadatum.metadata_type_object.options.taxonomy_id;
+                    this.taxonomy = 'tnc_tax_' + this.taxonomyId;
+                }
+        },
         mounted(){
             this.loadOptions();
         }, 
@@ -239,7 +249,7 @@
                     props: {
                         parent: parent,
                         filter: this.filter,
-                        taxonomy_id: this.taxonomy_id,
+                        taxonomy_id: this.taxonomyId,
                         selected: this.selected,
                         metadatumId: this.metadatumId,
                         taxonomy: this.taxonomy,
@@ -258,11 +268,6 @@
             },
             prepareOptionsForTaxonomy(items) {
 
-                if (items[0] != undefined) {
-                    this.taxonomy = items[0].taxonomy;
-                    this.taxonomy_id = items[0].taxonomy_id;
-                }
-
                 this.options = [];
                 this.options = items.slice(); // copy array.
 

src/classes/filter-types/taxonomy/Taginput.vue

@@ -43,24 +43,19 @@
     
     export default {
         mixins: [ filterTypeMixin, dynamicFilterTypeMixin ],
-        created(){
+        created() {
-            let endpoint = '/collection/' + this.collectionId + '/metadata/' +  this.metadatumId;
+            if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' && 
-
+                this.filter.metadatum && 
-            if (this.isRepositoryLevel || this.collectionId == 'default'){
+                this.filter.metadatum.metadata_type_object && 
-                endpoint = '/metadata/' + this.metadatumId;
+                this.filter.metadatum.metadata_type_object.options &&
-            }
+                this.filter.metadatum.metadata_type_object.options.taxonomy_id) {
-
+                    this.taxonomyId = this.filter.metadatum.metadata_type_object.options.taxonomy_id;
-            axios.get(endpoint)
+                    this.taxonomy = 'tnc_tax_' + this.taxonomyId;
-                .then( res => {
+                }
-                    let metadatum = res.data;
-                    this.taxonomyId = metadatum.metadata_type_options.taxonomy_id
-                    this.updateSelectedValues();
-                });
         },
         watch: {
             'query.taxquery'() {
-                if (this.taxonomyId != '')
+                this.updateSelectedValues();
-                    this.updateSelectedValues();
             }
         },
         data(){
@@ -92,8 +87,6 @@
                 
                 return axios.get(endpoint).then( res => {
                     for (let term of res.data.values) {   
-                          
-                        this.taxonomy = term.taxonomy;
 
                         if (valuesToIgnore != undefined && valuesToIgnore.length > 0) {
                             let indexToIgnore = valuesToIgnore.findIndex(value => value == term.value);
@@ -127,8 +120,6 @@
                 if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
                     return false;
 
-                this.taxonomy = 'tnc_tax_' + this.taxonomyId;
-
                 let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy == this.taxonomy);
 
                 if ( index >= 0){