accrete 0.0.147__tar.gz → 0.0.149__tar.gz

{accrete-0.0.147 → accrete-0.0.149}/PKG-INFO

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

{accrete-0.0.147 → accrete-0.0.149}/accrete/contrib/ui/response.py

@@ -21,9 +21,12 @@ class Response:
     def add_trigger(response):
         pass
 
+    def get_context(self):
+        return self.context
+
     def render(self, request) -> str:
         return render_to_string(
-            template_name=self.template, context=self.context, request=request
+            template_name=self.template, context=self.get_context(), request=request
         )
 
     def response(self, request, extra_content: str = None, replace_body: bool = False) -> HttpResponse:
@@ -47,11 +50,18 @@ class OobResponse(Response):
 
     def __init__(self, *, template: str, context: dict, swap: str, tag: str = 'div'):
         super().__init__(template=self.oob_template, context=context)
-        self.context.update({'oob': {
-            'template': template,
-            'swap': swap,
-            'tag': tag
+        self.include_template = template
+        self.swap = swap
+        self.tag = tag
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({'oob': {
+            'template': self.include_template,
+            'swap': self.swap,
+            'tag': self.tag
         }})
+        return context
 
 
 class WindowResponse(Response):
@@ -68,20 +78,29 @@ class WindowResponse(Response):
         is_centered: bool = False
     ):
         super().__init__(template=self.base_template, context=context)
+        self.title = title
+        self.overview_template = overview_template
+        self.header_template = header_template
         self.panel_template = panel_template
-        if 'has_panel' not in self.context.keys():
-            self.context.update(has_panel=self._has_panel())
-        self.context.update({
-            'title': title,
-            'overview_template': overview_template,
-            'header_template': header_template,
-            'panel_template': panel_template,
-            'is_centered': is_centered
-        })
+        self.panel_template = panel_template
+        self.is_centered = is_centered
 
     def _has_panel(self):
         return bool(self.panel_template)
 
+    def get_context(self):
+        context = super().get_context()
+        if 'has_panel' not in context.keys():
+            context.update(has_panel=self._has_panel())
+        context.update({
+            'title': self.title,
+            'overview_template': self.overview_template,
+            'header_template': self.header_template,
+            'panel_template': self.panel_template,
+            'is_centered': self.is_centered
+        })
+        return context
+
     def response(self, request, extra_content: str = None, replace_body: bool = True) -> HttpResponse:
         return super().response(request, extra_content, replace_body)
 
@@ -101,38 +120,48 @@ class ListResponse(WindowResponse):
         column_count: int = 1,
         column_height: str = '150px',
         overview_template: str = 'ui/list.html',
-        detail_response: 'DetailResponse' = None
+        detail_header_template: str = None,
+        detail_data_template: str = None
     ):
         assert page is not None or ui_filter is not None, _(
             'Argument page or ui_filter must be supplied'
         )
-        self.ui_filter = ui_filter
-        self.overview_template = overview_template
-        self.show_content_right = bool(detail_response)
         super().__init__(
             title=title,
             context=context,
-            overview_template=self.overview_template,
+            overview_template=overview_template,
             header_template=header_template,
             panel_template=panel_template,
         )
-        if ui_filter and not page:
-            page = ui_filter.get_page()
-        self.context.update({
-            'list_entry_template': list_entry_template,
-            'page': page,
-            'ui_filter': ui_filter,
-            'endless_scroll': endless_scroll,
-            'column_count': column_count,
-            'column_height': column_height,
-            'show_content_right': str(self.show_content_right).lower()
-        })
-        if detail_response:
-            self.context.update(detail_response.context)
+        self.page = page or (ui_filter and ui_filter.get_page())
+        self.list_entry_template = list_entry_template
+        self.ui_filter = ui_filter
+        self.endless_scroll = endless_scroll
+        self.column_count = column_count
+        self.column_height = column_height
+        self.detail_header_template = detail_header_template
+        self.detail_data_template = detail_data_template
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
 
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'list_entry_template': self.list_entry_template,
+            'page': self.page,
+            'ui_filter': self.ui_filter,
+            'endless_scroll': self.endless_scroll,
+            'column_count': self.column_count,
+            'column_height': self.column_height,
+            'detail_header_template': self.detail_header_template,
+            'detail_data_template': self.detail_data_template,
+            'show_content_right': str(bool(
+                self.detail_header_template or self.detail_data_template
+            )).lower(),
+        })
+        return context
+
     def response(self, request, extra_content: str = None, replace_body: bool = False) -> HttpResponse:
         return super().response(request, extra_content, replace_body)
 
@@ -151,15 +180,24 @@ class ListEntryResponse(Response):
         column_count: int = 1,
         column_height: str = '150px',
     ):
-        self.page = page
         super().__init__(template=self.base_template, context=context or {})
