From 6ed41f66802dd44bbf0ca79b9adbd5be09268d02 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 11 Apr 2025 08:20:24 -0400
Subject: [PATCH] Fixes #18955: Include the "clear" button only for
 non-required dropdown fields (#18971)

* Include the 'clear' button only for non-required fields

* Apply the 'required' attribute for mandatory <select> fields

* Recompile static assets
---
 netbox/project-static/dist/netbox.js          | Bin 392123 -> 392138 bytes
 netbox/project-static/dist/netbox.js.map      | Bin 526751 -> 526762 bytes
 netbox/project-static/src/select/config.ts    |  12 +++++++-----
 .../django/forms/widgets/select.html          |   2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 37ee63f0adf53d27e9b460c46e80ff9b488065b8..b81a361e0ce01d0cb1bdcc1a912f34958f654929 100644
GIT binary patch
delta 2306
zcmZ`*dr*|u6`ynOw*vAA3T6?71x2#!K18ZUkPpR}Y1Ih6$VPF65BS)<2p`;UcNv~B
zF*+La7^1azoJkZ@n@*>uc|g3j&BGW?jkXb|(55!6*o=u46(>$(O%v()NKBf{^q)QV
zyng50bIy0}{`RK*)J^-#>-HCLrfRy=V6Fw6<>qqci<m4J)Xg=`dd>HFACKx$JvZ0c
z&Q#vJYyZ|sahxp(qo0%ScD$AeytnwZIe;X5*prT=r+-jE(lQuH1OM*ft8W0`{fldl
z;jeeZ1b=VONJ$Lp|MA&vg4~5$pWBf8aC9?rasz=~<A95iSXcsF&WVHkIHbXeKmgVC
zDe!M4hKCnchn-xoG{{8Zjx^YX;l-46aG>piboePndOibQw#3~IIDurs5t=IMvta2|
z&MKC%fLmR~Doi6VGiY?Vx=cM1HH|DT&SXI!Vs6cbdCGJwQyx~RsEqj<bR!rEA>($t
zI$AU{>prHIu?jB#HUp|+(4*K3kK(oE(b=#QQx(g90Eh3!$~J1uC~0Nk!qv>%W_TM6
zFBkSXkn<hgQs!<m+?xzH7pvxgM3}g_kZ5IZp9eX}7R>`kJfdzWf%W%t=IZ!5;V1@Z
zs%3RdH^WP`h*p6S4XsfRsAbjldQHTqg~KdpI6JyLTwX1K_i`~+8G;=Y!4@^ZG9*tl
zz)B<^Ho!+njy6I?Hg8s^X$`s=ndb51u{!Mgnrp08t9&^feo<rqi{;H-H4RN+U5uOo
zhy1+(+3}d`wKf>Q)a5%J@Ql^8@-CQWL*&*iSXwT<kHL6swV1yRLa05k4LTKMGk3x)
zB&9pyFUedh)S0TP_lFnau{A7Sc@YfpvnSw>Xn_f4O7SF=SylezDR?fKH>y=3R;%Z9
zm|9nr$1i{UH2mDs7IkCs{6g!7ER3|J8wie?$ld`dV#t74(X$6W{t9uj==ll!9gQ{%
zc-(TuDCuJQUeNHoZ7*15JG2*StQk#y7DmxTChvpK$dCM3aJ@C+jD%R&SE)DXjk*!>
z_%&BWUZArRwaup9^8dAU%&09hbf;gI9snf)Vb{C}TP^qxeg%h!`+osE%bLDH{U+wO
zLiy4w5D&z!iKkwLneyXTVN)F9tbQH#kHcGhdJL+QdGJoDmYY_oMD05;h)pRx4pXh5
z{u6MVh@^f<6|+tPBRncrp2bR(HNiOfo0IUY)j9uZ*oZ!dPs2lsm~s+r?^H8U-rElo
ztae&m62Sr3gXb>?;5cF*8-xI=WY#$dgUuiHtc!~M|AAcj=3imRn#VDpH_pRmJgY;n
z#S#s{YII4t0NLY_&K-ui_-%_#*C2rGd)MHS6|Cf4m?j5qz|llZYYz}}3JPO0NIBYU
z%phY8y_89opw#Oi4kRla<RMhP;2>+PYk!_aMlB%BV6u4f9<o@L=aLN6j7cO)#<o+!
zO!BZ*fHAX!9&!s^_j$==3*v~6oP#86m(@{cS)0oh35!*|FiA|!CUNr3JW_cVW|z5$
zL?Mp1sf?+`jEU=Kl#B#_n=`^(E>E5dhxbGY>7NnLYn?i-XSDK*o**gvzQ8RO-6qL|
z*NTNIwTsdac@&fA50T7-B3xS~tYQfZRA?-KD{EniX=-gg79OKcTptT@O*BWtA?FI_
zD*V<~#eFt2N)BRzm|aIZb8`9T7V>rxMP97DNVCQ3z2qJTXPzdrRyPY*;GsDZG@GK$
zg_~HH%Y#upT#!D}ie2jH!_siErw<#!<!~SACTR#1WWGC2VJpi8tPYp?Zb{an@g+$L
z(Rlh1a$^m$_5`{X@70h%=UUtF`9wNH97v?;@<JjVbtf_AGj$$ire53G=@df+R3|Qv
zxY9zVNUf0GC_ta`2)&Ixd*oqyx2TWOc_=y%r4<<D%P5V(l`U-TRK+0owNo!amUq%R
z)PB%Oe?0-kyPl?%$;f}YkG_vnD&KydDrhF(JxBxiRLPuQ(m&WO{V`e@lgJHc9h)&b
zAGcSYOTaCfBARc~IMIHJ&W|5c7OS)KT>;T^mS%`^C`HJW)AT_Ly8eCIZf%&0{q(H$
zLC66bLDn-!OOx!JVYi%XnKdR|by1@x!kX~KlFxiZ|7CsW+pp4`yC{YbkDQ>B<?p_r
zjwBR+GG1x2)c#cE3Q773WVVIjD#XXeuH2gV9ocf$*~#UGH06s}bXu3KJYY}fA$5fo
z3E@-L>df=hhi2t_E7`1k99Hqxd}Ra^eW^gn!x9V?C=;!F+$d7&@a>oD%au_JX8lHG
zx%Dx<P^pv>Ziwzvbdrp(QdYx6%s2ao%;k3C0V)3Z5KWq5O~P?a*?z}ZpmFN<mTE<|
zRNIzr7pa$Riv?V^rHHrwX<IBGyli_MMDZ0{ytq7UTPw~F+v4TYE4K4i5nb19hcJgf
JUAJ8v|6ikuADI9E

delta 2289
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

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 9a6be8d69c5a544df36f8705c85ef6cbd765d720..ccf6d1dfc72561b3a3719c9cbdfea009e0c3e478 100644
GIT binary patch
delta 66
zcmbO~Sz*;=g@zW!7N!>FEi4ZOdA(h9+#MYQb;2E;Bb=u{7G!Z@ad-4|ovtm!;?J1V
TUM<7|#H>Kfw!K=2UFACfz>yRp

delta 55
zcmZ2ASz-QUg@zW!7N!>FEi4ZOnH(LbzY}C}VR3bI_ndAf#NyAG(cUJ+0>rF9%(lHv
Ih+XA70R40kU;qFB

diff --git a/netbox/project-static/src/select/config.ts b/netbox/project-static/src/select/config.ts
index c655b5271..0b0d6f294 100644
--- a/netbox/project-static/src/select/config.ts
+++ b/netbox/project-static/src/select/config.ts
@@ -5,11 +5,13 @@ interface PluginConfig {
 export function getPlugins(element: HTMLSelectElement): object {
   const plugins: PluginConfig = {};
 
-  // Enable "clear all" button
-  plugins.clear_button = {
-    html: (data: Dict) =>
-      `<i class="mdi mdi-close-circle ${data.className}" title="${data.title}"></i>`,
-  };
+  // Enable "clear all" button for non-required fields
+  if (!element.required) {
+    plugins.clear_button = {
+      html: (data: Dict) =>
+        `<i class="mdi mdi-close-circle ${data.className}" title="${data.title}"></i>`,
+    };
+  }
 
   // Enable individual "remove" buttons for items on multi-select fields
   if (element.hasAttribute('multiple')) {
diff --git a/netbox/templates/django/forms/widgets/select.html b/netbox/templates/django/forms/widgets/select.html
index 4688a9e8e..99f677ade 100644
--- a/netbox/templates/django/forms/widgets/select.html
+++ b/netbox/templates/django/forms/widgets/select.html
@@ -1,4 +1,4 @@
-<select name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %} class="form-select {% if 'class' in widget.attrs %} {{ widget.attrs.class }}{% endif %}">{% for group_name, group_choices, group_index in widget.optgroups %}{% if group_name %}
+<select name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %} class="form-select{% if 'class' in widget.attrs %} {{ widget.attrs.class }}{% endif %}"{% if widget.required %} required{% endif %}>{% for group_name, group_choices, group_index in widget.optgroups %}{% if group_name %}
   <optgroup label="{{ group_name }}">{% endif %}{% for option in group_choices %}
   {% include option.template_name with widget=option %}{% endfor %}{% if group_name %}
   </optgroup>{% endif %}{% endfor %}