accrete 0.0.159__tar.gz → 0.0.161__tar.gz

{accrete-0.0.159 → accrete-0.0.161}/PKG-INFO

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

{accrete-0.0.159 → accrete-0.0.161}/accrete/consumer.py

@@ -14,5 +14,8 @@ class WebsocketTenantConsumer(WebsocketConsumer):
 
 class JsonWebsocketTenantConsumer(JsonWebsocketConsumer):
 
-    pass
-
+    def websocket_connect(self, message):
+        tenant = get_tenant()
+        if tenant is None:
+            raise ValueError('Tenant must be set.')
+        super().websocket_connect(message)

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/sequence/queries.py

@@ -9,13 +9,13 @@ def get_nextval(name: str, create_if_none:bool = True) -> int:
     tenant = get_tenant()
     with transaction.atomic():
         seq = Sequence.objects.filter(
-            tenant=tenant, name=name
+            tenant_id=tenant.pk, name=name
         ).select_for_update().first()
 
         if seq is None and not create_if_none:
             raise ValueError(f'Sequence "{name}" does not exist.')
         elif seq is None:
-            seq = Sequence(name=name, tenant=tenant)
+            seq = Sequence(name=name, tenant_id=tenant.pk)
             seq.save()
 
         nextval = seq.nextval

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/response.py

@@ -247,6 +247,7 @@ class TableResponse(WindowResponse):
         context: dict,
         fields: list[str],
         instance_label: str | Promise | None = None,
+        active_instance: Model = None,
         footer: dict = None,
         page: paginator.Page = None,
         ui_filter: Filter = None,
@@ -257,6 +258,7 @@ class TableResponse(WindowResponse):
         detail_header_template: str = None,
         detail_data_template: str = None,
         detail_enabled: bool = True,
+        can_compact: bool = True,
         config: WindowResponseConfig = None
     ):
         assert page is not None or ui_filter is not None, _(
@@ -271,6 +273,7 @@ class TableResponse(WindowResponse):
             config=config
         )
         self.instance_label = instance_label
+        self.active_instance = active_instance
         self.fields = fields
         self.footer = footer
         self.page = page or (ui_filter and ui_filter.get_page())
@@ -279,6 +282,7 @@ class TableResponse(WindowResponse):
         self.detail_header_template = detail_header_template
         self.detail_data_template = detail_data_template
         self.detail_enabled = detail_enabled
+        self.can_compact = can_compact
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
@@ -291,10 +295,12 @@ class TableResponse(WindowResponse):
             'endless_scroll': self.endless_scroll,
             'fields': self.fields,
             'instance_label': self.instance_label,
+            'active_instance': self.active_instance,
             'footer': self.footer,
             'detail_header_template': self.detail_header_template,
             'detail_data_template': self.detail_data_template,
             'detail_enabled': self.detail_enabled,
+            'can_compact': self.can_compact,
             'show_content_right': str(bool(
                 self.detail_header_template or self.detail_data_template
             )).lower()
@@ -329,6 +335,7 @@ class TableRowResponse(Response):
         context = super().get_context()
         context.update({
             'instance': self.instance,
+            'row_object': self.instance,
             'fields': self.fields,
             'instance_label': self.instance_label,
             'footer': self.footer,

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/static/css/accrete.css

@@ -52,17 +52,23 @@ a {
   border-bottom-color: transparent;
   border-left-color: transparent; }
 
+.button.is-static.is-primary {
+  background-color: var(--bulma-primary);
+  color: var(--bulma-button-disabled-border-color); }
+
 .input:focus, .input:focus-within {
   box-shadow: none;
   border: 1px solid var(--bulma-primary); }
 
 input[disabled] {
-  background-color: transparent !important;
-  cursor: unset !important; }
+  cursor: default !important; }
 
 input[disabled] ~ .helptext {
   font-weight: normal !important; }
 
+select[disabled] {
+  cursor: default !important; }
+
 textarea {
   box-shadow: none !important; }
 

accrete-0.0.161/accrete/contrib/ui/static/css/accrete.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["accrete.scss"],
+"names": [],
+"file": "accrete.css"
+}

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/static/css/accrete.scss

@@ -70,20 +70,28 @@ a {
   border-left-color: transparent;
 }
 
