Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v23.12.1 testing into staging #232

Merged
merged 60 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e9fc262
tweaks to get app working
lakikowolfe Aug 28, 2023
bfbf764
use forceUpdate=T
lakikowolfe Aug 28, 2023
c86d596
merge deployment workflow from main
lakikowolfe Aug 28, 2023
84925be
Merge pull request #218 from Sage-Bionetworks/dev-fds-46-launch-error
lakikowolfe Sep 6, 2023
179c165
point at dev dfamodules
lakikowolfe Sep 6, 2023
0c33aa1
Merge pull request #219 from Sage-Bionetworks/update-dfamodules
lakikowolfe Sep 6, 2023
740d110
use pre-commit
lakikowolfe Sep 7, 2023
eca17ac
Merge pull request #220 from Sage-Bionetworks/fds-959-precommit
lakikowolfe Sep 13, 2023
5f6dbf6
update renv
lakikowolfe Sep 20, 2023
0b95b64
select a dcc landing page ui
lakikowolfe Sep 29, 2023
3f20587
formatting
lakikowolfe Sep 29, 2023
da62529
move dcc_config download to global.R
lakikowolfe Oct 18, 2023
b9955cc
integrate dfamodules dcc selection module w landing page and dash
lakikowolfe Oct 18, 2023
55288c6
remove unnecissary variable creation
lakikowolfe Oct 18, 2023
67561e5
refactor administrator to accept reactive inputs
lakikowolfe Oct 20, 2023
8195cc0
increment version
lakikowolfe Oct 20, 2023
0bc6647
update dfamodules to development version 23.10.1
lakikowolfe Oct 23, 2023
a441877
Merge pull request #221 from Sage-Bionetworks/integrate-select-dcc
lakikowolfe Oct 23, 2023
2aa4184
remove -beta from version
lakikowolfe Oct 23, 2023
3c2b34f
remove -beta from version
lakikowolfe Oct 23, 2023
c97c5ef
generate data flow model that contains attributes outlined in rfc
lakikowolfe Oct 24, 2023
4c6bb55
use new data model
lakikowolfe Oct 27, 2023
fa26ee6
use multi-tenant version of dfamodules
lakikowolfe Oct 31, 2023
4db0727
Merge pull request #223 from Sage-Bionetworks/fds-1213-rfc-data-model
lakikowolfe Oct 31, 2023
70b9d49
move tab update to data flow app from dcc selection module
lakikowolfe Oct 31, 2023
b55f139
initialize waiter pkg
lakikowolfe Nov 2, 2023
0fabdda
update to most recent version of dev dfamodules
lakikowolfe Nov 2, 2023
8aeecf3
Merge pull request #224 from Sage-Bionetworks/fds-1254-tab-update
lakikowolfe Nov 2, 2023
2194856
wip: dashboard load waiter screen
lakikowolfe Nov 10, 2023
2eee642
clean up
lakikowolfe Nov 10, 2023
213b8fa
update dfamodules: schematic api move token to auth header
lakikowolfe Nov 10, 2023
54748a9
document
lakikowolfe Nov 10, 2023
053d8b1
update dfamodules version
lakikowolfe Nov 10, 2023
636cd02
remove old config code
lakikowolfe Nov 14, 2023
98bc81b
Merge pull request #226 from Sage-Bionetworks/fds-1208-dcc-selection-…
lakikowolfe Nov 16, 2023
26320c4
waiter language
lakikowolfe Nov 16, 2023
5ecf9f4
Merge branch 'dev-mt' of https://github.com/Sage-Bionetworks/release_…
lakikowolfe Nov 17, 2023
8c337e9
csv dataflow manifests
lakikowolfe Nov 28, 2023
b306efd
Merge pull request #227 from Sage-Bionetworks/fds-1338-generate-new-data
lakikowolfe Nov 30, 2023
c2a9b87
remove old synapse manifest
lakikowolfe Nov 30, 2023
a1146eb
remove erroneously added row num column
lakikowolfe Nov 30, 2023
2bc6431
update dfamodules version
lakikowolfe Nov 30, 2023
84f0825
Merge pull request #228 from Sage-Bionetworks/fds-1338-generate-new-data
lakikowolfe Nov 30, 2023
f6a048d
use refactored mod_datatable_filters modules
lakikowolfe Dec 4, 2023
bedca27
remove na replace
lakikowolfe Dec 4, 2023
8bdd863
update renv.lock
lakikowolfe Dec 7, 2023
70f5a50
Merge pull request #229 from Sage-Bionetworks/fds-1403-fix-filtering
lakikowolfe Dec 7, 2023
ca95bb7
wip: refactor administrator
lakikowolfe Dec 8, 2023
53a42a9
refactor administrator
lakikowolfe Dec 11, 2023
c830194
point app at configuration repo main branch
lakikowolfe Dec 11, 2023
8d03a2d
update dfamodules version to feature branch
lakikowolfe Dec 11, 2023
0c9b258
Merge branch 'dev-mt' into fds-1412-htan-demo-prep
lakikowolfe Dec 11, 2023
21d9999
update renv.lock (fixed installation error)
lakikowolfe Dec 11, 2023
3707f5a
Merge branch 'fds-1412-htan-demo-prep' of https://github.com/Sage-Bio…
lakikowolfe Dec 11, 2023
cf31701
update renv.lock
lakikowolfe Dec 14, 2023
edf122b
point app at main branch of config repo
lakikowolfe Dec 14, 2023
e1decca
Merge pull request #230 from Sage-Bionetworks/fds-1412-htan-demo-prep
lakikowolfe Dec 14, 2023
b7a0531
Merge pull request #225 from Sage-Bionetworks/dev-mt
lakikowolfe Dec 14, 2023
c22d41b
update renv.lock
lakikowolfe Dec 15, 2023
1b939c1
clean up / remove testing comments
lakikowolfe Dec 15, 2023
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
21 changes: 18 additions & 3 deletions .github/workflows/shinyapps_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
SCHEMATIC_URL_PROD: https://schematic.api.sagebionetworks.org
# This should not be necessary for installing from public repo's however remotes::install_github() fails without it.
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}


