Merge pull request #302 from ldgallery/oz-types-normalization

viewer: types normalization

17 files changed, 59 insertions, 46 deletions

diff --git a/viewer/src/components/LdBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue
index 618b15a..2c17554 100644
--- a/viewer/src/components/LdBreadcrumb.vue
+++ b/viewer/src/components/LdBreadcrumb.vue
@@ -47,13 +47,14 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Ref, Watch, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import DragScrollClickFix from "@/services/dragscrollclickfix";
 import Navigation from "@/services/navigation";
+import { Component, Prop, Ref, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdBreadcrumb extends Vue {
-  @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly currentItemPath!: Item[];
   @Prop(Boolean) readonly searchMode!: boolean;
   @Ref() readonly breadcrumb!: HTMLUListElement;
 
@@ -82,7 +83,7 @@ export default class LdBreadcrumb extends Vue {
     });
   }
 
-  getIcon(item: Gallery.Item) {
+  getIcon(item: Item) {
     return Navigation.getIcon(item);
   }
 }
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index 5ba8266..7ffa670 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -40,12 +40,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue } from "vue-property-decorator";
 import { RawLocation } from "vue-router";
 
 @Component
 export default class LdCommand extends Vue {
-  @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly currentItemPath!: Item[];
 
   get commandToggleSearchPanelIcon(): string {
     return this.$uiStore.fullWidth ? "search" : "angle-double-left";
diff --git a/viewer/src/components/LdCommandSort.vue b/viewer/src/components/LdCommandSort.vue
index 4c246e6..c8a822e 100644
--- a/viewer/src/components/LdCommandSort.vue
+++ b/viewer/src/components/LdCommandSort.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
 import ItemComparators, { ItemSort } from "@/services/itemComparators";
+import { Component, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdCommandSort extends Vue {
diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index edd479c..1443927 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -27,12 +27,12 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Model } from "vue-property-decorator";
-import DragScrollClickFix from "@/services/dragscrollclickfix";
+import { Item } from "@/@types/gallery";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdPicture extends Vue {
-  @Prop({ type: Array, required: true }) readonly items!: Gallery.Item[];
+  @Prop({ type: Array, required: true }) readonly items!: Item[];
   @Prop(String) readonly noresult?: string;
 
   get sortedItems() {
diff --git a/viewer/src/components/LdInformation.vue b/viewer/src/components/LdInformation.vue
index 66ccc80..b161485 100644
--- a/viewer/src/components/LdInformation.vue
+++ b/viewer/src/components/LdInformation.vue
@@ -26,12 +26,13 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop } from "vue-property-decorator";
+import { Item } from "@/@types/gallery";
 import marked from "marked";
+import { Component, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdInformation extends Vue {
-  @Prop({ required: true }) readonly item!: Gallery.Item;
+  @Prop({ required: true }) readonly item!: Item;
 
   get formatDate() {
     const date = this.item.datetime.substr(0, 10);
diff --git a/viewer/src/components/LdKeyPress.vue b/viewer/src/components/LdKeyPress.vue
index c507b33..151d6c6 100644
--- a/viewer/src/components/LdKeyPress.vue
+++ b/viewer/src/components/LdKeyPress.vue
@@ -18,7 +18,7 @@
 -->
 
 <script lang="ts">
-import { Component, Vue, Prop, Emit } from "vue-property-decorator";
+import { Component, Emit, Prop, Vue } from "vue-property-decorator";
 
 @Component
 export default class LdKeyPress extends Vue {
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index aa44943..088e249 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -54,16 +54,18 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, PropSync, Watch } from "vue-property-decorator";
+import { Item, RawTag } from "@/@types/gallery";
 import { Operation } from "@/@types/Operation";
+import { TagIndex, TagNode, TagSearch } from "@/@types/tag";
+import { Component, Prop, PropSync, Vue, Watch } from "vue-property-decorator";
 
 @Component
 export default class LdProposition extends Vue {
-  @Prop() readonly category?: Tag.Node;
+  @Prop() readonly category?: TagNode;
   @Prop({ type: Boolean, required: true }) readonly showCategory!: boolean;
   @Prop({ type: Array, required: true }) readonly currentTags!: string[];
-  @Prop({ required: true }) readonly tagsIndex!: Tag.Index;
-  @PropSync("searchFilters", { type: Array, required: true }) model!: Tag.Search[];
+  @Prop({ required: true }) readonly tagsIndex!: TagIndex;
+  @PropSync("searchFilters", { type: Array, required: true }) model!: TagSearch[];
 
   readonly INITIAL_TAG_DISPLAY_LIMIT = this.getInitialTagDisplayLimit();
 
@@ -118,16 +120,16 @@ export default class LdProposition extends Vue {
     return this.category?.tag ?? this.$t("panelLeft.propositions.other");
   }
 
-  extractDistinctItems(currentTags: Tag.Search[]): Gallery.Item[] {
+  extractDistinctItems(currentTags: TagSearch[]): Item[] {
     return [...new Set(currentTags.flatMap(tag => tag.items))];
   }
 
-  rightmost(tag: Gallery.RawTag): Gallery.RawTag {
+  rightmost(tag: RawTag): RawTag {
     const dot = tag.lastIndexOf(":");
     return dot <= 0 ? tag : tag.substr(dot + 1);
   }
 
-  add(operation: Operation, rawTag: Gallery.RawTag) {
+  add(operation: Operation, rawTag: RawTag) {
     const node = this.tagsIndex[rawTag];
     const display = this.category ? `${operation}${this.category.tag}:${node.tag}` : `${operation}${node.tag}`;
     this.model.push({ ...node, parent: this.category, operation, display });
diff --git a/viewer/src/components/LdTagInput.vue b/viewer/src/components/LdTagInput.vue
index ce83ba8..855813a 100644
--- a/viewer/src/components/LdTagInput.vue
+++ b/viewer/src/components/LdTagInput.vue
@@ -40,24 +40,23 @@
 </template>