diff --git a/server.R b/server.R index 5950350..37650f1 100644 --- a/server.R +++ b/server.R @@ -296,7 +296,7 @@ shinyServer(function(input, output, session) { # since a lot of MS data is very sparse and only using the first 1000 # rows to guess may guess a column type wrong # Custom behavior for report - if(file$name == 'report') { + if(file$file == 'report.parquet') { .dat <- as.data.frame(read_parquet(file=file.path(folder$Path, file[['file']]))) } diff --git a/settings.yaml b/settings.yaml index 21ed2de..3ec35a0 100644 --- a/settings.yaml +++ b/settings.yaml @@ -64,8 +64,8 @@ dia-nn: input_files: report: name: 'report' - file: 'report.parquet' - help: 'DIA-NN report.parquet' + file: 'report.tsv' + help: 'DIA-NN report.tsv' default_enabled: true ms1_extracted: diff --git a/ui/import_tab.R b/ui/import_tab.R index 9b06a13..4f94b8a 100644 --- a/ui/import_tab.R +++ b/ui/import_tab.R @@ -66,17 +66,17 @@ import_tab <- tabItem(tabName='import', fluidPage( p(class='import-help', 'Once folders are selected, click "Load Data" to import the files and begin the analysis. The status panel below to the right will update when the data is imported.'), fluidRow( column(6, - div(class='upload-button-container', - tags$button(id='confirm_folders', - class='btn btn-primary action-button shiny-bound-input', - icon('file-upload', verify_fa = FALSE), 'Load Data') - ) + div(class='upload-button-container', + actionButton("confirm_folders", + label = span(icon('file-upload', verify_fa = FALSE), 'Load Data'), + class = 'btn-primary') + ) ), column(6, - wellPanel( - div(class='well-header', h4('Status')), - htmlOutput('data_status') - ) + wellPanel( + div(class='well-header', h4('Status')), + htmlOutput('data_status') + ) ) ),