+.button.is-static.is-primary {
+  background-color: var(--bulma-primary);
+  color: var(--bulma-button-disabled-border-color);
+}
+
 .input:focus, .input:focus-within {
   box-shadow: none;
   border: 1px solid var(--bulma-primary);
 }
 
 input[disabled] {
-  background-color: transparent !important;
-  cursor: unset !important;
+  cursor: default !important;
 }
 
 input[disabled] ~ .helptext {
   font-weight: normal !important;
 }
 
+select[disabled] {
+  cursor: default !important;
+}
+
 textarea {
     box-shadow: none!important;
 }

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/templates/ui/layout.html

@@ -166,7 +166,7 @@
                         {% if config.display_header %}
                             <div id="overview-header">
                                 <div class="is-flex is-justify-content-space-between is-flex-wrap-wrap {% if is_centered %}container{% endif %}">
-                                    <div class="is-flex is-flex-wrap-wrap is-flex-grow-5 is-align-self-center py-2 mx-1 header-items">
+                                    <div id="overview-header-items" class="is-flex is-flex-wrap-wrap is-flex-grow-5 is-align-self-center py-2 mx-1 header-items">
                                         {% block overview_header %}
                                             <div class="" style="align-self: center">
                                                 <p class="title is-5">{{ title }}</p>
@@ -199,7 +199,7 @@
                                                     <button id="pagination-next-button" class="button"
                                                             hx-get="{% if page.has_next %}{% querystring page=page.next_page_number %}{% else %}{% querystring page=1 %}{% endif %}"
                                                             hx-replace-url="true"
-                                                            hx-select-oob="#overview,#pagination,#overview-buttons"
+                                                            hx-select-oob="#overview-header-items,#overview,#pagination,#overview-buttons"
                                                     >
                                                         &gt;
                                                     </button>

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/templates/ui/table.html

@@ -3,7 +3,7 @@
 {% load partials %}
 
 {% block table %}
-<table id="content-table" class="table can-compact is-fullwidth is-hoverable is-narrow my-0" hx-indicator=".htmx-indicator" x-data="">
+<table id="content-table" class="table is-fullwidth is-hoverable is-narrow my-0 {% if can_compact %}can-compact{% endif %}" style="{% if not can_compact %}white-space: nowrap{% endif %}" hx-indicator=".htmx-indicator" x-data="">
     <thead style="position: sticky; top: 0; z-index: 10; background-color: var(--bulma-scheme-main)">
         <tr>
             {% if instance_label %}<th>{{ instance_label }}</th>{% endif %}
@@ -13,24 +13,24 @@
         </tr>
     </thead>
     <tbody id="content-table-body" style="z-index: 9" x-ref="tbody">
-        {% for instance in page.object_list %}
+        {% for row_object in page.object_list %}
             {% partialdef tr inline=True %}
-                <tr id="tr-{{ instance.pk }}"
-                    {% if instance.get_absolute_url and detail_enabled %}
+                <tr id="tr-{{ row_object.pk }}"
+                    {% if row_object.get_absolute_url and detail_enabled %}
                         style="cursor: pointer;"
-                        hx-get="{{ instance.get_absolute_url }}{% querystring %}" hx-swap="none"
-                        hx-replace-url="{% querystring detail=instance.pk %}"
-                        x-data="{selected: false}" @unselect-tr.window="selected = false"
+                        hx-get="{{ row_object.get_absolute_url }}{% querystring %}" hx-swap="none"
+                        hx-replace-url="{% querystring detail=row_object.pk %}"
+                        x-data="{selected: {% if row_object == active_instance %}true{% else %}false{% endif %}}" @unselect-tr.window="selected = false"
                         x-on:click="$dispatch('unselect-tr'); selected = true; $nextTick(() => { $el.scrollIntoView( {block: 'nearest'} ) });" x-bind:class="selected ? 'is-primary' : ''"
                     {% endif %}
                 >
                     {% partialdef td inline=True %}
-                        {% if instance_label %}<td>{{ instance }}</td>{% endif %}
+                        {% if instance_label %}<td><span class="has-text-weight-bold">{{ row_object }}</span></td>{% endif %}
                         {% for field in fields %}
-                            <td style="text-align: {{ instance|table_alignment:field }}">
+                            <td style="text-align: {{ row_object|table_alignment:field }}">
                                 <span>
