From 2a293d5d02532a55473af14fabc359b0c8bdd8f0 Mon Sep 17 00:00:00 2001
From: thatmattlove <mtt.lov@gmail.com>
Date: Tue, 7 Sep 2021 18:19:32 -0700
Subject: [PATCH 1/4] Fixes #7188: Re-add missing support for `null_option` on
 API select

---
 docs/release-notes/version-3.0.md             |   1 +
 netbox/project-static/dist/netbox.js          | Bin 323165 -> 323330 bytes
 netbox/project-static/dist/netbox.js.map      | Bin 311640 -> 311779 bytes
 .../src/select/api/apiSelect.ts               |  23 +++++++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index ac2ee021c..e1bb57d72 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -8,6 +8,7 @@
 * [#7164](https://github.com/netbox-community/netbox/issues/7164) - Fix styling of "decommissioned" label for circuits
 * [#7169](https://github.com/netbox-community/netbox/issues/7169) - Fix CSV import file upload
 * [#7176](https://github.com/netbox-community/netbox/issues/7176) - Fix issue where query parameters were duplicated across different forms of the same type
+* [#7188](https://github.com/netbox-community/netbox/issues/7188) - Fix issue where select fields with `null_option` did not render or send the null option
 * [#7193](https://github.com/netbox-community/netbox/issues/7193) - Fix prefix (flat) template issue when viewing child prefixes with prefixes available
 
 ---
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index 92ffda9def5df35afd4ffaf8997202b3db481620..e4d0f8d8ce75a47b3c94f4bb12fa5de77475f6e5 100644
GIT binary patch
delta 1305
zcmZ8g&u<e)6xPH;B2+|^hO`hRso8_OBR1Pu<(IsfM5IX%5mJ~^mq?aHC-yjOS?`+N
zafq=)*d$feO1*X@1QP8X6@jY#7br@V9$Ik#DxqExhYFB5wX^H2y~<&C-h1DB-+S}k
zn`ci4H~t>H_bvpBoBc58hv1*q7{Ol}WC~AYGGsC@e@C%8H#ISx&y8o1LBxO$-tQwt
z!>p+D;?6qAh%bCF3`pSk;8xFj1kWDJj$hU0@q|Gp@vMv(-2&(Xf;6JdBV<$@S0y+b
zf?rFpxCK-gg28uN;Jyxsn0x>Z56G-o=4-A{H$9K@1ro3a;BBgxM6}}h58#k=Z3G}A
zGv5ioSN-Qm+O*So#B|dxv(<%)O3>7JcG}fTj$JXA3#5oks$?o6y-I89Srh^#%GHDi
z%JD{xIhFKWfrxVt!EmpP3bWT9g8x!7V{IGE%H!8<fK#$+@y9k8*+1iO?o<_dhvDDB
zoBa|WcnlU~Ve~ODMx}cD6*$#L&@t6hiFon~_<(#{d=2E+6BJ*kj(_vvqRKCso~A5O
zk15EARhw2LRouG<hdzz1tXkuZg&H><JLy}utX-pKOS#L!U2}PvxuLIkc?}-P#YC1v
z%X2Ht<_Vgm=rVh)o@G{}_%ls73Kqr1CLEK;_4aYQ2}jhJwC-AprX(1z)S27JcdX)h
z6AsPB-c`qC%AR^_E<5kIoRt;rsNA{O^`aA9*;BMaez_Q4Cf9-^vWg2WxY<Lo_{r}X
zN{8u@5q49TBBoj-#x-CX46H#5^cfc8X|o+O8MbS@%`Rh2rkW^|i6)|lP`j(R$=NE;
znc51q>MW;(h_Z%)wd?R>kfK^i{IU*D9F#(P$-@Lx{3~q-Xwve@4VX<yi`ZF*L!xy9
z-UN<#b_<S)6F%$*p7_j%c+f%9QQ^C@!%of<Kl+fo<H?s1rj`W?|7Plt=-q%HwWTu~
z@aasq;I5;M3lUit({x?8i>Te4PQP0%)y8(9ZNeRNGH&}NYL_kMdWnhFTxYeB(Br|#
znFQIp@aJ$SfBptfcXnc_E?-D;S(#0jELQ&9xf<~X#~;B{`)1;lJOmT`yWTT<S<0pt
o(R6{}?hgEZUuVJhJSUG+p5&z^ZmzJirhU1yg29!);ETim1BXPhW&i*H

delta 1188
zcmZ8fTWb?R6y`MJ4TUzwY7JVGJj7kPjSYCC>9#2COHpd7k%16(+f3S(&Ca^Jv5k$I
zv=veCdBh8-AU=qo7FmCSNX7b~B3?jz6@6(1LD1Q>YnMLk&Ybg|`MxvXoXIbt&!0k%
z8xf?Znvm0k;9I2?%g0l=TkeR*aaV@_qO#D}-O-cjY)^_Q%z`!8yawk|YC-5{cP>Jl
z9jieYutRHbt6?LSd)t!jV^Y7|k-}YaFF&z;8pJJFl(5t<im3uM1uQ3B@H7W=(;y%h
zbgoRp(*$7FH3Ka{t}1iAiL;6s>6bHE?2sAw9axR)wCw9O*u+cA4#c_g9S2S|9l;S*
zk7PuWQ1v_+A1DY|>~2r?n2BMk7u1m~&dI|9XUd6*qGAY#L>CxVY{6F{cG_iw&_bjy
zi`kJE5MIqsx$4FX_#5Dg#w_&m<=HIA0p2y6n}u!b4pQ5u#TdUs_!azG$MN8M7~qX5
z?;*9Fhqvcp-x@5o36_A_$9bp$zMNYC{xvwcg~0AhJJNzZs#;QPNU=yvOnITM6zd^-
zd=52V^s=OA*yRDkR;li*wM}(ogqXgJqG@z&kQ7W}jmD&C$1<-*m3-e>qT9aeq53UW
zW-U!EE)}s86DSO6R-Qnue7Vk-tk;sE*rUf4twgMtq?578VZ~ThE16nMiut6@l!#f*
ztjsF5XJnL5TABqbD0KM0fJu&0(<XU-5f@$Z>m;q)z*V!Ek=$}VuUg8GM)Hd;xv&ee
zGZi$|V9D%mt)ZE%KaU!NmgE|r@H&z$r|mq_!1;Lr?Sg<MDJ)t=dp7dT;^=C`j#v>s
zA#C;v+RAEG)Uv_yLF|4NB?COe4pdPy`%y(VKxGeaqE_~xhMIt~=QSjURI#V7yYy(X
z+DX~kNtE6|`QYm%O^e3`%AQ;bgxL5b+R2aA_cN2|Q={QoQK<;JOq@4U=(V`lb7WM}
z^BOTNpWTK@$IHIh^Nc&<ynBT1ZF3*>CE71|9782O(EiyXdfm-II#%a(KD<QxRt3Fs
w+XY>I7M(*|!d}{YgM<IsoWVJCbydVGSTXFDt=Nk+f8L_4kajk|L*HBe0gE7sC;$Ke

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index 678ca7255cc1be16d5ca086e3ee15fe03b11b381..10b2b5ae537d50dbacbf628f64f790979129fc38 100644
GIT binary patch
delta 303
zcmX|*y-EX75QTB~f?&I)FCb(fosja(WLYlDRWL=em8J-25Lc4;vsPlZ@&)uEEQR|h
z+KaWX;LI-C9ELgPn=_wJ+1ECEY<JqEP2b(m#puSbm@1&69B7yXSN@u5fpTmDS~J3*
z)(i}o0>X&n{?eT$p#TD@%#AN;Zj;7jB?Q2mH6ag~DW(3@e1V)Zl}6@}BXf>v0zZq*
zrAyPZe91kmk?!O|BeLPXM*uOnJ674Q(1K#vU9_c~{6949gB_y(Sx|=j@>aWp)NjV|
cqjoXdyKVSEwBoLbuUl8{CijE*{p{9<zxYX4YybcN

delta 164
zcmaFdEPSI$xS@ryg{g&k3(NaVolMUnC!I(~$4DJlN5@Jh9cM>#j{+y1R7Y<Y5aFm(
z?BwVRA)U8tWU<6EZNHks!o+OgoaLnB=;-LJ;|(Ih9i4-8+#MYgLB@na#GD-+ok3i8
z9ZyF`|LNuhEE>%2#%|k_3Rt!abLCVxRXOYUI_6evS8iePW@pN?++NVlQfvkQCWkPx

diff --git a/netbox/project-static/src/select/api/apiSelect.ts b/netbox/project-static/src/select/api/apiSelect.ts
index 11576c53f..690608113 100644
--- a/netbox/project-static/src/select/api/apiSelect.ts
+++ b/netbox/project-static/src/select/api/apiSelect.ts
@@ -58,6 +58,12 @@ export class APISelect {
    */
   public readonly emptyOption: Option;
 
+  /**
+   * Null option. When `data-null-option` attribute is a string, the value is used to created an
+   * option of type `{text: '<value from data-null-option>': 'null'}`.
+   */
+  public readonly nullOption: Nullable<Option> = null;
+
   /**
    * Event that will initiate the API call to NetBox to load option data. By default, the trigger
    * is `'load'`, so data will be fetched when the element renders on the page.
@@ -197,6 +203,14 @@ export class APISelect {
       this.emptyOption = EMPTY_PLACEHOLDER;
     }
 
+    const nullOption = base.getAttribute('data-null-option');
+    if (isTruthy(nullOption)) {
+      this.nullOption = {
+        text: nullOption,
+        value: 'null',
+      };
+    }
+
     this.slim = new SlimSelect({
       select: this.base,
       allowDeselect: true,
@@ -291,8 +305,15 @@ export class APISelect {
    */
   private set options(optionsIn: Option[]) {
     let newOptions = optionsIn;
+    // Ensure null option is present, if it exists.
+    if (this.nullOption !== null) {
+      newOptions = [this.nullOption, ...newOptions];
+    }
+    // Sort options unless this element is pre-sorted.
     if (!this.preSorted) {
-      newOptions = optionsIn.sort((a, b) => (a.text.toLowerCase() > b.text.toLowerCase() ? 1 : -1));
+      newOptions = newOptions.sort((a, b) =>
+        a.text.toLowerCase() > b.text.toLowerCase() ? 1 : -1,
+      );
     }
     // Deduplicate options each time they're set.
     const deduplicated = uniqueByProperty(newOptions, 'value');

From 0e8c6ee52298d3141ae8698d7f342a353e9d5439 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 8 Sep 2021 08:33:30 -0400
Subject: [PATCH 2/4] Changelog for #7189

---
 docs/release-notes/version-3.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index e1bb57d72..84cd3994b 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -9,6 +9,7 @@
 * [#7169](https://github.com/netbox-community/netbox/issues/7169) - Fix CSV import file upload
 * [#7176](https://github.com/netbox-community/netbox/issues/7176) - Fix issue where query parameters were duplicated across different forms of the same type
 * [#7188](https://github.com/netbox-community/netbox/issues/7188) - Fix issue where select fields with `null_option` did not render or send the null option
+* [#7189](https://github.com/netbox-community/netbox/issues/7189) - Set connection factory for django-redis when Sentinel is in use
 * [#7193](https://github.com/netbox-community/netbox/issues/7193) - Fix prefix (flat) template issue when viewing child prefixes with prefixes available
 
 ---

From 9226302742fdd557d74b5e747165e844de19f009 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 8 Sep 2021 09:38:23 -0400
Subject: [PATCH 3/4] Fixes #7209: Allow unlimited API results when
 MAX_PAGE_SIZE is disabled

---
 docs/release-notes/version-3.0.md  |  1 +
 netbox/netbox/api/pagination.py    | 21 ++++++++----
 netbox/utilities/tests/test_api.py | 51 +++++++++++++++++++++++++++++-
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index 84cd3994b..ea463dfd7 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -11,6 +11,7 @@
 * [#7188](https://github.com/netbox-community/netbox/issues/7188) - Fix issue where select fields with `null_option` did not render or send the null option
 * [#7189](https://github.com/netbox-community/netbox/issues/7189) - Set connection factory for django-redis when Sentinel is in use
 * [#7193](https://github.com/netbox-community/netbox/issues/7193) - Fix prefix (flat) template issue when viewing child prefixes with prefixes available
+* [#7209](https://github.com/netbox-community/netbox/issues/7209) - Allow unlimited API results when `MAX_PAGE_SIZE` is disabled
 
 ---
 
diff --git a/netbox/netbox/api/pagination.py b/netbox/netbox/api/pagination.py
index 77af755ce..e34cb27d0 100644
--- a/netbox/netbox/api/pagination.py
+++ b/netbox/netbox/api/pagination.py
@@ -34,13 +34,22 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination):
             return list(queryset[self.offset:])
 
     def get_limit(self, request):
-        limit = super().get_limit(request)
+        if self.limit_query_param:
+            try:
+                limit = int(request.query_params[self.limit_query_param])
+                if limit < 0:
+                    raise ValueError()
+                # Enforce maximum page size, if defined
+                if settings.MAX_PAGE_SIZE:
+                    if limit == 0:
+                        return settings.MAX_PAGE_SIZE
+                    else:
+                        return min(limit, settings.MAX_PAGE_SIZE)
+                return limit
+            except (KeyError, ValueError):
+                pass
 
-        # Enforce maximum page size
-        if settings.MAX_PAGE_SIZE:
-            limit = min(limit, settings.MAX_PAGE_SIZE)
-
-        return limit
+        return self.default_limit
 
     def get_next_link(self):
 
diff --git a/netbox/utilities/tests/test_api.py b/netbox/utilities/tests/test_api.py
index 2cc9accaa..d06670ca9 100644
--- a/netbox/utilities/tests/test_api.py
+++ b/netbox/utilities/tests/test_api.py
@@ -1,7 +1,8 @@
 import urllib.parse
 
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
-from django.test import Client, TestCase
+from django.test import Client, TestCase, override_settings
 from django.urls import reverse
 from rest_framework import status
 
@@ -122,6 +123,54 @@ class WritableNestedSerializerTest(APITestCase):
         self.assertEqual(VLAN.objects.count(), 0)
 
 
+class APIPaginationTestCase(APITestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.url = reverse('dcim-api:site-list')
+
+        # Create a large number of Sites for testing
+        Site.objects.bulk_create([
+            Site(name=f'Site {i}', slug=f'site-{i}') for i in range(1, 101)
+        ])
+
+    def test_default_page_size(self):
+        response = self.client.get(self.url, format='json', **self.header)
+        page_size = settings.PAGINATE_COUNT
+        self.assertLess(page_size, 100, "Default page size not sufficient for data set")
+
+        self.assertEqual(response.data['count'], 100)
+        self.assertTrue(response.data['next'].endswith(f'?limit={page_size}&offset={page_size}'))
+        self.assertIsNone(response.data['previous'])
+        self.assertEqual(len(response.data['results']), page_size)
+
+    def test_custom_page_size(self):
+        response = self.client.get(f'{self.url}?limit=10', format='json', **self.header)
+
+        self.assertEqual(response.data['count'], 100)
+        self.assertTrue(response.data['next'].endswith(f'?limit=10&offset=10'))
+        self.assertIsNone(response.data['previous'])
+        self.assertEqual(len(response.data['results']), 10)
+
+    @override_settings(MAX_PAGE_SIZE=20)
+    def test_max_page_size(self):
+        response = self.client.get(f'{self.url}?limit=0', format='json', **self.header)
+
+        self.assertEqual(response.data['count'], 100)
+        self.assertTrue(response.data['next'].endswith(f'?limit=20&offset=20'))
+        self.assertIsNone(response.data['previous'])
+        self.assertEqual(len(response.data['results']), 20)
+
+    @override_settings(MAX_PAGE_SIZE=0)
+    def test_max_page_size_disabled(self):
+        response = self.client.get(f'{self.url}?limit=0', format='json', **self.header)
+
+        self.assertEqual(response.data['count'], 100)
+        self.assertIsNone(response.data['next'])
+        self.assertIsNone(response.data['previous'])
+        self.assertEqual(len(response.data['results']), 100)
+
+
 class APIDocsTestCase(TestCase):
 
     def setUp(self):

From e12314ba60ae2ba0045cd49b9f2cedbe4bc283bf Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 8 Sep 2021 09:57:53 -0400
Subject: [PATCH 4/4] Fix test user permissions for API pagination tests

---
 netbox/utilities/testing/api.py    | 4 ++--
 netbox/utilities/tests/test_api.py | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index c67296c47..8498f93ae 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -39,13 +39,13 @@ class APITestCase(ModelTestCase):
 
     def setUp(self):
         """
-        Create a superuser and token for API calls.
+        Create a user and token for API calls.
         """
         # Create the test user and assign permissions
         self.user = User.objects.create_user(username='testuser')
         self.add_permissions(*self.user_permissions)
         self.token = Token.objects.create(user=self.user)
-        self.header = {'HTTP_AUTHORIZATION': 'Token {}'.format(self.token.key)}
+        self.header = {'HTTP_AUTHORIZATION': f'Token {self.token.key}'}
 
     def _get_view_namespace(self):
         return f'{self.view_namespace or self.model._meta.app_label}-api'
diff --git a/netbox/utilities/tests/test_api.py b/netbox/utilities/tests/test_api.py
index d06670ca9..5b711056a 100644
--- a/netbox/utilities/tests/test_api.py
+++ b/netbox/utilities/tests/test_api.py
@@ -124,6 +124,7 @@ class WritableNestedSerializerTest(APITestCase):
 
 
 class APIPaginationTestCase(APITestCase):
+    user_permissions = ('dcim.view_site',)
 
     @classmethod
     def setUpTestData(cls):
@@ -139,6 +140,7 @@ class APIPaginationTestCase(APITestCase):
         page_size = settings.PAGINATE_COUNT
         self.assertLess(page_size, 100, "Default page size not sufficient for data set")
 
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 100)
         self.assertTrue(response.data['next'].endswith(f'?limit={page_size}&offset={page_size}'))
         self.assertIsNone(response.data['previous'])
@@ -147,6 +149,7 @@ class APIPaginationTestCase(APITestCase):
     def test_custom_page_size(self):
         response = self.client.get(f'{self.url}?limit=10', format='json', **self.header)
 
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 100)
         self.assertTrue(response.data['next'].endswith(f'?limit=10&offset=10'))
         self.assertIsNone(response.data['previous'])
@@ -156,6 +159,7 @@ class APIPaginationTestCase(APITestCase):
     def test_max_page_size(self):
         response = self.client.get(f'{self.url}?limit=0', format='json', **self.header)
 
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 100)
         self.assertTrue(response.data['next'].endswith(f'?limit=20&offset=20'))
         self.assertIsNone(response.data['previous'])
@@ -165,6 +169,7 @@ class APIPaginationTestCase(APITestCase):
     def test_max_page_size_disabled(self):
         response = self.client.get(f'{self.url}?limit=0', format='json', **self.header)
 
+        self.assertHttpStatus(response, status.HTTP_200_OK)
         self.assertEqual(response.data['count'], 100)
         self.assertIsNone(response.data['next'])
         self.assertIsNone(response.data['previous'])