fix: correct reference table event logging

dataworkspace/dataworkspace/apps/core/templatetags/core_tags.py

@@ -3,6 +3,7 @@
 
 from django import template
 from django.utils.html import format_html
+from django.urls import reverse
 
 register = template.Library()
 
@@ -67,3 +68,8 @@ def spawner_cpu(value):
 def browser_is_internet_explorer(context, **kwargs):
     user_agent = context["request"].META.get("HTTP_USER_AGENT", "")
     return re.search(r"MSIE|Trident/7\.0; rv:\d+", user_agent) is not None
+
+
+@register.simple_tag
+def send_post_data_url(dataset_uuid, data_type):
+    return reverse("datasets:reference_dataset_download", args=(dataset_uuid, data_type))

dataworkspace/dataworkspace/apps/datasets/models.py

@@ -18,7 +18,7 @@
 from botocore.exceptions import ClientError
 from ckeditor.fields import RichTextField
 
-from django import forms
+from django import forms, template
 from django.apps import apps
 from django.db import (
     DatabaseError,
@@ -76,6 +76,7 @@
     get_earliest_tables_last_updated_date,
 )
 
+register = template.Library()
 
 class DataGroupingManager(DeletableQuerySet):
     def with_published_datasets(self):
@@ -1335,9 +1336,6 @@ def manage_published(self, create):
             self.major_version = self.published_major_version
             self.minor_version = self.published_minor_version
 
-    def send_post_data_url(self):
-        return reverse("datasets:reference_dataset_download", args=(self.uuid, "csv"))
-
     @transaction.atomic
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
         create = self.pk is None

dataworkspace/dataworkspace/apps/datasets/urls.py

@@ -56,8 +56,8 @@
         name="reference_dataset_grid",
     ),
     path(
-        "<uuid:dataset_uuid>/reference/<str:format>/download",
-        login_required(views.ReferenceDatasetDownloadView.as_view()),
+        "<uuid:dataset_uuid>/reference/<str:data_type>/download",
+        login_required(views.reference_dataset_download),
         name="reference_dataset_download",
     ),
     path(

dataworkspace/dataworkspace/apps/datasets/views.py

@@ -670,20 +670,19 @@ def unset_bookmark(request, dataset_uuid):
     return HttpResponse(status=200)
 
 
-class ReferenceDatasetDownloadView(DetailView):
-    def post(self, request, *args, **kwargs):
-        dataset = find_dataset(self.kwargs.get("dataset_uuid"), request.user, ReferenceDataset)
-        log_event(
-            request.user,
-            EventLog.TYPE_REFERENCE_DATASET_DOWNLOAD,
-            dataset,
-            extra={
-                "path": request.get_full_path(),
-                "reference_dataset_version": dataset.published_version,
-                "format": self.kwargs.get("format"),
-            },
-        )
-        return HttpResponse(status=200)
+def reference_dataset_download(request, dataset_uuid, data_type):
+    dataset = find_dataset(dataset_uuid, request.user, ReferenceDataset)
+    log_event(
+        request.user,
+        EventLog.TYPE_REFERENCE_DATASET_DOWNLOAD,
+        dataset,
+        extra={
+            "path": request.get_full_path(),
+            "reference_dataset_version": dataset.published_version,
+            "format": data_type,
+        },
+    )
+    return HttpResponse(status=200)
 
 
 class SourceLinkDownloadView(DetailView):
@@ -964,7 +963,7 @@ def get(self, request, dataset_uuid):
         dataset = find_dataset(dataset_uuid, request.user, ReferenceDataset)
         log_event(
             request.user,
-            EventLog.TYPE_REFERENCE_DATASET_VIEW,
+            EventLog.TYPE_DATA_TABLE_VIEW,
             dataset,
             extra={
                 "path": request.get_full_path(),

dataworkspace/dataworkspace/static/data-grid.js

@@ -326,6 +326,13 @@ function initDataGrid(
         linkElement.setAttribute("href", dataUri);
         linkElement.setAttribute("download", exportFileDefaultName);
         linkElement.click();
+        if (referenceDataEndpoint) {
+          var xhr = new XMLHttpRequest();
+          xhr.open("POST", referenceDataEndpoint, true);
+          xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+          xhr.setRequestHeader("X-CSRFToken", getCsrfToken());
+          xhr.send();
+        }
         logDownloadEvent(
           gridOptions,
           itemId,
@@ -342,14 +349,6 @@ function initDataGrid(
     }
   }
 
-  if (referenceDataEndpoint) {
-    var xhr = new XMLHttpRequest();
-    xhr.open("POST", referenceDataEndpoint, true);
-    xhr.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-    xhr.setRequestHeader("X-CSRFToken", getCsrfToken());
-    xhr.send();
-  }
-
   var createChartButton = document.querySelector("#data-grid-create-chart");
   if (createChartButton !== null && createChartEndpoint) {
     createChartButton.addEventListener("click", function (e) {

dataworkspace/dataworkspace/templates/datasets/reference_dataset_grid.html

@@ -24,7 +24,7 @@
         JSON.parse(document.getElementById('grid_data').textContent),
         '{{ model.slug }}-{{ model.published_version }}-custom-export.csv',
         null,
-        '{{ model.send_post_data_url}}',
+        {% send_post_data_url model.id 'json123' %},
         '{{ model.id }}',
         '{{ model.name }}',
         '{{ model.get_type_display }}',