@abi-software/flatmapvuer 0.6.1-auth.0 → 0.6.1-auth.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/flatmapvuer",
-  "version": "0.6.1-auth.0",
+  "version": "0.6.1-auth.2",
   "license": "Apache-2.0",
   "files": [
     "dist/*",
@@ -43,9 +43,9 @@
     "./src/*": "./src/*"
   },
   "dependencies": {
-    "@abi-software/flatmap-viewer": "^2.5.10",
+    "@abi-software/flatmap-viewer": "^2.4.4",
     "@abi-software/sparc-annotation": "0.2.0",
-    "@abi-software/svg-sprite": "^0.4.0-vue3.3",
+    "@abi-software/svg-sprite": "^0.4.0-vue3-beta.0",
     "@element-plus/icons-vue": "^2.3.1",
     "css-element-queries": "^1.2.2",
     "element-plus": "2.5.5",

package/src/App.vue

@@ -229,7 +229,7 @@ export default {
       //flatmapAPI: "https://mapcore-demo.org/fccb/flatmap/"
       //flatmapAPI: "https://mapcore-demo.org/staging/flatmap/v1/"
       // flatmapAPI: "https://mapcore-demo.org/devel/flatmap/v1/",
-      userApiKey: '',
+      userApiKey: undefined,
       ElIconSetting: shallowRef(ElIconSetting)
     }
   },

package/src/components/AnnotationTool.vue

@@ -60,70 +60,52 @@
           <template v-if="isEditable">
             <el-row class="dialog-spacer"></el-row>
             <el-row v-if="!editing">
-              <el-icon class="standard-icon">
-                <el-icon-edit @click="editing = true" />
-              </el-icon>
-              <el-icon
-                class="standard-icon"
-                v-if="isDeleted"
-              >
-                <el-icon-delete @click="submit"/>
-              </el-icon>
-              <el-icon
-                class="standard-icon"
-                v-else-if="isPositionUpdated"
-              >
-                <el-icon-finished @click="submit" />
-              </el-icon>
+              <el-icon class="standard-icon"><el-icon-edit /></el-icon>
             </el-row>
             <template v-else>
               <el-row class="dialog-text">
                 <strong class="sub-title">Suggest changes:</strong>
               </el-row>
-              <template v-if="!isDeleted">
-                <el-row class="dialog-text">
-                  <strong>Evidvence:</strong>
-                </el-row>
-                <el-row v-for="(value, index) in evidence" :key="value">
-                  <el-col :span="20">
-                    {{ evidence[index] }}
-                  </el-col>
-                  <el-col :span="4">
-                    <el-icon class="standard-icon">
-                      <el-icon-close @click="removeEvidence(index)" />
-                    </el-icon>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-input
-                    size="small"
-                    placeholder="Enter"
-                    v-model="newEvidence"
-                    @change="evidenceEntered($event)"
-                  >
-                    <template #prepend>
-                      <el-select
-                        :teleported="false"
-                        v-model="evidencePrefix"
-                        placeholder="Select"
-                        class="select-box"
-                        popper-class="flatmap_dropdown"
+              <el-row class="dialog-text">
+                <strong>Evidvence:</strong>
+              </el-row>
+              <el-row v-for="(value, index) in evidence" :key="value">
+                <el-col :span="20">
+                  {{ evidence[index] }}
+                </el-col>
+                <el-col :span="4">
+                  <el-icon class="standard-icon"><el-icon-close /></el-icon>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-input
+                  size="mini"
+                  placeholder="Enter"
+                  v-model="newEvidence"
+                  @change="evidenceEntered($event)"
+                >
+                  <template #prepend>
+                    <el-select
+                      :teleported="false"
+                      v-model="evidencePrefix"
+                      placeholder="Select"
+                      class="select-box"
+                      popper-class="flatmap_dropdown"
+                    >
+                      <el-option
+                        v-for="item in evidencePrefixes"
+                        :key="item"
+                        :label="item"
+                        :value="item"
                       >
