Merge branch 'develop' for release v2.0v2.0

1 files changed, 19 insertions, 7 deletions

diff --git a/viewer/src/services/indexfactory.ts b/viewer/src/services/indexfactory.ts
index e402185..4b28a60 100644
--- a/viewer/src/services/indexfactory.ts
+++ b/viewer/src/services/indexfactory.ts
@@ -18,19 +18,19 @@
 */
 
 import { Operation } from "@/@types/Operation";
+import { ItemType } from "@/@types/ItemType";
 import Navigation from "@/services/navigation";
 
 export default class IndexFactory {
-
   public static generateTags(root: Gallery.Item | null): Tag.Index {
-    let tagsIndex: Tag.Index = {};
+    const tagsIndex: Tag.Index = {};
     if (root) IndexFactory.pushTagsForItem(tagsIndex, root);
     return tagsIndex;
   }
 
   // Pushes all tags for a root item (and its children) to the index
   private static pushTagsForItem(tagsIndex: Tag.Index, item: Gallery.Item): void {
-    if (item.properties.type === "directory") {
+    if (item.properties.type === ItemType.DIRECTORY) {
       item.properties.items.forEach(item => this.pushTagsForItem(tagsIndex, item));
       return; // Directories are not indexed
     }
@@ -50,7 +50,15 @@ export default class IndexFactory {
   }
 
   private static pushPartToIndex(index: Tag.Node, part: string, item: Gallery.Item, rootPart: boolean): Tag.Node {
-    if (!index) index = { tag: part, tagfiltered: Navigation.normalize(part), rootPart, childPart: !rootPart, items: [], children: {} };
+    if (!index)
+      index = {
+        tag: part,
+        tagfiltered: Navigation.normalize(part),
+        rootPart,
+        childPart: !rootPart,
+        items: [],
+        children: {},
+      };
     else if (rootPart) index.rootPart = true;
     else index.childPart = true;
 
@@ -60,7 +68,6 @@ export default class IndexFactory {
 
   // ---
 
-
   public static searchTags(tagsIndex: Tag.Index, filter: string, strict: boolean): Tag.Search[] {
     let search: Tag.Search[] = [];
     if (tagsIndex && filter) {
@@ -105,7 +112,12 @@ export default class IndexFactory {
       );
   }
 
-  private static searchTagsFromFilter(tagsIndex: Tag.Index, operation: Operation, filter: string, strict: boolean): Tag.Search[] {
+  private static searchTagsFromFilter(
+    tagsIndex: Tag.Index,
+    operation: Operation,
+    filter: string,
+    strict: boolean
+  ): Tag.Search[] {
     filter = Navigation.normalize(filter);
     return Object.values(tagsIndex)
       .filter(node => IndexFactory.matches(node, filter, strict))
@@ -114,7 +126,7 @@ export default class IndexFactory {
 
   private static matches(node: Tag.Node, filter: string, strict: boolean): boolean {
     if (strict) return node.tagfiltered === filter;
-    return node.tagfiltered.includes(filter)
+    return node.tagfiltered.includes(filter);
   }
 
   // ---