Squashed commit of the following:

commit ebb65a9 Author: Roman Rodionov <[email protected]> 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 42a2a6c Author: Roman Rodionov <[email protected]> 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 6c4a38b Author: Roman Rodionov <[email protected]> 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 c7d3f22 Author: Roman Rodionov <[email protected]> Date: Thu Dec 12 11:27:46 2024 +0100 #5032 - Selection of monomers should disappear when the user moves the cursor (#6136) commit 8862787 Author: Roman Rodionov <[email protected]> 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 dc4cfdc Author: Igor Kostrubin <[email protected]> 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 014472b Author: Roman Rodionov <[email protected]> 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 b236964 Author: Maksim Labovich <[email protected]> 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 fa13b99 Author: Roman Rodionov <[email protected]> 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 668758d Author: Roman Rodionov <[email protected]> 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 89f5ce6 Author: Ruslan <[email protected]> Date: Wed Dec 11 13:14:21 2024 +0500 #6127 - Hover mouse over ambiguous monomer on Micromolecules canvas causes app crash (#6128) commit cca5f90 Author: Anrei Menshikov <[email protected]> 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 <[email protected]> commit 932ed0f Author: Roman Rodionov <[email protected]> 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
epam · Dec 13, 2024 · 4d2ca27 · 4d2ca27
1 parent 8375aff
commit 4d2ca27
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -190,6 +190,7 @@ const addToCanvas = ({
           true,
         ),
       );
+      modelChanges.setUndoOperationsByPriority();
     }
   }
 

diff --git 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
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,8 @@ export class FlexMode extends BaseMode { @@
           ),
         );
+        command.setUndoOperationsByPriority();
         return command;
       }
@@ Expand Down @@