From 4baf587e9632436d06b92a4404104bedf6067dc4 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 8 Nov 2023 19:51:31 +0000
Subject: [PATCH 1/8] feat(views): added view and button to delete ds table;

- Added view to delete datastore table.
- Added button to delete a resource's datastore table.
---
 .../xloader/confirm_datastore_delete.html     | 22 +++++++++++
 .../templates/xloader/resource_data.html      | 12 +++++-
 ckanext/xloader/views.py                      | 37 +++++++++++++++++++
 requirements.txt                              |  1 +
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/xloader/templates/xloader/confirm_datastore_delete.html

diff --git a/ckanext/xloader/templates/xloader/confirm_datastore_delete.html b/ckanext/xloader/templates/xloader/confirm_datastore_delete.html
new file mode 100644
index 00000000..06af5ecc
--- /dev/null
+++ b/ckanext/xloader/templates/xloader/confirm_datastore_delete.html
@@ -0,0 +1,22 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _("Confirm Delete") }}{% endblock %}
+
+{% block maintag %}<div class="row" role="main">{% endblock %}
+
+{% block main_content %}
+  <section class="module col-md-6 col-md-offset-3">
+    <div class="module-content">
+      {% block form %}
+        <p>{{ _('Are you sure you want to delete this DataStore table and Data Dictionary?') }}</p>
+        <p class="form-actions">
+          <form action="{{ h.url_for('xloader.delete_datastore_table', id=package_id, resource_id=resource_id) }}" method="post">
+            {{ h.csrf_input() if 'csrf_input' in h }}
+            <button class="btn btn-danger" type="submit" name="cancel" >{{ _('Cancel') }}</button>
+            <button class="btn btn-primary" type="submit" name="delete" >{{ _('Confirm Delete') }}</button>
+          </form>
+        </p>
+      {% endblock %}
+    </div>
+  </section>
+{% endblock %}
diff --git a/ckanext/xloader/templates/xloader/resource_data.html b/ckanext/xloader/templates/xloader/resource_data.html
index a94ad631..1582fe41 100644
--- a/ckanext/xloader/templates/xloader/resource_data.html
+++ b/ckanext/xloader/templates/xloader/resource_data.html
@@ -7,8 +7,18 @@
   {% set action = h.url_for('xloader.resource_data', id=pkg.name, resource_id=res.id) %}
   {% set show_table = true %}
 
+  {% block delete_ds_button %}
+    <form class="mb-3 d-inline-block">
+      <a href="{{ h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) }}"
+        class="btn btn-danger pull-left"
+        data-module="confirm-action"
+        data-module-content="{{ _('Are you sure you want to delete this DataStore table and Data Dictionary?') }}"
+        >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete DataStore table') }}{% endblock %}</a>
+    </form>
+  {% endblock %}
+
   {% block upload_ds_button %}
-    <form method="post" action="{{ action }}" class="datapusher-form">
+    <form method="post" action="{{ action }}" class="datapusher-form mb-3 d-inline-block">
       {{ h.csrf_input() if 'csrf_input' in h }}
       <button class="btn btn-primary" name="save" type="submit">
         <i class="fa fa-cloud-upload"></i> {{ _('Upload to DataStore') }}
diff --git a/ckanext/xloader/views.py b/ckanext/xloader/views.py
index 198de320..7126844a 100644
--- a/ckanext/xloader/views.py
+++ b/ckanext/xloader/views.py
@@ -1,5 +1,8 @@
 from flask import Blueprint
 
+from ckanapi import LocalCKAN
+from ckan.plugins.toolkit import _, h, g, render, request, abort, NotAuthorized
+
 import ckanext.xloader.utils as utils
 
 
@@ -13,3 +16,37 @@ def get_blueprints():
 @xloader.route("/dataset/<id>/resource_data/<resource_id>", methods=("GET", "POST"))
 def resource_data(id, resource_id):
     return utils.resource_data(id, resource_id)
