Skip to content

use progress app #13

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

Open
tomjemmett wants to merge 3 commits into
base: main
Choose a base branch
from
Open

use progress app #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d01ad9e
redirect the user to the progress app if a scenario has previously be…
tomjemmett Aug 6, 2026
0297536
if we are creating a new scenario, we must remove the __inputs_app__ …
tomjemmett Aug 7, 2026
fd78b15
Potential fix for pull request finding
tomjemmett Aug 10, 2026
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
46 changes: 35 additions & 11 deletions R/app_server.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,31 @@ app_server <- function(input, output, session) {
})

output$start_button <- shiny::renderUI({
if (scenario_validation()) {
if (!scenario_validation()) {
return(NULL)
}

p <- shiny::req(params_with_inputs())

if (
input$scenario_type == "Edit existing" &&
!is.null(p[["__inputs_app__"]]) &&
!is.null(p[["__inputs_app__"]][["model_run_id"]])
) {
Comment thread
Copilot marked this conversation as resolved.
# go to the model run progress app
url <- glue::glue(
get_config("model_run_progress_url"),
"?model_run_id={p[['dataset']]}/{p[['__inputs_app__']][['model_run_id']]}"
)

button_text <- "View Progress"
} else {
f <- tempfile_name()
p <- shiny::req(params_with_inputs())
if (input$scenario_type == "Create new from existing") {
# remove existing inputs app metadata
p[["__inputs_app__"]] <- NULL
}
# go to the inputs app
jsonlite::write_json(p, f, pretty = TRUE, auto_unbox = TRUE)

# used by the variable in get_config("app_url")
Expand All @@ -425,16 +447,18 @@ app_server <- function(input, output, session) {
utils::URLencode(basename(f))
)

bslib::layout_columns(
col_widths = c(9, 3),
shiny::tags$span(),
shiny::tags$a(
"Start",
class = "btn btn-success text-white",
href = url
)
)
button_text <- "Start"
}

bslib::layout_columns(
col_widths = c(9, 3),
shiny::tags$span(),
shiny::tags$a(
button_text,
class = "btn btn-success text-white",
href = url
)
)
}) |>
shiny::bindEvent(filename(), params_with_inputs())

Expand Down
3 changes: 3 additions & 0 deletions inst/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
default:
app_url: "http://localhost:8080/"
params_data_path: "."
model_run_progress_url: "http://localhost:8081/"

development:
app_url: "/nhp/dev/inputs/"
params_data_path: "/data/nhp/dev/inputs"
model_run_progress_url: "/nhp/model_run_progress/"

production:
app_url: "/nhp/{version}/inputs/"
params_data_path: "/data/nhp/prod/inputs"
model_run_progress_url: "/nhp/model_run_progress/"