Merge branch 'main' into gh-pages

datalad · Oct 1, 2023 · 4631ea9 · 4631ea9
2 parents 7965aa7 + 8be6ec8
commit 4631ea9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/assets/app_component_dataset.js b/assets/app_component_dataset.js
@@ -218,10 +218,17 @@ const datasetView = () =>
                 c.dirs_from_path[c.dirs_from_path.length - 1]
                   .toLowerCase()
                   .indexOf(this.search_text.toLowerCase()) >= 0 ||
-                // || (c.authors.some(e => e.givenName.toLowerCase().indexOf(this.search_text.toLowerCase()) >= 0))
                 c.authors.some(
                   (f) =>
-                    f.name.toLowerCase().indexOf(this.search_text.toLowerCase()) >= 0
+                  f.givenName && f.givenName.toLowerCase().indexOf(this.search_text.toLowerCase()) >= 0 
+                ) ||
+                c.authors.some(
+                  (f) =>
+                  f.familyName && f.familyName.toLowerCase().indexOf(this.search_text.toLowerCase()) >= 0 
+                ) ||
+                c.authors.some(
+                  (f) =>
+                  f.name && f.name.toLowerCase().indexOf(this.search_text.toLowerCase()) >= 0
                 )
               );
             });
@@ -326,6 +333,9 @@ const datasetView = () =>
                   dataset_version: objVersion,
                 },
               }
+              // before navigation, clear filtering options
+              this.clearFilters()
+              // now navigate
               if (newBrowserTab) {
                 const routeData = router.resolve(route_info);
                 window.open(routeData.href, '_blank');
@@ -338,6 +348,11 @@ const datasetView = () =>
               this.$root.$emit("bv::show::modal", "modal-3", "#btnShow");
             }
           },
+          clearFilters() {
+            this.search_text = ""
+            this.search_tags = []
+            this.clearSearchTagText()
+          },
           selectDescription(desc) {
             if (desc.content.startsWith("path:")) {
               this.description_ready = false;

diff --git a/assets/app_component_item.js b/assets/app_component_item.js
@@ -89,6 +89,9 @@ Vue.component('tree-item', function (resolve, reject) {
                       dataset_version: objVersion,
                     },
                   }
+                  // before navigation, clear filter options
+                  this.$emit('clear-filters')
+                  // now navigate
                   if (newBrowserTab) {
                     const routeData = router.resolve(route_info);
                     window.open(routeData.href, '_blank');

diff --git a/templates/dataset-template.html b/templates/dataset-template.html
@@ -170,7 +170,7 @@ <h3>Cite dataset</h3>
             <span v-else>
               <span v-if="!subdatasets || !subdatasets.length"><em>There are no subdatasets listed for the current dataset</em></span>
               <span v-else>
-                <b-form>
+                <b-form v-if="subdatasets.length > 3">
                   <b-row>
                     <b-col md="7">
                       <b-input-group>
@@ -246,7 +246,12 @@ <h5><a @click="selectDataset($event, ds)" class="newlink">{{ds.dirs_from_path.at
                       </b-col>
                       <b-col md="4">
                         <b-card-text>
-                          <span v-for="keyword in ds.keywords"><b-button pill size="sm" class="p-1" variant="outline-dark" @click="addSearchTag(keyword)">{{keyword}}</b-button>&nbsp;</span>
+                          <span v-if="subdatasets.length > 3">
+                            <span v-for="keyword in ds.keywords"><b-button pill size="sm" class="p-1" variant="outline-dark" @click="addSearchTag(keyword)">{{keyword}}</b-button>&nbsp;</span>
+                          </span>
+                          <span v-else>
+                            <span v-for="keyword in ds.keywords"><b-button pill size="sm" class="p-1" variant="outline-secondary">{{keyword}}</b-button>&nbsp;</span>
+                          </span>
                         </b-card-text>
                       </b-col>
                     </b-row>
@@ -265,7 +270,7 @@ <h5><a @click="selectDataset($event, ds)" class="newlink">{{ds.dirs_from_path.at
               <span v-else>
                 <b-card no-body class="p-2">
                   <ul>
-                    <tree-item class="item" v-for="item in selectedDataset.tree" :item="item"></tree-item>
+                    <tree-item class="item" v-for="item in selectedDataset.tree" :item="item" @clear-filters="clearFilters"></tree-item>
                   </ul>
                 </b-card>
               </span>

diff --git a/templates/item-template.html b/templates/item-template.html
@@ -17,6 +17,6 @@
     </div>
     <!-- Children of an open folder -->
     <ul v-show="isOpen" v-if="isFolder">
-        <tree-item class="item" v-for="(child, index) in item.children" :key="index" :index="index" :item="child"></tree-item>
+        <tree-item class="item" v-for="(child, index) in item.children" :key="index" :index="index" :item="child" v-on="$listeners"></tree-item>
     </ul>
 </li>