Skip to content

Fixes import issues for testcase #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GeorgWa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes import issues for testcase #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']])))
}

Expand Down
4 changes: 2 additions & 2 deletions settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 9 additions & 9 deletions ui/import_tab.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
)
)
),

Expand Down