From 714d537624063d813475ba71637731a5939715c7 Mon Sep 17 00:00:00 2001
From: Stefan Peters <stefandesu@exo.pm>
Date: Thu, 3 Mar 2022 09:48:40 +0100
Subject: [PATCH] ConceptSchemeSelection: Add filter for schemes with concepts
 (#670)

---
 config/locale.json                        |  2 ++
 src/components/ConceptSchemeSelection.vue | 32 +++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/config/locale.json b/config/locale.json
index 010afc1f..d01c9607 100644
--- a/config/locale.json
+++ b/config/locale.json
@@ -53,6 +53,7 @@
       "filterSelectAll": "select all",
       "filterDeselectAll": "deselect all",
       "filterOnlyFavorites": "Show only favorites",
+      "filterOnlyWithConcepts": "Show only schemes with concepts",
       "languageFilter": "Language",
       "typeFilter": "Scheme Type",
       "filterOther": "Other",
@@ -381,6 +382,7 @@
       "filterSelectAll": "alle auswählen",
       "filterDeselectAll": "alle abwählen",
       "filterOnlyFavorites": "Nur Favoriten anzeigen",
+      "filterOnlyWithConcepts": "Nur Vokabulare mit Konzepten anzeigen",
       "languageFilter": "Sprache",
       "typeFilter": "Vokabular-Typ",
       "filterOther": "Sonstige",
diff --git a/src/components/ConceptSchemeSelection.vue b/src/components/ConceptSchemeSelection.vue
index 840c59d6..6c38a06a 100644
--- a/src/components/ConceptSchemeSelection.vue
+++ b/src/components/ConceptSchemeSelection.vue
@@ -123,7 +123,7 @@
                 <a
                   ref="removeAllFiltersLink"
                   href=""
-                  @click.prevent="onlyFavorites = false; schemeFilter = ''; registryFilter = availableRegistries.map(r => r.uri); languageFilter = availableLanguages.concat([null]); typeFilter = availableTypes.concat([null]);">
+                  @click.prevent="onlyFavorites = false; onlyWithConcepts = false; schemeFilter = ''; registryFilter = availableRegistries.map(r => r.uri); languageFilter = availableLanguages.concat([null]); typeFilter = availableTypes.concat([null]);">
                   {{ $t("schemeSelection.filtersRemove") }}
                 </a>
               </p>
@@ -133,6 +133,11 @@
                 size="sm">
                 {{ $t("schemeSelection.filterOnlyFavorites") }}
               </b-form-checkbox>
+              <b-form-checkbox
+                v-model="onlyWithConcepts"
+                size="sm">
+                {{ $t("schemeSelection.filterOnlyWithConcepts") }}
+              </b-form-checkbox>
               <!-- Registry filter -->
               <div
                 v-b-toggle="`conceptSchemeSelection-filterPopover-${id}-registryFilterCollapse`"
@@ -323,6 +328,8 @@ export default {
       typeFilter: [],
       // Flag whether to show only favorite concepts
       onlyFavorites: true,
+      // Flag whether to show only schemes that potentially have concepts
+      onlyWithConcepts: false,
       // Item component for VirtualList
       itemComponent: ConceptSchemeSelectionItemVue,
       // TODO: To mitigate performance issues, we're updating these properties in a debounced watcher.
@@ -347,7 +354,7 @@ export default {
     },
     // Indicates whether there is a filter active.
     isFiltered() {
-      return this.schemeFilter != "" || this.registryFilter.length < this.availableRegistries.length || (this.languageFilter.length - 1) < this.availableLanguages.length || (this.typeFilter.length - 1) < this.availableTypes.length || this.onlyFavorites
+      return this.schemeFilter != "" || this.registryFilter.length < this.availableRegistries.length || (this.languageFilter.length - 1) < this.availableLanguages.length || (this.typeFilter.length - 1) < this.availableTypes.length || this.onlyFavorites || this.onlyWithConcepts
     },
     // Returns an array of all available registries
     availableRegistries() {
@@ -427,6 +434,12 @@ export default {
       this.schemeFilter = ""
       this.updateProperties()
     },
+    onlyWithConcepts(value) {
+      if (value) {
+        this.onlyFavorites = false
+      }
+      this.updateProperties()
+    },
     favoriteSchemes() {
       this.updateProperties()
     },
@@ -521,6 +534,9 @@ export default {
           ) &&
           (
             !this.onlyFavorites || this.$jskos.isContainedIn(scheme, this.favoriteSchemes)
+          ) &&
+          (
+            !this.onlyWithConcepts || this.hasConcepts(scheme)
           ),
       )
       this.shownRegistries = this.availableRegistries.filter(registry => schemes.find(scheme => this.$jskos.compareFast(registry, scheme._registry)))
@@ -538,6 +554,9 @@ export default {
           ) &&
           (
             !this.onlyFavorites || this.$jskos.isContainedIn(scheme, this.favoriteSchemes)
+          ) &&
+          (
+            !this.onlyWithConcepts || this.hasConcepts(scheme)
           ),
       )
       this.shownLanguages = _.uniq([].concat(...schemes.map(scheme => scheme.languages || []))).sort()
@@ -555,6 +574,9 @@ export default {
           ) &&
           (
             !this.onlyFavorites || this.$jskos.isContainedIn(scheme, this.favoriteSchemes)
+          ) &&
+          (
+            !this.onlyWithConcepts || this.hasConcepts(scheme)
           ),
       )
       this.shownTypes = _.uniq(_.flatten(schemes.map(scheme => scheme.type || []))).filter(type => type && type != "http://www.w3.org/2004/02/skos/core#ConceptScheme")
@@ -616,6 +638,9 @@ export default {
             ) &&
             (
               !this.onlyFavorites || this.$jskos.isContainedIn(scheme, this.favoriteSchemes)
+            ) &&
+            (
+              !this.onlyWithConcepts || this.hasConcepts(scheme)
             ),
         )
       }
@@ -680,6 +705,9 @@ export default {
         this.showPopover()
       }
     },
+    hasConcepts(scheme) {
+      return !scheme.concepts || scheme.concepts.length
+    },
   },
 }
 </script>