From e8f32265c3cca8501da98a2d255141581651f85e Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Wed, 23 Oct 2024 16:05:39 +1300
Subject: [PATCH 1/8] Improve inject provide for annotator.

---
 src/App.vue                     | 11 +++++++++--
 src/components/ScaffoldVuer.vue | 15 +++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f65fe3d..e74a2a1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -297,7 +297,8 @@
 
 <script>
 /* eslint-disable no-alert, no-console */
-import { shallowRef } from 'vue';
+import { AnnotationService } from '@abi-software/sparc-annotation'
+import { markRaw, shallowRef } from 'vue';
 import { ScaffoldVuer } from "./components/index.js";
 import DropZone from "./app/DropZone.vue";
 import ModelsTable from "./app/ModelsTable.vue";
@@ -356,6 +357,11 @@ export default {
     ModelsTable,
     HelpModeDialog,
   },
+  provide() {
+    return {
+      $annotator: this.annotator,
+    }
+  },
   data: function () {
     return {
       consoleOn: true,
@@ -406,7 +412,8 @@ export default {
       router: useRouter(),
       ElIconSetting: shallowRef(ElIconSetting),
       ElIconFolderOpened: shallowRef(ElIconFolderOpened),
-      auto: NaN
+      auto: NaN,
+      annotator: markRaw(new AnnotationService(`https://mapcore-demo.org/devel/flatmap/v4/annotator`)),
     };
   },
   watch: {
diff --git a/src/components/ScaffoldVuer.vue b/src/components/ScaffoldVuer.vue
index aab999a..02464a7 100644
--- a/src/components/ScaffoldVuer.vue
+++ b/src/components/ScaffoldVuer.vue
@@ -382,7 +382,7 @@
 
 <script>
 /* eslint-disable no-alert, no-console */
-import { markRaw, shallowRef } from 'vue';
+import { inject, markRaw, provide, shallowRef } from 'vue';
 import {
   WarningFilled as ElIconWarningFilled,
   ArrowDown as ElIconArrowDown,
@@ -454,8 +454,16 @@ export default {
     ScaffoldTreeControls
   },
   setup(props) {
-    const annotator = markRaw(new AnnotationService(`${props.flatmapAPI}annotator`));
-    return { annotator };
+    let annotator = inject('$annotator')
+    if (!annotator) {
+      console.log("Not defined")
+      annotator = markRaw(new AnnotationService(`${props.flatmapAPI}annotator`));
+      provide('$annotator', annotator)
+    } else {
+      console.log("defined")
+    }
+    console.log(annotator)
+    return { annotator }
   },
   props: {
     /**
@@ -698,7 +706,6 @@ export default {
     return {
       flatmapAPI: this.flatmapAPI,
       scaffoldUrl: this.url,
-      $annotator: this.annotator,
       boundingDims: this.boundingDims,
     };
   },

From 71863ca1444ecf49c03ae88b7a336ad8429ffb83 Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Fri, 25 Oct 2024 14:41:21 +1300
Subject: [PATCH 2/8] Move create tooltip content.

---
 package-lock.json                       |   8 +-
 package.json                            |   2 +-
 src/components/CreateTooltipContent.vue | 201 ------------------------
 src/components/ScaffoldTooltip.vue      |   7 +-
 src/components/ScaffoldVuer.vue         |   7 +
 5 files changed, 15 insertions(+), 210 deletions(-)
 delete mode 100644 src/components/CreateTooltipContent.vue

diff --git a/package-lock.json b/package-lock.json
index f461fb7..0576f4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.5.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@abi-software/map-utilities": "^1.1.2",
+        "@abi-software/map-utilities": "^1.2.0-beta.3",
         "@abi-software/sparc-annotation": "^0.3.1",
         "@abi-software/svg-sprite": "^1.0.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -42,9 +42,9 @@
       }
     },
     "node_modules/@abi-software/map-utilities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.1.2.tgz",
-      "integrity": "sha512-NMERIqSq6pVwy7Daq+Uip8Cm1UE2KEJoquOqVXACrMoTDHV77LPbWAtawn3f7De5HK69oqLwZ+wbnFLy5aisrQ==",
+      "version": "1.2.0-beta.3",
+      "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.2.0-beta.3.tgz",
+      "integrity": "sha512-3o1s/9NB5zzJQ2XYdlG8P/uw1ZjK6zPwrc7ixE0wBBPN+wo1G9hb/DceI0vdWDA9sZe2F2LUoaWUyK6ZzlMWgA==",
       "dependencies": {
         "@abi-software/svg-sprite": "^1.0.1",
         "@element-plus/icons-vue": "^2.3.1",
diff --git a/package.json b/package.json
index 64b41b4..c8be44c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/map-utilities": "^1.1.2",
+    "@abi-software/map-utilities": "^1.2.0-beta.3",
     "@abi-software/sparc-annotation": "^0.3.1",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
diff --git a/src/components/CreateTooltipContent.vue b/src/components/CreateTooltipContent.vue
deleted file mode 100644
index e0450c9..0000000
--- a/src/components/CreateTooltipContent.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-<template>
-  <el-container class="create-container">
-    <el-header height="30px" class="header">
-      <div>Create {{ createData.shape }}</div>
-    </el-header>
-    <el-main class="slides-block">
-      <span class="create-text">
-        Primitives will be created in the
-        <br>
-        __annotation region
-      </span>
-      <el-row class="row" v-show="showPoint">
-        <el-col :offset="0" :span="8">
-          Position:
-        </el-col>
-        <el-col :offset="0" :span="16">
-          <el-row v-for="{ value, i } in createData.points" :key="i" class="value">
-            {{ i }}
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row class="row">
-        <el-col :offset="0" :span="8">
-          Region:
-        </el-col>
-        <el-col :offset="0" :span="16">
-          <el-input
-            v-model="region"
-            placeholder="__annotation"
-            size="small"
-          />
-        </el-col>
-      </el-row>
-      <el-row class="row">
-        <el-col :offset="0" :span="8">
-          Group:
-        </el-col>
-        <el-col :offset="0" :span="16">
-          <el-input
-            v-model="group"
-            :placeholder="createData.shape"
-            size="small"
-          />
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :offset="0" :span="12">
-          <el-button
-            type="primary"
-            plain
-            @click="confirm"
-          >
-            {{ confirmText }}
-          </el-button>
-        </el-col>
-        <el-col :offset="0" :span="12">
-          <el-button
-            type="primary"
-            plain
-            @click="cancel"
-          >
-            Cancel
-          </el-button>
-        </el-col>
-      </el-row>
-    </el-main>
-  </el-container>
-</template>
-
-<script>
-/* eslint-disable no-alert, no-console */
-
-import {
-  ElButton as Button,
-  ElCol as Col,
-  ElContainer as Container,
-  ElHeader as Header,
-  ElInput as Input,
-  ElMain as Main,
-
-} from "element-plus";
-
-/**
- * A component to control the opacity of the target object.
- */
-export default {
-  name: "CreateTooltipContent",
-  components: {
-    Button,
-    Col,
-    Container,
-    Header,
-    Input,
-    Main,
-  },
-  props: {
-    createData: {
-      type: Object,
-    },
-  },
-  watch: {
-    "createData.shape": {
-      handler: function (value) {
-        this.group = value;
-        this.$emit("cancel-create");
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    confirmText: function () {
-      if (this.createData.editingIndex > -1) {
-        return "Edit";
-      }
-      return "Confirm";
-    },
-  },
-  data: function () {
-    return {
-      group: "default",
-      region: "",
-      showPoint: false,
-    }
-  },
-  methods: {
-    confirm: function () {
-      this.$emit(
-        "confirm-create", 
-        { 
-          region: "__annotation/" + this.region, 
-          group: this.group,
-          shape: this.createData.shape,
-          editingIndex: this.createData.editingIndex,
-        }
-      );
-      this.group = this.createData.shape;
-    },
-    cancel: function () {
-      this.$emit("cancel-create");
-    },
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-.header {
-  color: #606266;
-  line-height: 1;
-  padding: 8px 17px 1px 15px;
-  border-bottom: 1px solid #ebeef5;
-  font-size: 14px;
-}
-
-.row {
-  margin: 4px;
-  text-align: left;
-}
-
-:deep(.create-text) {
-  max-width: 220px;
-  height:35px;
-  font-size: 12px;
-}
-
-
-.create-container {
-  width: 250px;
-  height: auto;
-  border-radius: 4px;
-  border: solid 1px #d8dce6;
-  background-color: #fff;
-  overflow-y: none;
-  user-select: auto;
-  pointer-events: auto;
-}
-
-.value {
-  font-size: 12px;
-}
-
-.input-box {
-  width: 42px;
-  border-radius: 4px;
-  border: 1px solid rgb(144, 147, 153);
-  background-color: var(--white);
-  font-weight: 500;
-  color: rgb(48, 49, 51);
-  margin-left: 8px;
-  height: 24px;
-
-  &.number-input {
-    width: 42px;
-    :deep(.el-input__wrapper) {
-      padding-left: 0px;
-      padding-right: 0px;
-    }
-  }
-}
-
-</style>
diff --git a/src/components/ScaffoldTooltip.vue b/src/components/ScaffoldTooltip.vue
index 54202e5..571bb5e 100644
--- a/src/components/ScaffoldTooltip.vue
+++ b/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>
-        <CreateTooltiipContent
+        <CreateTooltipContent
           v-show="createData.toBeConfirmed"
           :createData="createData"
           @confirm-create="$emit('confirm-create', $event)"
@@ -66,10 +66,9 @@ import {
 import {
   Delete as ElIconDelete,
 } from '@element-plus/icons-vue'
-import CreateTooltiipContent from "./CreateTooltipContent.vue";
 import { mapState } from 'pinia';
 import { useMainStore } from "@/store/index";
-import { Tooltip } from '@abi-software/map-utilities'
+import { CreateTooltipContent, Tooltip } from '@abi-software/map-utilities'
 import '@abi-software/map-utilities/dist/style.css'
 
 /**
@@ -79,7 +78,7 @@ export default {
   name: "ScaffoldTooltip",
   components: {
     Col,
-    CreateTooltiipContent,
+    CreateTooltipContent,
     ElIconDelete,
     Icon,
     Popover,
diff --git a/src/components/ScaffoldVuer.vue b/src/components/ScaffoldVuer.vue
index 02464a7..1a973a5 100644
--- a/src/components/ScaffoldVuer.vue
+++ b/src/components/ScaffoldVuer.vue
@@ -712,6 +712,13 @@ export default {
   data: function () {
     return {
       annotator: undefined,
+      /**
+      * The option to show connectivity information in sidebar
+      */
+      annotationSidebar: {
+        type: Boolean,
+        default: false,
+      },
       createData: {
         drawingBox: false,
         toBeConfirmed: false,

From 0f914aff457a71c5f67409b682ae5211b84908bb Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Wed, 30 Oct 2024 15:33:06 +1300
Subject: [PATCH 3/8] Support annotation on sidebar.

---
 package-lock.json                  | 14 ++---
 package.json                       |  2 +-
 src/components.d.ts                |  7 ---
 src/components/ScaffoldTooltip.vue |  4 +-
 src/components/ScaffoldVuer.vue    | 86 +++++++++++++++++++++++-------
 5 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0576f4b..8e0d222 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.5.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@abi-software/map-utilities": "^1.2.0-beta.3",
+        "@abi-software/map-utilities": "^1.2.0-beta.8",
         "@abi-software/sparc-annotation": "^0.3.1",
         "@abi-software/svg-sprite": "^1.0.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -42,9 +42,9 @@
       }
     },
     "node_modules/@abi-software/map-utilities": {
-      "version": "1.2.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.2.0-beta.3.tgz",
-      "integrity": "sha512-3o1s/9NB5zzJQ2XYdlG8P/uw1ZjK6zPwrc7ixE0wBBPN+wo1G9hb/DceI0vdWDA9sZe2F2LUoaWUyK6ZzlMWgA==",
+      "version": "1.2.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.2.0-beta.8.tgz",
+      "integrity": "sha512-cVAJagFLI/KErjn/Vx0v1aMcZnTVG/6+Ofbq9G23DU1NZrNPG04ApFXfWXYwcDGw6BYsyY2WaQ4tLzVNhpGEUA==",
       "dependencies": {
         "@abi-software/svg-sprite": "^1.0.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -3419,9 +3419,9 @@
       }
     },
     "node_modules/elliptic": {
-      "version": "6.5.7",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz",
-      "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
+      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
       "dev": true,
       "dependencies": {
         "bn.js": "^4.11.9",
diff --git a/package.json b/package.json
index c8be44c..a644415 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/map-utilities": "^1.2.0-beta.3",
+    "@abi-software/map-utilities": "^1.2.0-beta.8",
     "@abi-software/sparc-annotation": "^0.3.1",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",
diff --git a/src/components.d.ts b/src/components.d.ts
index 0ea73c3..e08c7ce 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,22 +7,18 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
-    CreateTooltipContent: typeof import('./components/CreateTooltipContent.vue')['default']
-    ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCollapse: typeof import('element-plus/es')['ElCollapse']
     ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElFooter: typeof import('element-plus/es')['ElFooter']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElIconArrowLeft: typeof import('@element-plus/icons-vue')['ArrowLeft']
     ElIconArrowRight: typeof import('@element-plus/icons-vue')['ArrowRight']
     ElIconDelete: typeof import('@element-plus/icons-vue')['Delete']
     ElIconPlus: typeof import('@element-plus/icons-vue')['Plus']
     ElIconWarningFilled: typeof import('@element-plus/icons-vue')['WarningFilled']
-    ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMain: typeof import('element-plus/es')['ElMain']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -30,9 +26,6 @@ declare module 'vue' {
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     LinesControls: typeof import('./components/LinesControls.vue')['default']
diff --git a/src/components/ScaffoldTooltip.vue b/src/components/ScaffoldTooltip.vue
index 571bb5e..a014a65 100644
--- a/src/components/ScaffoldTooltip.vue
+++ b/src/components/ScaffoldTooltip.vue
@@ -164,9 +164,7 @@ export default {
       }
     },
     hideTriggered: function() {
-      if (this.createData.toBeConfirmed) {
-        this.$emit('cancel-create');
-      }
+      this.$emit('tooltip-hide');
     },
   },
   watch: {
diff --git a/src/components/ScaffoldVuer.vue b/src/components/ScaffoldVuer.vue
index 1a973a5..b51772d 100644
--- a/src/components/ScaffoldVuer.vue
+++ b/src/components/ScaffoldVuer.vue
@@ -17,7 +17,8 @@
       :annotationDisplay="annotationDisplay"
       @confirm-create="confirmCreate($event)"
       @cancel-create="cancelCreate()"
-      @confirm-delete="confirmDelete($event)"
+      @confirm-delete="confirmDelete()"
+      @tooltip-hide="onTooltipHide()"
     />
     <div
       id="organsDisplayArea"
@@ -466,6 +467,13 @@ export default {
     return { annotator }
   },
   props: {
+    /**
+      * The option to show annotation information in sidebar
+      */
+    annotationSidebar: {
+      type: Boolean,
+      default: false,
+    },
     /**
      * URL of the zincjs metadata. This value will be ignored if a valid
      * state prop is also provided.
@@ -712,13 +720,6 @@ export default {
   data: function () {
     return {
       annotator: undefined,
-      /**
-      * The option to show connectivity information in sidebar
-      */
-      annotationSidebar: {
-        type: Boolean,
-        default: false,
-      },
       createData: {
         drawingBox: false,
         toBeConfirmed: false,
@@ -916,6 +917,24 @@ export default {
       }
       this.previousMarkerLabels = markRaw({...labels});
     },
+    annotationDisplay: function(value) {
+      if (this.annotationSidebar) {
+        if (value) {
+          const region = this.tData.region ? this.tData.region +"/" : "";
+          const annotationEntry = {
+            "featureId": region + this.tData.label,
+            "resourceId": this.url,
+            "resource": this.url,
+          };
+          this.$emit('annotation-open', {annotationEntry: annotationEntry,
+            commitCallback: this.commitAnnotationEvent});
+        } else {
+          if (!this.createData.toBeConfirmed || !this.createData.toBeDeleted) {
+            this.$emit("annotation-close");
+          }
+        }
+      }
+    }
   },
   beforeCreate: function () {
     this.$module = new OrgansViewer();
@@ -1170,6 +1189,7 @@ export default {
      * Cancel create workflows. Reset all relevant UIs and data.
      */
     cancelCreate: function() {
+      console.log("cancel Create on scaffold")
       this.createData.points.length = 0;
       this.createData.toBeConfirmed = false;
       this._editingZincObject = undefined;
@@ -1185,13 +1205,16 @@ export default {
         this.$module.scene.removeTemporaryPrimitive(this._tempPoint);
         this._tempPoint = undefined;
       }
+      if (this.annotationSidebar){
+        this.$emit("annotation-close");
+      }
     },
     /**
      * Internal only.
      * Confirm delete of user created primitive.
      * This is only called from callback.
      */
-     confirmDelete: function() {
+    confirmDelete: function() {
       if (this._editingZincObject?.isEditable) {
         const regionPath = this._editingZincObject.region.getFullPath() + "/";
         const group = this._editingZincObject.groupName;
@@ -1205,6 +1228,15 @@ export default {
       }
       this.cancelCreate();
     },
+    /**
+     * Internal only.
+     * This is triggered when tooltip is hidden
+     */
+     onTooltipHide: function() {
+      if (this.createData.toBeConfirmed && !this.annotationSidebar) {
+        this.cancelCreate();
+      }
+    },
     formatTooltip(val) {
       if (this.timeMax >= 1000) {
         if (val) {
@@ -1401,21 +1433,21 @@ export default {
       if (this.createData.toBeConfirmed === false) {
         this.createData.points.length = 0;
         this.createData.points.push(coords);
+        this.createData.toBeConfirmed = true;
         this.showRegionTooltipWithAnnotations(data, true, false);
         this.tData.x = 50;
         this.tData.y = 200;
         this._tempPoint = this.$module.scene.addTemporaryPoints([coords], 0xffff00);
-        this.createData.toBeConfirmed = true;
       }
     },
     drawLine: function(coords, data) {
       if (this.createData.toBeConfirmed === false) {
         if (this.createData.points.length === 1) {
           this.createData.points.push(coords);
+          this.createData.toBeConfirmed = true;
           this.showRegionTooltipWithAnnotations(data, true, false);
           this.tData.x = 50;
           this.tData.y = 200;
-          this.createData.toBeConfirmed = true;
         } else {
           this._tempPoint = this.$module.scene.addTemporaryPoints([coords], 0xffff00);
           this.createData.points.push(coords);
@@ -1895,13 +1927,31 @@ export default {
       if (this.$module.scene) {
         const result = getObjectsFromAnnotations(this.$module.scene, annotations);
         if (result && result.objects.length > 0) {
-          return this.showRegionTooltipWithObjects(
-            result.label,
-            result.objects,
-            result.regionPath,
-            resetView,
-            liveUpdates
-          );
+          if (!this.annotationSidebar) {
+            return this.showRegionTooltipWithObjects(
+              result.label,
+              result.objects,
+              result.regionPath,
+              resetView,
+              liveUpdates
+            );
+          } else {
+            this.tData.visible = false;
+            const region = this.tData.region ? this.tData.region +"/" : "";
+            const annotationEntry = {
+              "featureId": region + this.tData.label,
+              "resourceId": this.url,
+              "resource": this.url,
+            };
+            this.$emit('annotation-open', {
+              annotationEntry: annotationEntry,
+              createData: this.createData,
+              confirmCreate: this.confirmCreate,
+              cancelCreate: this.cancelCreate,
+              confirmDelete: this.confirmDelete,
+            });
+            return;
+          }
         }
       }
       this.hideRegionTooltip();

From 0fc889452c2392da557252143e87798907be0372 Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Thu, 31 Oct 2024 09:24:38 +1300
Subject: [PATCH 4/8] Remove debug message.

---
 src/components/ScaffoldVuer.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/ScaffoldVuer.vue b/src/components/ScaffoldVuer.vue
index b51772d..f919873 100644
--- a/src/components/ScaffoldVuer.vue
+++ b/src/components/ScaffoldVuer.vue
@@ -457,13 +457,9 @@ export default {
   setup(props) {
     let annotator = inject('$annotator')
     if (!annotator) {
-      console.log("Not defined")
       annotator = markRaw(new AnnotationService(`${props.flatmapAPI}annotator`));
       provide('$annotator', annotator)
-    } else {
-      console.log("defined")
     }
-    console.log(annotator)
     return { annotator }
   },
   props: {
@@ -1189,7 +1185,6 @@ export default {
      * Cancel create workflows. Reset all relevant UIs and data.
      */
     cancelCreate: function() {
-      console.log("cancel Create on scaffold")
       this.createData.points.length = 0;
       this.createData.toBeConfirmed = false;
       this._editingZincObject = undefined;

From b7742f55fb6284611d38e2c0cabb3c19c50029c8 Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Thu, 31 Oct 2024 13:20:13 +1300
Subject: [PATCH 5/8] Increment beta version.

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8e0d222..1a84dbf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.5.1",
+  "version": "1.6.0-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@abi-software/scaffoldvuer",
-      "version": "1.5.1",
+      "version": "1.6.0-beta.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@abi-software/map-utilities": "^1.2.0-beta.8",
diff --git a/package.json b/package.json
index a644415..395474c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.5.1",
+  "version": "1.6.0-beta.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

From cb7b00431a9f7f7df3fbb82c2ee61f92c2a4eeed Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Thu, 31 Oct 2024 13:26:49 +1300
Subject: [PATCH 6/8] 1.6.0-beta.1

---
 CHANGELOG.md      | 10 +++++++++-
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f176c7..86da40f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [v1.5.1](https://github.com/alan-wu/scaffoldvuer/compare/v1.5.0...v1.5.1)
+## [v1.6.0-beta.1](https://github.com/alan-wu/scaffoldvuer/compare/v1.5.1...v1.6.0-beta.1)
+
+### Commits
+
+- Move create tooltip content. [`71863ca`](https://github.com/alan-wu/scaffoldvuer/commit/71863ca1444ecf49c03ae88b7a336ad8429ffb83)
+- Support annotation on sidebar. [`0f914af`](https://github.com/alan-wu/scaffoldvuer/commit/0f914aff457a71c5f67409b682ae5211b84908bb)
+- Improve inject provide for annotator. [`e8f3226`](https://github.com/alan-wu/scaffoldvuer/commit/e8f32265c3cca8501da98a2d255141581651f85e)
+
+## [v1.5.1](https://github.com/alan-wu/scaffoldvuer/compare/v1.5.0...v1.5.1) - 2024-10-16
 
 ### Commits
 
diff --git a/package-lock.json b/package-lock.json
index 1a84dbf..a00a403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.6.0-beta.0",
+  "version": "1.6.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@abi-software/scaffoldvuer",
-      "version": "1.6.0-beta.0",
+      "version": "1.6.0-beta.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@abi-software/map-utilities": "^1.2.0-beta.8",
diff --git a/package.json b/package.json
index 395474c..736ab93 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/scaffoldvuer",
-  "version": "1.6.0-beta.0",
+  "version": "1.6.0-beta.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

From 4cbc3172edcb61b24f3435379ea948e1eef4750d Mon Sep 17 00:00:00 2001
From: "David J. Yu" <87633683+ddjnw1yu@users.noreply.github.com>
Date: Thu, 14 Nov 2024 10:54:55 +1300
Subject: [PATCH 7/8] Fix some issues

---
 src/components/ScaffoldVuer.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/ScaffoldVuer.vue b/src/components/ScaffoldVuer.vue
index f919873..0774e40 100644
--- a/src/components/ScaffoldVuer.vue
+++ b/src/components/ScaffoldVuer.vue
@@ -1327,6 +1327,7 @@ export default {
     toggleDrawing: function (type, icon) {
       this.createData.toBeDeleted = false;
       if (type === 'mode') {
+        this.cancelCreate()
         this.activeDrawMode = icon;
         this.createData.shape = '';
         this.$module.selectObjectOnPick = true;
@@ -1581,7 +1582,9 @@ export default {
                 : event.identifiers[0].data.group;
               if (event.identifiers[0].coords) {
                 this.tData.active = false;
-                this.tData.visible = true;
+                if (!this.annotationSidebar) {
+                  this.tData.visible = true;
+                }
                 this.tData.label = id;
                 if (event.identifiers[0].data.region) {
                   this.tData.region = event.identifiers[0].data.region;
@@ -1931,7 +1934,6 @@ export default {
               liveUpdates
             );
           } else {
-            this.tData.visible = false;
             const region = this.tData.region ? this.tData.region +"/" : "";
             const annotationEntry = {
               "featureId": region + this.tData.label,

From acf5c837135b167d6f5e1d125cdc090a0a95d062 Mon Sep 17 00:00:00 2001
From: alan-wu <alan.wu@auckland.ac.nz>
Date: Thu, 14 Nov 2024 15:44:57 +1300
Subject: [PATCH 8/8] Update map-utilities.

---
 package-lock.json | 17 +++++++++++++----
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a00a403..e8e668a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.6.0-beta.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@abi-software/map-utilities": "^1.2.0-beta.8",
+        "@abi-software/map-utilities": "^1.2.0",
         "@abi-software/sparc-annotation": "^0.3.1",
         "@abi-software/svg-sprite": "^1.0.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -42,12 +42,13 @@
       }
     },
     "node_modules/@abi-software/map-utilities": {
-      "version": "1.2.0-beta.8",
-      "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.2.0-beta.8.tgz",
-      "integrity": "sha512-cVAJagFLI/KErjn/Vx0v1aMcZnTVG/6+Ofbq9G23DU1NZrNPG04ApFXfWXYwcDGw6BYsyY2WaQ4tLzVNhpGEUA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@abi-software/map-utilities/-/map-utilities-1.2.0.tgz",
+      "integrity": "sha512-KKDCnHUDmLgzcUxBNZdh0ev2XY04ISirK7WXk87pxKH0m6qUhU9RUBcgHUQ3yizLP07mQe0/CvQpkwHv9znlEw==",
       "dependencies": {
         "@abi-software/svg-sprite": "^1.0.1",
         "@element-plus/icons-vue": "^2.3.1",
+        "cytoscape": "^3.30.2",
         "element-plus": "2.8.4",
         "mitt": "^3.0.1",
         "vue": "^3.4.21"
@@ -3201,6 +3202,14 @@
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
+    "node_modules/cytoscape": {
+      "version": "3.30.3",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.3.tgz",
+      "integrity": "sha512-HncJ9gGJbVtw7YXtIs3+6YAFSSiKsom0amWc33Z7QbylbY2JGMrA0yz4EwrdTScZxnwclXeEZHzO5pxoy0ZE4g==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
diff --git a/package.json b/package.json
index 736ab93..35cd7f4 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/map-utilities": "^1.2.0-beta.8",
+    "@abi-software/map-utilities": "^1.2.0",
     "@abi-software/sparc-annotation": "^0.3.1",
     "@abi-software/svg-sprite": "^1.0.1",
     "@element-plus/icons-vue": "^2.3.1",