github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 14:00:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Keep Admin Console URLs at the origin root

Browse Source
This commit is contained in:
Francis Santiago 2026-10-13 13:19:32 +02:00
parent 89c6bad8cd
commit 27cb95d1a6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/app/main/data/nitrate.cljs
View File

@ -69,9 +69,10 @@
([path query-params]
(build-admin-console-url cf/public-uri path query-params))
([public-uri path query-params]
(dm/str
(cond-> (u/join public-uri "admin-console/" path)
(seq query-params) (assoc :query (u/map->query-string query-params))))))
(let [base-uri (assoc public-uri :path "/" :query nil :fragment nil)]
(dm/str
(cond-> (u/join base-uri "admin-console/" path)
(seq query-params) (assoc :query (u/map->query-string query-params)))))))
(defn build-admin-console-href
([]

8
frontend/test/frontend_tests/data/nitrate_test.cljs
View File

@ -142,12 +142,12 @@
(t/is (= :auth-register (:id event)))
(t/is (= invitation-token (get-in event [:params :invitation-token])))))))
(t/deftest build-admin-console-url-preserves-public-uri-subpath
(t/testing "builds admin console routes below the configured Penpot subpath"
(t/deftest build-admin-console-url-uses-public-uri-origin
(t/testing "builds admin console routes at the root of the Penpot origin"
(let [public-uri (u/uri "https://example.com/penpot/")]
(t/is (= "https://example.com/penpot/admin-console/"
(t/is (= "https://example.com/admin-console/"
(dnt/build-admin-console-url public-uri "" nil)))
(t/is (= "https://example.com/penpot/admin-console/organization/my-organization/organization-id/people/"
(t/is (= "https://example.com/admin-console/organization/my-organization/organization-id/people/"
(dnt/build-admin-console-url
public-uri
"organization/my-organization/organization-id/people/"