Merge pull request #258 from dpc-sdp/uat

UAT to master

Author: joelwigley

ckanext/datavic_odp_theme/config.py

@@ -21,6 +21,7 @@
     "csv-geo-au",
     "aus-geo-csv",
 ]
+CONFIG_DTV_MAX_SIZE_LIMIT = "ckanext.datavicmain.dtv.max_size_limit"
 CONFIG_DTV_URL = "ckanext.datavic_odp_theme.dtv.url"
 CONFIG_DTV_EXTERNAL_LINK = "ckanext.datavic_odp_theme.dtv.external_link"
 
@@ -49,6 +50,10 @@ def get_dtv_supported_formats() -> set[str]:
     }
 
 
+def get_dtv_max_size_limit() -> str:
+    return tk.config.get(CONFIG_DTV_MAX_SIZE_LIMIT, "157286400")
+
+
 def get_dtv_url() -> str:
     return tk.config.get(CONFIG_DTV_URL, "")
 

ckanext/datavic_odp_theme/grunt/sass/_dataset.scss

@@ -0,0 +1,15 @@
+// Dataset Additional info styles
+.additional-info {
+    .dataset-details {
+        ul {
+            margin-bottom: 0;
+
+            li {
+                &:only-child {
+                    list-style-type: none;
+                    margin-left: -31px;
+                }
+            }
+        }
+    }
+}

ckanext/datavic_odp_theme/grunt/sass/_form.scss

@@ -123,6 +123,11 @@ select.form-control {
     appearance: auto;
 }
 