+
+
+@xloader.route("/dataset/<id>/delete-datastore-table/<resource_id>", methods=("GET", "POST"))
+def delete_datastore_table(id, resource_id):
+    if u'cancel' in request.form:
+        return h.redirect_to(u'xloader.resource_data', id=id, resource_id=resource_id)
+
+    if request.method == 'POST':
+        lc = LocalCKAN(username=g.user)
+
+        try:
+            lc.action.datastore_delete(
+                resource_id=resource_id,
+                force=True,
+            )
+        except NotAuthorized:
+            return abort(403, _(u'Unauthorized to delete resource %s') % resource_id)
+
+        h.flash_notice(_(u'DataStore table and Data Dictionary deleted for resource %s') % resource_id)
+
+        return h.redirect_to(
+            'xloader.resource_data',
+            id=id,
+            resource_id=resource_id
+        )
+    else:
+        g.resource_id = resource_id
+        g.package_id = id
+
+        extra_vars = {
+            u"resource_id": resource_id,
+            u"package_id": id
+        }
+        return render(u'xloader/confirm_datastore_delete.html', extra_vars)
diff --git a/requirements.txt b/requirements.txt
index 58540beb..8124a06f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ six>=1.12.0
 tabulator==1.53.5
 Unidecode==1.0.22
 python-dateutil>=2.8.2
+ckanapi

From c141716ff0f389812e3148b99b5bbdbc4bcd8431 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 8 Nov 2023 20:14:14 +0000
Subject: [PATCH 2/8] feat(templates): added missing csrf field;

- Added csrf field to delete button form.
---
 ckanext/xloader/templates/xloader/resource_data.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ckanext/xloader/templates/xloader/resource_data.html b/ckanext/xloader/templates/xloader/resource_data.html
index 1582fe41..0c1480f8 100644
--- a/ckanext/xloader/templates/xloader/resource_data.html
+++ b/ckanext/xloader/templates/xloader/resource_data.html
@@ -5,13 +5,17 @@
 {% block primary_content_inner %}
 
   {% set action = h.url_for('xloader.resource_data', id=pkg.name, resource_id=res.id) %}
+  {% set delete_action = h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) %}
   {% set show_table = true %}
 
   {% block delete_ds_button %}
-    <form class="mb-3 d-inline-block">
+    <form method="post" action="{{ delete_action }}" class="mb-3 d-inline-block">
+      {{ h.csrf_input() if 'csrf_input' in h }}
       <a href="{{ h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) }}"
         class="btn btn-danger pull-left"
+        type="submit"
         data-module="confirm-action"
+        data-module-with-data=true
         data-module-content="{{ _('Are you sure you want to delete this DataStore table and Data Dictionary?') }}"
         >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete DataStore table') }}{% endblock %}</a>
     </form>

From ae29b8fe33e8bfcd8d774a94fbe95a8b678203c7 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 9 Nov 2023 15:07:58 +0000
Subject: [PATCH 3/8] fix(semantics): removed the word table;

- Removed the word `table` from user visible things.
---
 .../xloader/templates/xloader/confirm_datastore_delete.html   | 2 +-
 ckanext/xloader/templates/xloader/resource_data.html          | 4 ++--
 ckanext/xloader/views.py                                      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckanext/xloader/templates/xloader/confirm_datastore_delete.html b/ckanext/xloader/templates/xloader/confirm_datastore_delete.html
index 06af5ecc..81fca258 100644
--- a/ckanext/xloader/templates/xloader/confirm_datastore_delete.html
+++ b/ckanext/xloader/templates/xloader/confirm_datastore_delete.html
@@ -8,7 +8,7 @@
   <section class="module col-md-6 col-md-offset-3">
     <div class="module-content">
       {% block form %}
-        <p>{{ _('Are you sure you want to delete this DataStore table and Data Dictionary?') }}</p>
+        <p>{{ _('Are you sure you want to delete the DataStore and Data Dictionary?') }}</p>
         <p class="form-actions">
           <form action="{{ h.url_for('xloader.delete_datastore_table', id=package_id, resource_id=resource_id) }}" method="post">
             {{ h.csrf_input() if 'csrf_input' in h }}
