From a8523f41b3313634c5e330eec953753cfc32f3d9 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 17 Jun 2021 08:11:40 +0200
Subject: [PATCH] :bug: Remove unnecesary redirect when user goes from
 dashboard to workspace.

And then, clicks the browser back button.
---
 CHANGES.md                                |  3 +++
 frontend/src/app/main/data/workspace.cljs |  5 +----
 frontend/src/app/main/ui/workspace.cljs   | 27 +++++++++++------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 7594df160..fc02209f9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,9 @@
   becomes inactive.
 
 ### :bug: Bugs fixed
+
+- Remove unnecesary redirect from history when user goes to workspace from dashboard [Taiga 1820](https://tree.taiga.io/project/penpot/issue/1820).
+
 ### :arrow_up: Deps updates
 ### :boom: Breaking changes
 ### :heart: Community contributions by (Thank you!)
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index e973bf1de..618b656a1 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -214,8 +214,6 @@
       (rx/of (dwn/finalize file-id)
              ::dwp/finalize))))
 
-(declare go-to-page)
-
 (defn initialize-page
   [page-id]
   (us/assert ::us/uuid page-id)
@@ -1193,7 +1191,6 @@
 
 (defn go-to-page
   ([]
-
    (ptk/reify ::go-to-page
      ptk/WatchEvent
      (watch [it state stream]
@@ -1203,7 +1200,7 @@
 
              pparams    {:file-id file-id :project-id project-id}
              qparams    {:page-id page-id}]
-         (rx/of (rt/nav :workspace pparams qparams))))))
+         (rx/of (rt/nav' :workspace pparams qparams))))))
   ([page-id]
    (us/verify ::us/uuid page-id)
    (ptk/reify ::go-to-page
diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index 843f110a2..34877fdaa 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -86,22 +86,21 @@
 
 (mf/defc workspace-page
   [{:keys [file layout page-id] :as props}]
-  (let [page (mf/deref trimmed-page-ref)]
-    (mf/use-layout-effect
-     (mf/deps page-id)
+  (mf/use-layout-effect
+   (mf/deps page-id)
+   (fn []
+     (if (nil? page-id)
+       (st/emit! (dw/go-to-page))
+       (st/emit! (dw/initialize-page page-id)))
+
      (fn []
-       (if (nil? page-id)
-         (st/emit! (dw/go-to-page))
-         (st/emit! (dw/initialize-page page-id)))
+       (when page-id
+         (st/emit! (dw/finalize-page page-id))))))
 
-       (fn []
-         (when page-id
-           (st/emit! (dw/finalize-page page-id))))))
-
-    (when page
-      [:& workspace-content {:key page-id
-                             :file file
-                             :layout layout}])))
+  (when-let [page (mf/deref trimmed-page-ref)]
+    [:& workspace-content {:key page-id
+                           :file file
+                           :layout layout}]))
 
 (mf/defc workspace-loader
   []