wbcore 1.56.8__py2.py3-none-any.whl → 1.57.0__py2.py3-none-any.whl

wbcore/filters/mixins.py

@@ -106,7 +106,6 @@ class WBCoreFilterMixin:
         if initial is not None or self.allow_empty_initial:
             lookup_expr["input_properties"]["initial"] = initial
 
-        if self.required:
-            lookup_expr["input_properties"]["required"] = True
+        lookup_expr["input_properties"]["required"] = self.required
         representation["depends_on"] = self.depends_on
         return representation, lookup_expr

wbcore/metadata/configs/fields.py

@@ -10,8 +10,13 @@ class FieldsViewConfig(WBCoreViewConfig):
     def get_metadata(self) -> dict:
         fields = defaultdict(dict)
         if (serializer_class := getattr(self.view, "get_serializer", None)) and (serializer := serializer_class()):
+            related_key_fields = []
             for field_name, field in serializer.fields.items():
                 field_key, field_representation = field.get_representation(self.request, field_name)
+                # we need to get the representation of the related field last so that the key update properly (priority to the related field values)
+                if "related_key" in field_representation:
+                    related_key_fields.append((field_key, field_representation))
+                fields[field_key].update(field_representation)
+            for field_key, field_representation in related_key_fields:
                 fields[field_key].update(field_representation)
-
         return fields

wbcore/serializers/fields/mixins.py

@@ -33,6 +33,8 @@ class WBCoreSerializerFieldMixin:
         read_only=False,
         copyable=None,
         related_key=None,
+        on_unsatisfied_deps="read_only",
+        clear_dependent_fields=True,
         **kwargs,
     ):
         if not decorators:
@@ -50,6 +52,8 @@ class WBCoreSerializerFieldMixin:
             self._callable_read_only = read_only
             read_only = True
         self.related_key = related_key
+        self.on_unsatisfied_deps = on_unsatisfied_deps
+        self.clear_dependent_fields = clear_dependent_fields
         super().__init__(*args, read_only=read_only, **kwargs)
 
     def _evaluate_read_only(self, field_name, parent):
@@ -131,6 +135,10 @@ class WBCoreSerializerFieldMixin:
             representation["math"] = self.math
         if self.copyable:
             representation["copyable"] = self.copyable
+        if self.on_unsatisfied_deps != "read_only":
+            representation["on_unsatisfied_deps"] = self.on_unsatisfied_deps
+        if self.clear_dependent_fields is not True:
+            representation["clear_dependent_fields"] = self.clear_dependent_fields
         return field_name, representation
 
     def validate_empty_values(self, data):

wbcore/serializers/fields/related.py

@@ -58,7 +58,7 @@ class PrimaryKeyRelatedField(WBCoreSerializerFieldMixin, serializers.PrimaryKeyR
     )
 
     def __init__(self, *args, queryset=None, read_only=False, **kwargs):
-        self.field_type = kwargs.pop("field_type", WBCoreType.SELECT.value)
+        self.field_type = kwargs.pop("field_type", WBCoreType.PRIMARY_KEY.value)
         if callable(read_only) and queryset is not None:
             self._queryset = queryset  # we unset any given queryset to be compliant with the RelatedField assertion
             queryset = None

wbcore/utils/reportlab.py

@@ -0,0 +1,7 @@
+from reportlab.platypus import Paragraph as BaseParagraph
+
+
+class FormattedParagraph(BaseParagraph):
+    def __init__(self, text, *args, **kwargs):
+        text = text.replace("<br>", "<br/>")  # convert the HTML line break into a compatible XML line break tag
+        super().__init__(text, *args, **kwargs)