diff --git a/ckanext/xloader/templates/xloader/resource_data.html b/ckanext/xloader/templates/xloader/resource_data.html
index 0c1480f8..cca86f39 100644
--- a/ckanext/xloader/templates/xloader/resource_data.html
+++ b/ckanext/xloader/templates/xloader/resource_data.html
@@ -16,8 +16,8 @@
         type="submit"
         data-module="confirm-action"
         data-module-with-data=true
-        data-module-content="{{ _('Are you sure you want to delete this DataStore table and Data Dictionary?') }}"
-        >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete DataStore table') }}{% endblock %}</a>
+        data-module-content="{{ _('Are you sure you want to delete the DataStore and Data Dictionary?') }}"
+        >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete from DataStore') }}{% endblock %}</a>
     </form>
   {% endblock %}
 
diff --git a/ckanext/xloader/views.py b/ckanext/xloader/views.py
index 7126844a..32c8f6d2 100644
--- a/ckanext/xloader/views.py
+++ b/ckanext/xloader/views.py
@@ -18,7 +18,7 @@ def resource_data(id, resource_id):
     return utils.resource_data(id, resource_id)
 
 
-@xloader.route("/dataset/<id>/delete-datastore-table/<resource_id>", methods=("GET", "POST"))
+@xloader.route("/dataset/<id>/delete-datastore/<resource_id>", methods=("GET", "POST"))
 def delete_datastore_table(id, resource_id):
     if u'cancel' in request.form:
         return h.redirect_to(u'xloader.resource_data', id=id, resource_id=resource_id)
@@ -34,7 +34,7 @@ def delete_datastore_table(id, resource_id):
         except NotAuthorized:
             return abort(403, _(u'Unauthorized to delete resource %s') % resource_id)
 
