Merge remote-tracking branch 'origin/SXDEDPCXZIC-435' into release-2.10.1

Author: mutantsan

ckanext/datavic_odp_theme/helpers.py

@@ -10,7 +10,7 @@
 import ckan.plugins.toolkit as toolkit
 import ckan.model as model
 
-from ckanext.toolbelt.decorators import Collector
+from ckanext.toolbelt.decorators import Collector, Cache
 
 from ckanext.datavic_odp_theme import config as conf, const
 
@@ -20,38 +20,41 @@
 
 
 @helper
-def organization_list():
-    org_list = toolkit.get_action("organization_list")({}, {})
-    organizations = []
-    for org in org_list:
-        org_dict = toolkit.get_action("organization_show")({}, {"id": org})
-        organizations.append(org_dict)
-
-    return organizations
+@Cache()
+def group_list(is_organization: bool) -> list[dict[str, str]]:
+    """Returns a list of active groups or organizations.
 
+    Results are cached separately for groups and organizations.
+    Cache is invalidated on create, update, or delete actions
+    (see `clear_group_list_cache` in plugins.py).
+    """
+    groups = (
+        model.Session.query(model.Group.id, model.Group.title, model.Group.name)
+        .filter(model.Group.is_organization.is_(is_organization))
+        .filter(model.Group.state == "active")
+        .order_by(func.coalesce(model.Group.title, model.Group.name).asc())
+        .all()
+    )
 
-@helper
-def group_list():
-    return toolkit.get_action("group_list")({}, {"all_fields": True})
+    return [
+        {"id": g.id, "display_name": g.title or g.name, "name": g.name} for g in groups
+    ]
 
 
 @helper
 def format_list() -> list[str]:
-    """Return a list of all available resources on portal"""
+    """Return a sorted list of unique resource formats."""
+
+    # Clean format: lower-case and trimmed
+    cleaned_format = func.lower(func.trim(model.Resource.format))
 
     query = (
-        model.Session.query(model.Resource.format)
+        model.Session.query(func.distinct(cleaned_format))
         .filter(model.Resource.state == model.State.ACTIVE)
-        .group_by(model.Resource.format)
-        .order_by(func.lower(model.Resource.format))
+        .filter(model.Resource.format.isnot(None))
+        .filter(model.Resource.format != "")
     )
-
-    formats = [
-        resource.format.upper().split(".")[-1] for resource in query if resource.format
-    ]
-    unique_formats = set(formats)
-
-    return sorted(list(unique_formats))
+    return sorted({fmt.upper().split(".")[-1] for (fmt,) in query})
 
 
 @helper
