wbcore 1.59.6__py2.py3-none-any.whl → 1.59.6rc0__py2.py3-none-any.whl

wbcore/filters/mixins.py

@@ -90,12 +90,12 @@ class WBCoreFilterMixin:
             "help_text": self.get_help_text(),
         }
         lookup_expr = {
+            "label": get_lookup_label(self.lookup_expr) if self.lookup_label is None else self.lookup_label,
             "icon": get_lookup_icon(self.lookup_expr) if self.lookup_icon is None else self.lookup_icon,
+            "key": name,
             "hidden": self.hidden,
             "allow_exclude": self.allow_exclude,
             "input_properties": {
-                "label": get_lookup_label(self.lookup_expr) if self.lookup_label is None else self.lookup_label,
-                "key": name,
                 "type": self.filter_type,
             },
         }

wbcore/metadata/configs/buttons/__init__.py

@@ -1,4 +1,4 @@
 from .bases import ButtonConfig
 from .buttons import ActionButton, DropDownButton, HyperlinkButton, WidgetButton
-from .enums import ButtonDefaultColor, ButtonType
+from .enums import ButtonDefaultColor, ButtonType, HyperlinkTarget
 from .view_config import ButtonViewConfig

wbcore/metadata/configs/buttons/bases.py

@@ -11,6 +11,7 @@ class ButtonConfig:
     label: Optional[str] = None
     icon: Optional[str] = None
     title: Optional[str] = None
+    style: Optional[dict] = None
     color: ButtonDefaultColor | str = ButtonDefaultColor.PRIMARY
     weight: int = 100
     disabled: bool = False
@@ -30,12 +31,16 @@ class ButtonConfig:
         if iter := getattr(super(), "__iter__", None):
             yield from iter()
 
-        for key in ["label", "icon", "title"]:
+        for key in ["label", "icon", "title", "style"]:
             value = getattr(self, key, None)
             if value:
                 yield key, value
         color = getattr(self.color, "value", self.color)
         yield "color", color
+        yield (
+            "level",
+            color,
+        )  # TODO: we return level for backward compatibility reason. to be removed once we move to frontend version 2
         yield "disabled", self.disabled  # set to True if you want to set the css "disabled" property to that button
         yield "always_render", self.always_render  # set to True the button always needs to be rendered (even if empty)
         yield "placeholder", self.placeholder  # set to a valid string if a placeholder is needed onhover

wbcore/metadata/configs/buttons/buttons.py

@@ -11,7 +11,7 @@ from wbcore.serializers import ListSerializer, RepresentationSerializer, Seriali
 from wbcore.utils.urls import get_parse_endpoint, get_urlencode_endpoint
 
 from .bases import ButtonConfig, ButtonTypeMixin, ButtonUrlMixin
-from .enums import ButtonType
+from .enums import ButtonType, HyperlinkTarget
 
 
 @dataclass
@@ -71,6 +71,12 @@ class WidgetButton(ButtonTypeMixin, ButtonUrlMixin, ButtonConfig):
 @dataclass
 class HyperlinkButton(ButtonTypeMixin, ButtonUrlMixin, ButtonConfig):
     button_type = ButtonType.HYPERLINK
+    target: HyperlinkTarget = HyperlinkTarget.BLANK
+
+    def serialize(self, request, **kwargs):
+        res = super().serialize(request, **kwargs)
+        res["target"] = self.target.value
+        return res
 
     def __hash__(self):
         if self.key:

wbcore/metadata/configs/buttons/enums.py

@@ -66,3 +66,10 @@ class ButtonType(Enum):
     HYPERLINK = "hyperlink"
     WIDGET = "widget"
     ACTION = "action"
+
+
+class HyperlinkTarget(Enum):
+    BLANK = "_blank"
+    SELF = "_self"
+    PARENT = "_parent"
+    TOP = "_top"

wbcore/metadata/tests/test_buttons.py

@@ -11,7 +11,7 @@ from wbcore.metadata.configs.buttons import (
     HyperlinkButton,
     WidgetButton,
 )
-from wbcore.metadata.configs.buttons.enums import ButtonDefaultColor
+from wbcore.metadata.configs.buttons.enums import ButtonDefaultColor, HyperlinkTarget
 from wbcore.metadata.configs.display.instance_display import create_simple_display
 from wbcore.metadata.utils import prefix_key
 
@@ -31,6 +31,7 @@ class TestDropDownButton:
         assert serialized_btn["icon"] == button.icon
         assert serialized_btn["title"] == button.title
         assert serialized_btn["color"] == button.color
+        assert serialized_btn["level"] == button.color
         assert serialized_btn["buttons"] == [button.buttons[0].serialize(rf)]
         assert serialized_btn["type"] == DropDownButton.button_type.value
 
@@ -42,6 +43,7 @@ class TestDropDownButton:
         assert serialized_btn["icon"] == button.icon
         assert serialized_btn["title"] == button.title
         assert serialized_btn["color"] == button.color
+        assert serialized_btn["level"] == button.color
         assert serialized_btn["buttons"] == [nested_button.serialize(rf, key_prefix=key_prefix)]
         assert serialized_btn["type"] == DropDownButton.button_type.value
         assert serialized_btn["buttons"][0]["key"] == prefix_key(nested_button.key, key_prefix)
@@ -76,6 +78,7 @@ class TestWidgetButton:
         assert serialized_btn["icon"] == key_button.icon
         assert serialized_btn["title"] == key_button.title
         assert serialized_btn["color"] == key_button.color
+        assert serialized_btn["level"] == key_button.color
         assert serialized_btn["key"] == key_button.key
         assert serialized_btn["type"] == self.button_class.button_type.value
 
@@ -86,6 +89,7 @@ class TestWidgetButton:
         assert serialized_btn["icon"] == key_button.icon
         assert serialized_btn["title"] == key_button.title
         assert serialized_btn["color"] == key_button.color
+        assert serialized_btn["level"] == key_button.color
         assert serialized_btn["type"] == self.button_class.button_type.value
         assert serialized_btn["key"] == prefix_key(key_button.key, key_prefix)
 
@@ -100,6 +104,7 @@ class TestWidgetButton:
         assert serialized_btn["icon"] == endpoint_button.icon
         assert serialized_btn["title"] == endpoint_button.title
         assert serialized_btn["color"] == endpoint_button.color
+        assert serialized_btn["level"] == endpoint_button.color
         assert serialized_btn["endpoint"] == endpoint_button.endpoint
         assert serialized_btn["type"] == self.button_class.button_type.value
 
@@ -113,11 +118,18 @@ class TestWidgetButton:
 class TestHyperlinkButtonutton(TestWidgetButton):
     button_class = HyperlinkButton
 
+    def test_serialize(self, rf, key_button):
+        super().test_serialize(rf, key_button)
+        key_button.target = random.choice(list(HyperlinkTarget))
+        serialized_btn = key_button.serialize(rf)
+        assert serialized_btn["target"] == key_button.target.value
+
     def test_serialize_endpoint_button(self, rf, endpoint_button):
         serialized_btn = endpoint_button.serialize(rf)
         assert serialized_btn["icon"] == endpoint_button.icon
         assert serialized_btn["title"] == endpoint_button.title
         assert serialized_btn["color"] == endpoint_button.color
+        assert serialized_btn["level"] == endpoint_button.color
         assert serialized_btn["endpoint"] == endpoint_button.endpoint
         assert serialized_btn["type"] == self.button_class.button_type.value
 

wbcore/serializers/fields/fields.py

