viewer: directories first and sorted by title in the navigation mode

5 files changed, 49 insertions, 15 deletions

diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery/index.d.ts
index 25407e8..b112b6d 100644
--- a/viewer/src/@types/gallery/index.d.ts
+++ b/viewer/src/@types/gallery/index.d.ts
@@ -18,6 +18,9 @@
 */
 
 declare namespace Gallery {
+    interface Other extends Item {
+        properties: OtherProperties,
+    }
     interface Picture extends Item {
         properties: PictureProperties,
     }
@@ -31,7 +34,10 @@ declare namespace Gallery {
         tags: RawTag[],
         path: string,
         thumbnail?: string,
-        properties: PictureProperties | DirectoryProperties,
+        properties: OtherProperties | PictureProperties | DirectoryProperties,
+    }
+    interface OtherProperties {
+        type: "other",
     }
     interface PictureProperties {
         type: "picture",
@@ -42,4 +48,5 @@ declare namespace Gallery {
         items: Item[]
     }
     type RawTag = string;
+    type ItemType = "other" | "picture" | "directory";
 }
\ No newline at end of file
diff --git a/viewer/src/router/index.ts b/viewer/src/router/index.ts
index 55b4b6c..0f3d2c7 100644
--- a/viewer/src/router/index.ts
+++ b/viewer/src/router/index.ts
@@ -19,7 +19,7 @@
 
 import Vue from "vue";
 import VueRouter from "vue-router";
-import Gallery from "@/views/Gallery.vue";
+import Gallery from "@/views/MainGallery.vue";
 
 Vue.use(VueRouter);
 
diff --git a/viewer/src/tools.ts b/viewer/src/tools.ts
index 5eb287e..57a889d 100644
--- a/viewer/src/tools.ts
+++ b/viewer/src/tools.ts
@@ -27,4 +27,21 @@ export default class Tools {
       .toLowerCase();
   }
 
+
+  public static checkType(item: Gallery.Item | null, type: Gallery.ItemType): boolean {
+    return item?.properties.type === type ?? false;
+  }
+
+  public static directoriesFirst(items: Gallery.Item[]) {
+    return [
+      ...items
+        .filter(child => Tools.checkType(child, "directory"))
+        .sort((a, b) => a.title.localeCompare(b.title)),
+
+      ...items
+        .filter(child => !Tools.checkType(child, "directory")),
+    ];
+  }
+
+
 }
\ No newline at end of file
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index 1df0c4d..d01032d 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -19,7 +19,7 @@
 
 <template>
   <div class="thumbnail-tiles">
-    <div v-for="(item) in directory.properties.items" :key="item.path">
+    <div v-for="(item) in orderedItems" :key="item.path">
       <router-link :to="item.path">
         <gallery-thumbnail :item="item" />
       </router-link>
@@ -32,13 +32,19 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import Tools from "@/tools";
 import GalleryThumbnail from "./GalleryThumbnail.vue";
+import Gallery from "./Gallery.vue";
 
 @Component({
   components: { GalleryThumbnail },
 })
 export default class GalleryDirectory extends Vue {
   @Prop({ required: true }) readonly directory!: Gallery.Directory;
+
+  get orderedItems() {
+    return Tools.directoriesFirst(this.directory.properties.items);
+  }
 }
 </script>
 
diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/MainGallery.vue
index fad7cc3..06cf512 100644
--- a/viewer/src/views/Gallery.vue
+++ b/viewer/src/views/MainGallery.vue
@@ -28,7 +28,8 @@
 
 <script lang="ts">
 import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import { Operation } from '@/@types/tag/Operation';
+import { Operation } from "@/@types/tag/Operation";
+import Tools from "@/tools";
 import GallerySearch from "./GallerySearch.vue";
 import GalleryDirectory from "./GalleryDirectory.vue";
 import GalleryPicture from "./GalleryPicture.vue";
@@ -40,7 +41,7 @@ export default class Gallery extends Vue {
   @Prop(String) readonly pathMatch!: string;
 
   mounted() {
-    this.pathChanged()
+    this.pathChanged();
   }
 
   @Watch("pathMatch")
@@ -59,14 +60,15 @@ export default class Gallery extends Vue {
 
   // ---
 
-  private checkType(type: string): boolean {
-    return this.$galleryStore.currentItem?.properties.type === type ?? false;
+  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));
+    Object.values(Operation).forEach(
+      operation => (byOperation[operation] = currentTags.filter(tag => tag.operation === operation))
+    );
     return byOperation;
   }
 
@@ -75,8 +77,8 @@ export default class Gallery extends Vue {
     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)
+        .reduce((a, b) => a.filter(c => b.includes(c)))
+        .flatMap(items => items)
         .forEach(item => intersection.add(item));
     }
     return intersection;
@@ -85,14 +87,16 @@ export default class Gallery extends Vue {
   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));
+      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[] {
+  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];