great-components 2.7.3__py3-none-any.whl → 2.8.0__py3-none-any.whl

great_components/forms/fields.py

@@ -87,7 +87,17 @@ class DirectoryComponentsFieldMixin:
 
     @property
     def widget_css_classes(self):
-        return self.widget.attrs['class']
+        try:
+            return self.widget.attrs['class']
+        except (KeyError, AttributeError):
+            return ''
+
+    @property
+    def label_css_classes(self):
+        try:
+            return self.widget.attrs['label-class']
+        except (KeyError, AttributeError):
+            return ''
 
     def get_bound_field(self, form, field_name):
         return DirectoryComponentsBoundField(form, self, field_name)

great_components/mixins.py

@@ -31,7 +31,7 @@ class EnableTranslationsMixin:
 
         context['language_switcher'] = {
             'show': True,
-            'form': self.language_form_class(**language_form_kwargs)
+            'form': self.language_form_class(**language_form_kwargs),
         }
         return context
 
@@ -51,12 +51,11 @@ class CMSLanguageSwitcherMixin:
     def get_context_data(self, *args, **kwargs):
         form = forms.LanguageForm(
             initial={'lang': translation.get_language()},
-            language_choices=self.page['meta']['languages']
-        )
-        show_language_switcher = (
-            len(self.page['meta']['languages']) > 1 and
-            form.is_language_available(translation.get_language())
+            language_choices=self.page['meta']['languages'],
         )
+        show_language_switcher = len(
+            self.page['meta']['languages']
+        ) > 1 and form.is_language_available(translation.get_language())
         return super().get_context_data(
             language_switcher={'form': form, 'show': show_language_switcher},
             *args,
@@ -69,7 +68,14 @@ class GA360Mixin:
         self.ga360_payload = {}
         super().__init__(*args, **kwargs)
 
-    def set_ga360_payload(self, page_id, business_unit, site_section, site_subsection=None, referer_url=None):
+    def set_ga360_payload(
+        self,
+        page_id,
+        business_unit,
+        site_section,
+        site_subsection=None,
+        referer_url=None,
+    ):
         self.ga360_payload['page_id'] = page_id
         self.ga360_payload['business_unit'] = business_unit
         self.ga360_payload['site_section'] = site_section
@@ -88,16 +94,20 @@ class GA360Mixin:
             },
             json={
                 'client_id': str(uuid.uuid4()),
-                'events': [{
-                    'name': 'page_view',
-                    'params': {
-                        'page_id': self.ga360_payload.get('page_id'),
-                        'business_unit': self.ga360_payload.get('business_unit'),
-                        'site_section': self.ga360_payload.get('site_section'),
-                        'site_subsection': self.ga360_payload.get('site_subsection'),
-                        'site_language': self.ga360_payload.get('site_language'),
+                'events': [
+                    {
+                        'name': 'page_view',
+                        'params': {
+                            'page_id': self.ga360_payload.get('page_id'),
+                            'business_unit': self.ga360_payload.get('business_unit'),
+                            'site_section': self.ga360_payload.get('site_section'),
+                            'site_subsection': self.ga360_payload.get(
+                                'site_subsection'
+                            ),
+                            'site_language': self.ga360_payload.get('site_language'),
+                        },
                     }
-                }],
+                ],
             },
         )
         logger.info('Request status code %s', req.status_code)
@@ -106,7 +116,9 @@ class GA360Mixin:
         user = helpers.get_user(self.request)
         is_logged_in = helpers.get_is_authenticated(self.request)
         self.ga360_payload['login_status'] = is_logged_in
-        self.ga360_payload['user_id'] = user.hashed_uuid if (is_logged_in and not user.is_superuser) else None
+        self.ga360_payload['user_id'] = (
+            user.hashed_uuid if (is_logged_in and not user.is_superuser) else ''
+        )  # requested in GREATUK-2568
         self.ga360_payload['site_language'] = translation.get_language()
         self.__send_to_ga4()
         return super().get_context_data(ga360=self.ga360_payload, *args, **kwargs)

