.drone.yml

@@ -10,7 +10,7 @@ steps:
   - name: build
     image: simon987/sist2-build
     commands:
-      - ./scripts/build.sh
+      - ./ci/build.sh
   - name: docker
     image: plugins/docker
     settings:
@@ -55,7 +55,7 @@ steps:
   - name: build
     image: simon987/sist2-build-arm64
     commands:
-      - ./scripts/build_arm64.sh
+      - ./ci/build_arm64.sh
   - name: scp files
     image: appleboy/drone-scp
     settings:

schema/mappings.json

@@ -78,7 +78,6 @@
     "name": {
       "analyzer": "content_analyzer",
       "type": "text",
-      "fielddata": true,
       "fields": {
         "nGram": {
           "type": "text",

sist2-vue/src/Sist2Query.ts

@@ -43,20 +43,6 @@ const SORT_MODES = {
             {_tie: {order: "asc"}}
         ],
         key: (hit: EsHit) => hit._source.size
-    },
-    nameAsc: {
-        mode: [
-            {name: {order: "asc"}},
-            {_tie: {order: "asc"}}
-        ],
-        key: (hit: EsHit) => hit._source.name
-    },
-    nameDesc: {
-        mode: [
-            {name: {order: "desc"}},
-            {_tie: {order: "asc"}}
-        ],
-        key: (hit: EsHit) => hit._source.name
     }
 } as any;
 

sist2-vue/src/components/IndexPicker.vue

@@ -7,27 +7,11 @@
         value-field="id"></b-form-select>
   </div>
   <div v-else>
-
+    <b-list-group id="index-picker-desktop">
-    <div class="d-flex justify-content-between align-content-center">
-      <span>
-        {{ selectedIndices.length }}
-        {{ selectedIndices.length === 1 ? $t("indexPicker.selectedIndex") : $t("indexPicker.selectedIndices") }}
-      </span>
-
-      <div>
-        <b-button variant="link" @click="selectAll()"> {{ $t("indexPicker.selectAll") }}</b-button>
-        <b-button variant="link" @click="selectNone()"> {{ $t("indexPicker.selectNone") }}</b-button>
-      </div>
-    </div>
-
-    <b-list-group id="index-picker-desktop" class="unselectable">
       <b-list-group-item
           v-for="idx in indices"
-          @click="toggleIndex(idx, $event)"
+          @click="toggleIndex(idx)"
-          @click.shift="shiftClick(idx, $event)"
+          class="d-flex justify-content-between align-items-center list-group-item-action pointer">
-          class="d-flex justify-content-between align-items-center list-group-item-action pointer"
-          :class="{active: lastClickIndex === idx}"
-      >
         <div class="d-flex">
           <b-checkbox @change="toggleIndex(idx)" :checked="isSelected(idx)"></b-checkbox>
           {{ idx.name }}
@@ -52,7 +36,6 @@ export default Vue.extend({
   data() {
     return {
       loading: true,
-      lastClickIndex: null
     }
   },
   computed: {
@@ -70,50 +53,13 @@ export default Vue.extend({
     ...mapActions({
       setSelectedIndices: "setSelectedIndices"
     }),
-    shiftClick(index, e) {
-      if (this.lastClickIndex === null) {
-        return;
-      }
-
-      const select = this.isSelected(this.lastClickIndex);
-
-      let leftBoundary = this.indices.indexOf(this.lastClickIndex);
-      let rightBoundary = this.indices.indexOf(index);
-
-      if (rightBoundary < leftBoundary) {
-        let tmp = leftBoundary;
-        leftBoundary = rightBoundary;
-        rightBoundary = tmp;
-      }
-
-      for (let i = leftBoundary; i <= rightBoundary; i++) {
-        if (select) {
-          if (!this.isSelected(this.indices[i])) {
-            this.setSelectedIndices([this.indices[i], ...this.selectedIndices]);
-          }
-        } else {
-          this.setSelectedIndices(this.selectedIndices.filter(idx => idx !== this.indices[i]));
-        }
-      }
-    },
-    selectAll() {
-      this.setSelectedIndices(this.indices);
-    },
-    selectNone() {
-      this.setSelectedIndices([]);
-    },
     onSelect(value) {
       this.setSelectedIndices(this.indices.filter(idx => value.includes(idx.id)));
     },
     formatIdxDate(timestamp: number): string {
       return format(new Date(timestamp * 1000), "yyyy-MM-dd");
     },
-    toggleIndex(index, e) {
+    toggleIndex(index) {
-      if (e.shiftKey) {
-        return;
-      }
-
-      this.lastClickIndex = index;
       if (this.isSelected(index)) {
         this.setSelectedIndices(this.selectedIndices.filter(idx => idx.id != index.id));
       } else {
@@ -146,21 +92,4 @@ export default Vue.extend({
   overflow-y: auto;
   max-height: 132px;
 }
-
-.btn-link:focus {
-  box-shadow: none;
-}
-
-.unselectable {
-  user-select: none;
-  -ms-user-select: none;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-}
-
-.list-group-item.active {
-  z-index: 2;
-  background-color: inherit;
-  color: inherit;
-}
 </style>

sist2-vue/src/components/ResultsCard.vue

@@ -23,7 +23,7 @@
 <script lang="ts">
 import {EsResult} from "@/Sist2Api";
 import Vue from "vue";
-import {humanFileSize} from "@/util";
+import {humanFileSize, humanTime} from "@/util";
 import DisplayModeToggle from "@/components/DisplayModeToggle.vue";
 import SortSelect from "@/components/SortSelect.vue";
 

sist2-vue/src/components/SortSelect.vue

@@ -19,14 +19,6 @@
       {{ $t("sort.sizeDesc") }}
     </b-dropdown-item>
 
-    <b-dropdown-item :class="{'dropdown-active': sort === 'nameDesc'}" @click="onSelect('nameDesc')">
-      {{ $t("sort.nameDesc") }}
-    </b-dropdown-item>
-
-    <b-dropdown-item :class="{'dropdown-active': sort === 'nameAsc'}" @click="onSelect('nameAsc')">
-      {{ $t("sort.nameAsc") }}
-    </b-dropdown-item>
-
     <b-dropdown-item :class="{'dropdown-active': sort === 'random'}" @click="onSelect('random')">
       {{ $t("sort.random") }}
     </b-dropdown-item>

sist2-vue/src/i18n/messages.ts

@@ -131,14 +131,13 @@ export default {
         saveTagModalTitle: "Add tag",
         saveTagPlaceholder: "Tag name",
         confirm: "Confirm",
+        indexPickerPlaceholder: "Select indices",
         sort: {
             relevance: "Relevance",
             dateAsc: "Date (Older first)",
             dateDesc: "Date (Newer first)",
             sizeAsc: "Size (Smaller first)",
             sizeDesc: "Size (Larger first)",
-            nameAsc: "Name (A-z)",
-            nameDesc: "Name (Z-a)",
             random: "Random",
         },
         d3: {
@@ -146,13 +145,7 @@ export default {
             mimeSize: "Size distribution by media type",
             dateHistogram: "File modification time distribution",
             sizeHistogram: "File size distribution",
-        },
+        }
-        indexPicker: {
-            selectNone: "Select None",
-            selectAll: "Select All",
-            selectedIndex: "selected index",
-            selectedIndices: "selected indices",
-        },
     },
     fr: {
         searchBar: {
@@ -295,8 +288,6 @@ export default {
             dateDesc: "Date (Plus récent)",
             sizeAsc: "Taille (Plus petit)",
             sizeDesc: "Taille (Plus grand)",
-            nameAsc: "Nom (A-z)",
-            nameDesc: "Nom (Z-a)",
             random: "Aléatoire",
         },
         d3: {
@@ -304,12 +295,6 @@ export default {
             mimeSize: "Distribution des tailles de fichiers par type de média",
             dateHistogram: "Distribution des dates de modification",
             sizeHistogram: "Distribution des tailles de fichier",
-        },
+        }
-        indexPicker: {
-            selectNone: "Sélectionner aucun",
-            selectAll: "Sélectionner tout",
-            selectedIndex: "indice sélectionné",
-            selectedIndices: "indices sélectionnés",
-        },
     }
 }