From ca912bf74c2953bc6b4f4790aabf1c8a59048eb4 Mon Sep 17 00:00:00 2001
From: eduardohumberto <eduardo.humberto1992@gmail.com>
Date: Mon, 26 Mar 2018 11:16:05 -0300
Subject: [PATCH] Relationship field type: search in different fields

---
 .../field-types/relationship/Relationship.vue | 85 ++++---------------
 .../search-components/list-items.vue          | 77 -----------------
 2 files changed, 16 insertions(+), 146 deletions(-)
 delete mode 100644 src/classes/field-types/relationship/search-components/list-items.vue

diff --git a/src/classes/field-types/relationship/Relationship.vue b/src/classes/field-types/relationship/Relationship.vue
index de1b7b704..9b24359a0 100644
--- a/src/classes/field-types/relationship/Relationship.vue
+++ b/src/classes/field-types/relationship/Relationship.vue
@@ -1,7 +1,6 @@
 <template>
     <div>
         <b-taginput
-                v-if="this.searchFields.length === 0"
                 :id="id"
                 v-model="selected"
                 :data="options"
@@ -9,43 +8,12 @@
                 :loading="loading"
                 field="label"
                 @typing="search"/>
-        <div
-            v-else>
-            <div
-                v-if="itemsFound.length === 0"
-                class="box">
-                <b-field
-                        v-for="(field,index) in searchFields"
-                        :key="index"
-                        :label="field.name">
-                    <component
-                            @input="setQuery( $event, field )"
-                            :is="getComponentSearch( field )"/>
-                </b-field>
-                <button
-                        type="button"
-
-                        @click="doSearch"
-                        class="button">
-                    <b-icon icon="magnify" />
-                    <span> {{ $i18n.get('search') }}</span>
-                </button>
-            </div>
-
-            <list-found-items
-                    class="box"
-                    @input="listenSelectedItems"
-                    @clearSearch="clearSearch"
-                    :items="itemsFound"
-                    v-else/>
-        </div>
 
     </div>
 </template>
 
 <script>
     import { tainacan as axios } from '../../../js/axios/axios'
-    import ListFoundItems from './search-components/list-items.vue';
     import qs from 'qs';
 
     export default {
@@ -113,9 +81,6 @@
                 this.onInput( values );
             }
         },
-        components: {
-            ListFoundItems
-        },
         methods: {
             setResults(option){
                 if(!option)
@@ -132,10 +97,11 @@
                 }
 
                 if (query !== '') {
+                    let metaquery = this.mountQuery( query );
                     this.loading = true;
                     this.options = [];
                     let collectionId = ( this.field && this.field.field.field_type_options.collection_id ) ? this.field.field.field_type_options.collection_id : this.collection_id;
-                    axios.get('/collection/'+collectionId+'/items?search=' + query)
+                    axios.get('/collection/'+collectionId+'/items?' + qs.stringify( metaquery ))
                     .then( res => {
                         this.loading = false;
                         let result = res.data;
@@ -150,42 +116,23 @@
                     this.options = [];
                 }
             },
-            getComponentSearch( field ){
-                return field.field_type_object.component;
-            },
-            setQuery( event, field ){
-                if( field.field_type.indexOf( 'Core_Title' ) >= 0 ){
-                    this.queryObject['search'] = event;
-                } else if( field.field_type.indexOf( 'Core_Description' ) >= 0 ){
-                    this.queryObject['search'] = event;
-                }
-            },
-            doSearch(){
-                let collectionId = ( this.field && this.field.field.field_type_options.collection_id ) ? this.field.field.field_type_options.collection_id : this.collection_id;
-                axios.get('/collection/' + collectionId + '/items?' + qs.stringify( this.queryObject ))
-                    .then(res => {
-                        let items = res.data;
-                        if( items.length > 0 ){
-                            this.itemsFound = items;
+            mountQuery( search ){
+                let query = []
+                query['search'] = search;
+                if( this.searchFields.length > 0){
+                    query['metaquery'] = [];
+                    const metaquery = query['metaquery'];
+                    metaquery['relation'] = 'OR'
+                    for( let index in this.searchFields ){
+                        metaquery[index] = {
+                            key: this.searchFields[index].id,
+                            value: search
                         }
-                    })
-                    .catch(error => {
-                        this.$console.log( error )
-                    });
-            },
-            clearSearch(){
-                this.itemsFound = [];
-            },
-            listenSelectedItems( event ){
-                let results = [];
-
-                if( event && event.length > 0 ){
-                    for( let item of event ){
-                        results.push( item.id );
                     }
-                }
 
-                this.onInput( results );
+                    query['metaquery'] = metaquery;
+                }
+                return query;
             }
         }
     }
diff --git a/src/classes/field-types/relationship/search-components/list-items.vue b/src/classes/field-types/relationship/search-components/list-items.vue
deleted file mode 100644
index 756ea4727..000000000
--- a/src/classes/field-types/relationship/search-components/list-items.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-    <section>
-        <button
-                type="button"
-                @click="clearSearch"
-                class="button field is-info">
-            <b-icon icon="magnify"/>
-            <span>{{ $i18n.get('label_relationship_new_search') }}</span>
-        </button>
-
-        <b-tabs>
-            <b-tab-item :label="$i18n.get('label_relationship_items_found')">
-                <b-table
-                        :data="data"
-                        :columns="columns"
-                        :checked-rows.sync="checkedRows"
-                        :is-row-checkable="(row) => row.id !== 3"
-                        checkable>
-
-                    <template slot="bottom-left">
-                        <b>Total</b>: {{ checkedRows.length }}
-                    </template>
-                </b-table>
-            </b-tab-item>
-
-            <b-tab-item :label="$i18n.get('label_selected')">
-                <button
-                        class="button field is-danger"
-                        @click="checkedRows = []"
-                        :disabled="!checkedRows.length">
-                    <b-icon icon="close"/>
-                    <span>{{ $i18n.get('label_clean') }}</span>
-                </button>
-                <pre>{{ checkedRows }}</pre>
-            </b-tab-item>
-        </b-tabs>
-    </section>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                data: this.items,
-                checkedRows: [],
-                columns: [
-                    {
-                        field: 'title',
-                        label: this.$i18n.get('label_title'),
-                    },
-                    {
-                        field: 'description',
-                        label: this.$i18n.get('label_description'),
-                    }
-                ]
-            }
-        },
-        watch: {
-            checkedRows( val ){
-                this.checkedRows = val;
-                this.$emit('input', val );
-            }
-        },
-        props: {
-            collectionId: Number,
-            totalItems: 0,
-            page: 1,
-            itemsPerPage: 12,
-            items: Array,
-        },
-        methods: {
-            clearSearch(){
-                this.$emit('clearSearch', true );
-            }
-        }
-    }
-</script>
\ No newline at end of file