accrete 0.0.100__tar.gz → 0.0.102__tar.gz

{accrete-0.0.100 → accrete-0.0.102}/PKG-INFO

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

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/__init__.py

@@ -30,6 +30,4 @@ from .elements import (
     Icon
 )
 
-from .components import (
-    ModelSearchSelectOptions
-)
+from . import components

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/components/search_select.py

@@ -9,7 +9,7 @@ from django.utils.safestring import mark_safe
 class ModelSearchSelectOptions:
 
     queryset: QuerySet
-    template: str = 'ui/components/model_search_select_options.html'
+    template: str = 'ui/widgets/model_search_select_options.html'
 
     def get_context(self):
         return {'options': self.queryset}

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/filter.py

@@ -1,5 +1,7 @@
 import logging
-from django.db.models.fields.related import ManyToOneRel, ManyToManyRel
+from collections import Counter
+from itertools import tee
+from django.db.models import fields as db_fields
 from django.core.cache import cache
 from django.utils.translation import gettext_lazy as _
 from django.utils.safestring import mark_safe
@@ -56,17 +58,33 @@ class Filter:
             lambda x: x.is_relation and x.name not in filter_exclude,
             model_path[-1]._meta.get_fields()
         )
+        fields, fields_counter = tee(fields)
         res = []
+        occurrences = Counter([
+            f.related_model for f in filter(
+                lambda x: isinstance(
+                    x, db_fields.reverse_related.ManyToOneRel
+                ), fields_counter
+            )
+        ])
+        multi_related_models = set([
+            key for key, val in occurrences.items() if val > 1
+        ])
         for field in fields:
+            multi_ref = field.related_model in multi_related_models
             if field.related_model in model_path:
                 continue
             rel_path = f'{field_path}{"__" if field_path else ""}{field.name}'
             model_path_copy = model_path.copy()
             model_path_copy.append(field.related_model)
-            try:
+            if isinstance(field, db_fields.reverse_related.ManyToManyRel):
+                continue
+            elif isinstance(field, db_fields.reverse_related.ManyToOneRel):
+                label = field.related_model._meta.verbose_name_plural
+                if multi_ref:
+                    label = f'{label}/{field.field.verbose_name}'
+            else:
                 label = field.verbose_name
