From 181151e444b2915abdd9697451f8952cf06185a8 Mon Sep 17 00:00:00 2001
From: weryques <weryques@outlook.com>
Date: Thu, 2 Aug 2018 16:42:15 -0300
Subject: [PATCH] Adds default value for max_options, Fixes Pagination (issue
 #83)

---
 .../other/checkbox-filter-modal.vue           | 31 +++++++++++++++++--
 .../filter-types/checkbox/Checkbox.vue        |  4 +--
 .../filter-types/filter-types-mixin.js        |  4 +++
 .../repositories/class-tainacan-filters.php   |  3 +-
 .../repositories/class-tainacan-metadata.php  |  2 +-
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/admin/components/other/checkbox-filter-modal.vue b/src/admin/components/other/checkbox-filter-modal.vue
index 5b6529288..fd76fde65 100644
--- a/src/admin/components/other/checkbox-filter-modal.vue
+++ b/src/admin/components/other/checkbox-filter-modal.vue
@@ -24,13 +24,19 @@
                     v-if="!isSearching && !isTaxonomy"
                     class="modal-card-body tainacan-checkbox-list-container">
                 <a
+                        v-if="checkboxListOffset"
                         role="button"
                         class="tainacan-checkbox-list-page-changer"
                         @click="beforePage">
                     <b-icon
                             icon="chevron-left"/>
                 </a>
-                <ul class="tainacan-modal-checkbox-list-body">
+                <ul
+                        :class="{
+                            'tainacan-modal-checkbox-list-body-dynamic-m-l': !checkboxListOffset,
+                            'tainacan-modal-checkbox-list-body-dynamic-m-r': noMorePage,
+                        }"
+                        class="tainacan-modal-checkbox-list-body">
                     <li
                             class="tainacan-li-checkbox-list"
                             v-for="(option, key) in options"
@@ -46,6 +52,7 @@
                             :active.sync="isCheckboxListLoading"/>
                 </ul>
                 <a
+                        v-if="!noMorePage"
                         role="button"
                         class="tainacan-checkbox-list-page-changer"
                         @click="nextPage">
@@ -196,6 +203,7 @@
                 collection: this.collection_id,
                 isCheckboxListLoading: false,
                 isSearchingLoading: false,
+                noMorePage: 0,
             }
         },
         created() {
@@ -208,10 +216,12 @@
         methods: {
             beforePage(){
                 this.checkboxListOffset -= this.maxNumOptionsCheckboxList;
+                this.noMorePage = 0;
+
+                //console.log(this.checkboxListOffset, this.maxNumOptionsCheckboxList);
 
                 if(this.checkboxListOffset < 0){
                     this.checkboxListOffset = 0;
-                    return;
                 }
 
                 this.isCheckboxListLoading = true;
@@ -219,7 +229,12 @@
                 this.getOptions(this.checkboxListOffset);
             },
             nextPage(){
-                this.checkboxListOffset = this.options.length;
+                if(!this.noMorePage) {
+                    this.checkboxListOffset += this.maxNumOptionsCheckboxList - 1;
+                }
+
+                // 0 20 / 19 20 / 39 20 / 59 20
+                //console.log(this.checkboxListOffset, this.maxNumOptionsCheckboxList);
 
                 this.isCheckboxListLoading = true;
 
@@ -611,6 +626,15 @@
         flex-direction: column;
         flex-wrap: wrap;
         padding: 0 !important;
+        max-height: 253px;
+    }
+
+    .tainacan-modal-checkbox-list-body-dynamic-m-l {
+        margin-left: 34px !important;
+    }
+
+    .tainacan-modal-checkbox-list-body-dynamic-m-r {
+        margin-right: 34px !important;
     }
 
     .tainacan-search-results-container {
@@ -623,6 +647,7 @@
         display: flex;
         flex-direction: column;
         flex-wrap: wrap;
+        max-height: 253px;
     }
 
     .tainacan-li-no-children {
diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index a99704f0a..512417d13 100644
--- a/src/classes/filter-types/checkbox/Checkbox.vue
+++ b/src/classes/filter-types/checkbox/Checkbox.vue
@@ -112,9 +112,9 @@
                     let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ?
                         this.metadatum_object.metadata_type_options.collection_id : this.collection_id;
 
-                    promise = this.getValuesRelationship( collectionTarget, null, null, 0, this.filter.max_options);
+                    promise = this.getValuesRelationship( collectionTarget, null, [], 0, this.filter.max_options);
                 } else {
-                    promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, 0, this.filter.max_options );
+                    promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, [], 0, this.filter.max_options );
                 }
 
                 promise.then(() => {
diff --git a/src/classes/filter-types/filter-types-mixin.js b/src/classes/filter-types/filter-types-mixin.js
index 47f209be0..0cb796eb6 100644
--- a/src/classes/filter-types/filter-types-mixin.js
+++ b/src/classes/filter-types/filter-types-mixin.js
@@ -76,6 +76,8 @@ export const filter_type_mixin = {
 
                     if (opts.length) {
                         this.options = opts;
+                    } else {
+                        this.noMorePage = 1;
                     }
 
                     if (this.filter.max_options && this.options.length >= this.filter.max_options) {
@@ -145,6 +147,8 @@ export const filter_type_mixin = {
 
                     if (opts.length) {
                         this.options = opts;
+                    } else {
+                        this.noMorePage = 1;
                     }
 
                     if (this.filter.max_options && this.options.length >= this.filter.max_options) {
diff --git a/src/classes/repositories/class-tainacan-filters.php b/src/classes/repositories/class-tainacan-filters.php
index 4f2bd20fe..c6be88916 100644
--- a/src/classes/repositories/class-tainacan-filters.php
+++ b/src/classes/repositories/class-tainacan-filters.php
@@ -90,7 +90,8 @@ class Filters extends Repository {
 			    'title'       => __( 'Max of options', 'tainacan' ),
 			    'type'        => 'integer/string',
 			    'description' => __( 'The max number of options to be showed in filter sidebar.', 'tainacan' ),
-			    'validation'  => ''
+			    'validation'  => '',
+			    'default'     => 4
 		    ]
         ]);
     }
diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php
index b7a709d5f..904bb5b47 100644
--- a/src/classes/repositories/class-tainacan-metadata.php
+++ b/src/classes/repositories/class-tainacan-metadata.php
@@ -860,7 +860,7 @@ class Metadata extends Repository {
 
 		$pagination = '';
 		if($offset >= 0 && $number >= 1){
-			$pagination = $wpdb->prepare("LIMIT %d, %d", (int) $offset, (int) $number);
+			$pagination = $wpdb->prepare("LIMIT %d,%d", (int) $offset, (int) $number);
 		}
 
 		// If no has logged user or actual user can not read private posts