@@ -136,19 +139,14 @@ def featured_resource_preview(package: dict[str, Any]) -> Optional[dict[str, Any
 
 
 @helper
-def get_digital_twin_resources(pkg_id: str) -> list[dict[str, Any]]:
+def get_digital_twin_resources(pkg: dict[str, Any]) -> list[dict[str, Any]]:
     """Select resource suitable for DTV(Digital Twin Visualization).
 
     Additional info:
     https://gist.github.com/steve9164/b9781b517c99486624c02fdc7af0f186
     """
     supported_formats: set[str] = conf.get_dtv_supported_formats()
 
-    try:
-        pkg = toolkit.get_action("package_show")({}, {"id": pkg_id})
-    except (toolkit.ObjectNotFound, toolkit.NotAuthorized):
-        return []
-
     # Additional info #2
     if pkg["state"] != "active":
         return []
@@ -307,9 +305,7 @@ def datavic_update_org_error_dict(
     to show it as an error on the Logo field."""
     if error_dict.pop("upload", "") == ["File upload too large"]:
         error_dict["Logo"] = [
-            (
-                f"File size is too large. Select an image which is no larger than {datavic_max_image_size()}MB."
-            )
+            f"File size is too large. Select an image which is no larger than {datavic_max_image_size()}MB."
         ]
     elif "Unsupported upload type" in error_dict.pop("image_upload", [""])[0]:
         error_dict["Logo"] = [

ckanext/datavic_odp_theme/plugin.py

@@ -6,14 +6,14 @@
 
 import ckan.plugins as p
 import ckan.plugins.toolkit as tk
-import ckan.model as model
+from ckan import model, types
 
 from ckanext.search_autocomplete.interfaces import ISearchAutocomplete
 from ckanext.xloader.plugin import xloaderPlugin
 
 from ckanext.datavic_odp_theme.logic import auth_functions, actions, get_validators
 from ckanext.datavic_odp_theme.views import get_blueprints
-from ckanext.datavic_odp_theme.helpers import get_helpers
+from ckanext.datavic_odp_theme.helpers import get_helpers, group_list
 
 
 class DatavicODPTheme(p.SingletonPlugin):
@@ -25,6 +25,7 @@ class DatavicODPTheme(p.SingletonPlugin):
     p.implements(p.IPackageController, inherit=True)
     p.implements(ISearchAutocomplete)
     p.implements(p.IAuthenticator, inherit=True)
+    p.implements(p.ISignal)
 
     # IConfigurer
 
@@ -33,6 +34,10 @@ def update_config(self, config_):
         tk.add_public_directory(config_, "public")
         tk.add_resource("webassets", "datavic_odp_theme")
 
+        # Reset group/organization cache on server restart
+        group_list.reset(is_organization=False)
+        group_list.reset(is_organization=True)
+
     # ITemplateHelpers
 
     def get_helpers(self):
@@ -112,6 +117,55 @@ def logout(self) -> Optional[Response]:
         session.modified = True
 
 
+    # ISignal
+
+    def get_signal_subscriptions(self) -> types.SignalMapping:
+        return {
+            tk.signals.action_succeeded: [
+                {
+                    "receiver": clear_group_list_cache,
+                    "sender": "group_create",
+                },
+                {
+                    "receiver": clear_group_list_cache,
+                    "sender": "group_update",
+                },
+                {
+                    "receiver": clear_group_list_cache,
+                    "sender": "group_delete",
+                },
+                {
+                    "receiver": clear_group_list_cache,
+                    "sender": "organization_create",
+                },
+                {
+                    "receiver": clear_group_list_cache,
+                    "sender": "organization_update",
+                },
+                {
+                    "receiver": clear_group_list_cache,
+                    "sender": "organization_delete",
+                },
+            ]
+        }
+
+
+def clear_group_list_cache(
+    action_name: str,
+    context: types.Context,
+    data_dict: dict[str, Any],
+    result: dict[str, Any],
+):
+    """Invalidates the cached group or organization list after
+    create, update, or delete actions."""
+
+    is_organization = (
+        action_name.startswith("organization")
+        or data_dict.get("type") == "organization"
+    )
+    group_list.reset(is_organization=is_organization)
+
+
 @tk.blanket.auth_functions(auth_functions)
 class DatavicODPThemeAuth(p.SingletonPlugin):
     """Register auth function inside separate extension.

ckanext/datavic_odp_theme/templates/package/snippets/datavic_dtv.html

@@ -1,4 +1,4 @@
-{% set dtv_resources = h.get_digital_twin_resources(pkg.id)|map(attribute="id")|list %}
+{% set dtv_resources = h.get_digital_twin_resources(pkg)|map(attribute="id")|list %}
 {% set dtv_preview = pkg.dtv_preview %}
 {% set dtv_exceeds_limit = h.dtv_exceeds_max_size_limit(dtv_resources[0]) %}
 {% set dtv_url = h.datavic_get_dtv_url() %}

ckanext/datavic_odp_theme/templates/snippets/dataset_search_form.html

@@ -63,7 +63,8 @@ <h1>
             {% endblock %}
           </div>
           {% if facets %}
-            {% set organization_list = h.organization_list() %}
+            {% set organization_list = h.group_list(is_organization=True) %}
+            {% set group_list = h.group_list(is_organization=False) %}
 
             <button class="rpl-search-form__show-filters rpl-search-form__show-filters--expanded" aria-expanded="true">
               <span>Advanced search</span>
@@ -138,7 +139,7 @@ <h1>
                               <div class="rpl-checklist__main-row">
                                 <button type="button" class="rpl-checklist__info" data-checklist="checklist-group">
                                   {% if group %}
-                                    {% for item in h.group_list() %}
+                                    {% for item in group_list %}
                                       {% if item.name == group %}
                                         <span>{{ item.display_name }}</span>
                                       {% endif %}
@@ -152,7 +153,7 @@ <h1>
                                   </svg>
                                 </button>
                               </div>
-                              {% with items = h.group_list() %}
+                              {% with items = group_list %}
                                 {% if items %}
                                   <div aria-hidden="true" class="rpl-checklist__list rpl-checklist__list--dropdown" style="display: none;">
                                     <div class="rpl-checklist__list-row rpl-checklist__list-row--single">

ckanext/datavic_odp_theme/templates/snippets/package_item.html

@@ -80,7 +80,7 @@ <h4 class="search-result-organisation">
         {% endif %}
         <ul class="list-unstyled dataset-api">
           <ul>
-              {% set dtv_resources = h.get_digital_twin_resources(package.id)|map(attribute="id")|list %}
+              {% set dtv_resources = h.get_digital_twin_resources(package)|map(attribute="id")|list %}
               {% set featured_resource = h.featured_resource_preview(package) %}
 
               {% if dtv_resources %}

ckanext/datavic_odp_theme/templates/user/snippets/login_form.html

@@ -16,10 +16,10 @@
     {{ h.csrf_input() }}
     {{ form.errors(errors=error_summary) }}
 
-    <div id="error-container" class="alert alert-error" style="display: none;">
+    <div id="mfa-error-container" class="alert alert-error" style="display: none;">
         <p>{{ _('The form contains invalid entries:') }}</p>
         <ul>
-            <li id="error-message"></li>
+            <li class="mfa-error-message"></li>
         </ul>
     </div>
 

ckanext/datavic_odp_theme/webassets/js/datavic-2fa-error-messages.js

@@ -0,0 +1,21 @@
+ckan.module('-datavic-odp-auth-login-form', function ($){
+    setTimeout(() => {
+        const authLoginFormModule = ckan.module.registry["auth-login-form"];
+        if (!authLoginFormModule) return;
+    
+        const modulePrototype = authLoginFormModule.prototype;
+        const originalShowError = modulePrototype._showError;
+
+        if (originalShowError) {
+            modulePrototype._showError = function(message) {
+                const errorMessages = {
+                    "Invalid reCAPTCHA": "CAPTCHA verification failed. Please try again.",
+                    "Invalid login or password": "Login failed. Incorrect username or password."
+                };
+
+                message = errorMessages[message] || message;
+                return originalShowError.call(this, message);
+            };
+        }
+    }, 100);
+})

ckanext/datavic_odp_theme/webassets/webassets.yml

@@ -12,6 +12,7 @@ datavic_odp_theme-js:
     - js/datavic-advanced-search.js
     - js/datavic-api-info.js
     - js/datavic-search-autocomplete.js
+    - js/datavic-2fa-error-messages.js
   extra:
     preload:
       - base/main