accrete 0.0.101__py3-none-any.whl → 0.0.102__py3-none-any.whl

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/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/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/contrib/ui/templates/ui/widgets/model_search_select.html

@@ -2,20 +2,9 @@
 {% load i18n %}
 
 
-<script>
-    function modelSearchSelect() {
-        return {
-            open: false,
-            
-            shouldClose(event) {
-                return event.relatedTarget === this.$refs.dropdownContent || this.$refs.dropdownContent.contains(event.relatedTarget)
-            }
-        }
-    }
-</script>
-
-
-<div class="field select" x-data="modelSearchSelect()" @click.outside="open = false">
+<div class="field select" x-data="{open: false, shouldClose(event) {return event.relatedTarget == $refs.dropdownContent || $refs.dropdownContent.contains(event.relatedTarget);} }" 
+     @click.outside="open = false"
+>
     <input id="id_{{ widget.name }}_value" hidden="hidden" type="{{ widget.type }}" name="{{ widget.name }}" x-ref="inputValue" aria-label="inputValue"
            value="{{ widget.value }}"
     >
@@ -26,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' %}"
@@ -45,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/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/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/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.101.dist-info → accrete-0.0.102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accrete
-Version: 0.0.101
+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.101.dist-info → accrete-0.0.102.dist-info}/RECORD

@@ -5,10 +5,10 @@ accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
 accrete/managers.py,sha256=oZOA45HViNstaeIaGD2szg717DwByifW5GfvVsi4hOk,1561
-accrete/middleware.py,sha256=NhtT3YPq0EynAi4F81LLLUZd5rsWDjGVn1tkgUObT3M,3477
+accrete/middleware.py,sha256=JvUwvrKbM8NEmCUdWT4pxeorPXSmv27XFsjGBinqSs8,3396
 accrete/models.py,sha256=xliEVR0XPW46ZDJn3-F46s54tG9dxz7BVLbkq1pC144,5434
 accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
-accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
+accrete/tenant.py,sha256=T1cPBhFp20tmlO1o_QXSOTe2qE_cF0k8kkchpBojQWU,1811
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/urls.py,sha256=goDFR-yhOlLLy7AMi9pmh2aBkxdtZtwXNg6mwI2zPhU,227
 accrete/views.py,sha256=eGWaGHiNplhvYQFkW1gP5j2JEvjAkf1YIFrcOPj0GJw,3433
@@ -39,12 +39,13 @@ accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,6
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
 accrete/contrib/ui/context.py,sha256=Awpt3kcjn_REJsZ3xDq71WitPefBLCj2N5FrAZfDXYE,10155
 accrete/contrib/ui/elements.py,sha256=l62e3uKDDYI1AfLVhE1AVht-GXKv5DwNdUZ3GkHudio,1948
-accrete/contrib/ui/filter.py,sha256=N3_h-AeN3VQdkGAGREHTGTRDRzcOrlk0Q2rbdTQyevA,12472
+accrete/contrib/ui/filter.py,sha256=f3L-ZKN5Yz3-iObYlRISNzz2Yvr9-TdMyydn_EY00M0,13917
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=UrRRroqP6ANW_jpkRWqo2yLvBhYOVhczzbxbfkGnoq4,124
 accrete/contrib/ui/views.py,sha256=Eewx1n_fOAqx_nP4mvGltaksUtp1_WhCJThtK13YiQc,106
 accrete/contrib/ui/components/__init__.py,sha256=B-0S010wPC-XSsEGGURCJDlaEdpSMphiO67XkOFRmQc,52
-accrete/contrib/ui/components/search_select.py,sha256=s1VeJm0Jhn0ix2kG7hAXO-jd6jlPjwGxh-tw86fBs1k,481
+accrete/contrib/ui/components/search_select.py,sha256=t9i37ZVyhKiYUwuPumXhC3DPMVHU9R7sPdFESdNmzIE,478
+accrete/contrib/ui/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/ui/forms/widgets.py,sha256=mo5E6qT8zDBEGHJQ6GCN8epjOYIo0kLxNgvQnq19vGU,3298
 accrete/contrib/ui/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/ui/static/bulma/LICENSE,sha256=--fY7Bi3Lt7RXXnKc9pe756OJY9fGv-D5OmT5pdSJ5w,1080
