wbcore 1.55.10rc0__tar.gz → 1.58.1__tar.gz

{wbcore-1.55.10rc0 → wbcore-1.58.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcore
-Version: 1.55.10rc0
+Version: 1.58.1
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: boto3==1.35.*
 Requires-Dist: celery[redis]==5.*
@@ -35,6 +35,7 @@ Requires-Dist: fabric==3.2.*
 Requires-Dist: faker==25.*
 Requires-Dist: firebase-admin==6.*
 Requires-Dist: graphviz==0.*
+Requires-Dist: humanize==4.*
 Requires-Dist: ics==0.*
 Requires-Dist: igraph==0.*
 Requires-Dist: inscriptis==1.*

{wbcore-1.55.10rc0 → wbcore-1.58.1}/pyproject.toml

@@ -85,7 +85,8 @@ dependencies = [
   "langchain-openai >= 0.3",
   "django-modeltrans >= 0.8",
   "weasyprint == 65.*",
-  "pillow==11.*"
+  "pillow==11.*",
+  "humanize==4.*"
 ]
 
 [project.optional-dependencies]

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/cache/registry.py

@@ -61,7 +61,8 @@ class CachedClass:
         for kwargs in view_kwargs:
             for request in self._get_requests(**kwargs):
                 with suppress(RequiredFilterMissing):
-                    view = self.view_class(request=request, kwargs=kwargs)
+                    view = self.view_class()
+                    view.setup(request, **kwargs)
                     request.parser_context = {"request": request, "view": view, "kwargs": kwargs}
                     cache_key = view._get_cache_key()
                     cache.delete(cache_key)

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/authentication/filters.py

@@ -6,7 +6,6 @@ from .models import UserActivity
 
 class UserActivityChartFilter(wb_filters.FilterSet):
     date = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/currency/models.py

@@ -4,7 +4,9 @@ from datetime import date as date_lib
 from decimal import Decimal
 
 from django.db import models
-from django.db.models import Expression, ExpressionWrapper, Subquery
+from django.db.models import Case, CharField, Expression, ExpressionWrapper, F, Q, Subquery, Value, When
+from django.db.models.functions import Concat
+from persisting_theory import QuerySet
 
 from wbcore.contrib.io.mixins import ImportMixin
 from wbcore.models import WBModel
@@ -13,6 +15,21 @@ from wbcore.utils.models import LabelKeyMixin
 from .import_export.handlers import CurrencyFXRatesImportHandler, CurrencyImportHandler
 
 
+class CurrencyDefaultManager(models.Manager):
+    def get_queryset(self) -> QuerySet:
+        return (
+            super()
+            .get_queryset()
+            .annotate(
+                name_repr=Case(
+                    When(Q(symbol="") | Q(symbol__isnull=True), then=F("title")),
+                    default=Concat(F("title"), Value(" ("), F("symbol"), Value(")")),
+                    output_field=CharField(),
+                )
+            )
+        )
+
+
 class Currency(ImportMixin, LabelKeyMixin, WBModel):
     import_export_handler_class = CurrencyImportHandler
 
@@ -21,18 +38,19 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
         verbose_name_plural = "Currencies"
         ordering = ("title",)
 
-    def __str__(self):
-        symbol = f"({self.symbol})" if self.symbol else ""
-        return f"{self.key} {symbol}"
+    def __str__(self) -> str:
+        if self.symbol:
+            return f"{self.title} ({self.symbol})"
+        return self.title
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return self.key
 
     title = models.CharField(max_length=255)
     symbol = models.CharField(max_length=10, blank=True, null=True)
     key = models.CharField(max_length=3, unique=True)
 
-    objects = models.Manager()
+    objects = CurrencyDefaultManager()
 
     LABEL_KEY = "{{key}} ({{symbol}})"
 
@@ -83,7 +101,7 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
 
     @classmethod
     def get_representation_label_key(cls) -> str:
-        return "{{key}} ({{symbol}})"
+        return "{{name_repr}}"
 
 
 class CurrencyFXRates(ImportMixin, models.Model):

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/currency/serializers.py

@@ -8,11 +8,15 @@ from .models import Currency, CurrencyFXRates
 class CurrencyRepresentationSerializer(wb_serializers.RepresentationSerializer):
     """Representation Serializer for Currencies"""
 
+    name_repr = wb_serializers.SerializerMethodField(read_only=True)
     _detail = wb_serializers.HyperlinkField(reverse_name="wbcore:currency:currency-detail")
 
+    def get_name_repr(self, obj):
+        return str(obj)
+
     class Meta:
         model = Currency
-        fields = ("id", "title", "key", "symbol", "_detail")
+        fields = ("id", "name_repr", "key", "_detail")
 
 
 class CurrencyModelSerializer(wb_serializers.ModelSerializer):

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/currency/tests/test_serializers.py

@@ -30,6 +30,10 @@ class TestSerializers:
         mocker.patch.object(currency_fx_rate, "currency_id", currency.id)
         return currency_fx_rate
 
+    @pytest.fixture
+    def expected_representation_data(self, currency):
+        return {"id": currency.id, "name_repr": f"{currency.title} ({currency.symbol})", "key": currency.key}
+
     @pytest.fixture
     def expected_data(self, currency):
         return {"id": currency.id, "title": currency.title, "key": currency.key, "symbol": currency.symbol}
@@ -43,12 +47,12 @@ class TestSerializers:
             "currency": currency_fx_rate.currency_id,
         }
 
