I lied, this is the last commit

IGS · Sep 11, 2024 · 8f432d8 · 8f432d8
1 parent b2df9de
commit 8f432d8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/www/js/classes/analysis-ui.js b/www/js/classes/analysis-ui.js
@@ -51,7 +51,7 @@ class AnalysisUI {
     // Initial info
     primaryInitialInfoSection = "#initial-info-s"
     primaryInitialPlotContainer = "#initial-plot-c"
-    primaryInitialLoadingPlotElt = "#initial-loading-plot"
+    primaryInitialLoadingElt = "#initial-loading-c"
     primaryInitialScatterContainer = "#initial-scatter-c"
     primaryInitialViolinContainer = "#initial-violin-c"
     selectedDatasetShapeInitialElt = "#selected-dataset-shape-initial"

diff --git a/www/js/classes/analysis.js b/www/js/classes/analysis.js
@@ -498,6 +498,7 @@ class Analysis {
      * @returns {Promise<void>} A promise that resolves when the preliminary figures are loaded.
      */
     async loadPreliminaryFigures() {
+        document.querySelector(UI.primaryInitialPlotContainer).classList.add("is-hidden");
 
         try {
             const {data} = await axios.post("./cgi/h5ad_preview_primary_filter.cgi", convertToFormData({
@@ -515,6 +516,7 @@ class Analysis {
             document.querySelector(UI.primaryInitialViolinContainer).innerHTML = `<a target="_blank" href="./datasets/${this.dataset.id}.prelim_violin.png"><img src="./datasets/${this.dataset.id}.prelim_violin.png" class="img-fluid img-zoomed" /></a>`;
             document.querySelector(UI.primaryInitialScatterContainer).innerHTML = `<a target="_blank" href="./datasets/${this.dataset.id}.prelim_n_genes.png"><img src="./datasets/${this.dataset.id}.prelim_n_genes.png" class="img-fluid img-zoomed" /></a>`;
             createToast("Preliminary plots displayed", "is-success");
+            document.querySelector(UI.primaryInitialPlotContainer).classList.remove("is-hidden");
 
         } catch (error) {
             createToast("Failed to access dataset");

diff --git a/www/js/sc_workbench.js b/www/js/sc_workbench.js
@@ -88,8 +88,8 @@ const datasetTree = new DatasetTree({
             logErrorInConsole(error);
         }
 
-        document.querySelector(UI.primaryInitialPlotContainer).classList.remove("is-hidden");
-        document.querySelector(UI.primaryInitialLoadingPlotElt).classList.remove("is-hidden");
+        document.querySelector(UI.primaryInitialInfoSection).classList.remove("is-hidden");
+        document.querySelector(UI.primaryInitialLoadingElt).classList.remove("is-hidden");
         try {
             await getDatasetInfo(datasetId);
             await currentAnalysis.loadPreliminaryFigures(); // depends on dataset.id from getDatasetInfo
@@ -101,7 +101,7 @@ const datasetTree = new DatasetTree({
             document.querySelector(UI.analysisSelect).disabled = true;
             // pass
         } finally {
-            document.querySelector(UI.primaryInitialLoadingPlotElt).classList.add("is-hidden");
+            document.querySelector(UI.primaryInitialLoadingElt).classList.add("is-hidden");
         }
 
     })
@@ -181,7 +181,6 @@ const getDatasetInfo = async (datasetId) => {
 
         currentAnalysis.dataset = ds;
 
-        document.querySelector(UI.primaryInitialInfoSection).classList.remove("is-hidden");
         document.querySelector(UI.primaryFilterSection).classList.remove("is-hidden");
         document.querySelector(UI.selectedDatasetShapeInitialElt).textContent = currentAnalysis.dataset.shape();
 

diff --git a/www/sc_workbench.html b/www/sc_workbench.html
@@ -169,11 +169,11 @@ <h5 class="title is-5">
                             Initial shape:<br>
                             <span id='selected-dataset-shape-initial' class="has-text-weight-normal"></span>
                         </p>
+                        <div id="initial-loading-c"><img class="image" src="../img/loading_search.gif"
+                            alt="Loading" /> Loading initial gene/cell count plots
+                        </div>
                         <div id="initial-plot-c" class="is-hidden">
                             <h6 class="subtitle is-6 has-text-centered">Initial composition plots</h6>
-                            <div id="initial-loading-plot"><img class="image" src="../img/loading_search.gif"
-                                  alt="Loading" /> Loading initial gene/cell
-                                count plots</div>
                             <div class="columns">
                                 <div id="initial-violin-c" class="column is-6"></div>
                                 <div id="initial-scatter-c" class="column is-6"></div>