From 5413263effc9a48d02f7ca1723c104fad812b7bd Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Fri, 30 Jul 2021 01:25:29 -0700
Subject: [PATCH] #6797: Properly update API select query parameters when
 values already exist on the element

---
 netbox/project-static/dist/netbox.js     | Bin 312447 -> 312523 bytes
 netbox/project-static/dist/netbox.js.map | Bin 1116303 -> 1116612 bytes
 netbox/project-static/src/select/api.ts  |   7 +++++++
 3 files changed, 7 insertions(+)

diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index b91a41a924ecf016312b97ade9e58bdce3667420..c0f1e123d154350666164edaaea9b865a1a5f0e8 100644
GIT binary patch
delta 583
zcmYk1&1(}u7{+;LXPdOO*mR2u^)uR-ElZLfyhPRz1r@b^w5Vt-C6;NkU^8}R)1(B{
zTP>}iBFwpm-eU0}4)}2>7A!=m;Khp{e?Tn=4JuUhU3>BL%=^qUzvrDlcdh!gb>}Ip
zWI?F+S=iPjm{Z9Ky_$tDE$F>H1DSB(F*_}k)dx#xe(Zx6AoQcNu-$AG%srYrF?je&
zT<B*5aNNMa?@RCw1NF;rzl?fq1s?8h6U?p(=9ffquVCuIPuQWXHTYl!{xB~}euE{L
z5L_VW*BazZkm}+(yacW~8ZfqnGdC){(Sjd!q?&2KF3OoBb*%w&Td8CYR~Jk&6v5Mk
zJL0--bTXRBvozO>CfP|5_PLoXhb4=};@4fS7h1@tc4W_Xk^La`lP<Dk0N15GWYk1*
zTB@%H@J1-wP15*@OgE{L5LV`c*2ROQpCGfdhur>Gu2m0tLxc7q_uPN&iYLh_q&!cO
z??|bo$Pwtk)PTPkt86Ygwb4uTMz8Thf~VK#4c3HuwPt(+)RPOwYA5QU*T(7jP|kDs
zARkfVx2R>aqAxrq<F@UwIJaXlzu?Klc!`P0^LddUlL^WEIKI&30*!<bGJTV_1#mS%
zQvrOrOi7^i3M~`VV^x}J4<n5s%~RDGI@OGmkJCO+x6abJApQ6r9ZsS~UeRLcFLC(B
AJpcdz

delta 531
zcmYk1O-NKx6vsK|-KS4YGT)HF^f~4<BSSMT+DyELX;D#Gl$g{cVsg_9H8<`Xbz~N`
zvlycfg1dI%Zg3S{m}(&f1{wwtv@wIWCIk*C7<OK6TK(_&^W%5UU3lbfKXf0wgrzJ9
z{V5B3>jX~}bHc1<VWp9}#fy+}f{w@2Lc87Yp31M?@EU}9aS7V&Cc(YaxwHKzug8RW
z)dOcN0{&csj|43A!P9Zdn@jNgV6))ylH!F?l|L-FezpPow7UkM-Jl<md0*b)$GK8c
zk!W)bayCfayAE$a>DC(D-KDq}QDS(c5J^Z~uE7DOctV;=4W@T9$rDOnv2kDzy~e!T
zp65j-BAG#+R%Xt|{fuPa8t{W7c{Cck<ta1Uh|4YHo(f~TE{CznRKr-cK$+1)IBb(V
zE%o=K*iQdp9hjznWIC{f^|W;`SUh(OuOewfop}G>exo~ao&^UCc$fb>K+7baCrdSn
zzsOQa;VEb(s;97n6?g8O-0DKJ)n)zm!8hwO7O$hcQL%mk<+)jFHAH#hopoWxERHb8
zq3O##)*Mhj##kz#LPdr_woR~cq<m6hsTRlQF&>XbeLY`hlMOT#XgcDXz9}{x(3_9h
MP?EC$Ez8&c1sDId2LJ#7

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index aae0e9096e9887066ab489a9c3917cd247c529f0..3f86f21082a3f225701c652137ae95407a08cd22 100644
GIT binary patch
delta 274
zcmeC5=yGJTOG67|3sVbo3rh=Y3tJ0&3r7p*7OoGM-1YSp98*#h67wn*5_5`D6H_X6
zi&Bg8bIMXv6tYt*^~(}-N>ddI5;Kd66-x3IN-|Ov90NQR3QJRqDuKd9iMgpIsYS)p
zH~ipIXG_b>0dl7O;F6v$p322Ly()=IaC&bC5Bqe1|6DxN8DBAqOg|aS$TK}an1iGJ
z!zC^t<_2OOAm#;PzU?0_@jv@u=2_*W<L~GguH)?J=&a-F=;*EE>F5}$;|pRXIyxrm
zggQDKJL@<)I(q83J30mfrJW<D7hDh!WpQ`(wA_B<us|pur)7pyl`~M2_I9&N0#DeP
Nib}T2+!83(0|5U0VvGO)

delta 89
zcmX>y*`<G?OG67|3sVbo3rh=Y3tJ0&3r7p*7OoGM+HYLu0%C3;<^f_}Am-bC<1+uV
o4@~Y=+j)-)gz|BgWjIwi>-ajBZ_mCg@PwVovUq#oZGmDv0M5iFRsaA1

diff --git a/netbox/project-static/src/select/api.ts b/netbox/project-static/src/select/api.ts
index 4fc21c809..e9199603d 100644
--- a/netbox/project-static/src/select/api.ts
+++ b/netbox/project-static/src/select/api.ts
@@ -164,6 +164,13 @@ class APISelect {
       this.updateQueryParams(filter);
     }
 
+    // Add any already-resolved key/value pairs to the API query parameters.
+    for (const [key, value] of this.filterParams.entries()) {
+      if (isTruthy(value)) {
+        this.queryParams.set(key, value);
+      }
+    }
+
     for (const filter of this.pathValues.keys()) {
       this.updatePathValues(filter);
     }