accrete 0.0.26__tar.gz → 0.0.28__tar.gz

{accrete-0.0.26 → accrete-0.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accrete
-Version: 0.0.26
+Version: 0.0.28
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek
@@ -35,6 +35,7 @@ Requires-Dist: django>=4.2
 Provides-Extra: contrib
 Requires-Dist: celery>=5.3.4; extra == 'contrib'
 Requires-Dist: django-celery-beat; extra == 'contrib'
+Requires-Dist: sqlalchemy; extra == 'contrib'
 Provides-Extra: dev
 Requires-Dist: build; extra == 'dev'
 Requires-Dist: pytest>=7.0; extra == 'dev'

accrete-0.0.28/accrete/contrib/sequence/migrations/0002_alter_sequence_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.9 on 2024-01-27 07:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sequence', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sequence',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='Name'),
+        ),
+    ]

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/sequence/models.py

@@ -21,7 +21,7 @@ class Sequence(TenantModel):
 
     name = models.CharField(
         verbose_name=_('Name'),
-        max_length=50,
+        max_length=255,
     )
 
     nextval = models.PositiveBigIntegerField(

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/sequence/queries.py

@@ -9,11 +9,11 @@ def get_nextval(name, create_if_none=True):
     tenant = get_tenant()
     with transaction.atomic():
         seq = Sequence.objects.filter(
-            tenant=tenant.id, name=name
+            tenant=tenant, name=name
         ).select_for_update().first()
 
         if seq is None and not create_if_none:
-            raise AttributeError(f'No sequence for {name} found!')
+            raise ValueError(f'Sequence "{name}" does not exist.')
         elif seq is None:
             seq = Sequence(name=name, tenant=tenant)
             seq.save()

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/system_mail/tasks.py

@@ -1,15 +1,22 @@
 import logging
-from celery import shared_task
-
+from celery import shared_task, current_app
+from celery.schedules import crontab
 from django.core import mail
 from django.db import transaction
 from django.utils.html import strip_tags
-
 from .models import SystemMail
 
 _logger = logging.getLogger(__name__)
 
 
+@current_app.on_after_finalize.connect
+def setup_periodic_tasks(sender, **kwargs):
+    sender.add_periodic_task(
+        crontab(hour='*', minute='*/5'),
+        run_mail_queue.s()
+    )
+
+
 @shared_task()
 def run_mail_queue():
     with transaction.atomic():

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/__init__.py

@@ -6,9 +6,10 @@ from .context import (
 )
 from .components import (
     ClientAction,
+    ActionMethod,
     BreadCrumb,
     TableField,
     TableFieldAlignment,
     TableFieldType
 )
-from .querystring import load_querystring, build_url_params
+from .querystring import load_querystring, build_querystring

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/components.py

@@ -1,5 +1,17 @@
 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):
@@ -37,6 +49,7 @@ class BreadCrumb:
 
     name: str
     url: str
+    add_url_params: bool = True
 
 
 @dataclass
