From 976e91cb44a5ac6460f79e0ca59b7470825a7245 Mon Sep 17 00:00:00 2001
From: Maksym Rymar <rim.maxim+dev@gmail.com>
Date: Fri, 11 Aug 2023 19:16:32 +0300
Subject: [PATCH] DRILL-8451: options and profile pages have bad order symbols
 style (#2820)

---
 exec/java-exec/src/main/resources/rest/options.ftl |  13 ++++++++-----
 .../src/main/resources/rest/profile/profile.ftl    |  13 ++++++++++---
 .../rest/static/css/drill-dataTables.sortable.css  |  11 -----------
 .../main/resources/rest/static/img/black-asc.gif   | Bin 48 -> 0 bytes
 .../main/resources/rest/static/img/black-desc.gif  | Bin 49 -> 0 bytes
 .../resources/rest/static/img/black-unsorted.gif   | Bin 54 -> 0 bytes
 6 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css
 delete mode 100644 exec/java-exec/src/main/resources/rest/static/img/black-asc.gif
 delete mode 100644 exec/java-exec/src/main/resources/rest/static/img/black-desc.gif
 delete mode 100644 exec/java-exec/src/main/resources/rest/static/img/black-unsorted.gif

diff --git a/exec/java-exec/src/main/resources/rest/options.ftl b/exec/java-exec/src/main/resources/rest/options.ftl
index b18d8712620..09178c2bd4d 100644
--- a/exec/java-exec/src/main/resources/rest/options.ftl
+++ b/exec/java-exec/src/main/resources/rest/options.ftl
@@ -69,7 +69,6 @@
     <!-- List of Option Descriptions -->
     <script src="/dynamic/options.describe.js"></script>
     <link href="/static/css/datatables.min.css" rel="stylesheet">
-    <link href="/static/css/drill-dataTables.sortable.css" rel="stylesheet">
 </#macro>
 
 <#macro page_body>
@@ -91,12 +90,12 @@
   </div>
   <#include "*/alertModals.ftl">
   <div class="table-responsive">
-    <table id='optionsTbl' class="table table-striped table-condensed display sortable" style="table-layout: auto; width: 100%;">
+    <table id='optionsTbl' class="table table-striped table-condensed display" style="table-layout: auto; width: 100%;">
       <thead>
         <tr>
-          <th style="width:30%">OPTION</th>
-          <th style="width:25%">VALUE</th>
-          <th style="width:45%">DESCRIPTION</th>
+          <th class="option" style="width:30%">OPTION</th>
+          <th class="value" style="width:25%">VALUE</th>
+          <th class="description" style="width:45%">DESCRIPTION</th>
         </tr>
       </thead>
       <tbody><#assign i = 1><#list model.getOptions() as option>
@@ -140,6 +139,10 @@
         "dom": 'lrit',
         "jQueryUI" : true,
         "searching": true,
+        "columnDefs": [ {
+            "targets": [ "value", "description" ],
+            "orderable": false
+        } ],
         "language": {
             "lengthMenu": "Display _MENU_ records per page",
             "zeroRecords": "No matching options found. Check search entry",
diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
index 16071e72c33..513e22cf592 100644
--- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl
+++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl
@@ -33,8 +33,10 @@
 <script src="/static/js/ace-code-editor/theme-sqlserver.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/js/ace-code-editor/snippets/sql.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/js/ace-code-editor/mode-snippets.js" type="text/javascript" charset="utf-8"></script>
-<link href="/static/css/drill-dataTables.sortable.css" rel="stylesheet">
-
+<link href="/static/css/datatables.min.css" rel="stylesheet">
+<style>
+  table.dataTable th {background-color: transparent}
+</style>
 <script>
     var globalconfig = {
         "queryid" : "${model.getQueryId()}"
@@ -45,7 +47,12 @@
         "searching": false,
         "lengthChange": false,
         "paging": false,
-        "info": false
+        "info": false,
+        "sDom": '<"top"lftip><"bottom"><"clear">',
+        "columnDefs": [ {
+          "targets": "_all",
+          "className": "dt-right"
+        } ]
       });
       //Enable Warnings by making it visible
       checkForWarnings();
diff --git a/exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css b/exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css
deleted file mode 100644
index 47f4260096b..00000000000
--- a/exec/java-exec/src/main/resources/rest/static/css/drill-dataTables.sortable.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* DataTables Sorting: inherited via sortable class */
-table.sortable thead .sorting,.sorting_asc,.sorting_desc {
-  background-repeat: no-repeat;
-  background-position: center right;
-  cursor: pointer;
-}
-/* Sorting Symbols */
-table.sortable thead .sorting { background-image: url("/static/img/black-unsorted.gif"); }
-table.sortable thead .sorting_asc { background-image: url("/static/img/black-asc.gif"); }
-table.sortable thead .sorting_desc { background-image: url("/static/img/black-desc.gif"); }
-
diff --git a/exec/java-exec/src/main/resources/rest/static/img/black-asc.gif b/exec/java-exec/src/main/resources/rest/static/img/black-asc.gif
deleted file mode 100644
index 730533fa3570dd4805cec70fe2630e85a2e1b863..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48
zcmZ?wbhEHbWM^PuXkcJa);0M5|G(l-7DfgJMg|=QAOOiQFtPU}a;`qj$IW0300PSi
A(EtDd

diff --git a/exec/java-exec/src/main/resources/rest/static/img/black-desc.gif b/exec/java-exec/src/main/resources/rest/static/img/black-desc.gif
deleted file mode 100644
index 4c3b61020bb4d707e41e94fbf2b6ebe5d0c87f6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 49
zcmZ?wbhEHbWM^PuXkcJa);0M5|G(l-7DfgJMg|=QAOOiQFmbf-H%eylMrtrv0{{qN
B3331c

diff --git a/exec/java-exec/src/main/resources/rest/static/img/black-unsorted.gif b/exec/java-exec/src/main/resources/rest/static/img/black-unsorted.gif
deleted file mode 100644
index 5647f658329230706ec09c5e3c24fae39d225a04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
zcmZ?wbhEHbWM|-HXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A;za;`qjH@QXcLR*>^
GgEatAw+#UR