Skip to content

Commit

Permalink
Backmerge: #4975 - Connection is displayed at the bottom of the row, …
Browse files Browse the repository at this point in the history
…if drag a horizontal side-chain connection between the extreme nucleotides of a row (#5072)

- fixed matrix cells amount calculation
- fixed matrix recalculation during undo/redo
- link monomer to matrix cell instead of node
- fixed rna bases connections
  • Loading branch information
rrodionov91 authored Jul 11, 2024
1 parent b8d7d16 commit 2c9909d
Show file tree
Hide file tree
Showing 155 changed files with 20,515 additions and 179 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,12 @@ test.describe('Macro-Micro-Switcher', () => {
/*
Test case: Macro-Micro-Switcher/#3747
Description: Switching between Macro and Micro mode not crash application when opened DNA/RNA with modyfied monomer
Test fail because we have a bug https://github.com/epam/ketcher/issues/4881
After fix we need update snapshots.
*/
await openFileAndAddToCanvasMacro(testInfo.fileName, page);
await turnOnMicromoleculesEditor(page);
await takeEditorScreenshot(page);
await turnOnMacromoleculesEditor(page);
await selectSnakeLayoutModeTool(page);
await takeEditorScreenshot(page);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,11 @@ test.describe('Sequence Mode', () => {
await takeEditorScreenshot(page);
await selectSnakeLayoutModeTool(page);
await scrollDown(page, SCROLL_DOWN_VALUE);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await selectFlexLayoutModeTool(page);
await scrollDown(page, SCROLL_DOWN_VALUE);
await moveMouseAway(page);
await takeEditorScreenshot(page);
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { test } from '@playwright/test';
import {
selectSnakeLayoutModeTool,
takeEditorScreenshot,
waitForPageInit,
openFileAndAddToCanvasMacro,
moveMouseAway,
} from '@utils';
import { turnOnMacromoleculesEditor } from '@utils/macromolecules';

test.describe('Side chain connections', () => {
test.beforeEach(async ({ page }) => {
await waitForPageInit(page);
await turnOnMacromoleculesEditor(page);
});

test('Open file with rna side chain connections', async ({ page }) => {
/*
Github ticket: #3532 - Displaying side chain connections in snake-like mode
Description: Open file and check how side connections look for rna chain in snake mode
*/

await selectSnakeLayoutModeTool(page);
await openFileAndAddToCanvasMacro(`KET/side-connections-rna.ket`, page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
});

test('Open file with peptide side chain connection', async ({ page }) => {
/*
Github ticket: #3532 - Displaying side chain connections in snake-like mode
Description: Open file and check how side connections look for peptide chain in snake mode
*/

await selectSnakeLayoutModeTool(page);
await openFileAndAddToCanvasMacro(`KET/side-connections-peptide.ket`, page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
});

test('Open file with cycled side chain connection', async ({ page }) => {
/*
Github ticket: #3532 - Displaying side chain connections in snake-like mode
Description: Open file and check how side connections look for cycled chain in snake mode
*/

await selectSnakeLayoutModeTool(page);
await openFileAndAddToCanvasMacro(
`KET/side-connection-in-cycle-chain.ket`,
page,
);
await moveMouseAway(page);
await takeEditorScreenshot(page);
});
});
Loading

0 comments on commit 2c9909d

Please sign in to comment.