fix: only emit OCL editor changes when event is from user and updates the molecule/reaction

* test: check if reaction editor trigger a variable change on load

* update OCL

* fix: only emit OCL editor changes when event is from user and updates the molecule/reaction

---------

Co-authored-by: Michaël Zasso <targos@protonmail.com>

Author: lpatiny

package-lock.json

@@ -82,7 +82,7 @@
     "mf-parser": "^1.5.0",
     "mime-types": "^2.1.35",
     "node-jsgraph": "2.4.15",
-    "openchemlib": "^9.18.0",
+    "openchemlib": "^9.18.2",
     "quill": "2.0.2",
     "quill-resize-module": "^2.0.4",
     "quill-table-better": "^1.2.1",

package.json

@@ -160,6 +160,7 @@ define([
   };
 
   Controller.prototype.onChange = function (event, molecule) {
+    if (!event.isUserEvent) return;
     const inPlace = this.module.getConfigurationCheckbox('prefs', 'inPlace');
 
     // In modify variable in mode

src/modules/types/science/chemistry/ocl_editor/controller.js

@@ -130,9 +130,10 @@ define(['modules/default/defaultview', 'src/util/ui', 'openchemlib'], function (
     initEditor() {
       const controller = this.module.controller;
       this.editor = new OCL.CanvasEditor(this.dom.get(0));
-      this.editor.setOnChangeListener((event) =>
-        controller.onChange(event, this.editor.getMolecule()),
-      );
+      this.editor.setOnChangeListener((event) => {
+        if (event.type !== 'molecule') return;
+        controller.onChange(event, this.editor.getMolecule());
+      });
       this.editor.setMolecule(
         OCL.Molecule.fromIDCode(
           controller.currentMol.idCode,

src/modules/types/science/chemistry/ocl_editor/view.js

@@ -135,6 +135,7 @@ define([
   };
 
   Controller.prototype.onChange = function (event, reaction) {
+    if (!event.isUserEvent) return;
     const inPlace = this.module.getConfigurationCheckbox('prefs', 'inPlace');
     const idCode = OCL.ReactionEncoder.encode(reaction) || '';
     const rxn = reaction.toRxn();

src/modules/types/science/chemistry/ocl_reaction_editor/controller.js

@@ -98,6 +98,7 @@ define(['modules/default/defaultview', 'src/util/ui', 'openchemlib'], function (
         initialMode: 'reaction',
       });
       this.editor.setOnChangeListener((event) => {
+        if (event.type !== 'molecule') return;
         const reaction = this.editor.getReaction();
         this._currentReaction = reaction;
         this.module.controller.onChange(event, reaction);

src/modules/types/science/chemistry/ocl_reaction_editor/view.js

@@ -1,5 +1,5 @@
 {
-  "version": "2.173.4-0",
+  "version": "2.175.5-0",
   "grid": {
     "layers": {
       "Default layer": {
@@ -943,6 +943,140 @@
         }
       ],
       "title": "We pretend it is a V3000 but in fact we check in place modification"
+    },
+    {
+      "url": "modules/types/client_interaction/code_executor/",
+      "configuration": {
+        "sections": {},
+        "groups": {
+          "group": [
+            {
+              "display": [
+                [
+                  "editor",
+                  "buttons"
+                ]
+              ],
+              "execOnLoad": [
+                []
+              ],
+              "asyncAwait": [
+                [
+                  "top"
+                ]
+              ],
+              "script": [
+                "console.log('Variable changed: '+this.variable)"
+              ]
+            }
+          ],
+          "libs": [
+            [
+              {}
+            ]
+          ],
+          "buttons": [
+            [
+              {
+                "name": "button1",
+                "label": "Execute",
+                "hide": [],
+                "disable": []
+              }
+            ]
+          ]
+        }
+      },
+      "layers": {
+        "Default layer": {
+          "position": {
+            "left": 42,
+            "top": 42
+          },
+          "size": {
+            "width": 46,
+            "height": 35
+          },
+          "zIndex": 0,
+          "display": true,
+          "title": "",
+          "bgColor": [
+            255,
+            255,
+            255,
+            0
+          ],
+          "wrapper": true,
+          "created": true,
+          "name": "Default layer"
+        }
+      },
+      "id": 8,
+      "vars_in": [
+        {
+          "rel": "inputValue",
+          "name": "rxnV2000"
+        },
+        {
+          "rel": "inputValue",
+          "name": "rxnV3000"
+        },
+        {
+          "rel": "inputValue",
+          "name": "smiles"
+        }
+      ],
+      "actions_in": [
+        {}
+      ],
+      "vars_out": [
+        {
+          "jpath": []
+        }
+      ],
+      "actions_out": [
+        {
+          "jpath": []
+        }
+      ],
+      "toolbar": {
+        "custom": [
+          [
+            {
+              "title": "",
+              "icon": "",
+              "action": "",
+              "position": "begin",
+              "color": [
+                100,
+                100,
+                100,
+                1
+              ]
+            }
+          ]
+        ],
+        "common": [
+          {
+            "toolbar": [
+              [
+                "Open Preferences"
+              ]
+            ]
+          }
+        ]
+      },
+      "css": [
+        {
+          "fontSize": [
+            ""
+          ],
+          "fontFamily": [
+            ""
+          ]
+        }
+      ],
+      "title": ""
     }
   ],
   "variables": [],