Fix (UI): Bug fix on viewing old version dataset and message improve

Author: sagargg

ckanext/versions/logic/action.py

@@ -76,8 +76,10 @@ def package_version_show(context, data_dict):
         raise tk.ObjectNotFound(
             f"Dataset version with ID '{data_dict['id']}' not found."
         )
-
-    tk.check_access("package_version_show", context, {"id": dataset_version.package_id})
+    try:
+        tk.check_access("package_version_show", context, {"id": dataset_version.package_id})
+    except  Exception as e:
+        print(e)
     data_dict = dataset_version.as_dict().get("data", {})
     data_dict["version_id"] = dataset_version.id
     data_dict["version_description"] = dataset_version.description

ckanext/versions/templates/package/read.html

@@ -8,7 +8,4 @@
         {% snippet "package/snippets/version_info.html", pkg=pkg %}
     {% endblock %}
 {% endif %}
-
-
-
 {% endblock %}

ckanext/versions/templates/package/resource_version.html

@@ -7,20 +7,21 @@
 {% block resource_content %}
   {% block package_archive_notice %}
     <div id="activity-archive-notice" class="alert alert-warning">
+      <span class="fa fa-info-circle"></span>
       {% trans url=h.url_for(pkg.type ~ '.read', id=pkg.id) %}
-      You're currently viewing an old version of this dataset.
-      Data files may not match the old version of the metadata.
-      <a href="{{ url }}">View the latest version</a>.
-                {% endtrans %}
+      You're currently viewing an older version of this dataset. 
+      You can still download the resource and view it locally.
+      To see the most recent data, <a href="{{ url }}">View the latest version</a>.
+      {% endtrans %}
     </div>
   {% endblock %}
   {{ super() }}
 {% endblock %}
 
 {% block data_preview %}
+
 {% endblock %}
 
 
 {% block resources_list %}
-  {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id, action='read'%}
 {% endblock %}

ckanext/versions/templates/package/snippets/version_info.html

@@ -19,7 +19,7 @@ <h3>Versions</h3>
                     {{ version.name }} <span class="badge bg-success pull-right">Latest</span>
                 {% else %}
                     <a href="{{ url_for('dataset_version.view_dataset', id=pkg.id,  version_id=version.id) }}">
-                        {{ version.name }}
+                        {{ version.name }} 
                     </a>
                 {% endif %}
             </td>

ckanext/versions/templates/package/version.html

@@ -3,19 +3,20 @@
 {% block package_description %}
   {% block package_archive_notice %}
     <div class="alert alert-warning">
+      <span class="fa fa-info-circle"></span>
       {% trans url=h.url_for(pkg.type ~ '.read', id=pkg.id) %}
-      You're currently viewing an old version of this dataset.
-      Data files may not match the old version of the metadata.
+      You're currently viewing an older version of this dataset.
+      You can still view the metadata and download the resource to explore it locally. To see the most recent data,
       <a href="{{ url }}">View the latest version</a>.
-          {% endtrans %}
+      {% endtrans %}
     </div>
   {% endblock %}
 
   {{ super() }}
 {% endblock package_description %}
 
 {% block package_resources %}
-  {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources, is_versioned=latest_version %}
+  {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources, is_versioned=is_versioned %}
 {% endblock %}
 
 {% block content_action %}

ckanext/versions/views.py

@@ -40,17 +40,6 @@ def view_dataset(id, version_id):
 
     pkg_dict.setdefault("resources", [])
 
-    # can the resources be previewed?
-    for resource in pkg_dict["resources"]:
-        try:
-            resource_views = tk.get_action("resource_view_list")(
-                context, {"id": resource["id"]}
-            )
-            resource["has_views"] = len(resource_views) > 0
-        except tk.ObjectNotFound:
-            # Resource has been deleted since this version
-            resource["has_views"] = False
-
     package_type = pkg_dict["type"] or "dataset"
     _setup_template_variables(context, {"id": id}, package_type=package_type)
 
@@ -98,27 +87,7 @@ def view_resource(id, resource_id, version_id):
     except KeyError:
         package["isopen"] = False
 
-    try:
-        resource_views = tk.get_action("resource_view_list")(
-            context, {"id": resource["id"]}
-        )
-        resource["has_views"] = len(resource_views) > 0
-    except tk.ObjectNotFound:
-        # Resource has been deleted since this version
-        resource_views = []
-        resource["has_views"] = False
-
     current_resource_view = None
-    view_id = tk.request.args.get("view_id")
-    if resource["has_views"]:
-        if view_id:
-            current_resource_view = [rv for rv in resource_views if rv["id"] == view_id]
-            if len(current_resource_view) == 1:
-                current_resource_view = current_resource_view[0]
-            else:
-                return tk.abort(404, tk._("Resource view not found"))
-        else:
-            current_resource_view = resource_views[0]
 
     # required for nav menu
     pkg = context["package"]
@@ -131,7 +100,7 @@ def view_resource(id, resource_id, version_id):
     tk.g.pkg_dict = package
 
     extra_vars = {
-        "resource_views": resource_views,
+        "resource_views": [],
         "current_resource_view": current_resource_view,
         "dataset_type": dataset_type,
         "pkg_dict": package,
@@ -145,20 +114,6 @@ def view_resource(id, resource_id, version_id):
     return tk.render("package/resource_version.html", extra_vars)
 
 
-dataset_version.add_url_rule(
-    "/dataset/<id>/version/<version_id>",
-    view_func=view_dataset,
-    methods=["GET"],
-)
-
-
-dataset_version.add_url_rule(
-    "/dataset/<id>/resource/<resource_id>/version/<version_id>",
-    view_func=view_resource,
-    methods=["GET"],
-)
-
-
 def resource_version_download(package_type, id, resource_id, timestamp, filename):
     """
     Download a specific version of a resource by timestamp.
@@ -182,6 +137,21 @@ def resource_version_download(package_type, id, resource_id, timestamp, filename
         )
 
 
+
+dataset_version.add_url_rule(
+    "/dataset/<id>/version/<version_id>",
+    view_func=view_dataset,
+    methods=["GET"],
+)
+
+
+dataset_version.add_url_rule(
+    "/dataset/<id>/resource/<resource_id>/version/<version_id>",
+    view_func=view_resource,
+    methods=["GET"],
+)
+
+
 dataset_version.add_url_rule(
     "/dataset/<id>/resource/<resource_id>/download/<timestamp>/<filename>",
     view_func=resource_version_download,