-    def test_currency_representation_serializer(self, mocker: MockerFixture, currency, expected_data):
+    def test_currency_representation_serializer(self, mocker: MockerFixture, currency, expected_representation_data):
         detail = f"/wbcore/currency/currency/{currency.id}/"
         mocker.patch("wbcore.serializers.fields.fields.HyperlinkField", return_value=detail)
         serializer = CurrencyRepresentationSerializer(instance=currency)
-        expected_data["_detail"] = detail
-        assert serializer.data == expected_data
+        expected_representation_data["_detail"] = detail
+        assert serializer.data == expected_representation_data
 
     def test_currency_model_serializer(self, mocker: MockerFixture, currency, expected_data):
         mocker.patch(

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/currency/tests/test_viewsets.py

@@ -50,7 +50,7 @@ class TestCurrencyRepresentationViewSets:
         assert response.status_code == status.HTTP_200_OK
         assert instance.get("id") == euro.id
         assert instance.get("key") == euro.key
-        assert instance.get("title") == euro.title
+        assert instance.get("name_repr") == f"{euro.title} ({euro.symbol})"
 
 
 @pytest.mark.viewset_tests

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/currency/viewsets/currency.py

@@ -19,8 +19,8 @@ class CurrencyRepresentationViewSet(viewsets.RepresentationViewSet):
     serializer_class = CurrencyRepresentationSerializer
     filter_backends = (filters.OrderingFilter, filters.SearchFilter)
 
-    ordering = ordering_fields = ["-symbol"]
-    search_fields = ("symbol", "key")
+    ordering = ["name_repr"]
+    search_fields = ("name_repr", "key")
 
 
 class CurrencyModelViewSet(viewsets.ModelViewSet):

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/models/contacts.py

@@ -227,7 +227,7 @@ class BankingContact(PrimaryMixin, WBModel):
 
         notification_types = [
             create_notification_type(
-                code="directory.banking+contact.approval",
+                code="directory.banking_contact.approval",
                 title="Banking Contact Notification",
                 help_text="Sends out a notification when you want need to approve a change in bank details",
             )

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/models/entries.py

@@ -22,11 +22,13 @@ from slugify import slugify
 
 from wbcore.contrib.agenda.models import CalendarItem
 from wbcore.contrib.authentication.models import User
+from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.directory.models.contacts import (
     AddressContact,
     BankingContact,
     ContactLocationChoices,
     EmailContact,
+    SocialMediaContact,
     TelephoneContact,
     WebsiteContact,
 )
@@ -245,10 +247,6 @@ class EntryDefaultQueryset(models.QuerySet):
                     EmailContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("address")[:1],
                     output_field=CharField(),
                 ),
-                secondary_email=Subquery(
-                    EmailContact.objects.filter(primary=False, entry__id=OuterRef("pk")).values("address")[:1],
-                    output_field=CharField(),
-                ),
                 primary_telephone=Subquery(
                     TelephoneContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("number")[:1],
                     output_field=CharField(),
@@ -263,6 +261,14 @@ class EntryDefaultQueryset(models.QuerySet):
                     .values("primary_address")[:1],
                     output_field=CharField(),
                 ),
+                primary_website=Subquery(
+                    WebsiteContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("url")[:1],
+                    output_field=CharField(),
+                ),
+                primary_social=Subquery(
+                    SocialMediaContact.objects.filter(primary=True, entry__id=OuterRef("pk")).values("url")[:1],
+                    output_field=CharField(),
+                ),
                 last_event=Subquery(
                     CalendarItem.objects.filter(
                         period__endswith__lte=timezone.now(),
@@ -408,6 +414,14 @@ class Entry(ComplexToStringMixin, DeleteToDisableMixin, WBModel):
         if additional_field_key in self.additional_fields:
             del self.additional_fields[additional_field_key]
 
+    def get_banking_contact(self, currency: Currency) -> BankingContact | None:
+        bank_accounts = self.banking.all()
+        if bank_accounts.filter(currency=currency).exists():
+            bank_accounts = bank_accounts.filter(currency=currency)
+        if bank_accounts.filter(primary=True).exists():
+            bank_accounts = bank_accounts.filter(primary=True)
+        return bank_accounts.first()
+
     @classmethod
     def get_endpoint_basename(cls):
         return "wbcore:directory:entry"

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/serializers/companies.py

@@ -26,10 +26,8 @@ class CompanyModelSerializer(EntryModelSerializer):
         many=True,
     )
     _employees = PersonRepresentationSerializer(source="employees", many=True)
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=True)
-    tier = wb_serializers.CharField(
-        help_text=settings.DEFAULT_TIERING_HELP_TEXT, required=False, read_only=True, label=_("Tier")
-    )
+    is_primary_employer = wb_serializers.BooleanField(read_only=True)
+    tier = wb_serializers.CharField(help_text=settings.DEFAULT_TIERING_HELP_TEXT, label=_("Tier"), required=False)
     _type = CompanyTypeRepresentationSerializer(source="type")
 
     @wb_serializers.register_resource()
@@ -63,6 +61,8 @@ class CompanyModelSerializer(EntryModelSerializer):
             "primary_email",
             "primary_manager_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "salutation",
             "signature",
@@ -77,7 +77,7 @@ class CompanyModelSerializer(EntryModelSerializer):
 
 class CompanyModelListSerializer(CompanyModelSerializer):
     eer_id = wb_serializers.CharField(default="", required=False, read_only=True)
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=True)
+    is_primary_employer = wb_serializers.BooleanField(read_only=True)
 
     @wb_serializers.register_resource()
     def delete(self, instance, request, user):
