From e8b482b44e782a6e5760977e2fa73032fcbf4ac5 Mon Sep 17 00:00:00 2001
From: Juleen Graham <juleengrah@gmail.com>
Date: Fri, 12 Jun 2020 09:27:24 -0400
Subject: [PATCH 1/3] Show favourited tools independent of version

---
 client/src/components/Panels/utilities.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Panels/utilities.js b/client/src/components/Panels/utilities.js
index 76109648f0c..ea64e6a4c0c 100644
--- a/client/src/components/Panels/utilities.js
+++ b/client/src/components/Panels/utilities.js
@@ -1,10 +1,12 @@
 export function filterToolSections(layout, results) {
     if (results) {
+        results = normalize_results(results);
         const filteredLayout = layout.map((section) => {
             var toolRes = [];
             if (section.elems) {
                 section.elems.forEach((el) => {
-                    if (!el.text && results.includes(el.id)) {
+                    if ((!el.text && results.includes(el.id)) ||
+                        (el.tool_shed_repository && results.includes(el.tool_shed_repository.name))) {
                         toolRes.push(el);
                     }
                 });
@@ -41,6 +43,7 @@ export function filterTools(layout, results) {
     // do not consider expression tools, unless requested by the workflow editor
     layout = layout.filter((section) => section.name !== "Expression Tools");
     if (results) {
+        results = normalize_results(results);
         var toolsResults = [];
         if (results.length < 1) {
             return toolsResults;
@@ -50,7 +53,8 @@ export function filterTools(layout, results) {
         layout.map((section) => {
             if (section.elems) {
                 section.elems.forEach((el) => {
-                    if (!el.text && results.includes(el.id)) {
+                    if ((!el.text && results.includes(el.id)) ||
+                        (el.tool_shed_repository && results.includes(el.tool_shed_repository.name))) {
                         toolsResults.push(el);
                     }
                 });
@@ -63,3 +67,13 @@ export function filterTools(layout, results) {
         return layout;
     }
 }
+
+function normalize_results(results) {
+    var norm_results = [];
+    results.forEach((result) => {
+        if (result.includes("/repos/")) {
+            norm_results.push(result.split('/')[3]);
+        }
+    });
+    return norm_results;
+}
\ No newline at end of file

From 1e960f5f6037d68f1960250351cc21e9270b9386 Mon Sep 17 00:00:00 2001
From: Juleen Graham <juleengrah@gmail.com>
Date: Mon, 21 Sep 2020 10:58:57 -0400
Subject: [PATCH 2/3] fix unrendered results

---
 client/src/components/Panels/utilities.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/src/components/Panels/utilities.js b/client/src/components/Panels/utilities.js
index ea64e6a4c0c..8bbd390555f 100644
--- a/client/src/components/Panels/utilities.js
+++ b/client/src/components/Panels/utilities.js
@@ -74,6 +74,9 @@ function normalize_results(results) {
         if (result.includes("/repos/")) {
             norm_results.push(result.split('/')[3]);
         }
+        else {
+            norm_results.push(result);
+        }
     });
     return norm_results;
 }
\ No newline at end of file

From b89cdf33913d99fc03ba1e02912ea4fc49a77eef Mon Sep 17 00:00:00 2001
From: Juleen Graham <juleengrah@gmail.com>
Date: Tue, 22 Sep 2020 00:09:08 -0400
Subject: [PATCH 3/3] prettier

---
 client/src/components/Panels/utilities.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Panels/utilities.js b/client/src/components/Panels/utilities.js
index 8bbd390555f..75e5996f74c 100644
--- a/client/src/components/Panels/utilities.js
+++ b/client/src/components/Panels/utilities.js
@@ -5,8 +5,10 @@ export function filterToolSections(layout, results) {
             var toolRes = [];
             if (section.elems) {
                 section.elems.forEach((el) => {
-                    if ((!el.text && results.includes(el.id)) ||
-                        (el.tool_shed_repository && results.includes(el.tool_shed_repository.name))) {
+                    if (
+                        (!el.text && results.includes(el.id)) ||
+                        (el.tool_shed_repository && results.includes(el.tool_shed_repository.name))
+                    ) {
                         toolRes.push(el);
                     }
                 });
@@ -53,8 +55,10 @@ export function filterTools(layout, results) {
         layout.map((section) => {
             if (section.elems) {
                 section.elems.forEach((el) => {
-                    if ((!el.text && results.includes(el.id)) ||
-                        (el.tool_shed_repository && results.includes(el.tool_shed_repository.name))) {
+                    if (
+                        (!el.text && results.includes(el.id)) ||
+                        (el.tool_shed_repository && results.includes(el.tool_shed_repository.name))
+                    ) {
                         toolsResults.push(el);
                     }
                 });
@@ -72,11 +76,10 @@ function normalize_results(results) {
     var norm_results = [];
     results.forEach((result) => {
         if (result.includes("/repos/")) {
-            norm_results.push(result.split('/')[3]);
-        }
-        else {
+            norm_results.push(result.split("/")[3]);
+        } else {
             norm_results.push(result);
         }
     });
     return norm_results;
-}
\ No newline at end of file
+}