steps:
- name: Install System Dependencies
Expand All @@ -39,15 +40,28 @@ jobs:

# this action sets up pandoc
- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
r-version: 'renv'

# install packages
- name: Install rsconnect
run: |
install.packages("renv")
renv::upgrade(version = "0.17.3")
renv::install("rsconnect@0.8.29")
shell: Rscript {0}

# this action activates renv
- uses: r-lib/actions/setup-renv@v2

# deploy app using rsconnect
- name: Authorize and deploy app
run: |
renv::restore()
install.packages("rsconnect")

renv::restore(packages = "renv")

refName <- Sys.getenv("GITHUB_REF_NAME")
repo <- Sys.getenv("GITHUB_REPOSITORY")
appName <- strsplit(repo, "/")[[1]][2]
Expand Down Expand Up @@ -98,6 +112,7 @@ jobs:
# get app names. If app exists, configure then deploy. Otherwise
# deploy then configure.
apps <- rsconnect::applications()$name

if (appName %in% apps) {
rsconnect::configureApp(appName = appName, size = "xxxlarge", logLevel = "verbose")
rsconnect::deployApp(appName = appName)
Expand Down
72 changes: 72 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/lorenzwalthert/precommit
rev: v0.3.2.9019
hooks:
- id: style-files
args: [--style_pkg=styler, --style_fun=tidyverse_style]
# codemeta must be above use-tidy-description when both are used
# - id: codemeta-description-updated
- id: use-tidy-description
- id: lintr
- id: readme-rmd-rendered
- id: parsable-R
- id: no-browser-statement
- id: no-debug-statement
- id: deps-in-desc
- id: spell-check
exclude: >
(?x)^(
.*\.[rR]|
.*\.feather|
.*\.jpeg|
.*\.pdf|
.*\.png|
.*\.py|
.*\.RData|
.*\.rds|
.*\.Rds|
.*\.Rproj|
.*\.sh|
(.*/|)\.gitignore|
(.*/|)\.gitlab-ci\.yml|
(.*/|)\.lintr|
(.*/|)\.pre-commit-.*|
(.*/|)\.Rbuildignore|
(.*/|)\.Renviron|
(.*/|)\.Rprofile|
(.*/|)\.travis\.yml|
(.*/|)appveyor\.yml|
(.*/|)NAMESPACE|
(.*/|)renv/settings\.dcf|
(.*/|)renv\.lock|
(.*/|)WORDLIST|
\.github/workflows/.*|
data/.*|
)$
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: check-added-large-files
args: ['--maxkb=200']
- id: file-contents-sorter
files: '^\.Rbuildignore$'
- id: end-of-file-fixer
exclude: '\.Rd'
- id: check-merge-conflict
- repo: https://github.com/pre-commit-ci/pre-commit-ci-config
rev: v1.5.1
hooks:
# Only reuiqred when https://pre-commit.ci is used for config validation
- id: check-pre-commit-ci-config
- repo: local
hooks:
- id: forbid-to-commit
name: Don't commit common R artifacts
entry: Cannot commit .Rhistory, .RData, .Rds or .rds.
language: fail
files: '\.(Rhistory|RData|Rds|rds)$'
# `exclude: <regex>` to allow committing specific files
ci:
autoupdate_schedule: monthly
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: dataflow
Title: Data Flow App Demo
Version: 23.06.1
Version: 23.10.1
Authors@R: person('L', 'Wolfe', email = 'loren.wolfe@sagebase.org', role = c('cre', 'aut'))
Description: A data flow package.
License: MIT + file LICENSE
Expand Down
Loading