From a8ab648eda3bdb848d300075f28d78ba7655cb20 Mon Sep 17 00:00:00 2001
From: Andreas Gammelgaard Damsbo <andreas@gdamsbo.dk>
Date: Mon, 17 Mar 2025 20:26:30 +0100
Subject: [PATCH] deployed latest

---
 R/app_version.R                                    |  2 +-
 R/data-import.R                                    |  2 +-
 R/import-file-ext.R                                |  5 +----
 inst/apps/freesearcheR/app.R                       | 14 +++++---------
 .../shinyapps.io/agdamsbo/freesearcheR.dcf         |  2 +-
 inst/apps/freesearcheR/server.R                    |  2 +-
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/R/app_version.R b/R/app_version.R
index 0cdf321..c2f44c1 100644
--- a/R/app_version.R
+++ b/R/app_version.R
@@ -1 +1 @@
-app_version <- function()'250317_1458'
+app_version <- function()'250317_2026'
diff --git a/R/data-import.R b/R/data-import.R
index 33acf37..8b74135 100644
--- a/R/data-import.R
+++ b/R/data-import.R
@@ -84,7 +84,7 @@ data_import_server <- function(id) {
 
     shiny::observeEvent(data_file$data(), {
       shiny::req(data_file$data())
-      browser()
+
       rv$data_temp <- data_file$data()
       rv$code <- append_list(data = data_file$code(), list = rv$code, index = "import")
     })
diff --git a/R/import-file-ext.R b/R/import-file-ext.R
index 5e90500..05ac7b6 100644
--- a/R/import-file-ext.R
+++ b/R/import-file-ext.R
@@ -239,10 +239,7 @@ import_file_server <- function(id,
       {
         req(input$file)
         if (is_workbook(input$file$datapath)) shiny::req(input$sheet)
-        # browser()
 
-        # browser()
-        # req(input$skip_rows)
         extension <- tools::file_ext(input$file$datapath)
 
         parameters <- list(
@@ -253,7 +250,7 @@ import_file_server <- function(id,
           encoding = input$encoding,
           na.strings = datamods:::split_char(input$na_label)
         )
-        # browser()
+
         parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(get(read_fns[[extension]])))]
         # parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(read_fns[[extension]]))]
         imported <- try(rlang::exec(read_fns[[extension]], !!!parameters), silent = TRUE)
diff --git a/inst/apps/freesearcheR/app.R b/inst/apps/freesearcheR/app.R
index 9577550..02ef7d9 100644
--- a/inst/apps/freesearcheR/app.R
+++ b/inst/apps/freesearcheR/app.R
@@ -10,7 +10,7 @@
 #### Current file: R//app_version.R 
 ########
 
-app_version <- function()'250317_1458'
+app_version <- function()'250317_2026'
 
 
 ########
@@ -1757,7 +1757,7 @@ data_import_server <- function(id) {
 
     shiny::observeEvent(data_file$data(), {
       shiny::req(data_file$data())
-      browser()
+
       rv$data_temp <- data_file$data()
       rv$code <- append_list(data = data_file$code(), list = rv$code, index = "import")
     })
@@ -2843,10 +2843,7 @@ import_file_server <- function(id,
       {
         req(input$file)
         if (is_workbook(input$file$datapath)) shiny::req(input$sheet)
-        # browser()
 
-        # browser()
-        # req(input$skip_rows)
         extension <- tools::file_ext(input$file$datapath)
 
         parameters <- list(
@@ -2857,7 +2854,7 @@ import_file_server <- function(id,
           encoding = input$encoding,
           na.strings = datamods:::split_char(input$na_label)
         )
-        # browser()
+
         parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(get(read_fns[[extension]])))]
         # parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(read_fns[[extension]]))]
         imported <- try(rlang::exec(read_fns[[extension]], !!!parameters), silent = TRUE)
@@ -7477,7 +7474,7 @@ server <- function(input, output, session) {
         deparse() |>
         paste(collapse="") |>
         paste("|>
-        dplyr::select(tidyselect::all_of(c(",paste(input$import_var,collapse=","),"))) |>
+        dplyr::select(",paste(input$import_var,collapse=","),") |>
         freesearcheR::default_parsing()") |>
         (\(.x){
           paste0("data <- ",.x)
@@ -7725,7 +7722,7 @@ server <- function(input, output, session) {
   )
 
   output$code_import <- shiny::renderPrint({
-    rv$code$import
+    cat(rv$code$import)
   })
 
   output$code_data <- shiny::renderPrint({
@@ -7734,7 +7731,6 @@ server <- function(input, output, session) {
                  sapply(ls,\(.x) paste(deparse(.x),collapse=",")),
                  collapse="|> \n")
     cat(out)
-    # attr(rv$data, "code")
   })
 
   output$code_filter <- shiny::renderPrint({
diff --git a/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf b/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf
index ec31612..a180caa 100644
--- a/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf
+++ b/inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf
@@ -5,6 +5,6 @@ account: agdamsbo
 server: shinyapps.io
 hostUrl: https://api.shinyapps.io/v1
 appId: 13611288
-bundleId: 9937654
+bundleId: 9958659
 url: https://agdamsbo.shinyapps.io/freesearcheR/
 version: 1
diff --git a/inst/apps/freesearcheR/server.R b/inst/apps/freesearcheR/server.R
index 6ed6062..b49bb28 100644
--- a/inst/apps/freesearcheR/server.R
+++ b/inst/apps/freesearcheR/server.R
@@ -173,7 +173,7 @@ server <- function(input, output, session) {
         deparse() |>
         paste(collapse="") |>
         paste("|>
-        dplyr::select(tidyselect::all_of(c(",paste(input$import_var,collapse=","),"))) |>
+        dplyr::select(",paste(input$import_var,collapse=","),") |>
         freesearcheR::default_parsing()") |>
         (\(.x){
           paste0("data <- ",.x)