@abi-software/map-side-bar 2.5.3-beta.4 → 2.5.3-beta.5

package/src/components/SidebarContent.vue

@@ -95,7 +95,6 @@ var handleErrors = async function (response) {
 }
 
 var initial_state = {
-  filters: [],
   searchInput: '',
   lastSearch: '',
   results: [],
@@ -173,7 +172,7 @@ export default {
       this.results = []
       this.loadingCards = false
     },
-    openSearch: function (filter, search = '', option = { withSearch: true }) {
+    openSearch: function (filter, search = '') {
       this.searchInput = search
       this.resetPageNavigation()
       //Proceed normally if cascader is ready
@@ -192,16 +191,14 @@ export default {
           this.$refs.filtersRef.checkShowAllBoxes()
           this.resetSearch()
         } else if (this.filter) {
-          if (option.withSearch) {
-            this.searchAlgolia(this.filter, search)
-          }
+          this.searchAlgolia(this.filter, search)
           this.$refs.filtersRef.setCascader(this.filter)
         }
       } else {
         //cascader is not ready, perform search if no filter is set,
         //otherwise waith for cascader to be ready
         this.filter = filter
-        if ((!filter || filter.length == 0) && option.withSearch) {
+        if (!filter || filter.length == 0) {
           this.searchAlgolia(this.filter, search)
         }
       }
@@ -229,47 +226,28 @@ export default {
       this.searchInput = ''
       this.resetPageNavigation()
       this.searchAlgolia(this.filters, this.searchInput)
-      this.$refs.searchHistory.selectValue = 'Search history'
+      this.$refs.searchHistory.selectValue = 'Full search history'
     },
     searchEvent: function (event = false) {
       if (event.keyCode === 13 || event instanceof MouseEvent) {
-        this.searchAndFilterUpdate();
+        this.resetPageNavigation()
+        this.searchAlgolia(this.filters, this.searchInput)
+        this.$refs.searchHistory.selectValue = 'Full search history'
+        this.$refs.searchHistory.addSearchToHistory(
+          this.filters,
+          this.searchInput
+        )
       }
     },
     filterUpdate: function (filters) {
       this.filters = [...filters]
-      this.searchAndFilterUpdate();
+      this.resetPageNavigation()
+      this.searchAlgolia(filters, this.searchInput)
       this.$emit('search-changed', {
         value: filters,
         type: 'filter-update',
       })
     },
-    /**
-     * Transform filters for third level items to perform search
-     * because cascader keeps adding it back.
-     */
-    transformFiltersBeforeSearch: function (filters) {
-      return filters.map((filter) => {
-        if (filter.facet2) {
-          filter.facet = filter.facet2;
-          delete filter.facet2;
-        }
-        return filter;
-      });
-    },
-    searchAndFilterUpdate: function () {
-      this.resetPageNavigation();
-      const transformedFilters = this.transformFiltersBeforeSearch(this.filters);
-      this.searchAlgolia(transformedFilters, this.searchInput);
-      this.$refs.searchHistory.selectValue = 'Search history';
-      // save history only if there has value
-      if (this.filters.length || this.searchInput?.trim()) {
-        this.$refs.searchHistory.addSearchToHistory(
-          this.filters,
-          this.searchInput
-        );
-      }
-    },
     searchAlgolia(filters, query = '') {
       // Algolia search
 
@@ -461,9 +439,7 @@ export default {
     searchHistorySearch: function (item) {
       this.searchInput = item.search
       this.filters = item.filters
-      this.searchAndFilterUpdate();
-      // withSearch: false to prevent algoliaSearch in openSearch
-      this.openSearch([...item.filters], item.search, { withSearch: false });
+      this.openSearch(item.filters, item.search)
     },
   },
   mounted: function () {

package/src/components.d.ts

@@ -16,14 +16,9 @@ declare module 'vue' {
     ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
-    ElDropdown: typeof import('element-plus/es')['ElDropdown']
-    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
-    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElIconArrowDown: typeof import('@element-plus/icons-vue')['ArrowDown']
     ElIconArrowLeft: typeof import('@element-plus/icons-vue')['ArrowLeft']
     ElIconArrowRight: typeof import('@element-plus/icons-vue')['ArrowRight']
-    ElIconDelete: typeof import('@element-plus/icons-vue')['Delete']
     ElIconLocation: typeof import('@element-plus/icons-vue')['Location']
     ElIconWarning: typeof import('@element-plus/icons-vue')['Warning']
     ElIconWarnTriangleFilled: typeof import('@element-plus/icons-vue')['WarnTriangleFilled']