From 69dc0d20706ed41e5ecdbb77515066d8a7d7703b Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 19 Jun 2020 22:12:03 +0200
Subject: viewer: code update (no functional change)

Types { [x: T]: R } updated to Record<T, R>
Methods in template updated to getters (computed in VueJS), which are reactive and cached
Code formatting
---
 viewer/src/@types/scrollposition.d.ts       |  2 +-
 viewer/src/@types/tag.d.ts                  |  4 ++--
 viewer/src/components/LdAudioViewer.vue     | 16 +++++++++-------
 viewer/src/components/LdCommand.vue         | 16 ++++++++--------
 viewer/src/components/LdDownload.vue        | 11 ++++++-----
 viewer/src/components/LdGallery.vue         |  4 ++--
 viewer/src/components/LdPdfViewer.vue       |  8 ++++----
 viewer/src/components/LdPlainTextViewer.vue |  9 +++++----
 viewer/src/components/LdProposition.vue     |  2 +-
 viewer/src/components/LdThumbnail.vue       |  8 ++++----
 viewer/src/components/LdVideoViewer.vue     | 20 ++++++++++++--------
 viewer/src/views/GalleryDirectory.vue       |  4 ++--
 viewer/src/views/GallerySearch.vue          |  6 +++---
 viewer/src/views/PanelLeft.vue              |  4 ++--
 14 files changed, 61 insertions(+), 53 deletions(-)

(limited to 'viewer/src')

diff --git a/viewer/src/@types/scrollposition.d.ts b/viewer/src/@types/scrollposition.d.ts
index b2147fa..cd393b3 100644
--- a/viewer/src/@types/scrollposition.d.ts
+++ b/viewer/src/@types/scrollposition.d.ts
@@ -17,4 +17,4 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-type ScrollPosition = { [index: string]: number }
+type ScrollPosition = Record<string, number>
diff --git a/viewer/src/@types/tag.d.ts b/viewer/src/@types/tag.d.ts
index 76f1207..59ae779 100644
--- a/viewer/src/@types/tag.d.ts
+++ b/viewer/src/@types/tag.d.ts
@@ -31,8 +31,8 @@ declare namespace Tag {
     operation: string; // Enum Operation
     display: string;
   }
