accrete 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

accrete/contrib/user/views.py

@@ -1,14 +1,16 @@
-from django.views.generic import View
+from django.utils import timezone
 from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth import logout, views, update_session_auth_hash
+from django.contrib.auth import views, update_session_auth_hash
 from django.contrib.auth.decorators import login_required
+from django.contrib.sessions.models import Session
 from django.contrib import messages
+from django.db.models import Q
 from django.shortcuts import redirect, render, reverse, resolve_url
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 from accrete.forms import save_form
-from accrete.contrib.ui import FormContext, DetailContext, ClientAction
+from accrete.contrib import ui
 from .forms import UserForm, ChangePasswordForm, ChangeEmailForm
 
 
@@ -37,15 +39,17 @@ class LogoutView(views.LogoutView):
 
 @login_required()
 def user_detail(request):
-    ctx = DetailContext(
-        request.user, request.GET.dict(), paginate_by=0, breadcrumbs=[],
+    ctx = ui.DetailContext(
+        title=_('Preferences'),
+        object=request.user,
+        breadcrumbs=[],
         actions=[
-            ClientAction(_('Edit'), url=reverse('user:edit')),
-            ClientAction(_('Change E-Mail'), url=reverse('user:edit_email')),
-            ClientAction(_('Change Password'), url=reverse('user:edit_password'))
+            ui.ClientAction(_('Edit'), url=reverse('user:edit')),
+            ui.ClientAction(_('Change E-Mail'), url=reverse('user:edit_email')),
+            ui.ClientAction(_('Change Password'), url=reverse('user:edit_password'))
         ]
     )
-    return render(request, 'user/user_detail.html', ctx.dict())
+    return render(request, 'user/user_detail.html', ctx)
 
 
 @login_required()
@@ -58,7 +62,12 @@ def user_edit(request):
         form = save_form(UserForm(request.POST, instance=request.user))
         if form.is_saved:
             return redirect('user:detail')
-    ctx = FormContext(request.user, form, request.GET.dict()).dict()
+    ctx = ui.FormContext(
+        title=_('Preferences'),
+        form=form,
+        form_id='form',
+        actions=ui.form_actions(reverse('user:detail'))
+    )
     return render(request, 'user/user_form.html', ctx)
 
 
@@ -75,12 +84,12 @@ def user_change_password(request):
                 fail_silently=True
             )
             return redirect('user:detail')
-    ctx = FormContext(
-        request.user,
-        form,
-        request.GET.dict(),
+    ctx = ui.FormContext(
         title=_('Change Password'),
-    ).dict()
+        form=form,
+        form_id='form',
+        actions=ui.form_actions(reverse('user:detail'))
+    )
     return render(request, 'user/change_password.html', ctx)
 
 
@@ -96,10 +105,11 @@ def user_change_email(request):
                 fail_silently=True
             )
             return redirect('user:detail')
-    ctx = FormContext(
-        request.user,
-        form,
-        request.GET.dict(),
-        title=_('Change Email')
-    ).dict()
+
+    ctx = ui.FormContext(
+        title=_('Change Email'),
+        form=form,
+        form_id='form',
+        actions=ui.form_actions(reverse('user:detail'))
+    )
     return render(request, 'user/change_email.html', ctx)

accrete/middleware.py

@@ -1,5 +1,6 @@
 from django.utils.deprecation import MiddlewareMixin
 from django.conf import settings
+from django.http.response import HttpResponseRedirect, HttpResponsePermanentRedirect
 from accrete.tenant import set_tenant, set_member
 
 from .models import Tenant
@@ -73,3 +74,17 @@ class TenantMiddleware(MiddlewareMixin):
                 max_age=31536000
             )
         return response
+
+
+class HtmxRedirectMiddleware(MiddlewareMixin):
+
+    @staticmethod
+    def process_response(request, response):
+        is_htmx = request.headers.get('HX-Request', 'false') == 'true'
+        is_redirect = isinstance(
+            response, (HttpResponseRedirect, HttpResponsePermanentRedirect)
+        )
+        if is_htmx and is_redirect:
+            response['HX-Redirect'] = response['Location']
+            response.status_code = 200
+        return response

