From e5660641072cc2f440acd0743d7014e931b7ce61 Mon Sep 17 00:00:00 2001 From: adkinsrs Date: Wed, 11 Sep 2024 16:03:30 -0400 Subject: [PATCH] rearranging order of when analysis are allowed to be run --- www/js/sc_workbench.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/www/js/sc_workbench.js b/www/js/sc_workbench.js index 617fbc06..859d6e8f 100644 --- a/www/js/sc_workbench.js +++ b/www/js/sc_workbench.js @@ -81,12 +81,11 @@ const datasetTree = new DatasetTree({ currentAnalysis = new Analysis({id: datasetId, type: "primary", datasetIsRaw: true}); try { + document.querySelector(UI.analysisSelect).disabled = true; analysisLabels = await currentAnalysis.getSavedAnalysesList(datasetId, -1, 'sc_workbench'); - document.querySelector(UI.analysisSelect).disabled = false; } catch (error) { createToast("Failed to access analyses for this dataset"); logErrorInConsole(error); - document.querySelector(UI.analysisSelect).disabled = true; } document.querySelector(UI.primaryInitialInfoSection).classList.remove("is-hidden"); @@ -96,11 +95,16 @@ const datasetTree = new DatasetTree({ await currentAnalysis.loadPreliminaryFigures(); // depends on dataset.id from getDatasetInfo } catch (error) { logErrorInConsole(error); + + // Cannot run analyses without a dataset + document.querySelector(UI.analysisSelect).disabled = true; // pass } finally { document.querySelector(UI.primaryInitialPlotContainer).classList.add("is-hidden"); } + document.querySelector(UI.analysisSelect).disabled = false; + }) });