-        h.flash_notice(_(u'DataStore table and Data Dictionary deleted for resource %s') % resource_id)
+        h.flash_notice(_(u'DataStore and Data Dictionary deleted for resource %s') % resource_id)
 
         return h.redirect_to(
             'xloader.resource_data',

From 46bc35a0568a9fdbc8bd40c65cbf287309db1ce8 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 9 Nov 2023 15:09:35 +0000
Subject: [PATCH 4/8] removal(views): replaces ckanapi with toolkit;

- Used `get_action` from toolkit instead of ckanapi dependency.
---
 ckanext/xloader/views.py | 11 +++++------
 requirements.txt         |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ckanext/xloader/views.py b/ckanext/xloader/views.py
index 32c8f6d2..805102fc 100644
--- a/ckanext/xloader/views.py
+++ b/ckanext/xloader/views.py
@@ -1,7 +1,7 @@
 from flask import Blueprint
 
 from ckanapi import LocalCKAN
-from ckan.plugins.toolkit import _, h, g, render, request, abort, NotAuthorized
+from ckan.plugins.toolkit import _, h, g, render, request, abort, NotAuthorized, get_action
 
 import ckanext.xloader.utils as utils
 
@@ -24,13 +24,12 @@ def delete_datastore_table(id, resource_id):
         return h.redirect_to(u'xloader.resource_data', id=id, resource_id=resource_id)
 
     if request.method == 'POST':
-        lc = LocalCKAN(username=g.user)
+        context = {"user": g.user}
 
         try:
-            lc.action.datastore_delete(
-                resource_id=resource_id,
-                force=True,
-            )
+            get_action('datastore_delete')(context, {
+                "resource_id": resource_id,
+                "force": True})
         except NotAuthorized:
             return abort(403, _(u'Unauthorized to delete resource %s') % resource_id)
 
diff --git a/requirements.txt b/requirements.txt
index 8124a06f..58540beb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,3 @@ six>=1.12.0
 tabulator==1.53.5
 Unidecode==1.0.22
 python-dateutil>=2.8.2
-ckanapi

From 2defc6a4a7133a2ec318c72cc99432b5f90059bd Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 16 Nov 2023 13:22:24 +0000
Subject: [PATCH 5/8] feat(views): check resource owner;

- Confirm that the resource id belongs to the package id.
---
 ckanext/xloader/views.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ckanext/xloader/views.py b/ckanext/xloader/views.py
index 805102fc..79ba1aa8 100644
--- a/ckanext/xloader/views.py
+++ b/ckanext/xloader/views.py
@@ -1,7 +1,6 @@
 from flask import Blueprint
 
-from ckanapi import LocalCKAN
-from ckan.plugins.toolkit import _, h, g, render, request, abort, NotAuthorized, get_action
+from ckan.plugins.toolkit import _, h, g, render, request, abort, NotAuthorized, get_action, ObjectNotFound
 
 import ckanext.xloader.utils as utils
 
@@ -23,6 +22,13 @@ def delete_datastore_table(id, resource_id):
     if u'cancel' in request.form:
         return h.redirect_to(u'xloader.resource_data', id=id, resource_id=resource_id)
 
+    try:
+        res_dict = get_action('resource_show')(context, {"id": resource_id})
+        if res_dict.get('package_id') != id:
+            raise ObjectNotFound
+    except ObjectNotFound:
+        return abort(404, _(u'Resource not found'))
+
     if request.method == 'POST':
         context = {"user": g.user}
 

From ce69207fe79575acf75f57f50cc23239dcc0cc08 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Thu, 16 Nov 2023 13:41:25 +0000
Subject: [PATCH 6/8] fix(views): syntax, and template;

- Condition delete button behind `datastore_active`.
- Fix context variable in view.
---
 .../templates/xloader/resource_data.html      | 22 ++++++++++---------
 ckanext/xloader/views.py                      |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ckanext/xloader/templates/xloader/resource_data.html b/ckanext/xloader/templates/xloader/resource_data.html
index cca86f39..6ea29166 100644
--- a/ckanext/xloader/templates/xloader/resource_data.html
+++ b/ckanext/xloader/templates/xloader/resource_data.html
@@ -9,16 +9,18 @@
   {% set show_table = true %}
 
   {% block delete_ds_button %}
-    <form method="post" action="{{ delete_action }}" class="mb-3 d-inline-block">
-      {{ h.csrf_input() if 'csrf_input' in h }}
-      <a href="{{ h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) }}"
-        class="btn btn-danger pull-left"
-        type="submit"
-        data-module="confirm-action"
-        data-module-with-data=true
-        data-module-content="{{ _('Are you sure you want to delete the DataStore and Data Dictionary?') }}"
-        >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete from DataStore') }}{% endblock %}</a>
-    </form>
+    {% if res.datastore_active %}
+      <form method="post" action="{{ delete_action }}" class="mb-3 d-inline-block">
+        {{ h.csrf_input() if 'csrf_input' in h }}
+        <a href="{{ h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) }}"
+          class="btn btn-danger pull-left"
+          type="submit"
+          data-module="confirm-action"
+          data-module-with-data=true
+          data-module-content="{{ _('Are you sure you want to delete the DataStore and Data Dictionary?') }}"
+          >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete from DataStore') }}{% endblock %}</a>
+      </form>
+    {% endif %}
   {% endblock %}
 
   {% block upload_ds_button %}
diff --git a/ckanext/xloader/views.py b/ckanext/xloader/views.py
index 79ba1aa8..0564144b 100644
--- a/ckanext/xloader/views.py
+++ b/ckanext/xloader/views.py
@@ -22,6 +22,8 @@ def delete_datastore_table(id, resource_id):
     if u'cancel' in request.form:
         return h.redirect_to(u'xloader.resource_data', id=id, resource_id=resource_id)
 
+    context = {"user": g.user}
+
     try:
         res_dict = get_action('resource_show')(context, {"id": resource_id})
         if res_dict.get('package_id') != id:
@@ -30,8 +32,6 @@ def delete_datastore_table(id, resource_id):
         return abort(404, _(u'Resource not found'))
 
     if request.method == 'POST':
-        context = {"user": g.user}
-
         try:
             get_action('datastore_delete')(context, {
                 "resource_id": resource_id,

From 1a1bd147fd46176f5f752cf7833fccb2e7553412 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Mon, 29 Jan 2024 20:04:38 +0000
Subject: [PATCH 7/8] fix(templates): fix layout of delete button;

- Fix layout of delete button with upload button.
- Changed delete button icon.
---
 .../templates/xloader/resource_data.html      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ckanext/xloader/templates/xloader/resource_data.html b/ckanext/xloader/templates/xloader/resource_data.html
index e5349aae..e55f6421 100644
--- a/ckanext/xloader/templates/xloader/resource_data.html
+++ b/ckanext/xloader/templates/xloader/resource_data.html
@@ -8,30 +8,32 @@
   {% set delete_action = h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) %}
   {% set show_table = true %}
 
+  {% block upload_ds_button %}
+    <form method="post" action="{{ action }}" class="datapusher-form mb-3 mr-3 d-inline-block">
+      {{ h.csrf_input() if 'csrf_input' in h }}
+      <button class="btn btn-primary" name="save" type="submit">
+        <i class="fa fa-cloud-upload"></i> {{ _('Upload to DataStore') }}
+      </button>
+    </form>
+  {% endblock %}
+
+  <div class="clear-fix mx-1 d-inline-block"></div>
+
   {% block delete_ds_button %}
     {% if res.datastore_active %}
       <form method="post" action="{{ delete_action }}" class="mb-3 d-inline-block">
         {{ h.csrf_input() if 'csrf_input' in h }}
         <a href="{{ h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) }}"
-          class="btn btn-danger pull-left"
+          class="btn btn-danger"
           type="submit"
           data-module="confirm-action"
           data-module-with-data=true
           data-module-content="{{ _('Are you sure you want to delete the DataStore and Data Dictionary?') }}"
-          >{% block delete_datastore_button_text %}<i class="fa fa-remove"></i>{{ _('Delete from DataStore') }}{% endblock %}</a>
+          >{% block delete_datastore_button_text %}<i class="fa fa-trash-alt"></i> {{ _('Delete from DataStore') }}{% endblock %}</a>
       </form>
     {% endif %}
   {% endblock %}
 
-  {% block upload_ds_button %}
-    <form method="post" action="{{ action }}" class="datapusher-form mb-3 d-inline-block">
-      {{ h.csrf_input() if 'csrf_input' in h }}
-      <button class="btn btn-primary" name="save" type="submit">
-        <i class="fa fa-cloud-upload"></i> {{ _('Upload to DataStore') }}
-      </button>
-    </form>
-  {% endblock %}
-
   {% if status.error and status.error.message %}
     {% set show_table = false %}
     <div class="alert alert-error">

From a1b73f1dae67c6490e71b13eafdb09a4aeb8b2a6 Mon Sep 17 00:00:00 2001
From: Jesse Vickery <jesse.vickery@tbs-sct.gc.ca>
Date: Wed, 31 Jan 2024 15:05:44 +0000
Subject: [PATCH 8/8] fix(templates): set in block;

- Move sets into their respective blocks.
---
 ckanext/xloader/templates/xloader/resource_data.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/xloader/templates/xloader/resource_data.html b/ckanext/xloader/templates/xloader/resource_data.html
index e55f6421..74a5f715 100644
--- a/ckanext/xloader/templates/xloader/resource_data.html
+++ b/ckanext/xloader/templates/xloader/resource_data.html
@@ -4,11 +4,10 @@
 
 {% block primary_content_inner %}
 
-  {% set action = h.url_for('xloader.resource_data', id=pkg.name, resource_id=res.id) %}
-  {% set delete_action = h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) %}
   {% set show_table = true %}
 
   {% block upload_ds_button %}
+    {% set action = h.url_for('xloader.resource_data', id=pkg.name, resource_id=res.id) %}
     <form method="post" action="{{ action }}" class="datapusher-form mb-3 mr-3 d-inline-block">
       {{ h.csrf_input() if 'csrf_input' in h }}
       <button class="btn btn-primary" name="save" type="submit">
@@ -21,6 +20,7 @@
 
   {% block delete_ds_button %}
     {% if res.datastore_active %}
+      {% set delete_action = h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) %}
       <form method="post" action="{{ delete_action }}" class="mb-3 d-inline-block">
         {{ h.csrf_input() if 'csrf_input' in h }}
         <a href="{{ h.url_for('xloader.delete_datastore_table', id=pkg.id, resource_id=res.id) }}"