From f2c7548c44cc83beacfd73aeeab57f131669c118 Mon Sep 17 00:00:00 2001
From: Jan Michael Yu <jan.michael.yu+github@gmail.com>
Date: Fri, 3 May 2019 18:49:17 +0800
Subject: [PATCH 1/2] fix for using search:search using custom constraint
 instead of extsimilar

---
 src/api/SearchApi.js          | 31 +++++++++++++++++++++++++++++++
 src/components/ml-similar.vue | 32 +++++++++++++-------------------
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/api/SearchApi.js b/src/api/SearchApi.js
index 391e64b..fea1982 100755
--- a/src/api/SearchApi.js
+++ b/src/api/SearchApi.js
@@ -169,5 +169,36 @@ export default {
         return error;
       }
     );
+  },
+  getSimilar(uri) {
+    let custom = {
+      "query": {
+        "queries": [{
+          "custom-constraint-query": {
+            "constraint-name": "similar",
+            "text": uri
+          }
+        }]
+      }
+    };
+
+    return fetch('/api/search/similar', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json'
+      },
+      body: JSON.stringify(custom),
+      credentials: 'same-origin'
+    }).then(
+      response => {
+        return response.json().then(function(json) {
+          return { response: json };
+        });
+      },
+      error => {
+        return error;
+      }
+    );
   }
 };
diff --git a/src/components/ml-similar.vue b/src/components/ml-similar.vue
index c5af0fc..6109a5d 100755
--- a/src/components/ml-similar.vue
+++ b/src/components/ml-similar.vue
@@ -11,6 +11,8 @@
 </template>
 
 <script>
+import SearchApi from "../api/SearchApi";
+
 export default {
   name: 'ml-similar',
   props: {
@@ -35,28 +37,20 @@ export default {
     updateSimilar() {
       if (this.uri) {
         this.loading = true;
-        // TODO: fetching similar docs needs a better middleware/backend solution
-        this.$http({
-          method: 'GET',
-          url: '/v1/resources/extsimilar',
-          params: {
-            'rs:uri': this.uri
-          },
-          auth: {
-            username: this.$store.state.auth.username,
-            password: this.$store.state.auth.password,
-            sendImmediately: true
-          }
-        }).then(
-          response => {
-            this.similar = response.data.similar;
+
+        SearchApi.getSimilar(this.uri).then(result => {
+          console.log('getSimilar',result);
+
+          if (result.response) {
+            this.similar = result.response.results;
             this.loading = false;
-          },
-          error => {
-            console.log(error);
+          } else {
+            // error
             this.loading = false;
+            return result;
           }
-        );
+        });
+
       }
     },
     resultLabel(result) {

From 33b6032be03b98d93898a247ce22b5021f5f6863 Mon Sep 17 00:00:00 2001
From: jmichael <jan.michael.yu+github@gmail.com>
Date: Mon, 8 Jul 2019 16:36:22 +0800
Subject: [PATCH 2/2] GROVE-334 : adds 'show more' link to show more facets in
 the Vue template

---
 src/api/ValuesApi.js                   | 114 +++++++++++++++++++++++++
 src/components/ml-search/ml-facets.vue |   4 +-
 src/store.js                           |  48 +++++++++++
 src/views/SearchPage.vue               |  12 ++-
 4 files changed, 175 insertions(+), 3 deletions(-)
 create mode 100644 src/api/ValuesApi.js
 mode change 100755 => 100644 src/components/ml-search/ml-facets.vue

diff --git a/src/api/ValuesApi.js b/src/api/ValuesApi.js
new file mode 100644
index 0000000..06494b1
--- /dev/null
+++ b/src/api/ValuesApi.js
@@ -0,0 +1,114 @@
+import { polyfill } from 'es6-promise';
+import 'isomorphic-fetch';
+
+polyfill();
+
+export default {
+  name: 'ValuesApi',
+
+  getValues(name, params, options, searchState, qtext, facetObject) {
+    //get options
+    return fetch('/v1/config/query/all?format=json', {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json'
+      },
+      credentials: 'same-origin'
+    }).then(
+      response => {
+        return response.json().then(function(json) {
+          let options = json.options || {};
+
+          let path = '';
+          let collation = '';
+          for (let i=0; i < options.constraint.length; i++) {
+            if (options.constraint[i].name === name){
+              path = options.constraint[i].range['path-index'].text;
+              collation = options.constraint[i].range.collation;
+            }
+          }
+
+          options.values = {
+            name: name,
+            range: {
+              collation: collation,
+              type: 'xs:string',
+              'path-index': {
+                text: path,
+                ns: ''
+              }
+            },
+            'values-option' : ['frequency-order']
+          };
+          //combine with search
+          let searchType = 'all';
+          // let searchType = searchType !== undefined ? searchType : 'all';
+          let start = facetObject.facetValues.length +1 || 1;
+          // let start = 1;
+          let pageLength = 10;
+          // var limit = 100;
+          var limit = start + pageLength - 1;
+
+          let facets = Object.keys(searchState.activeFacets || {}).map(function(facetName) {
+            let constraintType = searchState.activeFacets[facetName].type;
+            if (constraintType && constraintType.substring(0, 3) === 'xs:') {
+              constraintType = 'range';
+            }
+            let temp = {
+              'range-constraint-query' :{
+                'constraint-name': facetName,
+                constraintType: constraintType
+              }
+            };
+            searchState.activeFacets[facetName].values.map(function(facetValue) {
+              temp.value = [facetValue.value];
+              if (facetValue.negated) {
+                temp['range-operator'] = 'NE';
+              }
+            });
+
+            return temp;
+          });
+          let valuesParams = new URLSearchParams();
+          valuesParams.append('q', qtext);
+          valuesParams.append('start', start);
+          valuesParams.append('pageLength', pageLength);
+          valuesParams.append('limit', limit);
+          valuesParams.append('direction', 'descending');
+          let valuesParamsString = valuesParams.toString();
+
+          return fetch('/v1/values/' + name + '?'+valuesParamsString, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              Accept: 'application/json'
+            },
+            body: JSON.stringify({
+              search: {
+                query: {
+                  queries: {
+                    and: [].concat(facets)
+                  }},
+                options: options
+            }}),
+            credentials: 'same-origin'
+          }).then(
+            response => {
+              return response.json().then(function(json) {
+
+                return { response: json };
+              });
+            },
+            error => {
+              return error;
+            }
+          );
+        });
+      },
+      error => {
+        return error;
+      }
+    );
+  }
+};
diff --git a/src/components/ml-search/ml-facets.vue b/src/components/ml-search/ml-facets.vue
old mode 100755
new mode 100644
index c2b376f..d955a06
--- a/src/components/ml-search/ml-facets.vue
+++ b/src/components/ml-search/ml-facets.vue
@@ -14,8 +14,8 @@
         </span>
         <i v-if="!!negate" class="fa fa-ban facet-add-neg" v-on:click.prevent="negate(facetName, facet.type, value.name)" :title="value.name"></i>
       </div>
-      <div v-if="!!showMore && !facet.displayingAll">
-        <a href v-on:click.prevent="showMore(facetName)">see more ...</a>
+      <div v-if="!!showMore && !facet.displayingAll && facet.type.startsWith('xs:')">
+        <a href v-on:click.prevent="showMore(facet, facetName)">show more ...</a>
       </div>
     </div>
   </div>
diff --git a/src/store.js b/src/store.js
index 4c16196..6f1e5db 100755
--- a/src/store.js
+++ b/src/store.js
@@ -4,6 +4,7 @@ import Vuex from 'vuex';
 import authApi from './api/AuthApi';
 import searchApi from './api/SearchApi';
 import crudApi from './api/CRUDApi';
+import ValuesApi from './api/ValuesApi.js';
 
 Vue.use(Vuex);
 
@@ -156,6 +157,38 @@ function typedSearchState(searchType) {
           state.facets = response.facets;
         }
       },
+      setFacetValue(state, { facetName, facets }) {
+        if (facets) {
+          let values = state.facets[facetName].facetValues;
+
+          if (facets) {
+            facets.forEach(function(newFacetValue) {
+              //check if not existing
+              for (let i = 0; i < values.length; i++) {
+                if (values[i].name === newFacetValue._value) {
+                  state.facets[facetName].displayingAll = true;
+                  return;
+                }
+              }
+              values.push({
+                name: newFacetValue._value || 'blank',
+                count: facetName.endsWith('*')?'':newFacetValue.frequency,
+                value: newFacetValue._value || ''
+              });
+            });
+          }
+
+          state.facets[facetName].facetValues = values;
+        } else {
+          state.facets[facetName].displayingAll = true;
+          return;
+        }
+      },
+      setFacetDisplayingAll(state, { facetName }) {
+        state.facets[facetName].displayingAll = true;
+        //cloning data to force UI update
+        state.facets[facetName] = {...state.facets[facetName]};
+      },
       setText(state, { qtext }) {
         if (qtext !== undefined) {
           state.qtext = qtext;
@@ -298,6 +331,21 @@ function typedSearchState(searchType) {
               return result;
             }
           });
+      },
+      showMore({ commit, state }, {facet, facetName}) {
+        let params = {};
+        let options = {};
+        ValuesApi.getValues(facetName, params, options,
+          state, state.qtext, facet).then( response => {
+          let newFacets = response.response && response.response['values-response'] && response.response['values-response']['distinct-value'];
+
+          if (newFacets) {
+            commit('setFacetValue', {facetName, facets: newFacets});
+          } else {
+            commit('setFacetDisplayingAll', {facetName});
+          }
+
+        });
       }
     },
     getters: {
diff --git a/src/views/SearchPage.vue b/src/views/SearchPage.vue
index f9b55c4..fb5482b 100755
--- a/src/views/SearchPage.vue
+++ b/src/views/SearchPage.vue
@@ -5,7 +5,7 @@
         <ml-input :qtext="qtext" :search="search" :suggest="suggest" class="search"></ml-input>
       </div>
       <div class="col-xs-12 col-sm-4 col-md-3 facets-col">
-        <ml-facets v-if="facets" :facets="facets" :toggle="toggleFacet" :active-facets="activeFacets" :negate="toggleNegatedFacet"></ml-facets>
+        <ml-facets v-if="facets" :facets="facets" :toggle="toggleFacet" :active-facets="activeFacets" :negate="toggleNegatedFacet" :showMore="showMore"></ml-facets>
       </div>
       <div class="col-xs-12 col-sm-8 col-md-9 results-col">
         <i class="fa fa-refresh pull-right" :class="searchPending ? 'fa-spin' : ''"
@@ -109,6 +109,16 @@ export default {
     }
   },
   methods: {
+    showMore(facet, facetName) {
+      if (facet.displayingAll) {
+        return;
+      }
+      this.$store
+        .dispatch('search/' + this.type + '/showMore', {facet, facetName})
+        .then(() => {
+          this.searchPending = false;
+        });
+    },
     toggleFacet(facet, type, value) {
       console.log('Toggle ' + facet + ' ' + type + ' ' + value);
       this.searchPending = true;