From d5d933c2a8dd040a5c289bd1006c1b43bbbf6e75 Mon Sep 17 00:00:00 2001
From: Rishabh Nambiar <5862206+rishabhnambiar@users.noreply.github.com>
Date: Thu, 30 Aug 2018 16:43:15 +0530
Subject: [PATCH 1/2] FEATURE: Sort queries by names, last_run_at by clicking
 table headers

---
 .../controllers/admin-plugins-explorer.js.es6     |  7 +++++++
 .../templates/admin/plugins-explorer.hbs          | 15 ++++++++++++---
 assets/stylesheets/explorer.scss                  |  3 +++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
index 61754fd..b5625ff 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
@@ -119,6 +119,13 @@ export default Ember.Controller.extend({
       this.save().then(() => this.send('run'));
     },
 
+    sortByProperty(property) {
+      if (this.sortBy == `${property}:desc`){
+        this.set('sortBy', [`${property}:asc`]);}
+      else {
+        this.set('sortBy', [`${property}:desc`]);
+    }},
+
     create() {
       const name = this.get("newQueryName").trim();
       this.set('loading', true);
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 7679b73..3f06a02 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -147,9 +147,18 @@
       {{#if sortedQueries.length}}
         <table class="recent-queries">
           <thead class="heading-container">
-            <th class="col heading name">{{i18n 'explorer.query_name'}}</th>
-            <th class="col heading user">{{i18n 'explorer.query_user'}}</th>
-            <th class="col heading time">{{i18n 'explorer.query_time'}}</th>
+            <th {{action "sortByProperty" "name"}} class="col heading name">
+              <i class="fa fa-sort"></i>
+              {{i18n 'explorer.query_name'}}
+            </th>
+            <th {{action "sortByProperty" "username"}} class="col heading user">
+              <i class="fa fa-sort"></i>
+              {{i18n 'explorer.query_user'}}
+            </th>
+            <th {{action "sortByProperty" "last_run_at"}} class="col heading time">
+              <i class="fa fa-sort"></i>
+              {{i18n 'explorer.query_time'}}
+            </th>
           </thead>
           <tr></tr>
           {{#each sortedQueries as |query|}}
diff --git a/assets/stylesheets/explorer.scss b/assets/stylesheets/explorer.scss
index 5eea997..dbcf8d1 100644
--- a/assets/stylesheets/explorer.scss
+++ b/assets/stylesheets/explorer.scss
@@ -260,6 +260,9 @@
   .query-desc {
     color: $primary-high;
   }
+  th:hover{
+    cursor: pointer;
+  }
 }
 
 .explorer-pad-bottom {

From 5a75b6c1e1b4295343a3f8da50ec858a19b6b59f Mon Sep 17 00:00:00 2001
From: Rishabh Nambiar <5862206+rishabhnambiar@users.noreply.github.com>
Date: Thu, 30 Aug 2018 21:08:12 +0530
Subject: [PATCH 2/2] FIX: Fix ESLint issues and use d-icon instead of <i> tags

---
 .../discourse/controllers/admin-plugins-explorer.js.es6  | 9 +++++----
 .../discourse/templates/admin/plugins-explorer.hbs       | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
index b5625ff..613577a 100644
--- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
+++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6
@@ -120,11 +120,12 @@ export default Ember.Controller.extend({
     },
 
     sortByProperty(property) {
-      if (this.sortBy == `${property}:desc`){
-        this.set('sortBy', [`${property}:asc`]);}
-      else {
+      if (this.sortBy[0] === `${property}:desc`) {
+        this.set('sortBy', [`${property}:asc`]);
+      } else {
         this.set('sortBy', [`${property}:desc`]);
-    }},
+      }
+    },
 
     create() {
       const name = this.get("newQueryName").trim();
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 3f06a02..ccc3129 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -148,15 +148,15 @@
         <table class="recent-queries">
           <thead class="heading-container">
             <th {{action "sortByProperty" "name"}} class="col heading name">
-              <i class="fa fa-sort"></i>
+              {{d-icon "sort"}}
               {{i18n 'explorer.query_name'}}
             </th>
             <th {{action "sortByProperty" "username"}} class="col heading user">
-              <i class="fa fa-sort"></i>
+              {{d-icon "sort"}}
               {{i18n 'explorer.query_user'}}
             </th>
             <th {{action "sortByProperty" "last_run_at"}} class="col heading time">
-              <i class="fa fa-sort"></i>
+              {{d-icon "sort"}}
               {{i18n 'explorer.query_time'}}
             </th>
           </thead>