- move the websocket connect to layout response #1820

metasfresh · Jun 1, 2018 · d962ff5 · d962ff5
1 parent 70f3f4b
commit d962ff5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -227,6 +227,7 @@ class DocumentList extends Component {
 
   connectWebSocket = viewId => {
     const { windowType } = this.props;
+
     connectWS.call(this, `/view/${viewId}`, msg => {
       const { fullyChanged, changedIds } = msg;
       if (changedIds) {
@@ -376,14 +377,16 @@ class DocumentList extends Component {
               layout: response.data,
             },
             () => {
-              if (viewId && !isNewFilter) {
-                this.browseView();
-              } else {
-                if (viewId) {
-                  this.filterView();
+              if (viewId) {
+                this.connectWebSocket(viewId);
+
+                if (!isNewFilter) {
+                  this.browseView();
                 } else {
-                  this.createView();
+                  this.filterView();
                 }
+              } else {
+                this.createView();
               }
               setModalTitle && setModalTitle(response.data.caption);
             }
@@ -447,6 +450,7 @@ class DocumentList extends Component {
             viewId: response.data.viewId,
           },
           () => {
+            this.connectWebSocket(response.data.viewId);
             this.getData(response.data.viewId, page, sort);
           }
         );
@@ -552,7 +556,6 @@ class DocumentList extends Component {
                 })
               );
             }
-            this.connectWebSocket(response.data.viewId);
           }
         );
       }