-                        <el-option
-                          v-for="item in evidencePrefixes"
-                          :key="item"
-                          :label="item"
-                          :value="item"
-                        >
-                          <el-row>
-                            <el-col :span="12">{{ item }}</el-col>
-                          </el-row>
-                        </el-option>
-                      </el-select>
-                    </template>
-                  </el-input>
-                </el-row>
-              </template>
+                        <el-row>
+                          <el-col :span="12">{{ item }}</el-col>
+                        </el-row>
+                      </el-option>
+                    </el-select>
+                  </template>
+                </el-input>
+              </el-row>
               <el-row>
                 <strong>Comment:</strong>
               </el-row>
@@ -157,10 +139,10 @@ import {
   ArrowDown as ElIconArrowDown,
   Edit as ElIconEdit,
   Close as ElIconClose,
-  Delete as ElIconDelete,
-  Finished as ElIconFinished,
 } from '@element-plus/icons-vue'
 /* eslint-disable no-alert, no-console */
+/* eslint-disable no-alert, no-console */
+import { AnnotationService } from '@abi-software/sparc-annotation'
 import {
   ElButton as Button,
   ElCol as Col,
@@ -189,7 +171,7 @@ export default {
       type: Object,
     },
   },
-  inject: ['flatmapAPI', 'userApiKey', '$annotator'],
+  inject: ['flatmapAPI', 'userApiKey'],
   data: function () {
     return {
       displayPair: {
@@ -209,29 +191,14 @@ export default {
       prevSubs: [],
       showSubmissions: true,
       errorMessage: '',
-      creator: undefined
     }
   },
   computed: {
     isEditable: function () {
       return (
-        this.annotationEntry['resourceId'] &&
-        this.annotationEntry['featureId']
+        this.annotationEntry['resourceId'] && this.annotationEntry['featureId']
       )
     },
-    isPositionUpdated: function () {
-      return (
-        this.annotationEntry['resourceId'] &&
-        this.annotationEntry['type'] === 'updated' &&
-        this.annotationEntry['positionUpdated']
-      )
-    },
-    isDeleted: function () {
-      return (
-        this.annotationEntry['resourceId'] &&
-        this.annotationEntry['type'] === 'deleted'
-      )
-    }
   },
   methods: {
     evidenceEntered: function (value) {
@@ -273,21 +240,6 @@ export default {
       }
     },
     submit: function () {
-      // User can either update/delete annotation directly 
-      // or provide extra comments for update/delete action
-      if (
-        this.annotationEntry['type'] === 'updated' &&
-        this.annotationEntry['positionUpdated']
-      ) {
-        this.comment = this.comment ?
-          `Position Updated: ${this.comment}` :
-          'Position Updated'
-      } else if (this.annotationEntry['type'] === 'deleted') {
-        this.comment = this.comment ?
-          `Feature Deleted: ${this.comment}` :
-          'Feature Deleted'
-      }
-
       if (this.evidence.length > 0 || this.comment) {
         if (
           this.annotationEntry['resourceId'] &&
@@ -311,16 +263,10 @@ export default {
             item: this.annotationEntry['featureId'],
             evidence: evidenceURLs,
             comment: this.comment,
-            feature: this.annotationEntry['feature']
-          }
-          if (this.annotationEntry['type'] === 'deleted') {
-            userAnnotation.feature = undefined
           }
-          if (this.creator) userAnnotation.creator = this.creator
           this.$annotator
             .addAnnotation(this.userApiKey, userAnnotation)
             .then(() => {
-              this.$emit('annotation', userAnnotation)
               this.errorMessage = ''
               this.resetSubmission()
               this.updatePrevSubmissions()
@@ -355,10 +301,13 @@ export default {
     },
   },
   mounted: function () {
+    if (!this.$annotator) {
+      this.$annotator = new AnnotationService(
+        `${this.flatmapAPI}annotator`
+      )
+    }
     this.$annotator.authenticate(this.userApiKey).then((userData) => {
       if (userData.name && userData.email) {
-        this.creator = userData
-        if (!userData.orcid) this.creator.orcid = '0000-0000-0000-0000'
         this.authenticated = true
         this.updatePrevSubmissions()
       } else {