From b1624430536d5584a50e7041e674b02025a625f9 Mon Sep 17 00:00:00 2001
From: Rainer Simon <rainer.simon@ait.ac.at>
Date: Tue, 28 Apr 2020 12:01:41 +0200
Subject: [PATCH] More fixing of inconsistencies with hash IDs

---
 src/relations/Connection.js             | 1 +
 src/relations/drawing/DrawingTool.js    | 4 ++--
 src/relations/editor/RelationEditor.jsx | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/relations/Connection.js b/src/relations/Connection.js
index 6df5d9a..ef601be 100644
--- a/src/relations/Connection.js
+++ b/src/relations/Connection.js
@@ -51,6 +51,7 @@ export default class Connection extends EventEmitter {
 
   /** Initializes a fixed connection from an annotation **/
   initFromAnnotation = function(contentEl, svgEl, annotation) {
+    console.log('init', annotation);
     const [ fromId, toId ] = annotation.target.map(t => t.id);
     const relation = annotation.bodies[0].value;
 
diff --git a/src/relations/drawing/DrawingTool.js b/src/relations/drawing/DrawingTool.js
index 092628f..bc03f54 100644
--- a/src/relations/drawing/DrawingTool.js
+++ b/src/relations/drawing/DrawingTool.js
@@ -142,8 +142,8 @@ export default class DrawingTool extends EventEmitter {
 
     const annotation = WebAnnotation.create({ 
       target: [
-        { id: `#${from.id}` },
-        { id: `#${to.id}` }
+        { id: from.id },
+        { id: to.id }
       ]
     });
 
diff --git a/src/relations/editor/RelationEditor.jsx b/src/relations/editor/RelationEditor.jsx
index 01cf08f..67dc886 100644
--- a/src/relations/editor/RelationEditor.jsx
+++ b/src/relations/editor/RelationEditor.jsx
@@ -83,7 +83,7 @@ export default class RelationEditor extends Component {
 
     // Fire create or update event
     if (this.props.relation.annotation.bodies.length === 0) 
-      this.props.onRelationCreated(updatedRelation);
+      this.props.onRelationCreated(updatedRelation, this.props.relation);
     else 
       this.props.onRelationUpdated(updatedRelation, this.props.relation);
   }