@@ -127,7 +127,12 @@ class CompanyModelListSerializer(CompanyModelSerializer):
             "_customer_status",
             "eer_id",
             "is_primary_employer",
+            "primary_address",
+            "primary_email",
             "primary_manager_repr",
+            "primary_telephone",
+            "primary_website",
+            "primary_social",
             "last_event",
             "last_event_period_endswith",
             "tier",
@@ -138,10 +143,12 @@ class CompanyModelListSerializer(CompanyModelSerializer):
 
 
 class BankModelSerializer(wb_serializers.ModelSerializer):
-    primary_address = wb_serializers.CharField(allow_null=True, default="", label=_("Primary Address"), read_only=True)
-    primary_email = wb_serializers.CharField(allow_null=True, default="", label=_("Primary Email"), read_only=True)
+    primary_address = wb_serializers.CharField(
+        allow_null=True, label=_("Primary Address"), read_only=True, required=False
+    )
+    primary_email = wb_serializers.CharField(allow_null=True, label=_("Primary Email"), required=False, read_only=True)
     primary_telephone = wb_serializers.TelephoneField(
-        allow_null=True, default="", label=_("Primary Telephone"), read_only=True
+        allow_null=True, label=_("Primary Telephone"), read_only=True, required=False
     )
     _relationship_managers = PersonRepresentationSerializer(many=True, source="relationship_managers")
 

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/serializers/entries.py

@@ -181,7 +181,7 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
         read_only=True,
         required=False,
     )
-    is_primary_employer = wb_serializers.BooleanField(default=False, read_only=True)
+    is_primary_employer = wb_serializers.BooleanField(read_only=True)
     position_in_company = wb_serializers.CharField(
         allow_null=True,
         default="",
@@ -192,19 +192,26 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
         read_only=True,
         required=False,
     )
