Merge branch 'develop': release v1.0v1.0

1 files changed, 29 insertions, 13 deletions

diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index 7e61f89..e75a37e 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -18,25 +18,41 @@
 -->
 
 <template>
-  <div class="flex">
-    <div v-for="(item) in items" :key="item.path">
-      <router-link :to="item.path" @click.native="$uiStore.setModeNavigation()">
-        <gallery-thumbnail :item="item" />
-      </router-link>
-    </div>
-    <div v-if="items.length===0">{{$t('search.no-results')}}</div>
-  </div>
+  <ld-gallery :items="items()" :noresult="noResult()" />
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
-import GalleryThumbnail from "./GalleryThumbnail.vue";
+import { Operation } from "@/@types/Operation";
+import IndexSearch from "@/services/indexsearch";
 
-@Component({
-  components: { GalleryThumbnail },
-})
+@Component
 export default class GalleryPicture extends Vue {
-  @Prop({ required: true }) readonly items!: Gallery.Item[];
+  @Prop(String) readonly path!: string;
+
+  otherCount: Number = 0;
+
+  mounted() {
+    this.$uiStore.toggleFullscreen(false);
+    this.$uiStore.toggleSearchMode(true);
+  }
+
+  destroyed() {
+    this.$uiStore.toggleSearchMode(false);
+    this.$galleryStore.setCurrentSearch([]);
+  }
+
+  items() {
+    const searchResult = IndexSearch.search(this.$galleryStore.currentSearch);
+    const filteredByPath = searchResult.filter(item => item.path.startsWith(this.path));
+    this.otherCount = searchResult.length - filteredByPath.length;
+    return filteredByPath;
+  }
+
+  noResult() {
+    const params = [this.otherCount, this.otherCount > 1 ? "s" : ""];
+    return this.$t("search.no-results.otherfolders", params);
+  }
 }
 </script>