UAT Release

Pipfile

@@ -52,18 +52,18 @@ markdown = "~=3.4.1"
 mohawk = ">=1.1.0"
 munch = "~=2.5.0"
 requests = {extras = ["security"], version = "~=2.21"}
-sentry-sdk = "~=1.17.0"
+sentry-sdk = "~=2.8.0"
 whitenoise = "~=5.3.0"
 crispy-forms-gds = "~=0.2.4"
 notifications-python-client = "~=6.4.1"
 python-magic = "~=0.4.27"
-Authlib = "==0.15.5"
+Authlib = "==1.3.1"
 regex = "==2022.3.2"
 deepmerge = "*"
 phonenumbers = "~=8.12.57"
 setuptools = "~=70.0.0"
 rules="~=3.3.0"
-djangorestframework = "~=3.14.0"
+djangorestframework = "~=3.15.2"
 django-chunk-upload-handlers = "~=0.0.13"
 django-compressor = "~=2.4.1"
 django-csp = "~=3.7"
@@ -82,6 +82,7 @@ django-extra-views = "~=0.14.0"
 django = "~=4.2.15"
 django-log-formatter-asim = "~=0.0.5"
 dbt-copilot-python = "~=0.2.1"
+cryptography = "~=43.0.1"
 
 [requires]
 python_version = "3.9"

caseworker/bookmarks/views.py

@@ -24,7 +24,7 @@ class AddBookmark(LoginRequiredMixin, CaseDataMixin, FormView):
 
     @cached_property
     def all_cles(self):
-        return get_control_list_entries(self.request, include_parent=True)
+        return get_control_list_entries(self.request, include_non_selectable_for_assessment=True)
 
     @cached_property
     def all_regimes(self):

caseworker/core/context_processors.py

@@ -9,7 +9,7 @@
     get_new_mention_count,
     get_user_role_name,
 )
-from lite_content.lite_internal_frontend import strings, open_general_licences
+from lite_content.lite_internal_frontend import strings
 from lite_content.lite_internal_frontend.flags import FlagsList
 from lite_content.lite_internal_frontend.organisations import OrganisationsPage
 from lite_content.lite_internal_frontend.queues import QueuesList
@@ -76,14 +76,6 @@ def lite_menu(request):
             {"title": QueuesList.TITLE, "url": reverse_lazy("queues:manage"), "icon": "menu/queues"},
             {"title": UsersPage.TITLE, "url": reverse_lazy("users:users"), "icon": "menu/users"},
             {"title": FlagsList.TITLE, "url": reverse_lazy("flags:flags"), "icon": "menu/flags"},
-            conditional(
-                Permission.MAINTAIN_OGL.value in permissions,
-                {
-                    "title": open_general_licences.List.TITLE,
-                    "url": reverse_lazy("open_general_licences:open_general_licences"),
-                    "icon": "menu/open-general-licences",
-                },
-            ),
             conditional(
                 Permission.CONFIGURE_TEMPLATES.value in permissions,
                 {
@@ -92,10 +84,6 @@ def lite_menu(request):
                     "icon": "menu/letter-templates",
                 },
             ),
-            conditional(
-                Permission.MANAGE_FLAGGING_RULES.value in permissions,
-                {"title": "Flagging rules", "url": reverse_lazy("flags:flagging_rules"), "icon": "menu/flags"},
-            ),
             conditional(
                 Permission.MANAGE_TEAM_ROUTING_RULES.value in permissions
                 or Permission.MANAGE_ALL_ROUTING_RULES.value in permissions,

caseworker/core/services.py

@@ -131,40 +131,14 @@ def get_user_role_name(request):
     return user["user"]["role"]["name"]
 
 
-CLC_ENTRIES_CACHE = []
-
-
-# Control List Entries
-def get_control_list_entries(  # noqa
-    request, convert_to_options=False, include_parent=False, clc_entries_cache=CLC_ENTRIES_CACHE  # noqa
-):  # noqa
-    """
-    Preliminary caching mechanism, requires service restart to repopulate control list entries
-    """
-    if convert_to_options:
-        if clc_entries_cache:
-            return clc_entries_cache
-        else:
-            data = client.get(request, "/static/control-list-entries/")
-
-        for control_list_entry in data.json().get("control_list_entries"):
-            clc_entries_cache.append(
-                Option(
-                    key=control_list_entry["rating"],
-                    value=control_list_entry["rating"],
-                    description=control_list_entry["text"],
-                )
-            )
-
-        return clc_entries_cache
-
-    if include_parent:
-        response = client.get(request, "/static/control-list-entries/?include_parent=True")
-    else:
-        response = client.get(request, "/static/control-list-entries/?group=True")
+def get_control_list_entries(request, include_non_selectable_for_assessment=False):
+    url = "/caseworker/static/control-list-entries/"
+    if include_non_selectable_for_assessment:
+        url = f"{url}?include_non_selectable_for_assessment=True"
 
+    response = client.get(request, url)
     response.raise_for_status()
-    return response.json().get("control_list_entries")
+    return response.json()
 
 
 # Regime Entries