HWE: Fix Chain getHelm for cyclic

datagrok-ai · Aug 29, 2024 · c83b7d5 · c83b7d5
1 parent fbafdde
commit c83b7d5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/HELM/source/CHANGELOG.md b/HELM/source/CHANGELOG.md
@@ -1,5 +1,9 @@
 # HELMWebEditor changelog
 
+## 1.1.11 (2024-08-29)
+
+Fix Chain getHelm for cyclic
+
 ## 1.1.10 (2024-08-27)
 
 Public Mol.name attribute (bump JSDraw dependency version)

diff --git a/HELM/source/helm/Chain.ts b/HELM/source/helm/Chain.ts
@@ -709,18 +709,20 @@ class ChainInt {
 
     if (this.isCircle()) {
       const b = this.bonds[this.bonds.length - 1];
-      // RNA1,RNA1,1:R1-21:R2
-      let conn;
-      if (this.atoms[0] == b.a1)
-        conn = b.a1._aaid + ":R" + b.r1 + "-" + b.a2._aaid + ":R" + b.r2;
-      else
-        conn = b.a2._aaid + ":R" + b.r2 + "-" + b.a1._aaid + ":R" + b.r1;
-
-      let tag = "";
-      if (!scil.Utils.isNullOrEmpty(b.tag))
-        tag = '\"' + b.tag.replace(/"/g, "\\\"") + '\"';
-
-      ret.connections.push(firstseqid + "," + lastseqid + "," + conn);
+      // // RNA1,RNA1,1:R1-21:R2
+      // let conn;
+      // if (this.atoms[0] == b.a1)
+      //   conn = b.a1._aaid + ":R" + b.r1 + "-" + b.a2._aaid + ":R" + b.r2;
+      // else
+      //   conn = b.a2._aaid + ":R" + b.r2 + "-" + b.a1._aaid + ":R" + b.r1;
+      //
+      // let tag = "";
+      // if (!scil.Utils.isNullOrEmpty(b.tag))
+      //   tag = '\"' + b.tag.replace(/"/g, "\\\"") + '\"';
+      //
+      // ret.connections.push(firstseqid + "," + lastseqid + "," + conn);
+
+      org.helm.webeditor.IO.addConnection(ret, firstseqid, lastseqid, b.a1, b.a2, b.r1, b.r2, null, null, b.tag, highlightselection && b.selected);
     }
   }
 

diff --git a/HELM/source/package-lock.json b/HELM/source/package-lock.json
diff --git a/HELM/source/package.json b/HELM/source/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@datagrok-libraries/helm-web-editor",
   "friendlyName": "HELMWebEditor",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "HELMWebEditor forked from Pistoia Alliance",
   "dependencies": {
     "@datagrok-libraries/js-draw-lite": "^0.0.8"