Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
352b6f6
Allow column preselection for filter inclusion
Jeff-Thompson12 Mar 6, 2023
665a25f
Update shiny_data_filter.R
jhk0530 Jul 11, 2023
c4456d7
Add basic framework
Jeff-Thompson12 Jul 26, 2023
cbffcd5
Implement using an expression in numeric many
Jeff-Thompson12 Jul 26, 2023
9ab2e48
Set `dev` version
Jeff-Thompson12 Jul 26, 2023
f37bb03
Merge pull request #16 from jhk0530/master
Jeff-Thompson12 Jul 26, 2023
0ea052c
Utilize `%||%()` and set appropriate empty data structure
Jeff-Thompson12 Jul 26, 2023
dbd733b
Update NEWS
Jeff-Thompson12 Jul 26, 2023
199eccb
Merge pull request #19 from Biogen-Inc/jt-15-NULL_cannot_have_attributes
Jeff-Thompson12 Jul 26, 2023
f325ba5
Merge branch 'devel' into jt-13-preselection
Jeff-Thompson12 Jul 26, 2023
1e7672a
Update documentation
Jeff-Thompson12 Jul 26, 2023
8e0b38d
Use timezone of vector instead of trying to specify
Jeff-Thompson12 Jul 26, 2023
0531c0a
Change `filter_expr` to `filter_fn`
Jeff-Thompson12 Jul 27, 2023
349a67f
Turn back to silently failing for now
Jeff-Thompson12 Jul 27, 2023
1615f92
Implement preselection for datetime types
Jeff-Thompson12 Jul 27, 2023
aa5bfa5
Update other methods with preselection
Jeff-Thompson12 Jul 27, 2023
708f9c6
Update NEWS
Jeff-Thompson12 Jul 27, 2023
2b32f77
Move preselection argument to end
Jeff-Thompson12 Aug 2, 2023
b19b56f
Make preselection reactive
Jeff-Thompson12 Aug 2, 2023
ac7aeb3
Make application of filter pre-selection a function
Jeff-Thompson12 Aug 2, 2023
8afdbd9
Allow chaning/updating filter pre-selection
Jeff-Thompson12 Aug 2, 2023
9d8ab8e
Merge pull request #21 from Biogen-Inc/jt-17-fix_shiny_vector_datetime
AARON-CLARK Aug 2, 2023
2a2da74
Resolve merge conflicts with `devel`
Jeff-Thompson12 Aug 2, 2023
aedd0ff
Update documentation
Jeff-Thompson12 Aug 2, 2023
7cfaf06
Add wrappers for data filter item
Jeff-Thompson12 Aug 2, 2023
93a5e81
Add wrappers for shiny data filter
Jeff-Thompson12 Aug 2, 2023
262e616
Update NEWS
Jeff-Thompson12 Aug 2, 2023
9b00b3d
Add reader readme action
Jeff-Thompson12 Aug 2, 2023
e8a5d43
Update README to use wrappers
Jeff-Thompson12 Aug 2, 2023
4ebe124
Re-build Rmarkdown files
Jeff-Thompson12 Aug 2, 2023
88b9a29
Clean up comments and examples a little
Jeff-Thompson12 Aug 2, 2023
5cfa425
Merge branch 'jt-22-utilize_moduleServer' of https://github.com/Bioge…
Jeff-Thompson12 Aug 2, 2023
f7711b4
Re-build Rmarkdown files
Jeff-Thompson12 Aug 2, 2023
52205e1
Separate out IDEAFilter modules
Jeff-Thompson12 Aug 4, 2023
827917d
Add new filters using modern module implementation
Jeff-Thompson12 Aug 7, 2023
144ddbb
Add tests for new implementation
Jeff-Thompson12 Aug 7, 2023
0574fbc
Update example apps
Jeff-Thompson12 Aug 7, 2023
7b5f4ab
Fix bug when changing dataset
Jeff-Thompson12 Aug 7, 2023
a1c3b77
Repair `data_call`
Jeff-Thompson12 Aug 7, 2023
b1caa5b
Repair bug when switching datasets with added filters
Jeff-Thompson12 Aug 8, 2023
7e76a4e
Update documentation
Jeff-Thompson12 Aug 8, 2023
4faa89d
Add tests for reactive data
Jeff-Thompson12 Aug 8, 2023
8e65c5c
Add waiter
Jeff-Thompson12 Aug 8, 2023
bf403ff
Update NEWS
Jeff-Thompson12 Aug 8, 2023
bdacdbd
Merge pull request #23 from Biogen-Inc/jt-22-utilize_moduleServer
Jeff-Thompson12 Aug 8, 2023
45c7993
Merge branch 'devel' into jt-13-preselection
Jeff-Thompson12 Aug 8, 2023
938236e
Implement pre-selection using `IDEAFilter()`
Jeff-Thompson12 Aug 8, 2023
1c5b475
Increment version number
Jeff-Thompson12 Aug 8, 2023
5d07343
Implement column subsetting
Jeff-Thompson12 Aug 8, 2023
ff438ab
Update NEWS
Jeff-Thompson12 Aug 8, 2023
c59d597
Update documentation
Jeff-Thompson12 Aug 8, 2023
7786326
Merge pull request #24 from Biogen-Inc/jt-14-column_subsetting
Jeff-Thompson12 Aug 8, 2023
4cafa9e
Use `pillar::type_sum()` instead of `pillar::new_pillar_type()`
Jeff-Thompson12 Aug 8, 2023
e542fae
Update NEWS
Jeff-Thompson12 Aug 8, 2023
b739a0f
Merge pull request #25 from Biogen-Inc/jt-9-use_type_sum
Jeff-Thompson12 Aug 8, 2023
27ec963
Merge branch 'devel' into jt-13-preselection
Jeff-Thompson12 Aug 8, 2023
3431cd6
Fix merge conflicts with `dev`
Jeff-Thompson12 Aug 8, 2023
a25f48c
Fix bug with NAs imcorrectly displaying
Jeff-Thompson12 Aug 9, 2023
fafe952
Fix issue where `IDEAFilter()` was pointing to `shiny_data_filter_ite…
Jeff-Thompson12 Aug 9, 2023
0a959d6
Simplify `code()` reactive in `IDEAFilter()`
Jeff-Thompson12 Aug 9, 2023
3de74d3
Add test for pre-selection
Jeff-Thompson12 Aug 9, 2023
770555b
Increment version number
Jeff-Thompson12 Aug 9, 2023
5c2bb92
Merge pull request #20 from Biogen-Inc/jt-13-preselection
Jeff-Thompson12 Aug 9, 2023
8231cc8
Initialize vignettes
Jeff-Thompson12 Aug 10, 2023
3c5b24d
Don't reinitialize modules on resort
Jeff-Thompson12 Aug 14, 2023
7854af2
Repair test for IDEAFilter_item
Jeff-Thompson12 Aug 14, 2023
59b70b0
Add erase filter selection feature
Jeff-Thompson12 Aug 15, 2023
2c6e9bd
Remove inputs when exiting module
Jeff-Thompson12 Aug 16, 2023
de0cc04
Remove observers when exiting vector module
Jeff-Thompson12 Aug 16, 2023
34ea8c1
Increment version number
Jeff-Thompson12 Aug 16, 2023
b9e1bec
Add data to test data types
Jeff-Thompson12 Aug 16, 2023
fc1301d
Fix bug causing the erase filters event to trigger
Jeff-Thompson12 Aug 16, 2023
b0f97db
Update NEWS
Jeff-Thompson12 Aug 16, 2023
ef20ba4
Update NEWS again
Jeff-Thompson12 Aug 16, 2023
b42d5b5
Merge pull request #26 from Biogen-Inc/jt-vector_filter
Jeff-Thompson12 Aug 16, 2023
846749d
Require data
Jeff-Thompson12 Aug 16, 2023
0dd4bb1
Add checks for data being present
Jeff-Thompson12 Aug 16, 2023
41bc20c
Increment version number
Jeff-Thompson12 Aug 16, 2023
a917cd3
Merge pull request #27 from Biogen-Inc/jt-test_tidyCDISC
Jeff-Thompson12 Aug 16, 2023
2c4cc7c
Fix bug when switching between numeric few and many
Jeff-Thompson12 Aug 21, 2023
a0092bb
Add `try()` when destroying observer
Jeff-Thompson12 Aug 21, 2023
8c6d78e
Fix merge conflicts with `devel`
Jeff-Thompson12 Aug 28, 2023
d702a75
Update version number
Jeff-Thompson12 Aug 28, 2023
4aa8583
Resolve minor bug when switching from character vector
Jeff-Thompson12 Aug 28, 2023
0071ceb
Update authorship
Jeff-Thompson12 Aug 29, 2023
63295ab
Separate inputs in numeric few and many
Jeff-Thompson12 Aug 29, 2023
cdf4e1e
Update example apps
Jeff-Thompson12 Aug 29, 2023
a86572e
Flesh out vignette a little more
Jeff-Thompson12 Aug 29, 2023
736d49f
Change implementation of column subsetting
Jeff-Thompson12 Aug 29, 2023
2377a0c
Increment version number
Jeff-Thompson12 Aug 29, 2023
b343dbf
Update `columnSelectInput()`
Jeff-Thompson12 Aug 29, 2023
879cfbd
Merge pull request #28 from Biogen-Inc/jt-extend_col_subset
Jeff-Thompson12 Aug 29, 2023
162a16c
Merge branch 'devel' into jt-6-add_vignettes
Jeff-Thompson12 Aug 29, 2023
a011445
Increment version number
Jeff-Thompson12 Aug 29, 2023
dcc21a5
Re-build Rmarkdown files
Jeff-Thompson12 Aug 29, 2023
b46555f
Repair tests
Jeff-Thompson12 Aug 29, 2023
73cee62
Resolve some warnings
Jeff-Thompson12 Sep 19, 2023
e63c145
Resolve issue where column subsets were not getting updated
Jeff-Thompson12 Sep 22, 2023
53a4709
Flesh out vignette a little more
Jeff-Thompson12 Sep 22, 2023
d9d2f12
Update some language in vignette
Jeff-Thompson12 Sep 22, 2023
8cd8318
Merge pull request #29 from Biogen-Inc/jt-6-add_vignettes
Jeff-Thompson12 Sep 22, 2023
33e18ee
Fix some issues introduced by changes in selectize.js
jthompson-arcus Apr 2, 2024
3829ec3
Fix minor bug applying NA filter to logical vector
jthompson-arcus Apr 2, 2024
c07de5a
Don't show deprecated message for `shiny_data_filter_item` when calle…
jthompson-arcus Apr 2, 2024
27de7cf
Polish NEWS
jthompson-arcus Apr 3, 2024
d97d981
Fix URL redirect
jthompson-arcus Apr 3, 2024
c512f02
Update CRAN comments
jthompson-arcus Apr 3, 2024
747a746
Increment for minor release
jthompson-arcus Apr 3, 2024
69ddbcd
Update cran-comments.md
jthompson-arcus Apr 3, 2024
796bb24
.Rbuildignore, description, CRAN-SUB file changed
aclark02-arcus Apr 3, 2024
3b7224f
Update LICENSE.md
tidyCDISC Apr 10, 2024
e4c9a4a
Update LICENSE
tidyCDISC Apr 10, 2024
77a5263
Update README.Rmd
tidyCDISC Apr 10, 2024
41beb93
re-compile readme.md
aclark02-arcus Apr 10, 2024
6a3f369
push updated cran-comments
aclark02-arcus Apr 10, 2024
3f225ee
Add cran submission file
aclark02-arcus Apr 10, 2024
622758d
Update DESCRIPTION's reference to license
tidyCDISC Apr 10, 2024
df367fe
update wordlist & fix spelling
aclark02-arcus Apr 10, 2024
fb6f1fb
hide spellcheck code
aclark02-arcus Apr 10, 2024
68b7499
update another spot in readme where link was getting redirected
aclark02-arcus Apr 10, 2024
82f03de
Merge pull request #30 from Biogen-Inc/prep_cran_020
aclark02-arcus Apr 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ cran-comments.md
^pkgdown$
^cran-comments\.md$
^CRAN-RELEASE$
^data-raw$
^CRAN-SUBMISSION$
40 changes: 40 additions & 0 deletions .github/workflows/render-readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help

# this is set to re-render whenever README.Rmd is changed on a given branch
# the file is rendered and committed to the same branch
# adapted from: https://github.com/r-lib/actions/tree/v2/examples#render-rmarkdown
on:
push:
paths: ['README.Rmd']

name: render-readme

jobs:
render-rmarkdown:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2

# install packages needed
- name: install required packages
run: Rscript -e 'install.packages(c("rmarkdown"))'

- name: Render Rmarkdown files and Commit Results
run: |
Rscript -e 'rmarkdown::render("README.Rmd", output_format = "github_document")'
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
git add README.md || echo "WARN: README.md was not updated"
git add man/figures/README-* || echo "No figure updates were found"
git commit -m 'Re-build Rmarkdown files' || echo "No changes to commit"
git push origin || echo "No changes to commit"
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.2.0
Date: 2024-04-10 14:26:56 UTC
SHA: fb6f1fbe1a4f883c2fa7e819abfa0772dac6be50
31 changes: 17 additions & 14 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: IDEAFilter
Type: Package
Version: 0.1.3
Version: 0.2.0
Title: Agnostic, Idiomatic Data Filter Module for Shiny
Description: When added to an existing shiny app, users may subset any
developer-chosen R data.frame on the fly. That is, users are empowered to
Expand All @@ -19,39 +19,42 @@ Authors@R: c(
email = "clark.aaronchris@gmail.com",
role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-0123-0970")),
person(
given = "Jeff", family = "Thompson",
email = "jeff.thompson51317@gmail.com", role = "aut"),
person(
given = "Doug", family = "Kelkhoff",
email = "doug.kelkhoff@gmail.com", role = c("ctb", "cph"),
comment = "Author of shinyDataFilter"),
person(
given = "Maya", family = "Gans",
email = "maya.gans@biogen.com", role = "ctb"),
person(
given = "Jeff", family = "Thompson",
email = "jeff.thompson51317@gmail.com", role = "ctb"),
person(family = "SortableJS contributors", role = "ctb",
comment = "SortableJS library"),
person(given = "Biogen", role = "cph"))
License: AGPL-3 + file LICENSE
License: MIT + file LICENSE
URL: https://biogen-inc.github.io/IDEAFilter/, https://github.com/Biogen-Inc/IDEAFilter
BugReports: https://github.com/Biogen-Inc/IDEAFilter/issues
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.2
RoxygenNote: 7.3.1
Imports:
shiny,
crayon,
ggplot2,
pillar (>= 1.5.0),
crayon,
purrr,
RColorBrewer,
shinyTime,
purrr
shiny,
shinyTime
Suggests:
shinytest,
shinytest2,
testthat,
dplyr,
knitr,
rmarkdown,
shinytest,
shinytest2,
spelling,
dplyr
testthat
Language: en-US
VignetteBuilder: knitr
Depends:
R (>= 2.10)
5 changes: 4 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
YEAR: 2024
COPYRIGHT HOLDER: Biogen Inc

The IDEAFilter package includes other open source software components. The
following is a list of these components (full copies of the license agreements
used by these components are included below):
Expand Down Expand Up @@ -53,4 +56,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
Loading