@abi-software/map-side-bar 2.11.4 → 2.12.0-acupoints.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-side-bar",
-  "version": "2.11.4",
+  "version": "2.12.0-acupoints.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/App.vue

@@ -18,6 +18,7 @@
       <el-button @click="keywordSearch">keyword search</el-button>
       <el-button @click="getFacets">Get facets</el-button>
       <el-button @click="toggleCreateData">Create Data/Annotation</el-button>
+      <el-button @click="searchAcupoints">Search Acupoints</el-button>
       <el-button @click="openConnectivitySearch()">Connectivity Search</el-button>
     </div>
     <SideBar
@@ -26,14 +27,18 @@
       ref="sideBar"
       :visible="sideBarVisibility"
       :annotationEntry="annotationEntry"
+      :acupointsInfoList="acupoints"
       :createData="createData"
       :connectivityEntry="connectivityEntry"
       :connectivityKnowledge="connectivityKnowledge"
       :showVisibilityFilter="true"
+      :tabs="tabArray"
       @search-changed="searchChanged($event)"
       @hover-changed="hoverChanged($event)"
       @connectivity-hovered="onConnectivityHovered"
       @actionClick="action"
+      @acupoints-clicked="onAcupointsClicked"
+      @acupoints-hovered="onAcupointsHovered"
       @connectivity-collapse-change="onConnectivityCollapseChange"
     />
   </div>
@@ -42,6 +47,7 @@
 <script>
 /* eslint-disable no-alert, no-console */
 // optionally import default styles
+import { acupointEntries } from './acupoints.js'
 import SideBar from './components/SideBar.vue'
 import EventBus from './components/EventBus.js'
 import exampleConnectivityInput from './exampleConnectivityInput.js'
