Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jinseob2kim/jsmodule
Browse files Browse the repository at this point in the history
  • Loading branch information
jinseob2kim committed Oct 18, 2023
2 parents e3ef608 + ee49654 commit 2ce1425
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 7 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: "CLA Assistant"
on:
issue_comment:
types: [created]
pull_request_target:
types: [opened,closed,synchronize]

# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings
permissions:
actions: write
contents: write
pull-requests: write
statuses: write

jobs:
CLAAssistant:
runs-on: ubuntu-latest
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: contributor-assistant/github-action@v2.3.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# the below token should have repo scope and must be manually added by you in the repository's secret
# This token is required only if you have configured to store the signatures in a remote repository/organization
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
with:
path-to-signatures: 'cla/cla.json'
path-to-document: 'https://github.com/cla-assistant/github-action/blob/master/SAPCLA.md' # e.g. a CLA or a DCO document
# branch should not be protected
branch: 'master'
allowlist: jinseob2kim,bot*

# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
#remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
#remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
#create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
#signed-commit-message: 'For example: $contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
#custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
#custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
#custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
#use-dco-flag: true - If you are using DCO instead of CLA
41 changes: 41 additions & 0 deletions .github/workflows/styler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Style R

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
style:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v1
with:
r-version: 4.0.5

- name: Install dependencies
run: |
R -e "install.packages(c('styler', 'roxygen2', 'knitr'))"
- name: Style code
run: |
R -e 'styler::style_pkg()'
- name: Check if there are any changes
id: verify_diff
run: |
git diff --quiet . || echo "changed=true" >> $GITHUB_OUTPUT
- name: Commit changes
if: steps.verify_diff.outputs.changed == 'true'
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git commit -am "Apply automatic stylistic changes"
git push
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5 changes: 2 additions & 3 deletions R/ggpairs.R
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ ggpairsModule <- function(input, output, session, data, data_label, data_varStru
return(p)
}

eval(parse(text = paste0('p <- p + theme_', input$theme, '()')))
eval(parse(text = paste0("p <- p + theme_", input$theme, "()")))
return(p)
})

Expand Down Expand Up @@ -601,9 +601,8 @@ ggpairsModule2 <- function(input, output, session, data, data_label, data_varStr
return(p)
}

eval(parse(text = paste0('p <- p + theme_', input$theme, '()')))
eval(parse(text = paste0("p <- p + theme_", input$theme, "()")))
return(p)

})

output$downloadControls <- renderUI({
Expand Down
8 changes: 4 additions & 4 deletions R/tb1.R
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ tb1module <- function(input, output, session, data, data_label, data_varStruct =
# vars.fisher = setdiff(vlist()$factor_vars, input$group_vars)[unlist(vars.fisher)]

testNN <- wilcox.test
if (length(setdiff(unique(data[[input$group_vars]]), NA)) > 2){
if (length(setdiff(unique(data[[input$group_vars]]), NA)) > 2) {
testNN <- kruskal.test
}

Expand All @@ -294,7 +294,7 @@ tb1module <- function(input, output, session, data, data_label, data_varStruct =
# vars.fisher = setdiff(vlist()$factor_vars, c(input$group2_vars, input$group_vars))[vars.fisher]

testNN <- wilcox.test
if ((length(setdiff(unique(data[[input$group2_vars]]), NA)) > 2) | (input$psub == F)){
if ((length(setdiff(unique(data[[input$group2_vars]]), NA)) > 2) | (input$psub == F)) {
testNN <- kruskal.test
}

Expand Down Expand Up @@ -574,7 +574,7 @@ tb1module2 <- function(input, output, session, data, data_label, data_varStruct
vars.tb1 <- setdiff(vars, input$group_vars)

testNN <- wilcox.test
if (length(setdiff(unique(data()[[input$group_vars]]), NA)) > 2){
if (length(setdiff(unique(data()[[input$group_vars]]), NA)) > 2) {
testNN <- kruskal.test
}

Expand All @@ -594,7 +594,7 @@ tb1module2 <- function(input, output, session, data, data_label, data_varStruct
vars.tb1 <- setdiff(vars, c(input$group2_vars, input$group_vars))

testNN <- wilcox.test
if ((length(setdiff(unique(data()[[input$group2_vars]]), NA)) > 2) | (input$psub == F)){
if ((length(setdiff(unique(data()[[input$group2_vars]]), NA)) > 2) | (input$psub == F)) {
testNN <- kruskal.test
}

Expand Down

0 comments on commit 2ce1425

Please sign in to comment.