@abi-software/map-utilities 1.2.2-beta.0 → 1.2.2-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/map-utilities",
-  "version": "1.2.2-beta.0",
+  "version": "1.2.2-beta.1",
   "files": [
     "dist/*",
     "src/*",

package/src/components/Tooltip/AnnotationPopup.vue

@@ -3,7 +3,9 @@
     <div class="block">
       <el-row class="info-field">
         <div class="title">Feature Annotations</div>
-        <copy-to-clipboard :content="updatedCopyContent" />
+        <div class="title-buttons">
+          <copy-to-clipboard :content="updatedCopyContent" />
+        </div>
       </el-row>
       <template v-if="annotationEntry">
         <el-row
@@ -46,11 +48,15 @@
               <el-row class="dialog-text">
                 <strong>Evidence: </strong>
                 <el-row
-                  v-for="evidence in sub.body.evidence"
+                  v-for="(evidence, index) in sub.body.evidence"
                   :key="evidence"
                   class="dialog-text"
-                >
-                  <a :href="evidence" target="_blank"> {{ evidence }}</a>
+                > 
+                  <a v-if="typeof evidence === 'object' ":href="Object.values(evidence)[0]" target="_blank"> 
+                    {{ Object.keys(evidence)[0] }}
+                  </a>
+                  <span v-else> {{ evidence }}</span>
+                  <span v-if="index !== sub.body.evidence.length - 1">, </span>
                 </el-row>
               </el-row>
               <el-row class="dialog-text">
@@ -102,18 +108,17 @@
                       <el-select
                         :teleported="false"
                         v-model="evidencePrefix"
-                        placeholder="No Prefix"
+                        placeholder="Other:"
                         class="select-box"
                         popper-class="flatmap_dropdown"
                       >
                         <el-option
                           v-for="item in evidencePrefixes"
-                          :key="item"
-                          :label="item"
-                          :value="item"
+                          :key="item.label"
+                          :value="item.value"
                         >
                           <el-row>
-                            <el-col :span="12">{{ item }}</el-col>
+                            <el-col :span="12">{{ item.label }}</el-col>
                           </el-row>
                         </el-option>
                       </el-select>
@@ -167,8 +172,12 @@ export default {
         Resource: "resourceId",
       },
       editing: false,
-      evidencePrefixes: ["", "DOI:", "PMID:"],
-      evidencePrefix: "",
+      evidencePrefixes: [
+        { value: "DOI:", label: "DOI:" },
+        { value: "PMID:", label: "PMID:" },
+        { value: "", label: "Other:" },
+      ],
+      evidencePrefix: "DOI:",
       evidence: [],
       authenticated: false,
       newEvidence: "",
@@ -270,18 +279,20 @@ export default {
           this.annotationEntry["featureId"]
         ) {
           const evidenceURLs = [];
-          this.evidence.forEach((evidence) => {
-            if (evidence.includes("DOI:")) {
-              const link = evidence.replace("DOI:", "https://doi.org/");
-              evidenceURLs.push(new URL(link));
-            } else if (evidence.includes("PMID:")) {
-              const link = evidence.replace(
+          this.evidence.forEach((evi) => {
+            let eviObject = {}
+            if (evi.includes("DOI:")) {
+              eviObject[evi] = evi.replace("DOI:", "https://doi.org/");
+            } else if (evi.includes("PMID:")) {
+              eviObject[evi] = evi.replace(
                 "PMID:",
                 "https://pubmed.ncbi.nlm.nih.gov/"
               );
-              evidenceURLs.push(new URL(link));
+            }
+            if (evi in eviObject) {
+              evidenceURLs.push(eviObject);
             } else {
-              evidenceURLs.push(evidence);
+              evidenceURLs.push(evi);
             }
           });
           const userAnnotation = {
@@ -364,8 +375,15 @@ export default {
         this.prevSubs.map((sub, index) => {
           annotationContent += `<div><strong>Created:</strong>${this.formatTime(sub.created)}</div>\n<br>`;
           annotationContent += `<div><strong>Creator:</strong>${sub.creator.name}</div>\n<br>`;
-          annotationContent += `<div><strong>Contact:</strong>${sub.creator.email}</div>\n<br>`;
-          annotationContent += `<div><strong>Evidence:</strong>${sub.body.evidence.join(', ')}</div>\n<br>`;
+          annotationContent += `<div><strong>Email:</strong>${sub.creator.email}</div>\n<br>`;
+          if (sub.body.evidence.length) {
+            let evidenceContent = '';
+            sub.body.evidence.forEach((evi, index) => {
+              evidenceContent += `${typeof evi === 'object' ? Object.values(evi)[0] : evi}`;
+              if (index !== sub.body.evidence.length - 1) evidenceContent += ', ';
+            })
+            annotationContent += `<div><strong>Evidence:</strong>${evidenceContent}</div>\n<br>`;
+          }
           annotationContent += `<div><strong>Comment:</strong>${sub.body.comment}</div>\n<br>`;
         })
         contentArray.push(`<div>${annotationContent}</div>`);
@@ -403,7 +421,11 @@ export default {
 
 <style lang="scss" scoped>
 .info-field {
+  padding: 0;
   display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  gap: 1rem;
 }
 
 .block {
@@ -462,7 +484,22 @@ export default {
   font-weight: 500;
   font-weight: bold;
   padding-bottom: 8px;
-  color: rgb(131, 0, 191);
+  color: $app-primary-color;
+}
+
+.title-buttons {
+  display: flex;
+  flex-direction: row;
+  gap: 0.5rem;
+
+  :deep(.copy-clipboard-button) {
+    &,
+    &:hover,
+    &:focus {
+      border-color: $app-primary-color !important;
+      border-radius: 50%;
+    }
+  }
 }
 
 .sub-title {