@@ -121,6 +127,14 @@ export default {
   },
   data: function () {
     return {
+      acupoints: acupointEntries,
+      contextArray: [null, null],
+      tabArray: [
+        { title: 'Dataset Explorer', id: 1, type: 'datasetExplorer', closable: false },
+        { title: 'Connectivity Explorer', id: 2, type: 'connectivityExplorer', closable: false },
+        { title: 'Annotation', id: 3, type: 'annotation', closable: true },
+        {title: 'Acupoints', id: 4, type: 'acupoints' },
+      ],
       annotationEntry: [{
         featureId: "epicardium",
         resourceId: "https://mapcore-bucket1.s3-us-west-2.amazonaws.com/others/29_Jan_2020/heartICN_metadata.json",
@@ -156,6 +170,12 @@ export default {
     }
   },
   methods: {
+    onAcupointsClicked: function (data) {
+      console.log("acupoints-clicked", data)
+    },
+    onAcupointsHovered: function (data) {
+      console.log("acupoints-hovered", data)
+    },
     loadConnectivityKnowledge: async function () {
       const sql = `select knowledge from knowledge
         where source="${this.sckanVersion}"
@@ -232,6 +252,9 @@ export default {
         'http://purl.obolibrary.org/obo/UBERON_0001103'
       )
     },
+    searchAcupoints: function() {
+      this.$refs.sideBar.openAcupointsSearch("LU 1")
+    },
     singleFacets: function () {
       this.$refs.sideBar.addFilter({
         facet: 'Cardiovascular system',
@@ -406,4 +429,4 @@ body {
   align-items: center;
   gap: 0.5rem;
 }
-</style>
+</style>./acupoints.js

package/src/acupoints.js

@@ -0,0 +1,49 @@
+export const acupointEntries = {
+  "LU 1": {
+      "Acupoint": "LU 1",
+      "Label": "LU 1",
+      "Synonym": "Test data",
+      "UMLS CUI": "",
+      "Meridian": "LTest data",
+      "Chinese Name": "Zhongfu",
+      "English Name": "Central Treasury",
+      "Location": " z zxczc.",
+      "Reference": "Test data",
+      "Indications": "Test data",
+      "Acupuncture Method": "Test data",
+      "Vasculature": "Test data",
+      "Innervation": "Test data",
+      "Curated": false,
+  },
+  "LU 2": {
+      "Acupoint": "LU 2",
+      "Label": "LU 2",
+      "Synonym": "Test data",
+      "UMLS CUI": "",
+      "Meridian": "LTest data",
+      "Chinese Name": "Yunmen",
+      "English Name": "Cloud Gate",
+      "Location": " z zxczc.",
+      "Reference": "Test data",
+      "Indications": "Test data",
+      "Acupuncture Method": "Test data",
+      "Vasculature": "Test data",
+      "Innervation": "Test data",
+      "Curated": true,
+  },
+  "ST 3": {
+    "Acupoint": "ST 3",
+    "Label": "ST 3",
+    "Synonym": "Test data",
+    "UMLS CUI": "",
+    "Meridian": "STest data",
+    "Chinese Name": "Cheng Qi",
+    "English Name": "Not Available",
+    "Location": " z zxcxadadadzc.",
+    "Reference": "Test data",
+    "Indications": "Test data",
+    "Acupuncture Method": "Test data",
+    "Vasculature": "Test data",
+    "Innervation": "Test data"
+  }
+}

package/src/algolia/algolia.js

@@ -187,24 +187,47 @@ export class AlgoliaClient {
    * This is using fetch from the Algolia API
    */
   search(filter, query = '', hitsperPage = 10, page = 1) {
+    const terms = query.replaceAll('"', '').split(",")
+    let processed = "";
+    const optionalWords = [];
+    if (terms) {
+      if (terms.length === 1 && (!(query.includes(" ")))) {
+        processed = query;
+      } else {
+        terms.forEach(term => {
+          optionalWords.push(term.trim())
+          processed += `"${term.trim()}" `;
+        });
+      }
+    }
+    processed = processed.trim()
+
+    const payload = {
+      advancedSyntax: true,
+      advancedSyntaxFeatures: ['exactPhrase'],
+      queryType: 'prefixAll',
+      facets: ['*'],
+      hitsPerPage: hitsperPage,
+      page: page - 1,
+      filters: filter,
+      attributesToHighlight: [],
+      attributesToRetrieve: [
+        'pennsieve.publishDate',
+        'pennsieve.updatedAt',
+        'item.curie',
+        'item.name',
+        'item.description',
+        'objectID',
+        'anatomy.organ.curie'
+      ],
+    }
+    if (optionalWords.length > 1) {
+      payload.optionalWords = optionalWords
+    }
+
     return new Promise(resolve => {
       this.index
-        .search(query, {
-          facets: ['*'],
-          hitsPerPage: hitsperPage,
-          page: page - 1,
-          filters: filter,
-          attributesToHighlight: [],
-          attributesToRetrieve: [
-            'pennsieve.publishDate',
-            'pennsieve.updatedAt',
-            'item.curie',
-            'item.name',
-            'item.description',
-            'objectID',
-            'anatomy.organ.curie'
-          ],
-        })
+        .search(processed, payload)
         .then(response => {
           let searchData = {
             items: this._processResultsForCards(response.hits),
@@ -299,7 +322,7 @@ export class AlgoliaClient {
     const anatomyOrganSubcategoryNames = anatomyOrganSubcategoryName ? Object.keys(anatomyOrganSubcategoryName) : []
     const anatomyOrganSubsubcategoryNames = anatomyOrganSubsubcategoryName ? Object.keys(anatomyOrganSubsubcategoryName) : []
     const filteredOrganNames = []
-  
+
     anatomyOrganCategoryNames.forEach((_categoryName) => {
       const categoryName = _categoryName.toLowerCase();
       anatomyOrganNames.forEach((_organName) => {
@@ -313,7 +336,7 @@ export class AlgoliaClient {
           } else {
             return anatomyOrganSubsubcategoryNames.find((name) => {
               const fullsubsubname = `${subcategoryName}.${organName}`
-              return (fullsubsubname === name) 
+              return (fullsubsubname === name)
             })
           }
         });

package/src/assets/searchPopover.scss

@@ -0,0 +1,90 @@
+
+.filter-help-popover {
+  font-family: 'Asap', sans-serif;
+  background: #f3ecf6 !important;
+  border: 1px solid $app-primary-color !important;
+  border-radius: 4px !important;
+  color: #303133 !important;
+  font-size: 12px !important;
+  line-height: 18px !important;
+
+  > div {
+    word-break: break-word;
+    text-align: initial;
+  }
+
+  ul {
+    padding-left: 1.5rem;
+
+    > li + li {
+      margin-top: 0.5rem;
+    }
+  }
+
+  .el-popper__arrow::before {
+    background: #f3ecf6 !important;
+    border-color: $app-primary-color !important;
+  }
+
+  &[data-popper-placement^=bottom] .el-popper__arrow:before {
+    border-bottom-color: transparent !important;
+    border-right-color: transparent !important;
+  }
+
+  code {
+    font-size: 90%;
+  }
+}
+
+.header {
+  display: flex;
+  align-items: center;
+
+  .el-button {
+    font-family: inherit;
+
+    &:hover,
+    &:focus {
+      background: $app-primary-color;
+      box-shadow: -3px 2px 4px #00000040;
+      color: #ffffff;
+    }
+  }
+}
+
+.help {
+  width: 24px !important;
+  height: 24px;
+  transform: scale(1.1);
+  cursor: pointer;
+  color: #ffffff !important;
+}
+
+.search-input {
+  width: 298px !important;
+  height: 40px;
+  padding-right: 14px;
+  font-family: inherit;
+
+  :deep(.el-input__inner) {
+    font-family: inherit;
+  }
+}
+
+.search-input-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .map-icon {
+    position: absolute;
+    right: 18px;
+    color: $app-primary-color !important;
+  }
+
+  &.is-focus {
+    .map-icon {
+      display: none;
+    }
+  }
+}

package/src/components/AcupointsCard.vue

@@ -0,0 +1,215 @@
+<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">
+          <el-collapse class="collapse-card" v-model="expanded" @change="expandedChanged">
+            <el-collapse-item :title="entry.Acupoint" name="1" class="collapse-card">
+              <template v-for="field in displayFields" :key="field['name']">
+                <div class="details" >
+                  <strong>{{ field['name'] }}: </strong>
+                  <span
+                    v-if="!field['isEditing']"
+                    @click="field['isEditing'] = true"
+                  >
+                    {{ entry[field['name']] || 'Not Available' }}
+                  </span>
+                  <el-input
+                    v-else
+                    v-model="entry[field['name']]"
+                    @blur="field['isEditing'] = false"
+                    @keyup.enter="field['isEditing'] = false"
+                    @vue:mounted="inputMounted"
+                    type="textarea"
+                  />
+                </div>
+              </template>
+          </el-collapse-item>
+          </el-collapse>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import EventBus from './EventBus.js'
+/* eslint-disable no-alert, no-console */
+
+export default {
+  data() {
+    return {
+      expanded: [],
+      displayFields: [
+        {name: "Synonym", isEditing: false},
+        {name: "Chinese Name", isEditing: false},
+        {name: "English Name", isEditing: false},
+        {name: "Reference", isEditing: false},
+        {name: "Indications", isEditing: false},
+        {name: "Acupuncture Method", isEditing: false},
+        {name: "Vasculature", isEditing: false},
+        {name: "Innervation", isEditing: false},
+        {name: "Notes", isEditing: false},
+      ]
+    }
+  },
+  name: 'AcupointsCard',
+  props: {
+    /**
+     * Object containing information for
+     * the required viewing.
+     */
+    entry: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  methods: {
+    expandedChanged: function() {
+      if (this.expanded.length > 0) {
+        EventBus.emit('acupoints-clicked', this.entry);
+      }
+    },
+    cardClicked: function (data) {
+      EventBus.emit('acupoints-clicked', data);
+    },
+    cardHovered: function (data) {
+      EventBus.emit('acupoints-hovered', data);
+    },
+    inputMounted: function(event) {
+      event.el?.querySelector('textarea')?.focus();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+:deep(.el-collapse-item__header) {
+  font-weight: bold;
+}
+
+:deep(.el-collapse-item__content) {
+  padding-bottom: 4px;
+}
+
+:deep(.el-collapse-item__wrap) {
+  border: none;
+}
+
+.collapse-card {
+  border-top: none;
+  :deep(.el-collapse-item__header) {
+    border-bottom: none;
+  }
+}
+
+.dataset-card {
+  padding-left: 5px;
+  padding-right: 5px;
+  position: relative;
+}
+
+.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: 12px;
+  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>