-        self.context.update({
-            'instance': instance,
-            'list_entry_template': list_entry_template,
-            'is_new': is_new,
-            'column_count': column_count,
-            'column_height': column_height
+        self.instance = instance
+        self.list_entry_template = list_entry_template
+        self.page = page
+        self.is_new = is_new
+        self.column_count = column_count
+        self.column_height = column_height
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'instance': self.instance,
+            'list_entry_template': self.list_entry_template,
+            'is_new': self.is_new,
+            'column_count': self.column_count,
+            'column_height': self.column_height
         })
+        return context
 
     def render(self, request) -> str:
         res = super().render(request)
@@ -188,36 +226,48 @@ class TableResponse(WindowResponse):
         header_template: str = None,
         panel_template: str = None,
         overview_template: str = 'ui/table.html',
-        detail_response: 'DetailResponse' = None
+        detail_header_template: str = None,
+        detail_data_template: str = None
     ):
         assert page is not None or ui_filter is not None, _(
             'Argument page or ui_filter must be supplied'
         )
-        self.ui_filter = ui_filter
-        self.overview_template = overview_template
         super().__init__(
             title=title,
             context=context,
-            overview_template=self.overview_template,
+            overview_template=overview_template,
             header_template=header_template,
             panel_template=panel_template
         )
-        if ui_filter and not page:
-            page = ui_filter.get_page()
-        self.context.update({
-            'page': page,
-            'ui_filter': ui_filter,
-            'endless_scroll': endless_scroll,
-            'fields': fields,
-            'instance_label': instance_label,
-            'footer': footer
-        })
-        if detail_response:
-            self.context.update(detail_response.context)
+        self.instance_label = instance_label
+        self.fields = fields
+        self.footer = footer
+        self.page = page or (ui_filter and ui_filter.get_page())
+        self.ui_filter = ui_filter
+        self.endless_scroll = endless_scroll
+        self.detail_header_template = detail_header_template
+        self.detail_data_template = detail_data_template
 
     def _has_panel(self):
         return bool(self.panel_template or self.ui_filter)
 
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'page': self.page,
+            'ui_filter': self.ui_filter,
+            'endless_scroll': self.endless_scroll,
+            'fields': self.fields,
+            'instance_label': self.instance_label,
+            'footer': self.footer,
+            'detail_header_template': self.detail_header_template,
+            'detail_data_template': self.detail_data_template,
+            'show_content_right': str(bool(
+                self.detail_header_template or self.detail_data_template
+            )).lower()
+        })
+        return context
+
     def response(self, request, extra_content: str = None, replace_body: bool = False) -> HttpResponse:
         return super().response(request, extra_content, replace_body)
 
@@ -233,14 +283,21 @@ class TableRowResponse(Response):
         footer: dict = None,
         page: paginator.Page = None,
     ):
+        super().__init__(template=self.base_template, context={})
+        self.instance = instance
+        self.fields = fields
+        self.footer = footer
         self.page = page
-        context = {
-            'instance': instance,
-            'fields': fields,
-            'footer': footer,
-            'page': page
-        }
-        super().__init__(template=self.base_template, context=context)
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'instance': self.instance,
+            'fields': self.fields,
+            'footer': self.footer,
+            'page': self.page
+        })
+        return context
 
     def render(self, request) -> str:
         res = super().render(request)
@@ -267,15 +324,20 @@ class DetailResponse(Response):
         super().__init__(template=self.base_template, context=context)
         self.header_template = header_template
         self.data_template = data_template
-        self.context.update({
-            'detail_header_template': header_template,
-            'detail_data_template': data_template
-        })
+        self.context.update()
 
     @staticmethod
     def add_trigger(response):
         add_trigger(response, 'activate-detail')
 
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'detail_header_template': self.header_template,
+            'detail_data_template': self.data_template
+        })
+        return context
+
 
 class ModalResponse(Response):
 
@@ -291,13 +353,22 @@ class ModalResponse(Response):
 
     ):
         super().__init__(template=template, context=context)
-        self.context.update({
-            'title': title,
-            'modal_id': re.sub(r'[^A-Za-z-]+', '', modal_id).strip('-'),
-            'is_update': is_update,
-            'is_blocking': is_blocking,
-            'modal_width': modal_width
+        self.modal_id = modal_id
+        self.title = title
+        self.is_update = is_update
+        self.is_blocking = is_blocking
+        self.modal_width = modal_width
+
+    def get_context(self):
+        context = super().get_context()
+        context.update({
+            'title': self.title,
+            'modal_id': re.sub(r'[^A-Za-z-]+', '', self.modal_id).strip('-'),
+            'is_update': self.is_update,
+            'is_blocking': self.is_blocking,
+            'modal_width': self.modal_width
         })
+        return context
 
 
 @dataclass
@@ -356,9 +427,7 @@ def add_trigger(
 def update(request, ui_responses: list[Response]) -> HttpResponse:
     response = HttpResponse()
     content = ''
-    print(ui_responses)
     for res in ui_responses:
-        print(res.context)
         content += res.render(request)
         res.add_trigger(response)
     content += render_to_string('ui/message.html', request=request)

{accrete-0.0.147 → accrete-0.0.149}/pyproject.toml

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