hide json displayed instead of wikidata entry, removed use of undecla…

…red local variable (#1395)
impresso · Dec 13, 2024 · c1af34f · c1af34f
1 parent 749502a
commit c1af34f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 54 deletions.
diff --git a/src/components/Monitor.vue b/src/components/Monitor.vue
@@ -78,7 +78,7 @@
           <div class="text-center m-2" v-if="filterModificationsEnabled">
             <b-button
               size="sm"
-              class="mr-1"
+              class="mr-1 mb-1"
               variant="outline-primary"
               @click="applyFilter('include')"
               >{{ $t('actions.addToCurrentFilters') }}</b-button
@@ -96,7 +96,7 @@
           <div class="mx-3">
             <div v-if="['person', 'location'].indexOf(type) !== -1">
               <wikidata-block :item="item" v-if="item.wikidataId" class="p-2" />
-              <div class="m-2" v-else>{{ item }}</div>
+              <!-- <div class="m-2" v-else>{{ item }}</div> -->
             </div>
             <div v-else class="m-2" style="max-height: 150px; overflow: scroll">
               <item-label :item="item" :type="type" detailed />
@@ -116,20 +116,19 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
+import { defineComponent } from 'vue'
 import { mapState, mapActions, mapStores } from 'pinia'
 import { useMonitorStore } from '@/stores/monitor'
+
 import Ellipsis from './modules/Ellipsis.vue'
 import Timeline from './modules/Timeline.vue'
 import WikidataBlock from './modules/WikidataBlock.vue'
 import ItemLabel from './modules/lists/ItemLabel.vue'
 import SearchQuerySummary from './modules/SearchQuerySummary.vue'
 import SearchQuery from '../models/SearchQuery'
 import { containsFilter } from '@/logic/filters'
-
-/**
- * @typedef {import('@/models').Filter} Filter
- */
+import type { Filter } from '@/models'
 
 /**
  * Display info about the current selected item.
@@ -147,57 +146,46 @@ import { containsFilter } from '@/logic/filters'
   * Cfr src/components/modules/ItemSelector.vue
   */
 
-export default {
+export default defineComponent({
   data: () => ({
     isDragging: false,
-    position: {},
+    position: {} as { x: number; y: number },
     transformStyle: {},
     tabs: ['selectedItem'], // 'currentSearch'],
     tab: 'selectedItem'
   }),
   methods: {
-    /**
-     * @param {{ x: number, y: number }} param
-     */
-    dragstart({ x, y }) {
+    dragstart({ x, y }: { x: number; y: number }) {
       this.isDragging = true
       if (isNaN(this.position.x)) {
         this.position = { x, y }
       }
     },
-    /**
-     * @param {{ x: number, y: number }} param
-     */
-    dragend({ x, y }) {
+    dragend({ x, y }: { x: number; y: number }) {
       this.isDragging = false
       this.transformStyle = {
         transform: `translate(${x - this.position.x}px,${y - this.position.y}px)`
       }
     },
-    /**
-     * @param {string} tab
-     */
-    switchTab(tab) {
+    switchTab(tab: string) {
       this.tab = tab
     },
     ...mapActions(useMonitorStore, {
       fadeOut: 'hide'
     }),
-    /**
-     * @param {string} context
-     */
-    async applyFilter(context = 'include') {
-      const newFilter = {
+    async applyFilter(context: string = 'include') {
+      const currentFilters = this.searchQueryFilters as Filter[]
+      const newFilter: Filter = {
         type: this.type,
         q: this.item.uid,
         items: [this.item],
         context
       }
 
-      const isAlreadyIncluded = this.searchQueryFilters.find(containsFilter(newFilter)) != null
+      const isAlreadyIncluded = currentFilters.find(containsFilter(newFilter)) != null
 
       if (!isAlreadyIncluded) {
-        const updatedFilters = [...this.searchQueryFilters].concat(newFilter)
+        const updatedFilters: Filter[] = [...currentFilters].concat(newFilter)
         await this.monitorStore.updateFilters(updatedFilters)
       }
       this.fadeOut()
@@ -226,23 +214,19 @@ export default {
     ...mapState(useMonitorStore, {
       filterModificationsEnabled: state => !state.disableFilterModification
     }),
-    /** @returns {[number, number] | []} */
-    itemTimelineDomain() {
+    itemTimelineDomain(): [number, number] | [] {
       const { itemTimeline } = this
       if (!itemTimeline.length) {
         return []
       }
-      return [itemTimeline[0].t, itemTimeline[itemTimeline.length - 1].t]
+      return [(itemTimeline[0] as any).t, (itemTimeline[itemTimeline.length - 1] as any).t]
     },
-    /** @returns {number} */
-    countActiveFilters() {
+    countActiveFilters(): number {
       return this.searchQuery.countActiveFilters()
     },
-    /** @returns {SearchQuery} */
     searchQuery() {
       return new SearchQuery({ filters: this.searchQueryFilters })
     },
-    /** @returns {string} */
     searchQueryFiltersLabel() {
       if (this.itemTimelineDomain.length !== 2) {
         return this.$t('actions.loading').toString()
@@ -254,11 +238,9 @@ export default {
         to
       }).toString()
     },
-    /** @returns {boolean} */
     isItemSelected() {
       return !!this.item
     },
-    /** @returns {object} */
     detailsUrl() {
       if (this.type === 'newspaper') {
         return {
@@ -274,8 +256,7 @@ export default {
             topic_uid: this.item.uid
           }
         }
-        // @ts-ignore
-      } else if (['person', 'location'].indexOf(type) !== this.type) {
+      } else if (['person', 'location'].includes(this.type)) {
         return {
           name: 'entity',
           params: {
@@ -292,17 +273,14 @@ export default {
       }
       return null
     },
-    /** @returns {string | undefined} */
     path() {
       return this.$route.name
     },
-    /** @returns {string} */
     statsLabel() {
       if (this.isPendingTimeline) {
         return this.$t('actions.loading').toString()
       }
       let key = 'itemStats'
-
       if (!this.itemTimelineDomain.length) {
         key = 'itemStatsEmpty'
       } else if (this.applyCurrentSearchFilters && this.countActiveFilters) {
@@ -333,12 +311,13 @@ export default {
     SearchQuerySummary,
     Ellipsis
   }
+
   // - removed: added "x" close button in component
   // mounted() {
   //   document.addEventListener('click', this.fadeOut);
   //   document.addEventListener('touchstart', this.fadeOut);
   // },
-}
+})
 </script>
 
 <style lang="scss">

diff --git a/src/stores/monitor.ts b/src/stores/monitor.ts
@@ -1,15 +1,11 @@
-import { defineStore } from 'pinia'
-import { search as searchService, entities as entitiesService } from '@/services'
-import Helpers from '@/plugins/Helpers'
+import type { Filter } from '@/models'
 import Entity from '@/models/Entity'
 import Topic from '@/models/Topic'
+import Helpers from '@/plugins/Helpers'
+import { entities as entitiesService, search as searchService } from '@/services'
+import { defineStore } from 'pinia'
 
-interface Filter {
-  q?: string
-  type?: string
-}
-
-interface ActivateParameters {
+export interface ActivateParameters {
   item: { uid: string }
   type: string
   filters?: Filter[]
@@ -18,13 +14,13 @@ interface ActivateParameters {
   disableFilterModification?: boolean
 }
 
-interface State {
+export interface State {
   applyCurrentSearchFilters: boolean
   filters: Filter[]
   timeline: object[]
   isPendingTimeline: boolean
   type?: string
-  item?: { uid: string }
+  item?: { uid: string; wikidataId?: string }
   groupBy: 'articles'
   itemCountRelated: number
   isActive: boolean