Shiny GSoC Final Submission #1594
Conversation
…pecan into shiny-viz-gsoc
…shiny-viz-gsoc
There was a problem hiding this comment.
In general, looks good, except for the following:
- The merge conflict needs to be resolved
- The
ui.Rscript is missing call tolibrary(plotly)for theplotlyOutputfunction. I just discovered this while testing on our servers. - Additional cleanup, described below.
shiny/workflowPlot/helper.R
Outdated
| # We can also save the csv on the run from the shiny app as well | ||
| # write.csv(inputs_df,file='/home/carya/pecan/shiny/workflowPlot/inputs_df.csv', | ||
| # quote = FALSE,sep = ',',col.names = TRUE,row.names=FALSE) | ||
|
|
There was a problem hiding this comment.
Commented code should be removed.
shiny/workflowPlot/server.R
Outdated
| # file format can be retrieved using either by input or format id. | ||
| getFileFormat <- function(bety,input.id,format.id=NULL){ | ||
| # Retaining the code for getting file format using format Id as in tutorial | ||
| # TODO Retaining the code for getting file format using format Id as in tutorial |
There was a problem hiding this comment.
This function is not necessary, since it just directly calls query.format.vars with the same arguments. You should remove it here and replace it elsewhere with the direct call.
shiny/workflowPlot/server.R
Outdated
| configPath <- file.path(basePath, 'pecan.CONFIGS.xml') | ||
| # Second way of proving configPath. More of a hack | ||
| # Second way of providing configPath. More of a hack |
There was a problem hiding this comment.
Remove this and the following line.
shiny/workflowPlot/server.R
Outdated
| # File_format <- PEcAn.DB::query.format.vars(bety = bety, format.id = format.id) | ||
| File_format <- PEcAn.DB::query.format.vars(bety = bety, input.id = input.id) | ||
| return(File_format) | ||
| } | ||
| getSettingsFromWorkflowId <- function(bety,workflowID){ | ||
| basePath <- tbl(bety, 'workflows') %>% filter(id %in% workflowID) %>% pull(folder) | ||
| basePath <- tbl(bety, 'workflows') %>% dplyr::filter(id %in% workflowID) %>% pull(folder) |
shiny/workflowPlot/server.R
Outdated
| return(inputIds) | ||
| # Subsetting the input id list based on the current (VM) machine | ||
| my_hostname <- PEcAn.utils::fqdn() | ||
| my_machine_id <- tbl(bety, 'machines') %>% dplyr::filter(hostname == my_hostname) %>% pull(id) |
shiny/workflowPlot/server.R
Outdated
| inputs_df <- tbl(bety, 'dbfiles') %>% | ||
| dplyr::filter(container_type == 'Input', machine_id == my_machine_id) %>% | ||
| inner_join(tbl(bety, 'inputs') %>% dplyr::filter(site_id %in% site_Id), by = c('container_id' = 'id')) %>% | ||
| collect() |
There was a problem hiding this comment.
dplyr::inner_join, dplyr::collect
|
Also, in the |
|
@shubhamagarwal92 can you update the changelog as well to indicate this new functionality |
This PR is related to the final submission for "Scientific Visualization" project GSoC 2017.
Description
Major changes for the project:
Information related to previous related PRs and commit history can be found here
Motivation and Context
These changes are related to the required enhancements in the existing workflowPlot Shiny app.
Types of changes
Checklist: