From 370e3db3455f548699ff5e046e0f8dcc304991ac Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 14 Feb 2020 09:19:53 +0100
Subject: viewer: major code and search mode overhaul

Updated libraries to the lastest version
SCSS Formatter as suggested VSC extensions
Renamed toolbar-color by scrollbar-color
LD components use Props in favor of touching the stores directly (when possible)
Moved most common algorithms to a "services" folder
Complete search overhaul (lots of code change)
---
 viewer/src/views/GalleryDirectory.vue  |  14 ++---
 viewer/src/views/GalleryNavigation.vue |  63 +++++++++++++++++++
 viewer/src/views/GallerySearch.vue     |  36 ++++++++---
 viewer/src/views/MainGallery.vue       | 110 ---------------------------------
 viewer/src/views/MainLayout.vue        |   4 --
 viewer/src/views/PanelLeft.vue         |  34 +++++++++-
 viewer/src/views/PanelTop.vue          |   7 ++-
 7 files changed, 129 insertions(+), 139 deletions(-)
 create mode 100644 viewer/src/views/GalleryNavigation.vue
 delete mode 100644 viewer/src/views/MainGallery.vue

(limited to 'viewer/src/views')

diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index 162ef6e..6e68578 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -18,18 +18,12 @@
 -->
 
 <template>
-  <div class="thumbnail-tiles">
-    <div v-for="(item) in orderedItems" :key="item.path">
-      <router-link :to="item.path">
-        <ld-thumbnail :item="item" />
-      </router-link>
-    </div>
-  </div>
+  <ld-gallery :items="orderedItems()" :noresult="$t('directory.no-results')" />
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
-import Tools from "@/tools";
+import Navigation from "@/services/navigation";
 
 @Component
 export default class GalleryDirectory extends Vue {
@@ -39,8 +33,8 @@ export default class GalleryDirectory extends Vue {
     this.$uiStore.fullscreen = false;
   }
 
-  get orderedItems() {
-    return Tools.directoriesFirst(this.directory.properties.items);
+  orderedItems() {
+    return Navigation.directoriesFirst(this.directory.properties.items);
   }
 }
 </script>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
new file mode 100644
index 0000000..e09b292
--- /dev/null
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -0,0 +1,63 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <div>
+    <gallery-search v-if="query.length" :path="path" :query="query" />
+    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
+    <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
+    <div v-else>{{$t("gallery.unknowntype")}}</div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop, Watch } from "vue-property-decorator";
+import { Operation } from "@/@types/Operation";
+import Navigation from "@/services/navigation";
+import GalleryDirectory from "./GalleryDirectory.vue";
+import GallerySearch from "@/views/GallerySearch.vue";
+
+@Component({
+  components: {
+    GalleryDirectory,
+    GallerySearch,
+  },
+})
+export default class GalleryNavigation extends Vue {
+  @Prop(String) readonly path!: string;
+  @Prop(Array) readonly query!: string[];
+
+  mounted() {
+    this.pathChanged();
+  }
+
+  @Watch("path")
+  pathChanged() {
+    console.log("Path: ", this.path);
+    this.$galleryStore.setCurrentPath(this.path);
+  }
+
+  private checkType(type: Gallery.ItemType): boolean {
+    return Navigation.checkType(this.$galleryStore.currentItem, type);
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index 97c5c66..eacbcdd 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -18,25 +18,41 @@
 -->
 
 <template>
-  <div class="thumbnail-tiles">
-    <div v-for="(item) in items" :key="item.path">
-      <router-link :to="item.path" @click.native="$uiStore.setModeNavigation()">
-        <ld-thumbnail :item="item" />
-      </router-link>
-    </div>
-    <div v-if="items.length===0">{{$t('search.no-results')}}</div>
-  </div>
+  <ld-gallery :items="items()" :noresult="$t('search.no-results')" />
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Component, Vue, Prop, Watch } from "vue-property-decorator";
+import { Operation } from "@/@types/Operation";
+import IndexSearch from "@/services/indexsearch";
+import IndexFactory from "../services/indexfactory";
 
 @Component
 export default class GalleryPicture extends Vue {
-  @Prop({ required: true }) readonly items!: Gallery.Item[];
+  @Prop(String) readonly path!: string;
+  @Prop(Array) readonly query!: string[];
+
+  currentSearch: Tag.Search[] = [];
 
   mounted() {
     this.$uiStore.fullscreen = false;
+    this.$uiStore.searchMode = true;
+    this.restoreSearchFilters();
+  }
+
+  destroyed() {
+    this.$uiStore.searchMode = false;
+  }
+
+  items() {
+    return IndexSearch.search(this.currentSearch, this.path);
+  }
+
+  @Watch("query")
+  restoreSearchFilters() {
+    const tagsIndex = this.$galleryStore.tagsIndex;
+    this.currentSearch = this.query.flatMap(filter => IndexFactory.searchTags(tagsIndex, filter));
+    this.$uiStore.searchFilters = [...this.currentSearch];
   }
 }
 </script>
diff --git a/viewer/src/views/MainGallery.vue b/viewer/src/views/MainGallery.vue
deleted file mode 100644
index 5767cce..0000000
--- a/viewer/src/views/MainGallery.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- ldgallery - A static generator which turns a collection of tagged
---             pictures into a searchable web gallery.
---
--- Copyright (C) 2019-2020  Guillaume FOUET
---
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU Affero General Public License as
--- published by the Free Software Foundation, either version 3 of the
--- License, or (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU Affero General Public License for more details.
---
--- You should have received a copy of the GNU Affero General Public License
--- along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<template>
-  <div>
-    <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" />
-    <gallery-directory v-else-if="checkType('directory')" :directory="$galleryStore.currentItem" />
-    <ld-picture v-else-if="checkType('picture')" :picture="$galleryStore.currentItem" />
-    <div v-else>{{$t("gallery.unknowntype")}}</div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Operation } from "@/@types/Operation";
-import Tools from "@/tools";
-import GallerySearch from "./GallerySearch.vue";
-import GalleryDirectory from "./GalleryDirectory.vue";
-
-@Component({
-  components: {
-    GallerySearch,
-    GalleryDirectory,
-  },
-})
-export default class Gallery extends Vue {
-  @Prop(String) readonly pathMatch!: string;
-
-  mounted() {
-    this.pathChanged();
-  }
-
-  @Watch("pathMatch")
-  pathChanged() {
-    console.log("Path: ", this.pathMatch);
-    this.$galleryStore.setCurrentPath(this.pathMatch);
-  }
-
-  // Results of the search (by tags)
-  get currentSearch(): Gallery.Item[] {
-    const byOperation = this.extractTagsByOperation(this.$uiStore.currentTags);
-    const intersection = this.extractIntersection(byOperation);
-    const substraction = this.extractSubstraction(byOperation);
-    return this.aggregateAll(byOperation, intersection, substraction);
-  }
-
-  // ---
-
-  private checkType(type: Gallery.ItemType): boolean {
-    return Tools.checkType(this.$galleryStore.currentItem, type);
-  }
-
-  private extractTagsByOperation(currentTags: Tag.Search[]): Tag.SearchByOperation {
-    let byOperation: Tag.SearchByOperation = {};
-    Object.values(Operation).forEach(
-      operation => (byOperation[operation] = currentTags.filter(tag => tag.operation === operation))
-    );
-    return byOperation;
-  }
-
-  private extractIntersection(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let intersection = new Set<Gallery.Item>();
-    if (byOperation[Operation.INTERSECTION].length > 0) {
-      byOperation[Operation.INTERSECTION]
-        .map(tag => tag.items)
-        .reduce((a, b) => a.filter(c => b.includes(c)))
-        .flatMap(items => items)
-        .forEach(item => intersection.add(item));
-    }
-    return intersection;
-  }
-
-  private extractSubstraction(byOperation: Tag.SearchByOperation): Set<Gallery.Item> {
-    let substraction = new Set<Gallery.Item>();
-    if (byOperation[Operation.SUBSTRACTION].length > 0) {
-      byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item));
-    }
-    return substraction;
-  }
-
-  private aggregateAll(
-    byOperation: Tag.SearchByOperation,
-    intersection: Set<Gallery.Item>,
-    substraction: Set<Gallery.Item>
-  ): Gallery.Item[] {
-    byOperation[Operation.ADDITION].flatMap(tag => tag.items).forEach(item => intersection.add(item));
-    substraction.forEach(item => intersection.delete(item));
-    return [...intersection];
-  }
-}
-</script>
-
-<style lang="scss">
-</style>
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 63a1b83..272c045 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -24,10 +24,6 @@
     <router-view v-if="!isLoading" ref="content" class="layout layout-content scrollbar" />
     <b-loading :active="isLoading" is-full-page />
     <ld-key-press :keycode="27" @action="$uiStore.fullscreen=false" />
-
-    <!-- TODO: Remove when #21 (remove explicit navigation/search modes) is resolved -->
-    <ld-mode-radio v-if="!isLoading" class="tmp-mode-selector" />
-    <!-- ===== -->
   </div>
 </template>
 
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index a61fe4a..fd117a6 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -19,17 +19,45 @@
 
 <template>
   <div class="flex-column sidebar">
-    <ld-tag-input />
+    <ld-tag-input v-model="$uiStore.searchFilters" :tags-index="$galleryStore.tagsIndex" />
+    <ld-command-search @clear="clear" @search="search" />
     <h1 class="title">{{$t('panelLeft.propositions')}}</h1>
-    <ld-proposition class="scrollbar no-scroll-x" />
+    <ld-proposition
+      v-model="$uiStore.searchFilters"
+      :tags-index="$galleryStore.tagsIndex"
+      :current-tags="currentTags()"
+      class="scrollbar no-scroll-x"
+    />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import { Dictionary } from "vue-router/types/router";
 
 @Component
-export default class PanelLeft extends Vue {}
+export default class PanelLeft extends Vue {
+  clear() {
+    this.$uiStore.searchFilters = [];
+    this.search();
+  }
+
+  search() {
+    this.$router.push({ query: this.serializeSearch() }).catch(err => {
+      if (err.name !== "NavigationDuplicated") throw err;
+    });
+  }
+
+  serializeSearch() {
+    let query: Dictionary<null> = {};
+    this.$uiStore.searchFilters.forEach(filter => (query[filter.display] = null));
+    return query;
+  }
+
+  currentTags() {
+    return this.$galleryStore.currentItem?.tags ?? [];
+  }
+}
 </script>
 
 <style lang="scss">
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index 60722cd..0591f37 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -19,8 +19,11 @@
 
 <template>
   <div class="flex">
-    <ld-command />
-    <ld-breadcrumb />
+    <ld-command :current-item-path="$galleryStore.currentItemPath" />
+    <ld-breadcrumb
+      :current-item-path="$galleryStore.currentItemPath"
+      :search-mode="$uiStore.searchMode"
+    />
   </div>
 </template>
 
-- 
cgit v1.2.3