Merge pull request #163 from pacien/oz-result-count-in-other-folders

viewer: added a count of results found in other folders when no-resul…

4 files changed, 20 insertions, 8 deletions

diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index 169bc54..16e9f7c 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -24,7 +24,7 @@
         <ld-thumbnail :item="item" />
       </router-link>
     </div>
-    <div v-if="hasNoResults()">{{noresult}}</div>
+    <div v-if="hasNoResults()" class="noresult">{{noresult}}</div>
   </div>
 </template>
 
@@ -44,4 +44,7 @@ export default class LdPicture extends Vue {
 </script>
 
 <style lang="scss">
+.thumbnail-tiles .noresult {
+  margin-top: 40px;
+}
 </style>
diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index 878204e..81ddd1e 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -13,5 +13,6 @@
   "command.search.search": "Search",
   "command.back": "Go back",
   "command.parent": "Go to parent directory",
-  "directory.no-results": "Empty directory"
-}
+  "directory.no-results": "Empty directory",
+  "search.no-results.otherfolders": "result(s) in other folders"
+}
\ No newline at end of file
diff --git a/viewer/src/services/indexsearch.ts b/viewer/src/services/indexsearch.ts
index 3e73fb1..cd3383a 100644
--- a/viewer/src/services/indexsearch.ts
+++ b/viewer/src/services/indexsearch.ts
@@ -22,12 +22,11 @@ import { Operation } from '@/@types/Operation';
 export default class IndexSearch {
 
   // Results of the search (by tags)
-  public static search(searchTags: Tag.Search[], rootPath: string): Gallery.Item[] {
+  public static search(searchTags: Tag.Search[]): Gallery.Item[] {
     const byOperation = this.extractTagsByOperation(searchTags);
     const intersection = this.extractIntersection(byOperation);
     const substraction = this.extractSubstraction(byOperation);
-    return this.aggregateAll(byOperation, intersection, substraction)
-      .filter(item => item.path.startsWith(rootPath));
+    return this.aggregateAll(byOperation, intersection, substraction);
   }
 
   private static extractTagsByOperation(searchTags: Tag.Search[]): Tag.SearchByOperation {
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index 4b6dd7f..9f2ac17 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <ld-gallery :items="items()" :noresult="$t('search.no-results')" />
+  <ld-gallery :items="items()" :noresult="noResult()" />
 </template>
 
 <script lang="ts">
@@ -30,6 +30,8 @@ import IndexSearch from "@/services/indexsearch";
 export default class GalleryPicture extends Vue {
   @Prop(String) readonly path!: string;
 
+  otherCount: Number = 0;
+
   mounted() {
     this.$uiStore.fullscreen = false;
     this.$uiStore.searchMode = true;
@@ -40,7 +42,14 @@ export default class GalleryPicture extends Vue {
   }
 
   items() {
-    return IndexSearch.search(this.$galleryStore.currentSearch, this.path);
+    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() {
+    return `${this.$t("search.no-results")} • ${this.otherCount} ${this.$t("search.no-results.otherfolders")}`;
   }
 }
 </script>