From ccce7751a05e8f87d21710077f18c942de2922f7 Mon Sep 17 00:00:00 2001
From: thatmattlove <mtt.lov@gmail.com>
Date: Mon, 7 Feb 2022 14:36:28 -0700
Subject: [PATCH] Fixes #8564: only use columns form field in user table config
 form submit

---
 docs/release-notes/version-3.1.md        |   3 ++-
 netbox/project-static/dist/config.js.map | Bin 105872 -> 105872 bytes
 netbox/project-static/dist/lldp.js.map   | Bin 106584 -> 106584 bytes
 netbox/project-static/dist/netbox.js     | Bin 375383 -> 375412 bytes
 netbox/project-static/dist/netbox.js.map | Bin 344743 -> 344757 bytes
 netbox/project-static/dist/status.js.map | Bin 128409 -> 128409 bytes
 netbox/project-static/src/tableConfig.ts |   2 +-
 7 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md
index b24aba73e..88214246b 100644
--- a/docs/release-notes/version-3.1.md
+++ b/docs/release-notes/version-3.1.md
@@ -4,9 +4,10 @@
 
 ### Bug Fixes
 
+* [#8331](https://github.com/netbox-community/netbox/issues/8331) - Implement `replaceAll` string utility function to improve browser compatibility
 * [#8548](https://github.com/netbox-community/netbox/issues/8548) - Fix display of VC members when position is zero
 * [#8561](https://github.com/netbox-community/netbox/issues/8561) - Include option to connect a rear port to a console port
-* [#8331](https://github.com/netbox-community/netbox/issues/8331) - Implement `replaceAll` string utility function to improve browser compatibility
+* [#8564](https://github.com/netbox-community/netbox/issues/8564) - Fix errant table configuration key `available_columns`
 
 ---
 
diff --git a/netbox/project-static/dist/config.js.map b/netbox/project-static/dist/config.js.map
index d070a0451a8a679376f39a26b6cb6672f28f84c3..37bd61eddb822428ecbf862b6d8f798df9c2c46e 100644
GIT binary patch
delta 27
jcmbQRn{C2wwuUW?;?o%Ow@XZ8>|$gz-@bS{<6Bk$k#Y(G

delta 27
jcmbQRn{C2wwuUW?;?o$@w@XZ8>|$iB+P-)?<6Bk$lFte~

diff --git a/netbox/project-static/dist/lldp.js.map b/netbox/project-static/dist/lldp.js.map
index 25d5fc87e066e8df9a8fc76317abe48857268375..52eb58fa7f68b5e5babf771b1308140a8e66150d 100644
GIT binary patch
delta 27
jcmca{fbGTswuUW?qSF}jw~I|<>|$gz-@b4<<8}@JpbiRS

delta 27
jcmca{fbGTswuUW?qSF}Dw~I|<>|$iB+P-i)<8}@Jp=%1B

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 678527f92d3b3b9f93510ba2198c1f93ecb07832..fa97fedd9324aa8dc67aa937bd65c79cd310fe12 100644
GIT binary patch
delta 238
zcmccqMeNHLv4$4L7N!>FEi5e+YC5TTwo1jRIjPAdN}AO<sU-?|dA8B9)@k`g8X#U#
zo<e?_!sG@&k^0m;P0h?SjiNk7Tid+SoE(Vq{5;$0yu{p8tD-zT5UrD6P?DLSS8Np>
zTMIWO5o`)j1yoWqF;5R-X=;j^T0UG{ub{LzLjx#TmY7qTs%Z^!i=LidUY<^V9#?E_
sQEEvk&_Q|aj+HFi9V=P)i;L?(9Ul#{+cr5rr!+UOI96%fMAmRk0G^3fA^-pY

delta 162
zcmezJMeO<)v4$4L7N!>FEi5e+qMFq?sU-@jdA8B9)@k`g8X#WY^m#K`q&SOHb5fH_
zlr%M`8?Im#Wv|Xl%uTh*n|`l?McOq#Pa!`|Aumrazn~;DKd)FbKTi*$J~c&6tq3lz
yS5R7<p#hXEOUx-v)wBj#q^GBsnx|8g7dzQOO{6`jl4W~PCF>UP?XnYD!!-f_YdQ4*

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 66cf3d8d37d04e22f061c0bbe3a28578ab6eefcc..915e5e6c91faa056aea3efa0f917f7bf1d4795ac 100644
GIT binary patch
delta 180
zcmZ49D!R2*w4sHug{g&k3yY1rT)3%|PNbu=kB+;evm=mj%yrTUc64^padvdhahe|J
z&Z5TXxxK=jWiKmZ(RMRm7RK8m&aN=k&V|l8nLw3A&eMG~ShYBETn(LdLLGCb*J-eZ
zSVVzLa?~jVDsa@%c6N02)bV$8_5%{0ZXm0Cbvzv%L!p)e`N2BnPLA#+&f8fuS-&tc
M8gBoo#kx)$02PEX*#H0l

delta 145
zcmdnmD!RN?w4sHug{g&k3yY1rXsD@^PNbt_u8WSlqoa|Nj<ch4p4;>&cNR6q(Cv-x
zEPGiQv$os&vM}Bjbxd~#DM|zpW-dCJK&2J#(?c{^wK()$44rjC9n+_`X|RR}h3N!4
rIy>qV0u?ywXgfQ)x=w$i!79z_>F93mv|UJ(^$R0o*>-kq)^*|l_uVMa

diff --git a/netbox/project-static/dist/status.js.map b/netbox/project-static/dist/status.js.map
index abfb8e6ca1303f6fe6de00c1be5923994c3b8a71..cf0984f7323aca447f8ce9b495fe7c9bd49c9109 100644
GIT binary patch
delta 27
lcmV+$0ObFf>j#<Z2Y|Ez_1^(+xAxxw>jD9Gx8mXfw-U!!4aNWf

delta 27
lcmV+$0ObFf>j#<Z2Y|Ez_1^(!xAxxw>jD98x8mXfw-Uyu4YmLP

diff --git a/netbox/project-static/src/tableConfig.ts b/netbox/project-static/src/tableConfig.ts
index 8ab1a7d56..09f4c5c96 100644
--- a/netbox/project-static/src/tableConfig.ts
+++ b/netbox/project-static/src/tableConfig.ts
@@ -82,7 +82,7 @@ function handleSubmit(event: Event): void {
   }
 
   // Get all the selected options from any select element in the form.
-  const options = getSelectedOptions(element);
+  const options = getSelectedOptions(element, 'select[name=columns]');
 
   // Create an object mapping the select element's name to all selected options for that element.
   const formData: Dict<Dict<string>> = Object.assign(