From 5e5acbfda8a810fae0a4e40ef9d3677016627d30 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 4 Mar 2024 14:06:15 -0500
Subject: [PATCH] Fix object selector

---
 netbox/project-static/dist/netbox.js        | Bin 374530 -> 374566 bytes
 netbox/project-static/dist/netbox.js.map    | Bin 339796 -> 339769 bytes
 netbox/project-static/src/objectSelector.ts |  11 ++++++-----
 netbox/project-static/src/select/dynamic.ts |   2 +-
 netbox/project-static/src/select/static.ts  |   4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index d2af6f39b07134275eef7cb424296d93ebd91117..5d2d4581d034d2b5e31add00e8320ff5798d298e 100644
GIT binary patch
delta 186
zcmZpAC${XJSVIeA3sVd878av=<&yl|;?$hf<dW1BO{={85)Hk)eBF{_2s^qsvnn-q
zx_Lc|>hz3ymS7=>3S>Roch|G56~-dbo-vtad&Xo|HCa2jdcDMy6#s&f%=|o!>dX|Y
m;!K^C%;JKa#7e88%vw#Iyi7e5rJg0Jxf;dW?`>dJVFLgSszlQO

delta 172
zcmZ4XPORyjSVIeA3sVd878av=*1UY(lH%#1^(?B~R(bg)8qvj>RjIMl@71%2P4BN~
zvD<#Xo@K3Y`@G34+viPYRg;Y?&dJQxD^4wONi0d!h^{V4tthc7%G4=K%qdN^D$cBp
z)wIq@Em26!w9QK`S8y#$%`4GRO3p~kOHWnOw9d=aOUW!QNGwUtfJh}~YSyNe<|UV8
V=I1FSW=t2XXA#}5x{;NU4FJ#LKEeP1

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index bb40896b47a33d482121c36c2dcf16a7a8063d07..755bed990534bbd2bd4823cc006d6d9323ce0c5d 100644
GIT binary patch
delta 112
zcmca|Ph{skk%kt=7N!>FEi8e$OyzFVgLPS~m@1vO_v^A86<{iL-X3Phvhl5XsH0=3
z4w!IubgpvJad&j|1QO0(I)RRk!8+cK?hzm{e~22OSfGxlqj$mdNF7#ZM#JrMby&AE
F0RR#YB0>NF

delta 117
zcmdmaPvpuyk%kt=7N!>FEi8e$OvSF#gLPS~rXO%;;o3f3mu0U2Q=!xLFguowZ#BIg
z9ldn|9UTL8oE@EWoPeaGvkp+uSI6Da(O<_GLb#SWP0!F_k>mE)Np^Hh*70=o&X{he
P!|KdfwY^D)bvqLP&Eg}!

diff --git a/netbox/project-static/src/objectSelector.ts b/netbox/project-static/src/objectSelector.ts
index 9de6c1750..633f5038a 100644
--- a/netbox/project-static/src/objectSelector.ts
+++ b/netbox/project-static/src/objectSelector.ts
@@ -18,11 +18,12 @@ function handleSelection(link: HTMLAnchorElement): void {
   const value = link.getAttribute('data-value');
 
   //@ts-ignore
-  target.slim.setData([
-    {text: label, value: value}
-  ]);
-  const change = new Event('change');
-  target.dispatchEvent(change);
+  target.tomselect.addOption({
+    id: value,
+    display: label,
+  });
+  //@ts-ignore
+  target.tomselect.addItem(value);
 
 }
 
diff --git a/netbox/project-static/src/select/dynamic.ts b/netbox/project-static/src/select/dynamic.ts
index 9f29efe1d..3e934275f 100644
--- a/netbox/project-static/src/select/dynamic.ts
+++ b/netbox/project-static/src/select/dynamic.ts
@@ -20,7 +20,7 @@ function renderOption(data: TomOption, escape: typeof escape_html) {
 
 // Initialize <select> elements which are populated via a REST API call
 export function initDynamicSelects(): void {
-  for (const select of getElements<HTMLSelectElement>('select.api-select')) {
+  for (const select of getElements<HTMLSelectElement>('select.api-select:not(.tomselected)')) {
     new DynamicTomSelect(select, {
       ...config,
       valueField: VALUE_FIELD,
diff --git a/netbox/project-static/src/select/static.ts b/netbox/project-static/src/select/static.ts
index 1362d3c99..d88110a7d 100644
--- a/netbox/project-static/src/select/static.ts
+++ b/netbox/project-static/src/select/static.ts
@@ -7,7 +7,7 @@ import { getElements } from '../util';
 // Initialize <select> elements with statically-defined options
 export function initStaticSelects(): void {
   for (const select of getElements<HTMLSelectElement>(
-    'select:not(.no-ts):not(.api-select):not(.color-select):not([size])',
+    'select:not(.tomselected):not(.no-ts):not([size]):not(.api-select):not(.color-select)',
   )) {
     new TomSelect(select, {
       ...config,
@@ -17,7 +17,7 @@ export function initStaticSelects(): void {
 
 // Initialize color selection fields
 export function initColorSelects(): void {
-  for (const select of getElements<HTMLSelectElement>('select.color-select')) {
+  for (const select of getElements<HTMLSelectElement>('select.color-select:not(.tomselected)')) {
     new TomSelect(select, {
       ...config,
       render: {