From 4d2ca2734b006ae417e3640322911dcfed4bd956 Mon Sep 17 00:00:00 2001 From: Konstantin_Nadonenko Date: Fri, 13 Dec 2024 13:43:04 +0500 Subject: [PATCH] Squashed commit of the following: commit ebb65a9d93bc519aa7a908525359e3528f58171a Author: Roman Rodionov Date: Thu Dec 12 20:17:51 2024 +0100 #6129 - Undo operation creates unremovable bonds on the canvas (clear canvas doesn't help) (#6131) (#6141) commit 42a2a6c5526262742609eb9111b6e11b6d10bf38 Author: Roman Rodionov Date: Thu Dec 12 11:29:11 2024 +0100 #6109 - Antisense of layout doesn't work on flex mode after load (#6114) (#6138) * #6109 - Antisense of layout doesn't work on flex mode after load - applied snake layout in flex mode if open/paste file with antisense chain - fixed open file implementation * #6083 - Creation of antisense chain causes monomer re-arrangement on the flex canvas - applied zoom to left top corner of the structures after antisense chains creation - updated ketcher version to 2.28.0-rc.2 commit 6c4a38b202cf01c07255730dcc49d687a31a361c Author: Roman Rodionov Date: Thu Dec 12 11:28:28 2024 +0100 #6107 - Create Antisense Strand doesn't work in some cases (#6116) (#6120) - changed implementation of searching first monomers in selection (in this case monomer can be in the middle of the chain and does not have free r1 attachment point) - changed antisense base for Adenine commit c7d3f22727e94eead27a46808de0b486abcf93ac Author: Roman Rodionov Date: Thu Dec 12 11:27:46 2024 +0100 #5032 - Selection of monomers should disappear when the user moves the cursor (#6136) commit 88627873316d45cfa5845f5a70a4eb7d97796dd1 Author: Roman Rodionov Date: Wed Dec 11 23:06:58 2024 +0100 Backmerge: #5949 - Delete of micromolecules bonds works wrong (or doesn't work) (#6124) * #5949 - Delete of micromolecules bonds works wrong (or doesn't work) - added invertAfterAllOperations method to atom and bonds operations to allow renderers rely on final state of model before rendering - added deleting of atoms and bonds from molecules struct to synchronize molecules and macromolecules modes - reworked bonds/atoms deletion logic - moved post execution logic from renderer to command commit dc4cfdcb97ca0c5fd9d231c819b4f73960912938 Author: Igor Kostrubin Date: Wed Dec 11 20:54:17 2024 +0100 #5796 - Indigo functions doesn't work if monomer on micro canvas - system throws an error: Error: Cannot deserialize input JSON. (#6130) commit 014472b9efd1a9139d93938f5597ec59d71537f9 Author: Roman Rodionov Date: Wed Dec 11 17:50:13 2024 +0100 #5317 - Some side chain bonds are not shown in Sequence mode for bases, CHEMs, phosphates and sugars (#6054) commit b2369644285e32adbd0af7dca60a19b3c0d5e5c1 Author: Maksim Labovich Date: Wed Dec 11 18:55:54 2024 +0300 #5476 - Copy/Cut and Paste using Ctrl+C/X and Ctrl+V doesn't work for static elements in Mozilla Firefox (#6121) * #5476 - save to text/plain in KET format instead of RXN - Firefox doesn't support MIME types other than text/plain in ClipboardItem, and RXN format saved by default to text/plain supports only chemical elements * #5476 - added comment, added stringify for data object to avoid [object Object] in console commit fa13b99dba4b4739aa22be36349de4ea644ef619 Author: Roman Rodionov Date: Wed Dec 11 15:48:24 2024 +0100 #6086 - Unable to create antisense chains for ambiguous monomers from the library (#6113) (#6118) - added antisense creation for chains with ambiguous bases commit 668758d2e862c7b7557efedf6e975053eed269cf Author: Roman Rodionov Date: Wed Dec 11 15:34:37 2024 +0100 #6096 - Antisense creation works wrong in case of partial selection (#6122) (#6123) - fixed creation of antisense for partial selection by several pieces in one chain commit 89f5ce661efdfa71da811c5efad080d4e42a6df3 Author: Ruslan <117785539+Guch1g0v@users.noreply.github.com> Date: Wed Dec 11 13:14:21 2024 +0500 #6127 - Hover mouse over ambiguous monomer on Micromolecules canvas causes app crash (#6128) commit cca5f9029b1182492cbce1bf9eb743f58d5d0b98 Author: Anrei Menshikov <95479023+Drimodaren@users.noreply.github.com> Date: Wed Dec 11 12:05:35 2024 +0400 #5978-entire-element-bounding-box-should-be-clickable-not-only-black-dots (#6059) * 5978-entire-element-bounding-box-should-be-clickable-not-only-black-dots * Refactoring * fix test * add new metod bondHoverablePath after review * createBondHoverablePath new logic * add type,const and refctoring createBondHoverablePath * commit TODO for mouseEvents * add ?? operand --------- Co-authored-by: Andrey Menshikov commit 932ed0f8966721ab44cdf47d470c863814f54f8e Author: Roman Rodionov Date: Tue Dec 10 12:49:17 2024 +0100 Backmerge: #6068 - Same chain configuration imported by different HELM layouted differently (anyway - both are wrong) (#6111) * #6068 - Same chain configuration imported by different HELM layouted differently (anyway - both are wrong) (#6099) #6074 - System doesn't flip chain if connected to monomer but not to base (2) #6068 - Same chain configuration imported by different HELM layouted differently (anyway - both are wrong) #6074 - System doesn't flip chain if connected to monomer but not to base (2) #6080 - System doesn't flip chain if connected to monomer but not to base (3) #6081 - Smaller chain should be at the bottom #6087 - Antisense layout is wrong for any ambiguouse base from the library #6077 - H-bond is not alligned to Snake mode view in some cases #6076 - Two-to-one base H-bond connection layouted wrong #6075 - In case of multipal H-bonds system should arrange antisence chain to first base of bottom chain #6070 - System doesn't flip chain if connected to monomer but not to base #6067 - Two chains connected by H-bond arranged wrong if third bond present on the canvas #6061 - RNA chain remain flipped after hydrogen bond removal - reworked antisense chains calculation * - fixed flacky test --- package-lock.json | 8 ++++---- packages/ketcher-core/package.json | 2 +- .../ketcher-core/src/application/editor/modes/FlexMode.ts | 2 ++ packages/ketcher-core/src/domain/entities/Command.ts | 1 + packages/ketcher-macromolecules/package.json | 2 +- .../src/components/modal/Open/Open.tsx | 1 + packages/ketcher-react/package.json | 2 +- packages/ketcher-standalone/package.json | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 803ddce3a7..ebc9d90c5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31974,7 +31974,7 @@ } }, "packages/ketcher-core": { - "version": "2.28.0-rc.1", + "version": "2.28.0-rc.3", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -32100,7 +32100,7 @@ "dev": true }, "packages/ketcher-macromolecules": { - "version": "2.28.0-rc.1", + "version": "2.28.0-rc.3", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -33529,7 +33529,7 @@ } }, "packages/ketcher-react": { - "version": "2.28.0-rc.1", + "version": "2.28.0-rc.3", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -35264,7 +35264,7 @@ } }, "packages/ketcher-standalone": { - "version": "2.28.0-rc.1", + "version": "2.28.0-rc.3", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", diff --git a/packages/ketcher-core/package.json b/packages/ketcher-core/package.json index d458ffa000..1f6b67e981 100644 --- a/packages/ketcher-core/package.json +++ b/packages/ketcher-core/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-core", - "version": "2.28.0-rc.2", + "version": "2.28.0-rc.3", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-core/src/application/editor/modes/FlexMode.ts b/packages/ketcher-core/src/application/editor/modes/FlexMode.ts index 9a58c72cf6..d9d0d40d79 100644 --- a/packages/ketcher-core/src/application/editor/modes/FlexMode.ts +++ b/packages/ketcher-core/src/application/editor/modes/FlexMode.ts @@ -48,6 +48,8 @@ export class FlexMode extends BaseMode { ), ); + command.setUndoOperationsByPriority(); + return command; } diff --git a/packages/ketcher-core/src/domain/entities/Command.ts b/packages/ketcher-core/src/domain/entities/Command.ts index 1d68a3c2fc..0f04df64ac 100644 --- a/packages/ketcher-core/src/domain/entities/Command.ts +++ b/packages/ketcher-core/src/domain/entities/Command.ts @@ -12,6 +12,7 @@ export class Command { public merge(command: Command) { this.operations = [...this.operations, ...command.operations]; + this.setUndoOperationByPriority = command.setUndoOperationByPriority; } public setUndoOperationReverse() { diff --git a/packages/ketcher-macromolecules/package.json b/packages/ketcher-macromolecules/package.json index 447b5c7878..4393f2c85c 100644 --- a/packages/ketcher-macromolecules/package.json +++ b/packages/ketcher-macromolecules/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-macromolecules", - "version": "2.28.0-rc.2", + "version": "2.28.0-rc.3", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-macromolecules/src/components/modal/Open/Open.tsx b/packages/ketcher-macromolecules/src/components/modal/Open/Open.tsx index 215eaa8b7f..d8575625e4 100644 --- a/packages/ketcher-macromolecules/src/components/modal/Open/Open.tsx +++ b/packages/ketcher-macromolecules/src/components/modal/Open/Open.tsx @@ -190,6 +190,7 @@ const addToCanvas = ({ true, ), ); + modelChanges.setUndoOperationsByPriority(); } } diff --git a/packages/ketcher-react/package.json b/packages/ketcher-react/package.json index c2ff44fc12..c6b069958a 100644 --- a/packages/ketcher-react/package.json +++ b/packages/ketcher-react/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-react", - "version": "2.28.0-rc.2", + "version": "2.28.0-rc.3", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-standalone/package.json b/packages/ketcher-standalone/package.json index a966a9869b..f5b50fe3f0 100644 --- a/packages/ketcher-standalone/package.json +++ b/packages/ketcher-standalone/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-standalone", - "version": "2.28.0-rc.2", + "version": "2.28.0-rc.3", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher",