#6535 - Unable to add nucleoside to the end of sequence if hanging an…

…tisense monomer present - reworked sequence view model to work on same algorithm as snake view model
epam · Feb 21, 2025 · 19f81bf · 19f81bf
1 parent 7460cd4
commit 19f81bf
Show file tree

Hide file tree

Showing 7 changed files with 392 additions and 331 deletions.
diff --git a/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts b/packages/ketcher-core/src/application/editor/modes/SequenceMode.ts
@@ -1156,7 +1156,6 @@ export class SequenceMode extends BaseMode {
           const editor = CoreEditor.provideEditorInstance();
           const history = new EditorHistory(editor);
           const currentTwoStrandedNode = SequenceRenderer.currentEdittingNode;
-          const currentAntisenseNode = currentTwoStrandedNode?.antisenseNode;
           const previousTwoStrandedNode =
             (currentTwoStrandedNode &&
               SequenceRenderer.getPreviousNode(currentTwoStrandedNode)) ||
@@ -1167,6 +1166,8 @@ export class SequenceMode extends BaseMode {
                 currentTwoStrandedNode,
               )) ||
             undefined;
+          const previousAntisenseNodeInSameChain =
+            previousTwoStrandedNodeInSameChain?.antisenseNode;
 
           const insertNewSequenceItemResult = this.insertNewSequenceItem(
             editor,
@@ -1190,12 +1191,13 @@ export class SequenceMode extends BaseMode {
               DrawingEntitiesManager.createAntisenseNode(
                 addedNode,
                 (addedNode instanceof Nucleotide &&
-                  (currentAntisenseNode instanceof Nucleotide ||
-                    currentAntisenseNode instanceof Nucleoside ||
-                    (currentAntisenseNode instanceof BackBoneSequenceNode &&
-                      (currentAntisenseNode.secondConnectedNode instanceof
+                  (previousAntisenseNodeInSameChain instanceof Nucleotide ||
+                    previousAntisenseNodeInSameChain instanceof Nucleoside ||
+                    (previousAntisenseNodeInSameChain instanceof
+                      BackBoneSequenceNode &&
+                      (previousAntisenseNodeInSameChain.secondConnectedNode instanceof
                         Nucleotide ||
-                        currentAntisenseNode.secondConnectedNode instanceof
+                        previousAntisenseNodeInSameChain.secondConnectedNode instanceof
                           Nucleoside)))) ||
                   (addedNode instanceof Nucleoside &&
                     !(
@@ -2228,7 +2230,10 @@ export class SequenceMode extends BaseMode {
       currentSenseNode instanceof EmptySequenceNode &&
       previousNodeInSameChain
     ) {
-      if (!this.isR2Free(previousNodeInSameChain)) {
+      if (
+        !previousTwoStrandedNodeInSameChain?.antisenseNode &&
+        !this.isR2Free(previousNodeInSameChain)
+      ) {
         this.showMergeWarningModal();
         return;
       }
@@ -2239,7 +2244,7 @@ export class SequenceMode extends BaseMode {
       currentSenseNode &&
       !(currentSenseNode instanceof EmptySequenceNode)
     ) {
-      if (!this.isR1Free(currentSenseNode)) {
+      if (!currentAntisenseNode && !this.isR1Free(currentSenseNode)) {
         this.showMergeWarningModal();
         return;
       }

diff --git a/packages/ketcher-core/src/application/render/renderers/sequence/BaseSequenceItemRenderer.ts b/packages/ketcher-core/src/application/render/renderers/sequence/BaseSequenceItemRenderer.ts
@@ -185,7 +185,7 @@ export abstract class BaseSequenceItemRenderer extends BaseSequenceRenderer {
       .attr('y', this.node.monomer.monomerItem.isAntisense ? '24' : '-24')
       .text(
         this.isAntisenseNode && isNumber(antisenseNodeIndex)
-          ? this.currentChainNodesWithoutEmptyNodes.length - antisenseNodeIndex
+          ? antisenseNodeIndex + 1
           : senseNodeIndex + 1,
       )
       .attr('font-family', 'Courier New')
@@ -205,7 +205,7 @@ export abstract class BaseSequenceItemRenderer extends BaseSequenceRenderer {
       !(this.node instanceof BackBoneSequenceNode) &&
       (this.isAntisenseNode && isNumber(antisenseNodeIndex)
         ? (this.monomerIndexInChain + 1) % this.nthSeparationInRow === 1 ||
-          antisenseNodeIndex === 0
+          antisenseNodeIndex === this.chain.length - 1
         : (this.monomerIndexInChain + 1) % this.nthSeparationInRow === 0 ||
           this.isLastMonomerInChain)
     );