From d1dbc3850dcd508061d7b4a50d17ce6eeb2f581f Mon Sep 17 00:00:00 2001
From: Pablo Alba <pablo.alba@kaleidos.net>
Date: Fri, 30 Dec 2022 11:11:12 +0100
Subject: [PATCH] :bug: Show color name on inspect

---
 .../styles/main/partials/color-bullet.scss    |  1 +
 .../app/main/ui/components/color_bullet.cljs  |  4 +--
 .../ui/viewer/inspect/attributes/common.cljs  | 33 ++++++++++++-------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/frontend/resources/styles/main/partials/color-bullet.scss b/frontend/resources/styles/main/partials/color-bullet.scss
index 7b1c98800..6a86edd37 100644
--- a/frontend/resources/styles/main/partials/color-bullet.scss
+++ b/frontend/resources/styles/main/partials/color-bullet.scss
@@ -184,6 +184,7 @@ ul.palette-menu .color-bullet {
 
 .color-bullet.is-not-library-color {
   border-radius: $br-small;
+  overflow: hidden;
 
   & .color-bullet-wrapper {
     clip-path: none;
diff --git a/frontend/src/app/main/ui/components/color_bullet.cljs b/frontend/src/app/main/ui/components/color_bullet.cljs
index 4342e25dc..0260aa7ee 100644
--- a/frontend/src/app/main/ui/components/color_bullet.cljs
+++ b/frontend/src/app/main/ui/components/color_bullet.cljs
@@ -31,12 +31,12 @@
 
       ;; No multiple selection
       (let [color (if (string? color) {:color color :opacity 1} color)]
-        [:div.color-bullet.tooltip.tooltip-right
+        [:div.color-bullet
          {:class (dom/classnames :is-library-color (some? (:id color))
                                  :is-not-library-color (nil? (:id color))
                                  :is-gradient (some? (:gradient color)))
           :on-click on-click
-          :title (or (:name color) (:color color) (gradient-type->string (:type (:gradient color))))}
+          :title (or (:color-library-name color) (:name color) (:color color) (gradient-type->string (:type (:gradient color))))}
          (if  (:gradient color)
            [:div.color-bullet-wrapper {:style {:background (uc/color->background color)}}]
            [:div.color-bullet-wrapper
diff --git a/frontend/src/app/main/ui/viewer/inspect/attributes/common.cljs b/frontend/src/app/main/ui/viewer/inspect/attributes/common.cljs
index 0dd81d1d0..b0959c464 100644
--- a/frontend/src/app/main/ui/viewer/inspect/attributes/common.cljs
+++ b/frontend/src/app/main/ui/viewer/inspect/attributes/common.cljs
@@ -6,6 +6,7 @@
 
 (ns app.main.ui.viewer.inspect.attributes.common
   (:require
+   [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.components.color-bullet :refer [color-bullet color-name]]
    [app.main.ui.components.copy-button :refer [copy-button]]
@@ -20,21 +21,31 @@
 (def file-colors-ref
   (l/derived (l/in [:viewer :file :data :colors]) st/state))
 
-(defn make-colors-library-ref [file-id]
+(defn make-colors-library-ref [libraries-place file-id]
   (let [get-library
         (fn [state]
-          (get-in state [:viewer-libraries file-id :data :colors]))]
-    #(l/derived get-library st/state)))
+          (get-in state [libraries-place file-id :data :colors]))]
+    (l/derived get-library st/state)))
+
+(defn- get-colors-library [color]
+  (let [colors-library-v  (-> (mf/use-memo
+                               (mf/deps (:file-id color))
+                               #(make-colors-library-ref :viewer-libraries (:file-id color)))
+                              mf/deref)
+        colors-library-ws (-> (mf/use-memo
+                               (mf/deps (:file-id color))
+                               #(make-colors-library-ref :workspace-libraries (:file-id color)))
+                              mf/deref)]
+    (or colors-library-v colors-library-ws)))
+
+(defn- get-file-colors []
+  (or (mf/deref file-colors-ref) (mf/deref refs/workspace-file-colors)))
 
 (mf/defc color-row [{:keys [color format copy-data on-change-format]}]
-  (let [colors-library-ref (mf/use-memo
-                            (mf/deps (:file-id color))
-                            (make-colors-library-ref (:file-id color)))
-        colors-library (mf/deref colors-library-ref)
-
-        file-colors (mf/deref file-colors-ref)
-
-        color-library-name (get-in (or colors-library file-colors) [(:id color) :name])]
+  (let [colors-library (get-colors-library color)
+        file-colors (get-file-colors)
+        color-library-name (get-in (or colors-library file-colors) [(:id color) :name])
+        color (assoc color :color-library-name color-library-name)]
     [:div.attributes-color-row
      (when color-library-name
        [:div.attributes-color-id