@abi-software/map-side-bar 2.5.2 → 2.5.3-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.5.2",
+  "version": "2.5.3-beta.0",
   "files": [
     "dist/*",
     "src/*",

package/src/components/SearchFilters.vue

@@ -469,7 +469,14 @@ export default {
               facetSubPropPath: facetSubPropPath, // will be used for filters if we are at the third level of the cascader
             }
           })
-        
+
+        // if all checkboxes are checked
+        // there has no filter values
+        const filtersLength = filters.filter((item) => item.facet !== 'Show all');
+        if (!filtersLength.length) {
+          filters = [];
+        }
+
         this.$emit('loading', true) // let sidebarcontent wait for the requests
         this.$emit('filterResults', filters) // emit filters for apps above sidebar
         this.setCascader(filterKeys) //update our cascader v-model if we modified the event
@@ -631,7 +638,7 @@ export default {
           let filters = createFilter(e)
           return filters
         })
-        
+
         // Unforttunately the cascader is very particular about it's v-model
         //   to get around this we create a clone of it and use this clone for adding our boolean information
         this.cascadeSelectedWithBoolean = filterFacets.map((e) => {

package/src/components/SearchHistory.vue

@@ -1,33 +1,84 @@
 <template>
-  <div class="history-container">
-    <!-- <span v-if="reversedSearchHistory.length > 0" class="title"> Search History </span> -->
-    <template v-for="(item, i) in reversedSearchHistory">
-      <el-tag
-        class="search-tag"
-        v-if="i < 3"
-        v-bind:key="i"
-        @click="search(item)"
-        size="large"
-      >
-        {{ item.search }}
-      </el-tag>
-    </template>
-    <el-select
-      v-if="reversedSearchHistory.length > 0"
-      :model-value="selectValue"
-      class="m-2 search-select"
-      placeholder="Full search History"
-      popper-class="sidebar-search-select-popper"
-      @change="selectChange"
-      :teleported="false"
-    >
-      <el-option
-        v-for="(item, i) in cascaderOptions"
-        :key="i"
-        :label="item.label"
-        :value="item.value"
-      />
-    </el-select>
+  <div class="history-container" v-if="searchHistory.length">
+    <div class="saved-search-history" v-if="savedSearchHistory.length">
+      <template v-for="(item, i) in savedSearchHistory">
+        <el-tag
+          class="search-tag"
+          v-if="i < 2"
+          v-bind:key="i"
+          @click="search(item)"
+          size="large"
+        >
+          {{ item.label }}
+        </el-tag>
+      </template>
+    </div>
+    <div v-else>
+      <span class="empty-saved-search">No Saved Searches</span>
+    </div>
+    <el-dropdown trigger="click" :max-height="350" :hide-on-click="false">
+      <span class="el-dropdown-select">
+        Search history
+        <el-icon class="el-icon--right">
+          <el-icon-arrow-down />
+        </el-icon>
+      </span>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item v-for="(item, i) in searchHistory">
+            <div>{{ item.label }}</div>
+            <div>
+              <el-popover
+                width="auto"
+                trigger="hover"
+                :teleported="true"
+                :show-after="100"
+                popper-class="popover-dropdown"
+              >
+                <template #reference>
+                  <el-button circle text size="small"
+                    @click="toggleSavedSearch(item)"
+                    :disabled="savedSearchHistory.length > 1 && !item.saved"
+                  >
+                    <el-icon color="#8300BF">
+                      <el-icon-star-filled v-if="item.saved" />
+                      <el-icon-star v-else />
+                    </el-icon>
+                  </el-button>
+                </template>
+                <span v-if="savedSearchHistory.length > 1 && !item.saved">
+                  Please unsave one before adding another.
+                </span>
+                <span v-else-if="item.saved">
+                  Remove from saved searches.
+                </span>
+                <span v-else>
+                  Add up to two saved searches.
+                </span>
+              </el-popover>
+              <el-popover
+                width="auto"
+                trigger="hover"
+                :teleported="true"
+                :show-after="100"
+                popper-class="popover-dropdown"
+              >
+                <template #reference>
+                  <el-button circle text size="small" @click="removeFromSavedSearch(item)">
+                    <el-icon color="#8300BF">
+                      <el-icon-delete />
+                    </el-icon>
+                  </el-button>
+                </template>
+                <span>
+                  Remove from search history.
+                </span>
+              </el-popover>
+            </div>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
   </div>
 </template>
 
@@ -35,7 +86,9 @@
 /* eslint-disable no-alert, no-console */
 import {
   ElTag as Tag,
-  ElSelect as Select
+  ElSelect as Select,
+  ElDropdown as Dropdown,
+  ElIcon as Icon,
 } from 'element-plus'
 
 import EventBus from './EventBus.js'
@@ -47,6 +100,20 @@ const removeDuplicates = function (arrayOfAnything) {
   )
 }
 
+function generateUUID() {
+  const arr = new Uint8Array(16);
+  window.crypto.getRandomValues(arr);
+
+  arr[6] = (arr[6] & 0x0f) | 0x40;
+  arr[8] = (arr[8] & 0x3f) | 0x80;
+
+  const hex = Array.from(arr)
+    .map(byte => byte.toString(16).padStart(2, '0'))
+    .join('');
+
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+
 export default {
   name: 'SearchHistory',
   components: {
@@ -56,26 +123,16 @@ export default {
   data() {
     return {
       searchHistory: [],
-      selectValue: 'Full search history',
+      savedSearchHistory: [],
     }
   },
-  computed: {
-    reversedSearchHistory: function () {
-      return removeDuplicates(
-        this.searchHistory
-          .slice()
-          .reverse()
-          .filter((item) => item.search !== '')
-      )
-    },
-    cascaderOptions: function () {
-      return this.reversedSearchHistory.map((item) => {
-        return {
-          value: item.search,
-          label: item.search,
-        }
-      })
-    },
+  mounted: function () {
+    this.getSearchHistory()
+    EventBus.on('search-changed', (data) => {
+      this.setSearchHistory(data)
+    });
+    this.updateSearchHistory();
+    this.savedSearchHistory = this.searchHistory.filter((item) => item.saved);
   },
   methods: {
     getSearchHistory() {
@@ -91,58 +148,132 @@ export default {
       localStorage.removeItem('sparc.science-sidebar-search-history')
       this.searchHistory = []
     },
-    addSearchToHistory(filters, search) {
-      filters = [] // disable filters for now
+    addSearchToHistory(filters = [], search) {
       search = search.trim() // remove whitespace
       let searchHistory = JSON.parse(
         localStorage.getItem('sparc.science-sidebar-search-history')
       )
       if (searchHistory) {
-        searchHistory.push({ filters: filters, search: search })
+        searchHistory.push({
+          filters: filters,
+          search: search,
+          saved: false,
+          label: this.searchHistoryItemLabel(search, filters),
+          id: generateUUID(),
+        });
         this.searchHistory = removeDuplicates(searchHistory)
         localStorage.setItem(
           'sparc.science-sidebar-search-history',
-          JSON.stringify(searchHistory)
+          JSON.stringify(this.searchHistory)
         )
       } else {
         localStorage.setItem(
           'sparc.science-sidebar-search-history',
-          JSON.stringify([{ filters: filters, search: search }])
+          JSON.stringify([{
+            filters: filters,
+            search: search,
+            saved: false,
+            label: this.searchHistoryItemLabel(search, filters),
+            id: generateUUID(),
+          }])
         )
       }
     },
+    updateSearchHistory: function () {
+      this.searchHistory.forEach((item) => {
+        if (!item.id) {
+          item['id'] = generateUUID();
+        }
+        if (!item.label) {
+          item['label'] = this.searchHistoryItemLabel(item.search, item.filters);
+        }
+        if (!item.saved) {
+          item['saved'] = false;
+        }
+      });
+      this.searchHistory = this.searchHistory.sort((a, b) => {
+        if (a.saved > b.saved) {
+          return -1;
+        }
+        if (a.saved < b.saved) {
+          return 1;
+        }
+        return 0;
+      });
+      localStorage.setItem(
+        'sparc.science-sidebar-search-history',
+        JSON.stringify(this.searchHistory)
+      )
+    },
     search: function (item) {
       this.$emit('search', item)
     },
-    selectChange: function (value) {
-      this.selectValue = value
-      this.search({ search: value })
+    searchHistoryItemLabel: function (search, filters) {
+      let label = search;
+      let filterItems = [];
+
+      if (filters) {
+        filterItems = filters.filter((filterItem) => filterItem.facet !== 'Show all');
+      }
+
+      if (!label) {
+        label = filterItems.length ? filterItems[0].facet : 'Unknown search';
+      }
+
+      return label;
+    },
+    toggleSavedSearch: function (item) {
+      this.searchHistory.forEach((_item) => {
+        if (_item.id === item.id) {
+          _item.saved = !_item.saved;
+        }
+      });
+      this.savedSearchHistory = this.searchHistory.filter((item) => item.saved);
+      this.updateSearchHistory();
+    },
+    removeFromSavedSearch: function (item) {
+      const itemIndex = this.searchHistory.findIndex((_item) => _item.id === item.id);
+      this.searchHistory.splice(itemIndex, 1);
+      this.savedSearchHistory = this.searchHistory.filter((item) => item.saved);
+      this.updateSearchHistory();
     },
-  },
-  mounted: function () {
-    this.getSearchHistory()
-    EventBus.on('search-changed', (data) => {
-      this.setSearchHistory(data)
-    })
   },
 }
 </script>
 
 <style lang="scss" scoped>
 .history-container {
-  padding-bottom: 3px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 6px;
+}
+
+.empty-saved-search {
+  font-style: italic;
+  font-size: 14px;
+  font-weight: 400;
+  color: var(--el-text-color-secondary);
+}
+
+.saved-search-history {
+  display: flex;
+  align-items: center;
+  gap: 6px;
 }
 
 .search-tag.el-tag {
-  margin: 0 5px 5px 0;
+  margin: 0;
   cursor: pointer;
-  max-width: 100px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  float: left;
   background: #f9f2fc!important;
   border-color: $app-primary-color!important;
   color:$app-primary-color!important;
+
+  .el-tag__content {
+    max-width: 15ch;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 
 .title {
@@ -154,22 +285,110 @@ export default {
   align-items: center;
 }
 
-.search-select {
-  float: right;
+.el-dropdown {
   width: 180px;
+  position: relative;
+  box-sizing: border-box;
+  cursor: pointer;
+  text-align: left;
+  font-size: 14px;
+  padding: 4px 12px;
+  min-height: 32px;
+  line-height: 24px;
+  border-radius: var(--el-border-radius-base);
+  background-color: var(--el-fill-color-blank);
+  transition: var(--el-transition-duration);
+  transform: translateZ(0);
+  box-shadow: 0 0 0 1px var(--el-border-color) inset;
+  cursor: pointer;
+}
+
+.el-dropdown-select {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 1rem;
+
+  .el-icon {
+    transform: rotate(0deg);
+    transition: transform 0.25s linear;
+  }
+
+  &[aria-expanded="true"] {
+    .el-icon {
+      transform: rotate(180deg);
+    }
+  }
+}
+
+:deep(.el-dropdown-menu__item) {
+  justify-content: space-between;
+  gap: 0.5rem;
+  cursor: default;
+  position: relative;
+
+  > div:first-child {
+    max-width: 148px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  + .el-dropdown-menu__item {
+    &::before {
+      content: "";
+      display: block;
+      width: calc(100% - 32px);
+      border-top: 1px solid var(--el-border-color);
+      position: absolute;
+      top: 0;
+    }
+  }
+
+  &:hover,
+  &:focus,
+  &:active {
+    color: inherit;
+    background-color: var(--el-bg-color-page);
+  }
+
+  i {
+    margin: 0;
+  }
 }
 </style>
 
 <style lang="scss">
-.sidebar-search-select-popper {
+.el-dropdown__popper {
   font-family: Asap;
   font-size: 14px;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: normal;
   font-style: normal;
   line-height: normal;
   letter-spacing: normal;
   color: #292b66;
-  max-width: 200px;
+  min-width: 180px;
+  width: fit-content;
+
+  .el-button + .el-button {
+    margin: 0;
+  }
+}
+
+.el-popper.popover-dropdown {
+  padding: 4px 10px;
+  min-width: max-content;
+  font-family: Asap;
+  font-size: 12px;
+  color: inherit;
+  background: #f3ecf6 !important;
+  border: 1px solid $app-primary-color;
+
+  & .el-popper__arrow::before {
+    border: 1px solid;
+    border-color: $app-primary-color;
+    background: #f3ecf6;
+  }
 }
 </style>

package/src/components/SidebarContent.vue

@@ -95,6 +95,7 @@ var handleErrors = async function (response) {
 }
 
 var initial_state = {
+  filters: [],
   searchInput: '',
   lastSearch: '',
   results: [],
@@ -226,28 +227,33 @@ export default {
       this.searchInput = ''
       this.resetPageNavigation()
       this.searchAlgolia(this.filters, this.searchInput)
-      this.$refs.searchHistory.selectValue = 'Full search history'
+      this.$refs.searchHistory.selectValue = 'Search history'
     },
     searchEvent: function (event = false) {
       if (event.keyCode === 13 || event instanceof MouseEvent) {
-        this.resetPageNavigation()
-        this.searchAlgolia(this.filters, this.searchInput)
-        this.$refs.searchHistory.selectValue = 'Full search history'
-        this.$refs.searchHistory.addSearchToHistory(
-          this.filters,
-          this.searchInput
-        )
+        this.searchAndFilterUpdate();
       }
     },
     filterUpdate: function (filters) {
       this.filters = [...filters]
-      this.resetPageNavigation()
-      this.searchAlgolia(filters, this.searchInput)
+      this.searchAndFilterUpdate();
       this.$emit('search-changed', {
         value: filters,
         type: 'filter-update',
       })
     },
+    searchAndFilterUpdate: function () {
+      this.resetPageNavigation();
+      this.searchAlgolia(this.filters, 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
 

package/src/components.d.ts

@@ -16,10 +16,17 @@ 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']
+    ElIconStar: typeof import('@element-plus/icons-vue')['Star']
+    ElIconStarFilled: typeof import('@element-plus/icons-vue')['StarFilled']
     ElIconWarning: typeof import('@element-plus/icons-vue')['Warning']
     ElIconWarnTriangleFilled: typeof import('@element-plus/icons-vue')['WarnTriangleFilled']
     ElInput: typeof import('element-plus/es')['ElInput']