@@ -174,10 +175,7 @@ accrete/contrib/ui/templates/ui/form.html,sha256=uCtP16THdOuRfs3JdsjadIW0k9b2rN3
 accrete/contrib/ui/templates/ui/layout.html,sha256=MUrb19FvoOKAgxek8NCxA23uFr-Jgmvg7eqK1rqgUOc,15650
 accrete/contrib/ui/templates/ui/list.html,sha256=ahN8SgF4kE3OEy6EBeDBdDQvuXx-CyIgbixYd-KdV4k,1751
 accrete/contrib/ui/templates/ui/table.html,sha256=8ELtgxoapCyNsvmGISAGXe712lG6AkP_nekb4OVLK3I,4481
-accrete/contrib/ui/templates/ui/components/model_search_select_multi_selected_options.html,sha256=1fDpCnotpGFH7bzqllwbVixH1DB1-akbso5eH8cL4iU,91
-accrete/contrib/ui/templates/ui/components/model_search_select_multi_tags.html,sha256=FV2pc5qaJil19reZXWzLgrUlcXyugdwunZ12lv6COfg,231
-accrete/contrib/ui/templates/ui/components/model_search_select_options.html,sha256=TECaTLnkmVoUZBhehLwcSjyfgwvhXX2ZBiqSro9ap_U,203
-accrete/contrib/ui/templates/ui/partials/filter.html,sha256=fMxi5L1daqKElzZpHg8bItv0FlBjOkAEBxmT_OXgg4M,7434
+accrete/contrib/ui/templates/ui/partials/filter.html,sha256=LtsYKB-cHlpGngCjBHkXDdeuunzkuC1UA0xnq-aSGMA,7621
 accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=C5ktasYff2xBTiWfM6QR8qaGKSyK9QufB3B9N77KGpg,1386
 accrete/contrib/ui/templates/ui/partials/header.html,sha256=wBiyo02mON3z7l4hJAPTAJn_vDhekYZ-a0g8TuW4RmY,7015
 accrete/contrib/ui/templates/ui/partials/modal.html,sha256=Lk7ViKJS99QLjGFHKna90j6VUo_U03IDAT1Rq__QVLU,1472
@@ -189,8 +187,11 @@ accrete/contrib/ui/templates/ui/partials/table_field.html,sha256=4oQw0na9UgHP8lo
 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/templates/ui/widgets/model_search_select.html,sha256=prJLy58XSJKlqOagI7gcVyHg-pcaUKqCFMfAP4aQEn8,2979
-accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html,sha256=AFoAKEeB99f63CWwL-ougERnj-IQVya_jdDcwW7Bo80,4109
+accrete/contrib/ui/templates/ui/widgets/model_search_select.html,sha256=yLmXgPVksfB5LMt0q_imE3eFxk8xNac90dxrOIVpB1M,2843
+accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html,sha256=6KXUIeSQAZqI8ssf8RCH5j7p-__en1zTJLqZl7MBIhs,4106
+accrete/contrib/ui/templates/ui/widgets/model_search_select_multi_selected_options.html,sha256=1fDpCnotpGFH7bzqllwbVixH1DB1-akbso5eH8cL4iU,91
+accrete/contrib/ui/templates/ui/widgets/model_search_select_multi_tags.html,sha256=FV2pc5qaJil19reZXWzLgrUlcXyugdwunZ12lv6COfg,231
+accrete/contrib/ui/templates/ui/widgets/model_search_select_options.html,sha256=TECaTLnkmVoUZBhehLwcSjyfgwvhXX2ZBiqSro9ap_U,203
 accrete/contrib/ui/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/ui/templatetags/accrete_ui.py,sha256=nGd6U5AVZvfwi4yHBoR6YUIIA3vYGkrHCs_m-T__pFk,3839
 accrete/contrib/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -234,7 +235,7 @@ accrete/utils/forms.py,sha256=IvxbXNpSd4a-JBgsTJhs2GHe-DCRWX-xnVPRcoiCzbI,3104
 accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
 accrete/utils/views.py,sha256=iWZSYbd3qYMrV9wAsX26ofGb5wxn1N_nRrQ6s2lpp2I,4557
-accrete-0.0.101.dist-info/METADATA,sha256=ZF8MU0HdYFEsShI4phQv86kglt-GWT_BAgpAdqc3Ks8,4953
-accrete-0.0.101.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.101.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.101.dist-info/RECORD,,
+accrete-0.0.102.dist-info/METADATA,sha256=WwkK-4Wp5Eal_Gwzf_kI7am_oUP_CB0Sh9DzuXQJgMw,4953
+accrete-0.0.102.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.102.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.102.dist-info/RECORD,,