andreas/FreesearchR
1
0
Fork 0
mirror of https://github.com/agdamsbo/FreesearchR.git synced 2025-09-12 18:09:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: andreas:7fde4bde46c2498291208124c41b0bca1189531c
Branches Tags
andreas:main
andreas:gh-pages
andreas:v25.8.2
andreas:v25.8.1
andreas:v25.7.2
andreas:v25.7.1
andreas:v25.6.3
andreas:v25.6.2
andreas:v25.6.1
andreas:v25.5.6
andreas:v25.5.4
andreas:v25.5.3
andreas:v25.5.2
andreas:v25.5.1
andreas:v25.4.5
andreas:v25.4.4
andreas:v25.4.3
andreas:v25.4.2
andreas:v25.4.1
andreas:v25.3.1
andreas:v24.12.1
..
compare: andreas:67cfc313048fe40c6a66ef087d97ac49a0e8303f
Branches Tags
andreas:main
andreas:gh-pages
andreas:v25.8.2
andreas:v25.8.1
andreas:v25.7.2
andreas:v25.7.1
andreas:v25.6.3
andreas:v25.6.2
andreas:v25.6.1
andreas:v25.5.6
andreas:v25.5.4
andreas:v25.5.3
andreas:v25.5.2
andreas:v25.5.1
andreas:v25.4.5
andreas:v25.4.4
andreas:v25.4.3
andreas:v25.4.2
andreas:v25.4.1
andreas:v25.3.1
andreas:v24.12.1

No commits in common. "7fde4bde46c2498291208124c41b0bca1189531c" and "67cfc313048fe40c6a66ef087d97ac49a0e8303f" have entirely different histories.
7fde4bde46 ... 67cfc31304

18 changed files with 159 additions and 409 deletions
Show stats Expand all files Collapse all files

30
CITATION.cff
View file

@ -9,7 +9,7 @@ type: software
license: AGPL-3.0-or-later
title: 'FreesearchR: A free and open-source browser based data analysis tool for researchers
with publication ready output'
version: 25.8.2
version: 25.8.1
doi: 10.5281/zenodo.14527429
identifiers:
- type: url
@ -1002,34 +1002,6 @@ references:
email: russell-lenth@uiowa.edu
year: '2025'
doi: 10.32614/CRAN.package.emmeans
- type: software
title: readxl
abstract: 'readxl: Read Excel Files'
notes: Imports
url: https://readxl.tidyverse.org
repository: https://CRAN.R-project.org/package=readxl
authors:
- family-names: Wickham
given-names: Hadley
email: hadley@posit.co
orcid: https://orcid.org/0000-0003-4757-117X
- family-names: Bryan
given-names: Jennifer
email: jenny@posit.co
orcid: https://orcid.org/0000-0002-6983-2759
year: '2025'
doi: 10.32614/CRAN.package.readxl
- type: software
title: NHANES
abstract: 'NHANES: Data from the US National Health and Nutrition Examination Study'
notes: Imports
repository: https://CRAN.R-project.org/package=NHANES
authors:
- family-names: Pruim
given-names: Randall
email: rpruim@calvin.edu
year: '2025'
doi: 10.32614/CRAN.package.NHANES
- type: software
title: styler
abstract: 'styler: Non-Invasive Pretty Printing of R Code'

6
DESCRIPTION
View file