-                                    <span class="responsive-heading has-text-weight-light" style="margin-right: .2rem">{{ instance|verbose_field_name:field }}:</span>
-                                    {{ instance|table_display:field|default_if_none:'' }}
+                                    {% if can_compact %}<span class="responsive-heading has-text-weight-medium mr-2" style="margin-right: .2rem">{{ row_object|verbose_field_name:field }}:</span>{% endif %}
+                                    <span>{{ row_object|table_display:field|default_if_none:'' }}</span>
                                 </span>
                             </td>
                         {% endfor %}
@@ -59,19 +59,20 @@
         </tr>
     </tfoot>
 </table>
-
+{% if endless_scroll %}
 <div id="endless-scroller"
      {% if page.has_next %}
         hx-get="{% querystring page=page.next_page_number %}"
         hx-trigger="intersect once"
-        hx-select="tbody > tr"
+        hx-select="#content-table > tbody > tr"
         hx-target="#content-table-body"
         hx-swap="beforeend"
-        hx-select-oob="#pagination-next-button,#pagination-end-index,#endless-scroller"
+        hx-select-oob="#overview-header-items,#pagination-next-button,#pagination-end-index,#endless-scroller"
         hx-indicator="#endless-scroll-indicator"
         hx-replace-url="true"
      {% endif %}
 >
 </div>
 <progress id="endless-scroll-indicator" class="htmx-indicator progress is-small is-primary" max="100">15%</progress>
+{% endif %}
 {% endblock %}

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/templates/ui/templatetags/field.html

@@ -57,15 +57,3 @@
         <span class="helptext is-size-7">{{ field.help_text|default_if_falsy:'' }}</span>
     </div>
 {% endpartialdef %}
-
-{% partialdef model_state %}
-    <label class="label mb-0 {% if field.field.required %}has-text-weight-bold{% endif %}" for="{{ field.id_for_label }}">{{ label }}</label>
-    <div class="field has-addons mb-0">
-        {% if icon %}
-            <p class="control">
-                <button tabindex="-1" type="button" class="button is-static"><span class="icon"><i class="{{ icon }}"></i></span></button>
-            </p>
-        {% endif %}
-        <div class="control input is-expanded">{{ value|default_if_none:'' }}</div>
-    </div>
-{% endpartialdef %}

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/templates/ui/widgets/model_search_select.html

@@ -20,9 +20,9 @@
             <input id="id_{{ widget.name }}_search" type="search" autocomplete="off" class="input my-2" x-ref="searchInput" aria-label="search"
                    name="{{ widget.search_parameter }}" placeholder="{% translate 'Type to search' %}" hx-get="{{ widget.search_url }}"
                    hx-trigger="input changed delay:500ms, search" hx-target="#{{ widget.name }}_dropdown_items"
-                   style="border-radius: 0; border-top: none; border-right: none; border-left: none"
+                   style="border-radius: 0; border-top: none; border-right: none; border-left: none; box-shadow: none"
             >
-            <div x-on:click="$refs.inputValue.setAttribute('value', $event.target.value); $refs.inputDisplay.value = $event.target.innerText; htmx.trigger($refs.inputValue, 'submit'); open = false; {% if widget.hx_trigger_on_change %}htmx.trigger('#id_{{ widget.name }}_value', 'change');{% endif %}"
+            <div x-on:click="$refs.inputValue.setAttribute('value', $event.target.value); $refs.inputDisplay.value = $event.target.innerText; htmx.trigger($refs.inputValue, 'submit'); open = false; htmx.trigger('#id_{{ widget.name }}_value', 'change');"
                  x-on:keydown="if (![9, 27, 38, 40].includes($event.keyCode)) {$refs.searchInput.focus();}"
                  @keyup.escape="if (open) {$event.stopPropagation();} open = false;"
             >

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/templates/ui/widgets/model_search_select_multi.html

@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load ui %}
 
-<div class="is-fullwidth" x-data="{open: false}"
+<div class="is-fullwidth" x-data="{open: false, changed: false}"
      @click.outside="open = false" hx-disinherit="*" @keyup.escape="if (open) {$event.stopPropagation();} open = false;"
      x-on:keydown="if (!open && [38, 40].includes($event.keyCode)) {open = true};"
 >
