From 1e20fd7bb6cfa0a0511933c7295339a9fafa075b Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 10 Jan 2025 17:08:03 +0100
Subject: [PATCH 1/2] :sparkles: Log old id on importing binfile-v3 media
 entries

---
 backend/src/app/binfile/v3.clj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/app/binfile/v3.clj b/backend/src/app/binfile/v3.clj
index 7980c21df..b191fc764 100644
--- a/backend/src/app/binfile/v3.clj
+++ b/backend/src/app/binfile/v3.clj
@@ -781,6 +781,7 @@
                      (d/update-when :thumbnail-id bfc/lookup-index))]
 
       (l/dbg :hint "inserting file media object"
+             :old-id (str (:id item))
              :id (str (:id params))
              :file-id (str (:file-id params))
              ::l/sync? true)

From 717c447f327346beea0eaaf81f6ee35350951b74 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 10 Jan 2025 17:12:06 +0100
Subject: [PATCH 2/2] :arrow_up: Update rumext to v2.20

It includes:

- a revert for recursive transformations for :> handler
- a revert for use-state stable reference handling
- a partial support for malli decoding on props validation
---
 frontend/deps.edn                             |  4 +--
 frontend/src/app/main/ui/comments.cljs        |  2 +-
 .../src/app/main/ui/workspace/sidebar.cljs    | 25 +++++++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/deps.edn b/frontend/deps.edn
index a64a3d5ba..f0855a69c 100644
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@@ -20,8 +20,8 @@
    :git/url "https://github.com/funcool/beicon.git"}
 
   funcool/rumext
-  {:git/tag "v2.18"
-   :git/sha "b6e8f45"
+  {:git/tag "v2.20"
+   :git/sha "7f5e1cd"
    :git/url "https://github.com/funcool/rumext.git"}
 
   instaparse/instaparse {:mvn/version "1.5.0"}
diff --git a/frontend/src/app/main/ui/comments.cljs b/frontend/src/app/main/ui/comments.cljs
index 942ee27ac..fbe559461 100644
--- a/frontend/src/app/main/ui/comments.cljs
+++ b/frontend/src/app/main/ui/comments.cljs
@@ -962,7 +962,7 @@
                         (some? position-modifier)
                         (gpt/transform position-modifier))
 
-        max-height    (when (some? viewport) (int (* (obj/get viewport "height") 0.75)))
+        max-height    (when (some? viewport) (int (* (get viewport :height) 0.75)))
 
         ;; We should probably look for a better way of doing this.
         bubble-margin {:x 24 :y 24}
diff --git a/frontend/src/app/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs
index 2c86658ec..ac00afe8f 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar.cljs
@@ -271,17 +271,20 @@
                                   :on-click on-close-history
                                   :icon "close"}])]
 
-           [:> tab-switcher*
-            {:tabs [{:label (tr "workspace.versions.tab.history")
-                     :id "history"
-                     :content versions-tab}
-                    {:label (tr "workspace.versions.tab.actions")
-                     :id "actions"
-                     :content history-tab}]
-             :default-selected "history"
-             :class (stl/css :left-sidebar-tabs)
-             :action-button-position "end"
-             :action-button button}])
+
+           (let [tabs (mf/object
+                       [{:label (tr "workspace.versions.tab.history")
+                         :id "history"
+                         :content versions-tab}
+                        {:label (tr "workspace.versions.tab.actions")
+                         :id "actions"
+                         :content history-tab}])]
+             [:> tab-switcher*
+              {:tabs tabs
+               :default-selected "history"
+               :class (stl/css :left-sidebar-tabs)
+               :action-button-position "end"
+               :action-button button}]))
 
          :else
          [:> options-toolbox* props])]]]))