From 3e0c80270d5725fcd1d389b75669c382157fc474 Mon Sep 17 00:00:00 2001
From: "Valentin Vallaeys (vava)" <vava@odoo.com>
Date: Wed, 19 Oct 2022 08:12:34 +0000
Subject: [PATCH] [FIX] product,web: color_field fixes for product variant
 color

There was a typo in the color_field xml not allowing to disable the
pop-up in case of readonly. A test validates the feature is active.

The color_field now displays the transparent symbol (instead of black
color) in case the color is undefined.

The product configurator also displays the transparent symbol for
undefined non-custom colors.

task-3013110

closes odoo/odoo#106669

X-original-commit: c67c32c2dbe10b4885ec1177852839b3d18ecf05
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Signed-off-by: Vallaeys Valentin (vava) <vava@odoo.com>
---
 .../static/src/scss/product_configurator.scss |  4 +++
 addons/sale/views/variant_templates.xml       |  2 +-
 .../src/views/fields/color/color_field.js     |  4 +--
 .../src/views/fields/color/color_field.xml    |  4 +--
 .../tests/views/fields/color_field_tests.js   | 27 ++++++++++++++++---
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/addons/sale/static/src/scss/product_configurator.scss b/addons/sale/static/src/scss/product_configurator.scss
index 7538018795a..2044539eb6f 100644
--- a/addons/sale/static/src/scss/product_configurator.scss
+++ b/addons/sale/static/src/scss/product_configurator.scss
@@ -31,6 +31,10 @@
     &.custom_value {
         background-image: linear-gradient(to bottom right, #FF0000, #FFF200, #1E9600);
     }
+
+    &.transparent {
+        background-image: url(/web/static/img/transparent.png);
+    }
 }
 
 .css_not_available_msg {
diff --git a/addons/sale/views/variant_templates.xml b/addons/sale/views/variant_templates.xml
index bca394f00bd..af0d8674ab6 100644
--- a/addons/sale/views/variant_templates.xml
+++ b/addons/sale/views/variant_templates.xml
@@ -95,7 +95,7 @@
                         <ul t-att-data-attribute_id="ptal.attribute_id.id" t-attf-class="list-inline o_wsale_product_attribute #{'d-none' if single_and_custom else ''}">
                             <li t-foreach="ptal.product_template_value_ids._only_active()" t-as="ptav" class="list-inline-item me-1">
                                 <label t-attf-style="background-color:#{ptav.html_color or ptav.product_attribute_value_id.name if not ptav.is_custom else ''}"
-                                    t-attf-class="css_attribute_color #{'active' if ptav in combination else ''} #{'custom_value' if ptav.is_custom else ''}">
+                                    t-attf-class="css_attribute_color #{'active' if ptav in combination else ''} #{'custom_value' if ptav.is_custom else ''} #{'transparent' if (not ptav.is_custom and not ptav.html_color) else ''}">
                                     <input type="radio"
                                         t-attf-class="js_variant_change  #{ptal.attribute_id.create_variant}"
                                         t-att-checked="ptav in combination"
diff --git a/addons/web/static/src/views/fields/color/color_field.js b/addons/web/static/src/views/fields/color/color_field.js
index 852df48ed48..afd51f6de1e 100644
--- a/addons/web/static/src/views/fields/color/color_field.js
+++ b/addons/web/static/src/views/fields/color/color_field.js
@@ -8,11 +8,11 @@ import { Component, useState, onWillUpdateProps } from "@odoo/owl";
 export class ColorField extends Component {
     setup() {
         this.state = useState({
-            color: this.props.value || "#000000",
+            color: this.props.value || '',
         });
 
         onWillUpdateProps((nextProps) => {
-            this.state.color = nextProps.value || "#000000";
+            this.state.color = nextProps.value || '';
         });
     }
 
diff --git a/addons/web/static/src/views/fields/color/color_field.xml b/addons/web/static/src/views/fields/color/color_field.xml
index b30b0534f09..46a47d119dc 100644
--- a/addons/web/static/src/views/fields/color/color_field.xml
+++ b/addons/web/static/src/views/fields/color/color_field.xml
@@ -2,8 +2,8 @@
 <templates xml:space="preserve">
 
     <t t-name="web.ColorField" owl="1">
-        <div class="o_field_color d-flex" t-att-class="{ 'o_field_cursor_disabled': readonly }" t-attf-style="background-color: {{state.color}}">
-            <input t-on-click.stop="" class="w-100 h-100 opacity-0" type="color" t-att-value="state.color" t-att-disabled="readonly" t-on-input="(ev) => this.state.color = ev.target.value" t-on-change="(ev) => this.props.update(ev.target.value)" />
+        <div class="o_field_color d-flex" t-att-class="{ 'o_field_cursor_disabled': isReadonly }" t-attf-style="background: #{state.color or 'url(/web/static/img/transparent.png)'}">
+            <input t-on-click.stop="" class="w-100 h-100 opacity-0" type="color" t-att-value="state.color" t-att-disabled="isReadonly" t-on-input="(ev) => this.state.color = ev.target.value" t-on-change="(ev) => this.props.update(ev.target.value)" />
         </div>
     </t>
 
diff --git a/addons/web/static/tests/views/fields/color_field_tests.js b/addons/web/static/tests/views/fields/color_field_tests.js
index abab67061d0..f71c5572e94 100644
--- a/addons/web/static/tests/views/fields/color_field_tests.js
+++ b/addons/web/static/tests/views/fields/color_field_tests.js
@@ -61,8 +61,8 @@ QUnit.module("Fields", (hooks) => {
         // style returns the value in the rgb format
         assert.strictEqual(
             target.querySelector(".o_field_color div").style.backgroundColor,
-            "rgb(0, 0, 0)",
-            "field has the default color set as background if no value has been selected"
+            "initial",
+            "field has the transparent background if no color value has been selected"
         );
 
         assert.strictEqual(target.querySelector(".o_field_color input").value, "#000000");
@@ -100,6 +100,25 @@ QUnit.module("Fields", (hooks) => {
         assert.doesNotHaveClass(target.querySelector(".o_data_row"), "o_selected_row");
     });
 
+    QUnit.test("read-only color field in editable list view", async function (assert) {
+        await makeView({
+            type: "list",
+            serverData,
+            resModel: "partner",
+            arch: `
+                <tree editable="bottom">
+                    <field name="hex_color" readonly="1" widget="color" />
+                </tree>`,
+        });
+
+        assert.containsN(
+            target,
+            '.o_field_color input:disabled',
+            2,
+            "the field should not be editable"
+        );
+    });
+
     QUnit.test("color field change via another field's onchange", async (assert) => {
         serverData.models.partner.onchanges = {
             foo: (rec) => {
@@ -125,8 +144,8 @@ QUnit.module("Fields", (hooks) => {
 
         assert.strictEqual(
             target.querySelector(".o_field_color div").style.backgroundColor,
-            "rgb(0, 0, 0)",
-            "field has the default color set as background if no value has been selected"
+            "initial",
+            "field has transparent background if no color value has been selected"
         );
         assert.strictEqual(target.querySelector(".o_field_color input").value, "#000000");
         await editInput(target, ".o_field_char[name='foo'] input", "someValue");