Merge branch '#1920-abbreviation-is-expanded-after-adding-to-the-canv…

…as' into #1921-incorrect-info-panel-behavior
epam · Dec 15, 2022 · d2200e9 · d2200e9
2 parents c1fc74d + e310dcf
commit d2200e9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/packages/ketcher-core/src/domain/entities/sgroup.ts b/packages/ketcher-core/src/domain/entities/sgroup.ts
@@ -221,7 +221,10 @@ export class SGroup {
   static isSaltOrSolvent(moleculeName: string): boolean {
     const saltsAndSolventsProvider = SaltsAndSolventsProvider.getInstance()
     const saltsAndSolvents = saltsAndSolventsProvider.getSaltsAndSolventsList()
-    return saltsAndSolvents.some(({ name }) => name === moleculeName)
+    return saltsAndSolvents.some(
+      ({ name, abbreviation }) =>
+        name === moleculeName || moleculeName === abbreviation
+    )
   }
 
   static isAtomInSaltOrSolvent(

diff --git a/packages/ketcher-core/src/domain/entities/struct.ts b/packages/ketcher-core/src/domain/entities/struct.ts
@@ -60,6 +60,7 @@ export class Struct {
   frags: Pool<Fragment | null>
   rgroups: Pool<RGroup>
   name: string
+  abbreviation?: string
   sGroupForest: SGroupForest
   simpleObjects: Pool<SimpleObject>
   texts: Pool<Text>
@@ -78,6 +79,7 @@ export class Struct {
     this.frags = new Pool<Fragment>()
     this.rgroups = new Pool<RGroup>()
     this.name = ''
+    this.abbreviation = ''
     this.sGroupForest = new SGroupForest()
     this.simpleObjects = new Pool<SimpleObject>()
     this.texts = new Pool<Text>()

diff --git a/packages/ketcher-react/src/script/editor/tool/bond.ts b/packages/ketcher-react/src/script/editor/tool/bond.ts
@@ -237,7 +237,7 @@ class BondTool {
           }
         }
         // don't rotate the bond if the distance between the start and end point is too small
-        if (dist > 0.3)
+        if (dist > 0.3) {
           dragCtx.action = fromBondAddition(
             rnd.ctab,
             this.bondProps,
@@ -246,7 +246,9 @@ class BondTool {
             beginPos,
             endPos
           )[0]
-        else delete dragCtx.action
+        } else {
+          delete dragCtx.action
+        }
         this.editor.update(dragCtx.action, true)
         return true
       }

diff --git a/packages/ketcher-react/src/script/ui/state/saltsAndSolvents/index.ts b/packages/ketcher-react/src/script/ui/state/saltsAndSolvents/index.ts
@@ -63,7 +63,10 @@ export function initSaltsAndSolventsTemplates(baseUrl: string) {
     const text = await prefetchStatic(url)
     const templates = sdfSerializer.deserialize(text)
     const saltsAndSolvents = templates.reduce(
-      (acc: Struct[], { struct }) => [...acc, struct],
+      (acc: Struct[], { struct, props }) => {
+        acc.push({ ...struct, abbreviation: props.abbreviation } as Struct)
+        return acc
+      },
       []
     )
     saltsAndSolventsProvider.setSaltsAndSolventsList(saltsAndSolvents)