#4773 - It is impossible to apply R-group to atom with attachment poi…

…nt attached (#4855) * #4773 - It is impossible to apply R-group to atom with attachment point attached * hotfix: add logic for charge tool
epam · Jun 21, 2024 · 7ab4107 · 7ab4107
1 parent 0173cf1
commit 7ab4107
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 14 deletions.
diff --git a/packages/ketcher-react/src/script/editor/tool/apoint.ts b/packages/ketcher-react/src/script/editor/tool/apoint.ts
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 import assert from 'assert';
-import { FunctionalGroup } from 'ketcher-core';
+import { Atom, FunctionalGroup } from 'ketcher-core';
 import Editor from '../Editor';
 import { Tool } from './Tool';
 import { editRGroupAttachmentPoint } from './apoint.utils';
@@ -60,6 +60,13 @@ class APointTool implements Tool {
         functionalGroups,
         ci.id,
       );
+      const isAtomSuperatomLeavingGroup = Atom.isSuperatomLeavingGroupAtom(
+        molecule,
+        ci.id,
+      );
+      if (isAtomSuperatomLeavingGroup) {
+        return;
+      }
 
       if (atomId !== null) {
         atomResult.push(atomId);
@@ -76,8 +83,10 @@ class APointTool implements Tool {
           result.push(fgId);
         }
       }
-      this.editor.event.removeFG.dispatch({ fgIds: result });
-      return;
+      if (result.length > 0) {
+        this.editor.event.removeFG.dispatch({ fgIds: result });
+        return;
+      }
     }
 
     if (ci && ci.map === 'atoms') {

diff --git a/packages/ketcher-react/src/script/editor/tool/charge.ts b/packages/ketcher-react/src/script/editor/tool/charge.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  ***************************************************************************/
 
-import { Elements, fromAtomsAttrs, FunctionalGroup } from 'ketcher-core';
+import { Atom, Elements, fromAtomsAttrs, FunctionalGroup } from 'ketcher-core';
 import Editor from '../Editor';
 import { Tool } from './Tool';
 
@@ -59,6 +59,13 @@ class ChargeTool implements Tool {
         functionalGroups,
         ci.id,
       );
+      const isAtomSuperatomLeavingGroup = Atom.isSuperatomLeavingGroupAtom(
+        molecule,
+        ci.id,
+      );
+      if (isAtomSuperatomLeavingGroup) {
+        return;
+      }
 
       if (atomId !== null) {
         atomResult.push(atomId);
@@ -76,8 +83,10 @@ class ChargeTool implements Tool {
           result.push(fgId);
         }
       }
-      this.editor.event.removeFG.dispatch({ fgIds: result });
-      return;
+      if (result.length > 0) {
+        this.editor.event.removeFG.dispatch({ fgIds: result });
+        return;
+      }
     }
 
     if (

diff --git a/packages/ketcher-react/src/script/editor/tool/rgroupatom.ts b/packages/ketcher-react/src/script/editor/tool/rgroupatom.ts
@@ -61,7 +61,13 @@ class RGroupAtomTool implements Tool {
         functionalGroups,
         ci.id,
       );
-
+      const isAtomSuperatomLeavingGroup = Atom.isSuperatomLeavingGroupAtom(
+        molecule,
+        ci.id,
+      );
+      if (isAtomSuperatomLeavingGroup) {
+        return;
+      }
       if (atomId !== null) {
         atomResult.push(atomId);
       }
@@ -78,8 +84,10 @@ class RGroupAtomTool implements Tool {
           result.push(fgId);
         }
       }
-      this.editor.event.removeFG.dispatch({ fgIds: result });
-      return;
+      if (result.length > 0) {
+        this.editor.event.removeFG.dispatch({ fgIds: result });
+        return;
+      }
     }
 
     if (!ci) {

diff --git a/packages/ketcher-react/src/script/editor/tool/rgroupfragment.ts b/packages/ketcher-react/src/script/editor/tool/rgroupfragment.ts
@@ -87,8 +87,10 @@ class RGroupFragmentTool implements Tool {
           result.push(fgId);
         }
       }
-      this.editor.event.removeFG.dispatch({ fgIds: result });
-      return;
+      if (result.length > 0) {
+        this.editor.event.removeFG.dispatch({ fgIds: result });
+        return;
+      }
     } else if (bondResult.length > 0) {
       for (const id of bondResult) {
         const fgId = FunctionalGroup.findFunctionalGroupByBond(

diff --git a/packages/ketcher-react/src/script/editor/tool/sgroup.ts b/packages/ketcher-react/src/script/editor/tool/sgroup.ts
@@ -240,9 +240,10 @@ class SGroupTool implements Tool {
           result.push(fgId);
         }
       }
-
-      this.editor.event.removeFG.dispatch({ fgIds: result });
-      return;
+      if (result.length > 0) {
+        this.editor.event.removeFG.dispatch({ fgIds: result });
+        return;
+      }
     } else if (bondResult.length > 0) {
       for (const id of bondResult) {
         const fgId = FunctionalGroup.findFunctionalGroupByBond(