{wbcore-1.56.8.dist-info → wbcore-1.57.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.56.8
+Version: 1.57.0
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: boto3==1.35.*
 Requires-Dist: celery[redis]==5.*

{wbcore-1.56.8.dist-info → wbcore-1.57.0.dist-info}/RECORD

@@ -966,7 +966,7 @@ wbcore/filters/backends.py,sha256=7XX5LcFrAFE5jvFj5qSjww4VMux8aKRlcQKmZxdIiKY,73
 wbcore/filters/defaults.py,sha256=poSD8Ww2NumwYjZ01zS0iBsNCmv6Bee1z3bDSYdX17A,1988
 wbcore/filters/filterset.py,sha256=TTk4mQq9DFCXdyzMq3Ig6e5uIbmjsr4HT2kswOgiuPc,11775
 wbcore/filters/lookups.py,sha256=IYuQqEcYutiXk9UpzY3qKSCaCR2vyllB0RXBj98o8Ao,1186
-wbcore/filters/mixins.py,sha256=_CT4Nrn8vwsANLrIRO4Ghal2aZD6XYTnFOubPPzGuSE,4508
+wbcore/filters/mixins.py,sha256=eIXW2Wq_VO3sXioQKcYdyTvZPHS06tytcGo4ZHEasvA,4487
 wbcore/filters/utils.py,sha256=wSs0g7mKF6n_ziSEDItfFYcuHwZTXyu78D6LHxzY2Bk,786
 wbcore/filters/fields/__init__.py,sha256=ZucwBossNTlvcUfRullicg0ovghQEGO0jxY5eQ3UaEs,546
 wbcore/filters/fields/booleans.py,sha256=6BrK3p1Bv_KIlVCeMOgJ7V8_P8tWQKBnxTOBOBSsGvE,175
@@ -1009,7 +1009,7 @@ wbcore/metadata/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 wbcore/metadata/configs/base.py,sha256=jxOuuisAAEMjvdvQY_1WSruEaNR9onmXn7W6NN95ogw,2790
 wbcore/metadata/configs/documentations.py,sha256=Wv6vToaalOFkCY_KU8HOddpkfeMKsBoGlla_4LTbJ40,348
 wbcore/metadata/configs/endpoints.py,sha256=peGTXR53IpOYcm0kBqDwMuIxxjjLYHRhDv0XWt6-OYQ,7143
-wbcore/metadata/configs/fields.py,sha256=t_GFdQUUDiCUkk7i9TffFEBDBhRCuD_yaoyUIu9tCMQ,634
+wbcore/metadata/configs/fields.py,sha256=4R-C_wzz9R5BttzfiWH0MeCDF5_tkvJUGo8sk4XaWPI,1091
 wbcore/metadata/configs/filter_fields.py,sha256=1jZyZHU8rBse2P69xFFRAn8VitEdevz5bPeniMk0vKs,2000
 wbcore/metadata/configs/identifiers.py,sha256=4cntC5IarkENLrBnFf26uyfrZY3b4QDXtugvNc_VRhI,1025
 wbcore/metadata/configs/ordering_fields.py,sha256=9ww1zwCFfL6XKGxMI2RKCcMhRS-dkFi3pYbQVbuKN_A,878
@@ -1103,11 +1103,11 @@ wbcore/serializers/fields/file.py,sha256=tDDK2bITiP7zxl9Ilzja2_gWae_lf9CkO1rDEBP
 wbcore/serializers/fields/fsm.py,sha256=xUYxDj166PDnmDLggI4fShXdSunJVzbc8quFQioM3Yc,700
 wbcore/serializers/fields/json.py,sha256=8SmEOW2hXnTTfuCztaxA8AA3qtTxhCZtft7BJm1yO6o,2225
 wbcore/serializers/fields/list.py,sha256=cYmMBg9M10Qb_5z98CeP3SjE2bV-u7Z0xkzXr-C3xoA,4178
-wbcore/serializers/fields/mixins.py,sha256=_KbdxJDGWFMAH_y6MX_7bXICZ-MXH9ZXV0QAi4uegWk,7155
+wbcore/serializers/fields/mixins.py,sha256=sP1mEiD5tMZ4yCr-X0IkIY3RZwJcT0JokvontvRsDKw,7613
 wbcore/serializers/fields/number.py,sha256=Lxhiy8KBMA8dzv2nKsHVtAaPgjZMNt0TQTgVujh_2BI,3473
 wbcore/serializers/fields/other.py,sha256=3r_70JH_A_daS99LuwQWwa0LNtyosKW7QKJzZgQA-zo,1131
 wbcore/serializers/fields/primary_key.py,sha256=yTbs5B2QlUX-XKEtop3JpwIPeP-FhM8u-2qDXM5q6u0,676
-wbcore/serializers/fields/related.py,sha256=7LYfPLz-7Kfs4b_tlRdIJGKp34UcfK3M4TbwyD5LjO8,6350
+wbcore/serializers/fields/related.py,sha256=mq7QhcjSG273G400ZueYJnNVNDlGgnUHLoAHaKRjW_Q,6355
 wbcore/serializers/fields/text.py,sha256=8cmRiH1RpCDGzuUmO1zMmm8uiybXDMqyuBkjFblNMmQ,5060
 wbcore/serializers/fields/types.py,sha256=eiSOajWwlZjFfXnMGjIakAa7WGzXHjtRQwT0LH-2_oA,983
 wbcore/shares/__init__.py,sha256=uhHkbgHoFgbcsxHUPxNNzNs11oIjjQ7zIxG8FzsREAI,32
@@ -1211,6 +1211,7 @@ wbcore/utils/numbers.py,sha256=KaC2yNmaVMwe05uRvGvC_ayWJW_1dOgjswlqsB-QeoM,2289
 wbcore/utils/prettytable.py,sha256=RnZ9VZpSZBaOVPyvcbdD17PeKp6pNN57PDfyILy1nlg,877
 wbcore/utils/print.py,sha256=_CBbuAf2ZbjXQBedcvhe6jZAfNq2kjC_ImWlWDbeRCc,725
 wbcore/utils/renderers.py,sha256=2q1ATrmzFFe03ofuKn2WZ3hK53aFwyEwCVbK0YxkdDM,520
+wbcore/utils/reportlab.py,sha256=gAvcZqpsx0-M9DxW_GvnXQbPFilmf18tQKhK3DqU-9Q,309
 wbcore/utils/rrules.py,sha256=oqg1eY_X7CLN--UkTjPsKuF_FrtKi1no9-ITvYerrXM,2743
 wbcore/utils/serializers.py,sha256=fn__UYJolYjg063OHmAt7zC9zxMxsqrVERpGhLzUK3o,418
 wbcore/utils/settings.py,sha256=MCt48ZJO9nOzGPAFYJ-_o0uRCDUt3_yzEek6m4oZTYg,198
@@ -1229,6 +1230,6 @@ wbcore/viewsets/generics.py,sha256=lKDq9UY_Tyc56u1bqaIEvHGgoaXwXxpZ1c3fLVteptI,1
 wbcore/viewsets/mixins.py,sha256=IdHd_uixOv3ExKoHxTgL5Bt8OELIwfYwhBZm0nsvZfc,12054
 wbcore/viewsets/utils.py,sha256=4520Ij3ASM8lOa8QZkCqbBfOexVRiZu688eW-PGqMOA,882
 wbcore/viewsets/viewsets.py,sha256=FPPESunEjlunDr5VFsjTfsquTS3iDSQkw0H6QjMKPqk,6574
-wbcore-1.56.8.dist-info/METADATA,sha256=cga3JvdAH3UXpC-1tiJr-T6bI08lEZ2HXvyRJHm43RI,2332
-wbcore-1.56.8.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcore-1.56.8.dist-info/RECORD,,
+wbcore-1.57.0.dist-info/METADATA,sha256=S2Im_-ZfGaGiK-1IaNBNvJUXbQuMDoR0jGNSOc7UDgQ,2332
+wbcore-1.57.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcore-1.57.0.dist-info/RECORD,,