@ -1,6 +1,6 @@
Package: FreesearchR
Title: A free and open-source browser based data analysis tool for researchers with publication ready output
Version: 25.8.2
Version: 25.8.1
Authors@R: c(
person("Andreas Gammelgaard", "Damsbo",email="agdamsbo@clin.au.dk", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-7559-1154")),
@ -64,9 +64,7 @@ Imports:
RcppArmadillo,
ggcorrplot,
shinyjs,
emmeans,
readxl,
NHANES
emmeans
Suggests:
styler,
devtools,

8
NEWS.md
View file

@ -1,10 +1,6 @@
# FreesearchR 25.8.2
# FreesearchR 25.8.2 - DEV
- *NEW* Including the [NHANES](https://cran.r-project.org/web/packages/NHANES/refman/NHANES.html#NHANES) dataset for experimentation.
- *BUG* Improved JS to correctly handle menu drop downs on mobile devices
- *DOCS* Updated "Prepare > Overview" to "Prepare > Overview and filter" to better reflect options.
- *NEW* preparing to automatically only show relevant tabs to simplify interface. NOT IMPLEMENTED YET
# FreesearchR 25.8.1

2
R/app_version.R
View file

@ -1 +1 @@
app_version <- function()'25.8.2'
app_version <- function()'25.8.1'

3
R/helpers.R
View file

@ -153,8 +153,7 @@ dummy_Imports <- function() {
cardx::all_of(),
parameters::ci(),
DT::addRow(),
bslib::accordion(),
NHANES::NHANES()
bslib::accordion()
)
# https://github.com/hadley/r-pkgs/issues/828
}

2
R/hosted_version.R
View file

@ -1 +1 @@
hosted_version <- function()'v25.8.2-250827'
hosted_version <- function()'v25.8.1-250808'

BIN
R/sysdata.rda
View file

Binary file not shown.

3
R/ui_elements.R
View file

@ -160,11 +160,10 @@ ui_elements <- function(selection) {
icon = shiny::icon("pen-to-square"),
value = "nav_prepare",
bslib::nav_panel(
title = "Overview and filter",
title = "Overview",
icon = shiny::icon("eye"),
value = "nav_prepare_overview",
tags$h3("Overview and filtering"),
# validation_ui("validation_col"),
fluidRow(
shiny::column(
width = 9,

54
SESSION.md
View file

@ -4,18 +4,18 @@
|setting |value |
|:-----------|:------------------------------------------|
|version |R version 4.4.1 (2024-06-14) |
|os |macOS 15.6.1 |
|os |macOS 15.3.1 |
|system |aarch64, darwin20 |
|ui |RStudio |
|language |(EN) |
|collate |en_US.UTF-8 |
|ctype |en_US.UTF-8 |
|tz |Europe/Copenhagen |
|date |2025-08-27 |
|date |2025-08-08 |
|rstudio |2025.05.0+496 Mariposa Orchid (desktop) |
|pandoc |3.6.4 @ /opt/homebrew/bin/ (via rmarkdown) |
|quarto |1.7.30 @ /usr/local/bin/quarto |
|FreesearchR |25.8.2.250827 |
|FreesearchR |25.8.1.250808 |
--------------------------------------------------------------------------------
@ -26,8 +26,6 @@
|apexcharter |0.4.4 |2024-09-06 |CRAN (R 4.4.1) |
|askpass |1.2.1 |2024-10-04 |CRAN (R 4.4.1) |
|assertthat |0.2.1 |2019-03-21 |CRAN (R 4.4.1) |
|attachment |0.4.5 |2025-03-14 |CRAN (R 4.4.1) |
|attempt |0.3.1 |2020-05-03 |CRAN (R 4.4.1) |
|backports |1.5.0 |2024-05-23 |CRAN (R 4.4.1) |
|base64enc |0.1-3 |2015-07-28 |CRAN (R 4.4.1) |
|bayestestR |0.16.1 |2025-07-01 |CRAN (R 4.4.1) |
@ -36,7 +34,7 @@
|bitops |1.0-9 |2024-10-03 |CRAN (R 4.4.1) |
|boot |1.3-31 |2024-08-28 |CRAN (R 4.4.1) |
|brio |1.1.5 |2024-04-24 |CRAN (R 4.4.1) |
|broom |1.0.9 |2025-07-28 |CRAN (R 4.4.1) |
|broom |1.0.8 |2025-03-28 |CRAN (R 4.4.1) |
|broom.helpers |1.21.0 |2025-04-24 |CRAN (R 4.4.1) |
|bsicons |0.1.2 |2023-11-04 |CRAN (R 4.4.0) |
|bslib |0.9.0 |2025-01-30 |CRAN (R 4.4.1) |
@ -45,7 +43,6 @@
|cardx |0.2.5 |2025-07-03 |CRAN (R 4.4.1) |
|caTools |1.18.3 |2024-09-04 |CRAN (R 4.4.1) |
|cellranger |1.1.0 |2016-07-27 |CRAN (R 4.4.0) |
|cffr |1.2.0 |2025-01-25 |CRAN (R 4.4.1) |
|checkmate |2.3.2 |2024-07-29 |CRAN (R 4.4.0) |
|class |7.3-23 |2025-01-01 |CRAN (R 4.4.1) |
|classInt |0.4-11 |2025-01-08 |CRAN (R 4.4.1) |
@ -55,17 +52,14 @@
|colorspace |2.1-1 |2024-07-26 |CRAN (R 4.4.1) |
|commonmark |2.0.0 |2025-07-07 |CRAN (R 4.4.1) |
|crayon |1.5.3 |2024-06-20 |CRAN (R 4.4.1) |
|credentials |2.0.2 |2024-10-04 |CRAN (R 4.4.1) |
|curl |6.4.0 |2025-06-22 |CRAN (R 4.4.1) |
|data.table |1.17.8 |2025-07-10 |CRAN (R 4.4.1) |
|datamods |1.5.3 |2024-10-02 |CRAN (R 4.4.1) |
|datawizard |1.2.0 |2025-07-17 |CRAN (R 4.4.1) |
|DEoptimR |1.1-4 |2025-07-27 |CRAN (R 4.4.1) |
|DEoptimR |1.1-3-1 |2024-11-23 |CRAN (R 4.4.1) |
|desc |1.4.3 |2023-12-10 |CRAN (R 4.4.1) |
|devtools |2.4.5 |2022-10-11 |CRAN (R 4.4.0) |
|DHARMa |0.4.7 |2024-10-18 |CRAN (R 4.4.1) |
|digest |0.6.37 |2024-08-19 |CRAN (R 4.4.1) |
|dockerfiler |0.2.5 |2025-05-07 |CRAN (R 4.4.1) |
|doParallel |1.0.17 |2022-02-07 |CRAN (R 4.4.0) |
|dplyr |1.1.4 |2023-11-17 |CRAN (R 4.4.0) |
|DT |0.33 |2024-04-04 |CRAN (R 4.4.0) |
@ -74,7 +68,7 @@
|ellipsis |0.3.2 |2021-04-29 |CRAN (R 4.4.1) |
|emmeans |1.11.2 |2025-07-11 |CRAN (R 4.4.1) |
|esquisse |2.1.0 |2025-02-21 |CRAN (R 4.4.1) |
|estimability |1.5.1 |2024-05-12 |CRAN (R 4.4.1) |
|estimability |1.5.1 |2024-05-12 |CRAN (R 4.4.0) |
|eulerr |7.0.2 |2024-03-28 |CRAN (R 4.4.0) |
|evaluate |1.0.4 |2025-06-18 |CRAN (R 4.4.1) |
|farver |2.1.2 |2024-05-13 |CRAN (R 4.4.1) |
@ -88,19 +82,16 @@
|foreach |1.5.2 |2022-02-02 |CRAN (R 4.4.0) |
|foreign |0.8-90 |2025-03-31 |CRAN (R 4.4.1) |
|Formula |1.2-5 |2023-02-24 |CRAN (R 4.4.1) |
|FreesearchR |25.8.2 |NA |NA |
|FreesearchR |25.8.1 |NA |NA |
|fs |1.6.6 |2025-04-12 |CRAN (R 4.4.1) |
|gdtools |0.4.2 |2025-03-27 |CRAN (R 4.4.1) |
|generics |0.1.4 |2025-05-09 |CRAN (R 4.4.1) |
|gert |2.1.5 |2025-03-25 |CRAN (R 4.4.1) |
|ggalluvial |0.12.5 |2023-02-22 |CRAN (R 4.4.0) |
|ggcorrplot |0.1.4.1 |2023-09-05 |CRAN (R 4.4.0) |
|ggforce |0.5.0 |2025-06-18 |CRAN (R 4.4.1) |
|ggplot2 |3.5.2 |2025-04-09 |CRAN (R 4.4.1) |
|ggridges |0.5.6 |2024-01-23 |CRAN (R 4.4.0) |
|ggstats |0.10.0 |2025-07-02 |CRAN (R 4.4.1) |
|gh |1.5.0 |2025-05-26 |CRAN (R 4.4.1) |
|gitcreds |0.1.2 |2022-09-08 |CRAN (R 4.4.1) |
|glue |1.8.0 |2024-09-30 |CRAN (R 4.4.1) |
|gridExtra |2.3 |2017-09-09 |CRAN (R 4.4.1) |
|gt |1.0.0 |2025-04-05 |CRAN (R 4.4.1) |
@ -114,24 +105,21 @@
|htmltools |0.5.8.1 |2024-04-04 |CRAN (R 4.4.1) |
|htmlwidgets |1.6.4 |2023-12-06 |CRAN (R 4.4.0) |
|httpuv |1.6.16 |2025-04-16 |CRAN (R 4.4.1) |
|httr2 |1.2.1 |2025-07-22 |CRAN (R 4.4.1) |
|IDEAFilter |0.2.1 |2025-07-29 |CRAN (R 4.4.1) |
|insight |1.4.0 |2025-08-18 |CRAN (R 4.4.1) |
|IDEAFilter |0.2.0 |2024-04-15 |CRAN (R 4.4.0) |
|insight |1.3.1 |2025-06-30 |CRAN (R 4.4.1) |
|iterators |1.0.14 |2022-02-05 |CRAN (R 4.4.1) |
|jquerylib |0.1.4 |2021-04-26 |CRAN (R 4.4.0) |
|jsonlite |2.0.0 |2025-03-27 |CRAN (R 4.4.1) |
|jsonvalidate |1.5.0 |2025-02-07 |CRAN (R 4.4.1) |
|KernSmooth |2.23-26 |2025-01-01 |CRAN (R 4.4.1) |
|keyring |1.4.1 |2025-06-15 |CRAN (R 4.4.1) |
|knitr |1.50 |2025-03-16 |CRAN (R 4.4.1) |
|labeling |0.4.3 |2023-08-29 |CRAN (R 4.4.1) |
|later |1.4.2 |2025-04-08 |CRAN (R 4.4.1) |
|lattice |0.22-7 |2025-04-02 |CRAN (R 4.4.1) |
|lifecycle |1.0.4 |2023-11-07 |CRAN (R 4.4.1) |
|litedown |0.7 |2025-04-08 |CRAN (R 4.4.1) |
|lme4 |1.1-37 |2025-03-26 |CRAN (R 4.4.1) |
|lubridate |1.9.4 |2024-12-08 |CRAN (R 4.4.1) |
|magrittr |2.0.3 |2022-03-30 |CRAN (R 4.4.1) |
|markdown |2.0 |2025-03-23 |CRAN (R 4.4.1) |
|MASS |7.3-65 |2025-02-28 |CRAN (R 4.4.1) |
|Matrix |1.7-3 |2025-03-11 |CRAN (R 4.4.1) |
|memoise |2.0.1 |2021-11-26 |CRAN (R 4.4.0) |
@ -139,15 +127,13 @@
|miniUI |0.1.2 |2025-04-17 |CRAN (R 4.4.1) |
|minqa |1.2.8 |2024-08-17 |CRAN (R 4.4.1) |
|mvtnorm |1.3-3 |2025-01-10 |CRAN (R 4.4.1) |
|NHANES |2.1.0 |2015-07-02 |CRAN (R 4.4.0) |
|nlme |3.1-168 |2025-03-31 |CRAN (R 4.4.1) |
|nloptr |2.2.1 |2025-03-17 |CRAN (R 4.4.1) |
|nnet |7.3-20 |2025-01-01 |CRAN (R 4.4.1) |
|officer |0.6.10 |2025-05-30 |CRAN (R 4.4.1) |
|opdisDownsampling |1.0.1 |2024-04-15 |CRAN (R 4.4.0) |
|openssl |2.3.3 |2025-05-26 |CRAN (R 4.4.1) |
|openxlsx2 |1.18 |2025-07-29 |CRAN (R 4.4.1) |
|pak |0.9.0 |2025-05-27 |CRAN (R 4.4.1) |
|openxlsx2 |1.17 |2025-07-04 |CRAN (R 4.4.1) |
|parameters |0.27.0 |2025-07-09 |CRAN (R 4.4.1) |
|patchwork |1.3.1 |2025-06-21 |CRAN (R 4.4.1) |
|pbmcapply |1.5.1 |2022-04-28 |CRAN (R 4.4.1) |
@ -159,6 +145,7 @@
|pkgload |1.4.0 |2024-06-28 |CRAN (R 4.4.0) |
|plyr |1.8.9 |2023-10-02 |CRAN (R 4.4.1) |
|polyclip |1.10-7 |2024-07-23 |CRAN (R 4.4.1) |
|polylabelr |0.3.0 |2024-11-19 |CRAN (R 4.4.1) |
|pracma |2.4.4 |2023-11-10 |CRAN (R 4.4.1) |
|processx |3.8.6 |2025-02-21 |CRAN (R 4.4.1) |
|profvis |0.4.0 |2024-09-20 |CRAN (R 4.4.1) |
@ -168,11 +155,14 @@
|purrr |1.1.0 |2025-07-10 |CRAN (R 4.4.1) |
|qqconf |1.3.2 |2023-04-14 |CRAN (R 4.4.0) |
|qqplotr |0.0.6 |2023-01-25 |CRAN (R 4.4.0) |
|quarto |1.5.0 |2025-07-28 |RSPM (R 4.4.0) |
|quarto |1.4.4 |2024-07-20 |CRAN (R 4.4.0) |
|R.cache |0.17.0 |2025-05-02 |CRAN (R 4.4.1) |
|R.methodsS3 |1.8.2 |2022-06-13 |CRAN (R 4.4.1) |
|R.oo |1.27.1 |2025-05-02 |CRAN (R 4.4.1) |
|R.utils |2.13.0 |2025-02-24 |CRAN (R 4.4.1) |
|R6 |2.6.1 |2025-02-15 |CRAN (R 4.4.1) |
|ragg |1.4.0 |2025-04-10 |CRAN (R 4.4.1) |
|rankinPlot |1.1.0 |2023-01-30 |CRAN (R 4.4.0) |
|rappdirs |0.3.3 |2021-01-31 |CRAN (R 4.4.1) |
|rbibutils |2.3 |2024-10-04 |CRAN (R 4.4.1) |
|RColorBrewer |1.1-3 |2022-04-03 |CRAN (R 4.4.1) |
|Rcpp |1.1.0 |2025-07-02 |CRAN (R 4.4.1) |
@ -183,11 +173,11 @@
|readr |2.1.5 |2024-01-10 |CRAN (R 4.4.0) |
|readxl |1.4.5 |2025-03-07 |CRAN (R 4.4.1) |
|REDCapCAST |25.3.2 |2025-03-10 |CRAN (R 4.4.1) |
|REDCapR |1.5.0 |2025-07-28 |CRAN (R 4.4.1) |
|REDCapR |1.4.0 |2025-01-11 |CRAN (R 4.4.1) |
|reformulas |0.4.1 |2025-04-30 |CRAN (R 4.4.1) |
|remotes |2.5.0 |2024-03-17 |CRAN (R 4.4.1) |
|rempsyc |0.1.9 |2025-02-01 |CRAN (R 4.4.1) |
|renv |1.1.5 |2025-07-24 |CRAN (R 4.4.1) |
|renv |1.1.4 |2025-03-20 |CRAN (R 4.4.1) |
|reshape2 |1.4.4 |2020-04-09 |CRAN (R 4.4.0) |
|rio |1.2.3 |2024-09-25 |CRAN (R 4.4.1) |
|rlang |1.1.6 |2025-04-11 |CRAN (R 4.4.1) |
@ -203,15 +193,13 @@
|see |0.11.0 |2025-03-11 |CRAN (R 4.4.1) |
|sessioninfo |1.2.3 |2025-02-05 |CRAN (R 4.4.1) |
|shiny |1.11.1 |2025-07-03 |CRAN (R 4.4.1) |
|shiny.i18n |0.3.0 |NA |NA |
|shiny2docker |0.0.3 |2025-06-28 |CRAN (R 4.4.1) |
|shinybusy |0.3.3 |2024-03-09 |CRAN (R 4.4.0) |
|shinyjs |2.1.0 |2021-12-23 |CRAN (R 4.4.0) |
|shinyTime |1.0.3 |2022-08-19 |CRAN (R 4.4.0) |
|shinyWidgets |0.9.0 |2025-02-21 |CRAN (R 4.4.1) |
|stringi |1.8.7 |2025-03-27 |CRAN (R 4.4.1) |
|stringr |1.5.1 |2023-11-14 |CRAN (R 4.4.0) |
|sys |3.4.3 |2024-10-04 |CRAN (R 4.4.1) |
|styler |1.10.3 |2024-04-07 |CRAN (R 4.4.0) |
|systemfonts |1.2.3 |2025-04-30 |CRAN (R 4.4.1) |
|testthat |3.2.3 |2025-01-13 |CRAN (R 4.4.1) |
|textshaping |1.0.1 |2025-05-01 |CRAN (R 4.4.1) |
@ -227,7 +215,6 @@
|urlchecker |1.0.1 |2021-11-30 |CRAN (R 4.4.1) |
|usethis |3.1.0 |2024-11-26 |CRAN (R 4.4.1) |
|uuid |1.2-1 |2024-07-29 |CRAN (R 4.4.1) |
|V8 |6.0.6 |2025-08-18 |CRAN (R 4.4.1) |
|vctrs |0.6.5 |2023-12-01 |CRAN (R 4.4.0) |
|vroom |1.6.5 |2023-12-05 |CRAN (R 4.4.0) |
|withr |3.0.2 |2024-10-28 |CRAN (R 4.4.1) |
@ -236,5 +223,4 @@
|xml2 |1.3.8 |2025-03-14 |CRAN (R 4.4.1) |
|xtable |1.8-4 |2019-04-21 |CRAN (R 4.4.1) |
|yaml |2.3.10 |2024-07-26 |CRAN (R 4.4.1) |
|yesno |0.1.3 |2024-07-26 |CRAN (R 4.4.1) |
|zip |2.3.3 |2025-05-13 |CRAN (R 4.4.1) |

2
app_docker/Dockerfile
View file

@ -3,7 +3,7 @@ RUN apt-get update -y && apt-get install -y cmake make libcurl4-openssl-dev lib
RUN mkdir -p /usr/local/lib/R/etc/ /usr/lib/R/etc/
RUN echo "options(renv.config.pak.enabled = FALSE, repos = c(CRAN = 'https://cran.rstudio.com/'), download.file.method = 'libcurl', Ncpus = 4)" | tee /usr/local/lib/R/etc/Rprofile.site | tee /usr/lib/R/etc/Rprofile.site
RUN R -e 'install.packages("remotes")'
RUN R -e 'remotes::install_version("renv", version = "1.1.5")'
RUN R -e 'remotes::install_version("renv", version = "1.1.4")'
COPY renv.lock renv.lock
RUN --mount=type=cache,id=renv-cache,target=/root/.cache/R/renv R -e 'renv::restore()'
WORKDIR /srv/shiny-server/

22
app_docker/app.R
View file

@ -49,7 +49,7 @@ library(rlang)
#### Current file: /Users/au301842/FreesearchR/R//app_version.R
########
app_version <- function()'25.8.2'
app_version <- function()'25.8.1'
########
@ -3527,8 +3527,7 @@ dummy_Imports <- function() {
cardx::all_of(),
parameters::ci(),
DT::addRow(),
bslib::accordion(),
NHANES::NHANES()
bslib::accordion()
)
# https://github.com/hadley/r-pkgs/issues/828
}
@ -4047,7 +4046,7 @@ simple_snake <- function(data){
#### Current file: /Users/au301842/FreesearchR/R//hosted_version.R
########
hosted_version <- function()'v25.8.2-250827'
hosted_version <- function()'v25.8.1-250808'
########
@ -8487,11 +8486,10 @@ ui_elements <- function(selection) {
icon = shiny::icon("pen-to-square"),
value = "nav_prepare",
bslib::nav_panel(
title = "Overview and filter",
title = "Overview",
icon = shiny::icon("eye"),
value = "nav_prepare_overview",
tags$h3("Overview and filtering"),
# validation_ui("validation_col"),
fluidRow(
shiny::column(
width = 9,
@ -10966,18 +10964,6 @@ server <- function(input, output, session) {
})
# validation_server(id = "validation_col",
# data = purrr::map2(
# .x = validation_lib()[1],
# .y = list(
# list(
# x =
# reactive(rv$data),
# y =
# reactive(rv$data_variables)
# )),
# make_validation))
######### Data filter
# IDEAFilter has the least cluttered UI, but might have a License issue
# Consider using shinyDataFilter, though not on CRAN

126
app_docker/renv.lock
View file

File diff suppressed because one or more lines are too long

54
app_docker/www/scripts.js
View file

@ -6,52 +6,24 @@ $(document).on('shown.bs.tab', '#main_panel', function(e) {
$('#main_panel .dropdown-toggle').removeClass('show').attr('aria-expanded', 'false');
});
$(document).on('shiny:sessioninitialized', function() {
// Function to collapse navbar on mobile
function collapseNavbar() {
var navbar = $('.navbar-collapse');
if (navbar.hasClass('show')) {
navbar.removeClass('show');
$('.navbar-toggler').addClass('collapsed');
$('.navbar-toggler').attr('aria-expanded', 'false');
}
// Function to collapse navbar on mobile
function collapseNavbar() {
var navbar = $('.navbar-collapse');
if (navbar.hasClass('show')) {
navbar.removeClass('show');
$('.navbar-toggler').addClass('collapsed');
$('.navbar-toggler').attr('aria-expanded', 'false');
}
}
// Main approach: Handle clicks on nav elements
$(document).on('click', '.navbar-nav .nav-link, .dropdown-item', function(event) {
var $target = $(event.currentTarget);
// Don't collapse if this is a dropdown toggle
if ($target.hasClass('dropdown-toggle')) {
return;
}
// Don't collapse if this is inside a dropdown and the dropdown should stay open
if ($target.hasClass('nav-link') && $target.closest('.dropdown').length &&
!$target.attr('data-bs-toggle')) {
return;
}
// Collapse the navbar after a short delay
// Add click event to navigation tabs
$(document).on('click', '.nav-link[data-bs-toggle=\"tab\"]', function() {
setTimeout(collapseNavbar, 10);
});
// Handle tab toggles specifically
$(document).on('click', '.nav-link[data-bs-toggle="tab"]', function() {
if (!$(this).hasClass('dropdown-toggle')) {
setTimeout(collapseNavbar, 10);
}
});
// Optional: Handle clicks outside the navbar to close it
$(document).on('click', function(event) {
var navbar = $('.navbar-collapse');
// Check if click is outside navbar and navbar is open
if (navbar.hasClass('show') &&
!$(event.target).closest('.navbar').length) {
collapseNavbar();
}
// Also handle direct clicks on nav items
$(document).on('click', '.navbar-nav .nav-link', function() {
setTimeout(collapseNavbar, 10);
});
});

20
inst/apps/FreesearchR/app.R
View file

@ -3527,8 +3527,7 @@ dummy_Imports <- function() {
cardx::all_of(),
parameters::ci(),
DT::addRow(),
bslib::accordion(),
NHANES::NHANES()
bslib::accordion()
)
# https://github.com/hadley/r-pkgs/issues/828
}
@ -4047,7 +4046,7 @@ simple_snake <- function(data){
#### Current file: /Users/au301842/FreesearchR/R//hosted_version.R
########
hosted_version <- function()'v25.8.1-250827'
hosted_version <- function()'v25.8.1-250808'
########
@ -8487,11 +8486,10 @@ ui_elements <- function(selection) {
icon = shiny::icon("pen-to-square"),
value = "nav_prepare",
bslib::nav_panel(
title = "Overview and filter",
title = "Overview",
icon = shiny::icon("eye"),
value = "nav_prepare_overview",
tags$h3("Overview and filtering"),
# validation_ui("validation_col"),
fluidRow(
shiny::column(
width = 9,
@ -10965,18 +10963,6 @@ server <- function(input, output, session) {
})
# validation_server(id = "validation_col",
# data = purrr::map2(
# .x = validation_lib()[1],
# .y = list(
# list(
# x =
# reactive(rv$data),
# y =
# reactive(rv$data_variables)
# )),
# make_validation))
######### Data filter
# IDEAFilter has the least cluttered UI, but might have a License issue
# Consider using shinyDataFilter, though not on CRAN

54
inst/apps/FreesearchR/www/scripts.js
View file

@ -6,52 +6,24 @@ $(document).on('shown.bs.tab', '#main_panel', function(e) {
$('#main_panel .dropdown-toggle').removeClass('show').attr('aria-expanded', 'false');
});
$(document).on('shiny:sessioninitialized', function() {
// Function to collapse navbar on mobile
function collapseNavbar() {
var navbar = $('.navbar-collapse');
if (navbar.hasClass('show')) {
navbar.removeClass('show');
$('.navbar-toggler').addClass('collapsed');
$('.navbar-toggler').attr('aria-expanded', 'false');
}
// Function to collapse navbar on mobile
function collapseNavbar() {
var navbar = $('.navbar-collapse');
if (navbar.hasClass('show')) {
navbar.removeClass('show');
$('.navbar-toggler').addClass('collapsed');
$('.navbar-toggler').attr('aria-expanded', 'false');
}
}
// Main approach: Handle clicks on nav elements
$(document).on('click', '.navbar-nav .nav-link, .dropdown-item', function(event) {
var $target = $(event.currentTarget);
// Don't collapse if this is a dropdown toggle
if ($target.hasClass('dropdown-toggle')) {
return;
}
// Don't collapse if this is inside a dropdown and the dropdown should stay open
if ($target.hasClass('nav-link') && $target.closest('.dropdown').length &&
!$target.attr('data-bs-toggle')) {
return;
}
// Collapse the navbar after a short delay
// Add click event to navigation tabs
$(document).on('click', '.nav-link[data-bs-toggle=\"tab\"]', function() {
setTimeout(collapseNavbar, 10);
});
// Handle tab toggles specifically
$(document).on('click', '.nav-link[data-bs-toggle="tab"]', function() {
if (!$(this).hasClass('dropdown-toggle')) {
setTimeout(collapseNavbar, 10);
}
});
// Optional: Handle clicks outside the navbar to close it
$(document).on('click', function(event) {
var navbar = $('.navbar-collapse');
// Check if click is outside navbar and navbar is open
if (navbar.hasClass('show') &&
!$(event.target).closest('.navbar').length) {
collapseNavbar();
}
// Also handle direct clicks on nav items
$(document).on('click', '.navbar-nav .nav-link', function() {
setTimeout(collapseNavbar, 10);
});
});

54
inst/assets/js/FreesearchR.js
View file

@ -6,52 +6,24 @@ $(document).on('shown.bs.tab', '#main_panel', function(e) {
$('#main_panel .dropdown-toggle').removeClass('show').attr('aria-expanded', 'false');
});
$(document).on('shiny:sessioninitialized', function() {
// Function to collapse navbar on mobile
function collapseNavbar() {
var navbar = $('.navbar-collapse');
if (navbar.hasClass('show')) {
navbar.removeClass('show');
$('.navbar-toggler').addClass('collapsed');
$('.navbar-toggler').attr('aria-expanded', 'false');
}
// Function to collapse navbar on mobile
function collapseNavbar() {
var navbar = $('.navbar-collapse');
if (navbar.hasClass('show')) {
navbar.removeClass('show');
$('.navbar-toggler').addClass('collapsed');
$('.navbar-toggler').attr('aria-expanded', 'false');
}
}
// Main approach: Handle clicks on nav elements
$(document).on('click', '.navbar-nav .nav-link, .dropdown-item', function(event) {
var $target = $(event.currentTarget);
// Don't collapse if this is a dropdown toggle
if ($target.hasClass('dropdown-toggle')) {
return;
}
// Don't collapse if this is inside a dropdown and the dropdown should stay open
if ($target.hasClass('nav-link') && $target.closest('.dropdown').length &&
!$target.attr('data-bs-toggle')) {
return;
}
// Collapse the navbar after a short delay
// Add click event to navigation tabs
$(document).on('click', '.nav-link[data-bs-toggle=\"tab\"]', function() {
setTimeout(collapseNavbar, 10);
});
// Handle tab toggles specifically
$(document).on('click', '.nav-link[data-bs-toggle="tab"]', function() {
if (!$(this).hasClass('dropdown-toggle')) {
setTimeout(collapseNavbar, 10);
}
});
// Optional: Handle clicks outside the navbar to close it
$(document).on('click', function(event) {
var navbar = $('.navbar-collapse');
// Check if click is outside navbar and navbar is open
if (navbar.hasClass('show') &&
!$(event.target).closest('.navbar').length) {
collapseNavbar();
}
// Also handle direct clicks on nav items
$(document).on('click', '.navbar-nav .nav-link', function() {
setTimeout(collapseNavbar, 10);
});
});

126
renv.lock
View file

File diff suppressed because one or more lines are too long

2
renv/activate.R
View file

@ -2,7 +2,7 @@
local({
# the requested version of renv
version <- "1.1.5"
version <- "1.1.4"
attr(version, "sha") <- NULL
# the project directory