-    primary_address = wb_serializers.CharField(default="", label=_("Primary Address"), read_only=True)
-    primary_email = wb_serializers.CharField(allow_null=True, default="", label=_("Primary Email"), read_only=False)
-    primary_manager_repr = wb_serializers.CharField(label=_("Primary Manager"), read_only=True)
-    primary_telephone = wb_serializers.TelephoneField(allow_null=True, default="", label=_("Primary Telephone"))
+    primary_address = wb_serializers.CharField(
+        allow_null=True, read_only=True, required=False, label=_("Primary Address")
+    )
+    primary_email = wb_serializers.CharField(
+        allow_null=True, required=False, read_only=False, label=_("Primary Email")
+    )
+    primary_manager_repr = wb_serializers.CharField(
+        allow_null=True, read_only=True, required=False, label=_("Primary Manager")
+    )
+    primary_telephone = wb_serializers.TelephoneField(
+        allow_null=True,
+        required=False,
+        label=_("Primary Telephone"),
+    )
+    primary_website = wb_serializers.URLField(allow_null=True, required=False, label=_("Primary Website"))
+    primary_social = wb_serializers.URLField(allow_null=True, required=False, label=_("Primary Social"))
     profile_image = wb_serializers.ImageField(allow_null=True, required=False, label=_("Profile Image"))
     _relationship_managers = PersonRepresentationSerializer(many=True, source="relationship_managers")
     _social_media = SocialMediaContactRepresentationSerializer(many=True, read_only=True, source="social_media")
-    primary_manager = wb_serializers.PrimaryKeyRelatedField(
-        queryset=lambda: Person.objects.filter_only_internal(),
-        default=wb_serializers.CurrentUserDefault("profile"),
-        label=_("Primary Manager"),
-        required=False,
-    )
+    primary_manager = wb_serializers.PrimaryKeyRelatedField(label=_("Primary Manager"), required=False, read_only=True)
     _primary_manager = InternalUserProfileRepresentationSerializer(source="primary_manager")
 
     @wb_serializers.register_resource()
@@ -333,6 +340,8 @@ class EntryModelSerializer(wb_serializers.ModelSerializer):
             "primary_email",
             "primary_manager_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "relationship_managers",
             "_relationship_managers",

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/serializers/entry_representations.py

@@ -9,8 +9,10 @@ from ..models import Entry
 class EntryRepresentationSerializer(wb_serializers.RepresentationSerializer):
     _detail = wb_serializers.SerializerMethodField()
     _detail_preview = wb_serializers.HyperlinkField(reverse_name="wbcore:directory:entry-detail")
-    primary_email = wb_serializers.CharField(default="", label=_("Primary Email"), allow_null=True)
-    primary_telephone = wb_serializers.TelephoneField(default="", label=_("Primary Telephone"), allow_null=True)
+    primary_email = wb_serializers.CharField(read_only=True, required=False, label=_("Primary Email"), allow_null=True)
+    primary_telephone = wb_serializers.TelephoneField(
+        read_only=True, required=False, label=_("Primary Telephone"), allow_null=True
+    )
 
     def get__detail(self, obj):
         if obj.is_company:

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/serializers/persons.py

@@ -15,13 +15,10 @@ from .relationships import PositionRepresentationSerializer
 
 
 class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer):
-    activites_count = wb_serializers.IntegerField(default=0, read_only=True)
-
     primary_employer_repr = wb_serializers.CharField(read_only=True, required=False, label=_("Primary Employer"))
     has_user_account = wb_serializers.CharField(read_only=True, label=_("User Account"))
     name = wb_serializers.CharField(read_only=True)
     last_connection = wb_serializers.DateTimeField(read_only=True, default=None, label=_("Last Connection"))
-    secondary_email = wb_serializers.CharField(default="", label=_("Secondary Email"), allow_null=True, read_only=True)
     personality_profile_red = wb_serializers.RangeSelectField(
         color=WBColor.RED_LIGHT.value, required=False, label=_("Personality Profile Red")
     )
@@ -32,7 +29,7 @@ class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer)
         color=WBColor.BLUE_LIGHT.value, required=False, label=_("Personality Profile Blue")
     )
     _specializations = SpecializationRepresentationSerializer(source="specializations", many=True)
-    tier = wb_serializers.CharField(read_only=True, help_text=_("Tier of the primary employer"), label=_("Tier"))
+    tier = wb_serializers.CharField(help_text=_("Tier of the primary employer"), label=_("Tier"), required=False)
 
     def get_user_account_email(self, obj):
         if hasattr(obj, "user_account"):
@@ -82,7 +79,6 @@ class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer)
             "name",
             "computed_str",
             "active_employee",
-            "activites_count",
             "activity_heat",
             "addresses",
             "cities",
@@ -104,9 +100,10 @@ class PersonModelSerializer(ModelTranslateSerializerMixin, EntryModelSerializer)
             "primary_manager_repr",
             "primary_employer_repr",
             "primary_telephone",