-  type SearchByOperation = { [index: string]: Tag.Search[] };
-  type Index = { [index: string]: Node };
+  type SearchByOperation = Record<string, Tag.Search[]>;
+  type Index = Record<string, Node>;
 
   interface Category {
     tag: string;
diff --git a/viewer/src/components/LdAudioViewer.vue b/viewer/src/components/LdAudioViewer.vue
index d115a34..739d36a 100644
--- a/viewer/src/components/LdAudioViewer.vue
+++ b/viewer/src/components/LdAudioViewer.vue
@@ -21,10 +21,11 @@
 <template>
   <div class="flex-column container-vh-centering">
     <ld-thumbnail :item="audioItem" />
-    <audio :class="$style.player" :src="itemResourceUrl()" preload="auto" controls>
-      <a :download="itemFileName()" :href="itemResourceUrl()">
-        {{ $t("download.download-file-fmt", [itemFileName()]) }}
-      </a>
+    <audio :class="$style.player" :src="itemResourceUrl" preload="auto" controls>
+      <a
+        :download="itemFileName"
+        :href="itemResourceUrl"
+      >{{ $t("download.download-file-fmt", [itemFileName]) }}</a>
     </audio>
   </div>
 </template>
@@ -33,14 +34,15 @@
 import { Component, Prop, Vue } from "vue-property-decorator";
 import Navigation from "@/services/navigation";
 
-@Component export default class LdAudioViewer extends Vue {
+@Component
+export default class LdAudioViewer extends Vue {
   @Prop({ required: true }) readonly audioItem!: Gallery.Audio;
 
-  itemResourceUrl(): string {
+  get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.audioItem.properties.resource;
   }
 
-  itemFileName(): string {
+  get itemFileName(): string {
     return Navigation.getFileName(this.audioItem);
   }
 }
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index d961519..49d86bb 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -21,17 +21,17 @@
 <template>
   <div class="flex command-btns">
     <a class="link" :title="$t('command.search')" @click="$uiStore.toggleFullWidth()">
-      <fa-icon :icon="commandToggleSearchPanelIcon()" size="lg" />
+      <fa-icon :icon="commandToggleSearchPanelIcon" size="lg" />
     </a>
     <a
-      :class="{'disabled': isEntryPoint()}"
+      :class="{'disabled': isEntryPoint}"
       class="link command-secondary"
       :title="$t('command.back')"
-      @click="isEntryPoint() || $router.back()"
+      @click="isEntryPoint || $router.back()"
     >
       <fa-icon icon="arrow-left" size="lg" />
     </a>
-    <router-link :class="{'disabled': isRoot()}" :title="$t('command.parent')" :to="parent()">
+    <router-link :class="{'disabled': isRoot}" :title="$t('command.parent')" :to="parent">
       <fa-icon icon="folder" size="xs" />
       <fa-icon icon="level-up-alt" size="lg" />
     </router-link>
@@ -46,19 +46,19 @@ import { RawLocation } from "vue-router";
 export default class LdCommand extends Vue {
   @Prop({ type: Array, required: true }) readonly currentItemPath!: Gallery.Item[];
 
-  commandToggleSearchPanelIcon(): string {
+  get commandToggleSearchPanelIcon(): string {
     return this.$uiStore.fullWidth ? "search" : "angle-double-left";
   }
 
-  isRoot(): boolean {
+  get isRoot(): boolean {
     return this.currentItemPath.length <= 1 && !this.$uiStore.searchMode;
   }
 
-  isEntryPoint(): boolean {
+  get isEntryPoint(): boolean {
     return history.state?.ldgallery === "ENTRYPOINT"; // Set by MainLayout.vue
   }
 
-  parent(): RawLocation {
+  get parent(): RawLocation {
     if (this.$uiStore.searchMode) return this.$route.path;
     if (this.currentItemPath.length > 1) return this.currentItemPath[this.currentItemPath.length - 2];
     return "";
diff --git a/viewer/src/components/LdDownload.vue b/viewer/src/components/LdDownload.vue
index d7dfb7d..7b09dab 100644
--- a/viewer/src/components/LdDownload.vue
+++ b/viewer/src/components/LdDownload.vue
@@ -20,10 +20,10 @@
 
 <template>
   <div class="container-vh-centering">
-    <a :class="$style.content" :download="itemFileName()" :href="itemDownloadUrl()">
+    <a :class="$style.content" :download="itemFileName" :href="itemDownloadUrl">
       <!-- TODO: show thumbnail instead of this generic file download icon? -->
       <fa-icon :class="$style.icon" icon="file-download" size="6x" />
-      <div>{{ $t("download.download-file-fmt", [itemFileName()]) }}</div>
+      <div>{{ $t("download.download-file-fmt", [itemFileName]) }}</div>
     </a>
   </div>
 </template>
@@ -32,14 +32,15 @@
 import { Component, Prop, Vue } from "vue-property-decorator";
 import Navigation from "@/services/navigation";
 
-@Component export default class LdDownload extends Vue {
+@Component
+export default class LdDownload extends Vue {
   @Prop({ required: true }) readonly item!: Gallery.Other;
 
-  itemFileName(): string {
+  get itemFileName(): string {
     return Navigation.getFileName(this.item);
   }
 
-  itemDownloadUrl(): string {
+  get itemDownloadUrl(): string {
     return this.$galleryStore.resourceRoot + this.item.properties.resource;
   }
 }
diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index e512758..5a72d99 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <ld-error v-if="hasNoResults()" icon="search" :message="noresult" />
+  <ld-error v-if="hasNoResults" icon="search" :message="noresult" />
   <div v-else class="thumbnail-tiles">
     <router-link v-for="item in items" :key="item.path" :to="item.path">
       <ld-thumbnail :item="item" />
@@ -35,7 +35,7 @@ export default class LdPicture extends Vue {
   @Prop({ type: Array, required: true }) readonly items!: Gallery.Item[];
   @Prop(String) readonly noresult?: string;
 
-  hasNoResults(): boolean {
+  get hasNoResults(): boolean {
     return Boolean(this.noresult) && this.items.length === 0;
   }
 }
diff --git a/viewer/src/components/LdPdfViewer.vue b/viewer/src/components/LdPdfViewer.vue
index 20055cc..b1f6c64 100644
--- a/viewer/src/components/LdPdfViewer.vue
+++ b/viewer/src/components/LdPdfViewer.vue
@@ -22,7 +22,7 @@
   <!-- intermediate container necessary to eliminate the double scrollbar -->
   <div class="fill no-scroll">
     <!-- prefer native browser PDF viewer if available -->
-    <object class="fill" :data="itemResourceUrl()" type="application/pdf">
+    <object class="fill" :data="itemResourceUrl" type="application/pdf">
       <!-- TODO: fallback to PDF.js (https://github.com/pacien/ldgallery/issues/212) -->
       <ld-download :item="pdfItem" />
     </object>
@@ -32,15 +32,15 @@
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
 
-@Component export default class LdPdfViewer extends Vue {
+@Component
+export default class LdPdfViewer extends Vue {
   @Prop({ required: true }) readonly pdfItem!: Gallery.PDF;
 
-  itemResourceUrl(): string {
+  get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.pdfItem.properties.resource;
   }
 }
 </script>
 
 <style lang="scss" module>
-
 </style>
diff --git a/viewer/src/components/LdPlainTextViewer.vue b/viewer/src/components/LdPlainTextViewer.vue
index 101fd4c..5c32470 100644
--- a/viewer/src/components/LdPlainTextViewer.vue
+++ b/viewer/src/components/LdPlainTextViewer.vue
@@ -22,17 +22,18 @@
   <!-- Outer div necessary for the resize handle to appear on Firefox. -->
   <div :class="$style.content" class="fill">
     <!-- Using an iframe here to let the browser deal with content encoding detection. -->
-    <iframe class="fill" :src="itemResourceUrl()" />
+    <iframe class="fill" :src="itemResourceUrl" />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
 
-@Component export default class LdPlainTextViewer extends Vue {
+@Component
+export default class LdPlainTextViewer extends Vue {
   @Prop({ required: true }) readonly plainTextItem!: Gallery.PlainText;
 
-  itemResourceUrl(): string {
+  get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.plainTextItem.properties.resource;
   }
 }
@@ -46,7 +47,7 @@ import { Component, Prop, Vue } from "vue-property-decorator";
   resize: horizontal;
   max-width: 100%; // Forbid overflow when resizing.
   overflow: hidden; // Necessary for the resize handle to be shown in Chromium.
-  padding: .5em; // Necessary for the resize handle to be selectable on qutebrowser.
+  padding: 0.5em; // Necessary for the resize handle to be selectable on qutebrowser.
 
   // Re-normalise page colour.
   background-color: white;
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index fe3af07..1490689 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -66,7 +66,7 @@ export default class LdProposition extends Vue {
   }
 
   get proposedTags() {
-    let propositions: { [index: string]: number } = {};
+    let propositions: Record<string, number> = {};
     if (this.model.length > 0) {
       // Tags count from current search
       this.extractDistinctItems(this.model)
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue
index bfcc595..0ddeb6b 100644
--- a/viewer/src/components/LdThumbnail.vue
+++ b/viewer/src/components/LdThumbnail.vue
@@ -22,14 +22,14 @@
     <v-lazy-image
       v-if="item.thumbnail"
       :src="pictureSrc(item.thumbnail.resource)"
-      :style="pictureStyle()"
+      :style="pictureStyle"
       :title="item.title"
       @intersect="loading=true"
       @load="loading=false"
     />
     <div v-else class="thumbnail-other flex-column flex-center">
       <div>
-        <fa-icon :icon="getIcon()" size="4x" />
+        <fa-icon :icon="icon" size="4x" />
       </div>
       {{item.title}}
     </div>
@@ -50,12 +50,12 @@ export default class LdThumbnail extends Vue {
     return this.$galleryStore.resourceRoot + resource;
   }
 
-  pictureStyle() {
+  get pictureStyle() {
     const resolution = this.item.thumbnail!.resolution;
     return { width: `${resolution.width}px`, height: `${resolution.height}px` };
   }
 
-  getIcon() {
+  get icon() {
     return Navigation.getIcon(this.item);
   }
 }
diff --git a/viewer/src/components/LdVideoViewer.vue b/viewer/src/components/LdVideoViewer.vue
index 49f687f..b7a7c35 100644
--- a/viewer/src/components/LdVideoViewer.vue
+++ b/viewer/src/components/LdVideoViewer.vue
@@ -21,7 +21,13 @@
 <template>
   <!-- intermediate container necessary to eliminate the scrollbar -->
   <div class="fill no-scroll">
-    <video class="fill" :src="itemResourceUrl()" :poster="thumbnailResourceUrl()" preload="auto" controls>
+    <video
+      class="fill"
+      :src="itemResourceUrl"
+      :poster="thumbnailResourceUrl"
+      preload="auto"
+      controls
+    >
       <ld-download :item="videoItem" />
     </video>
   </div>
@@ -30,21 +36,19 @@
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
 
-@Component export default class LdVideoViewer extends Vue {
+@Component
+export default class LdVideoViewer extends Vue {
   @Prop({ required: true }) readonly videoItem!: Gallery.Video;
 
-  itemResourceUrl(): string {
+  get itemResourceUrl(): string {
     return this.$galleryStore.resourceRoot + this.videoItem.properties.resource;
   }
 
-  thumbnailResourceUrl(): string {
-    return this.videoItem.thumbnail
-      ? this.$galleryStore.resourceRoot + this.videoItem.thumbnail.resource
-      : "";
+  get thumbnailResourceUrl(): string {
+    return this.videoItem.thumbnail ? this.$galleryStore.resourceRoot + this.videoItem.thumbnail.resource : "";
   }
 }
 </script>
 
 <style lang="scss" module>
-
 </style>
diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue
index 30f651c..bfe484e 100644
--- a/viewer/src/views/GalleryDirectory.vue
+++ b/viewer/src/views/GalleryDirectory.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <ld-gallery :items="orderedItems()" :noresult="$t('directory.no-results')" />
+  <ld-gallery :items="orderedItems" :noresult="$t('directory.no-results')" />
 </template>
 
 <script lang="ts">
@@ -33,7 +33,7 @@ export default class GalleryDirectory extends Vue {
     this.$uiStore.toggleFullscreen(false);
   }
 
-  orderedItems() {
+  get orderedItems() {
     return Navigation.directoriesFirst(this.directory.properties.items);
   }
 }
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index dfaa5d3..4b98cea 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <ld-gallery :items="items()" :noresult="noResult()" />
+  <ld-gallery :items="items" :noresult="noResult" />
 </template>
 
 <script lang="ts">
@@ -41,14 +41,14 @@ export default class GalleryPicture extends Vue {
     this.$galleryStore.setCurrentSearch([]);
   }
 
-  items() {
+  get items() {
     const searchResult = IndexSearch.search(this.$galleryStore.currentSearch);
     const filteredByPath = searchResult.filter(item => item.path.startsWith(this.path));
     this.otherCount = searchResult.length - filteredByPath.length;
     return filteredByPath;
   }
 
-  noResult() {
+  get noResult() {
     return this.$tc("search.no-result-fmt", this.otherCount, [this.otherCount]);
   }
 }
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index e3821a8..1d49648 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -34,7 +34,7 @@
         :show-category="$galleryStore.tagsCategories.length > 1"
         :search-filters.sync="searchFilters"
         :tags-index="category.index"
-        :current-tags="currentTags()"
+        :current-tags="currentTags"
       />
     </div>
   </div>
@@ -72,7 +72,7 @@ export default class PanelLeft extends Vue {
     return query;
   }
 
-  currentTags() {
+  get currentTags() {
     return this.$galleryStore.currentItem?.tags ?? [];
   }
 
-- 
cgit v1.2.3