@@ -21,7 +21,10 @@
                     let val = $event.target.getAttribute('data-value');
                     $refs.inputValue.querySelector(`option[value=${CSS.escape(val)}]`).remove(); 
                     $event.target.parentElement.remove();
-                    $dispatch('change');
+                    changed = true;
+                    if (!open) {
+                        htmx.trigger('#{{ widget.attrs.id }}', 'change');
+                    }
                 }
              "
         >
@@ -34,7 +37,7 @@
         </div>
     </div>
     <div style="position: relative; top: .5rem; z-index: 9">
-        <div x-show="open" x-effect="if (open) {$nextTick(() => { $refs.dropdownContent.scrollIntoView(true) });}" class="box pt-3 px-3 mb-2" x-ref="dropdownContent" x-cloak="" tabindex="-1" x-transition style="position: absolute; width: 100%">
+        <div x-show="open" x-effect="if (open) {$nextTick(() => { $refs.dropdownContent.scrollIntoView(true) });} if(!open & changed) {htmx.trigger('#{{ widget.attrs.id }}', 'change');}" class="box pt-3 px-3 mb-2" x-ref="dropdownContent" x-cloak="" tabindex="-1" x-transition style="position: absolute; width: 100%">
             <input id="id_{{ widget.uuid }}_search" type="search" autocomplete="off" class="input mb-2" x-ref="searchInput" aria-label="search"
                    name="{{ widget.search_parameter }}"
                    placeholder="{% translate 'Type to search' %}"
@@ -42,7 +45,7 @@
                    hx-trigger="input changed delay:300ms, search"
                    hx-target="#id_{{ widget.uuid }}_dropdown_items"
                    hx-swap="innerHTML"
-                   style="border-radius: 0; border-top: none; border-right: none; border-left: none"
+                   style="border-radius: 0; border-top: none; border-right: none; border-left: none; box-shadow: none"
                    x-on:keydown="if (![9, 27, 38, 40].includes($event.keyCode)) {$refs.searchInput.focus();}"
                    @change.stop=""
             >
@@ -63,10 +66,9 @@
                         tag.appendChild(delButton);
                         $refs.inputValue.appendChild(option);
                         $refs.inputDisplayTags.appendChild(tag);
-                        $dispatch('change');
+                        changed = true;
                     }
                     $refs.inputDisplay.focus();
-                    {% if widget.hx_trigger_on_change %}htmx.trigger('#{{ widget.attrs.id }}_value', 'change');{% endif %}
                  "
                  x-on:keydown="
                     if ($event.keyCode == 27) {$event.stopPropagation; document.activeElement.blur()}

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/templatetags/ui.py

@@ -63,6 +63,8 @@ def get_attr_from_string(param: object, value: str):
     except (AttributeError,):
         _logger.warning(f'Object {param} has no attribute {value}')
         attribute = None
+    if attribute and callable(attribute):
+        attribute = attribute()
     return return_save(attribute)
 
 
@@ -94,7 +96,7 @@ def verbose_field_name(param: object, value: str):
     else:
         field = getattr(param.model, value).field
         if isinstance(field, ManyToManyField):
-            name = field.model._meta.verbose_name_plural
+            name = field.verbose_name
         else:
             name = getattr(param.model, value).field.verbose_name
         
