accrete 0.0.53__py3-none-any.whl → 0.0.55__py3-none-any.whl

accrete/utils/__init__.py

@@ -1,4 +1,4 @@
 from . import dates
-from .forms import save_form
-from .http import filter_from_querystring
+from .forms import save_form, save_forms, inline_vals_from_post, extend_formset
+from .http import filter_from_querystring, cast_param
 from .models import get_related_model

accrete/utils/forms.py

@@ -1,6 +1,9 @@
+import re
 import logging
 from uuid import uuid4
+from typing import Type
 from django.db import transaction
+from django.forms import BaseFormSet
 
 _logger = logging.getLogger(__name__)
 
@@ -22,3 +25,79 @@ def save_form(form, reraise=False):
         if reraise:
             raise e
     return form
+
+
+def save_forms(form, inline_formsets: list = None, reraise: bool = False):
+
+    def handle_error(error):
+        form.save_error = repr(error)
+        error_id = str(uuid4())[:8]
+        _logger.exception(f'{error_id}: {error}')
+        form.save_error_id = error_id
+
+    form.is_saved = False
+    form.save_error = None
+    form.save_error_id = None
+    form.inline_forms = inline_formsets
+
+    try:
+        form.is_valid()
+        inlines_valid = all([
+            inline_formset.is_valid() for inline_formset in inline_formsets
+        ])
+    except Exception as e:
+        handle_error(e)
+        if reraise:
+            raise e
+        return form
+
+    if not form.is_valid() or not inlines_valid:
+        return form
+
+    try:
+        with transaction.atomic():
+            form.save()
+            for inline_formset in inline_formsets:
+                inline_formset.save()
+    except Exception as e:
+        handle_error(e)
+        if reraise:
+            raise e
+        return form
+
+    form.is_saved = True
+    return form
+
+
+def inline_vals_from_post(post: dict, prefix: str) -> list[dict]:
+    post_keys = set(re.findall(f'{prefix}-[0-9]+', ', '.join(post.keys())))
+    initial_data = {
+        post_key: {}
+        for post_key in post_keys if not post.get(f'{post_key}-DELETE')
+    }
+    for key, val in post.items():
+        post_key = '-'.join(key.split('-')[:-1])
+        if post_key not in initial_data:
+            continue
+        field_name = key.split('-')[-1]
+        initial_data[post_key].update({field_name: val})
+    return [val for val in initial_data.values()]
+
+
+def extend_formset(formset_class, post: dict, data: list[dict]|dict, **formset_kwargs) -> Type[BaseFormSet]:
+    formset = formset_class(post, **formset_kwargs)
+    if not formset.is_valid():
+        return formset
+    form_data = post.copy()
+    if isinstance(data, dict):
+        data = [data]
+    prefix = formset_kwargs.get('prefix', 'form')
+    total = int(form_data[f'{prefix}-TOTAL_FORMS']) - 1
+    for item in data:
+        total += 1
+        form_data.update({f'{prefix}-{total}-{key}': value for key, value in item.items()})
+    form_data[f'{prefix}-TOTAL_FORMS'] = total + 1
+    formset = formset_class(form_data, **formset_kwargs)
+    for form in formset:
+        form._errors = {}
+    return formset

accrete/utils/http.py

@@ -1,13 +1,14 @@
 import logging
 import json
 import operator
+from typing import Callable
 from django.db.models import Model, Q, QuerySet
 from accrete.utils.models import get_related_model
 from accrete.annotation import Annotation
 
 _logger = logging.getLogger(__name__)
 
-Querystring_KEY_MAP = {
+QUERYSTRING_KEY_MAP = {
     'querystring': 'q',
     'order': 'order',
     'paginate_by': 'paginate_by',
@@ -19,7 +20,7 @@ def filter_from_querystring(
         model: type[Model], get_params: dict, key_map: dict = None
 ) -> QuerySet:
 
-    key_map = key_map or Querystring_KEY_MAP
+    key_map = key_map or QUERYSTRING_KEY_MAP
     querystring = get_params.get(key_map['querystring'], '[]')
     order = get_params.get(key_map['order']) or model._meta.ordering
 
@@ -96,4 +97,14 @@ def parse_querystring(model: type[Model], query_string: str) -> Q:
 
     ops = {'&': operator.and_, '|': operator.or_, '^': operator.xor}
     query = parse_query_block(query_data)
-    return query
+    return query
+
+
+def cast_param(params: dict, param: str, cast_to: Callable, default):
+    if param not in params:
+        return default
+    try:
+        return cast_to(params.get(param, default))
+    except Exception as e:
+        _logger.exception(e)
+        return default

{accrete-0.0.53.dist-info → accrete-0.0.55.dist-info}/METADATA

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

{accrete-0.0.53.dist-info → accrete-0.0.55.dist-info}/RECORD

@@ -3,8 +3,8 @@ accrete/admin.py,sha256=MUYUmCFlGYPowiXTbwl4_Q6Cq0-neiL53WW4P76JCLs,1174
 accrete/annotation.py,sha256=P85kNgf_ka3U8i5cwaiKaAiSm21U-xY9PKmXMZR2ulU,1160
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
-accrete/forms.py,sha256=2LobDn8EjHIaqBcgE4_Xk-nbfN6CPQasey-l22cQcT0,10740
-accrete/managers.py,sha256=EvWURMnGadnH3d-wXwv0-sLJKD6uGY03tSCiRSGsKbo,1170
+accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
+accrete/managers.py,sha256=CaIJLeBry4NYIXaVUrdUjp7zx4sEWgv-1-ssI1m-EOs,1156
 accrete/middleware.py,sha256=bUsvhdVdUlbqB-Hd5Y5w6WL8rO8It1VSGA5EZaEPA3o,3266
 accrete/models.py,sha256=grvRNXg0ZYAJU3KAIX-svuZXeXlfqP4qEJ00nlbV594,5145
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
@@ -32,12 +32,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=gnU3YLT6kHCxrUm1c-Bsvh8-hpdLGbGYxdNGcNGsXlg,477
+accrete/contrib/ui/__init__.py,sha256=aeRSerct2JWpztNoxWDZXi7FzJhfxptVMVAZl4Sdzqs,504
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/context.py,sha256=m_QcDK9R3bMC-wB5JTaEBYVmfLGqofw9fVN7Cp5GcX8,6843
+accrete/contrib/ui/context.py,sha256=jVD7w9QIIA2qh04UrO9rYDDrY-0Osr6FLggMlGxvztI,8364
 accrete/contrib/ui/elements.py,sha256=mxhNC-29YqkPei4bQB6fHkBuOc-mv5WWN7JiUJ_ys0o,1856
-accrete/contrib/ui/filter.py,sha256=PnBDVwl2iV3xBg5cphYiib5dUx-0wKHGtwS-FaBDbkA,12188
+accrete/contrib/ui/filter.py,sha256=L7sBpmk454kaSZIQXe9hNj1Xbna8hJ2P-YTvmM7T5FE,12243
 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
@@ -135,16 +135,16 @@ accrete/contrib/ui/static/bulma/versions/bulma-no-dark-mode.scss,sha256=w6Q80mCV
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers-prefixed.scss,sha256=6HCUc4hxyaj4_rHqUnoy7aMuFZECHDYh5jvp-1CEtfE,344
 accrete/contrib/ui/static/bulma/versions/bulma-no-helpers.scss,sha256=5dzAXSgReWUO8GXLbYTpOclPPD0xqvvBiCCX_GOR_5U,313
 accrete/contrib/ui/static/bulma/versions/bulma-prefixed.scss,sha256=Yj7oEO00jy_G_L32y6rwzp2P5p2YtQ2Pvq4aZhvBSE8,138
-accrete/contrib/ui/static/css/accrete.css,sha256=nnpSvbFxkWeTIO2YmULbJB0XlyYuLpPWuxpDkb80Ig8,604658
-accrete/contrib/ui/static/css/accrete.css.map,sha256=QDXGC9e92LBCUkLnxhU5J_OXc0ApVccDraQPxw-q10Q,94319
-accrete/contrib/ui/static/css/accrete.scss,sha256=2GTcZpbsQypAy1lTABVT_ffRMJJjfmIjFIw0XkhQOAo,9848
+accrete/contrib/ui/static/css/accrete.css,sha256=pgbEKJKk3C0KXn_Vn43V90DGSC-J3Geg-imyTNuT4jk,604948
+accrete/contrib/ui/static/css/accrete.css.map,sha256=g0TsYsK_LT_sa79uPNMFbzAyiUkaPwrUTw4jrE-g0Cg,94375
+accrete/contrib/ui/static/css/accrete.scss,sha256=UHa62b7J14bEoiKYAmxm1dMlnb0lnpLDXWNbKT8kxX0,10385
 accrete/contrib/ui/static/css/fa.css,sha256=wiz7ZSCn_btzhjKDQBms9Hx4sSeUYsDrTLg7roPstac,102641
 accrete/contrib/ui/static/css/icons.css,sha256=5550KHsaayeEtRaUdf0h7esQhyec-_5ZfecZ_sOC6v0,6334
 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=-8yGsI4juzA9ZkUS4Qrto4s5Wq4teRLyZfJm5dySm7o,24613
 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/static/js/ui.js,sha256=pJm5Wc2bg9Bu0PWafz1cHpGrM5so4U11MkCKdstxUms,1015
 accrete/contrib/ui/static/webfonts/fa-brands-400.ttf,sha256=VlbVlrxZcWWkIYL2eyufF9KuR6nj7xsEK5pylzlzBwU,207972
 accrete/contrib/ui/static/webfonts/fa-brands-400.woff2,sha256=OokkzVIDooYocWrttc7wlD2kw7ROP_zukKsGOHtBxJA,117372
 accrete/contrib/ui/static/webfonts/fa-regular-400.ttf,sha256=XQLcm4WOPIWnlPh-N5hX9P7cTibPFQAXFKmg4LHSKU0,68004
@@ -160,13 +160,14 @@ accrete/contrib/ui/templates/django/forms/widgets/input.html,sha256=CRu81kTsbPwi
 accrete/contrib/ui/templates/django/forms/widgets/select.html,sha256=jT_UnHizHfdWTdJoSxjcIqTiR7NbVBA4bBSvkuDPRtw,394
 accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoDLVtTOOiWNprrsPriNr712yFxaHyDIo,47
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
-accrete/contrib/ui/templates/ui/detail.html,sha256=23daOnFjl1rx32zJJ7MtZtRur1Z4-KeHNrbpNPJyliU,5181
-accrete/contrib/ui/templates/ui/form.html,sha256=R5digymvYfefbT4QmwzMzWm41GS-JA3CZU6zDTDWr9k,915
-accrete/contrib/ui/templates/ui/layout.html,sha256=HGLqygLUX86ED6Kr5W42mO7nhuHTp1lzIzFwBCuWWHc,15067
-accrete/contrib/ui/templates/ui/list.html,sha256=oDv8I9xxsxuwoNywRqt0n0leuKocnvViFCC0OFFENDk,1695
-accrete/contrib/ui/templates/ui/table.html,sha256=7Ewx5cKfwmNJ1cjLOgvi4AIHaXF8DLqT25_73-M8lMs,4198
-accrete/contrib/ui/templates/ui/partials/filter.html,sha256=j0Rz5NzOVVVfFoGrqn0OftREP3ZVed-fHC1y0_reRXo,6808
-accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=1_TQvTdiejsn-43YSyp2YfnP52P-MFYb-HGY0DLm4oA,991
+accrete/contrib/ui/templates/ui/dashboard.html,sha256=udnwiSJEcn2wMaJfTs4P0Y20FU79VguK_9Lq4K2BqtM,160
+accrete/contrib/ui/templates/ui/detail.html,sha256=b1HC1QCGooo6tLh7fLhEDPau1tIOzscLXP6R_PN758I,1093
+accrete/contrib/ui/templates/ui/form.html,sha256=cd6VUNzfIZH2_iudQa_EkqsPaBjyTam4Fm-Kgh8YpkY,655
+accrete/contrib/ui/templates/ui/layout.html,sha256=f8K0KDlh_eDz0UKH0IB34dBjPtDiNgsuPgysK-DYLgE,14792
+accrete/contrib/ui/templates/ui/list.html,sha256=6jmChhCpj6iuSqAG7X_eD5ZjVvwU4cyynmvoH0-juTk,1740
+accrete/contrib/ui/templates/ui/table.html,sha256=bdPN2F7e7i3FHcQ18e0HJKkYT64PpxPRALRjcirJKGQ,4243
+accrete/contrib/ui/templates/ui/partials/filter.html,sha256=2vmeL3980rMmkRnmVtZh9mBHe6S0PTMjaGIN1J6SpNM,7184
+accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=QjfRriD9Z5SlhIFX__nVXqB3rPg4icbG4G02kML8IcQ,1529
 accrete/contrib/ui/templates/ui/partials/form_modal.html,sha256=TQVkLypx8y1inZbvUYKtSNHrDXJM1xvYl8IsDDwQwkE,1093
 accrete/contrib/ui/templates/ui/partials/header.html,sha256=5ER9E6c-vwDxuIuMSXL4F_fq2zYY17R_0A0Ao--H4Us,6916
 accrete/contrib/ui/templates/ui/partials/onchange_form.html,sha256=K5twTGqRUW1iM2dGtdWntjsJvJVo5EIzKxX2HK-H1yw,160
@@ -213,12 +214,12 @@ accrete/contrib/user_registration/templates/user_registration/mail_templates/con
 accrete/migrations/0001_initial.py,sha256=azThbc8otEhxJwo8BIgOt5eC30mxXhKJLBAazZFe3BA,4166
 accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEKnygZE,1628
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/utils/__init__.py,sha256=BGXx2NwF4Sc6uaenKNvPZEmHuHVY1u97PPECrd1seA8,129
+accrete/utils/__init__.py,sha256=YwEzwjz-E92LHhqeLsQ4167zXHHY1PFG6xcsAofnmBU,192
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
-accrete/utils/forms.py,sha256=FHR9IP76dkULCtX4H68xbQG5uvkBQZnDEXSlHyz34iU,606
-accrete/utils/http.py,sha256=dR4p-Q8xoTlrjfx0sN--vkY4ZGtYUsqqquAfPNxsXx8,3249
+accrete/utils/forms.py,sha256=UP6vCCTtXD5MqU2LWbNXtk2ZMMEmoty_tjLCbJlqYsY,2984
+accrete/utils/http.py,sha256=mAtQRgADv7zu1_j7A-EKVyb-oqa5a21i4Gd0QfjzGV0,3540
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.53.dist-info/METADATA,sha256=e1PCIDM2ktypQyDHf3OG-iMzSjaI0-d8sKzkoMcgiWA,4892
-accrete-0.0.53.dist-info/WHEEL,sha256=as-1oFTWSeWBgyzh0O_qF439xqBe6AbBgt4MfYe5zwY,87
-accrete-0.0.53.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.53.dist-info/RECORD,,
+accrete-0.0.55.dist-info/METADATA,sha256=Ex39yLJvYLDO_BC1Y8M5RwMJ3fJvX-Ghn2SHYyLtINQ,4892
+accrete-0.0.55.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.55.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.55.dist-info/RECORD,,

{accrete-0.0.53.dist-info → accrete-0.0.55.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.22.5
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

accrete/contrib/ui/static/js/list.js

@@ -1,146 +0,0 @@
-const showFilterButton = document.getElementById('filter-button');
-const showActionButton = document.querySelectorAll('.action-modal-button');
-const applyFilterFromModalButton = document.getElementById('applyFilterFromModalButton');
-const applyFilterFromPanelButton = document.getElementById('applyFilterFromPanelButton');
-const tableRows = document.querySelectorAll("tbody > tr" );
-const selectAllCheckBox = document.getElementById('select-all-checkbox');
-const listCheckBoxes = document.querySelectorAll('.list-checkbox');
-const actionButtonsWithIds = document.querySelectorAll('.get-ids-param')
-
-if (showFilterButton) {
-    showFilterButton.addEventListener('click', showFilter);
-    applyFilterFromModalButton.addEventListener('click', applyFilterFromModal);
-    applyFilterFromPanelButton.addEventListener('click', applyFilterFromPanel);
-}
-
-showActionButton.forEach((element) => {
-    element.addEventListener('click', showActions);
-})
-
-tableRows.forEach((element) => {
-    if (element.hasAttribute('data-detail-url')) {
-        element.addEventListener('click', openTableRow);
-    }
-})
-
-document.addEventListener('DOMContentLoaded', setFilter);
-
-if (selectAllCheckBox) {
-    selectAllCheckBox.addEventListener('click', selectAll);
-}
-
-listCheckBoxes.forEach(box => {
-    box.addEventListener('click', selectOne);
-})
-
-actionButtonsWithIds.forEach(button => {
-    button.addEventListener('click', callActionWithIds);
-})
-
-function openTableRow() {
-    // console.log(this)
-    window.location = this.getAttribute('data-detail-url');
-}
-
-function selectAll() {
-    const currentValue = selectAllCheckBox.checked;
-    listCheckBoxes.forEach(checkBox => {
-        checkBox.checked = currentValue;
-    })
-}
-
-function selectOne(e) {
-    e.stopPropagation();
-    selectAllCheckBox.checked = false;
-}
-
-function showFilter() {
-    let modal = document.getElementById('filter-modal');
-    let closeActions = modal.querySelectorAll('.filter-modal-close');
-    closeActions.forEach((action) => {
-        action.addEventListener('click', hideFilter);
-    })
-    modal.classList.add('is-active');
-}
-
-function showActions() {
-    let modal = document.getElementById('action-modal');
-    let closeActions = modal.querySelectorAll('.action-modal-close');
-    closeActions.forEach((action) => {
-        action.addEventListener('click', hideActions);
-    })
-    modal.classList.add('is-active');
-}
-
-function hideActions() {
-    let modal = document.getElementById('action-modal');
-    modal.classList.remove('is-active');
-}
-
-
-function hideFilter() {
-    let modal = document.getElementById('filter-modal');
-    modal.classList.remove('is-active');
-}
-
-function setFilter() {
-    let queryString = window.location.href.split('?')[1];
-    if (queryString) {
-        let terms = document.querySelectorAll('input, .filter-term');
-        let queries = queryString.split('&');
-
-        queries.forEach((query) => {
-            terms.forEach((term) => {
-                if (term.name === query.split('=')[0]) {
-                    term.value = decodeURIComponent(query.split('=')[1]);
-                }
-            })
-        })
-    }
-}
-
-function applyFilter(terms) {
-    const baseURl = window.location.href.split('?')[0];
-    let urlQueryString= '?';
-
-    terms.forEach((term) => {
-        if (term.value && term.value !== '') {
-            urlQueryString += term.name + '=' + encodeURIComponent(term.value) + '&';
-        }
-    })
-
-    window.location.assign(baseURl + urlQueryString);
-}
-
-function applyFilterFromModal() {
-    let modal = document.getElementById('filter-modal');
-    let terms = modal.querySelectorAll('input, .filter-term');
-    applyFilter(terms);
-}
-
-function applyFilterFromPanel() {
-    let panel = document.getElementById('filter-panel');
-    let terms = panel.querySelectorAll('input, .filter-term');
-    applyFilter(terms);
-}
-
-function resetFilter() {
-    window.location.assign(window.location.href.split('?')[0]);
-}
-
-function getSelectedIdsUrlParam() {
-    let ids = [];
-    listCheckBoxes.forEach(box=> {
-        if (box.checked) {
-            ids.push(box.name);
-        }
-    })
-    if (selectAllCheckBox.checked || !ids.length) {
-        return ''
-    }
-    return 'list__id__in=' + ids
-}
-
-function callActionWithIds() {
-    this.href += '&' + getSelectedIdsUrlParam();
-}