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.

Sign up for GitHub

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

Jump to bottom

Made busy-indicator work within modules #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Made busy-indicator work within modules #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions busy-indicator/helpers.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,16 @@ withBusyIndicatorUI <- function(button) {
# expression to run when the button is clicked
withBusyIndicatorServer <- function(buttonId, expr) {
# UX stuff: show the "busy" message, hide the other messages, disable the button
loadingEl <- sprintf("[data-for-btn=%s] .btn-loading-indicator", buttonId)
doneEl <- sprintf("[data-for-btn=%s] .btn-done-indicator", buttonId)
errEl <- sprintf("[data-for-btn=%s] .btn-err", buttonId)
session <- shinyjs:::getSession()
if(inherits(session, "session_proxy")) {
loadingEl <- sprintf("[data-for-btn=%s] .btn-loading-indicator", session$ns(buttonId))
doneEl <- sprintf("[data-for-btn=%s] .btn-done-indicator", session$ns(buttonId))
errEl <- sprintf("[data-for-btn=%s] .btn-err", session$ns(buttonId))
} else {
loadingEl <- sprintf("[data-for-btn=%s] .btn-loading-indicator", buttonId)
doneEl <- sprintf("[data-for-btn=%s] .btn-done-indicator", buttonId)
errEl <- sprintf("[data-for-btn=%s] .btn-err", buttonId)
}
shinyjs::disable(buttonId)
shinyjs::show(selector = loadingEl)
shinyjs::hide(selector = doneEl)
Expand All @@ -59,8 +66,14 @@ withBusyIndicatorServer <- function(buttonId, expr) {

# When an error happens after a button click, show the error
errorFunc <- function(err, buttonId) {
errEl <- sprintf("[data-for-btn=%s] .btn-err", buttonId)
errElMsg <- sprintf("[data-for-btn=%s] .btn-err-msg", buttonId)
session <- shinyjs:::getSession()
if(inherits(session, "session_proxy")) {
errEl <- sprintf("[data-for-btn=%s] .btn-err", session$ns(buttonId))
errElMsg <- sprintf("[data-for-btn=%s] .btn-err-msg", session$ns(buttonId))
} else {
errEl <- sprintf("[data-for-btn=%s] .btn-err", buttonId)
errElMsg <- sprintf("[data-for-btn=%s] .btn-err-msg", buttonId)
}
errMessage <- gsub("^ddpcr: (.*)", "\\1", err$message)
shinyjs::html(html = errMessage, selector = errElMsg)
shinyjs::show(selector = errEl, anim = TRUE, animType = "fade")
Expand Down