@@ -82,51 +82,28 @@ srv_transform_teal_data <- function(id, data, transformators, modules = NULL, is
8282 names(transformators )<- sprintf(" transform_%d" , seq_len(length(transformators )))
8383
8484 moduleServer(id ,function (input ,output ,session ) {
85- data_original_handled <- reactive(tryCatch(data(),error = function (e )e ))
8685module_output <- Reduce(
8786function (data_previous ,name ) {
8887 moduleServer(name ,function (input ,output ,session ) {
8988logger :: log_debug(" srv_transform_teal_data@1 initializing module for { name }." )
9089data_out <- reactiveVal()
9190
92- # Disable all elements if original data is not yet a teal_data
93- observeEvent(data_original_handled(), {
94- shinyjs :: toggleState(
95- sprintf(" wrapper_%s" ,name ),
96- condition = inherits(data_original_handled()," teal_data" )
97- )
98- })
99-
10091 .call_once_when(inherits(data_previous()," teal_data" ), {
10192logger :: log_debug(" srv_teal_transform_teal_data@2 triggering a transform module call for { name }." )
10293data_unhandled <- transformators [[name ]]$ server(" transform" ,data = data_previous )
10394data_handled <- reactive(tryCatch(data_unhandled(),error = function (e )e ))
10495
105- observeEvent(
106- {
107- data_handled()
108- data_original_handled()
109- },
110- {
111- if (! inherits(data_original_handled()," teal_data" )) {
112- data_out(
113- within(
114- teal.code :: qenv(),
115- stop(" Error with original data:" ,message ),
116- message = data_original_handled()$ message
117- )
118- )
119- }else if (inherits(data_handled()," teal_data" )) {
120- if (! identical(data_handled(), data_out())) {
121- data_out(data_handled())
122- }
96+ observeEvent(data_handled(), {
97+ if (inherits(data_handled()," teal_data" )) {
98+ if (! identical(data_handled(), data_out())) {
99+ data_out(data_handled())
123100 }
124101 }
125- )
102+ } )
126103
127104is_transform_failed [[name ]]<- FALSE
128105 observeEvent(data_handled(), {
129- if (inherits(data_handled()," teal_data" )|| rlang :: is_condition(data_original_handled()) ) {
106+ if (inherits(data_handled()," teal_data" )) {
130107is_transform_failed [[name ]]<- FALSE
131108 }else {
132109is_transform_failed [[name ]]<- TRUE