@abi-software/map-side-bar 1.1.2 → 1.1.3-fix-0

package/src/components/SearchFilters.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="filters">
-    <SvgSpriteColor />
+    <map-svg-sprite-color />
     <transition name="el-zoom-in-top">
       <span v-show="showFilters" class="search-filters transition-box">
         <custom-cascader
@@ -18,7 +18,7 @@
           @tags-changed="tagsChangedCallback"
         ></custom-cascader>
         <div v-if="showFiltersText" class="filter-default-value">
-          <svg-icon icon="noun-filter" class="filter-icon-inside" />Apply Filters
+          <map-svg-icon icon="noun-filter" class="filter-icon-inside" />Apply Filters
         </div>
       </span>
     </transition>
@@ -44,9 +44,7 @@ import CustomCascader from "./Cascader";
 import lang from "element-ui/lib/locale/lang/en";
 import locale from "element-ui/lib/locale";
 import speciesMap from "./species-map";
-import { SvgIcon, SvgSpriteColor } from "@abi-software/svg-sprite";
-
-Vue.component("svg-icon", SvgIcon);
+import { MapSvgIcon, MapSvgSpriteColor } from "@abi-software/svg-sprite";
 
 locale.use(lang);
 Vue.use(Option);
@@ -69,7 +67,8 @@ export default {
   name: "SearchFilters",
   components: {
     CustomCascader,
-    SvgSpriteColor
+    MapSvgIcon,
+    MapSvgSpriteColor
   },
   props: {
     /**
@@ -138,8 +137,7 @@ export default {
                 this.options[i].children.push({
                   value: this.createCascaderItemValue(
                     this.facets[i].toLowerCase(),
-                    labels[j].toLowerCase()
-                  ),
+                    labels[j].toLowerCase()),
                   label: convertReadableLabel(labels[j]) // Capitalisation is to match design specs
                 });
               }
@@ -217,7 +215,6 @@ export default {
           if (facetMaps[event[i][0]] === undefined) facetMaps[event[i][0]] = [];
           facetMaps[event[i][0]].push(event[i]);
         }
-
         // go through each facets
         for (const facet in facetMaps) {
           let showAll = undefined;
@@ -244,11 +241,33 @@ export default {
             modifiedEvent.push(...facetMaps[facet]);
           }
         }
-        return modifiedEvent;
+        //Make sure the expanded item are sorted first.
+        return modifiedEvent.sort((a, b) => {
+          if (this.__expandItem__) {
+            if (a[0] == this.__expandItem__) {
+              if (b[0] == this.__expandItem__) {
+                return 0;
+              } else {
+                return -1;
+              }
+            } else if (b[0] == this.__expandItem__) {
+              if (a[0] == this.__expandItem__) {
+                return 0;
+              } else {
+                return 1;
+              }
+            } else {
+              return 0;
+            }
+          } else
+            return 0;
+        });
       }
       return event;
     },
-    cascadeExpandChange: function() {
+    cascadeExpandChange: function(event) {
+      //work around as the expand item may change on modifying the cascade props
+      this.__expandItem__ = event;
       this.makeCascadeLabelsClickable();
     },
     numberShownChanged: function(event) {

package/src/components/SidebarContent.vue

@@ -91,7 +91,6 @@ var initial_state = {
   results: [],
   numberOfHits: 0,
   filter: [],
-  filterFacets: undefined,
   loadingCards: false,
   numberPerPage: 10,
   page: 1,
@@ -145,7 +144,7 @@ export default {
     filterEntry: function() {
       return {
         numberOfHits: this.numberOfHits,
-        filterFacets: this.filterFacets
+        filterFacets: this.filter
       };
     }
   },
@@ -156,8 +155,8 @@ export default {
       this.resetPageNavigation();
       this.searchSciCrunch(search, filter, endpoint, params);
       if (filter) {
-        this.filterFacets = [...filter];
-        this.$refs.filtersRef.setCascader(this.filterFacets);
+        this.filter = [...filter];
+        this.$refs.filtersRef.setCascader(this.filter);
       }
     },
     clearSearchClicked: function() {
@@ -331,15 +330,15 @@ export default {
     // temporarily disable flatmap search since there are no datasets
     if (this.firstSearch === "Flatmap" || this.firstSearch === "flatmap") {
       this.openSearch('', [
-        {facet: "show all", term:'organ'},
         {facet: "show all", term:'species'},
         {facet: "show all", term:'gender'},
+        {facet: "show all", term:'organ'},
         {facet: "show all", term:'datasets'}]);
     } else {
       this.openSearch(this.firstSearch,  [
-        {facet: "show all", term:'organ'},
         {facet: "show all", term:'species'},
         {facet: "show all", term:'gender'},
+        {facet: "show all", term:'organ'},
         {facet: "show all", term:'datasets'}]);
     }
   },