Main panel hidden till first sucessfull data upload

-> Problems with debugging!! Adde helper files
ICB-DCM · Jun 6, 2024 · fe88c3d · fe88c3d
1 parent e29996d
commit fe88c3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/program/shinyApp/R/data_selection/ui.R b/program/shinyApp/R/data_selection/ui.R
@@ -17,7 +17,7 @@ data_selection_sidebar_panel <- sidebarPanel(
           label = HTML('Upload data matrix <br/><small>(rows entities, cols samples) <br/><a href="airway-read-counts-LS.csv">Download example data (Transcriptomics, human)</a></small>'),
           accept = c(".csv", ".xlsx"),
           width = "80%"
-        ),
+        ) %>% helper(type = "markdown", content = "DataSelection_DataUploadFileInput"),
         shiny::fileInput(
           inputId = "data_sample_anno1",
           label = HTML('Upload sample annotation <br/><small>(rows must be samples)<br/><a href="airway-sample-sheet-LS.csv">Download example data</a></small>'),
@@ -35,7 +35,7 @@ data_selection_sidebar_panel <- sidebarPanel(
           label = "Inspect data",
           icon = icon('eye'),
           width = "80%",
-        ),
+        ) %>% helper(type = "markdown", content = "DataSelection_UploadInspection"),
         br(), br(), br(),
         actionButton(
           inputId = "refresh_file_input",
@@ -94,20 +94,20 @@ data_selection_sidebar_panel <- sidebarPanel(
           accept = c(".xlsx"),
           buttonLabel = list(icon("folder"),"Simply upload your Metadata Sheet!"),
           width = "80%"
-        ),
+        ) %>% helper(type = "markdown", content = "DataSelection_MetaData"),
         shiny::fileInput(
           inputId = "data_row_anno_metadata",
           label = HTML('Upload entities annotation matrix <br/><small>(rows must be entities)<br/><a href="airway-entitie_description-LS.csv">Download example data</a></small>'),
           accept = c(".csv", ".xlsx"),
           width = "80%"
         ),
-        br(),
+        br(), br(),
         actionButton(
           inputId = "refresh_metadata",
           label = "Upload new data",
-          widht = "80%",
+          width = "80%",
           icon = icon('paper-plane'),
-          style = "color: #fffff; background-color: #90DBF4; border-color: #000000"
+          style = "color: #fffff; background-color: #90DBF4; border-color: #000000",
         ),
         hr(style = "border-top: 1px solid #858585;")
       ),
@@ -152,7 +152,7 @@ data_selection_main_panel <- mainPanel(
            )),
     column(6,
            div(class = "SampleSelection",
-               h4("Sample selection"),
+               h4("Sample selection") %>% helper(type = "markdown", content = "DataSelection_RowSelection"),
                uiOutput("providedSampleAnnotationTypes_ui"),
                uiOutput("sample_selection_ui")
            ))
@@ -193,4 +193,4 @@ data_selection_panel <- tabPanel(
   ################################################################################
   data_selection_sidebar_panel,
   data_selection_main_panel
-)
+)
diff --git a/program/shinyApp/server.R b/program/shinyApp/server.R
@@ -253,6 +253,7 @@ server <- function(input,output,session){
   # Observer to toggle visibility of the complete main panel
   observe({
       if (input$refresh1 > 0) {
+        req(data_input_shiny() == "DataUploadSuccesful")
         shinyjs::show("mainPanel_DataSelection")
       } else {
         shinyjs::hide("mainPanel_DataSelection")