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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.7.0-beta.0",
+  "version": "2.7.0",
   "files": [
     "dist/*",
     "src/*",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@abi-software/gallery": "^1.1.2",
-    "@abi-software/map-utilities": "^1.4.0-beta.0",
+    "@abi-software/map-utilities": "^1.4.0",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
     "algoliasearch": "^4.10.5",

package/src/App.vue

@@ -114,6 +114,7 @@ export default {
         { title: 'Flatmap', id: 1, type: 'search'},
         { title: 'Connectivity', id: 2, type: 'connectivity' },
         { title: 'Annotation', id: 3, type: 'annotation' },
+        { title: 'Connectivity Explorer', id: 4, type: 'connectivityExplorer' }
       ],
       sideBarVisibility: true,
       envVars: {

package/src/components/ConnectivityCard.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="dataset-card-container" ref="container">
+    <div class="dataset-card" ref="card">
+      <div class="seperator-path"></div>
+      <div class="card"
+        @click="cardClicked(entry)"
+        @mouseover="cardHovered(entry)"
+        @mouseleave="cardHovered(undefined)"
+      >
+        <div class="card-right">
+          <div class="title">{{ entry.label }}</div>
+          <template v-for="field in displayFields" :key="field">
+            <div class="details" v-if="entry[field]">
+              <strong>{{ field }}:</strong> {{ entry[field] }}
+            </div>
+          </template>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import EventBus from './EventBus.js'
+/* eslint-disable no-alert, no-console */
+
+export default {
+  data() {
+    return {
+      displayFields: [
+        "label",
+        "id",
+      ]
+    }
+  },
+  name: 'ConnectivityCard',
+  props: {
+    /**
+     * Object containing information for
+     * the required viewing.
+     */
+    entry: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  methods: {
+    cardClicked: function (data) {
+      EventBus.emit('connectivity-clicked', data);
+    },
+    cardHovered: function (data) {
+      EventBus.emit('connectivity-hovered', data);
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.dataset-card {
+  padding-left: 5px;
+  padding-right: 5px;
+  position: relative;
+  min-height: 17rem;
+}
+
+.title {
+  padding-bottom: 0.75rem;
+  font-family: Asap;
+  font-size: 14px;
+  font-weight: bold;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: 1.5;
+  letter-spacing: 1.05px;
+  color: #484848;
+  cursor: pointer;
+}
+.card {
+  padding-top: 18px;
+  position: relative;
+  display: flex;
+}
+
+.card-left {
+  flex: 1;
+}
+
+.card-right {
+  flex: 1.3;
+  padding-left: 6px;
+}
+
+.button {
+  z-index: 10;
+  font-family: Asap;
+  font-size: 14px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  background-color: $app-primary-color;
+  border: $app-primary-color;
+  color: white;
+  cursor: pointer;
+  margin-top: 8px;
+}
+
+.button:hover {
+  background-color: $app-primary-color;
+  color: white;
+}
+
+.banner-img {
+  width: 128px;
+  height: 128px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ffffff;
+  cursor: pointer;
+}
+.details {
+  font-family: Asap;
+  font-size: 14px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: 1.5;
+  letter-spacing: 1.05px;
+  color: #484848;
+}
+
+.badges-container {
+  margin-top: 0.75rem;
+}
+
+.loading-icon {
+  z-index: 20;
+  width: 40px;
+  height: 40px;
+  left: 80px;
+}
+
+.loading-icon :deep(.el-loading-mask) {
+  background-color: rgba(117, 190, 218, 0) !important;
+}
+
+.loading-icon :deep(.el-loading-spinner .path) {
+  stroke: $app-primary-color;
+}
+
+.float-button-container {
+  position: absolute;
+  bottom: 8px;
+  right: 16px;
+  opacity: 0;
+  visibility: hidden;
+
+  .card:hover & {
+    opacity: 1;
+    visibility: visible;
+  }
+}
+</style>

package/src/components/ConnectivityExplorer.vue

@@ -0,0 +1,352 @@
+<template>
+  <div v-if="flatmapKnowledge" class="main">
+    <div class="header">
+      <el-input
+        class="search-input"
+        placeholder="Search"
+        v-model="searchInput"
+        @keyup="search(searchInput)"
+        clearable
+        @clear="clearSearchClicked"
+      ></el-input>
+      <el-button
+        v-show="false"
+        type="primary"
+        class="button"
+        @click="search(searchInput)"
+        size="large"
+      >
+        Search
+      </el-button>
+    </div>
+    <div class="content scrollbar" ref="content">
+      <div v-for="result in paginatedResults" :key="result.id" class="step-item">
+        <connectivity-card
+          class="dataset-card"
+          :entry="result"
+          @mouseenter="hoverChanged(result)"
+          @mouseleave="hoverChanged(undefined)"
+        />
+      </div>
+      <el-pagination
+        class="pagination"
+        v-model:current-page="page"
+        hide-on-single-page
+        large
+        layout="prev, pager, next"
+        :page-size="numberPerPage"
+        :total="numberOfHits"
+        @current-change="pageChange"
+      ></el-pagination>
+    </div>
+  </div>
+</template>
+
+
+
+<script>
+
+const flatmapQuery = (flatmapApi, sql) => {
+  const data = { sql: sql }
+  return fetch(`${flatmapApi}knowledge/query/`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(data),
+  })
+    .then((response) => response.json())
+    .catch((error) => {
+      console.error('Error:', error)
+  })
+}
+
+const filterKnowledge = (knowledge, sckanVersion) => {
+  const result = knowledge.filter((item) => {
+    if (item?.source && item.source === sckanVersion) {
+      if ("connectivity" in item) {
+        return true
+      }
+    }
+    return false
+  })
+  return result
+}
+
+
+/* eslint-disable no-alert, no-console */
+import {
+  ElButton as Button,
+  ElCard as Card,
+  ElDrawer as Drawer,
+  ElIcon as Icon,
+  ElInput as Input,
+  ElPagination as Pagination,
+} from 'element-plus'
+import ConnectivityCard from './ConnectivityCard.vue'
+
+export default {
+  components: {
+    ConnectivityCard,
+    Button,
+    Card,
+    Drawer,
+    Icon,
+    Input,
+    Pagination
+  },
+  name: 'ConnectivityExplorer',
+  props: {
+    sckanVersion: {
+      type: String,
+      default: "sckan-2024-09-21-npo",
+    },
+    envVars: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data: function () {
+    return {
+      mapServer: "",
+      flatmapKnowledge: [],
+      results: [],
+      paginatedResults: [],
+      searchInput: "",
+      lastSearch: "",
+      numberOfHits: 0,
+      numberPerPage: 10,
+      page: 1,
+      previousSearch: undefined
+    }
+  },
+  methods: {
+    hoverChanged: function (data) {
+      this.$emit('hover-changed', data)
+    },
+    resetSearch: function () {
+      this.numberOfHits = 0
+      this.search(this.searchInput)
+    },
+    clearSearchClicked: function () {
+      this.searchInput = '';
+      this.search("");
+    },
+    search: function(input) {
+      this.results = []
+      if (input !== this.previousSearch) {
+        if (input === "") {
+          this.results = this.flatmapKnowledge
+        } else {
+          for (const value of this.flatmapKnowledge) {
+            const lowerCase = input.toLowerCase()
+            const myJSON = JSON.stringify(value).toLowerCase()
+            if (myJSON.includes(lowerCase)) {
+              this.results.push(value)
+            }
+          }
+        }
+      }
+      console.log(this.flatmapKnowledge, this.results)
+      const start = this.numberPerPage * (this.page - 1)
+      this.paginatedResults = this.results.slice(start, start + this.numberPerPage)
+      this.numberOfHits = this.results.length
+      this.searchInput = input
+      this.lastSearch = input
+      console.log(this.numberOfHits)
+    },
+    numberPerPageUpdate: function (val) {
+      this.numberPerPage = val
+      this.pageChange(1)
+    },
+    pageChange: function (page) {
+      this.page = page
+      this.search( this.searchInput)
+    },
+    scrollToTop: function () {
+      if (this.$refs.content) {
+        this.$refs.content.scroll({ top: 0, behavior: 'smooth' })
+      }
+    },
+    resetPageNavigation: function () {
+      this.page = 1
+    },
+  },
+  mounted: function () {
+    this.mapServer = this.envVars.FLATMAPAPI_LOCATION
+    console.log(this.mapServer)
+    if (this.mapServer) {
+      const sql = `select knowledge from knowledge
+        where source="${this.sckanVersion}"
+        order by source desc`;
+      flatmapQuery(this.mapServer, sql).then((response) => {
+        const mappedData = response.values.map(x => x[0])
+        const parsedData = mappedData.map(x => JSON.parse(x))
+        this.flatmapKnowledge = filterKnowledge(parsedData, this.sckanVersion)
+        this.search("");
+      });
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.dataset-card {
+  position: relative;
+
+  &::before {
+    content: "";
+    display: block;
+    width: calc(100% - 15px);
+    height: 100%;
+    position: absolute;
+    top: 7px;
+    left: 7px;
+    border-style: solid;
+    border-radius: 5px;
+    border-color: transparent;
+  }
+
+  &:hover {
+    &::before {
+      border-color: var(--el-color-primary);
+    }
+  }
+}
+
+.main {
+  font-size: 14px;
+  text-align: left;
+  line-height: 1.5em;
+  font-family: Asap, sans-serif, Helvetica;
+  font-weight: 400;
+  /* outline: thin red solid; */
+  overflow-y: auto;
+  scrollbar-width: thin;
+  min-width: 16rem;
+  background-color: #f7faff;
+  height: 100%;
+  border-left: 1px solid var(--el-border-color);
+  border-top: 1px solid var(--el-border-color);
+  display: flex;
+  flex-direction: column;
+  gap: 1.75rem;
+  padding: 1rem;
+}
+
+.step-item {
+  font-size: 14px;
+  margin-bottom: 18px;
+  text-align: left;
+}
+
+.search-input {
+  width: 298px !important;
+  height: 40px;
+  padding-right: 14px;
+
+  :deep(.el-input__inner) {
+    font-family: inherit;
+  }
+}
+
+.header {
+  .el-button {
+    font-family: inherit;
+
+    &:hover,
+    &:focus {
+      background: $app-primary-color;
+      box-shadow: -3px 2px 4px #00000040;
+      color: #fff;
+    }
+  }
+}
+
+.pagination {
+  padding-bottom: 16px;
+  background-color: white;
+  padding-left: 95px;
+  font-weight: bold;
+}
+
+.pagination :deep(button) {
+  background-color: white !important;
+}
+.pagination :deep(li) {
+  background-color: white !important;
+}
+.pagination :deep(li.is-active) {
+  color: $app-primary-color;
+}
+
+.error-feedback {
+  font-family: Asap;
+  font-size: 14px;
+  font-style: italic;
+  padding-top: 15px;
+}
+
+.content-card :deep(.el-card__header) {
+  background-color: #292b66;
+  padding: 1rem;
+}
+
+.content-card :deep(.el-card__body) {
+  background-color: #f7faff;
+  overflow-y: hidden;
+  padding: 1rem;
+}
+
+.content {
+  // width: 515px;
+  flex: 1 1 auto;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+  border: solid 1px #e4e7ed;
+  background-color: #ffffff;
+  overflow-y: scroll;
+  scrollbar-width: thin;
+  border-radius: var(--el-border-radius-base);
+}
+
+.content :deep(.el-loading-spinner .path) {
+  stroke: $app-primary-color;
+}
+
+.content :deep(.step-item:first-child .seperator-path) {
+  display: none;
+}
+
+.content :deep(.step-item:not(:first-child) .seperator-path) {
+  width: 455px;
+  height: 0px;
+  border: solid 1px #e4e7ed;
+  background-color: #e4e7ed;
+}
+
+.scrollbar::-webkit-scrollbar-track {
+  border-radius: 10px;
+  background-color: #f5f5f5;
+}
+
+.scrollbar::-webkit-scrollbar {
+  width: 12px;
+  right: -12px;
+  background-color: #f5f5f5;
+}
+
+.scrollbar::-webkit-scrollbar-thumb {
+  border-radius: 4px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.06);
+  background-color: #979797;
+}
+
+:deep(.el-input__suffix) {
+  padding-right: 0px;
+}
+
+:deep(.my-drawer) {
+  background: rgba(0, 0, 0, 0);
+  box-shadow: none;
+}
+</style>

package/src/components/ConnectivityInfo.vue

@@ -209,6 +209,7 @@
     <div class="content-container" v-show="activeView === 'graphView'">
       <template v-if="graphViewLoaded">
         <connectivity-graph
+          :key="entry.featureId[0]"
           :entry="entry.featureId[0]"
           :mapServer="envVars.FLATMAPAPI_LOCATION"
           :sckanVersion="sckanVersion"

package/src/components/SideBar.vue

@@ -54,16 +54,23 @@
                 @confirm-delete="$emit('confirm-delete', $event)"
               />
             </template>
+            <template v-else-if="tab.type === 'connectivityExplorer'">
+              <connectivity-explorer
+                :ref="'connectivityExplorerTab_' + tab.id"
+                v-show="tab.id === activeTabId"
+                :envVars="envVars"
+              />
+            </template>
             <template v-else>
-            <SidebarContent
-              class="sidebar-content-container"
-              v-show="tab.id === activeTabId"
-              :contextCardEntry="tab.contextCard"
-              :envVars="envVars"
-              :ref="'searchTab_' + tab.id"
-              @search-changed="searchChanged(tab.id, $event)"
-              @hover-changed="hoverChanged($event)"
-            />
+              <SidebarContent
+                class="sidebar-content-container"
+                v-show="tab.id === activeTabId"
+                :contextCardEntry="tab.contextCard"
+                :envVars="envVars"
+                :ref="'searchTab_' + tab.id"
+                @search-changed="searchChanged(tab.id, $event)"
+                @hover-changed="hoverChanged($event)"
+              />
             </template>
           </template>
         </div>
@@ -84,6 +91,7 @@ import EventBus from './EventBus.js'
 import Tabs from './Tabs.vue'
 import AnnotationTool from './AnnotationTool.vue'
 import ConnectivityInfo from './ConnectivityInfo.vue'
+import ConnectivityExplorer from './ConnectivityExplorer.vue'
 
 /**
  * Aims to provide a sidebar for searching capability for SPARC portal.
@@ -98,6 +106,7 @@ export default {
     Icon,
     ConnectivityInfo,
     AnnotationTool,
+    ConnectivityExplorer,
   },
   name: 'SideBar',
   props: {
@@ -126,7 +135,8 @@ export default {
       default: () => [
         { id: 1, title: 'Search', type: 'search' },
         { id: 2, title: 'Connectivity', type: 'connectivity' },
-        { id: 3, title: 'Annotation', type: 'annotation' }
+        { id: 3, title: 'Annotation', type: 'annotation' },
+        { id: 4, title: 'Connectivity Explorer', type: 'connectivityExplorer' }
       ],
     },
     /**
@@ -239,8 +249,8 @@ export default {
     getTabByIdAndType: function (id, type) {
       const tabId = id || this.activeTabId;
       const tabType = type || 'search'; // default to search tab
-      const tabObj = this.tabs.find((tab) => tab.id === tabId && tab.type === tabType);
-      const firstAvailableTab = this.tabs[0];
+      const tabObj = this.activeTabs.find((tab) => tab.id === tabId && tab.type === tabType);
+      const firstAvailableTab = this.activeTabs[0];
       return tabObj || firstAvailableTab;
     },
     /**
@@ -252,6 +262,8 @@ export default {
         refIdPrefix = 'connectivityTab_';
       } else if (type === 'annotation') {
         refIdPrefix = 'annotationTab_';
+      } else if (type === 'connectivityExplorer') {
+        refIdPrefix = 'connectivityExplorerTab_';
       }
       const tabObj = this.getTabByIdAndType(id, type);
       const tabRefId = refIdPrefix + tabObj.id;
@@ -323,16 +335,22 @@ export default {
     },
   },
   computed: {
+    // This should respect the information provided by the property
     activeTabs: function() {
-      const tabs = [
-        { id: 1, title: 'Search', type: 'search' }
-      ];
-      if (this.connectivityInfo) {
-        tabs.push({ id: 2, title: 'Connectivity', type: 'connectivity' });
-      }
-      if (this.annotationEntry && Object.keys(this.annotationEntry).length > 0) {
-        tabs.push({ id: 3, title: 'Annotation', type: 'annotation' });
-      }
+      const tabs = []
+      this.tabs.forEach((tab) => {
+        if (tab.type === "search" || tab.type === "connectivityExplorer") {
+          tabs.push(tab)
+        } else if (tab.type === "connectivity") {
+          if (this.connectivityInfo) {
+            tabs.push(tab);
+          }
+        } else if (tab.type === "annotation") {
+          if (this.annotationEntry && Object.keys(this.annotationEntry).length > 0) {
+            tabs.push(tab);
+          }
+        }
+      })
       return tabs;
     },
   },

package/src/components.d.ts

@@ -9,6 +9,8 @@ declare module 'vue' {
   export interface GlobalComponents {
     AnnotationTool: typeof import('./components/AnnotationTool.vue')['default']
     BadgesGroup: typeof import('./components/BadgesGroup.vue')['default']
+    ConnectivityCard: typeof import('./components/ConnectivityCard.vue')['default']
+    ConnectivityExplorer: typeof import('./components/ConnectivityExplorer.vue')['default']
     ConnectivityInfo: typeof import('./components/ConnectivityInfo.vue')['default']
     DatasetCard: typeof import('./components/DatasetCard.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']