Macro: #3869 - Left-to-right ("Snake-like") layout for RNA (#3932)

Co-authored-by: Roman Rodionov <roman_rodionov@epam.com>
epam · Feb 2, 2024 · fb33861 · fb33861
1 parent b5f691a
commit fb33861
Show file tree

Hide file tree

Showing 39 changed files with 1,087 additions and 337 deletions.
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Clear-Tool/clear-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Clear-Tool/clear-tool.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
 import {
-  addMonomerToCanvas,
+  addSingleMonomerToCanvas,
   selectClearCanvasTool,
   selectSingleBondTool,
   takeEditorScreenshot,
@@ -27,31 +27,31 @@ test.describe('Clear Canvas Tool', () => {
     const MONOMER_NAME = 'Tza___3-thiazolylalanine';
     const MONOMER_ALIAS = 'Tza';
 
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       300,
       300,
       0,
     );
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       400,
       400,
       1,
     );
-    const peptide3 = await addMonomerToCanvas(
+    const peptide3 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       500,
       500,
       2,
     );
-    const peptide4 = await addMonomerToCanvas(
+    const peptide4 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
 import {
-  addMonomerToCanvas,
+  addSingleMonomerToCanvas,
   selectEraseTool,
   selectSingleBondTool,
   takeEditorScreenshot,
@@ -29,31 +29,31 @@ test.describe('Erase Tool', () => {
     const MONOMER_NAME = 'Tza___3-thiazolylalanine';
     const MONOMER_ALIAS = 'Tza';
 
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       300,
       300,
       0,
     );
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       400,
       400,
       1,
     );
-    const peptide3 = await addMonomerToCanvas(
+    const peptide3 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       500,
       500,
       2,
     );
-    const peptide4 = await addMonomerToCanvas(
+    const peptide4 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Modal-window/modal-window.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Modal-window/modal-window.spec.ts
@@ -1,6 +1,6 @@
 import { Locator, test } from '@playwright/test';
 import {
-  addMonomerToCanvas,
+  addSingleMonomerToCanvas,
   selectSingleBondTool,
   takeEditorScreenshot,
   waitForPageInit,
@@ -19,15 +19,15 @@ test.describe('Modal window', () => {
     const MONOMER_NAME = 'Test-6-Ch___Test-6-AP-Chem';
     const MONOMER_ALIAS = 'Test-6-Ch';
 
-    peptide1 = await addMonomerToCanvas(
+    peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       200,
       200,
       0,
     );
-    peptide2 = await addMonomerToCanvas(
+    peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
@@ -51,7 +51,15 @@ test.describe('Modal window', () => {
       */
 
     // Create bonds between peptides
-    await bondTwoMonomers(page, peptide1, peptide2);
+    await bondTwoMonomers(
+      page,
+      peptide1,
+      peptide2,
+      undefined,
+      undefined,
+      false,
+      false,
+    );
   });
 
   test('"Connect" button is active', async ({ page }) => {
@@ -62,10 +70,6 @@ test.describe('Modal window', () => {
       */
 
     // Create bonds between peptides
-    await bondTwoMonomers(page, peptide1, peptide2);
-
-    // Chose attachment points
-    await page.locator('button[title=R1]').nth(0).click();
-    await page.locator('button[title=R2]').nth(1).click();
+    await bondTwoMonomers(page, peptide1, peptide2, 'R1', 'R2', true, false);
   });
 });
diff --git a/...her-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-hover.spec.ts b/...her-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-hover.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
 import {
-  addMonomerToCanvas,
+  addSingleMonomerToCanvas,
   selectSingleBondTool,
   waitForPageInit,
   takeEditorScreenshot,
@@ -20,7 +20,7 @@ test.describe('Check attachment point hover', () => {
     const MONOMER_NAME = 'Tza___3-thiazolylalanine';
     const MONOMER_ALIAS = 'Tza';
     const coordinatesStart = { x: 300, y: 300 };
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
@@ -29,7 +29,7 @@ test.describe('Check attachment point hover', () => {
       0,
     );
     const coordinatesEnd = { x: 400, y: 400 };
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,

diff --git a/...-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts b/...-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts
@@ -1,6 +1,6 @@
 import { test } from '@playwright/test';
 import {
-  addMonomerToCanvas,
+  addSingleMonomerToCanvas,
   dragMouseTo,
   selectRectangleSelectionTool,
   selectSingleBondTool,
@@ -28,31 +28,31 @@ test.describe('Check attachment point rotation', () => {
     const MONOMER_ALIAS = 'Tza';
 
     // Get 4 peptides locators
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       300,
       300,
       0,
     );
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       400,
       400,
       1,
     );
-    const peptide3 = await addMonomerToCanvas(
+    const peptide3 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       500,
       500,
       2,
     );
-    const peptide4 = await addMonomerToCanvas(
+    const peptide4 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
@@ -98,15 +98,15 @@ test.describe('Check attachment point rotation', () => {
     const MONOMER_ALIAS = 'Tza';
 
     // Get 4 peptides locators
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       300,
       300,
       0,
     );
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts
@@ -3,7 +3,7 @@ import {
   selectSingleBondTool,
   waitForPageInit,
   takeEditorScreenshot,
-  addMonomerToCanvas,
+  addSingleMonomerToCanvas,
 } from '@utils';
 import {
   hideMonomerPreview,
@@ -31,31 +31,31 @@ test.describe('Polymer Bond Tool', () => {
     const MONOMER_NAME = 'Tza___3-thiazolylalanine';
     const MONOMER_ALIAS = 'Tza';
 
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       300,
       300,
       0,
     );
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       400,
       400,
       1,
     );
-    const peptide3 = await addMonomerToCanvas(
+    const peptide3 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       500,
       500,
       2,
     );
-    const peptide4 = await addMonomerToCanvas(
+    const peptide4 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
@@ -126,15 +126,15 @@ test.describe('Signle Bond Tool', () => {
       */
     const MONOMER_NAME = 'Tza___3-thiazolylalanine';
     const MONOMER_ALIAS = 'Tza';
-    const peptide1 = await addMonomerToCanvas(
+    const peptide1 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,
       300,
       300,
       0,
     );
-    const peptide2 = await addMonomerToCanvas(
+    const peptide2 = await addSingleMonomerToCanvas(
       page,
       MONOMER_NAME,
       MONOMER_ALIAS,