From 90babcad9395fbe6c3f2c011776230a0d752dbaf Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Wed, 13 May 2020 14:53:47 +0300
Subject: Use natural.js dataTables extension plugin from guix

---
 wqflask/wqflask/templates/collections/list.html   | 2 +-
 wqflask/wqflask/templates/mapping_results.html    | 2 +-
 wqflask/wqflask/templates/search_result_page.html | 2 +-
 wqflask/wqflask/templates/show_trait.html         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wqflask/wqflask/templates/collections/list.html b/wqflask/wqflask/templates/collections/list.html
index 31383b5a..9e0c0f07 100644
--- a/wqflask/wqflask/templates/collections/list.html
+++ b/wqflask/wqflask/templates/collections/list.html
@@ -70,7 +70,7 @@
     <script type="text/javascript" src="/static/new/javascript/search_results.js"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/dataTables.buttons.min.js') }}"></script>
     <script>
             $('#trait_table').dataTable( {
diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html
index 6348ca31..fd3df577 100644
--- a/wqflask/wqflask/templates/mapping_results.html
+++ b/wqflask/wqflask/templates/mapping_results.html
@@ -342,7 +342,7 @@
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="https://cdn.datatables.net/buttons/1.0.0/js/dataTables.buttons.min.js"></script>
     <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/purescript_genome_browser/js/purescript-genetics-browser.js"></script>
 
     <script>
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index b5b582d4..dbdca9f8 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -159,7 +159,7 @@
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/dataTables.buttons.min.js') }}"></script>
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/buttons.colVis.min.js') }}"></script>
 
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index e60cbd2b..926200e1 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -149,7 +149,7 @@
 
     <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.scientific.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
+    <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
     <script language="javascript" type="text/javascript" src="/static/new/packages/noUiSlider/nouislider.js"></script>
     <script language="javascript" type="text/javascript" src="/static/new/javascript/get_covariates_from_collection.js"></script>
 
-- 
cgit 1.4.1


From 1bd50f33e351f4e71736406e5c3846fe10f2226c Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Mon, 24 Aug 2020 23:52:17 +0300
Subject: Add check for "natural.js" in Mechanical Rob

* test/requests/link_checker.py (check_packaged_file): Add it.
---
 test/requests/link_checker.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py
index 0e333f43..f9f85793 100644
--- a/test/requests/link_checker.py
+++ b/test/requests/link_checker.py
@@ -95,6 +95,8 @@ def check_packaged_js_files(args_obj, parser):
         "/DataTablesExtensions/buttons/js/buttons.colVis.min.js",
         "/DataTables/js/jquery.dataTables.js",
         "/DataTablesExtensions/scroller/css/scroller.dataTables.min.css",
+        # natural.js [Datatables plugin]
+        "/DataTablesExtensions/plugins/sorting/natural.js",
     ]
 
     print("Checking links")
-- 
cgit 1.4.1