From 09c89202938493a5ff06ef80498ef5d6f0db8231 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 16 Sep 2020 14:20:19 +0200
Subject: [PATCH] :bug: Fixes problem with left sidebar

---
 frontend/src/app/main/data/workspace.cljs | 18 ++++++------------
 frontend/src/app/main/refs.cljs           | 10 ++--------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index b70766f0d..ecf1a335c 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -86,11 +86,6 @@
 
 (s/def ::options-mode #{:design :prototype})
 
-(def workspace-file-local-default
-  {:left-sidebar? true
-   :right-sidebar? true
-   :color-for-rename nil})
-
 (def workspace-local-default
   {:zoom 1
    :flags #{}
@@ -123,8 +118,7 @@
     ptk/UpdateEvent
     (update [_ state]
       (assoc state
-             :workspace-presence {}
-             :workspace-file-local workspace-file-local-default))
+             :workspace-presence {}))
 
     ptk/WatchEvent
     (watch [_ state stream]
@@ -373,9 +367,9 @@
                                                  :document-history
                                                  :assets])))
         right-sidebar? (not (empty? (keep layout [:element-options])))]
-    (update-in state [:workspace-local]
-               assoc :left-sidebar? left-sidebar?
-                     :right-sidebar? right-sidebar?)))
+    (update state :workspace-local
+            assoc :left-sidebar? left-sidebar?
+                  :right-sidebar? right-sidebar?)))
 
 (defn- check-auto-flags
   [state flags-to-toggle]
@@ -401,8 +395,8 @@
     ptk/UpdateEvent
     (update [_ state]
       (-> (reduce toggle-layout-flag state flags)
-          (check-sidebars)
-          (check-auto-flags flags)))))
+          (check-auto-flags flags)
+          (check-sidebars)))))
 
 ;; --- Set element options mode
 
diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 11e0bca48..1de3066b3 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -40,18 +40,12 @@
 ;; ---- Workspace refs
 
 
-;; (def workspace-local
-;;   (l/derived :workspace-local st/state))
+(def workspace-local
+  (l/derived :workspace-local st/state))
 
 (def workspace-drawing
   (l/derived :workspace-drawing st/state))
 
-(def workspace-local
-  (l/derived (fn [state]
-               (merge (:workspace-local state)
-                      (:workspace-file-local state)))
-             st/state =))
-
 (def selected-shapes
   (l/derived :selected workspace-local))