From 15a032e84abf74d5ada99c3c0dce6078bf72c766 Mon Sep 17 00:00:00 2001
From: FrancoisGe <fge@odoo.com>
Date: Wed, 24 Aug 2022 13:46:03 +0000
Subject: [PATCH] [FIX] web: placeholder in required SelectionField

This commit adds the possibility of having a placeholder in a
required SelectionField.

Solution:
We always add a false option with the placeholder but it is "display:none"
if the field is required.

How to reproduce:
- create a new record in a form view with a required selection field

Result before:
    The first option of the selection field will be selected

Result after:
    The placeholder of the selection field will be selected

When editing the selection field, the selection field does not propose
the placeholder.

closes odoo/odoo#98823

Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
---
 .../font_selection/font_selection_field.js    |  6 +--
 .../font_selection/font_selection_field.xml   |  6 +++
 .../views/fields/selection/selection_field.js | 13 ++---
 .../fields/selection/selection_field.xml      |  6 +++
 .../views/fields/selection_field_tests.js     | 54 +++++++++----------
 5 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/addons/web/static/src/views/fields/font_selection/font_selection_field.js b/addons/web/static/src/views/fields/font_selection/font_selection_field.js
index 6b2024f8677..c27798b1081 100644
--- a/addons/web/static/src/views/fields/font_selection/font_selection_field.js
+++ b/addons/web/static/src/views/fields/font_selection/font_selection_field.js
@@ -9,13 +9,9 @@ const { Component } = owl;
 
 export class FontSelectionField extends Component {
     get options() {
-        const options = this.props.record.fields[this.props.name].selection.filter(
+        return this.props.record.fields[this.props.name].selection.filter(
             (option) => option[0] !== false && option[1] !== ""
         );
-        if (!this.isRequired) {
-            options.unshift([false, this.props.placeholder || ""]);
-        }
-        return options;
     }
     get isRequired() {
         return this.props.record.isRequired(this.props.name);
diff --git a/addons/web/static/src/views/fields/font_selection/font_selection_field.xml b/addons/web/static/src/views/fields/font_selection/font_selection_field.xml
index b079da1164a..6699f82b4e8 100644
--- a/addons/web/static/src/views/fields/font_selection/font_selection_field.xml
+++ b/addons/web/static/src/views/fields/font_selection/font_selection_field.xml
@@ -7,6 +7,12 @@
         </t>
         <t t-else="">
             <select class="o_input" t-on-change="onChange" t-attf-style="font-family:{{ props.value }};">
+                <option
+                    t-att-selected="false === value"
+                    t-att-value="stringify(false)"
+                    t-esc="this.props.placeholder || ''"
+                    t-attf-style="{{ isRequired ? 'display:none' : '' }}"
+                />
                 <t t-foreach="options" t-as="option" t-key="option[0]">
                     <option
                         t-att-selected="option[0] === value"
diff --git a/addons/web/static/src/views/fields/selection/selection_field.js b/addons/web/static/src/views/fields/selection/selection_field.js
index b8927d7e6f6..835615e89e2 100644
--- a/addons/web/static/src/views/fields/selection/selection_field.js
+++ b/addons/web/static/src/views/fields/selection/selection_field.js
@@ -8,21 +8,16 @@ const { Component } = owl;
 
 export class SelectionField extends Component {
     get options() {
-        let options;
         switch (this.props.record.fields[this.props.name].type) {
             case "many2one":
-                options = [...this.props.record.preloadedData[this.props.name]];
-                break;
+                return [...this.props.record.preloadedData[this.props.name]];
             case "selection":
-                options = this.props.record.fields[this.props.name].selection.filter(
+                return this.props.record.fields[this.props.name].selection.filter(
                     (option) => option[0] !== false && option[1] !== ""
                 );
-                break;
+            default:
+                return [];
         }
-        if (!this.isRequired) {
-            options.unshift([false, this.props.placeholder || ""]);
-        }
-        return options;
     }
     get string() {
         switch (this.props.type) {
diff --git a/addons/web/static/src/views/fields/selection/selection_field.xml b/addons/web/static/src/views/fields/selection/selection_field.xml
index 82a4abd2b60..13e639fc1f2 100644
--- a/addons/web/static/src/views/fields/selection/selection_field.xml
+++ b/addons/web/static/src/views/fields/selection/selection_field.xml
@@ -7,6 +7,12 @@
         </t>
         <t t-else="">
             <select class="o_input" t-on-change="onChange">
+                <option
+                    t-att-selected="false === value"
+                    t-att-value="stringify(false)"
+                    t-esc="this.props.placeholder || ''"
+                    t-attf-style="{{ isRequired ? 'display:none' : '' }}"
+                />
                 <t t-foreach="options" t-as="option" t-key="option[0]">
                     <option
                         t-att-selected="option[0] === value"
diff --git a/addons/web/static/tests/views/fields/selection_field_tests.js b/addons/web/static/tests/views/fields/selection_field_tests.js
index 015e39da84e..90bb8aa5b83 100644
--- a/addons/web/static/tests/views/fields/selection_field_tests.js
+++ b/addons/web/static/tests/views/fields/selection_field_tests.js
@@ -371,28 +371,26 @@ QUnit.module("Fields", (hooks) => {
         });
 
         await click(target, ".o_form_button_edit");
-
-        assert.containsN(
-            target.querySelector(".o_field_widget[name='color']"),
-            "option",
-            3,
-            "Three options in non required field"
+        assert.deepEqual(
+            [...target.querySelectorAll(".o_field_widget[name='color'] option")].map(
+                (option) => option.style.display
+            ),
+            ["", "", ""]
         );
-        assert.containsN(
-            target.querySelector(".o_field_widget[name='feedback_value']"),
-            "option",
-            2,
-            "Two options in required field"
+        assert.deepEqual(
+            [...target.querySelectorAll(".o_field_widget[name='feedback_value'] option")].map(
+                (option) => option.style.display
+            ),
+            ["none", "", ""]
         );
 
         // change value to update widget modifier values
         await editSelect(target, ".o_field_widget[name='feedback_value'] select", '"bad"');
-
-        assert.containsN(
-            target.querySelector(".o_field_widget[name='color']"),
-            "option",
-            2,
-            "Two options in second selection as it is now required"
+        assert.deepEqual(
+            [...target.querySelectorAll(".o_field_widget[name='color'] option")].map(
+                (option) => option.style.display
+            ),
+            ["none", "", ""]
         );
     });
 
@@ -427,22 +425,20 @@ QUnit.module("Fields", (hooks) => {
             });
 
             await click(target, ".o_form_button_edit");
-
-            assert.containsN(
-                target.querySelector(".o_field_widget[name='color']"),
-                "option",
-                3,
-                "Three options in non required field (one blank option)"
+            assert.deepEqual(
+                [...target.querySelectorAll(".o_field_widget[name='color'] option")].map(
+                    (option) => option.style.display
+                ),
+                ["", "", ""]
             );
 
             // change value to update widget modifier values
             await editSelect(target, ".o_field_widget[name='feedback_value'] select", '"bad"');
-
-            assert.containsN(
-                target.querySelector(".o_field_widget[name='color']"),
-                "option",
-                2,
-                "Still three options in required selection (one blank option)"
+            assert.deepEqual(
+                [...target.querySelectorAll(".o_field_widget[name='color'] option")].map(
+                    (option) => option.style.display
+                ),
+                ["none", "", ""]
             );
         }
     );