Bug: Disallow user to check NCA / Outputs tabs without mapping data

inst/shiny/modules/column_mapping.R

@@ -277,6 +277,11 @@ column_mapping_server <- function(id, data, manual_units, on_submit) {
     observeEvent(input$submit_columns, {
       Sys.sleep(1) # Make this artificially slow to show the loading spinner
 
+      # Enable other tabs
+      purrr::walk(c("nca", "visualisation", "tlg"), \(tab) {
+        shinyjs::enable(selector = paste0("#page li a[data-value=", tab, "]"))
+      })
+
       req(data())
       dataset <- data()
 
@@ -348,6 +353,7 @@ column_mapping_server <- function(id, data, manual_units, on_submit) {
 
       # Execute the callback function to change the tab
       on_submit()
+
     })
 
     list(

inst/shiny/modules/tab_data.R

@@ -39,14 +39,14 @@ tab_data_ui <- function(id) {
       )
     ),
     nav_panel("Review Data",
-      "This is the data set that will be used for the analysis.
-      If you want to make any changes, please do so in the Mapping and Filters tab.",
-      reactableOutput(ns("data_processed")),
+      id = ns("data_navset-review"),
+      uiOutput(ns("reviewDataContent")),
       tags$script(HTML("
-        $(document).ready(function(){
-          $('[data-toggle=\"tooltip\"]').tooltip(); 
-        });
-      "))
+      $(document).ready(function(){
+      $('[data-toggle=\"tooltip\"]').tooltip();
+      });
+                    ")
+      )
     )
   )
 
@@ -121,6 +121,20 @@ tab_data_server <- function(id) {
       on_submit = change_to_review_tab
     )
 
+    output$reviewDataContent <- renderUI({
+      if (!is.null(processed_data()) && nrow(processed_data()) > 0) {
+        tagList(
+          "This is the data set that will be used for the analysis.
+          If you would like to make any changes please return to the 'Mapping and Filters' tab.",
+          reactableOutput(ns("data_processed"))
+        )
+      } else {
+        div(
+          "Please map your data in the 'Mapping and Filters' section before reviewing it."
+        )
+      }
+    })
+
     # Reactive value for the processed dataset
     processed_data <- column_mapping$processed_data
 

inst/shiny/server.R

@@ -3,6 +3,11 @@
 function(input, output, session) {
   log_info("Startup")
 
+  # Initially disable all tabs except the 'Data' tab
+  shinyjs::disable(selector = "#page li a[data-value=nca]")
+  shinyjs::disable(selector = "#page li a[data-value=visualisation]")
+  shinyjs::disable(selector = "#page li a[data-value=tlg]")
+
   # DATA ----
   data_module <- tab_data_server("data")
   # Data set for analysis

inst/shiny/ui.R

@@ -23,11 +23,12 @@ fluidPage(
     # DATA ----
     nav_panel(
       "Data",
+      value = "data",
       fluid = TRUE,
       tab_data_ui("data")
     ),
     # NCA ----
-    nav_panel("NCA", fluid = TRUE,
+    nav_panel("NCA", value = "nca", fluid = TRUE,
       fluidPage(
         actionButton("nca", "Run NCA", class = "run-nca-btn"),
 
@@ -221,12 +222,12 @@ fluidPage(
     ),
 
     # VISUALISATION ----
-    nav_panel("Visualisation",
+    nav_panel("Visualisation", value = "visualisation",
       fluid = TRUE,
       tab_visuals_ui("visuals")
     ),
     # New TLG tab
-    nav_panel("TLG",
+    nav_panel("TLG", value = "tlg",
       tab_tlg_ui("tlg")
     )
   ),