@@ -13,7 +13,7 @@ from wbcore.signals import (
 from wbcore.utils.importlib import parse_signal_received_for_module
 
 from .mixins import WBCoreSerializerFieldMixin
-from .text import StringRelatedField
+from .text import TextField
 from .types import WBCoreType
 
 logger = logging.getLogger(__name__)
@@ -155,8 +155,6 @@ class AdditionalResourcesField(WBCoreSerializerFieldMixin, serializers.ReadOnlyF
 
 
 class HyperlinkField(WBCoreSerializerFieldMixin, serializers.ReadOnlyField):
-    field_type = WBCoreType.HYPERLINK.value
-
     def __init__(self, *args, **kwargs):
         self.reverse_name = kwargs.pop("reverse_name")
         self.id_field_name = kwargs.pop("id_field_name", "id")
@@ -180,7 +178,7 @@ class SlugRelatedField(WBCoreSerializerFieldMixin, serializers.SlugRelatedField)
 
 
 class SerializerMethodField(WBCoreSerializerFieldMixin, serializers.SerializerMethodField):
-    def __init__(self, method_name=None, field_class=StringRelatedField, **kwargs):
+    def __init__(self, method_name=None, field_class=TextField, **kwargs):
         self.field_class = field_class
         self.initkwargs = kwargs
         super().__init__(method_name, **kwargs)

wbcore/serializers/fields/types.py

@@ -31,7 +31,6 @@ class WBCoreType(Enum):
     URL = "url"
     SPARKLINE = "sparkline"
     LANGUAGE = "language"
-    HYPERLINK = "hyperlink"
 
 
 class ReturnContentType(Enum):

{wbcore-1.59.6.dist-info → wbcore-1.59.6rc0.dist-info}/METADATA

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

{wbcore-1.59.6.dist-info → wbcore-1.59.6rc0.dist-info}/RECORD

@@ -970,7 +970,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=YIy2SEOtDjUVb7oePiC5oPjQEIdiwym02BHAyDkdep4,4495
+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
@@ -1023,10 +1023,10 @@ wbcore/metadata/configs/primary_keys.py,sha256=MZSAHZpAOvVtd-zGkkcrZ88EzlGUL6ewO
 wbcore/metadata/configs/search_fields.py,sha256=FOq3zk6jSPQ24m1QII0iV-eLTcD_Z4IPp8TnBjVdFXI,275
 wbcore/metadata/configs/titles.py,sha256=Iha24FKpL6BacGlN61-_O4f7v9meHwJDkG4W09PWi5s,1841
 wbcore/metadata/configs/window_types.py,sha256=RbUbUvid9qMIXZMI0sqLTanZcWCP-pmwm-_33z_3hQs,451
-wbcore/metadata/configs/buttons/__init__.py,sha256=s_FcAPwADxa8YE3gTbhbeqZhqBfoCZR3j4laLt7gpOo,205
-wbcore/metadata/configs/buttons/bases.py,sha256=rAw5Te9V5y6tCCKOTbZXz-uln0vT7io2oPV6QDn1Ijc,2823
-wbcore/metadata/configs/buttons/buttons.py,sha256=0dKPokHYMis_SZhFZ1gTHayFTMQk5nVAvyDetTNdQ6o,5033
-wbcore/metadata/configs/buttons/enums.py,sha256=vkJBfNFPTIIFvYrDGxrugqgRe22_KcqFRU39jo8ZvFw,1472
+wbcore/metadata/configs/buttons/__init__.py,sha256=JAMiJMEDtsWqHh5O4-gsZBuPINZGHzMKVYxrIxvphTM,222
+wbcore/metadata/configs/buttons/bases.py,sha256=WbiCoNyvzCQkXdT3A4Hq0vGL0-0oY2i-BIOulaTeHXs,3040
+wbcore/metadata/configs/buttons/buttons.py,sha256=JRj84v3EA7z8tzBvLPup_4etiU0oSTO7HDQB4TYaDh4,5259
+wbcore/metadata/configs/buttons/enums.py,sha256=J7gGqVtmlUj6JM9elK-WDeZ4v5FuFkDMjNJDU1rO9cY,1583
 wbcore/metadata/configs/buttons/metadata.py,sha256=OhSkW18R6B_uJrtcGjN8VEkNCPlXD2DxuYWCqZXQbD0,348
 wbcore/metadata/configs/buttons/view_config.py,sha256=31fFJFeV9iM24FQY7I6XaPthokJdCuzSeCBdAB1xGnE,5308
 wbcore/metadata/configs/display/__init__.py,sha256=K3CdAUuC-YbowUusZ9F6vGfepppSqE8cfvazczEGePo,272
@@ -1052,7 +1052,7 @@ wbcore/metadata/configs/display/instance_display/layouts/inlines.py,sha256=xfcZ7
 wbcore/metadata/configs/display/instance_display/layouts/layouts.py,sha256=3nY6M-4ZmE9labpY80wx_yPIqQmQw0_mjG5smmrujl8,3264
 wbcore/metadata/configs/display/instance_display/layouts/sections.py,sha256=yFo5i-41KJp733MoDlzonaXDylOn0pbBlwqd7late0A,1298
 wbcore/metadata/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcore/metadata/tests/test_buttons.py,sha256=CxwzXS8rFW5N37GrkZl9AI2NyhMdlVCAETyPETe6fBc,6696
+wbcore/metadata/tests/test_buttons.py,sha256=cOH77BKzHtsvc4D7LnTu3037fFmE_jzekQQhX0lgeN8,7345
 wbcore/migrations/0001_initial_squashed_squashed_0010_preset_appliedpreset.py,sha256=6RxsuOPKfhSSox5DC0bwUrI-oR9bGPkSyI1zDv5juSM,16460
 wbcore/migrations/0011_genericmodel.py,sha256=w-SK0-EwQCbXtLyFz3V-rBY-hj8bw7_n0xe0NM2HF8U,588
 wbcore/migrations/0012_delete_notification.py,sha256=HM0oUd05bgpuupsO_oG7t-C3lXInpq_Sg1vcEIyfHd0,293
@@ -1102,7 +1102,7 @@ wbcore/serializers/fields/__init__.py,sha256=xNNak0yl8FtC6m-__B5mfieSNGAygXND34E
 wbcore/serializers/fields/boolean.py,sha256=vwP7HQflArFEG0w9FfXkPYKreFJ5qMjs-L0qKMeKCVQ,1682
 wbcore/serializers/fields/choice.py,sha256=ozVwKaPCpsgPuQXQWr8TxHIcxSdGvhw23OFVD0xnipg,2128
 wbcore/serializers/fields/datetime.py,sha256=UVrBAdh-Iy3cDdVxbce9rsPYwwfxDJ-kJEr_1K_29ec,7386
-wbcore/serializers/fields/fields.py,sha256=R_JJxnSfgKK6pYFgfe_-7qo_y25YksQ-WuNgiKWev4U,7068
+wbcore/serializers/fields/fields.py,sha256=nRvVGqjaqgDThKKuMptrM5_IOKNi_hkGuL5rP2cr4Uw,7005
 wbcore/serializers/fields/file.py,sha256=tDDK2bITiP7zxl9Ilzja2_gWae_lf9CkO1rDEBPaj6g,568
 wbcore/serializers/fields/fsm.py,sha256=xUYxDj166PDnmDLggI4fShXdSunJVzbc8quFQioM3Yc,700
 wbcore/serializers/fields/json.py,sha256=8SmEOW2hXnTTfuCztaxA8AA3qtTxhCZtft7BJm1yO6o,2225
@@ -1113,7 +1113,7 @@ wbcore/serializers/fields/other.py,sha256=3r_70JH_A_daS99LuwQWwa0LNtyosKW7QKJzZg
 wbcore/serializers/fields/primary_key.py,sha256=yTbs5B2QlUX-XKEtop3JpwIPeP-FhM8u-2qDXM5q6u0,676
 wbcore/serializers/fields/related.py,sha256=mq7QhcjSG273G400ZueYJnNVNDlGgnUHLoAHaKRjW_Q,6355
 wbcore/serializers/fields/text.py,sha256=8cmRiH1RpCDGzuUmO1zMmm8uiybXDMqyuBkjFblNMmQ,5060
-wbcore/serializers/fields/types.py,sha256=Jf2lcNRKOnxMn55JZTTcvACRpADXwwXgPX3ojigrung,1011
+wbcore/serializers/fields/types.py,sha256=eiSOajWwlZjFfXnMGjIakAa7WGzXHjtRQwT0LH-2_oA,983
 wbcore/shares/__init__.py,sha256=uhHkbgHoFgbcsxHUPxNNzNs11oIjjQ7zIxG8FzsREAI,32
 wbcore/shares/config.py,sha256=7-Tfit2PFUVpr9qbapcmtZbjeMiUHSyfYX6PKGwnj_w,2292
 wbcore/shares/decorator.py,sha256=vFoVidO2IxLzYPZ-qWDWjjPxbCzFAvw4FVl2YZfPPAQ,448
@@ -1233,6 +1233,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.59.6.dist-info/METADATA,sha256=etXZZxWC9mm2rclCXLdO4ygq24nRItcmZVUhHXN3Y90,2316
-wbcore-1.59.6.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
-wbcore-1.59.6.dist-info/RECORD,,
+wbcore-1.59.6rc0.dist-info/METADATA,sha256=VTbp66knyzJHTclsb0mYzK-P6lyCammJjAim7lZ3MGM,2319
+wbcore-1.59.6rc0.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbcore-1.59.6rc0.dist-info/RECORD,,