accrete/models.py

@@ -3,16 +3,17 @@ from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.validators import UnicodeUsernameValidator
 from accrete.tenant import get_tenant
+from accrete.annotation import AnnotationModelMixin, AnnotationManagerMixin
 
 
-class TenantManager(models.Manager):
+class TenantManager(models.Manager, AnnotationManagerMixin):
 
     def get_queryset(self):
         queryset = super().get_queryset()
         tenant = get_tenant()
         if tenant:
             queryset = queryset.filter(tenant=tenant)
-        return queryset
+        return self.add_annotations(queryset)
 
     def bulk_create(
             self,
@@ -25,10 +26,11 @@ class TenantManager(models.Manager):
     ):
         tenant = get_tenant()
         if tenant is None and not all(obj.tenant_id for obj in objs):
-            raise ValueError('Tenant must be set for all objects when calling bulk_create')
-        else:
-            for obj in objs:
-                obj.tenant_id = tenant.pk
+            raise ValueError(
+                'Tenant must be set for all objects when calling bulk_create'
+            )
+        for obj in objs:
+            obj.tenant_id = tenant.pk
         return super().bulk_create(
             objs, batch_size=batch_size, ignore_conflicts=ignore_conflicts,
             update_conflicts=update_conflicts, update_fields=update_fields,
@@ -36,7 +38,7 @@ class TenantManager(models.Manager):
         )
 
 
-class TenantModel(models.Model):
+class TenantModel(models.Model, AnnotationModelMixin):
 
     class Meta:
         abstract = True

accrete/querystring.py

@@ -6,8 +6,14 @@ from django.db.models import Model, Q, QuerySet
 _logger = logging.getLogger(__name__)
 
 
-def filter_querystring(model: type[Model], query_string: str) -> QuerySet:
-    return model.objects.filter(parse_querystring(model, query_string))
+def filter_from_querystring(
+        model: type[Model], query_string: str, order: list[str] = None
+) -> QuerySet:
+
+    order = order or model._meta.ordering
+    return model.objects.filter(
+        parse_querystring(model, query_string)
+    ).order_by(*order).distinct()
 
 
 def parse_querystring(model: type[Model], query_string: str) -> Q:
@@ -23,7 +29,7 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
             invert = True
             term = term[1:]
 
-        parts = term.split('_a_')
+        parts = term.split('__')
         if len(parts) == 1:
             expression = Q(**{term: value})
             return ~expression if invert else expression
@@ -31,10 +37,7 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
         rel_path = parts[0].rstrip('__')
         term = parts[1]
         rel_model = get_related_model(rel_path) if rel_path else model
-        objects = rel_model.objects.annotate(**{
-            annotation['name']: annotation['func']
-            for annotation in rel_model.annotations
-        }).filter(Q(**{term: value}))
+        objects = rel_model.objects.filter(Q(**{term: value}))
         expression = Q(**{
             f'{rel_path}{"__" if rel_path else ""}id__in': objects.values_list('id', flat=True)
         })
@@ -80,7 +83,7 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
                 )
         return parsed_query
 
-    query_data = json.loads(query_string)
+    query_data = json.loads(query_string.strip('?&='))
     if isinstance(query_data, dict):
         query_data = [query_data]
 

accrete/utils/models.py

@@ -0,0 +1,14 @@
+from django.db.models import Model
+
+
+def get_related_model(model: type[Model], rel_path: str):
+    related_model = model
+    for part in rel_path.split('__'):
+        try:
+            related_model = related_model._meta.fields_map[part].related_model
+        except (AttributeError, KeyError):
+            try:
+                related_model = getattr(related_model, part).field.related_model
+            except AttributeError:
+                break
+    return related_model