{great_components-2.7.3.dist-info → great_components-2.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: great-components
-Version: 2.7.3
+Version: 2.8.0
 Summary: Shared components library for Great services.
 Home-page: https://github.com/uktrade/great-components
 Author: DIT

{great_components-2.7.3.dist-info → great_components-2.8.0.dist-info}/RECORD

@@ -7,10 +7,10 @@ great_components/context_processors.py,sha256=YkJPBLrrYnDYUHCpQP1shHommdj5NhgL-a
 great_components/decorators.py,sha256=dgT0IxSN0uTlCSzsAdGU9NsR9hqouk0YPkNNzefRKtE,311
 great_components/helpers.py,sha256=kOQqv4v2DSY5iKyseWnrMLawoa381GPRMgC7oHN3uCM,6908
 great_components/middleware.py,sha256=9dVTTbMlTBnwcmDB3CDi6DGQrxiecOwY-Dg7lEOC_OQ,7361
-great_components/mixins.py,sha256=efahQ0hbHeNcS2JwhltAFcLbUYNAZfG8JALzPZyEl8U,4226
+great_components/mixins.py,sha256=-8oh-xcCBEUMv1QPJSEYyaR56wp32JBkuiKHx5bmwJM,4457
 great_components/views.py,sha256=N2F6kvJUMmW9OQCIPcH16KMLlNhD_nrOTz_m0bnExZo,544
 great_components/forms/__init__.py,sha256=hKKA3w8GBglzmszrK3-z3n8DSRBKcBe9_TLrC52YbLI,153
-great_components/forms/fields.py,sha256=mr7AmIwLzNyTbt7iEiwIdseEAtNl6THXS3D56g9Q30g,6135
+great_components/forms/fields.py,sha256=QZjU3ierwb05CDESUMKCEly5w6wJpLHCa4B--hcmQ7Q,6395
 great_components/forms/forms.py,sha256=vWfSuI4li0Wnw1KBmc2JEEMuQE7qZb9PXr0fJTK985w,1462
 great_components/forms/widgets.py,sha256=U0oDJ3O6YvMK7d_PDXKNuYNxKHH2ehWF91yvL2P-yjs,4339
 great_components/janitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -634,8 +634,8 @@ great_components/templates/great_components/header_footer/search.html,sha256=SVU
 great_components/templates/great_components/header_footer/sso_login.html,sha256=IasiMYwuaTDbwpwYa2gLJcEQRIqZcZHGCpeh7Awvw9M,463
 great_components/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 great_components/templatetags/great_components.py,sha256=O_zVpOvZMHwhCpyq4JmmYu_iGwvaFsIP6lDn_ihtOVs,12173
-great_components-2.7.3.dist-info/LICENSE,sha256=q4QjlbTN37umB_xq3DRmS0qvT2tMO_5_-u0WWzYcDQE,1091
-great_components-2.7.3.dist-info/METADATA,sha256=4iJfSUioizef4-f3nc4ytPj9w_ibFbbG6mdFhSUCgqY,10545
-great_components-2.7.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-great_components-2.7.3.dist-info/top_level.txt,sha256=aI2xcjZzpL8o3QuUGQB5YkqHOknVkFwQOSZQiaNqRHU,22
-great_components-2.7.3.dist-info/RECORD,,
+great_components-2.8.0.dist-info/LICENSE,sha256=q4QjlbTN37umB_xq3DRmS0qvT2tMO_5_-u0WWzYcDQE,1091
+great_components-2.8.0.dist-info/METADATA,sha256=Jdj-nvqWCp8GGDsGDna54i7sAnAY7tza8Q-U2DFC2QU,10545
+great_components-2.8.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+great_components-2.8.0.dist-info/top_level.txt,sha256=aI2xcjZzpL8o3QuUGQB5YkqHOknVkFwQOSZQiaNqRHU,22
+great_components-2.8.0.dist-info/RECORD,,