#3372 - Update customQuery for bonds using topology (#3374)

epam · Sep 28, 2023 · e11818d · e11818d
1 parent 8660fdc
commit e11818d
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/toolbox/Bond/Bond.tsx b/packages/ketcher-react/src/script/ui/views/modal/components/toolbox/Bond/Bond.tsx
@@ -149,23 +149,31 @@ function customQueryValid(customQuery: string, isCustomQuery: boolean) {
 function getBondCustomQuery(bond: BondSettings) {
   let queryAttrsText = '';
   const { type, topology } = bond;
-  const bondType = {
-    single: '-',
-    double: '=',
-    triple: '#',
-    aromatic: ':',
-    any: '~',
-    up: '/',
-    down: '\\',
+  const patterns = {
+    bondType: {
+      single: '-',
+      double: '=',
+      triple: '#',
+      aromatic: ':',
+      any: '~',
+      up: '/',
+      down: '\\',
+    },
+    topology: {
+      [CoreBond.PATTERN.TOPOLOGY.RING]: '@',
+      [CoreBond.PATTERN.TOPOLOGY.CHAIN]: '!@',
+    },
   };
-  if (type in bondType) {
-    queryAttrsText += bondType[type];
-  }
-  if (queryAttrsText) {
-    queryAttrsText += ';';
+
+  if (type in patterns.bondType) {
+    queryAttrsText += patterns.bondType[type];
   }
-  if (topology === CoreBond.PATTERN.TOPOLOGY.RING) {
-    queryAttrsText += '@';
+
+  if (topology && topology in patterns.topology) {
+    if (queryAttrsText) {
+      queryAttrsText += ';';
+    }
+    queryAttrsText += patterns.topology[topology];
   }
   return queryAttrsText;
 }