#3874 - Macro: R2 label is displayed on attachment atom instead of le…

…aving group in monomer preview (#3875) - fixed leaving group searching during ket deserialization Co-authored-by: Roman Rodionov <[email protected]>
epam · Jan 12, 2024 · 8e5617a · 8e5617a
1 parent 8873d19
commit 8e5617a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/ketcher-core/src/domain/serializers/ket/ketSerializer.ts b/packages/ketcher-core/src/domain/serializers/ket/ketSerializer.ts
@@ -56,6 +56,7 @@ import { BaseMonomer } from 'domain/entities/BaseMonomer';
 import { validate } from 'domain/serializers/ket/validate';
 import { MacromoleculesConverter } from 'application/editor/MacromoleculesConverter';
 import { convertAttachmentPointNumberToLabel } from 'domain/helpers/attachmentPointCalculations';
+import { isNumber } from 'lodash';
 
 function parseNode(node: any, struct: any) {
   const type = node.type;
@@ -331,9 +332,12 @@ export class KetSerializer implements Serializer<Struct> {
 
           template.attachmentPoints?.forEach(
             (attachmentPoint, attachmentPointIndex) => {
+              const firstAtomInLeavingGroup =
+                attachmentPoint.leavingGroup?.atoms[0];
               const leavingGroupAtom = monomer.monomerItem.struct.atoms.get(
-                attachmentPoint.leavingGroup?.atoms[0] ||
-                  attachmentPoint.attachmentAtom,
+                isNumber(firstAtomInLeavingGroup)
+                  ? firstAtomInLeavingGroup
+                  : attachmentPoint.attachmentAtom,
               );
               assert(leavingGroupAtom);
               leavingGroupAtom.rglabel = (