{accrete-0.0.35.dist-info → accrete-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accrete
-Version: 0.0.35
+Version: 0.0.37
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.35.dist-info → accrete-0.0.37.dist-info}/RECORD

@@ -1,12 +1,13 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
+accrete/annotation.py,sha256=-nYqDQPOixkD9qdzVZDCIA4lETH2fAZcCSxNmaY2s80,1251
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=nPDgSZao-vuVFRam2Py18yiet3Bar-A-qkWjwbeUDlg,11235
-accrete/middleware.py,sha256=ldnMI4Wv9p1JUyFX_sQSa6Hg4MgkXNbKaHqq5aRsD8s,2629
-accrete/models.py,sha256=OcxHnmFWity-Pfgj-jOhrxzZ44MdqmLxTH-xwrbtz7w,5974
+accrete/middleware.py,sha256=RWeHHcYCfpVO4EnG5HMS52F1y5OKRzNCuidMeq6b0zY,3176
+accrete/models.py,sha256=ruPKqNeKYzqSpYRhpQ12S82iJDYxy0EjSEtNSKWeRz4,6126
 accrete/queries.py,sha256=bchiqLzE1DmR9kvQ6Yyog6cNlYK_lxpztQMOx6Hy_0c,410
-accrete/querystring.py,sha256=wSb3sm0HlCsa9KN1EA1O-lrjra6DjnWUixGxNgI3e7U,3130
+accrete/querystring.py,sha256=TEJ-PhNj1xfA5a2gL6QwD3r33CIcUpLjr5ju0RIgd_I,3140
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/views.py,sha256=9-sgCFe_CyG-wllAcIOLujyueiq66C-zg0U7Uf5Y2wU,2954
@@ -32,14 +33,12 @@ accrete/contrib/system_mail/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2
 accrete/contrib/system_mail/views.py,sha256=xc1IQHrsij7j33TUbo-_oewy3vs03pw_etpBWaMYJl0,63
 accrete/contrib/system_mail/migrations/0001_initial.py,sha256=6cwkkRXGjXvwXoMjjgmWmcPyXSTlUbhW1vMiHObk9MQ,1074
 accrete/contrib/system_mail/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/__init__.py,sha256=OX-63-6FgiwOgPyrYuFKiuk9LR1fzbSP_VqaZ-bjja8,316
+accrete/contrib/ui/__init__.py,sha256=D_QP3FW_4IzP2c_4WTWyuRIENDA1AFrSOXWL_FNeSMY,445
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/components.py,sha256=j6b-oK5vPxBtxV8KRo-0iI1QfwKMPOtQXvW-ZyzR5HY,2036
-accrete/contrib/ui/context.py,sha256=TUPjwhwAPahs29iTJMfDDNSZtZBWWdk4zIGGNReLHBg,9642
-accrete/contrib/ui/elements.py,sha256=as405cYGmyeCk_R8a8RNBjL8yNTQlUg6KLYQ9hWnqVA,75
-accrete/contrib/ui/filter.py,sha256=6EjHzTiqCwOjeiHNNmuvgj65VV-QCmZgCVKXAHxH5Bg,10650
-accrete/contrib/ui/querystring.py,sha256=vMP_4Hn6L3jCLf6_HIscZkPgkZGe9g9Y7GfI2zZYn2A,709
+accrete/contrib/ui/context.py,sha256=lBX3Ga-54cRDnbmFT28afCypbtwg65qNtjKbiQz2jmI,6242
+accrete/contrib/ui/elements.py,sha256=g6wksl7hHGJb3CKmkio5rWgcpr1Eyr2vxbKVD-59lkc,1570
+accrete/contrib/ui/filter.py,sha256=39Kms9jS-ruuursyUbnazrM3DrBsMSEr81Lh6EelUqs,13047
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=TUBlz_CGs9InTZoxM78GSnucA73I8knoh_obt12RUHM,186
 accrete/contrib/ui/views.py,sha256=WpBKMsxFFG8eG4IN7TW_TPE6i3OFF7gnLDTK7JMKti8,191