@@ -112,6 +114,13 @@ def table_display(param: object, value: str):
                 </div>
             </span>
         """)
+    try:
+        has_choices = param._meta.get_field(value).choices
+    except Exception as e:
+        _logger.error(repr(e))
+        has_choices = False
+    if has_choices:
+        value = f'get_{value}_display'
     return get_attr_from_string(param, value)
 
 
@@ -208,12 +217,6 @@ def wrap_model_field(instance, field_name):
     return mark_safe(html)
 
 
-@register.filter(name='wrap_model_state')
-def wrap_model_state(instance, field_name):
-    field = instance._meta.get_field(field_name)
-    # get choices, handle groups
-
-
 @register.filter(name='default_if_falsy')
 def default_if_falsy(value, default):
     if bool(value):

{accrete-0.0.159 → accrete-0.0.161}/accrete/contrib/ui/widgets/search_select.py

@@ -14,7 +14,6 @@ class ModelSearchSelect(widgets.NumberInput):
         search_kwargs: dict = None,
         search_parameter: str = 'search',
         limit: int | None = 5,
-        hx_trigger_on_change: bool = False,
         choices=()
     ):
         super().__init__()
@@ -22,7 +21,6 @@ class ModelSearchSelect(widgets.NumberInput):
         self.search_kwargs = search_kwargs or {}
         self.search_parameter = search_parameter
         self.limit = limit
-        self.hx_trigger_on_change = hx_trigger_on_change  # trigger htmx request on change
         self.choices = choices
 
     def get_context(self, name, value, attrs):
@@ -42,7 +40,6 @@ class ModelSearchSelect(widgets.NumberInput):
                 "template_name": self.template_name,
                 'search_url': resolve_url(self.search_url, **self.search_kwargs),
                 'search_parameter': self.search_parameter,
-                'hx_trigger_on_change': self.hx_trigger_on_change,
                 'uuid': uuid
             },
             'options': qs
@@ -74,7 +71,6 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
         search_kwargs: dict = None,
         search_parameter: str = 'search',
         limit: int | None = 5,
-        hx_trigger_on_change: bool = False,
         choices=()
     ):
         super().__init__()
@@ -82,7 +78,6 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
         self.search_kwargs = search_kwargs or {}
         self.search_parameter = search_parameter
         self.limit = limit
-        self.hx_trigger_on_change = hx_trigger_on_change  # trigger 'change' event on the actual input field
         self.choices = choices
 
     def get_context(self, name, value, attrs):
@@ -101,7 +96,6 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
                 "template_name": self.template_name,
                 'search_url': resolve_url(self.search_url, **self.search_kwargs),
                 'search_parameter': self.search_parameter,
-                'hx_trigger_on_change': self.hx_trigger_on_change,
                 'uuid': uuid
             },
             'options': qs,

{accrete-0.0.159 → accrete-0.0.161}/accrete/managers.py

@@ -8,7 +8,7 @@ class TenantManager(models.Manager):
         queryset = super().get_queryset()
         tenant = get_tenant()
         if tenant:
-            queryset = queryset.filter(tenant=tenant)
+            queryset = queryset.filter(tenant_id=tenant.pk)
         return queryset
 
     def bulk_create(

{accrete-0.0.159 → accrete-0.0.161}/accrete/middleware.py

@@ -45,7 +45,7 @@ class TenantMiddleware(MiddlewareMixin):
             request.member = memberships.first()
             request.tenant = request.member.tenant
             set_member(request.member)
-            self.update_post_data(request)
+            self.update_request_data(request)
             return
         if membership_count > 1:
             set_member(None)
@@ -54,13 +54,18 @@ class TenantMiddleware(MiddlewareMixin):
             set_member(None)
             set_tenant(tenant)
             request.tenant = tenant
+            self.update_request_data(request)
             return
         set_member(None)
         return
 
     @staticmethod
-    def update_post_data(request):
-        if request.POST and not request.POST.get('tenant') and request.tenant:
+    def update_request_data(request):
+        if not request.tenant:
+            return
+        request.GET = request.GET.copy()
+        request.GET['tenant_id'] = request.tenant.pk
+        if request.POST and not request.POST.get('tenant'):
             request.POST = request.POST.copy()
             request.POST['tenant'] = request.tenant.pk
 

{accrete-0.0.159 → accrete-0.0.161}/accrete/models.py

@@ -29,7 +29,7 @@ class TenantModel(models.Model):
         update_fields=None
     ):
         tenant = get_tenant()
-        if self.pk and tenant and self.tenant != tenant:
+        if self.pk and tenant and self.tenant_id != tenant.pk:
             raise ValueError('Current tenant differs from tenant of the record!')
         if self.pk and not self.tenant and not tenant:
             raise ValueError(
@@ -38,7 +38,7 @@ class TenantModel(models.Model):
                 'or set the tenant explicitly on the instance.'
             )
         if tenant:
-            self.tenant = tenant
+            self.tenant_id = tenant.pk
         super().save(
             force_insert=force_insert,
             force_update=force_update,

{accrete-0.0.159 → accrete-0.0.161}/pyproject.toml

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

accrete-0.0.159/accrete/contrib/ui/static/css/accrete.css.map

@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["accrete.scss"],
-"names": [],
-"file": "accrete.css"
-}