Potential code refactoring and improvements

R/10_mod_board_simulation_server.R

@@ -11,9 +11,11 @@ board_simulation_server <- function(
     shinyWidgets::updatePickerInput(
       session = session,
       inputId = "json_file_name",
-      choices = list.files(
-        path = file.path(session$userData$user_folder, "study_objects"), 
-        full.names = FALSE
+      choices = sort(
+        list.files(
+          path = file.path(session$userData$user_folder, "study_objects"), 
+          full.names = FALSE
+        )
       ),
       selected = list.files(
         path = file.path(session$userData$user_folder, "study_objects"), 
@@ -23,9 +25,11 @@ board_simulation_server <- function(
     shinyWidgets::updatePickerInput(
       session = session,
       inputId = "scenario_name",
-      choices = list.files(
-        path = file.path(session$userData$user_folder, "scenarios"), 
-        full.names = FALSE
+      choices = sort(
+        list.files(
+          path = file.path(session$userData$user_folder, "scenarios"), 
+          full.names = FALSE
+        )
       ),
       selected = character(0)
     )
@@ -53,9 +57,11 @@ board_simulation_server <- function(
       shinyWidgets::updatePickerInput(
         session,
         "json_file_name",
-        choices = list.files(
-          path = file.path(session$userData$user_folder, "study_objects"),
-          full.names = FALSE
+        choices = sort(
+          list.files(
+            path = file.path(session$userData$user_folder, "study_objects"),
+            full.names = FALSE
+          )
         ),
         selected = input$json_file_name
       )
@@ -64,9 +70,11 @@ board_simulation_server <- function(
       shinyWidgets::updatePickerInput(
         session,
         "scenario_name",
-        choices = list.files(
-          path = file.path(session$userData$user_folder, "scenarios"),
-          full.names = FALSE
+        choices = sort(
+          list.files(
+            path = file.path(session$userData$user_folder, "scenarios"),
+            full.names = FALSE
+          )
         ),
         selected = character(0)
       )
@@ -78,9 +86,11 @@ board_simulation_server <- function(
     cat(file = stderr(), "10 - Update json_file_name choices\n")
     shinyWidgets::updatePickerInput(
       inputId = "json_file_name",
-      choices = list.files(
-        path = file.path(session$userData$user_folder, "study_objects"),
-        full.names = FALSE
+      choices = sort(
+        list.files(
+          path = file.path(session$userData$user_folder, "study_objects"),
+          full.names = FALSE
+        )
       ),
       selected = list.files(
         path = file.path(session$userData$user_folder, "study_objects"),
@@ -129,20 +139,19 @@ board_simulation_server <- function(
   observeEvent(list(input$run_scenario, input$scenario_name), {
     cat(file = stderr(), "10 - Display warning text\n")
     shinyjs::hide(selector = jns("warning_scenario_text"))
+    req(input$scenario_name)
     # according to the scenario data
-    if (!is.null(input$scenario_name)) {
-      warning_msg <- readRDS(
+    warning_msg <- readRDS(
         file.path(
           session$userData$user_folder, "scenarios",
           input$scenario_name, "scenario_data.rds"
         )
       )$warning_msg
-      if (!is.null(warning_msg$warning_text)) {
-        shinyjs::show(id = "warning_scenario_text")
-        shinyjs::html(
-          id = "warning_scenario_text", html = warning_msg$warning_text
-        )
-      }
+    if (!is.null(warning_msg$warning_text)) {
+      shinyjs::show(id = "warning_scenario_text")
+      shinyjs::html(
+        id = "warning_scenario_text", html = warning_msg$warning_text
+      )
     }
   }, ignoreInit = FALSE)
 
@@ -237,7 +246,7 @@ board_simulation_server <- function(
           land_required = land_required,
           nitrogen_balance = nitrogen_balance
         )
-
+        
         # Add dry matter intake checks -----------------------------------------
         # Convert to daily intake
         dmi_per_day <- energy_required$annual_results$dmi_tot / 365 
@@ -329,8 +338,10 @@ board_simulation_server <- function(
     # update choices for scenario_name and scenario_results_comp input
     shinyWidgets::updatePickerInput(
       inputId = "scenario_name",
-      choices = list.files(
-        file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
+      choices = sort(
+        list.files(
+          file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
+        )
       ),
       selected = sub("\\.json$", "", input$json_file_name[1])
     )
@@ -441,15 +452,19 @@ board_simulation_server <- function(
     shinyWidgets::updatePickerInput(
       session = session,
       "scenario_name",
-      choices = list.files(
-        file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
+      choices = sort(
+        list.files(
+          file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
+        )
       ),
       selected = character(0)
     )
     shinyWidgets::updatePickerInput(
       inputId = "scenario_results_comp",
-      choices = list.files(
-        file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
+      choices = sort(
+        list.files(
+          file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
+        )
       ),
       selected = list.files(
         file.path(session$userData$user_folder, "scenarios"), full.names = FALSE
@@ -461,67 +476,46 @@ board_simulation_server <- function(
     )
   })
 
-  # ------ PLOT GHG emission ---------------------------------------------------
-  output$plot_ghg_emission <- renderGirafe({
-
+  # ------ Cached scenario data (read RDS once, shared by all 4 plots) ----------
+  scenario_plot_data <- reactive({
     req(input$scenario_name)
     req(session$userData$run_scenario_counter())
-    cat(file = stderr(), "10 - Plot GHG emission\n")
-
-    # Read the data
-    on_farm_table <- readRDS(
+    readRDS(
       file.path(
         session$userData$user_folder, "scenarios",
-        input$scenario_name,
-        "scenario_data.rds"
+        input$scenario_name, "scenario_data.rds"
       )
-    )[["on_farm_table"]]
-
+    )
+  })
+
+  # ------ PLOT GHG emission ---------------------------------------------------
+  output$plot_ghg_emission <- renderGirafe({
+    cat(file = stderr(), "10 - Plot GHG emission\n")
+    scenario_data <- scenario_plot_data()
+    on_farm_table <- scenario_data[["on_farm_table"]]
     unit <- graphs_desc[graphs_desc$indicator == "ghg_emission", ]$unit
     plot_ghg_emissions(on_farm_table, unit)
   })
 
   # ------ PLOT N BALANCE ------------------------------------------------------
   output$plot_n_balance <- renderGirafe({
-
-    req(input$scenario_name)
-    req(session$userData$run_scenario_counter())
     cat(file = stderr(), "10 - Plot N Balance\n")
-
-    # Read the data
-    nitrogen_balance <- readRDS(
-      file.path(
-        session$userData$user_folder,
-        "scenarios",
-        input$scenario_name,
-        "scenario_data.rds"
-      )
-    )[["nitrogen_balance"]]
-
+    scenario_data <- scenario_plot_data()
+    nitrogen_balance <- scenario_data[["nitrogen_balance"]]
     unit <- graphs_desc[graphs_desc$indicator == "n_balance", ]$unit
     plot_n_balance(nitrogen_balance, unit)
   })
 
   # ------ PLOT LAND REQUIRED --------------------------------------------------
   output$plot_land_req <- renderGirafe({
-
-    req(session$userData$run_scenario_counter())
-    req(input$scenario_name)
     cat(file = stderr(), "10 - Plot Land Required\n")
-
     # hide all the seasons legend items
     lapply(1:max_seasons, function(i) {
       shinyjs::hide(id = paste0("Seasons_LegendItemtxt_", i))
     })
 
-    # Read the data
-    land_required <- readRDS(
-      file.path(
-        session$userData$user_folder,
-        "scenarios", input$scenario_name,
-        "scenario_data.rds"
-      )
-    )[["land_required"]]
+    scenario_data <- scenario_plot_data()
+    land_required <- scenario_data[["land_required"]]
 
     # unique seasons
     seasons <- unique(land_required$season_name)
@@ -539,23 +533,14 @@ board_simulation_server <- function(
 
   # ----- PLOT WATER USE PER FEED ----------------------------------------------
   output$plot_water_feed <- renderGirafe({
-
-    req(session$userData$run_scenario_counter())
-    req(input$scenario_name)
     cat(file = stderr(), "10 - Plot Water Use per Feed\n")
-
     # hide all the feeds legend items
     lapply(1:max_feed_items, function(i) {
       shinyjs::hide(id = paste0("Feeds_LegendItemtxt_", i))
     })
 
-    # Read the data
-    water_use_per_feed_item <- readRDS(
-      file.path(
-        session$userData$user_folder, "scenarios",
-        input$scenario_name, "scenario_data.rds"
-      )
-    )[["water_use_per_feed_item"]]
+    scenario_data <- scenario_plot_data()
+    water_use_per_feed_item <- scenario_data[["water_use_per_feed_item"]]
 
     # unique feeds
     feeds <- unique(water_use_per_feed_item$feed)

R/10_mod_board_simulation_ui.R

@@ -41,6 +41,7 @@ board_simulation_ui <- function(id) {
               choices = NULL,
               multiple = TRUE,
               options = list(
+                `live-search` = TRUE,
                 `selected-text-format` = "count",
                 `count-selected-text` = "{0}/{1} Scenarios"
               )
@@ -98,7 +99,8 @@ board_simulation_ui <- function(id) {
             inputId = ns("scenario_name"), 
             label = NULL,
             choices = NULL,
-            multiple = FALSE
+            multiple = FALSE,
+            options = list(`live-search` = TRUE)
           )
         )
       ),