django-spire 0.23.0__py3-none-any.whl → 0.23.2__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.23.0'
+__VERSION__ = '0.23.2'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/contrib/queryset/enums.py

@@ -1,7 +1,6 @@
-from enum import Enum
+from enum import StrEnum
 
 
-# Todo: Change to string enum
-class SessionFilterActionEnum(Enum):
+class SessionFilterActionEnum(StrEnum):
     CLEAR = 'Clear'
     FILTER = 'Filter'

django_spire/contrib/queryset/mixins.py

@@ -22,24 +22,35 @@ class SessionFilterQuerySetMixin(QuerySet):
     ) -> QuerySet:
         # Session keys must match to process new queryset data
 
-        action = request.GET.get('action')
+        try:
+            action = SessionFilterActionEnum(request.GET.get('action'))
+        except ValueError:
+            action = None
+
         form = form_class(request.GET)
 
         if form.is_valid():
             session = SessionController(request=request, session_key=session_key)
 
-            # Todo: Change actions into an enum
-            if action == SessionFilterActionEnum.CLEAR.value:
+            if action == SessionFilterActionEnum.CLEAR:
                 session.purge()
                 return self
 
-            # The user has submitted the filter form
-            if action == SessionFilterActionEnum.FILTER.value and session_key == request.GET.get('session_filter_key'):
-
+            # Apply filters when the user submits the filter form
+            if (
+                    action == SessionFilterActionEnum.FILTER
+                    and session_key == request.GET.get('session_filter_key')
+            ):
                 # Update session data
                 for key, value in form.cleaned_data.items():
                     session.add_data(key, value)
 
+            # If the session is expired, return the unfiltered queryset
+            if session.is_expired:
+                return self
+
+            # When no new filter data is applied and session is NOT yet expired,
+            # return the original queryset
             return self.bulk_filter(session.data)
         else:
             show_form_errors(request, form)

django_spire/contrib/session/controller.py

@@ -75,7 +75,6 @@ class SessionController:
         self._set_modified()
 
     def _clean(self) -> None:
-
         if self._TIMEOUT_KEY in self.data and self.is_expired:
             self.request.session.pop(self.session_key)
             self._set_modified()

django_spire/core/templates/django_spire/infinite_scroll/scroll.html

@@ -66,7 +66,8 @@
                 batch_size: this.batch_size
             });
 
-            let url = `${this.endpoint}?${params}`;
+            let separator = this.endpoint.includes('?') ? '&' : '?';
+            let url = `${this.endpoint}${separator}${params}`;
             let view = new ViewGlue(url, {});
 
             let previous_count = this.loaded_count;
@@ -129,24 +130,13 @@
         >
             <div x-ref="content_container"></div>
 
-            <div style="height: 10px;" x-ref="infinite_scroll_trigger"></div>
-        </div>
-
-        <template x-if="show_loading">
-            <div
-                class="position-absolute d-flex justify-content-center align-items-center"
-                style="top: 0; left: 0; right: 0; bottom: 0; background: color-mix(in srgb, var(--app-layer-one) 85%, transparent);"
-            >
+            <div x-cloak x-show="show_loading" class="py-3 text-center">
                 <div class="spinner-border text-app-primary" role="status"></div>
             </div>
-        </template>
-    </div>
 
-    <div class="row mt-3">
-        <div class="col text-start">
-            <span class="fs-7 text-app-secondary">
-                Showing <span x-text="loaded_count"></span> of <span x-text="total_count"></span> items
-            </span>
+            <div style="height: 10px;" x-ref="infinite_scroll_trigger"></div>
         </div>
     </div>
+
+    {% include 'django_spire/infinite_scroll/element/footer.html' %}
 </div>

{django_spire-0.23.0.dist-info → django_spire-0.23.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.23.0
+Version: 0.23.2
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.

{django_spire-0.23.0.dist-info → django_spire-0.23.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=c5Hs-7lk9T15254tOasiQ2ZTFLQIVJof9_QJDfm1PAI,933
-django_spire/consts.py,sha256=xIvLbayXa8bBS1w8s_UdEMqzBVZIdIBVPm-BNoLz090,171
+django_spire/consts.py,sha256=gvinNQud8bYSX-PURLRcfJBJmBVQWlEp4R7rxv9E_y0,171
 django_spire/exceptions.py,sha256=L5ndRO5ftMmh0pHkO2z_NG3LSGZviJ-dDHNT73SzTNw,48
 django_spire/settings.py,sha256=B4GPqBGt_dmkt0Ay0j-IP-SZ6mY44m2Ap5kVSON5YLA,1005
 django_spire/urls.py,sha256=mKeZszb5U4iIGqddMb5Tt5fRC72U2wABEOi6mvOfEBU,656
@@ -355,9 +355,9 @@ django_spire/contrib/progress/static/django_spire/js/contrib/progress/progress.j
 django_spire/contrib/progress/templates/django_spire/contrib/progress/card/card.html,sha256=2Ajv0UBJEGwc4InVe69aLe2u4K56yh2JAuvO6uH24j8,3353
 django_spire/contrib/progress/templates/django_spire/contrib/progress/modal/content.html,sha256=oZ7mOxzro5809wSHLe4A90PonAqcr_eVawR_xHKXIt8,3682
 django_spire/contrib/queryset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_spire/contrib/queryset/enums.py,sha256=FhrwaEZ8Ql3AnImDleJFonp11-ObCZT24bC5fCCVBxE,132
+django_spire/contrib/queryset/enums.py,sha256=nGUHwCVOCBfVXo-lrgyqRoEaMq0ZQAGOWnjALSFPjJU,108
 django_spire/contrib/queryset/filter_tools.py,sha256=o7OBB3Jjtyoj7aaWspkFKS2bv0BeMIigXz7DVvt6Ueo,1087
-django_spire/contrib/queryset/mixins.py,sha256=1F8uZihv4kwhlqNsnDKjol1o2OVaxuzoOZLdQebbrtY,1732
+django_spire/contrib/queryset/mixins.py,sha256=Y_tK9ECr1cb_7AywpNaFKmqxRmNzvNuSCDyqVmfNcCE,2096
 django_spire/contrib/seeding/__init__.py,sha256=mHKO8a7fCAf70BWYjgyGgBDfssPtb3Pp9IxCVVI_4-M,112
 django_spire/contrib/seeding/field/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/contrib/seeding/field/base.py,sha256=SK8EYSsLgMRgosY8bRb3X27RpL7cq55VETf6Q_pYYr4,1198
@@ -409,7 +409,7 @@ django_spire/contrib/service/django_model_service.py,sha256=urQoEcrj2w3zxEILX0nr
 django_spire/contrib/service/exceptions.py,sha256=cQZitr-CiSJ1Aeah3L4kNYcFcicCGMu5AQtEI3TwiUE,113
 django_spire/contrib/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/contrib/session/apps.py,sha256=e2lvkf3lZIFYMsgzsdIb97kP3TSYF8W2u26lb0qqZkw,221
-django_spire/contrib/session/controller.py,sha256=sa4Pa1mIgcN-njajmF-6jsqJSnrnJssRcWjRgWbk_4Q,2927
+django_spire/contrib/session/controller.py,sha256=wXnBmoRz_HBOvsxjkndv76AEG7itmTwoXZq6LcwPjME,2926
 django_spire/contrib/session/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/contrib/session/templatetags/session_tags.py,sha256=wVlW5_d6AMsMWqCwCgX39r6nS5NS6vbl7hmi_ZrVKmg,459
 django_spire/contrib/session/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -665,7 +665,7 @@ django_spire/core/templates/django_spire/forms/elements/list_element.html,sha256
 django_spire/core/templates/django_spire/forms/elements/value_element.html,sha256=LaOR2ggmf-J_cPCVHjNoD4l_858zHCRA58T_ZB3EIkE,57
 django_spire/core/templates/django_spire/forms/widgets/json_tree_widget.html,sha256=dykf6xYRZ477i6SgcGR3TSnxDwLsu2p3FR45hEr4DF8,1489
 django_spire/core/templates/django_spire/infinite_scroll/base.html,sha256=x4JJgXTnWXTRz2laFHBW5jpD4D9sU-P8eAUDgEc3-UU,10875
-django_spire/core/templates/django_spire/infinite_scroll/scroll.html,sha256=fF_U1EPoZbkhK0zh-Q7ggrvR12yCsT1UOY2z63uM8es,4668
+django_spire/core/templates/django_spire/infinite_scroll/scroll.html,sha256=osZx9nsCypvnZY3dva_52MoZQRkLK0kOCMnGxHvhsUw,4311
 django_spire/core/templates/django_spire/infinite_scroll/element/footer.html,sha256=22yxDuYB2vKqaDaMsARStrYTYoHtPGYmK6Xl9XQdwH8,391
 django_spire/core/templates/django_spire/item/infinite_scroll_item.html,sha256=NMx3jQwtcKJiKtzbQXaXI3eWOtnJFiZhCI13tLTxSnc,1011
 django_spire/core/templates/django_spire/item/item.html,sha256=9AD6qRcYIb7q-EcmWlRUFiK8XfnmPBSS5NOsXdKEAAA,1217
@@ -1193,8 +1193,8 @@ django_spire/theme/urls/page_urls.py,sha256=S8nkKkgbhG3XHI3uMUL-piOjXIrRkuY2UlM_
 django_spire/theme/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/theme/views/json_views.py,sha256=PWwVTaty0BVGbj65L5cxex6JNhc-xVAI_rEYjbJWqEM,1893
 django_spire/theme/views/page_views.py,sha256=WenjOa6Welpu3IMolY56ZwBjy4aK9hpbiMNuygjAl1A,3922
-django_spire-0.23.0.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
-django_spire-0.23.0.dist-info/METADATA,sha256=D_Ci76LXS9AAtpSki9idJoi2EBdAta3wPc3OluSfq5A,5127
-django_spire-0.23.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.23.0.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.23.0.dist-info/RECORD,,
+django_spire-0.23.2.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
+django_spire-0.23.2.dist-info/METADATA,sha256=7x2HFXnglT6gwdbs_JxDzGbWqwZIfxsT6p9dzDCh-AY,5127
+django_spire-0.23.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.23.2.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.23.2.dist-info/RECORD,,