From 590b68aa29e55bec3e41bef7657d2f7b2ba01bb5 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 28 Jan 2020 12:48:09 +0100
Subject: [PATCH] :bug: Fix unexpected operation ordering.

---
 .../services/mutations/project_pages.clj      |  3 +-
 frontend/src/uxbox/main/data/projects.cljs    |  2 +-
 frontend/src/uxbox/main/data/workspace.cljs   | 38 +++++--------------
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/backend/src/uxbox/services/mutations/project_pages.clj b/backend/src/uxbox/services/mutations/project_pages.clj
index 06a67f0e4..53d94c368 100644
--- a/backend/src/uxbox/services/mutations/project_pages.clj
+++ b/backend/src/uxbox/services/mutations/project_pages.clj
@@ -181,7 +181,8 @@
   "select s.id, s.changes
      from project_page_snapshots as s
     where s.page_id = $1
-      and s.version > $2")
+      and s.version > $2
+    order by s.created_at asc")
 
 (defn- retrieve-lagged-changes
   [conn snapshot params]
diff --git a/frontend/src/uxbox/main/data/projects.cljs b/frontend/src/uxbox/main/data/projects.cljs
index 25b44fbfb..f6779668c 100644
--- a/frontend/src/uxbox/main/data/projects.cljs
+++ b/frontend/src/uxbox/main/data/projects.cljs
@@ -62,7 +62,7 @@
 ;; --- Helpers
 
 (defn unpack-page
-  [state {:keys [id data metadata] :as page}]
+  [state {:keys [id data] :as page}]
   (-> state
       (update :pages assoc id (dissoc page :data))
       (update :pages-data assoc id data)))
diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index e57c97b74..486bec30d 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -60,7 +60,6 @@
 (declare handle-page-snapshot)
 (declare shapes-changes-commited)
 (declare commit-changes)
-(declare commit-batched-changes)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Websockets Events
@@ -245,7 +244,6 @@
         (assoc state
                :workspace-local workspace-default
                :workspace-data data
-               :workspace-data-prev data
                :workspace-page page)))
 
     ptk/WatchEvent
@@ -274,8 +272,9 @@
   (ptk/reify ::diff-and-commit-changes
     ptk/WatchEvent
     (watch [_ state stream]
-      (let [curr (get-in state [:workspace-data :shapes-by-id])
-            prev (get-in state [:workspace-data-prev :shapes-by-id])
+      (let [pid (get-in state [:workspace-page :id])
+            curr (get-in state [:workspace-data :shapes-by-id])
+            prev (get-in state [:pages-data pid :shapes-by-id])
 
             diff (d/diff-maps prev curr)
             changes (loop [scs (rest diff)
@@ -959,9 +958,7 @@
     (update [_ state]
       (let [pid (get-in state [:workspace-page :id])
             data (get-in state [:pages-data pid])]
-        (-> state
-            (update-in [:pages-data pid] cp/process-changes changes)
-            (assoc :workspace-data-prev (:workspace-data state)))))
+        (update-in state [:pages-data pid] cp/process-changes changes)))
 
     ptk/WatchEvent
     (watch [_ state stream]
@@ -972,21 +969,6 @@
         (->> (rp/mutation :update-project-page params)
              (rx/map shapes-changes-commited))))))
 
-(def commit-batched-changes
-  (ptk/reify ::commit-batched-changes
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [pid (get-in state [:workspace-page :id])
-            data (get-in state [:pages-data pid])
-            changes (::batched-changes state)]
-        (update-in state [:pages-data pid] cp/process-changes changes)))
-
-    ptk/WatchEvent
-    (watch [_ state stream]
-      (let [changes (::batched-changes state)]
-        (rx/of #(dissoc % ::batched-changes)
-               (commit-changes changes))))))
-
 (s/def ::shapes-changes-commited
   (s/keys :req-un [::page-id ::version ::cp/changes]))
 
@@ -996,13 +978,11 @@
   (ptk/reify ::shapes-changes-commited
     ptk/UpdateEvent
     (update [_ state]
-      (let [sid (:session-id state)
-            changes (remove #(= sid (:session-id %)) changes)]
-        (-> state
-            (assoc-in [:workspace-page :version] version)
-            (assoc-in [:pages page-id :version] version)
-            (update-in [:pages-data page-id] cp/process-changes changes)
-            (update :workspace-data cp/process-changes changes))))))
+      (-> state
+          (assoc-in [:workspace-page :version] version)
+          (assoc-in [:pages page-id :version] version)
+          (update-in [:pages-data page-id] cp/process-changes changes)
+          (update :workspace-data cp/process-changes changes)))))
 
 ;; --- Start shape "edition mode"