testing environment variable LOCAL for js

ComPlat · Dec 18, 2024 · 9d239d1 · 9d239d1
1 parent ab1a996
commit 9d239d1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/app/MainApp.R b/app/MainApp.R
@@ -18,25 +18,24 @@ js_scripts <- function() {
 }
 
 upload_fct <- function() {
-  output$conditional_data_ui <- renderUI({
-    if (Sys.getenv("RUN_MODE") != "SERVER") {
-      res <- conditionalPanel(
-        condition = "input.conditionedPanels == 'Data'",
-        fileInput("file", "Choose CSV File",
-          accept = c(
-            "text/csv",
-            "text/comma-separated-values,text/plain",
-            ".csv"
-          )
+  if (Sys.getenv("RUN_MODE") != "SERVER") {
+    res <- conditionalPanel(
+      condition = "input.conditionedPanels == 'Data'",
+      fileInput("file", "Choose CSV File",
+        accept = c(
+          "text/csv",
+          "text/comma-separated-values,text/plain",
+          ".csv"
         )
       )
-      return(res)
-    }
-  })
+    )
+    return(res)
+  }
 }
 
 app <- function() {
   js <- js_scripts()
+  uf <- upload_fct()
   ui <- fluidPage(
     useShinyjs(),
 
@@ -144,7 +143,8 @@ app <- function() {
         div(
           conditionalPanel(
             condition = "input.conditionedPanels == 'Data'",
-            uiOutput("conditional_data_ui"),
+            # uiOutput("conditional_data_ui"),
+            uf,
             tags$hr()
           ),
           conditionalPanel(
@@ -386,7 +386,6 @@ app <- function() {
             )
           )
         )
-        showNotification(as.character(res))
         return(res)
       }
     })

diff --git a/bs/R/MainApp.R b/bs/R/MainApp.R
@@ -18,25 +18,24 @@ js_scripts <- function() {
 }
 
 upload_fct <- function() {
-  output$conditional_data_ui <- renderUI({
-    if (Sys.getenv("RUN_MODE") != "SERVER") {
-      res <- conditionalPanel(
-        condition = "input.conditionedPanels == 'Data'",
-        fileInput("file", "Choose CSV File",
-          accept = c(
-            "text/csv",
-            "text/comma-separated-values,text/plain",
-            ".csv"
-          )
+  if (Sys.getenv("RUN_MODE") != "SERVER") {
+    res <- conditionalPanel(
+      condition = "input.conditionedPanels == 'Data'",
+      fileInput("file", "Choose CSV File",
+        accept = c(
+          "text/csv",
+          "text/comma-separated-values,text/plain",
+          ".csv"
         )
       )
-      return(res)
-    }
-  })
+    )
+    return(res)
+  }
 }
 
 app <- function() {
   js <- js_scripts()
+  uf <- upload_fct()
   ui <- fluidPage(
     useShinyjs(),
 
@@ -144,7 +143,8 @@ app <- function() {
         div(
           conditionalPanel(
             condition = "input.conditionedPanels == 'Data'",
-            uiOutput("conditional_data_ui"),
+            # uiOutput("conditional_data_ui"),
+            uf,
             tags$hr()
           ),
           conditionalPanel(
@@ -386,7 +386,6 @@ app <- function() {
             )
           )
         )
-        showNotification(as.character(res))
         return(res)
       }
     })