From 1969188164c5f97144434bbdc92964c4f5707af6 Mon Sep 17 00:00:00 2001
From: Isaak <iyt2@cornell.edu>
Date: Thu, 12 Sep 2024 14:47:54 +0200
Subject: [PATCH] abstract out feedback code

---
 js/source/legacy/solGS/cluster.js | 47 ++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/js/source/legacy/solGS/cluster.js b/js/source/legacy/solGS/cluster.js
index 8b2e27bffc..7609ccea08 100644
--- a/js/source/legacy/solGS/cluster.js
+++ b/js/source/legacy/solGS/cluster.js
@@ -808,6 +808,18 @@ solGS.cluster = {
 
   },
 
+  cleanupFeedback: function(canvasId, runBtnId, msgDiv, message) {
+    jQuery(`${canvasId} .multi-spinner-container`).hide();
+    jQuery(runBtnId).show();
+
+    jQuery(msgDiv).empty();
+
+    if (message) {
+      jQuery(msgDiv).html(message);
+    }
+
+  },
+
   plotCluster: function (plotData, downloadLinks) {
     var scores = plotData.pc_scores_groups;
  
@@ -1176,21 +1188,16 @@ jQuery(document).ready(function () {
       runClusterBtnId = solGS.cluster.getRunClusterBtnId(clusterPopId);
       var page = clusterArgs.analysis_page;
 
+      runClusterBtnId = `#${runClusterBtnId}`;
       solGS.cluster
         .checkCachedCluster(page, clusterArgs)
         .done(function (res) {
           if (res.result == "success") {
-            jQuery(`${canvas} .multi-spinner-container`).hide();            
+            solGS.cluster.cleanupFeedback(canvas, runClusterBtnId, clusterMsgDiv);
             solGS.cluster.displayClusterOutput(res);
-
-            jQuery(clusterMsgDiv).empty();
-            jQuery("#" + runClusterBtnId).show();
           } else {
             jQuery(`${canvas} .multi-spinner-container`).hide();
             jQuery(clusterMsgDiv).empty();
-
-            runClusterBtnId = `#${runClusterBtnId}`;
-
             var title =
               "<p>This analysis may take a long time. " +
               "Do you want to submit the analysis and get an email when it completes?</p>";
@@ -1232,23 +1239,23 @@ jQuery(document).ready(function () {
                       .runClusterAnalysis(clusterArgs)
                       .done(function (res) {
                         if (res.result == "success") {
-                          jQuery(`${canvas} .multi-spinner-container`).hide();
-
-                          solGS.cluster.displayClusterOutput(res);
-                          jQuery(clusterMsgDiv).empty();
-                          jQuery(runClusterBtnId).show();
+                          if (res.pc_scores_groups) {
+                            solGS.cluster.cleanupFeedback(canvas, runClusterBtnId, clusterMsgDiv )
+                            solGS.cluster.displayClusterOutput(res);
+                          } else {
+                            var msg = "There is no cluster groups data to plot. " + 
+                            "The R clustering script did not write cluster results to output files.";
+
+                            solGS.cluster.cleanupFeedback(canvas, runClusterBtnId, clusterMsgDiv, msg);
+                          }
                         } else {
-                          jQuery(clusterMsgDiv).html(
-                            "Error occured running the clustering. Possibly the R script failed."
-                          );
-                          jQuery(`${canvas} .multi-spinner-container`).hide();
-                          jQuery(runClusterBtnId).show();
+                          var msg = "Error occured running the clustering. Possibly the R script failed.";
+                          solGS.cluster.cleanupFeedback(canvas, runClusterBtnId, clusterMsgDiv, msg);
                         }
                       })
                       .fail(function () {
-                        jQuery(clusterMsgDiv).html("Error occured running the clustering");
-                        jQuery(`${canvas} .multi-spinner-container`).hide();
-                        jQuery(runClusterBtnId).show();
+                        var msg = "Error occured running the clustering";
+                        solGS.cluster.cleanupFeedback(canvas, runClusterBtnId, clusterMsgDiv, msg);
                       });
                   },
                 },
-- 
2.11.4.GIT