@abi-software/map-side-bar 2.4.2 → 2.5.0-beta.1

package/package.json

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

package/src/App.vue

@@ -14,6 +14,7 @@
       <el-button @click="neuronSearch">open neuron search</el-button>
       <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>
     </div>
     <SideBar
       :envVars="envVars"
@@ -22,6 +23,8 @@
       :visible="sideBarVisibility"
       :tabs="tabs"
       :activeTabId="activeId"
+      :annotationEntry="annotationEntry"
+      :createData="createData"
       :connectivityInfo="connectivityInput"
       @tabClicked="tabClicked"
       @search-changed="searchChanged($event)"
@@ -100,8 +103,16 @@ export default {
   },
   data: function () {
     return {
+      annotationEntry: {
+        featureId :"epicardium",
+        resourceId: "https://mapcore-bucket1.s3-us-west-2.amazonaws.com/others/29_Jan_2020/heartICN_metadata.json","resource":"https://mapcore-bucket1.s3-us-west-2.amazonaws.com/others/29_Jan_2020/heartICN_metadata.json"
+      },
       contextArray: [null, null],
-      tabArray: [{ title: 'Flatmap', id: 1, type: 'search'}, { title: 'Connectivity', id: 2, type: 'connectivity' }],
+      tabArray: [
+        { title: 'Flatmap', id: 1, type: 'search'},
+        { title: 'Connectivity', id: 2, type: 'connectivity' },
+        { title: 'Annotation', id: 3, type: 'annotation' },
+      ],
       sideBarVisibility: true,
       envVars: {
         API_LOCATION: import.meta.env.VITE_APP_API_LOCATION,
@@ -115,6 +126,7 @@ export default {
       },
       connectivityInput: exampleConnectivityInput,
       activeId: 1,
+      createData: null,
     }
   },
   methods: {
@@ -224,6 +236,23 @@ export default {
       let facets = await this.$refs.sideBar.getAlgoliaFacets()
       console.log('Algolia facets:', facets)
     },
+    toggleCreateData : function() {
+      if (!this.createData) {
+        this.createData = {
+          drawingBox: false,
+          toBeConfirmed: true,
+          points: [[1.0, 1.0, 1.0]],
+          shape: "Lines",
+          x: 0,
+          y: 0,
+          editingIndex: -1,
+          faceIndex: -1,
+          toBeDeleted: false,
+        }
+      } else {
+        this.createData = null
+      }
+    }
   },
   mounted: function () {
     console.log('mounted app')

package/src/components/AnnotationTool.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="annotation-tool scrollbar">
+    <CreateTooltipContent
+      v-show="createData && createData.toBeConfirmed"
+      :createData="createData"
+      @confirm-create="$emit('confirm-create', $event)"
+      @cancel-create="$emit('cancel-create')"
+      class="create-tooltip-content"
+    />
+    <annotation-popup
+      v-if="annotationEntry && (!createData || !createData.toBeConfirmed)"
+      class="annotation-popup"
+      :annotationEntry="annotationEntry"
+      @annotation="$emit('annotation', $event)"
+    />
+    <div v-if="createData && createData.toBeDeleted" class="delete-container">
+      <el-row>
+        <el-col :offset="1" :span="6">Delete this feature?</el-col>
+        <el-col :offset="1" :span="3">
+          <el-button
+            class="delete-button"
+            :icon="ElIconDelete"
+            @click="$emit('confirm-delete')"
+            >
+              Delete
+          </el-button>
+        </el-col>
+        <el-col :offset="1" :span="2">
+          <el-button
+            class="delete-button"
+            @click="$emit('cancel-create')"
+            >
+              Dismiss
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { shallowRef } from 'vue';
+import { AnnotationPopup, CreateTooltipContent } from '@abi-software/map-utilities';
+import '@abi-software/map-utilities/dist/style.css';
+import {
+  ElButton as Button,
+  ElCol as Col,
+  ElRow as Row,
+  ElIcon as Icon,
+} from 'element-plus'
+import {
+  Delete as ElIconDelete,
+} from '@element-plus/icons-vue'
+
+export default {
+  name: 'AnnotationTool',
+  components: {
+    AnnotationPopup,
+    Button,
+    CreateTooltipContent,
+    Col,
+    ElIconDelete,
+    Icon,
+    Row,
+  },
+  props: {
+    annotationEntry: {
+      type: Object,
+    },
+    createData: {
+      type: Object,
+      default: {},
+    }
+  },
+  data: function () {
+    return {
+      ElIconDelete: shallowRef(ElIconDelete),
+    };
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.annotation-tool {
+  background-color: #f7faff;
+  height: 100%;
+  overflow-y: auto;
+}
+
+.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;
+}
+
+.annotation-popup.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;
+  max-height: unset;
+  background-color: #f7faff;
+  border-left: 1px solid var(--el-border-color);
+  border-top: 1px solid var(--el-border-color);
+}
+
+.delete-container {
+  margin-top: 12px;
+  margin-bottom: 12px;
+  font-size: 14px;
+  .delete-button {
+    pointer-events: auto;
+    cursor: pointer;
+    margin-left:8px;
+    padding-left: 8px;
+    padding-right: 8px;
+    height: 24px !important;
+    color: $app-primary-color;
+    &:hover {
+      background-color: var(--el-color-primary-light-9);
+    }
+  }
+}
+
+.create-container.create-tooltip-content {
+  background-color: #f7faff;
+}
+
+</style>

package/src/components/SideBar.vue

@@ -22,8 +22,8 @@
         </div>
         <div class="sidebar-container">
           <Tabs
-            v-if="tabs.length > 1 && connectivityInfo"
-            :tabTitles="tabs"
+            v-if="activeTabs.length > 1"
+            :tabTitles="activeTabs"
             :activeId="activeTabId"
             @titleClicked="tabClicked"
             @tab-close="tabClose"
@@ -39,6 +39,18 @@
                 @show-connectivity="showConnectivity"
               />
             </template>
+            <template v-else-if="tab.type === 'annotation'">
+              <annotation-tool
+                :ref="'annotationTab_' + tab.id"
+                v-show="tab.id === activeTabId"
+                :annotationEntry="annotationEntry"
+                :createData="createData"
+                @annotation="$emit('annotation-submitted', $event)"
+                @confirm-create="$emit('confirm-create', $event)"
+                @cancel-create="$emit('cancel-create')"
+                @confirm-delete="$emit('confirm-delete', $event)"
+              />
+            </template>
             <template v-else>
             <SidebarContent
               class="sidebar-content-container"
@@ -67,6 +79,7 @@ import { ElDrawer as Drawer, ElIcon as Icon } from 'element-plus'
 import SidebarContent from './SidebarContent.vue'
 import EventBus from './EventBus.js'
 import Tabs from './Tabs.vue'
+import AnnotationTool from './AnnotationTool.vue'
 import ConnectivityInfo from './ConnectivityInfo.vue'
 
 /**
@@ -81,6 +94,7 @@ export default {
     Drawer,
     Icon,
     ConnectivityInfo,
+    AnnotationTool,
   },
   name: 'SideBar',
   props: {
@@ -108,7 +122,8 @@ export default {
       type: Array,
       default: () => [
         { id: 1, title: 'Search', type: 'search' },
-        { id: 2, title: 'Connectivity', type: 'connectivity' }
+        { id: 2, title: 'Connectivity', type: 'connectivity' },
+        { id: 3, title: 'Annotation', type: 'annotation' }
       ],
     },
     /**
@@ -132,6 +147,17 @@ export default {
       type: Object,
       default: null,
     },
+    /**
+     * The annotation data to show in sidebar.
+     */
+    annotationEntry: {
+      type: Object,
+      default: null,
+    },
+    createData: {
+      type: Object,
+      default: null,
+    }
   },
   data: function () {
     return {
@@ -201,6 +227,8 @@ export default {
       let refIdPrefix = 'searchTab_'; // default to search tab
       if (type === 'connectivity') {
         refIdPrefix = 'connectivityTab_';
+      } else if (type === 'annotation') {
+        refIdPrefix = 'annotationTab_';
       }
       const tabObj = this.getTabByIdAndType(id, type);
       const tabRefId = refIdPrefix + tabObj.id;
@@ -261,7 +289,21 @@ export default {
       this.$emit('tabClicked', {id, type});
     },
     tabClose: function (id) {
-      this.$emit('connectivity-info-close');
+      this.$emit('tab-close', id);
+    },
+  },
+  computed: {
+    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' });
+      }
+      return tabs;
     },
   },
   created: function () {

package/src/components/Tabs.vue

@@ -16,7 +16,7 @@
         </div>
       </div>
       <el-button
-        v-if="title.id === 2"
+        v-if="title.id !== 1"
         @click="tabClose(title.id)"
         class="button-tab-close"
         aria-label="Close"

package/src/components.d.ts

@@ -7,12 +7,14 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
+    AnnotationTool: typeof import('./components/AnnotationTool.vue')['default']
     BadgesGroup: typeof import('./components/BadgesGroup.vue')['default']
     ConnectivityInfo: typeof import('./components/ConnectivityInfo.vue')['default']
     DatasetCard: typeof import('./components/DatasetCard.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCascader: typeof import('element-plus/es')['ElCascader']
+    ElCol: typeof import('element-plus/es')['ElCol']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElIconArrowLeft: typeof import('@element-plus/icons-vue')['ArrowLeft']
@@ -24,6 +26,7 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTag: typeof import('element-plus/es')['ElTag']
     ExternalResourceCard: typeof import('./components/ExternalResourceCard.vue')['default']