Merge pull request #163 from rwth-acis/synchronization-issues

Fix Synchronization issues
rwth-acis · May 26, 2023 · 78c7e56 · 78c7e56
2 parents c32439a + d01b96c
commit 78c7e56
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rwth-acis/syncmeta-widgets",
   "description": "SyncMeta is a near real-time collaborative modeling framework. This package only contains the used widgets. If you want to use the SyncMeta app in a docker container, see https://github.com/rwth-acis/syncmeta.",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "author": {
     "name": "ACIS Group, RWTH Aachen",
     "email": "[email protected]"

diff --git a/src/es6/attribute_widget/Value.js b/src/es6/attribute_widget/Value.js
@@ -100,7 +100,6 @@ class Value extends AbstractValue {
     };
 
     this.registerYType = (ytext) => {
-
       if (!ytext) {
         throw new Error("YText not found");
       }
@@ -117,10 +116,6 @@ class Value extends AbstractValue {
         _$editorRef,
         window.yjsConnection.websocketProvider.awareness
       );
-      _ytext?.observe(function () {
-        _value = _ytext.toString();
-      });
-      _value = _ytext.toString();
       //loging
       window.syncmetaLog.initializedYTexts += 1;
       if (window.syncmetaLog.hasOwnProperty(this.getEntityId()))

diff --git a/src/es6/canvas_widget/Manager.js b/src/es6/canvas_widget/Manager.js
@@ -8610,14 +8610,7 @@ export class Value extends AbstractValue {
     if (!yMap) {
       throw new Error("yMap is undefined");
     }
-    y.transact(() => {
-      if (!yMap.has(id) || !(yMap.get(id) instanceof YText)) {
-        _ytext = new YText();
-        yMap.set(id, _ytext);
-      } else {
-        _ytext = yMap.get(id);
-      }
-    });
+
 
     var that = this;
     /**
@@ -8641,8 +8634,6 @@ export class Value extends AbstractValue {
     this.setValue = function (value) {
       _value = value;
       _$node.text(value);
-
-      this.value = _ytext.toString();
     };
 
     /**
@@ -8683,6 +8674,14 @@ export class Value extends AbstractValue {
     };
 
     this.registerYType = function () {
+      y.transact(() => {
+        if (!yMap.has(id) || !(yMap.get(id) instanceof YText)) {
+          _ytext = new YText(_value);
+          yMap.set(id, _ytext);
+        } else {
+          _ytext = yMap.get(id);
+        }
+      });
       _ytext.observe(
         _.debounce(function (event) {
           _value = _ytext.toString().replace(/\n/g, "");
@@ -8713,8 +8712,9 @@ export class Value extends AbstractValue {
           );
         }, 500)
       );
+
       window.onbeforeunload = () => {
-       _ytext.unobserve()
+        _ytext.unobserve();
       };
     };
 

diff --git a/src/es6/canvas_widget/MultiValue.js b/src/es6/canvas_widget/MultiValue.js
@@ -160,7 +160,6 @@ export class MultiValue extends AbstractValue {
           }
         );
       }
-      EntityManagerInstance.storeDataYjs();
     });
     //initialize the map with the values
     for (const [key, value] of Object.entries(this._value)) {

diff --git a/src/es6/lib/yjs-sync.js b/src/es6/lib/yjs-sync.js
@@ -147,7 +147,7 @@ export function getInstance({ spaceTitle, host, protocol, port }) {
     });
   }
   window.onbeforeunload = function () {
-    window.yjsConnection.websocketProvider.destroy();
+    window.yjsConnection?.websocketProvider.destroy();
     window.yjsConnection = null;
   };
   return window.yjsConnection;

diff --git a/src/es6/shared.js b/src/es6/shared.js
@@ -19,7 +19,6 @@
         intent_listener.push(f);
       };
       window._reloadPage = function () {
-        console.log("Reloading Everything");
         var message = {
           action: "RELOAD",
           component: "",
@@ -29,6 +28,7 @@
           extras: {
             reload: true,
           },
+          sender: "syncmeta",
         };
         iwcClient.publishGlobal(message);
       };
@@ -57,7 +57,6 @@
         intent_listener.push(f);
       };
       window._reloadPage = function () {
-        console.log("Reloading Everything");
         var message = {
           action: "RELOAD",
           component: "syncmeta",

diff --git a/src/es6/shared.ts b/src/es6/shared.ts
@@ -18,7 +18,6 @@ export default function () {
         intent_listener.push(f);
       };
       window._reloadPage = function () {
-        console.log("Reloading Everything");
         var message = {
           action: "RELOAD",
           component: "",
@@ -28,6 +27,7 @@ export default function () {
           extras: {
             reload: true,
           },
+          sender: "syncmeta",
         };
         iwcClient.publish(message);
       };