From 2cae00df99adf5b94f899c23e37b9b5d5785c427 Mon Sep 17 00:00:00 2001 From: "Lea@Mac" Date: Thu, 19 Dec 2024 11:36:39 +0100 Subject: [PATCH] catch if only one matrix is uplaoded; closes #421 --- program/shinyApp/server.R | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/program/shinyApp/server.R b/program/shinyApp/server.R index f064bfac..9542fa3f 100644 --- a/program/shinyApp/server.R +++ b/program/shinyApp/server.R @@ -595,7 +595,6 @@ server <- function(input,output,session){ ) }, error = function(e) { - browser() # Handle errors specifically output$DataMatrix_VI <- DT::renderDataTable({ DT::datatable(data = data.frame(Error = "Invalid data for display")) @@ -950,6 +949,7 @@ server <- function(input,output,session){ fun_LogIt( message = paste0("**DataInput** - Uploaded Omic Type: ", par_tmp[[session$token]]['omic_type']) ) + if(!( # Is Precompiled data used? (isTruthy(input$data_preDone) & uploaded_from() == "precompiled") | @@ -1025,6 +1025,19 @@ server <- function(input,output,session){ par_tmp[[session$token]]['omic_type'] <<- input[[paste0("omic_type_", uploaded_from())]] omic_type(input[[paste0("omic_type_", uploaded_from())]]) } + # catch if only one file is uploaded + if(uploaded_from() == "file_input"){ + if(isTruthy(input$data_matrix1) & !isTruthy(input$data_sample_anno1) & !isTruthy(input$data_row_anno1)){ + output$debug <- renderText({ + "Upload failed, please check your input." + }) + reset('data_matrix1') + reset('data_sample_anno1') + reset('data_row_anno1') + + return(NULL) + } + } req( (isTruthy(input$data_preDone) & uploaded_from() == "precompiled") |