@abi-software/scaffoldvuer 1.4.1-image.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.4.1-image.0",
+  "version": "1.4.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -41,18 +41,17 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/map-utilities": "^1.1.0-beta.2",
+    "@abi-software/map-utilities": "^1.1.2",
     "@abi-software/sparc-annotation": "^0.3.1",
-    "@abi-software/svg-sprite": "^1.0.0",
+    "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
-    "@vue/compat": "^3.4.15",
     "core-js": "^3.22.5",
-    "element-plus": "^2.4.4",
+    "element-plus": "2.8.4",
     "minisearch": "^6.0.1",
     "pinia": "^2.1.7",
     "simple-dropzone": "^0.8.3",
     "unplugin-vue-components": "^0.26.0",
-    "vue": "^3.4.15",
+    "vue": "^3.4.21",
     "vue-router": "^4.2.5",
     "vue3-component-svg-sprite": "^0.0.1",
     "zincjs": "^1.11.4"
@@ -60,11 +59,9 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.6.2",
     "@vuese/markdown-render": "^2.11.3",
-    "@vuese/parser": "^2.9.1",
     "auto-changelog": "^2.4.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
-    "base64-inline-loader": "^2.0.1",
     "chokidar": "^3.6.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.56.0",
@@ -73,7 +70,7 @@
     "vite": "^5.0.10",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vitepress": "^1.0.0-rc.42",
-    "webpack-node-externals": "^2.5.2"
+    "vue-docgen-api": "^4.79.2"
   },
   "eslintConfig": {
     "root": true,
@@ -92,8 +89,5 @@
   "browserslist": [
     "> 1%",
     "last 2 versions"
-  ],
-  "optionalDependencies": {
-    "@rollup/rollup-linux-x64-gnu": "^4.21.1"
-  }
+  ]
 }

package/src/App.vue

@@ -28,7 +28,6 @@
         :format="format"
         :marker-labels="markerLabels"
         :enableLocalAnnotations="false"
-        :sparcAPI="sparcAPI"
         @open-map="openMap"
         @on-ready="onReady"
         @scaffold-selected="onSelected"