-            except AttributeError:
-                label = field.related_model._meta.verbose_name
             res.append({
                 'name': f'{rel_path}',
                 'label': str(label),
@@ -139,7 +157,9 @@ class Filter:
         for f in field.get('fields', []):
             params += self.field_params(f)
         return f"""
-            <div class="query-param" tabindex="-1" data-param="{field['name']}" data-param-label="{field['label']}">
+            <div class="query-param" tabindex="-1" data-param="{field['name']}" 
+                 data-param-label="{field['label']}"
+            >
                 <p class="px-1 arrow">{field['label']}</p>
                 <div class="query-params is-hidden" data-param="{field['name']}">
                     {params}
@@ -160,7 +180,9 @@ class Filter:
             'PositiveSmallIntegerField': self.int_param,
             'DateTimeField': self.date_time_param,
             'DateField': self.date_param,
+            'TimeField': self.time_param,
             'ForeignKey': self.foreign_key_param,
+            'ManyToManyField': self.many_to_many_param,
             'FileField': self.file_param,
             'ImageField': self.file_param
         }
@@ -268,11 +290,23 @@ class Filter:
             html += self.null_param(key, value)
         return html
 
+    def time_param(self, key, value):
+        options = self.parse_choices(value.get('choices', ''))
+        html = self.param(key, value, 'exact', 'time', options)
+        html += self.param(key, value, 'gte', 'time', options, False)
+        html += self.param(key, value, 'lte', 'time', options, False)
+        if value.get('null'):
+            html += self.null_param(key, value)
+        return html
+
     def foreign_key_param(self, key, value):
         if value.get('null'):
             return self.null_param(key, value)
         return ''
 
+    def many_to_many_param(self, key, value):
+        return self.null_param(key, value)
+
     def file_param(self, key, value):
         return self.null_param(key, value)
 
@@ -304,7 +338,10 @@ class Filter:
         fields = [(x.verbose_name, x.name) for x in filter(
             lambda x:
             x.name not in filter_exclude
-            and not isinstance(x, (ManyToOneRel, ManyToManyRel)),
+            and not isinstance(x, (
+                db_fields.related.ManyToOneRel,
+                db_fields.related.ManyToManyRel
+            )),
             self.model._meta.get_fields()
         )]
         if hasattr(self.model, 'get_annotations'):

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/templates/ui/partials/filter.html

@@ -36,7 +36,7 @@
             <input id="query-input"
                    type="text"
                    aria-label="Query Input"
-                   class="input"
+                   class="input is-fullwidth"
                    placeholder="Enter a search term"
                    data-default-term="{{ filter.default_filter_term }}"
                    onkeyup="inputConfirm()"
@@ -44,7 +44,10 @@
         </p>
         <p id="query-input-select-control" class="control is-expanded is-hidden">
             <span class="select is-fullwidth">
-                <select id="query-input-select" aria-label="query-input-select"></select>
+                <select id="query-input-select" aria-label="query-input-select" 
+                        style="border-bottom-left-radius: var(--bulma-radius-medium); border-top-left-radius: var(--bulma-radius-medium);"
+                >
+                </select>
             </span>
         </p>
         <p id="query-input-apply" class="control" onclick="applyInput()"><button class="button">&#x21D2;</button></p>

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/templates/ui/partials/modal_form.html

@@ -3,6 +3,7 @@
 <div id="modal-{{ form_id }}" class="modal {% block modal_form_class %}is-active{% endblock %}"
      hx-swap="outerHTML" 
      hx-target="#modal-{{ form_id }}"
+     hx-on:delete="removeModal('modal-{{ form_id }}')"
      {% if blocking %}
         hx-indicator="#modal-{{ form_id }}-indicator"
         hx-disabled-elt="#modal-{{ form_id }}-background"

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/templates/ui/widgets/model_search_select.html

@@ -1,5 +1,7 @@
+{% load static %}
 {% load i18n %}
 
+
 <div class="field select" x-data="{open: false, shouldClose(event) {return event.relatedTarget == $refs.dropdownContent || $refs.dropdownContent.contains(event.relatedTarget);} }" 
      @click.outside="open = false"
 >
@@ -13,7 +15,7 @@
            x-on:focusout="open = shouldClose($event)"
     >
     <div style="position: relative; z-index: 90;">
-        <div x-show="open" class="box pt-1" x-ref="dropdownContent" tabindex="-1" x-transition>
+        <div x-show="open" x-cloak="" class="box pt-1 mb-2" x-ref="dropdownContent" tabindex="-1" x-transition style="position: absolute">
             <input id="id_{{ widget.name }}_search" type="search" autocomplete="off" class="input" x-ref="searchInput" aria-label="search"
                    name="{{ widget.search_parameter }}"
                    placeholder="{% translate 'Type to search' %}"
@@ -32,7 +34,7 @@
                     </div>
                 {% endif %}
                 <div id="{{ widget.name }}_dropdown_items" class="hoverable" style="max-height: 200px; width: 100%; overflow-y: auto;">
-                    {% include 'ui/components/model_search_select_options.html' %}
+                    {% include 'ui/widgets/model_search_select_options.html' %}
                 </div>
             </div>
         </div>

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html

@@ -4,7 +4,7 @@
      @click.outside="open = false" style="width: 100%"
 >
     <select multiple id="{{ widget.attrs.id }}" hidden="hidden" name="{{ widget.name }}" aria-label="{{ widget.name }}" x-ref="inputValue">
-        {% include 'ui/components/model_search_select_multi_selected_options.html' %}
+        {% include 'ui/widgets/model_search_select_multi_selected_options.html' %}
     </select>
     <div id="{{ widget.attrs.id }}_display" class="input select py-1 pl-1" tabindex="0" x-ref="inputDisplay" aria-label="inputDisplay"
          style="padding-right: 30px; border-radius: 0; border-top: 0; border-right:0; border-left: 0; min-height: var(--bulma-control-height); height: fit-content; width: 100%"
@@ -20,11 +20,11 @@
                     $event.target.parentElement.remove();
                 }
              ">
-            {% include 'ui/components/model_search_select_multi_tags.html' %}
+            {% include 'ui/widgets/model_search_select_multi_tags.html' %}
         </div>
     </div>
     <div style="position: relative; z-index: 90;">
-        <div x-show="open" class="box pt-1" x-ref="dropdownContent" tabindex="-1" x-transition style="position: absolute; min-width: 100%">
+        <div x-show="open" class="box pt-1 mb-2" x-ref="dropdownContent" tabindex="-1" x-transition style="position: absolute; min-width: 100%;">
             <input id="id_{{ widget.name }}_search" type="search" autocomplete="off" class="input" x-ref="searchInput" aria-label="search"
                    name="{{ widget.search_parameter }}"
                    placeholder="{% translate 'Type to search' %}"
@@ -60,7 +60,7 @@
                     else if ($event.keyCode != 9 && $event.keyCode != 13) {$refs.searchInput.focus();}
                  "
             >
-                {% include 'ui/components/model_search_select_options.html' %}
+                {% include 'ui/widgets/model_search_select_options.html' %}
             </div>
         </div>
     </div>

{accrete-0.0.100 → accrete-0.0.102}/accrete/contrib/ui/templatetags/accrete_ui.py

@@ -120,7 +120,7 @@ def timedelta_cast(td: timedelta, code: str) -> str | None:
 
 
 @register.filter(name='weekday')
-def datetime_to_weekday(dt: datetime|date, default=None):
+def datetime_to_weekday(dt: datetime|date, default=None) -> str:
     if dt is None:
         return default
     mapping = {

{accrete-0.0.100 → accrete-0.0.102}/accrete/middleware.py

@@ -1,7 +1,7 @@
 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, unscoped
+from accrete.tenant import set_tenant, set_member
 
 from .models import Tenant
 
@@ -9,9 +9,7 @@ from .models import Tenant
 class TenantMiddleware(MiddlewareMixin):
     @staticmethod
     def get_tenant_id_from_request(request):
-        if tenant := request.POST.get('tenant'):
-            tenant_id = tenant
-        elif tenant := request.META.get('X_TENANT_ID'):
+        if tenant := request.META.get('X-TENANT_ID'):
             tenant_id = tenant
         elif tenant_id := request.GET.get('tenant_id'):
             tenant_id = tenant_id
@@ -35,11 +33,10 @@ class TenantMiddleware(MiddlewareMixin):
             return
 
         if request.user.is_authenticated:
-            with unscoped():
-                memberships = request.user.memberships.filter(
-                    is_active=True,
-                    tenant__is_active=True
-                )
+            memberships = request.user.memberships.filter(
+                is_active=True,
+                tenant__is_active=True
+            )
 
             if request.user.is_staff:
                 tenant_id = self.get_tenant_id_from_request(request)
@@ -69,6 +66,7 @@ class TenantMiddleware(MiddlewareMixin):
     @staticmethod
     def process_response(request, response):
         if request.tenant:
+            response['X-TENANT_ID'] = request.tenant.id
             response.set_cookie(
                 'tenant_id',
                 request.tenant.pk,

{accrete-0.0.100 → accrete-0.0.102}/accrete/tenant.py

@@ -36,7 +36,8 @@ class Unscoped:
     def __enter__(self):
         if self.tenant is None:
             _logger.warning(
-                'Entering unscoped context manager with tenant already set to None!'
+                'Entering unscoped context manager with tenant already set to None!',
+                stack_info=True
             )
         set_tenant(None)
 

{accrete-0.0.100 → accrete-0.0.102}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.100'
+version = '0.0.102'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]