#4508 – Macro: In the Text-editing mode, when selecting nucleotides linked through phosphates R2-R2, an error appears in the Console

packages/ketcher-core/src/domain/entities/BaseMonomer.ts

@@ -480,10 +480,6 @@ export abstract class BaseMonomer extends DrawingEntity {
     return this.SubChainConstructor !== monomerToChain.SubChainConstructor;
   }
 
-  public get isPartOfRna() {
-    return false;
-  }
-
   public get isModification() {
     return this.monomerItem.props.MonomerNaturalAnalogCode !== this.label;
   }

packages/ketcher-core/src/domain/entities/DrawingEntitiesManager.ts

@@ -1785,7 +1785,7 @@ export class DrawingEntitiesManager {
     ) {
       return { command, drawingEntities };
     }
-    if (drawingEntity.isPartOfRna && drawingEntity instanceof Sugar) {
+    if (drawingEntity instanceof Sugar && drawingEntity.isPartOfRNA) {
       const sugar = drawingEntity;
       if (isValidNucleoside(sugar)) {
         const nucleoside = Nucleoside.fromSugar(sugar);

packages/ketcher-core/src/domain/entities/DrawingEntity.ts

@@ -79,8 +79,4 @@ export abstract class DrawingEntity {
   public setBaseRenderer(renderer: BaseRenderer) {
     this.baseRenderer = renderer;
   }
-
-  public get isPartOfRna() {
-    return false;
-  }
 }

packages/ketcher-core/src/domain/entities/Phosphate.ts

@@ -2,7 +2,6 @@ import { BaseMonomer } from './BaseMonomer';
 import { AttachmentPointName, MonomerItemType } from 'domain/types';
 import { Vec2 } from './vec2';
 import { Sugar } from './Sugar';
-import { RNABase } from 'domain/entities/RNABase';
 import { PhosphateSubChain } from 'domain/entities/monomer-chains/PhosphateSubChain';
 import { SubChainNode } from 'domain/entities/monomer-chains/types';
 import { RnaSubChain } from 'domain/entities/monomer-chains/RnaSubChain';
@@ -93,21 +92,4 @@ export class Phosphate extends BaseMonomer {
   public get SubChainConstructor() {
     return PhosphateSubChain;
   }
-
-  get isPartOfRna() {
-    const previousMonomer =
-      this.attachmentPointsToBonds.R1?.getAnotherMonomer(this);
-    const isPreviousMonomerSugar = previousMonomer instanceof Sugar;
-    const isSugarConnectedToBase =
-      previousMonomer?.attachmentPointsToBonds.R3?.getAnotherMonomer(
-        previousMonomer,
-      ) instanceof RNABase;
-    const nextMonomer =
-      this.attachmentPointsToBonds.R2?.getAnotherMonomer(this);
-    const isNextMonomerRna = nextMonomer?.isPartOfRna;
-
-    // isNextMonomerRna used here because we need to interpret last phosphate of rna chain
-    // as not a part of nucleoTide but as phosphate connected to nucleoSide
-    return isPreviousMonomerSugar && isSugarConnectedToBase && isNextMonomerRna;
-  }
 }

packages/ketcher-core/src/domain/entities/PolymerBond.ts

@@ -63,7 +63,7 @@ export class PolymerBond extends DrawingEntity {
     return this.position;
   }
 
-  public getAnotherMonomer(monomer: BaseMonomer) {
+  public getAnotherMonomer(monomer: BaseMonomer): BaseMonomer | undefined {
     return this.firstMonomer === monomer
       ? this.secondMonomer
       : this.firstMonomer;

packages/ketcher-core/src/domain/entities/RNABase.ts

@@ -1,5 +1,4 @@
 import { BaseMonomer } from 'domain/entities/BaseMonomer';
-import { Sugar } from 'domain/entities/Sugar';
 import { ChemSubChain } from 'domain/entities/monomer-chains/ChemSubChain';
 
 export class RNABase extends BaseMonomer {
@@ -20,10 +19,4 @@ export class RNABase extends BaseMonomer {
   public get SubChainConstructor() {
     return ChemSubChain;
   }
-
-  public get isPartOfRna(): boolean {
-    return (
-      this.attachmentPointsToBonds.R1?.getAnotherMonomer(this) instanceof Sugar
-    );
-  }
 }

packages/ketcher-core/src/domain/entities/Sugar.ts

@@ -105,7 +105,7 @@ export class Sugar extends BaseMonomer {
     );
   }
 
-  public get isPartOfRna(): boolean {
+  public get isPartOfRNA(): boolean {
     return (
       this.attachmentPointsToBonds.R3?.getAnotherMonomer(this) instanceof
       RNABase