@@ -322,9 +321,6 @@ import {
 import { useRoute, useRouter } from 'vue-router'
 import { HelpModeDialog } from '@abi-software/map-utilities'
 import '@abi-software/map-utilities/dist/style.css'
-import { mapStores } from 'pinia';
-import { useSettingsStore } from '@/stores/settings';
-import { getOrganCuries } from '@/services/scicrunchQueries'
 
 let texture_prefix = undefined;
 
@@ -362,7 +358,7 @@ export default {
   },
   data: function () {
     return {
-      consoleOn: false,
+      consoleOn: true,
       createLinesWithNormal: false,
       url: undefined,
       input: undefined,
@@ -410,13 +406,9 @@ export default {
       router: useRouter(),
       ElIconSetting: shallowRef(ElIconSetting),
       ElIconFolderOpened: shallowRef(ElIconFolderOpened),
-      auto: NaN,
-      sparcAPI: import.meta.env.VITE_SPARC_API,
+      auto: NaN
     };
   },
-  computed: {
-    ...mapStores(useSettingsStore),
-  },
   watch: {
     input: function () {
       this.parseInput();
@@ -430,7 +422,7 @@ export default {
           "body proper": 9,
           "Spinal cord": 8,
           "lung": 11,
-          "stomach": 12,
+          "stomach": {number:12, imgURL: 'https://mapcore-bucket1.s3.us-west-2.amazonaws.com/texture/arm1/jpg/0984.jpg'},
           "urinary bladder": 11,
           "Brainstem": 11,
           "heart": 9,
@@ -462,9 +454,6 @@ export default {
   },
   mounted: function () {
     this._objects = [];
-    if (this.sparcAPI) {
-      getOrganCuries(this.sparcAPI).then((organCuries) => this.settingsStore.updateOrganCuries(organCuries))
-    }
   },
   created: function () {
     texture_prefix = import.meta.env.VITE_TEXTURE_FOOT_PREFIX;

package/src/components/ScaffoldTooltip.vue

@@ -14,7 +14,7 @@
       <template #default>
         <div class="tooltip-text">{{ label }}</div>
         <div class="tooltip-text" v-if="region">Region: {{ region }}</div>
-        <CreateTooltipContent
+        <CreateTooltiipContent
           v-show="createData.toBeConfirmed"
           :createData="createData"
           @confirm-create="$emit('confirm-create', $event)"
@@ -22,14 +22,10 @@
         />
         <Tooltip
           class="p-tooltip"
-          v-show="
-            (annotationDisplay && !createData.toBeConfirmed) ||
-            imageEntry.length
-          "
-          ref="tooltip"
-          :tooltipType="annotationDisplay ? 'annotation' : 'image'"
+          v-show="annotationDisplay && !createData.toBeConfirmed"
+          ref="annotationTooltip"
+          :annotationDisplay="true"
           :annotationEntry="annotationEntry"
-          :imageEntry="imageEntry"
         />
         <div v-if="createData.toBeDeleted" class="delete-container">
           <el-row>
@@ -70,9 +66,9 @@ import {
 import {
   Delete as ElIconDelete,
 } from '@element-plus/icons-vue'
+import CreateTooltiipContent from "./CreateTooltipContent.vue";
 import { mapState } from 'pinia';
-import { useMainStore } from "@/stores/index";
-import CreateTooltipContent from "./CreateTooltipContent.vue";
+import { useMainStore } from "@/store/index";
 import { Tooltip } from '@abi-software/map-utilities'
 import '@abi-software/map-utilities/dist/style.css'
 
@@ -83,7 +79,7 @@ export default {
   name: "ScaffoldTooltip",
   components: {
     Col,
-    CreateTooltipContent,
+    CreateTooltiipContent,
     ElIconDelete,
     Icon,
     Popover,
@@ -125,14 +121,6 @@ export default {
       type: Number,
       default: 200,
     },
-    imageThumbnails: {
-      type: Object,
-      default: {},
-    },
-    imageThumbnailSidebar: {
-      type: Boolean,
-      default: false,
-    },
   },
   inject: ['scaffoldUrl'],
   provide() {
@@ -142,6 +130,7 @@ export default {
   },
   data: function () {
     return {
+      display: false,
       annotationEntry: { },
       ElIconDelete: shallowRef(ElIconDelete),
     };
@@ -156,27 +145,11 @@ export default {
       const x = this.x - 40;
       return { left: x + "px", top: this.y - yOffset + "px" };
     },
-    imageEntry: function () {
-      let imageEntries = []
-      const imageThumbnailsEntries = Object.assign({},
-        Object.fromEntries(
-          Object.entries(this.imageThumbnails)
-            .filter(([key, value]) => value.length > 0)
-            .map(([key, value]) => [key.toLowerCase(), value])))
-      const lowerCaseLabel = this.label.toLowerCase()
-      if (lowerCaseLabel in imageThumbnailsEntries) {
-        imageEntries = imageThumbnailsEntries[lowerCaseLabel];
-      }
-      if (this.imageThumbnailSidebar) {
-        this.$emit('image-thumbnail-open', imageEntries)
-        return [];
-      }
-      return imageEntries;
-    },
   },
   methods: {
     checkForDisplay: function () {
       if (this.visible && this.label && this.label !== "") {
+        this.display = true;
         if (this.annotationDisplay) {
           const region = this.region ? this.region +"/" : "";
           this.annotationEntry = {
@@ -185,7 +158,9 @@ export default {
             "resource": encodeURIComponent(this.scaffoldUrl),
           };
         }
-      } else {
+      }
+      else {
+        this.display = false;
         this.annotationEntry = { };
       }
     },