make valid names, do not modify NA values

isglobal-brge · Oct 6, 2021 · 928601e · 928601e
1 parent 63046f8
commit 928601e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: dsOmics
 Type: Package
 Title: DataSHIELD server site Omic functions
-Version: 1.0.7-8
+Version: 1.0.7-9
 Date: 2021-07-08
 Authors@R: c(person("Yannick", "Marcon", , "yannick.marcon@obiba.org", role = "aut"),
   person("Xavier", "Esriba-Montagut", , "xavier.escriba@isglobal.org", role = "aut"),

diff --git a/R/make_valid_namesDS.R b/R/make_valid_namesDS.R
@@ -13,6 +13,6 @@
 make_valid_namesDS <- function(x){
   x <- eval(parse(text=x), envir = parent.frame())
   colnames(x) <- make.names(colnames(x))
-  x <- x %>% mutate(across(where(is.character), make.names))
+  x <- x %>% rowwise() %>% mutate(across(where(is.character), ~ if(!is.na(.x)){make.names(.x)}else{NA}))
   return(x)
 }