+            "primary_website",
+            "primary_social",
             "profile_image",
             "salutation",
-            "secondary_email",
             "specializations",
             "_specializations",
             "tier",
@@ -204,12 +201,14 @@ class PersonModelListSerializer(PersonModelSerializer):
             "_cities",
             "customer_status",
             "primary_employer_repr",
+            "primary_address",
+            "primary_email",
             "primary_manager_repr",
+            "primary_website",
+            "primary_social",
+            "primary_telephone",
             "last_event",
             "position_in_company",
-            "primary_email",
-            "primary_telephone",
-            "primary_telephone",
             "tier",
             "_additional_resources",
         )

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/tests/conftest.py

@@ -5,6 +5,7 @@ from django.db.models.signals import pre_migrate
 from pytest_factoryboy import register
 from wbcore.contrib.authentication.factories import InternalUserFactory, UserFactory
 from wbcore.contrib.geography.tests.signals import app_pre_migration
+from wbcore.contrib.currency.factories import CurrencyFactory
 from wbcore.tests.conftest import *
 
 from ..factories import (
@@ -45,6 +46,7 @@ register(RelationshipFactory)
 register(RelationshipTypeFactory)
 register(CustomerStatusFactory)
 register(CompanyTypeFactory)
+register(CurrencyFactory)
 
 
 @pytest.fixture(autouse=True, scope="session")

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/tests/test_models.py

@@ -405,3 +405,24 @@ class TestSpecificModelsRelationships:
             to_entry=to_entry,
         )
         assert rel.__str__() == "John Doe is Type of Jane Doe"
+
+
+@pytest.mark.django_db
+class TestEntry:
+    def test_get_banking_contact(self, entry, banking_contact_factory, currency_factory):
+        eur = currency_factory.create()
+        usd = currency_factory.create()
+
+        euro_banking_contact = banking_contact_factory.create(entry=entry, currency=eur)
+        assert entry.get_banking_contact(eur) == euro_banking_contact
+        assert (
+            entry.get_banking_contact(usd) == euro_banking_contact
+        )  # even if usd does not exist, we need to return at least a banking contact
+
+        usd_banking_contact = banking_contact_factory.create(entry=entry, currency=usd, primary=True)
+
+        assert entry.get_banking_contact(eur) == euro_banking_contact
+        assert entry.get_banking_contact(usd) == usd_banking_contact
+
+        new_primary_usd_banking_contact = banking_contact_factory.create(entry=entry, currency=usd, primary=True)
+        assert entry.get_banking_contact(usd) == new_primary_usd_banking_contact

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/viewsets/display/entries.py