@@ -118,14 +117,15 @@ accrete/contrib/ui/static/bulma/sass/utilities/extends.sass,sha256=jb5Ipy_k6hBSF
 accrete/contrib/ui/static/bulma/sass/utilities/functions.sass,sha256=tRNFJ9yQTS-GZ6ouJ7EIWiFITL7irYR7srzKwzacvUA,4896
 accrete/contrib/ui/static/bulma/sass/utilities/initial-variables.sass,sha256=JXNQHoF4YlBTUW6WSJ14_38SA9lbk6VkouzYURmlV8g,2691
 accrete/contrib/ui/static/bulma/sass/utilities/mixins.sass,sha256=oijSh2f1DPqod0W5op9iVEAFbC1huMqBIJmnHRx3exc,6291
-accrete/contrib/ui/static/css/accrete.css,sha256=seWy0cX31YB6IE26iqjLteZXxBpvQpo92EjLTnLRtCc,253314
+accrete/contrib/ui/static/css/accrete.css,sha256=XflTQHcjaGSFHjtojR1t8MWSt2MRDEQPeWH5QuU1hIo,253378
 accrete/contrib/ui/static/css/accrete.css.bak,sha256=2RErGa8_tm8lFSamfW3UfqPgEVkPDejk2fh8IidW-B0,2359
-accrete/contrib/ui/static/css/accrete.css.map,sha256=ZiVnkZ0jHY-ehK-WSoboneSeKdYiY6x-Ge2aCLkEObs,55936
-accrete/contrib/ui/static/css/accrete.scss,sha256=dSW0qis_-2xPfbhx_6cghn5Fni0o-EX4pSdE-BLwnRg,5694
+accrete/contrib/ui/static/css/accrete.css.map,sha256=eAGk5OIGglWaUl-B8ORQI24KwqZfYj_tkkTfEFr9MwU,55936
+accrete/contrib/ui/static/css/accrete.scss,sha256=KCY4QZNNVtIvogyNYkSwxeFzCCHs1MD4-l-f5bL6QFM,5694
 accrete/contrib/ui/static/css/icons.css,sha256=IMdNurvI1cUwpGG8n3UXRkxl8MqP2Eqkvyh2maeyghw,6301
 accrete/contrib/ui/static/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6Xl_dxx-27hM,1861
 accrete/contrib/ui/static/icons/accrete.svg,sha256=CWHJKIgk3hxL7xIaFSz2j1cK-eF1TroCbjcF58bgOIs,1024
-accrete/contrib/ui/static/js/filter.js,sha256=gHNrUa51KWn472xXGhW7YO4zg27wJHTBsRdBphtFtgo,22061
+accrete/contrib/ui/static/js/filter.js,sha256=wMK4rIx4J8ps3uB6J1z2wRAZ5MzkAN6D8EhFQiXybjM,22864
+accrete/contrib/ui/static/js/htmx.min.js,sha256=s73PXHQYl6U2SLEgf_8EaaDWGQFCm6H26I-Y69hOZp4,47755
 accrete/contrib/ui/static/js/list.js,sha256=OX_81ifRmawE-1QBU5Qpq_E6sHiiNwIPleETAn9EOJw,4280
 accrete/contrib/ui/templates/django/forms/widgets/attrs.html,sha256=zNxjU4Ta_eWZkh1WhrF_VIwNZ0lZyl980gSSijUK51k,195
 accrete/contrib/ui/templates/django/forms/widgets/email.html,sha256=fXpbxMzAdbv_avfWC5464gD2jFng931Eq7vzbzy1-yA,48
@@ -136,31 +136,31 @@ accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoD
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
 accrete/contrib/ui/templates/ui/detail.html,sha256=0sqsW_XbtLVIquXA8157ZWamnwRc4Wp-6_aZgZ5HN64,1051
 accrete/contrib/ui/templates/ui/form.html,sha256=kIIG4zzNbxb5fJAVr3lI05oa3yoxyAwstMeQWLa2Z0Y,409
-accrete/contrib/ui/templates/ui/layout.html,sha256=9-T8f3mZV6SJBQU6OVls-clKJAp6HgEZs0zguJfQyQw,8686
-accrete/contrib/ui/templates/ui/list.html,sha256=KmTPrXNS75FRSyb990VmMJ-r7B-nshMo8m3C9M1tHtg,1249
-accrete/contrib/ui/templates/ui/table.html,sha256=05KI_pVJx5ost4kRZmh7dbhEAsGymaGmzj8X40yOcME,3818
-accrete/contrib/ui/templates/ui/partials/filter.html,sha256=phofFaGKBt_A5Hv_8IVT58MRQYeiNZE-HjyBadZPXWs,2714
+accrete/contrib/ui/templates/ui/layout.html,sha256=qxLTBR16uh3ed1qm_eC-GrFkN6RYZZx0k1bX07Dcfz4,9247
+accrete/contrib/ui/templates/ui/list.html,sha256=dcPS1aSN9GlsljJsTNhKMqgPe8goF1uwknZ4DIbElLU,1212
+accrete/contrib/ui/templates/ui/table.html,sha256=xVSFKrjO_2YkSEO3nspHqMj8mQU4ZV8GSAQFSsAk5SI,3868
+accrete/contrib/ui/templates/ui/partials/filter.html,sha256=Y2-9fwV_sjrsu-Jvuh8hseku0mQTjsnePSHemps3Tqg,3936
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=1_TQvTdiejsn-43YSyp2YfnP52P-MFYb-HGY0DLm4oA,991
 accrete/contrib/ui/templates/ui/partials/form_modal.html,sha256=FFDfI5qjOCUBSGqDjBXa8tcqN2q94wOOCNFDaiyplHQ,1032
-accrete/contrib/ui/templates/ui/partials/header.html,sha256=X9oNlQuQUIm0-JS0u6Z3Fb1-PwDiTgqL58CBG3iEX6g,2927
+accrete/contrib/ui/templates/ui/partials/header.html,sha256=Fr65wv84RgcjpRr1jRdGzChaX08SVhmFhcdEmkTBmyI,2859
 accrete/contrib/ui/templates/ui/partials/onchange_form.html,sha256=K5twTGqRUW1iM2dGtdWntjsJvJVo5EIzKxX2HK-H1yw,160
-accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=ee5d5wZHLgh8wARvKCVZ68KZf77w107GWNRi9qkpW80,938
-accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=zdIHmK5W58IpYlW7QmMVpsh1ufUIxpPrDimq9uqaYFQ,1299
+accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=58nA3X7Il0FAD4VcYyr7tTGWRiVf_FN1TkImmKEpKHU,1014
+accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=9h-I5PfjViomZjoeBUZIwmx7tgWodCs4bDtjOdsPQ8c,1379
 accrete/contrib/ui/templates/ui/partials/table_field.html,sha256=4oQw0na9UgHP8lo8KttyWBuDhCEeaZ8Vt9jJYJdZ5Gs,641
 accrete/contrib/ui/templates/ui/partials/table_field_float.html,sha256=GH_jFdpk8wEJXv4QfO6c3URYrZGGLeuSyWwWl2cWxwQ,45
 accrete/contrib/ui/templates/ui/partials/table_field_monetary.html,sha256=Wtod9vel2dD4vG8lUVLbtls4aU_2EG3p0E1QRRUSH10,166
 accrete/contrib/ui/templates/ui/partials/table_field_string.html,sha256=GH_jFdpk8wEJXv4QfO6c3URYrZGGLeuSyWwWl2cWxwQ,45
 accrete/contrib/ui/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/contrib/ui/templatetags/accrete_ui.py,sha256=8Ryvwg8_DWYzCehZJTeiq66AvWLbcRTrAe5oxTk8Vzc,1320
+accrete/contrib/ui/templatetags/accrete_ui.py,sha256=ttu2dN5xVMOaON1gyd6Dk22TGt3RQQr97YECrwVgDmw,1593
 accrete/contrib/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user/admin.py,sha256=YS4iApli7XUaIl9GsEJxys2j8sepX0by88omYHjff-E,85
 accrete/contrib/user/apps.py,sha256=oHDrAiHf-G57mZLyxqGJzRY2DbPprGFD-QgyVJG_ruI,156
-accrete/contrib/user/forms.py,sha256=kkPXxeaJWheNogd1-nBFN4kUxbh9v4b6ofF8-lgt6Vo,3298
+accrete/contrib/user/forms.py,sha256=LVnRx9lcDZbSFn46zRndo1FR9qPvis5ivlXgTMp_IcM,3119
 accrete/contrib/user/middleware.py,sha256=qblcujwJsthopagyT-hPFq4HsMyGt-VvqZw5TQopBjk,403
 accrete/contrib/user/models.py,sha256=SFEXG9G-XY7Nuss7DT51abDv8BWLHKYJocOhQDI_1Lw,3926
 accrete/contrib/user/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/user/urls.py,sha256=ktQJ3vZxDlKNUfzOxReeDLOduSdoW5z5Sz0LVFpxZGU,460
-accrete/contrib/user/views.py,sha256=uQ_gd97HubpA2vFMeAM9IKK0N0U9os03g3FAKU6pN_E,3523
+accrete/contrib/user/views.py,sha256=82-RPqabxE6o7cglnfZmCUxNNRii4pmVFGiTThE4Zp0,3727
 accrete/contrib/user/locale/de/LC_MESSAGES/django.mo,sha256=p3rgUg6WltAVIMkQsjvjBqTsd_usLhSr1GH4Cyltc2c,433
 accrete/contrib/user/locale/de/LC_MESSAGES/django.po,sha256=f_Nxpo3HTm2L3f3zoHLfeWsZ-4IQp_EEVSku6TCZSvw,1870
 accrete/contrib/user/migrations/0001_initial.py,sha256=JWfM9PcMDfkJUdCjLWuWieGs6643qP0KdbCyr5uAZoY,2950
@@ -168,7 +168,7 @@ accrete/contrib/user/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 accrete/contrib/user/templates/user/accrete_navbar_end_dropdown.html,sha256=vDFjrOZ95doOpdGYSCRlP8H-FfKUWpkYgYP8mOKcboY,481
 accrete/contrib/user/templates/user/change_email.html,sha256=i9ZgDH31awO9W87E6c3_MKgQNf1ff7EYQX1nEdPqRC8,995
 accrete/contrib/user/templates/user/change_password.html,sha256=wcwm5_tfPgs9V7VWdDQqhhyMpcIkiGsx2OIptF5fWMk,1498
-accrete/contrib/user/templates/user/login.html,sha256=qKUqF5WCkWPrbwQMaa05Ou7zkM_CeVrJzHsjsDWNPhQ,1644
+accrete/contrib/user/templates/user/login.html,sha256=TuEH4uKK1CFV5X7nP3xPSzu2VJaoEn6APsHh-k6GiCc,1388
 accrete/contrib/user/templates/user/user_detail.html,sha256=SMkghUKVncVq3KFGBxADJf_wDnLYwmK4oDTKLO0Ejlo,1445
 accrete/contrib/user/templates/user/user_form.html,sha256=4o24KV940D_KsBP4YwBguwTFW9nYz1uz-RILs91M7Po,1935
 accrete/contrib/user_registration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -189,7 +189,8 @@ accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEK
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
-accrete-0.0.35.dist-info/METADATA,sha256=eGPkkjrItDQrRTT61E0IftMPtR1TdTKY2b35D5qtogM,4892
-accrete-0.0.35.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-accrete-0.0.35.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.35.dist-info/RECORD,,
+accrete/utils/models.py,sha256=qAdWovkztpvFZHY7VzK4hGIMUjBcA9iQtqYFgz7z2ro,474
+accrete-0.0.37.dist-info/METADATA,sha256=DKhGve3m6OHxG8gFRrsGmdShLC6Ttph3HlvB6_5ACQU,4892
+accrete-0.0.37.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+accrete-0.0.37.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.37.dist-info/RECORD,,

