From 08d56cd19f5c8603e5179a5b2e1bae1217b3aca5 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Tue, 8 Apr 2025 15:05:56 -0400
Subject: [PATCH] Fix auto-selection of selected columns

---
 netbox/extras/forms/model_forms.py          |   3 +--
 netbox/project-static/dist/netbox.js        | Bin 382572 -> 382486 bytes
 netbox/project-static/dist/netbox.js.map    | Bin 536090 -> 535986 bytes
 netbox/project-static/src/forms/elements.ts |   6 ++++++
 netbox/project-static/src/tableConfig.ts    |  13 -------------
 netbox/utilities/forms/forms.py             |   2 +-
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py
index 26b7a552c..1d44a0de2 100644
--- a/netbox/extras/forms/model_forms.py
+++ b/netbox/extras/forms/model_forms.py
@@ -320,9 +320,8 @@ class TableConfigForm(forms.ModelForm):
     )
     columns = SimpleArrayField(
         base_field=forms.CharField(),
-        required=False,
         widget=forms.SelectMultiple(
-            attrs={'size': 10, 'class': 'form-select'}
+            attrs={'size': 10, 'class': 'form-select select-all'}
         ),
         label=_('Selected Columns')
     )
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index c93cdc4c46d245fb82844331b0671d0e0e251366..b022e518d73e8e4cd45f72ee23e3f88bb78cee0c 100644
GIT binary patch
delta 358
zcmaE}Mts^D@rD-0ElkG(8C|y@4`lj&*D@`?NFyh;L?KflKTW|yL#a45CpEc54?^iC
z=Hw{k7nEe?=P7AwW<o_%Q*0FttlRhLGjHFg&+=4f`uiA`<<sB9ut-hc5X*9d(S3Vo
z9E$?;^f!qtn$xc*vWQOCN@CHOE}Fz5GCeDa#R#ZiZW2pNAEWnnrH?GBY(To>JIkW8
zOcCkRH=buzn!eyDtMv5DqpZTywT`mdPv3o%Rfx$eeVQh-@ph(TtX7PS5z}ptvqn$1
zInK&GeerSDS&UxW?M|?6W@3s;pZ@t2>pc*C`7~<@W9oK~GpzlLLaAjMd77HFX{C9|
zAkQe2l!0y9&V7!RgGr#IOaoamZ@TgY)+GMCG9(R|Wz!REnI)$mh+|>hzUcz14kKgc
Y^!pcCV;PIK+g@T-Wdzd6msvTP0pja}=>Px#

delta 398
zcmYk1y-NaN9LIU?d45quWElwIa7iydP+Gb5LQ@1bxrJqMXHRmV&qZDb5k|v7v_v%c
zn;L3%t9br^Frku?=Gvl$hN8i>vzDe0eBa<(u7o}+p?!~BYBwojs#;2GJ|8sWR5j!5
zbri2pXisdUDDoofEK8#xW+PcUzg>{UNJh6e9m|#@oXgl>LafgYjN?v*4dV9-J0=V0
zW!M*4RPHL%X`pDhV$Cs3f6SH}Ru0b$mcX*Xc-drq_++p#zd}ql?^hN~<{gnGb^pmk
zo6pH6JFnw#73MHlg&;}d#1su;;Q<1etiqU<&XqY$s7e*42ub1F4J>yib5UO6(|O_O
zIN{MSS~b`sY4u)%3r!O)p5DSsi={hoIvqDE`EDyL@RQSi)IHj!!uKFZ@2|&88{0D5
zI;~3=NdqG4st)a1K)O->&$O`q0A{!4{?oQx+?=6dm41X6AzOIZfDEzKTLXrO&#ouv
Fpg$Gykc$8S

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 72804c76586dafedcc499caa9b3fec3abe0311f4..a8ce742fd55df9e6a39d3492a1c742ca49545c46 100644
GIT binary patch
delta 1008
zcmZuv&rcIk5YEazw-KTyc)-#SyqKtKgdqOl_V(@Dr7d++*SgfiLkk6pP|L3xy%b6V
z2M-)4(Zs}<c=2E`YX1ZE=3NYbgYn=&W8%!L35j^<^zF?1=9}+(^W^K`o4vvHw$VP)
z?s{tuCcFHahNS_kHyU!J9CB<e)m81{pUm5#l#%Vr^s-~8rOau{Ms!SL(3s8Rw`XTD
zG9qhNvB?F8fFX4nbrsxAnqCh>Lxy_rI%#GN4Zo6R(o)p3l7Uped3wgT713fw(@Dhv
z`_#3@Ib`Tkrid5(WoLr!<?IT=F{>I5MGr#|Fn>U74>{XVJn0RZG_T=lznL_$@V?*t
zX*9NXQ)Xv3CHBjSNy$J3`%N)mDEQqJePb-FLWKemjKrcfwJLHA<(8x@;WTPqvz*W_
zV$p+OU1Y5^4L+5D=j)=cz-0uipiL|6^_)lb^#57X#8Mh3p$J+-&>DkAwNJSM^JIvp
z56*6g5hDk8Hbm5%r0RW=en|~0@_|hwN3p<h*45MW@z+4j&q<G5;m$L0ZA$ucPQYh=
zmV7L=K-{QzMDg%9DF!rajx2JG5QbY~%$R_MmauzsT+UFGtW#=u)e<SggHJ7S(eU9%
zOO%gK(}k+TBW8>6xh<~2vrQ45x=sAyfoJ}x8$owlygN~M4q<lOG7S=y352Fiq4_lG
zyrvhz<)RI(@*{?GWF{-o*W(SDbz(5=rmWuPVFVjXX+7`qN<{}`R~&l@doS?|t^Pwt
z>ysh2B08jNxX0?zc)V`+SVY9S7is0yvTFxu=yrWe;O}UszGb<$VDo$;nW)wprG@JB
r3Vi%xUG5y)vv!8yLwDjFy!>vRgm2x6$5v&bvRJ9Db{_O3UYz*@?Mok~

delta 1088
zcmZWo&rcIk5KdvAC4oo`!Gwj7LX5_+#$p7)#KYUSuiLULO;buk;=#5ouu#j7LXE@(
zS{k@$IKIS-e}hKSvj^kB{{W1Hi$^tHO!S~L(^i{s*vamj_s#cxGqZ0_LoYvt_Nswu
zTebbI7SbQcf;3{ByTXv1r|~rgL2jBx0=|XeK#X9{F?^Hr5z|O=o`eH2W=Zuz*CJgO
zrjrB}>P*+1fTc$IH9aUX;YHPSzt*=X48eH<Pb9w4Cz6VFX&W{au<&>uPV7x{3h%jw
z2XHtQB@<%=LOf3VF0wtP(~=;i)2KAzs*gY%5b8_6_A9V*cs`)j&Ij1%Y<!LrP$2LL
z0dKcjB>P})r0x-9<s;-Pfv_~lktD*YmyznjE*sRNC=*aipnQqUj7HE)%vOJPS?@J!
z-#nRtTN%zX01zuOhPb3L4}L8*vB#WAYC(?bt&zH&x-F`(YBq_AAg^d*k>ysR>o&U2
z%rxX|!>w()H6~p=OA%F6{RFCjqqcj4Lu#SS#&67FmI!yOQR)qO#qmIbV%U;d^{&i%
z`$$B}#*Ay^xV>yrad%dID>MB{5}n6Uh>O#*5=yVI`++HysxTw$P&SH@Q)Bre7E08+
zvI>e<O`Hvk6WYQ(^}51t1*AHwu<Ye5!hDlNIcXK&XGd2@(I7POUrX#U>yD{@?6c$U
zf_VWjp}tmGy6v8+eh+AUyN%i6O8c}2uzpa^gCGl5%kDQ9Bgc6Tk}$lBP}=hpLMQ7}
zi_mY=gf>V3yxs&qY9Xd3;$p~^I`PbZ^tfqkfW!?N=2jEk0K;OY5C=bvAk{)_#p?U%
zAGRMbcrMl24}uS8d;CHvllK>j!$xS>%X^Q#!j>wZ1n;W%r@`*p@k#I~++EC+yxB}P
f?}@d-qQ9iRp9BY$)!A`VJ?rdvUhC=Vcs2AF^=LNg

diff --git a/netbox/project-static/src/forms/elements.ts b/netbox/project-static/src/forms/elements.ts
index e047ea738..a397feed6 100644
--- a/netbox/project-static/src/forms/elements.ts
+++ b/netbox/project-static/src/forms/elements.ts
@@ -1,6 +1,12 @@
 import { getElements, scrollTo } from '../util';
 
 function handleFormSubmit(event: Event, form: HTMLFormElement): void {
+  // Automatically select all options in any <select> with the "select-all" class. This is useful for
+  // multi-select fields that are used to add/remove choices.
+  for (const element of getElements<HTMLOptionElement>('select.select-all option')) {
+    element.selected = true;
+  }
+
   // Track the names of each invalid field.
   const invalids = new Set<string>();
 
diff --git a/netbox/project-static/src/tableConfig.ts b/netbox/project-static/src/tableConfig.ts
index d67832f82..f1dbedbae 100644
--- a/netbox/project-static/src/tableConfig.ts
+++ b/netbox/project-static/src/tableConfig.ts
@@ -1,16 +1,6 @@
 import { createToast } from './bs';
 import { getElements, apiPatch, hasError, getSelectedOptions } from './util';
 
-/**
- * Mark each option element in the selected columns element as 'selected' so they are submitted to
- * the API.
- */
-function saveTableConfig(): void {
-  for (const element of getElements<HTMLOptionElement>('select[name="columns"] option')) {
-    element.selected = true;
-  }
-}
-
 /**
  * Add columns to the table config select element.
  */
@@ -124,9 +114,6 @@ function handleSubmit(event: Event): void {
  * Initialize table configuration elements.
  */
 export function initTableConfig(): void {
-  for (const element of getElements<HTMLButtonElement>('#save_tableconfig')) {
-    element.addEventListener('click', saveTableConfig);
-  }
   for (const element of getElements<HTMLButtonElement>('#add_columns')) {
     element.addEventListener('click', addColumns);
   }
diff --git a/netbox/utilities/forms/forms.py b/netbox/utilities/forms/forms.py
index 0b92ce7b3..07dccf974 100644
--- a/netbox/utilities/forms/forms.py
+++ b/netbox/utilities/forms/forms.py
@@ -121,7 +121,7 @@ class TableConfigForm(forms.Form):
         choices=[],
         required=False,
         widget=forms.SelectMultiple(
-            attrs={'size': 10, 'class': 'form-select'}
+            attrs={'size': 10, 'class': 'form-select select-all'}
         ),
         label=_('Selected Columns')
     )