Read ES version, handle legacy versions, add notice & debug info

sist2-vue/src/Sist2Query.ts

@@ -73,6 +73,8 @@ class Sist2Query {
         const selectedMimeTypes = getters.selectedMimeTypes;
         const selectedTags = getters.selectedTags;
 
+        const legacyES = store.state.sist2Info.esVersionLegacy;
+
         const filters = [
             {terms: {index: selectedIndexIds}}
         ] as any[];
@@ -187,9 +189,13 @@ class Sist2Query {
                     "name.nGram": {},
                     "content.nGram": {},
                     font_name: {},
-                },
-                max_analyzed_offset: 9_999_999
+                }
             };
+
+            if (!legacyES) {
+                q.highlight.max_analyzed_offset = 9_999_999;
+            }
+
             if (getters.optSearchInPath) {
                 q.highlight.fields["path.text"] = {};
                 q.highlight.fields["path.nGram"] = {};

sist2-vue/src/components/DebugInfo.vue

@@ -5,7 +5,6 @@
 
     <b-card-body>
 
-      <!-- TODO: ES connectivity, Link to GH page -->
       <b-table :items="tableItems" small borderless responsive="md" thead-class="hidden" class="mb-0"></b-table>
 
       <hr />
@@ -32,6 +31,9 @@ export default {
         {key: "esIndex", value: this.$store.state.sist2Info.esIndex},
         {key: "tagline", value: this.$store.state.sist2Info.tagline},
         {key: "dev", value: this.$store.state.sist2Info.dev},
+        {key: "esVersion", value: this.$store.state.sist2Info.esVersion},
+        {key: "esVersionSupported", value: this.$store.state.sist2Info.esVersionSupported},
+        {key: "esVersionLegacy", value: this.$store.state.sist2Info.esVersionLegacy},
       ]
     }
   }

sist2-vue/src/components/NavBar.vue

@@ -8,7 +8,8 @@
     </b-navbar-brand>
 
     <span class="badge badge-pill version" v-if="$store && $store.state.sist2Info">
-      v{{ sist2Version() }}<span v-if="isDebug()">-dbg</span>
+      v{{ sist2Version() }}<span v-if="isDebug()">-dbg</span><span v-if="isLegacy() && !hideLegacy()">-<a
+        href="https://github.com/simon987/sist2/blob/master/docs/USAGE.md#elasticsearch" target="_blank">legacyES</a></span>
     </span>
 
     <span v-if="$store && $store.state.sist2Info" class="tagline" v-html="tagline()"></span>
@@ -20,6 +21,7 @@
 
 <script>
 import Sist2Icon from "@/components/Sist2Icon";
+
 export default {
   name: "NavBar",
   components: {Sist2Icon},
@@ -32,6 +34,12 @@ export default {
     },
     isDebug() {
       return this.$store.state.sist2Info.debug;
+    },
+    isLegacy() {
+      return this.$store.state.sist2Info.esVersionLegacy;
+    },
+    hideLegacy() {
+      return this.$store.state.optHideLegacy;
     }
   }
 }
@@ -95,7 +103,7 @@ export default {
   }
 }
 
-.theme-light .btn-link{
+.theme-light .btn-link {
   color: #222;
 }
 </style>

sist2-vue/src/i18n/messages.ts

@@ -63,7 +63,8 @@ export default {
             slideDuration: "Slide duration",
             resultSize: "Number of results per page",
             tagOrOperator: "Use OR operator when specifying multiple tags.",
-            hideDuplicates: "Hide duplicate results based on checksum"
+            hideDuplicates: "Hide duplicate results based on checksum",
+            hideLegacy: "Hide the 'legacyES' Elasticsearch notice"
         },
         queryMode: {
             simple: "Simple",
@@ -211,7 +212,8 @@ export default {
             slideDuration: "Durée des diapositives",
             resultSize: "Nombre de résultats par page",
             tagOrOperator: "Utiliser l'opérateur OU lors de la spécification de plusieurs tags",
-            hideDuplicates: "Masquer les résultats en double"
+            hideDuplicates: "Masquer les résultats en double",
+            hideLegacy: "Masquer la notice 'legacyES' Elasticsearch"
         },
         queryMode: {
             simple: "Simple",

sist2-vue/src/store/index.ts

@@ -46,6 +46,7 @@ export default new Vuex.Store({
         optTreemapColor: "PuBuGn",
         optLightboxLoadOnlyCurrent: false,
         optLightboxSlideDuration: 15,
+        optHideLegacy: false,
 
         _onLoadSelectedIndices: [] as string[],
         _onLoadSelectedMimeTypes: [] as string[],
@@ -144,6 +145,7 @@ export default new Vuex.Store({
         setOptTreemapColorGroupingDepth: (state, val) => state.optTreemapColorGroupingDepth = val,
         setOptTreemapSize: (state, val) => state.optTreemapSize = val,
         setOptTreemapColor: (state, val) => state.optTreemapColor = val,
+        setOptHideLegacy: (state, val) => state.optHideLegacy = val,
 
         setOptLightboxLoadOnlyCurrent: (state, val) => state.optLightboxLoadOnlyCurrent = val,
 
@@ -339,5 +341,6 @@ export default new Vuex.Store({
         optLightboxLoadOnlyCurrent: state => state.optLightboxLoadOnlyCurrent,
         optLightboxSlideDuration: state => state.optLightboxSlideDuration,
         optResultSize: state => state.size,
+        optHideLegacy: state => state.optHideLegacy,
     }
 })

sist2-vue/src/views/Configuration.vue

@@ -19,6 +19,10 @@
             {{ $t("opt.lightboxLoadOnlyCurrent") }}
           </b-form-checkbox>
 
+          <b-form-checkbox :checked="optHideLegacy" @input="setOptHideLegacy">
+            {{ $t("opt.hideLegacy") }}
+          </b-form-checkbox>
+
           <label>{{ $t("opt.lang") }}</label>
           <b-form-select :options="langOptions" :value="optLang" @input="setOptLang"></b-form-select>
 
@@ -215,6 +219,7 @@ export default {
       "optTagOrOperator",
       "optLang",
       "optHideDuplicates",
+      "optHideLegacy",
     ]),
     clientWidth() {
       return window.innerWidth;
@@ -254,7 +259,8 @@ export default {
       "setOptResultSize",
       "setOptTagOrOperator",
       "setOptLang",
-      "setOptHideDuplicates"
+      "setOptHideDuplicates",
+      "setOptHideLegacy"
     ]),
     onResetClick() {
       localStorage.removeItem("sist2_configuration");