Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 21 commits into from
Feb 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
20d7fa7
#3869 Left-to-right ("Snake-like") layout for RNA
StarlaStarla Jan 18, 2024
4bff65c
#3869 snake mode for rna chain
StarlaStarla Jan 19, 2024
916d69e
#3869 revert changes
StarlaStarla Jan 19, 2024
a8dbc32
#3869 fix snake line issue
StarlaStarla Jan 21, 2024
c835c2e
Merge branch 'master' of github.com:epam/ketcher into 3869-macro-left…
StarlaStarla Jan 23, 2024
f705c8a
#3869 fix screenshot
StarlaStarla Jan 23, 2024
219fc53
#3869 small fix and tests
StarlaStarla Jan 24, 2024
debbbe9
#3869 add rearrange logic for nucleoside
StarlaStarla Jan 24, 2024
fc7d6c7
#3869 small fix for code and test
StarlaStarla Jan 25, 2024
8b455e1
#3869 refactor side chain logic
StarlaStarla Jan 29, 2024
53f4793
Merge branch 'master' of github.com:epam/ketcher into 3869-macro-left…
StarlaStarla Jan 29, 2024
6a1a825
#3869 update screenshot
StarlaStarla Jan 29, 2024
187aedb
#3869 enhancement
StarlaStarla Jan 30, 2024
639f783
# 3869 fix issue
StarlaStarla Jan 30, 2024
f77a9c1
Merge branch 'master' of github.com:epam/ketcher into 3869-macro-left…
StarlaStarla Jan 31, 2024
f53ce80
#3869 fix snake mode issue for same attachment points and autotests
StarlaStarla Jan 31, 2024
8019421
#3869 remove only of test
StarlaStarla Jan 31, 2024
4cc6baa
- fixed cases with side connections
rrodionov91 Feb 1, 2024
00910a8
#3869 fix single monomer and nucleoside case
StarlaStarla Feb 2, 2024
1946733
#3869 fix some comments issues
StarlaStarla Feb 2, 2024
0e25fd6
#3869 fix autotests
StarlaStarla Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ketcher-autotests/tests/Macromolecule-editor/Clear-Tool/clear-tool.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
import {
addMonomerToCanvas,
addSingleMonomerToCanvas,
selectClearCanvasTool,
selectSingleBondTool,
takeEditorScreenshot,
Expand All @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
import {
addMonomerToCanvas,
addSingleMonomerToCanvas,
selectEraseTool,
selectSingleBondTool,
takeEditorScreenshot,
Expand Down Expand Up @@ -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,
Expand Down
22 changes: 13 additions & 9 deletions ketcher-autotests/tests/Macromolecule-editor/Modal-window/modal-window.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Locator, test } from '@playwright/test';
import {
addMonomerToCanvas,
addSingleMonomerToCanvas,
selectSingleBondTool,
takeEditorScreenshot,
waitForPageInit,
Expand All @@ -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,
Expand All @@ -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 }) => {
Expand All @@ -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);
});
});
6 changes: 3 additions & 3 deletions ...her-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-hover.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
import {
addMonomerToCanvas,
addSingleMonomerToCanvas,
selectSingleBondTool,
waitForPageInit,
takeEditorScreenshot,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions ...-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
import {
addMonomerToCanvas,
addSingleMonomerToCanvas,
dragMouseTo,
selectRectangleSelectionTool,
selectSingleBondTool,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
selectSingleBondTool,
waitForPageInit,
takeEditorScreenshot,
addMonomerToCanvas,
addSingleMonomerToCanvas,
} from '@utils';
import {
hideMonomerPreview,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading
Loading