limiting dependencies

This commit is contained in:
Andreas Gammelgaard Damsbo 2025-04-23 14:24:07 +02:00
commit 2d35001c33
No known key found for this signature in database
4 changed files with 46 additions and 41 deletions

View file

@ -695,7 +695,7 @@ line_break <- function(data, lineLength = 20, force = FALSE) {
#' @export
#'
wrap_plot_list <- function(data, tag_levels = NULL) {
if (ggplot2::is.ggplot(data[[1]])) {
if (ggplot2::is_ggplot(data[[1]])) {
if (length(data) > 1) {
out <- data |>
(\(.x){
@ -732,7 +732,7 @@ wrap_plot_list <- function(data, tag_levels = NULL) {
align_axes <- function(...) {
# https://stackoverflow.com/questions/62818776/get-axis-limits-from-ggplot-object
# https://github.com/thomasp85/patchwork/blob/main/R/plot_multipage.R#L150
if (ggplot2::is.ggplot(..1)) {
if (ggplot2::is_ggplot(..1)) {
## Assumes list of ggplots
p <- list(...)
} else if (is.list(..1)) {

View file

@ -87,7 +87,7 @@ read_input <- function(file, consider.na = c("NA", '""', "")) {
if (ext == "csv") {
df <- readr::read_csv(file = file, na = consider.na)
} else if (ext %in% c("xls", "xlsx")) {
df <- openxlsx2::read_xlsx(file = file, na.strings = consider.na)
df <- readxl::read_excel(file = file, na.strings = consider.na)
} else if (ext == "dta") {
df <- haven::read_dta(file = file)
} else if (ext == "ods") {
@ -428,7 +428,7 @@ sort_by <- function(x, y, na.rm = FALSE, ...) {
get_ggplot_label <- function(data, label) {
assertthat::assert_that(ggplot2::is.ggplot(data))
assertthat::assert_that(ggplot2::is_ggplot(data))
data$labels[[label]]
}

View file

@ -242,7 +242,7 @@ import_file_server <- function(id,
req(input$file)
if (!all(input$sheet %in% temporary_rv$sheets)) {
sheets <- 1
sheets <- 1
} else {
sheets <- input$sheet
}
@ -298,31 +298,33 @@ import_file_server <- function(id,
)
observeEvent(input$see_data, {
tryCatch({
datamods:::show_data(default_parsing(temporary_rv$data), title = datamods:::i18n("Imported data"), type = show_data_in)
},
# warning = function(warn) {
# showNotification(warn, type = "warning")
# },
error = function(err) {
showNotification(err, type = "err")
}
tryCatch(
{
datamods:::show_data(default_parsing(temporary_rv$data), title = datamods:::i18n("Imported data"), type = show_data_in)
},
# warning = function(warn) {
# showNotification(warn, type = "warning")
# },
error = function(err) {
showNotification(err, type = "err")
}
)
})
output$table <- toastui::renderDatagrid2({
req(temporary_rv$data)
tryCatch({
toastui::datagrid(
data = setNames(head(temporary_rv$data, 5),make.names(names(temporary_rv$data),unique = TRUE)),
theme = "striped",
colwidths = "guess",
minBodyHeight = 250
)
},
error = function(err) {
showNotification(err, type = "err")
}
tryCatch(
{
toastui::datagrid(
data = setNames(head(temporary_rv$data, 5), make.names(names(temporary_rv$data), unique = TRUE)),
theme = "striped",
colwidths = "guess",
minBodyHeight = 250
)
},
error = function(err) {
showNotification(err, type = "err")
}
)
})
@ -418,13 +420,22 @@ import_xls <- function(file, sheet, skip, na.strings) {
sheet |>
purrr::map(\(.x){
openxlsx2::read_xlsx(
file = file,
readxl::read_excel(
path = file,
sheet = .x,
skip_empty_rows = TRUE,
start_row = skip - 1,
na.strings = na.strings
na = na.strings,
skip = skip,
.name_repair = "unique_quiet",
trim_ws = TRUE
)
# openxlsx2::read_xlsx(
# file = file,
# sheet = .x,
# skip_empty_rows = TRUE,
# start_row = skip - 1,
# na.strings = na.strings
# )
}) |>
purrr::reduce(dplyr::full_join)
},