2 files changed, 24 insertions, 63 deletions

diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
deleted file mode 100644
index bfe484e..0000000
--- a/viewer/src/views/GalleryDirectory.vue
+++ /dev/null
@@ -1,43 +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>
-  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
-import Navigation from "@/services/navigation";
-
-@Component
-export default class GalleryDirectory extends Vue {
-  @Prop({ required: true }) readonly directory!: Gallery.Directory;
-
-  mounted() {
-    this.$uiStore.toggleFullscreen(false);
-  }
-
-  get orderedItems() {
-    return Navigation.directoriesFirst(this.directory.properties.items);
-  }
-}
-</script>
-
-<style lang="scss">
-</style>
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index b141d44..843550f 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -18,23 +18,10 @@
 -->
 
 <template>
-  <!-- TODO: eliminate intermediate div -->
   <div>
-    <ld-error v-if="checkType(null)" icon="folder-open" :message="$t('gallery.unknown-resource')" />
-    <gallery-search v-else-if="checkType(ItemType.DIRECTORY) && query.length > 0" :path="path" />
-    <gallery-directory
-      v-else-if="checkType(ItemType.DIRECTORY)"
-      :directory="$galleryStore.currentItem"
-    />
-    <ld-picture v-else-if="checkType(ItemType.PICTURE)" :picture="$galleryStore.currentItem" />
-    <ld-plain-text-viewer
-      v-else-if="checkType(ItemType.PLAINTEXT)"
-      :plain-text-item="$galleryStore.currentItem"
-    />
-    <ld-pdf-viewer v-else-if="checkType(ItemType.PDF)" :pdf-item="$galleryStore.currentItem" />
-    <ld-video-viewer v-else-if="checkType(ItemType.VIDEO)" :video-item="$galleryStore.currentItem" />
-    <ld-audio-viewer v-else-if="checkType(ItemType.AUDIO)" :audio-item="$galleryStore.currentItem" />
-    <ld-download v-else :item="$galleryStore.currentItem" />
+    <ld-error v-if="isError" icon="folder-open" :message="$t('gallery.unknown-resource')" />
+    <gallery-search v-else-if="isSearch" :path="path" />
+    <component :is="componentName" v-else :item="$galleryStore.currentItem" />
   </div>
 </template>
 
@@ -42,12 +29,10 @@
 import { Component, Vue, Prop, Watch } from "vue-property-decorator";
 import { ItemType } from "@/@types/ItemType";
 import Navigation from "@/services/navigation";
-import GalleryDirectory from "./GalleryDirectory.vue";
 import GallerySearch from "@/views/GallerySearch.vue";
 
 @Component({
   components: {
-    GalleryDirectory,
     GallerySearch,
   },
 })
@@ -55,13 +40,32 @@ export default class GalleryNavigation extends Vue {
   @Prop(String) readonly path!: string;
   @Prop(Array) readonly query!: string[];
 
-  // For the template
-  readonly ItemType = Object.freeze(ItemType);
+  readonly COMPONENT_BY_TYPE: Record<ItemType, string> = {
+    directory: "ld-directory",
+    picture: "ld-picture",
+    plaintext: "ld-plain-text-viewer",
+    pdf: "ld-pdf-viewer",
+    video: "ld-video-viewer",
+    audio: "ld-audio-viewer",
+    other: "ld-download",
+  };
 
   mounted() {
     this.pathChanged();
   }
 
+  get isError() {
+    return this.checkType(null);
+  }
+
+  get isSearch() {
+    return this.checkType(ItemType.DIRECTORY) && this.query.length > 0;
+  }
+
+  get componentName() {
+    return this.COMPONENT_BY_TYPE[this.$galleryStore.currentItem?.properties.type ?? ItemType.OTHER];
+  }
+
   @Watch("path")
   pathChanged() {
     this.$galleryStore.setCurrentPath(this.path);