@@ -285,13 +285,23 @@ class PersonModelDisplay(EntryModelDisplay):
         return dp.ListDisplay(
             fields=[
                 dp.Field(key="name", label=_("Name")),
-                dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
                 dp.Field(key="customer_status", label=_("Status")),
                 dp.Field(key="position_in_company", label=_("Position")),
                 dp.Field(key="cities", label=_("City")),
-                dp.Field(key="primary_telephone", label=_("Primary Phone Number")),
                 dp.Field(key="tier", label=_("Tier")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_employer_repr", label=_("Primary Employer")),
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
                 dp.Field(
                     key=None,
                     label=_("Last Event"),
@@ -347,19 +357,36 @@ class CompanyModelDisplay(EntryModelDisplay):
             ),
         )
 
-        display = Display(
+        grid_template_areas = [
+            ["profile_image", "name", "customer_status", "activity_table"],
+            ["profile_image", "primary_telephone", "primary_telephone", "activity_table"],
+            ["profile_image", "type", "tier", "activity_table"],
+            ["profile_image", "activity_heat", "activity_heat", "activity_table"],
+            ["employees_section", "employees_section", "employees_section", "employees_section"],
+        ]
+        sections = [employees_section]
+        if portfolio_fields:
+            grid_template_areas.insert(
+                4,
+                [
+                    portfolio_fields.key,
+                    portfolio_fields.key,
+                    portfolio_fields.key,
+                    "activity_table",
+                ],
+            )
+            sections.append(portfolio_fields)
+        if aum_table:
+            grid_template_areas[-1][-1] = aum_table.key
+            sections.append(aum_table)
+
+        return Display(
             pages=[
                 Page(
                     title=_("Main Information"),
                     layouts={
                         default(): Layout(
-                            grid_template_areas=[
-                                ["profile_image", "name", "customer_status", "activity_table"],
-                                ["profile_image", "primary_telephone", "primary_telephone", "activity_table"],
-                                ["profile_image", "type", "tier", "activity_table"],
-                                ["profile_image", "activity_heat", "activity_heat", "activity_table"],
-                                ["employees_section", "employees_section", "employees_section", "employees_section"],
-                            ],
+                            grid_template_areas=grid_template_areas,
                             grid_template_columns=[
                                 Style.MIN_CONTENT,
                                 "minmax(min-content, 1fr)",
@@ -368,7 +395,7 @@ class CompanyModelDisplay(EntryModelDisplay):
                             ],
                             grid_template_rows=[Style.rem(6), Style.rem(6), Style.rem(6)],
                             grid_auto_rows=Style.MIN_CONTENT,
-                            sections=[employees_section],
+                            sections=sections,
                             inlines=[
                                 Inline(
                                     key="activity_table",
@@ -393,29 +420,6 @@ class CompanyModelDisplay(EntryModelDisplay):
             ]
         )
 
-        # Need to insert the portfolio fields into the display
-        for page in display.pages:
-            if page.title == "Main Information":
-                for layout_key in page.layouts.keys():
-                    if portfolio_fields:
-                        # Insert the section with the AUM fields below the profile picture at the left
-                        page.layouts[layout_key].grid_template_areas.insert(
-                            4,
-                            [
-                                portfolio_fields.key,
-                                portfolio_fields.key,
-                                portfolio_fields.key,
-                                "activity_table",
-                            ],
-                        )
-                        page.layouts[layout_key].sections.append(portfolio_fields)
-                    if aum_table:
-                        # Insert the section with the AUM table at the bottom right
-                        page.layouts[layout_key].grid_template_areas[-1][-1] = aum_table.key
-                        page.layouts[layout_key].sections.append(aum_table)
-                break
-        return display
-
     @classmethod
     def _get_new_company_instance_display(cls) -> Display:
         """Returns the display for creating a new company
@@ -468,7 +472,18 @@ class CompanyModelDisplay(EntryModelDisplay):
                 dp.Field(key="type", label=_("Type")),
                 dp.Field(key="tier", label=_("Tier")),
                 dp.Field(key="customer_status", label=_("Status")),
-                dp.Field(key="primary_manager_repr", label=_("Primary Relationship Manager")),
+                dp.Field(
+                    key=None,
+                    label=_("Primary Contacts"),
+                    children=[
+                        dp.Field(key="primary_manager_repr", label=_("Relationship Manager")),
+                        dp.Field(key="primary_telephone", label=_("Telephone")),
+                        dp.Field(key="primary_email", label=_("Email")),
+                        dp.Field(key="primary_address", label=_("Address"), show="open"),
+                        dp.Field(key="primary_website", label=_("Website"), show="open"),
+                        dp.Field(key="primary_social", label=_("Social"), show="open"),
+                    ],
+                ),
                 dp.Field(
                     key=None,
                     label=_("Last Event"),

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/directory/viewsets/entries.py

@@ -150,11 +150,10 @@ class PersonModelViewSet(ModelTranslateMixin, EntryModelViewSet):
         return super().get_serializer_class()
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
-        )
+        qs = super().get_queryset()
+        if "pk" in self.kwargs:
+            qs = qs.annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
+        return qs
 
 
 class CompanyModelViewSet(EntryModelViewSet):

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/documents/filters.py

@@ -13,7 +13,6 @@ from wbcore.contrib.documents.models import (
 class ShareableLinkFilter(wb_filters.FilterSet):
     valid = wb_filters.BooleanFilter(label=_("Valid"), method="boolean_is_valid")
     valid_until = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Valid Until",
     )
     link = wb_filters.CharFilter(label=_("Link"), method="filter_uuid")
@@ -36,7 +35,6 @@ class ShareableLinkFilter(wb_filters.FilterSet):
 class ShareableLinkAccessFilter(wb_filters.FilterSet):
     clearable = (False,)
     accessed = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Accessed between date",
     )
 

{wbcore-1.55.10rc0 → wbcore-1.58.1}/wbcore/contrib/io/imports.py

@@ -46,7 +46,7 @@ class ImportExportHandler:
             else:
                 return provider_id, content_type
 
-    def _model_dict_diff(self, model: Any, data: Dict[str, Any]) -> Dict[str, Any]:
+    def _model_dict_diff(self, model: Any, data: Dict[str, Any]) -> Dict[str, Any]:  # noqa: C901
         """
         Given a model and its dictionary representation, compare them and find out the fields that are different
         Args: