From a967677971bccdac44c65bd3355431ef62d87003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= <todor.kondic@uni.lu>
Date: Wed, 6 May 2020 08:42:51 +0200
Subject: [PATCH] Rewrite build observer
R/shiny-ui-config.R(server_conf) <build observer>: Emulate build
process from the cmd line flow.
---
R/shiny-ui-config.R | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/R/shiny-ui-config.R b/R/shiny-ui-config.R
index 9d8e018..9c0e41f 100644
--- a/R/shiny-ui-config.R
+++ b/R/shiny-ui-config.R
@@ -199,26 +199,15 @@ server_conf <- function(input,output,session,rv,rf,roots) {
## Building rv objects here. Probably should change to
## something like reactive get_m.
- rv$m$conf$compounds$known <- input$known
- rv$m$conf$compounds$unknown <- input$unknown
- rv$m$conf$compounds$sets <- input$sets
-
- assert(isTruthy(rv$m$conf$compounds$known) || isTruthy(rv$m$conf$compounds$unknown),
- msg = "Please provide at least one (known, or unknown) compounds table.")
- assert(isTruthy(rv$m$conf$compounds$sets), msg = "Please provide the compounds set table.")
- rv$m <- load_compound_input(rv$m)
- if (nrow(rv$m$input$tab$mzml)==0 && file.exists(rv$m$conf$data)) rv$m <- load_data_input(rv$m)
-
-
- ## Rebuild tags.
- isol({
- df_tags <- unique(rv$m$input$tab$mzml$tag)
- txt_tags <- input$tagsInp
- new_tags <- combine_tags(df_tags,txt_tags)
- shiny::updateTextInput(session=session,
- inputId=input$tagsInp,
- value=new_tags)})
- message("Here at:",Sys.time())
+ m <- list()
+ m$conf$compounds$known <- input$known
+ m$conf$compounds$unknown <- input$unknown
+ m$conf$compounds$sets <- input$sets
+ m$conf$project <- rv$m$conf$project
+ m$conf$data <- file.path(m$conf$project,FN_DATA_TAB)
+
+ m$conf <- vrfy_conf(m$conf)
+ message("Building m at:",Sys.time())
})
obsrv_e(rv$m$conf$project,{
--
GitLab