Advanced search fixes

peachjam/js/components/FindDocuments/AdvancedSearch.vue

@@ -147,7 +147,7 @@ export default {
 
       // ensure there's an empty entry at the end
       if (data[data.length - 1].text) {
-        data.push({ text: '', fields: [], exact: false, condition: 'AND' });
+        data.push({ text: '', fields: ['all'], exact: false, condition: 'AND' });
       }
 
       this.$emit('update:modelValue', data);

peachjam/js/components/FindDocuments/AdvancedSearchFields.vue

@@ -50,7 +50,8 @@
           >
             <input
               :id="`advanced-${targetIndex}-fields-${field.field}`"
-              :checked="field.field === 'ANY' && criterion.fields.length === 0 || criterion.fields.indexOf(field.field) > -1"
+              :checked="this.criterion.fields.includes(field.field)"
+              :disabled="field.field === 'all' && this.criterion.fields.includes(field.field)"
               class="form-check-input"
               type="checkbox"
               @change="(e) => fieldChanged(field.field, e.target.checked)"
@@ -101,7 +102,7 @@ export default {
   data: (self) => {
     return {
       fields: [{
-        field: 'ANY',
+        field: 'all',
         label: self.$t('Any field')
       },{
         field: 'title',
@@ -126,15 +127,28 @@ export default {
       this.$emit('on-change');
     },
     fieldChanged (field, checked) {
-      if (field === 'ANY') {
-        this.criterion.fields = [];
-      } else {
+      if (field === 'all') {
         if (checked) {
-          if (!this.criterion.fields.includes(field)) {
-            this.criterion.fields.push(field);
-          }
-        } else {
-          this.criterion.fields = this.criterion.fields.filter((f) => f !== field);
+          // only 'all'
+          this.criterion.fields.splice(0, this.criterion.fields.length);
+          this.criterion.fields.push(field);
+        } else if (this.criterion.fields.includes(field) && this.criterion.fields.length > 1) {
+          // remove it
+          this.criterion.fields.splice(this.criterion.fields.indexOf(field), 1);
+        }
+      } else if (checked) {
+        // add it
+        if (!this.criterion.fields.includes(field)) {
+          this.criterion.fields.push(field);
+        }
+        if (this.criterion.fields.includes('all')) {
+          this.criterion.fields.splice(this.criterion.fields.indexOf('all'), 1);
+        }
+      } else if (this.criterion.fields.includes(field)) {
+        // remove it
+        this.criterion.fields.splice(this.criterion.fields.indexOf(field), 1);
+        if (this.criterion.fields.length === 0) {
+          this.criterion.fields.push('all');
         }
       }
       this.changed();

peachjam/js/components/FindDocuments/index.vue

@@ -609,6 +609,12 @@ export default {
         params.append('facet', facet.name);
       });
 
+      this.generateAdvancedSearchParams(params);
+
+      return params;
+    },
+
+    generateAdvancedSearchParams (params) {
       // advanced search fields, if any
       if (this.advancedSearchDateCriteria.date_from && this.advancedSearchDateCriteria.date_to) {
         const dateFrom = this.advancedSearchDateCriteria.date_from;
@@ -620,9 +626,40 @@ export default {
         params.append('date__lte', this.advancedSearchDateCriteria.date_to);
       }
 
-      this.advancedSearchCriteria.forEach(criterion => this.addAdvancedSearchParams(criterion, params));
+      // group criteria by fields and process each field separately
+      const fields = new Map();
+      for (const criterion of this.advancedSearchCriteria) {
+        if (criterion.text) {
+          for (const field of criterion.fields) {
+            if (!fields.has(field)) fields.set(field, []);
+            fields.get(field).push(criterion);
+          }
+        }
+      }
 
-      return params;
+      for (const [field, criteria] of fields) {
+        params.set(`search__${field}`, this.generateAdvancedSearchQuery(criteria));
+      }
+    },
+
+    generateAdvancedSearchQuery (criteria) {
+      let q = '';
+
+      for (const criterion of criteria) {
+        const text = criterion.exact ? `"${criterion.text}"` : criterion.text;
+
+        if (criterion.condition === 'AND') {
+          q = q + ' & ';
+        } else if (criterion.condition === 'OR') {
+          q = q + ' | ';
+        } else if (criterion.condition === 'NOT') {
+          q = q + ' -';
+        }
+
+        q = q + `(${text})`;
+      }
+
+      return q.trim();
     },
 
     async search (pushState = true) {
@@ -717,13 +754,13 @@ export default {
     resetAdvancedFields () {
       this.advancedSearchCriteria = [{
         text: '',
-        fields: [],
+        fields: ['all'],
         condition: '',
         exact: false
       },
       {
         text: '',
-        fields: [],
+        fields: ['all'],
         condition: 'AND',
         exact: false
       }];
@@ -734,38 +771,6 @@ export default {
       };
     },
 
-    addAdvancedSearchParams (criterion, params) {
-      if (!criterion.text) return;
-
-      let q = '';
-      const text = criterion.exact ? `"${criterion.text}"` : criterion.text;
-      let splitValue = text.match(/\w+|"[^"]+"/g);
-
-      if (criterion.condition === 'AND') {
-        const tokens = [];
-
-        splitValue.forEach((value) => {
-          if (value.startsWith('"')) {
-            tokens.push(value);
-          } else {
-            tokens.push('"' + value + '"');
-          }
-        });
-
-        splitValue = tokens.join(' ');
-      } else if (criterion.condition === 'OR') {
-        splitValue = `(|${splitValue.join('|')})`;
-      } else if (criterion.condition === 'NOT') {
-        splitValue = splitValue.map((value) => `-${value}`).join(' ');
-      } else splitValue = splitValue.join(' ');
-
-      q = q + ' ' + splitValue.trim();
-
-      const fields = criterion.fields.length ? criterion.fields.map(f => `search__${f}`) : ['search'];
-      for (const field of fields) {
-        params.set(field, (params.get(field)?.trim() || '') + ' ' + q.trim());
-      }
-    }
   }
 };
 </script>