accrete/contrib/ui/components.py

@@ -1,96 +0,0 @@
-from dataclasses import dataclass, field
-from enum import Enum
-from django.db.models import Model, QuerySet, Q
-
-DEFAULT_PAGINATE_BY = 40
-
-
-class ActionMethod(Enum):
-
-    HREF = 'href'
-    GET = 'hx-get'
-    POST = 'hx-post'
-    PUT = 'hx-put'
-    DELETE = 'hx-delete'
-
-
-class TableFieldAlignment(Enum):
-
-    LEFT = 'left'
-    CENTER = 'center'
-    RIGHT = 'right'
-
-
-class TableFieldType(Enum):
-
-    NONE = ''
-    STRING = '_string'
-    MONETARY = '_monetary'
-    FLOAT = '_float'
-
-
-@dataclass
-class TableField:
-
-    label: str
-    name: str
-    alignment: TableFieldAlignment | Enum = TableFieldAlignment.LEFT
-    header_alignment: TableFieldAlignment | Enum = None
-    header_info: str = None
-    field_type: TableFieldType | Enum = TableFieldType.NONE
-    prefix: str = ''
-    suffix: str = ''
-    truncate_after: int = 0
-    template: str = None
-
-
-@dataclass
-class BreadCrumb:
-
-    name: str
-    url: str
-    add_url_params: bool = True
-
-
-class Icon(Enum):
-
-    ADD = 'icon-add'
-    EDIT = 'icon-edit'
-    LIST = 'icon-list'
-    OPEN_RELATED = 'icon-open-related'
-    ENVELOPE = 'icon-envelope'
-    CLEAR = 'icon-clear'
-    BACKSPACE = 'icon-backspace'
-    FILTER = 'icon-filter'
-    DELETE_FILTER = 'icon-delete-filter'
-    SELECT = 'icon-select'
-
-
-
-@dataclass
-class ClientAction:
-
-    name: str
-    url: str = ''
-    method: ActionMethod = ActionMethod.HREF
-    query_params: str = ''
-    attrs: list[tuple[str, str]] = field(default_factory=list)
-    submit: bool = False
-    form_id: str = 'form'
-    class_list: list[str] = field(default_factory=list)
-    add_url_params: bool = False
-    icon: Icon | type[Enum] = None
-
-    def attrs_str(self):
-        return ' '.join([f'{str(attr[0])}={str(attr[1])}' for attr in self.attrs])
-
-
-@dataclass
-class List:
-
-    queryset: QuerySet
-    title: str = None
-    paginate_by: int = DEFAULT_PAGINATE_BY
-    breadcrumbs: list[BreadCrumb] = field(default_factory=list)
-    actions: list[ClientAction] = field(default_factory=list)
-    fields: list[TableField] = field(default_factory=list)

accrete/contrib/ui/querystring.py

@@ -1,19 +0,0 @@
-import json
-
-
-def load_querystring(get_params: dict) -> list:
-    return json.loads(get_params.get('q', '[]'))
-
-
-def build_querystring(get_params: dict, extra_params: list[str] = None) -> str:
-    querystring = f'?q={get_params.get("q", "[]")}'
-    if paginate_by := get_params.get('paginate_by', False):
-        querystring += f'&paginate_by={paginate_by}'
-    if order_by := get_params.get('order_by', False):
-        querystring += f'&order_by={order_by}'
-    if crumbs := get_params.get('crumbs', False):
-        querystring += f'&crumbs={crumbs}'
-    for param in extra_params or []:
-        if value := get_params.get(param, False):
-            querystring += f'&{param}={value}'
-    return querystring