Merge remote-tracking branch 'origin/staging' into develop

frontend/src/app/main/data/team.cljs

@@ -474,6 +474,13 @@
              (rx/tap on-success)
              (rx/catch on-error))))))
 
+(defn- team-deleted
+  [id]
+  (ptk/reify ::team-deleted
+    ptk/UpdateEvent
+    (update [_ state]
+      (update state :teams dissoc id))))
+
 (defn delete-team
   [{:keys [id] :as params}]
   (ptk/reify ::delete-team
@@ -485,7 +492,10 @@
             (meta params)]
 
         (->> (rp/cmd! :delete-team {:id id})
-             (rx/mapcat on-success)
+             (rx/mapcat (fn [result]
+                          (rx/concat
+                           (rx/of (team-deleted id))
+                           (on-success result))))
              (rx/catch on-error))))))
 
 (defn delete-webhook

frontend/src/app/main/data/workspace.cljs

@@ -450,10 +450,12 @@
 
     ptk/WatchEvent
     (watch [_ state _]
-      (let [file-id (:current-file-id state)]
-        (rx/of (preload-data-uris page-id)
-               (dwth/watch-state-changes file-id page-id)
-               (dwl/watch-component-changes))))))
+      (if (dsh/lookup-page state page-id)
+        (let [file-id (:current-file-id state)]
+          (rx/of (preload-data-uris page-id)
+                 (dwth/watch-state-changes file-id page-id)
+                 (dwl/watch-component-changes)))
+        (rx/of (dcm/go-to-workspace))))))
 
 (defn finalize-page
   [page-id]

frontend/src/app/main/ui/dashboard/grid.cljs

@@ -333,7 +333,7 @@
 
         on-context-menu
         (mf/use-fn
-         (mf/deps is-library-view)
+         (mf/deps on-menu-click is-library-view)
          (fn [event]
            (dom/stop-propagation event)
            (dom/prevent-default event)

frontend/src/app/main/ui/onboarding/newsletter.cljs

@@ -10,6 +10,7 @@
    [app.main.data.event :as-alias ev]
    [app.main.data.notifications :as ntf]
    [app.main.data.profile :as du]
+   [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.icons :as i]
    [app.util.dom :as dom]
@@ -22,6 +23,7 @@
   (let [state* (mf/use-state #(do {:newsletter-updates false
                                    :newsletter-news false}))
         state  (deref state*)
+        team (mf/deref refs/team)
 
         on-change
         (mf/use-fn
@@ -33,7 +35,7 @@
 
         on-next
         (mf/use-fn
-         (mf/deps state)
+         (mf/deps state team)
          (fn []
            (when (or (:newsletter-updates state)
                      (:newsletter-news state))
@@ -44,7 +46,10 @@
                             (assoc :label "newsletter:subscriptions")
                             (assoc :step 6))]
              (st/emit! (ptk/data-event ::ev/event params)
-                       (du/update-profile-props state)))))]
+                       (du/update-profile-props
+                        (cond-> state
+                          (not (:is-default team))
+                          (assoc :onboarding-viewed true)))))))]
 
     [:div {:class (stl/css-case
                    :modal-overlay true)}