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

UI changes based on sonu user studies #162

Merged
merged 23 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b962c51
fix #154 navbar changes
sckott Oct 24, 2024
8f69367
fix #155 change "this" to proof and what the acronym means
sckott Oct 24, 2024
1742199
#156 changed headings on help page and added email and open an issue …
sckott Oct 24, 2024
127263c
fix #156 - add back code last date change, commit sha and link to repo
sckott Oct 25, 2024
833ba35
#157 server page: make Notes consistent, use bootstrap alerts for the…
sckott Oct 25, 2024
108b116
fix #157 add spinner for loading server details on server page
sckott Oct 25, 2024
50e8ae3
#158 submit pages changes:
sckott Oct 25, 2024
95cb8bd
undo addition of server spinner in 108b116b6cadd73f0ed107c504c4dcc82d…
sckott Oct 25, 2024
0278065
#159 track workflow page: each card
sckott Oct 25, 2024
57064c2
#159 added spinner for workflow details buttons on each click, and re…
sckott Oct 26, 2024
0e1a4d0
possible fix for 401 error
sckott Oct 28, 2024
1392c9c
change server start disable toggle - run toggle only if logged in and…
sckott Oct 28, 2024
c3f5439
move cromwellProofStatusData call in proofStatusTextGenerator within …
sckott Oct 28, 2024
1e5af36
fix #159 add spinner loading to cards on tracking page
sckott Oct 28, 2024
37ac9a6
#158 submit page, disable submit button on page load, and disable but…
sckott Oct 28, 2024
a80d551
#160 move troubleshoot tab into workflow details tab
sckott Oct 28, 2024
92c3de9
clean up workflow details page to have each panel be its own R object
sckott Oct 28, 2024
d03bdba
#160 rework header of workflow details, name and labels on left, ID o…
sckott Oct 28, 2024
c3606d1
#160 workflow details work
sckott Oct 29, 2024
6115cc0
code cleanup, remove an old file, and remove focus_id stuff
sckott Oct 29, 2024
a079cef
#160 workflow details - add no data alerts to tabs where appropriate;…
sckott Oct 29, 2024
8a03d23
make login button green and add spinner to login modal; FH logo link …
sckott Oct 29, 2024
487481c
bump mermaid.js to 11.4.0
sckott Oct 30, 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: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apt-get update -y && apt-get install -y libssh-dev python3-pip git libmariad

RUN R -q -e 'install.packages(c("ellipsis"), repos="https://cran.rstudio.com/")'
RUN R -q -e 'install.packages(c("shiny"), repos="https://cran.rstudio.com/")'
RUN R -q -e 'install.packages(c("shinyFeedback", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "ssh", "remotes", "markdown", "lubridate", "jsonlite", "dplyr", "DT", "glue", "httr", "purrr", "RColorBrewer", "rlang", "shinyBS", "shinyjs", "tidyverse", "uuid", "memoise", "rclipboard", "shinyvalidate", "shinylogs", "testhat", "bsicons", "listviewer", "htmltools", "cookies", "RMariaDB", "DBI", "parsedate", "testthat", "shinylogs", "ids"), repos="https://cran.r-project.org")'
RUN R -q -e 'install.packages(c("shinyFeedback", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "ssh", "remotes", "markdown", "lubridate", "jsonlite", "dplyr", "DT", "glue", "httr", "purrr", "RColorBrewer", "rlang", "shinyBS", "shinyjs", "tidyverse", "uuid", "memoise", "rclipboard", "shinyvalidate", "shinylogs", "testhat", "bsicons", "listviewer", "htmltools", "cookies", "RMariaDB", "DBI", "parsedate", "testthat", "shinylogs", "ids", "shinycssloaders"), repos="https://cran.r-project.org")'

RUN R -q -e "remotes::install_github('getwilds/[email protected]')"

Expand Down
6 changes: 4 additions & 2 deletions app/about.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Resources
### Getting Help with PROOF and WDL at Fred Hutch
- Get started with PROOF [How-To documentation](https://sciwiki.fredhutch.org/dasldemos/proof-how-to/) and [troubleshooting tips](https://sciwiki.fredhutch.org/dasldemos/proof-troubleshooting/)
- Ask a question about or report a problem with PROOF in our [GitHub repository](https://github.com/getwilds/proof/issues/new?template=Blank+issue)
- Email us at [[email protected]](mailto:[email protected])
- Find curated WDL workflow repositories and containers in Fred Hutch [DaSL's getWILDS GitHub organization](https://github.com/orgs/getwilds/repositories?q=wdl).
- Find Cromwell and WDL Resources in [Fred Hutch's GitHub organization](https://github.com/FredHutch?utf8=%E2%9C%93&q=wdl+OR+cromwell&type=&language=).
- Learn about Cromwell and WDL on the [Fred Hutch Biomedical Data Science Wiki](https://sciwiki.fredhutch.org/compdemos/Cromwell/).
Expand All @@ -10,7 +12,7 @@
## Users Elsewhere
This Shiny app and the R packages it relies on are all open source. Thus, if you are at a different institution and want to use this application to support your work or your users, we encourage you to look through our resources and fork our repositories. Feel free to contact DaSL developers by filing issues or emailing `[email protected]`. For this use case, we have provided the more general "DIY Cromwell" login button at the top.

### Resources
### Some Resources for Using Cromwell
- DIY: Get a Cromwell server running by yourself (does not require logging in). To learn more about how to get your Cromwell server running, read through the instructions in the GitHub repo [FredHutch/diy-cromwell-server](https://github.com/FredHutch/diy-cromwell-server)
- `rcromwell`: An [R package](https://github.com/getwilds/rcromwell) that makes interacting with the Cromwell API easier.
- `shiny-cromwell`: This app's [GitHub repo](https://github.com/FredHutch/shiny-cromwell) contains information on how to set started with this application.
Expand Down
4 changes: 3 additions & 1 deletion app/buttons.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ logInButton <-
actionButton(
inputId = "proofAuth",
label = "PROOF Login",
class = "btn-sm",
class = "btn-success btn-sm",
style = "color: white;",
icon = icon("truck-fast")

)
Expand All @@ -20,6 +21,7 @@ logInCromwellButton <-
inputId = "ownCrom",
label = "DIY Cromwell",
class = "btn-sm",
style = "color: white;",
icon = icon("plug-circle-xmark")
)
logOutCromwellButton <-
Expand Down
6 changes: 5 additions & 1 deletion app/modals.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ loginModal <- function(failed = FALSE, error = "Invalid username or password") {
},
footer = tagList(
modalButton("Cancel"),
actionButton("submit", "Submit")
shinyFeedback::loadingButton(
inputId = "submit",
label = "Submit",
class = "btn btn-default"
)
),
easyClose = TRUE
)
Expand Down
Loading