mirror of
https://github.com/penpot/penpot.git
synced 2026-11-20 17:11:15 +00:00
* ✨ Explain why a library cannot be disconnected in its modal A library that another connected library uses cannot be disconnected from a file, but the Libraries modal showed it with the same disconnect button as any other library, only disabled, and said nothing about why. Replace that button with an icon and a tooltip. A nested library ("Connected through ...") says it is inherited from its parent, and a direct library that another connected library uses says which one. Both name the library to disconnect first. A library nothing else uses keeps its button. library-disconnect-hint decides the case from the same data the disabled state used, so the buttons that were disabled are the ones that change. The legacy libraries tab keeps its button. Closes #12838 AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 🐛 Name every library to disconnect in the disconnect hint The hint named only the parent of a nested library as the one to disconnect. That was wrong when several libraries use it (disconnecting one leaves it linked through the others) and no help when the parent is nested too and has no disconnect button either. The removal step now lists the libraries the user can actually disconnect: those that use the library directly or through others, and that no linked library uses. The parent is still named as the reason it is inherited. In a cycle nothing is removable, so the parent is named as before. Tests cover a shared dependency, a deep chain and a cycle. AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 🐛 List directly linked libraries in the disconnect hint A library linked to the file directly stays until the user disconnects it, even when another linked library uses it. The hint skipped those: for a file linked to A and B, with A using B and B using C, it told the user to disconnect only A, and C stayed linked through B. Collect the libraries that use it, however far up, and that are either linked directly or used by no linked library. A directly linked library that another one uses cannot be disconnected yet, and its own tooltip says to disconnect that one first. The test covers a directly linked intermediate library. AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 🐛 Count a library linked in this session as direct in the hint Only the libraries fetched when the workspace opens carry :is-indirect. One linked afterwards comes back without it, so the hint did not treat it as directly linked: after connecting B (which uses C) and then A (which uses B) without reloading, C's tooltip said to disconnect only A, and C stayed linked through B. A library the user linked has no flag and is direct by construction, so only one known to be indirect is skipped. The test covers that sequence. AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 🐛 Flag libraries linked in this session as direct or indirect Only the libraries fetched when the workspace opens carried :is-indirect. Linking a library afterwards loads it and its dependencies through load-library-file, and none of them got the flag, so a missing flag could mean either. The disconnect hint in the Libraries modal reads it to tell which libraries the user can disconnect, and it listed the wrong ones for a chain connected in the same session (it named a dependency that has no disconnect button). Set the flag where the library is loaded: the library the user links is direct and the libraries it brings in are indirect. The hint is back to trusting only a flag that says false, because a missing one no longer means a direct link. The test links a library with one dependency and checks both flags. AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 🐛 Keep a library's direct flag when it is loaded twice When links overlap, a library can be requested twice: once because the user linked it and once because a library linked right after brings it in. Each load stored its own :is-indirect value, so whichever answer landed last won, and an indirect one could erase the direct link. The disconnect hint then listed the wrong libraries. Store a loaded library through one event that never turns a known direct link into an indirect one. The reverse order already ends direct, since the user's link is stored with the flag false. The test links a library and then one that uses it before the first answer arrives, and answers in the order that used to lose the flag. AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 🐛 Scope a library's kept direct flag to the file it belongs to The flag kept when a library is loaded twice was read from :files, which outlives a workspace. A library that was a direct link of the file visited before could keep that flag in the next file, where another library only brings it in, and the disconnect hint then listed one library too many. Keep the flag only when it was recorded for the file being loaded, using the :library-of the entry already carries. The test leaves a library flagged direct for another file and links a library that brings it in. AI-assisted-by: claude-opus-5-5 AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> * 💄 Name the libraries in the disconnect hint as design asked The nested library hint now reads "Connected through <parent>. To remove it, disconnect <libraries>." instead of "Inherited from ...". The library names in both hints (connected through and used by) show in the primary foreground color, so they stand out from the text. The translation is split on its two placeholders instead of rendered as HTML, because the library names are written by users. The full plain sentence stays as the aria label of the icon. The new key is workspace.libraries.connected-through-hint, since workspace.libraries.connected-through already labels the parent in the list. AI-assisted-by: claude-sonnet-5-5 Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> --------- Signed-off-by: Filip Sajdak <filip.sajdak@siili.com> Co-authored-by: Eva Marco <evamarcod@gmail.com>
204 lines
8.4 KiB
Clojure
204 lines
8.4 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.ui.workspace-libraries-test
|
|
(:require
|
|
[app.common.data :as d]
|
|
[app.main.ui.workspace.libraries :as wl]
|
|
[cljs.test :as t :include-macros true]))
|
|
|
|
(defn- lib
|
|
"A linked library; `connected-to` lists the ids of the files using it."
|
|
[id indirect? connected-to]
|
|
{:id id :name (name id) :is-indirect indirect? :connected-to connected-to})
|
|
|
|
(defn- summarize
|
|
[libraries]
|
|
(mapv (juxt :id :nested? :parent-name) libraries))
|
|
|
|
(t/deftest sort-linked-libraries-cycle-with-direct-root
|
|
;; file -> App, Foundations; App -> Foundations;
|
|
;; Foundations <-> Comments (cycle, as left by an import)
|
|
(let [libraries [(lib :foundations false [:file :app :comments])
|
|
(lib :app false [:file])
|
|
(lib :comments true [:foundations])]
|
|
result (wl/sort-linked-libraries libraries)]
|
|
(t/is (= [[:app false nil]
|
|
[:foundations false nil]
|
|
[:comments true "foundations"]]
|
|
(summarize result)))
|
|
(t/is (= (count libraries) (count result)))))
|
|
|
|
(t/deftest sort-linked-libraries-cycle-without-root
|
|
;; The direct flag is still unknown (nil) while the shared files load,
|
|
;; so both libraries are only reachable through the cycle. `:app` is
|
|
;; not a linked library, so it is ignored as a parent.
|
|
(let [libraries [(lib :foundations nil [:app :comments])
|
|
(lib :comments nil [:foundations])]
|
|
result (wl/sort-linked-libraries libraries)]
|
|
(t/is (= [[:comments false nil]
|
|
[:foundations true "comments"]]
|
|
(summarize result)))
|
|
(t/is (= (count libraries) (count result)))))
|
|
|
|
(t/deftest sort-linked-libraries-cycle-of-three-without-root
|
|
;; a -> b -> c -> a, all indirect: no root, nothing is lost
|
|
(let [libraries [(lib :c true [:b])
|
|
(lib :b true [:a])
|
|
(lib :a true [:c])]
|
|
result (wl/sort-linked-libraries libraries)]
|
|
(t/is (= [[:a false nil]
|
|
[:b true "a"]
|
|
[:c true "b"]]
|
|
(summarize result)))
|
|
(t/is (= (count libraries) (count result)))))
|
|
|
|
(t/deftest sort-linked-libraries-deep-chain
|
|
;; file -> a -> b -> c
|
|
(let [libraries [(lib :c true [:b])
|
|
(lib :b true [:a])
|
|
(lib :a false [:file])]]
|
|
(t/is (= [[:a false nil]
|
|
[:b true "a"]
|
|
[:c true "b"]]
|
|
(summarize (wl/sort-linked-libraries libraries))))))
|
|
|
|
(t/deftest sort-linked-libraries-diamond
|
|
;; a -> b, c; b -> d; c -> d: d is listed once, under its first parent
|
|
(let [libraries [(lib :d true [:b :c])
|
|
(lib :c true [:a])
|
|
(lib :b true [:a])
|
|
(lib :a false [:file])]
|
|
result (wl/sort-linked-libraries libraries)]
|
|
(t/is (= [[:a false nil]
|
|
[:b true "a"]
|
|
[:d true "b"]
|
|
[:c true "a"]]
|
|
(summarize result)))
|
|
(t/is (= (count libraries) (count result)))))
|
|
|
|
(t/deftest sort-linked-libraries-self-dependency
|
|
(let [libraries [(lib :a true [:a])]]
|
|
(t/is (= [[:a false nil]]
|
|
(summarize (wl/sort-linked-libraries libraries))))))
|
|
|
|
(t/deftest sort-linked-libraries-parent-not-linked
|
|
;; The only user of each library is not a linked library, so both are roots
|
|
(let [libraries [(lib :b true [:other])
|
|
(lib :a true [:file])]]
|
|
(t/is (= [[:a false nil]
|
|
[:b false nil]]
|
|
(summarize (wl/sort-linked-libraries libraries))))))
|
|
|
|
(t/deftest sort-linked-libraries-without-dependencies
|
|
;; Before get-team-shared-files answers, all libraries are flat
|
|
(let [libraries [(lib :b true nil)
|
|
(lib :a false nil)]]
|
|
(t/is (= [[:a false nil]
|
|
[:b false nil]]
|
|
(summarize (wl/sort-linked-libraries libraries))))))
|
|
|
|
(defn- disconnect-hints
|
|
"The disconnect hint of every library, by id, once sorted as the
|
|
Libraries modal shows them."
|
|
[libraries]
|
|
(let [sorted (wl/sort-linked-libraries libraries)
|
|
by-id (d/index-by :id sorted)]
|
|
(into {} (map (juxt :id #(wl/library-disconnect-hint % by-id))) sorted)))
|
|
|
|
(t/deftest library-disconnect-hint-none-when-no-linked-library-uses-it
|
|
;; Only the file uses it, so the user can disconnect it
|
|
(t/is (= {:a nil}
|
|
(disconnect-hints [(lib :a false [:file])]))))
|
|
|
|
(t/deftest library-disconnect-hint-nested-library-is-inherited-from-its-parent
|
|
;; file -> a -> b: b stays while a is connected
|
|
(t/is (= {:a nil
|
|
:b {:reason :inherited :library-name "a" :removable ["a"]}}
|
|
(disconnect-hints [(lib :a false [:file])
|
|
(lib :b true [:a])]))))
|
|
|
|
(t/deftest library-disconnect-hint-direct-library-is-used-by-another-one
|
|
;; file -> a, b; a -> b: b is linked directly but a needs it
|
|
(t/is (= {:a nil
|
|
:b {:reason :used-by :library-name "a" :removable ["a"]}}
|
|
(disconnect-hints [(lib :a false [:file])
|
|
(lib :b false [:file :a])]))))
|
|
|
|
(t/deftest library-disconnect-hint-names-the-first-user-by-name
|
|
(t/is (= {:c {:reason :used-by :library-name "a" :removable ["a" "b"]}
|
|
:a nil
|
|
:b nil}
|
|
(disconnect-hints [(lib :c false [:file :b :a])
|
|
(lib :b false [:file])
|
|
(lib :a false [:file])]))))
|
|
|
|
(t/deftest library-disconnect-hint-ignores-users-that-are-not-linked
|
|
;; `other` uses a, but it is not one of the file's libraries
|
|
(t/is (= {:a nil}
|
|
(disconnect-hints [(lib :a false [:file :other])]))))
|
|
|
|
(t/deftest library-disconnect-hint-shared-dependency-lists-every-removable-parent
|
|
;; file -> a, b; a -> c; b -> c: disconnecting a alone leaves c linked
|
|
;; through b, so both have to go
|
|
(t/is (= {:a nil
|
|
:b nil
|
|
:c {:reason :inherited :library-name "a" :removable ["a" "b"]}}
|
|
(disconnect-hints [(lib :a false [:file])
|
|
(lib :b false [:file])
|
|
(lib :c true [:a :b])]))))
|
|
|
|
(t/deftest library-disconnect-hint-deep-chain-points-to-the-removable-library
|
|
;; file -> a -> b -> c: b is nested too and has no button, so the
|
|
;; removal step names a, the only library the user can disconnect
|
|
(t/is (= {:a nil
|
|
:b {:reason :inherited :library-name "a" :removable ["a"]}
|
|
:c {:reason :inherited :library-name "b" :removable ["a"]}}
|
|
(disconnect-hints [(lib :c true [:b])
|
|
(lib :b true [:a])
|
|
(lib :a false [:file])]))))
|
|
|
|
(t/deftest library-disconnect-hint-lists-a-directly-linked-intermediate-library
|
|
;; file -> a, b; a -> b -> c: disconnecting a leaves the direct link to b,
|
|
;; which keeps c, so b has to go as well. b only becomes removable once a is gone.
|
|
(t/is (= {:a nil
|
|
:b {:reason :used-by :library-name "a" :removable ["a"]}
|
|
:c {:reason :inherited :library-name "b" :removable ["a" "b"]}}
|
|
(disconnect-hints [(lib :a false [:file])
|
|
(lib :b false [:file :a])
|
|
(lib :c true [:b])]))))
|
|
|
|
(t/deftest library-disconnect-hint-cycle-falls-back-to-the-parent
|
|
;; a <-> b, nothing removable: name the parent rather than nothing
|
|
(t/is (= {:a {:reason :used-by :library-name "b" :removable ["b"]}
|
|
:b {:reason :inherited :library-name "a" :removable ["a"]}}
|
|
(disconnect-hints [(lib :a true [:b])
|
|
(lib :b true [:a])]))))
|
|
|
|
(t/deftest disconnect-hint-segments-highlight-every-library-name
|
|
(t/is (= [[:text "Connected through "]
|
|
[:name "App"]
|
|
[:text ". To remove it, disconnect "]
|
|
[:name "App"]
|
|
[:text ", "]
|
|
[:name "Brand"]
|
|
[:text "."]]
|
|
(wl/disconnect-hint-segments
|
|
"Connected through %s. To remove it, disconnect %s."
|
|
"App"
|
|
["App" "Brand"]))))
|
|
|
|
(t/deftest disconnect-hint-segments-keep-the-text-after-the-last-name
|
|
(t/is (= [[:text "Used by "]
|
|
[:name "a"]
|
|
[:text ". To remove it, disconnect "]
|
|
[:name "b"]
|
|
[:text " first."]]
|
|
(wl/disconnect-hint-segments
|
|
"Used by %s. To remove it, disconnect %s first."
|
|
"a"
|
|
["b"]))))
|