#4530 - Add ability to define attachment points for molecules fixes

packages/ketcher-core/src/application/editor/MacromoleculesConverter.ts

@@ -90,9 +90,12 @@ export class MacromoleculesConverter {
     const atomIdMap = monomerToAtomIdMap.get(monomer);
 
     return {
-      attachmentAtomId:
+      globalAttachmentAtomId:
         isNumber(attachmentPoint?.attachmentAtom) &&
         atomIdMap?.get(attachmentPoint?.attachmentAtom as number),
+      attachmentAtomId:
+        isNumber(attachmentPoint?.attachmentAtom) &&
+        attachmentPoint?.attachmentAtom,
       attachmentPointNumber,
     };
   }
@@ -178,15 +181,15 @@ export class MacromoleculesConverter {
     drawingEntitiesManager.polymerBonds.forEach((polymerBond) => {
       assert(polymerBond.secondMonomer);
       const {
-        attachmentAtomId: beginAtom,
+        globalAttachmentAtomId: beginAtom,
         attachmentPointNumber: beginSuperatomAttachmentPointNumber,
       } = this.findAttachmentPointAtom(
         polymerBond,
         polymerBond.firstMonomer,
         monomerToAtomIdMap,
       );
       const {
-        attachmentAtomId: endAtom,
+        globalAttachmentAtomId: endAtom,
         attachmentPointNumber: endSuperatomAttachmentPointNumber,
       } = this.findAttachmentPointAtom(
         polymerBond,

packages/ketcher-core/src/domain/serializers/ket/ketSerializer.ts

@@ -494,7 +494,7 @@ export class KetSerializer implements Serializer<Struct> {
     monomerToAtomIdMap: Map<BaseMonomer, Map<number, number>>,
     struct: Struct,
   ): IKetConnectionMoleculeEndPoint {
-    const { attachmentAtomId } =
+    const { attachmentAtomId, globalAttachmentAtomId } =
       MacromoleculesConverter.findAttachmentPointAtom(
         polymerBond,
         monomer,
@@ -503,7 +503,7 @@ export class KetSerializer implements Serializer<Struct> {
 
     return {
       moleculeId: `mol${
-        struct.atoms.get(attachmentAtomId as number)?.fragment
+        struct.atoms.get(globalAttachmentAtomId as number)?.fragment
       }`,
       atomId: `${attachmentAtomId as number}`,
     };

packages/ketcher-react/src/script/ui/state/shared.ts

@@ -31,6 +31,7 @@ import {
 import { supportedSGroupTypes } from './constants';
 import { setAnalyzingFile } from './request';
 import tools from '../action/tools';
+import { isNumber } from 'lodash';
 
 export function onAction(action) {
   if (action && action.dialog) {
@@ -149,6 +150,14 @@ export function load(struct: Struct, options?) {
       const hasUnsupportedGroups = parsedStruct.sgroups.some(
         (sGroup) => !supportedSGroupTypes[sGroup.type],
       );
+      const hasMoleculeToMonomerConnections = parsedStruct.bonds.find(
+        (_, bond) => {
+          return (
+            isNumber(bond.beginSuperatomAttachmentPointNumber) ||
+            isNumber(bond.endSuperatomAttachmentPointNumber)
+          );
+        },
+      );
 
       if (hasUnsupportedGroups) {
         await editor.event.confirm.dispatch();
@@ -157,7 +166,10 @@ export function load(struct: Struct, options?) {
         );
       }
 
-      parsedStruct.rescale(); // TODO: move out parsing?
+      // scaling works bad with molecule-to-monomer connections
+      if (!hasMoleculeToMonomerConnections) {
+        parsedStruct.rescale(); // TODO: move out parsing?
+      }
 
       if (editor.struct().atoms.size) {
         // NB: reset id