accrete 0.0.53__tar.gz → 0.0.55__tar.gz

{accrete-0.0.53 → accrete-0.0.55}/PKG-INFO

@@ -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 → accrete-0.0.55}/accrete/contrib/ui/__init__.py

@@ -13,7 +13,8 @@ from .context import (
     extract_url_params,
     exclude_params,
     url_param_str,
-    get_table_fields
+    get_table_fields,
+    default_table_context
 )
 from .elements import (
     ClientActionGroup,

{accrete-0.0.53 → accrete-0.0.55}/accrete/contrib/ui/context.py

@@ -1,12 +1,13 @@
 import logging
+import json
 from urllib.parse import quote_plus
 from dataclasses import dataclass, field
-from typing import TypedDict, Callable
+from typing import Type, TypedDict, Callable
 from django.utils.translation import gettext_lazy as _t
 from django.db import models
 from django.db.models import Model, QuerySet
 from django.core.paginator import Paginator
-from django.core import paginator
+from django.core import paginator, exceptions
 from django.forms import Form, ModelForm
 from accrete.annotation import Annotation
 from .elements import (
@@ -14,7 +15,7 @@ from .elements import (
     ClientActionGroup
 )
 from .filter import Filter
-
+from accrete.utils import filter_from_querystring
 
 _logger = logging.getLogger(__name__)
 
@@ -60,6 +61,46 @@ class TableContext(Context):
     field_selection: bool = True
 
 
+def default_table_context(model: Type[Model], params: dict, queryset=None, **kwargs) -> TableContext:
+    if queryset is None:
+        queryset = filter_from_querystring(model, params)
+    page = list_page(
+        queryset,
+        cast_param(params, 'paginate_by', int, 40),
+        cast_param(params, 'page', int, 1)
+    )
+    try:
+        has_name_field = (
+            model._meta.get_field('name').get_internal_type() == 'CharField'
+        )
+    except exceptions.FieldDoesNotExist:
+        has_name_field = False
+
+    ctx = TableContext(
+        title=str(model._meta.verbose_name_plural),
+        object_label=str(model._meta.verbose_name),
+        object_param_str=url_param_str(
+            params,
+            ['q', 'paginate_by', 'page', 'fields']
+        ),
+        fields=get_table_fields(
+            cast_param(params, 'fields', json.loads, []), model
+        ),
+        list_page=page,
+        pagination_param_str=url_param_str(
+            params, ['q', 'paginate_by', 'fields']
+        ),
+        endless_scroll=True,
+        filter=Filter(
+            model,
+            default_filter_term='name__icontains' if has_name_field else ''
+        ),
+        kwargs=kwargs
+    )
+    return ctx
+
+
+
 @dataclass
 class ListContext(Context):
 
@@ -67,7 +108,7 @@ class ListContext(Context):
     object_param_str: str
     list_page: paginator.Page
     pagination_param_str: str
-    filter: Filter
+    filter: Filter = None
     endless_scroll: bool = True
     column_height: int = 4
     column_width: int = 12
@@ -93,7 +134,9 @@ class DetailContext(Context):
 class FormContext(Context):
 
     form: Form | ModelForm
-    form_id: str
+    form_id: str = 'form'
+    form_method: str = 'post'
+    form_action: str = ''
 
 
 def cast_param(params: dict, param: str, cast_to: Callable, default):
@@ -115,9 +158,8 @@ def url_param_dict(get_params: dict) -> dict:
 
 def url_param_str(params: dict, extract: list[str] = None) -> str:
     """
-    Return a URL Querystring from the given parameters
-    If extract is supplied, extract the value from the dictionary and prepare
-    them, so that each value is formatted e.g. {'page': '&page=1'}
+    Return a URL Querystring from the given params dict.
+    If extract is supplied, only specified keys will be used.
     """
     if extract:
         params = extract_url_params(params, extract)
@@ -155,6 +197,15 @@ def detail_page(queryset: QuerySet, obj: Model) -> dict:
             'deactivate pagination.'
         )
         return {}
+    if obj not in queryset:
+        url = obj.get_absolute_url()
+        return {
+            'previous_object_url': url,
+            'next_object_url': url,
+            'current_object_idx': 1,
+            'total_objects': 1
+        }
+
     idx = (*queryset,).index(obj)
     previous_object_url = (
         queryset[idx - 1] if idx - 1 >= 0 else queryset.last()

{accrete-0.0.53 → accrete-0.0.55}/accrete/contrib/ui/filter.py

@@ -1,4 +1,3 @@
-import time
 import logging
 from django.db.models.fields.related import ManyToOneRel, ManyToManyRel
 from django.core.cache import cache
@@ -301,10 +300,11 @@ class Filter:
             and not isinstance(x, (ManyToOneRel, ManyToManyRel)),
             self.model._meta.get_fields()
         )]
-        fields.extend([
-            (x['annotation'].verbose_name, x['name'])
-            for x in self.model.get_annotations()
-        ])
+        if hasattr(self.model, 'get_annotations'):
+            fields.extend([
+                (x['annotation'].verbose_name, x['name'])
+                for x in self.model.get_annotations()
+            ])
         sorted_fields = sorted(fields, key=lambda x: x[0].lower())
         for field in sorted_fields:
             html += f"""

{accrete-0.0.53 → accrete-0.0.55}/accrete/contrib/ui/static/css/accrete.css

@@ -20923,10 +20923,9 @@ select:focus {
   border-bottom-right-radius: 0;
 }
 
-#list-customization * .dropdown-menu {
-  width: 292px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+.dropdown-button.is-active {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
 @media screen and (max-width: 768px) {
@@ -20956,6 +20955,23 @@ select:focus {
     display: inline-block;
   }
 }
+/* Chrome, Safari, Edge, Opera */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+/* Firefox */
+input[type=number] {
+  -moz-appearance: textfield;
+}
+
+/* Fix CKEditor List Display */
+.ck-editor__editable_inline {
+  padding: 0 30px !important;
+}
+
 @media screen and (max-width: 1407px) {
   #list-customization * .dropdown-menu {
     width: auto;