Merge pull request #91 from vincenzocaputo/develop

Beta 0.24.0 - Update

Author: vincenzocaputo

src/graph/graph-ui.js

@@ -343,7 +343,7 @@ function getObjLabelByType(obj, type) {
             return "AS"+obj["number"];
         case "domain-name":
             return obj["value"];
-        case "email-address":
+        case "email-addr":
             return obj["value"];
         case "file":
             return obj["name"] === "" ? obj["id"] : obj["name"];
@@ -417,7 +417,6 @@ importButton.addEventListener("click", evt => {
                         graph.deleteGraph();
                         const objects = stixBundle["objects"];
 
-                        alert(objects);
                         for (const obj of objects) {
                             if (!obj.hasOwnProperty("id")) {
                                 alert("Invalid STIX: Object ID is missing.");
@@ -537,7 +536,7 @@ editButton.addEventListener("click", evt => {
         } case "domain-name": {
             createDomainNameForm(evt, "Edit Domain Name", selectedNodeSTIX);
             break;
-        } case "email-address": {
+        } case "email-addr": {
             createEmailAddressForm(evt, "Edit Email Address", selectedNodeSTIX);
             break;
         } case "file": {
@@ -626,7 +625,7 @@ document.querySelectorAll(".options div").forEach( (element) => {
             } case "domain-name": {
                 createDomainNameForm(evt, "Add Domain Name");
                 break;
-            } case "email-address": {
+            } case "email-addr": {
                 createEmailAddressForm(evt, "Add Email Address");
                 break;
             } case "file": {

src/graph/graph.html

@@ -129,8 +129,8 @@
                                     Domain Name
                                 </div>
                             </div>
-                            <div class="email-address" data-value="email-address">
-                                <img src="img/email-address-noback-flat.png"/>
+                            <div class="email-addr" data-value="email-addr">
+                                <img src="img/email-addr-noback-flat.png"/>
                                 <div class="options-value">
                                     Email Address
                                 </div>

src/graph/stix/sco/email-address.js

@@ -1,10 +1,10 @@
 function createEmailAddressForm(evt, title, stix={}) {
     const action = Object.keys(stix).length == 0 ? "add" : "edit";
 
-    const type = "email-address";
+    const type = "email-addr";
     const objectId = stix["id"] === undefined ? type+"--"+crypto.randomUUID() : stix["id"];
 
-    const formHandler = new FormHandler(title, "img/email-address-noback-flat.png");
+    const formHandler = new FormHandler(title, "img/email-addr-noback-flat.png");
     submitEvent = evt => {
         var stix = {}
         const fields = formHandler.getFields();