@@ -44,8 +57,24 @@ 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 = True
+
+    def attrs_str(self):
+        return ' '.join(['='.join(attr) 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-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/context.py

@@ -4,9 +4,10 @@ from dataclasses import dataclass, field
 from django.utils.translation import gettext_lazy as _
 from django.db.models import Model, QuerySet, Q
 from django.core.paginator import Paginator
+from django.forms import Form, ModelForm
 from accrete.querystring import parse_querystring
 
-from .querystring import load_querystring, build_url_params
+from .querystring import load_querystring, build_querystring
 from .components import ClientAction, BreadCrumb, TableField
 from .filter import Filter
 
@@ -42,16 +43,16 @@ class ListContext:
 
         order = self.order_by or self.model._meta.ordering
 
-        pks = self.model.objects.filter(
-            parse_querystring(self.model, self.get_params.get('q', '[]'))
-        ).distinct().values_list('pk', flat=True)
+        # pks = self.model.objects.filter(
+        #     parse_querystring(self.model, self.get_params.get('q', '[]'))
+        # ).distinct().values_list('pk', flat=True)
 
         queryset = self.model.objects.select_related(
             *self.select_related
         ).prefetch_related(
             *self.prefetch_related
         ).filter(
-            Q(pk__in=pks)
+            parse_querystring(self.model, self.get_params.get('q', '[]'))
         ).annotate(
             **self.get_annotations()
         ).order_by(
@@ -109,7 +110,7 @@ class ListContext:
             'default_filter_term': self.default_filter_term,
             'breadcrumbs': self.breadcrumbs,
             'querystring': load_querystring(self.get_params),
-            'url_params': build_url_params(self.get_params),
+            'url_params': build_querystring(self.get_params),
             'actions': self.actions,
             'fields': self.fields
         }
@@ -208,7 +209,7 @@ class DetailContext:
             'paginate_by': paginate_by,
             'detail_pagination': False,
             'breadcrumbs': self.breadcrumbs,
-            'url_params': build_url_params(self.get_params, ['page']),
+            'url_params': build_querystring(self.get_params, ['page']),
             'actions': self.actions
         }
         if self.paginate_by > 0:
@@ -221,6 +222,7 @@ class DetailContext:
 class FormContext:
 
     model: Model | type[Model]
+    form: Form | ModelForm
     get_params: dict
     title: str = None
     context: dict = field(default_factory=dict)
@@ -228,6 +230,7 @@ class FormContext:
     add_default_actions: bool = True
     discard_url: str = None
     actions: list[ClientAction] = field(default_factory=list)
+    breadcrumbs: list[BreadCrumb] = field(default_factory=list)
 
     def get_default_form_actions(self):
         actions = [
@@ -266,16 +269,18 @@ class FormContext:
             return self.title
         try:
             int(self.model.pk)
-            return f'Edit {self.model}'
+            return _('Edit')
         except TypeError:
-            return f'Add {self.model._meta.verbose_name}'
+            return _('Add')
 
     def dict(self):
         ctx = {
             'title': self.get_title(),
+            'form': self.form,
             'form_id': self.form_id,
-            'url_params': build_url_params(self.get_params, ['page']),
-            'actions': []
+            'url_params': build_querystring(self.get_params, ['page']),
+            'actions': [],
+            'breadcrumbs': self.breadcrumbs,
         }
         if self.add_default_actions:
             ctx.update({'actions': self.get_default_form_actions()})

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/filter.py

@@ -115,6 +115,28 @@ class Filter:
             ]
         }
 
+    def get_choice_int_query_term(self, label, param, choices):
+        choices = [(choice[0], str(choice[1])) for choice in choices]
+        return {
+            'label': str(label),
+            'param': param,
+            'params': [
+                {
+                    'label': str(self.LABEL_EXACT),
+                    'data_type': 'selection',
+                    'choices': choices,
+                    'param': 'exact'
+                },
+                {
+                    'label': str(self.LABEL_EXACT_NOT),
+                    'data_type': 'selection',
+                    'choices': choices,
+                    'invert': True,
+                    'param': 'exact'
+                }
+            ]
+        }
+
     def get_int_query_term(self, label, param):
         return {
             'label': str(label),
@@ -258,6 +280,8 @@ class Filter:
                 label, param, self.cast_decimal_places_to_step(field.decimal_places or 0)
             )
         elif internal_type in self.query_int_fields:
+            if field.choices:
+                return self.get_choice_int_query_term(label, param, field.choices)
             return self.get_int_query_term(label, param)
         elif internal_type in self.query_boolean_fields:
             return self.get_boolean_query_term(label, param)

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/querystring.py

@@ -5,7 +5,7 @@ def load_querystring(get_params: dict) -> list:
     return json.loads(get_params.get('q', '[]'))
 
 
-def build_url_params(get_params: dict, extra_params: list[str] = None) -> str:
+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}'

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/static/js/filter.js

@@ -8,6 +8,7 @@ function buildQueryTagsFromUrl() {
     const queryGroup = createQueryGroup();
     queryTags.appendChild(queryGroup)
     buildQueryFromQueryString(normalizeQueryString(), queryGroup, '&');
+    toggleFilterModalButton();
 }
 
 function removeQueryTagsChildren() {
@@ -18,7 +19,6 @@ function removeQueryTagsChildren() {
 }
 
 function buildQueryFromQueryString(jsonQuery, queryGroup, operator='&') {
-    console.log(jsonQuery)
     for (let item of jsonQuery) {
         if (isString(item)) {
             operator = item
@@ -229,6 +229,9 @@ function appendAfterTag(queryTagContainer) {
 function resetInput() {
     const input = document.getElementById('query-input');
     const queryParam = getParamElement(input.getAttribute('data-default-term'))
+    if (!queryParam) {
+        return
+    }
     const queryLabel = getCompleteQueryText(queryParam);
     const queryNotificationLabel = document.getElementById('query-label');
     queryNotificationLabel.innerText = queryLabel;
@@ -244,6 +247,18 @@ function fetchQuery(queryString=null) {
     queryApply.setAttribute('hx-get', url.toString());
     htmx.process(queryApply);
     queryApply.dispatchEvent(queryApplyEvent);
+    toggleFilterModalButton();
+}
+
+function toggleFilterModalButton() {
+    const button = document.getElementById('modal-filter-button');
+    const query = document.getElementById('query-tags');
+    if (query.firstElementChild && query.firstElementChild.childElementCount) {
+        button.classList.add('is-primary');
+    }
+    else {
+        button.classList.remove('is-primary');
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -253,6 +268,9 @@ function fetchQuery(queryString=null) {
 function showHide() {
     const target = this.event.target;
     const queryInput = document.getElementById('query-input-fieldset');
+    if (!queryInput) {
+        return;
+    }
     const queryParamDropDown = document.getElementById('query-params-dropdown');
     const operation = document.getElementById('query-operation');
     if (queryInput.contains(target)
@@ -683,4 +701,4 @@ function isBoolean(value) {
         return value.toLowerCase() === 'false' || value.toLowerCase() === 'true'
     }
     return false
-}
+}

accrete-0.0.28/accrete/contrib/ui/templates/ui/detail.html

@@ -0,0 +1,35 @@
+{% extends 'ui/layout.html' %}
+{% load i18n %}
+{% load accrete_ui %}
+
+{% block messages %}
+    {% if messages %}
+        <div class="columns is-desktop">
+            <div class="column is-8">
+                {% for message in messages %}
+                    <div class="columns py-0">
+                        <div class="column is-12">
+                            <div class="notification {{ message|message_class }} is-light">
+                                <p>{{ message }}</p>
+                            </div>
+                        </div>
+                    </div>
+                {% endfor %}
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+    <div class="columns is-desktop">
+        <div class="column p-0 is-8-desktop">
+            {% block detail_content %}{% endblock %}
+        </div>
+        <div class="info-panel column is-4">
+            <nav class="panel">
+                {% block info_panel %}
+                {% endblock %}
+            </nav>
+        </div>
+    </div>
+{% endblock %}

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/templates/ui/layout.html

@@ -93,12 +93,14 @@
                             {% if action.submit %}
                                 <input class="button is-fullwidth {{ action.class_list|join:' ' }}"
                                        type="submit" form={{ action.form_id }} value="{{ action.name }}"
-                                       {% for attr in action.attrs %}{{ attr }}{% endfor %}
+                                       {{ action.attrs_str }}
                                 >
                             {% else %}
                                 <a class="button is-fullwidth {{ action.class_list|join:' ' }}"
-                                   href="{{ action.url }}{{ url_params|default_if_none:'?' }}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
-                                   {% for attr, val in action.attrs %}{{ attr }}="{{ val }}"{% endfor %}
+                                    {% if action.url %}
+                                        {{ action.method.value }}="{{ action.url }}{% if action.add_url_params %}{{ url_params|default_if_none:'?' }}{% endif %}{% if page %}&page={{ page.number }}{% endif %}{{ action.query_params }}"
+                                    {% endif %}
+                                   {{ action.attrs_str }}
                                 >{{ action.name }}
                                 </a>
                             {% endif %}

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/templates/ui/list.html

@@ -2,11 +2,6 @@
 {% load static %}
 {% load i18n %}
 
-{% block script %}
-    {{ block.super }}
-    <script src="{% static "js/filter.js" %}" defer type="text/javascript"></script>
-{% endblock %}
-
 {% block content %}
     <div class="columns is-multiline">
         {% for obj in page %}

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/templates/ui/partials/filter.html

@@ -4,6 +4,7 @@
 {% load accrete_ui %}
 
 <div id="query-block" class="panel-block pt-0" style="position: relative; display: inline-block; width: 100%">
+    <script src="{% static "js/filter.js" %}" defer type="text/javascript"></script>
     <div id="query-apply" hx-get="" hx-trigger="click" hx-replace-url="true"
          hx-select-oob="#content,#list-pagination,#panel-actions,#header-actions,#query-apply">
 

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/templates/ui/partials/header.html

@@ -7,7 +7,9 @@
                 <nav id="breadcrumbs" class="breadcrumb" aria-label="breadcrumbs" style="white-space: unset; word-break: break-word">
                     <ul>
                         {% for crumb in breadcrumbs %}
-                            <li><a class="is-underlined" href="{{ crumb.url|default_if_none:'#' }}{{ url_params }}" aria-current="page">{{ crumb.name }}</a></li>
+                            <li><a class="is-underlined" hx-get="{{ crumb.url|default_if_none:'#' }}{% if crumb.add_url_params %}{{ url_params }}{% endif %}"
+                                   hx-target="body" hx-push-url="true" aria-current="page"
+                            >{{ crumb.name }}</a></li>
                         {% endfor %}
                         <li class="is-active"><a aria-current="page">{{ title }}</a></li>
                     </ul>

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/templates/ui/table.html

@@ -3,11 +3,6 @@
 {% load i18n %}
 {% load accrete_ui %}
 
-{% block script %}
-    {{ block.super }}
-    <script src="{% static "js/filter.js" %}" defer type="text/javascript"></script>
-{% endblock %}
-
 {% block content %}
     <table class="table hax-box is-fullwidth is-hoverable" hx-indicator=".htmx-indicator">
         <thead style="position: sticky; top: 0; background: white; z-index: 10">
@@ -36,7 +31,9 @@
                             hx-swap="afterend"
                         {% endif %}>
                         {% block table_data %}
-                            <td><a class="is-underlined" href="{{ obj.get_absolute_url }}{{ url_params }}&page={{ page.number }}">{{ obj }}</a></td>
+                            <td><a class="is-underlined" hx-get="{{ obj.get_absolute_url }}{{ url_params }}&page={{ page.number }}"
+                                   hx-target="body" hx-push-url="true"
+                            >{{ obj }}</a></td>
                             {% for field in fields %}
                                 {% if field.template %}
                                     {% include field.template %}

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/ui/templatetags/accrete_ui.py

@@ -3,6 +3,7 @@ from django import template
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.contrib import messages
 
 _logger = logging.getLogger(__name__)
 register = template.Library()
@@ -34,6 +35,17 @@ def get_attr_from_string(param, value):
         return attr
 
 
+@register.filter(name='message_class')
+def message_class(param):
+    if param.level == 25:
+        return 'is-success'
+    if param.level == 30:
+        return 'is-warning'
+    if param.level == 40:
+        return 'is-danger'
+
+
+
 @register.filter(name='render_query_params')
 def query_params_to_html(params):
     html = ''

accrete-0.0.28/accrete/contrib/user/forms.py

@@ -0,0 +1,119 @@
+from django.conf import settings
+from django.core.validators import validate_email
+from django.utils.translation import gettext_lazy as _
+from django.forms import ModelForm, fields, ValidationError, PasswordInput, EmailInput
+from .models import User
+
+
+class UserForm(ModelForm):
+
+    language_code = fields.ChoiceField(
+        label=_('Language'),
+        choices=settings.LANGUAGES,
+        required=True
+    )
+
+    class Meta:
+        model = User
+        fields = [
+            'username',
+            'first_name',
+            'last_name',
+        ]
+
+    def save(self, commit=True):
+        super().save(commit=False)
+        self.instance.language_code = self.cleaned_data['language_code']
+        if commit:
+            self.instance.save()
+            self.save_m2m()
+
+
+class ChangePasswordForm(ModelForm):
+
+    old_password = fields.CharField(
+        label=_('Old password'),
+        widget=PasswordInput(render_value=True),
+        max_length=128,
+    )
+
+    new_password = fields.CharField(
+        label=_('New password'),
+        widget=PasswordInput(render_value=True),
+        max_length=128
+    )
+
+    new_password_confirm = fields.CharField(
+        label=_('New password confirmation'),
+        widget=PasswordInput(render_value=True),
+        max_length=128
+    )
+
+    class Meta:
+        model = User
+        fields = []
+
+    def clean_old_password(self):
+        old_password = self.cleaned_data['old_password']
+        if not self.instance.check_password(old_password):
+            raise ValidationError(_(
+                'Password Validation failed'
+            ))
+        return old_password
+
+    def clean(self):
+        super().clean()
+        new_password = self.cleaned_data.get('new_password')
+        new_password_confirm = self.cleaned_data.get('new_password_confirm')
+        if not new_password or not new_password_confirm:
+            raise ValidationError(_(
+                'New password and password confirmation are required'
+            ))
+        if new_password != new_password_confirm:
+            raise ValidationError(
+                _('New password and confirmation did not match.')
+            )
+        return self.cleaned_data
+
+    def save(self, commit=True):
+        user = self.instance
+        user.set_password(self.cleaned_data['new_password'])
+        user.save()
+
+
+class ChangeEmailForm(ModelForm):
+
+    email = fields.EmailField(
+        label=_('New Email Address'),
+        widget=EmailInput(),
+    )
+
+    password = fields.CharField(
+        label=_('Password'),
+        widget=PasswordInput()
+    )
+
+    class Meta:
+        model = User
+        fields = []
+
+    def clean_email(self):
+        email = self.cleaned_data.get('email', '').lower()
+        validate_email(email)
+        if User.objects.filter(email=email):
+            raise ValidationError(
+                _('This email address is already bound to an account.')
+            )
+        return email
+
+    def clean_password(self):
+        password = self.cleaned_data.get('password')
+        if not self.instance.check_password(password):
+            raise ValidationError(_(
+                'Password incorrect'
+            ))
+        return password
+
+    def save(self, commit=True):
+        self.instance.email = self.cleaned_data['email']
+        self.instance.save()

{accrete-0.0.26 → accrete-0.0.28}/accrete/contrib/user/templates/user/accrete_navbar_end.html

@@ -6,4 +6,8 @@
     <a class="navbar-item" href="/admin/">Admin</a>
 {% endif %}
 <hr class="navbar-divider">
-<a class="navbar-item" href="{% url 'user:logout' %}">{% translate 'Logout' %}</a>
+<form id="logout-form" method="post" action="{% url 'user:logout' %}">
+  {% csrf_token %}
+  <a class="navbar-item" href="#" onclick="document.getElementById('logout-form').submit()">{% translate "Log out" %}</a>
+</form>
+

accrete-0.0.28/accrete/contrib/user/templates/user/change_email.html

@@ -0,0 +1,29 @@
+{% extends 'ui/form.html' %}
+
+{% block form %}
+    <form id="form" method="post" action="">
+    {% csrf_token %}
+    <div class="columns">
+        <div class="column is-6">
+            <label class="label has-field is-required">
+                {{ form.email.label_tag }}
+                <span class="has-text-danger is-size-7">{{ form.email.errors }}</span>
+                <div class="field">
+                    <p class="control is-fullwidth">{{ form.email }}</p>
+                </div>
+            </label>
+        </div>
+    </div>
+    <div class="columns">
+        <div class="column is-6">
+            <label class="label has-field is-required">
+                {{ form.password.label_tag }}
+                <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
+                <div class="field">
+                    <p class="control is-fullwidth">{{ form.password }}</p>
+                </div>
+            </label>
+        </div>
+    </div>
+</form>
+{% endblock %}