Merge pull request #4 from DeepWaterIMR/copilot/fix-axis-label-issue

Replace tidyselect::all_of with !! operator in dplyr::rename operations

Author: MikkoVihtakari

DESCRIPTION

@@ -15,7 +15,7 @@ Description: Contains functions to create life history parameter plots from raw
 	collection of packages. The package contains references to FishBase 
 	(Froese R., Pauly D., 2023) <https://www.fishbase.se/>.
 Depends: R (>= 3.5.0), ggplot2 (>= 3.4.0)
-Imports: dplyr, tibble, tidyr, ggridges (>= 0.5.0), fishmethods, broom, tidyselect,
+Imports: dplyr, tibble, tidyr, ggridges (>= 0.5.0), fishmethods, broom,
   magrittr, ggrepel, scales, purrr
 Suggests: knitr, rmarkdown
 License: GPL-3

R/plot_catchcurve.R

@@ -122,7 +122,7 @@ plot_catchcurve <- function(
   ## Select and rename columns ####
 
   dt <- dt %>%
-    dplyr::rename("age" = tidyselect::all_of(age)) %>%
+    dplyr::rename("age" = !!age) %>%
     dplyr::filter(!is.na(age)) %>%
     dplyr::mutate(age = as.numeric(age))
 
@@ -137,13 +137,13 @@ plot_catchcurve <- function(
 
     if (is.null(time)) {
       dt <- dt %>%
-        dplyr::rename("sex" = tidyselect::all_of(sex)) %>%
+        dplyr::rename("sex" = !!sex) %>%
         dplyr::filter(!is.na(sex)) %>%
         dplyr::group_by(sex, age) %>%
         dplyr::count()
     } else {
       dt <- dt %>%
-        dplyr::rename("sex" = tidyselect::all_of(sex)) %>%
+        dplyr::rename("sex" = !!sex) %>%
         dplyr::filter(!is.na(sex)) %>%
         dplyr::group_by(time = get(time), sex, age) %>%
         dplyr::count()

R/plot_growth.R

@@ -92,7 +92,7 @@ plot_growth <- function(
     orig.nrow <- nrow(dt)
 
     dt <- dt %>%
-      dplyr::rename("sex" = tidyselect::all_of(sex)) %>%
+      dplyr::rename("sex" = !!sex) %>%
       dplyr::filter(!is.na(sex))
 
     sex.missing <- orig.nrow - nrow(dt)
@@ -106,8 +106,8 @@ plot_growth <- function(
 
   dt <- dt %>%
     dplyr::rename(
-      "age" = tidyselect::all_of(age),
-      "length" = tidyselect::all_of(length)
+      "age" = !!age,
+      "length" = !!length
     )
 
   length.missing <- sum(is.na(dt$length))

R/plot_lw.R

@@ -105,7 +105,7 @@ plot_lw <- function(
     orig.nrow <- nrow(dt)
 
     dt <- dt %>%
-      dplyr::rename("sex" = tidyselect::all_of(sex)) %>%
+      dplyr::rename("sex" = !!sex) %>%
       dplyr::filter(!is.na(sex))
 
     sex.missing <- orig.nrow - nrow(dt)
@@ -119,8 +119,8 @@ plot_lw <- function(
 
   dt <- dt %>%
     dplyr::rename(
-      "weight" = tidyselect::all_of(weight),
-      "length" = tidyselect::all_of(length)
+      "weight" = !!weight,
+      "length" = !!length
     )
 
   length.missing <- sum(is.na(dt$length))

R/plot_maturity.R

@@ -137,8 +137,8 @@ plot_maturity <- function(
 
   dt <- dt %>%
     dplyr::rename(
-      "maturity" = tidyselect::all_of(maturity),
-      "length" = tidyselect::all_of(length)
+      "maturity" = !!maturity,
+      "length" = !!length
     ) %>%
     dplyr::filter(
       !is.na(maturity) &
@@ -156,7 +156,7 @@ plot_maturity <- function(
     }
 
     dt <- dt %>%
-      dplyr::rename("sex" = tidyselect::all_of(sex)) %>%
+      dplyr::rename("sex" = !!sex) %>%
       dplyr::filter(!is.na(sex)) %>%
       dplyr::select(length, sex, maturity)