From 46eeefea1322b4da713431dd86daded3954c0474 Mon Sep 17 00:00:00 2001
From: mateuswetah <mateus.m.luna@gmail.com>
Date: Wed, 23 Nov 2022 10:46:47 -0300
Subject: [PATCH] Sets sentence mode via a checkbox. #743.

---
 src/views/admin/js/event-bus-search.js          |  1 -
 .../admin/js/store/modules/search/mutations.js  |  6 ++++--
 src/views/admin/pages/lists/items-page.vue      | 16 ++++++++++++----
 .../theme-search/theme-items-page.vue           | 17 +++++++++++++----
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/views/admin/js/event-bus-search.js b/src/views/admin/js/event-bus-search.js
index e10ee6e33..aaae137e6 100644
--- a/src/views/admin/js/event-bus-search.js
+++ b/src/views/admin/js/event-bus-search.js
@@ -300,7 +300,6 @@ export default {
                 },
                 setSentenceMode(sentenceMode) {
                     this.$store.dispatch('search/setSentenceMode', sentenceMode);
-                    this.updateURLQueries();
                 },
                 setSearchQuery(searchQuery) {
                     this.$store.dispatch('search/setSearchQuery', searchQuery);
diff --git a/src/views/admin/js/store/modules/search/mutations.js b/src/views/admin/js/store/modules/search/mutations.js
index 0472ee949..0fb2ca014 100644
--- a/src/views/admin/js/store/modules/search/mutations.js
+++ b/src/views/admin/js/store/modules/search/mutations.js
@@ -149,9 +149,11 @@ export const setSearchQuery = ( state, searchQuery ) => {
 
 export const setSentenceMode = ( state, sentenceMode ) => {
     if (sentenceMode == true)
-        state.postquery.sentence = sentenceMode;
-    else
+        Vue.set(state.postquery, 'sentence', sentenceMode);
+    else {
+        Vue.set(state.postquery, 'sentence', sentenceMode); // Needed to trigger getter
         delete state.postquery.sentence;
+    }
 };
 
 export const setStatus = ( state, status ) => {
diff --git a/src/views/admin/pages/lists/items-page.vue b/src/views/admin/pages/lists/items-page.vue
index f14b9249a..7d50b2c58 100644
--- a/src/views/admin/pages/lists/items-page.vue
+++ b/src/views/admin/pages/lists/items-page.vue
@@ -81,12 +81,17 @@
                         <b-dropdown-item 
                                 @click="updateSearch()"
                                 :focusable="false">
-                            <span v-html="$i18n.get('instruction_press_enter_to_search_for')"/>&nbsp;"{{ futureSearchQuery }}".
+                            <span v-html="$i18n.get('instruction_press_enter_to_search_for')"/>&nbsp;
+                            <em>{{ sentenceMode == true ? futureSearchQuery : ('"' + futureSearchQuery + '"') }}.</em>
                         </b-dropdown-item>
                         <b-dropdown-item
-                                @click="$eventBusSearch.setSentenceMode(true)"
+                                custom
                                 :focusable="false">
-                            {{ $i18n.get('label_use_search_separated_words') }}
+                            <b-checkbox 
+                                    :value="sentenceMode"
+                                    @input="$eventBusSearch.setSentenceMode($event)">
+                                {{ $i18n.get('label_use_search_separated_words') }}
+                            </b-checkbox>
                             <small class="is-small help">{{ $i18n.get('info_use_search_separated_words') }}</small>
                         </b-dropdown-item>
                         <b-dropdown-item
@@ -706,6 +711,9 @@
             status() {
                 return this.getStatus();
             },
+            sentenceMode() {
+                return this.getSentenceMode();
+            },
             adminViewMode() {
                 const currentAdminViewMode = this.getAdminViewMode();
                 return ['table', 'cards', 'records', 'grid', 'masonry', 'list'].indexOf(currentAdminViewMode) >= 0 ? currentAdminViewMode : 'table';
@@ -1590,7 +1598,7 @@
                     /deep/ .dropdown-menu {
                         z-index: 99999991;
 
-                        .dropdown-item:last-of-type {
+                        .dropdown-item:last-child {
                             line-height: 2.25em;
                             background: var(--tainacan-item-hover-background-color);
                         }
diff --git a/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/theme-items-page.vue b/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/theme-items-page.vue
index c49ed079f..d763c5392 100644
--- a/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/theme-items-page.vue
+++ b/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/theme-items-page.vue
@@ -91,12 +91,17 @@
                         <b-dropdown-item 
                                 @click="updateSearch()"
                                 :focusable="false">
-                            <span v-html="$i18n.get('instruction_press_enter_to_search_for')"/>&nbsp;"{{ futureSearchQuery }}".
+                            <span v-html="$i18n.get('instruction_press_enter_to_search_for')"/>&nbsp;
+                            <em>{{ sentenceMode == true ? futureSearchQuery : ('"' + futureSearchQuery + '"') }}.</em>
                         </b-dropdown-item>
                         <b-dropdown-item
-                                @click="$eventBusSearch.setSentenceMode(true)"
+                                custom
                                 :focusable="false">
-                            {{ $i18n.get('label_use_search_separated_words') }}
+                            <b-checkbox 
+                                    :value="sentenceMode"
+                                    @input="$eventBusSearch.setSentenceMode($event)">
+                                {{ $i18n.get('label_use_search_separated_words') }}
+                            </b-checkbox>
                             <small class="is-small help">{{ $i18n.get('info_use_search_separated_words') }}</small>
                         </b-dropdown-item>
                         <b-dropdown-item
@@ -730,6 +735,9 @@
             searchQuery() {
                 return this.getSearchQuery();
             },
+            sentenceMode() {
+                return this.getSentenceMode();
+            },
             viewMode() {
                 return this.getViewMode();
             },
@@ -952,6 +960,7 @@
                 'getOrder',
                 'getViewMode',
                 'getTotalItems',
+                'getSentenceMode',
                 'getMetaKey',
                 'getPage',
                 'getItemsPerPage'
@@ -1622,7 +1631,7 @@
                     /deep/ .dropdown-menu {
                         z-index: 99999991;
 
-                        .dropdown-item:last-of-type {
+                        .dropdown-item:last-child {
                             line-height: 2.25em;
                             background: var(--tainacan-item-hover-background-color);