viewer: PR #238 code review changes

2 files changed, 12 insertions, 7 deletions

diff --git a/viewer/src/components/LdCommandSort.vue b/viewer/src/components/LdCommandSort.vue
index 1d2eac3..1eef5d3 100644
--- a/viewer/src/components/LdCommandSort.vue
+++ b/viewer/src/components/LdCommandSort.vue
@@ -25,7 +25,7 @@
     </a>
     <b-dropdown-item v-for="(sort, idx) in SORTS" :key="idx" :value="idx">
       <fa-icon :icon="['far', idx === selectedSort ? 'dot-circle' : 'circle']" />
-      <span :class="$style.ml1">{{ sort.name }}</span>
+      <span :class="$style.dropdownLabel">{{ sort.name }}</span>
     </b-dropdown-item>
   </b-dropdown>
 </template>
@@ -38,7 +38,7 @@ import ItemSortFn from "@/services/itemSortFn";
 @Component
 export default class LdCommandSort extends Vue {
   readonly SORTS = [
-    { name: this.$t("command.sort.byName"), fn: ItemSortFn.sortByName },
+    { name: this.$t("command.sort.byNameAsc"), fn: ItemSortFn.sortByNameAsc },
     { name: this.$t("command.sort.byDateDesc"), fn: ItemSortFn.sortByDateDesc },
   ];
 
@@ -51,7 +51,7 @@ export default class LdCommandSort extends Vue {
 </script>
 
 <style lang="scss" module>
-.ml1 {
+.dropdownLabel {
   margin-left: 0.5em;
 }
 </style>
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index e19e01a..34ddf51 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -47,8 +47,8 @@
 
       <div class="disabled" :title="$t('tag-propositions.item-count')">{{ proposed.count }}</div>
     </div>
-    <div v-if="showMore > 0" class="showmore" @click="limit += showMore">
-      {{ $t("tag-propositions.showmore", [showMore]) }}<fa-icon icon="angle-double-down" />
+    <div v-if="showMoreCount > 0" class="showmore" @click="limit += showMoreCount">
+      {{ $t("tag-propositions.showmore", [showMoreCount]) }}<fa-icon icon="angle-double-down" />
     </div>
   </div>
 </template>
@@ -65,10 +65,15 @@ export default class LdProposition extends Vue {
   @Prop({ required: true }) readonly tagsIndex!: Tag.Index;
   @PropSync("searchFilters", { type: Array, required: true }) model!: Tag.Search[];
 
-  readonly INITIAL_TAG_DISPLAY_LIMIT = this.$galleryStore.config?.initialTagDisplayLimit ?? 10;
+  readonly INITIAL_TAG_DISPLAY_LIMIT = this.getInitialTagDisplayLimit();
 
   limit: number = this.INITIAL_TAG_DISPLAY_LIMIT;
 
+  getInitialTagDisplayLimit() {
+    const limit = this.$galleryStore.config?.initialTagDisplayLimit ?? 10;
+    return limit > 0 ? limit : 1000;
+  }
+
   @Watch("$route")
   onRouteChange() {
     this.limit = this.INITIAL_TAG_DISPLAY_LIMIT;
@@ -105,7 +110,7 @@ export default class LdProposition extends Vue {
       .map(entry => ({ rawTag: entry[0], count: entry[1] }));
   }
 
-  get showMore(): number {
+  get showMoreCount(): number {
     return Object.keys(this.propositions).length - Object.keys(this.proposedTags).length;
   }