+.dataset-form {
+    .form-label[for="field-update_frequency"] {
+        margin-bottom: 0;
+    }
+}
 
 // hide URL button for upload widget
 .organization-edit {

ckanext/datavic_odp_theme/grunt/sass/_resources.scss

@@ -123,9 +123,17 @@ $primary-color: #0052C2;
 }
 
 .dataset-api {
+    ul {
+        padding-right: 50px;
+        display: inline-flex;
+
+        i {
+            margin-right: 3px;
+        }
+    }
+
     li {
         display: inline;
-        padding-right: 50px;
         &:last-child {
             padding-right: 0;
         }

ckanext/datavic_odp_theme/grunt/sass/styles.scss

@@ -56,3 +56,4 @@
 @import 'search_form';
 @import 'activity';
 @import 'datatables';
+@import 'dataset';

ckanext/datavic_odp_theme/helpers.py

@@ -206,6 +206,29 @@ def is_resource_downloadable(resource: dict[str, Any]) -> bool:
     return False
 
 
+@helper
+def dtv_exceeds_max_size_limit(resource_id: str) -> bool:
+    """Check if DTV resource exceeds the maximum file size limit
+    Args:
+        resource_id (str): DTV resource id
+    Returns:
+        bool: return True if dtv resource exceeds maximum file size limit set
+            in ckan config "ckanext.datavicmain.dtv.max_size_limit",
+            otherwise - False
+    """
+    try:
+        resource = toolkit.get_action("resource_show")({}, {"id": resource_id})
+    except (toolkit.ObjectNotFound, toolkit.NotAuthorized):
+        return True
+
+    limit = conf.get_dtv_max_size_limit()
+    filesize = resource.get("filesize")
+    if filesize and int(filesize) >= int(limit):
+        return True
+
+    return False
+
+
 @helper
 def datastore_loaded_resources(pkg_dict: dict[str, Any]) -> list[str]:
     """Return a list of the dataset resources that are loaded to the datastore"""
@@ -256,11 +279,12 @@ def datavic_update_org_error_dict(
         error_dict["Logo"] = [(
             "Image format is not supported. "
             "Select an image in one of the following formats: "
-            "JPG, JPEG, GIF, PNG, BMP, SVG."
+            "JPG, JPEG, GIF, PNG, WEBP."
         )]
 
     return error_dict
 
+
 @helper
 def resource_attributes(attrs):
     try:

ckanext/datavic_odp_theme/logic/__init__.py

@@ -19,6 +19,8 @@ def actions():
         "resource_update": action.resource_update,
         "resource_create": action.resource_create,
         "datavic_list_incomplete_resources": action.datavic_list_incomplete_resources,
+        "datavic_datatables_view_prioritize": action.datavic_datatables_view_prioritize,
+        "resource_view_create": action.resource_view_create,
     }
 
 

ckanext/datavic_odp_theme/logic/action.py

@@ -9,6 +9,9 @@
 from ckan import model
 from ckan.types import Action, Context, DataDict
 from ckan.types.logic import ActionResult
+from ckan.logic import validate
+from ckan.model import ResourceView
+from ckanext.datavic_odp_theme.logic import scheme
 
 from ckanext.datavic_odp_theme import jobs
 
@@ -198,3 +201,57 @@ def datavic_list_incomplete_resources(context, data_dict):
         "num_packages": num_packages,
         "results": results,
     }
+
+
+@validate(scheme.datatables_view_prioritize)
+def datavic_datatables_view_prioritize(
+        context: Context, data_dict: DataDict
+) -> ActionResult:
+    """Check if the datatables view is prioritized over the recline view.
+    If not, swap their order.
+    """
+    tk.check_access("vic_datatables_view_prioritize", context, data_dict)
+
+    resource_id = data_dict["resource_id"]
+    res_views = sorted(
+        model.Session.query(ResourceView)
+        .filter(ResourceView.resource_id == resource_id)
+        .all(),
+        key=lambda x: x.order,
+    )
+    datatables_views = _filter_views(res_views, "datatables_view")
+    recline_views = _filter_views(res_views, "recline_view")
+
+    if not (
+        datatables_views
+        and recline_views
+        and datatables_views[0].order > recline_views[0].order
+    ):
+        return {"updated": False}
+
+    datatables_views[0].order, recline_views[0].order = (
+        recline_views[0].order,
+        datatables_views[0].order,
+    )
+    order = [view.id for view in sorted(res_views, key=lambda x: x.order)]
+    tk.get_action("resource_view_reorder")(
+        {"ignore_auth": True}, {"id": resource_id, "order": order}
+    )
+    return {"updated": True}
+
+
+@tk.chained_action
+def resource_view_create(next_, context, data_dict):
+    result = next_(context, data_dict)
+    if data_dict["view_type"] == "datatables_view":
+        tk.get_action("datavic_datatables_view_prioritize")(
+            {"ignore_auth": True}, {"resource_id": data_dict["resource_id"]}
+        )
+    return result
+
+
+def _filter_views(
+    res_views: list[ResourceView], view_type: str
+) -> list[ResourceView]:
+    """Return a list of views with the given view type."""
+    return [view for view in res_views if view.view_type == view_type]

ckanext/datavic_odp_theme/logic/auth/get.py

@@ -37,7 +37,7 @@ def vic_activity_list(context, data_dict):
     # DataVIC modification
     if (
         data_dict["object_type"] in ["package", "organization"]
-        and not authz.auth_is_loggedin_user()
+        and authz.auth_is_anon_user(context)
     ):
         return {"success": False}
 
@@ -47,13 +47,18 @@ def vic_activity_list(context, data_dict):
 
 
 @tk.chained_auth_function
-def vic_package_activity_list(context, data_dict):
+def vic_package_activity_list(next_auth, context, data_dict):
     data_dict["object_type"] = "package"
     return vic_activity_list(context, data_dict)
 
+
 @tk.chained_auth_function
 def vic_organization_activity_list(
-    context: dict[str, Any], group_dict: dict[str, str]
+    next_auth, context: dict[str, Any], group_dict: dict[str, str]
 ) -> dict[bool, bool]:
     group_dict["object_type"] = "organization"
     return vic_activity_list(context, group_dict)
+
+
+def vic_datatables_view_prioritize(context, data_dict):
+    return {"success": False}

ckanext/datavic_odp_theme/logic/scheme.py

@@ -0,0 +1,10 @@
+from ckan.logic.schema import validator_args
+
+
+@validator_args
+def datatables_view_prioritize(not_empty):
+    return {
+        "resource_id": [
+            not_empty,
+        ],
+    }