accrete 0.0.101__tar.gz → 0.0.103__tar.gz

{accrete-0.0.101 → accrete-0.0.103}/PKG-INFO

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

{accrete-0.0.101 → accrete-0.0.103}/accrete/contrib/ui/components/search_select.py

@@ -9,7 +9,7 @@ from django.utils.safestring import mark_safe
 class ModelSearchSelectOptions:
 
     queryset: QuerySet
-    template: str = 'ui/components/model_search_select_options.html'
+    template: str = 'ui/widgets/model_search_select_options.html'
 
     def get_context(self):
         return {'options': self.queryset}

{accrete-0.0.101 → accrete-0.0.103}/accrete/contrib/ui/elements.py

@@ -17,6 +17,8 @@ class Icon(Enum):
     SELECT = 'icon-select'
     TRASH_CAN = 'fa fa-trash-can'
     BOLT = 'fa fa-bolt'
+    GEAR = 'fa fa-gear'
+    GEARS = 'fa fa-gears'
 
 
 class ActionMethod(Enum):

{accrete-0.0.101 → accrete-0.0.103}/accrete/contrib/ui/filter.py

@@ -1,5 +1,7 @@
 import logging
-from django.db.models.fields.related import ManyToOneRel, ManyToManyRel
+from collections import Counter
+from itertools import tee
+from django.db.models import fields as db_fields
 from django.core.cache import cache
 from django.utils.translation import gettext_lazy as _
 from django.utils.safestring import mark_safe
@@ -56,17 +58,33 @@ class Filter:
             lambda x: x.is_relation and x.name not in filter_exclude,
             model_path[-1]._meta.get_fields()
         )
+        fields, fields_counter = tee(fields)
         res = []
+        occurrences = Counter([
+            f.related_model for f in filter(
+                lambda x: isinstance(
+                    x, db_fields.reverse_related.ManyToOneRel
+                ), fields_counter
+            )
+        ])
+        multi_related_models = set([
+            key for key, val in occurrences.items() if val > 1
+        ])
         for field in fields:
+            multi_ref = field.related_model in multi_related_models
             if field.related_model in model_path:
                 continue
             rel_path = f'{field_path}{"__" if field_path else ""}{field.name}'
             model_path_copy = model_path.copy()
             model_path_copy.append(field.related_model)
-            try:
+            if isinstance(field, db_fields.reverse_related.ManyToManyRel):
+                continue
+            elif isinstance(field, db_fields.reverse_related.ManyToOneRel):
+                label = field.related_model._meta.verbose_name_plural
+                if multi_ref:
+                    label = f'{label}/{field.field.verbose_name}'
+            else:
                 label = field.verbose_name
-            except AttributeError:
-                label = field.related_model._meta.verbose_name
             res.append({
                 'name': f'{rel_path}',
                 'label': str(label),
@@ -139,7 +157,9 @@ class Filter:
         for f in field.get('fields', []):
             params += self.field_params(f)
         return f"""
-            <div class="query-param" tabindex="-1" data-param="{field['name']}" data-param-label="{field['label']}">
+            <div class="query-param" tabindex="-1" data-param="{field['name']}" 
+                 data-param-label="{field['label']}"
+            >
                 <p class="px-1 arrow">{field['label']}</p>
                 <div class="query-params is-hidden" data-param="{field['name']}">
                     {params}
@@ -160,7 +180,9 @@ class Filter:
             'PositiveSmallIntegerField': self.int_param,
             'DateTimeField': self.date_time_param,
             'DateField': self.date_param,
+            'TimeField': self.time_param,
             'ForeignKey': self.foreign_key_param,
+            'ManyToManyField': self.many_to_many_param,
             'FileField': self.file_param,
             'ImageField': self.file_param
         }
@@ -268,11 +290,23 @@ class Filter:
             html += self.null_param(key, value)
         return html
 
+    def time_param(self, key, value):
+        options = self.parse_choices(value.get('choices', ''))
+        html = self.param(key, value, 'exact', 'time', options)
+        html += self.param(key, value, 'gte', 'time', options, False)
+        html += self.param(key, value, 'lte', 'time', options, False)
+        if value.get('null'):
+            html += self.null_param(key, value)
+        return html
+
     def foreign_key_param(self, key, value):
         if value.get('null'):
             return self.null_param(key, value)
         return ''
 
+    def many_to_many_param(self, key, value):
+        return self.null_param(key, value)
+
     def file_param(self, key, value):
         return self.null_param(key, value)
 
@@ -304,7 +338,10 @@ class Filter:
         fields = [(x.verbose_name, x.name) for x in filter(
             lambda x:
             x.name not in filter_exclude
-            and not isinstance(x, (ManyToOneRel, ManyToManyRel)),
+            and not isinstance(x, (
+                db_fields.related.ManyToOneRel,
+                db_fields.related.ManyToManyRel
+            )),
             self.model._meta.get_fields()
         )]
         if hasattr(self.model, 'get_annotations'):

{accrete-0.0.101 → accrete-0.0.103}/accrete/contrib/ui/static/css/accrete.css

@@ -20536,6 +20536,7 @@ textarea.is-skeleton:-ms-input-placeholder {
   --accrete-dark: rgb(30, 31, 34);
   --accrete-grey: #FCFCFC;
   --accrete-hover-color: #F0F2F4;
+  --accrete-border-color: #D6D9E0;
   --accrete-side-panel-width: 320px;
   --accrete-side-panel-padding: 0;
   --accrete-side-panel-action-margin: 5px 14px 0 14px;
@@ -20608,7 +20609,7 @@ td {
   margin-bottom: 0 !important;
 }
 
-.label.has-field {
+.label {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -20618,7 +20619,7 @@ td {
   padding: 12px 12px 12px 0;
 }
 
-.label.has-field * input {
+.label * input {
   border-top: transparent;
   border-right: transparent;
   border-left: transparent;
@@ -20627,7 +20628,7 @@ td {
   background-color: var(--accrete-field-bg-color);
 }
 
-.label.has-field * select {
+.label * select {
   border-top: transparent;
   border-right: transparent;
   border-left: transparent;
@@ -20636,7 +20637,7 @@ td {
   background-color: var(--accrete-field-bg-color);
 }
 
-.label.has-field * .button:not(.label-button) {
+.label * .button:not(.label-button) {
   border-top: transparent;
   border-right: transparent;
   border-left: transparent;