mirror of
https://github.com/penpot/penpot.git
synced 2026-11-17 07:30:35 +00:00
* 🐛 Carry the team id in every team scoped navigation The eleven `go-to-*` helpers of `app.main.data.common` resolved the team with a plain `or` against `:current-team-id`, or read that key alone, so an event emitted while no team was initialized built a dashboard or workspace route without a `team-id`. `team-container*` raises `:not-found :invalid-team-id` for such a route and `exception-section*` does not report `:not-found`, so the user landed on the not-found page and PostHog never saw it. Add `resolve-team-id`, which falls back to the team of the route already on screen and then to the profile `:default-team-id`. The route goes first on purpose: an emitter that runs from a team screen knows which team the user is looking at, and the personal team would open their file under another team. The `:default` sentinel keeps its meaning. With none of the four the helper still navigates with a nil id, which is the documented last resort. Harden the team-container test at the same time: it now renders the same component with the store team the caller wants, captures markup and errors per render, unmounts the root from a `finally`, and covers the guard that compares the route id with the store team. React reports a hook-order violation through `console.error` and recovers, and only when a render adds hooks, so the harness captures that too and the "id leaves" direction stays a guard test. Closes #12962 AI-assisted-by: deepseek-v4.1-flash * ♻️ Measure the navigation tests by termination The `emitted` helper of `common_test` waited for the first event, with a budget of 50 macrotasks, so a helper that emitted anything before its navigation could be disposed early, and a helper that stopped closing its stream passed on the first event. Wait for termination instead: `async/observe` over a subject, and make `go-to-dashboard-search` complete by pushing the `::rt/navigated` it listens for, which is the event it waits for in the app to focus the search box. Every helper of the family is measured the same way now, `-search` included. `nav-params` returns nil when no navigation matched instead of calling `deref` on nil, as its docstring promised. Add the mirror test for the `:default` sentinel of `go-to-dashboard-deleted`, the second copy of the branch that `-recent` already had covered. Correct two memories: the resolver decides for every team scoped helper, not for every `go-to-*` and not alone, since two direct `rt/nav` emitters are the residual; and `(rx/empty)` is for a stream that must not emit, not for one that must stay open. Relates to #12962 AI-assisted-by: deepseek-v4.1-flash
175 lines
8.3 KiB
Clojure
175 lines
8.3 KiB
Clojure
;; This Source Code Form is subject to the terms of the Mozilla Public
|
|
;; License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
;;
|
|
;; Copyright (c) KALEIDOS SUBSIDIARY SL
|
|
|
|
(ns frontend-tests.data.common-test
|
|
"Every team-scoped navigation carries a team.
|
|
|
|
`team-container*` raises `:not-found :invalid-team-id` for a dashboard
|
|
or workspace route without a valid `team-id`, and `:not-found` is not
|
|
reported to the error pipeline, so a navigation that loses the id ends
|
|
on the not-found page without leaving a trace. The helpers resolve the
|
|
id from the argument, the initialized team, the team of the route
|
|
already on screen, and the profile default, in that order."
|
|
(:require
|
|
[app.common.uuid :as uuid]
|
|
[app.main.data.common :as dcm]
|
|
[app.main.router :as rt]
|
|
[beicon.v2.core :as rx]
|
|
[cljs.test :as t :include-macros true]
|
|
[frontend-tests.helpers.async :as async]
|
|
[potok.v2.core :as ptk]))
|
|
|
|
(def ^:private file-id (uuid/next))
|
|
|
|
(defn- state
|
|
"A slice of the store with the teams a navigation can resolve. The
|
|
route is the one a team screen leaves behind: its query names the team
|
|
the user is looking at."
|
|
[{:keys [current-team-id route-team-id default-team-id]}]
|
|
(cond-> {:profile {:id (uuid/next)}}
|
|
(some? current-team-id)
|
|
(assoc :current-team-id current-team-id)
|
|
|
|
(some? default-team-id)
|
|
(assoc-in [:profile :default-team-id] default-team-id)
|
|
|
|
(some? route-team-id)
|
|
(assoc :route {:data {:name :dashboard-recent}
|
|
:params {:path {} :query {:team-id (str route-team-id)}}
|
|
:query-params {:team-id (str route-team-id)}})))
|
|
|
|
(defn- ^:async emitted
|
|
"Runs `event` against `state` and returns every event it emitted, once
|
|
the event's stream terminates.
|
|
|
|
The stream is a subject the caller of `ptk/watch` never sees: `go-to-
|
|
dashboard-search` keeps listening to the router after navigating and
|
|
completes only when it receives one `::rt/navigated`, which is the event
|
|
it waits for in the app to focus the search box. Pushing it here makes
|
|
that helper terminate like the rest, so every event of the family is
|
|
measured the same way, subscribe and await termination.
|
|
|
|
`observe` forces asynchronous delivery even for a synchronous source and
|
|
rejects when the stream does not terminate in time, so a helper that
|
|
stops closing its stream fails here instead of passing on the first
|
|
event."
|
|
[event state]
|
|
(let [stream (rx/subject)
|
|
events (atom [])
|
|
done (async/observe (ptk/watch event state stream)
|
|
:on-next #(swap! events conj %))]
|
|
;; `observe` subscribes inside its promise executor, so the subject
|
|
;; already has a listener; a subject drops values nobody hears.
|
|
(rx/push! stream (rt/navigated {:data {:name :dashboard-search}} false))
|
|
(await done)
|
|
@events))
|
|
|
|
(defn- nav-params
|
|
"The params of the last navigation to `route-id`, or nil when the event
|
|
emitted none."
|
|
[events route-id]
|
|
(some->> events
|
|
(filter #(and (= ::rt/navigate (ptk/type %))
|
|
(= route-id (:id @%))))
|
|
(last)
|
|
(deref)
|
|
(:params)))
|
|
|
|
(t/deftest ^:async go-to-workspace-takes-the-team-of-the-route-on-screen
|
|
;; The opened file belongs to the team of the route. The personal
|
|
;; default would open it under another team.
|
|
(let [route-team-id (uuid/next)
|
|
default-team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-workspace :file-id file-id)
|
|
(state {:route-team-id route-team-id
|
|
:default-team-id default-team-id})))]
|
|
(t/is (= route-team-id (:team-id (nav-params events :workspace))))))
|
|
|
|
(t/deftest ^:async go-to-workspace-takes-the-team-initialized-in-the-store
|
|
(let [current-team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-workspace :file-id file-id)
|
|
(state {:current-team-id current-team-id
|
|
:route-team-id (uuid/next)
|
|
:default-team-id (uuid/next)})))]
|
|
(t/is (= current-team-id (:team-id (nav-params events :workspace))))))
|
|
|
|
(t/deftest ^:async go-to-workspace-takes-the-profile-default-when-no-team-is-known
|
|
(let [default-team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-workspace :file-id file-id)
|
|
(state {:default-team-id default-team-id})))]
|
|
(t/is (= default-team-id (:team-id (nav-params events :workspace))))))
|
|
|
|
(t/deftest ^:async go-to-workspace-keeps-the-team-the-caller-passes
|
|
(let [team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-workspace :team-id team-id :file-id file-id)
|
|
(state {:current-team-id (uuid/next)
|
|
:route-team-id (uuid/next)
|
|
:default-team-id (uuid/next)})))]
|
|
(t/is (= team-id (:team-id (nav-params events :workspace))))))
|
|
|
|
(t/deftest ^:async go-to-dashboard-recent-keeps-the-default-sentinel
|
|
(let [default-team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-dashboard-recent :team-id :default)
|
|
(state {:current-team-id (uuid/next)
|
|
:route-team-id (uuid/next)
|
|
:default-team-id default-team-id})))]
|
|
(t/is (= default-team-id (:team-id (nav-params events :dashboard-recent))))))
|
|
|
|
(t/deftest ^:async go-to-dashboard-deleted-keeps-the-default-sentinel
|
|
;; The sentinel is a second copy of the branch in `-recent`; without its
|
|
;; own test, a divergence here would navigate to the current team.
|
|
(let [default-team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-dashboard-deleted :team-id :default)
|
|
(state {:current-team-id (uuid/next)
|
|
:route-team-id (uuid/next)
|
|
:default-team-id default-team-id})))]
|
|
(t/is (= default-team-id (:team-id (nav-params events :dashboard-deleted))))))
|
|
|
|
(t/deftest ^:async go-to-dashboard-recent-resolves-a-nil-team-through-the-route
|
|
(let [route-team-id (uuid/next)
|
|
events (await (emitted (dcm/go-to-dashboard-recent)
|
|
(state {:route-team-id route-team-id
|
|
:default-team-id (uuid/next)})))]
|
|
(t/is (= route-team-id (:team-id (nav-params events :dashboard-recent))))))
|
|
|
|
(def ^:private dashboard-helpers
|
|
"The rest of the family, with the route each one navigates to."
|
|
[[dcm/go-to-dashboard-files :dashboard-files]
|
|
[dcm/go-to-dashboard-search :dashboard-search]
|
|
[dcm/go-to-dashboard-libraries :dashboard-libraries]
|
|
[dcm/go-to-dashboard-fonts :dashboard-fonts]
|
|
[dcm/go-to-dashboard-members :dashboard-members]
|
|
[dcm/go-to-dashboard-invitations :dashboard-invitations]
|
|
[dcm/go-to-dashboard-webhooks :dashboard-webhooks]
|
|
[dcm/go-to-dashboard-settings :dashboard-settings]
|
|
[dcm/go-to-dashboard-deleted :dashboard-deleted]])
|
|
|
|
(t/deftest ^:async dashboard-helpers-take-the-team-of-the-route-on-screen
|
|
(doseq [[helper route-id] dashboard-helpers]
|
|
(let [route-team-id (uuid/next)
|
|
events (await (emitted (helper)
|
|
(state {:route-team-id route-team-id
|
|
:default-team-id (uuid/next)})))]
|
|
(t/is (= route-team-id (:team-id (nav-params events route-id)))
|
|
(str "route: " route-id)))))
|
|
|
|
(t/deftest ^:async dashboard-helpers-take-the-profile-default-when-no-team-is-known
|
|
(doseq [[helper route-id] dashboard-helpers]
|
|
(let [default-team-id (uuid/next)
|
|
events (await (emitted (helper)
|
|
(state {:default-team-id default-team-id})))]
|
|
(t/is (= default-team-id (:team-id (nav-params events route-id)))
|
|
(str "route: " route-id)))))
|
|
|
|
(t/deftest ^:async navigations-still-fire-when-no-team-can-be-resolved
|
|
;; Documented last resort: a profile without a default team is a broken
|
|
;; or transient state, and there is nothing to resolve. The navigation
|
|
;; still fires, so the not-found page appears with its exit in the
|
|
;; header instead of the click doing nothing.
|
|
(let [events (await (emitted (dcm/go-to-dashboard-members) (state {})))]
|
|
(t/is (some? (nav-params events :dashboard-members)))
|
|
(t/is (nil? (:team-id (nav-params events :dashboard-members))))))
|