Update app.R

app.R

@@ -27,6 +27,12 @@ pitch_colors <- c(
   "Cutter"    = "#8B4513",   "Splitter" = "mediumpurple3"
 )
 
+# ── Helpers ────────────────────────────────────────────────────────────────────
+format_name <- function(name) {
+  parts <- strsplit(name, ", ")[[1]]
+  if (length(parts) == 2) paste(trimws(parts[2]), trimws(parts[1])) else name
+}
+
 clean_pitch_type <- function(pt) {
   case_when(
     pt %in% c("Fastball","FourSeamFastBall","Four-Seam","FourSeam") ~ "Fastball",
@@ -41,7 +47,6 @@ clean_pitch_type <- function(pt) {
   )
 }
 
-# ── Pitch type mapper ──────────────────────────────────────────────────────────
 map_pitch_type <- function(pt) {
   case_when(
     pt %in% c("Fastball","FourSeamFastBall","Four-Seam","FourSeam") ~ "Fastball",
@@ -110,7 +115,7 @@ compute_stuff_plus <- function(data) {
     summarise(
       `Stuff+` = round(weighted.mean(
         ((expected_whiff_rate - league_avg) / league_sd) * 10 + 100,
-        w = rep(1, n()), na.rm=TRUE), 0),
+        w=rep(1,n()), na.rm=TRUE), 0),
       .groups="drop"
     )
 }
@@ -142,42 +147,17 @@ compute_location_plus <- function(data) {
     summarise(
       `Location+` = round(weighted.mean(
         (-(avg_xRV288 - league_avg) / league_sd) * 10 + 100,
-        w = rep(1, n()), na.rm=TRUE), 0),
+        w=rep(1,n()), na.rm=TRUE), 0),
       .groups="drop"
     )
 }
 
 # ── Pitcher stats ──────────────────────────────────────────────────────────────
-build_pitcher_stats <- function(df, min_pitches) {
-
-  format_name <- function(name) {
-    parts <- strsplit(name, ", ")[[1]]
-    if (length(parts) == 2) paste(trimws(parts[2]), trimws(parts[1])) else name
-  }
+build_pitcher_stats <- function(df, min_pitches, stuff_scores, loc_scores) {
 
   team_lookup <- df %>%
     select(Pitcher, PitcherTeam) %>%
-    distinct(Pitcher, .keep_all = TRUE)
-
-  # compute models upfront outside the pipe
-  stuff_scores <- tryCatch(
-    compute_stuff_plus(df),
-    error = function(e) {
-      message("Stuff+ failed: ", e$message)
-      tibble(Pitcher=character(), `Stuff+`=numeric())
-    }
-  )
-
-  loc_scores <- tryCatch(
-    compute_location_plus(df),
-    error = function(e) {
-      message("Location+ failed: ", e$message)
-      tibble(Pitcher=character(), `Location+`=numeric())
-    }
-  )
-
-  message("Stuff+ rows: ", nrow(stuff_scores))
-  message("Location+ rows: ", nrow(loc_scores))
+    distinct(Pitcher, .keep_all=TRUE)
 
   df %>%
     mutate(
@@ -250,21 +230,13 @@ build_pitcher_stats <- function(df, min_pitches) {
                            round(fb_velo_sum / fb_velo_n, 1)),
       `Hard Hit%` = round(hh_n      / pmax(bip_n,     1) * 100, 1),
       `Plot`      = paste0('<button class="plot-btn" data-pitcher="',
-                           gsub('"', '&quot;', Pitcher),
+                           gsub('"','&quot;',Pitcher),
                            '">&#128202; View</button>'),
       `Twitter`   = paste0('<a href="https://www.google.com/search?q=',
-                           gsub(" ", "+", sapply(Pitcher, function(n) {
-                             parts <- strsplit(n, ", ")[[1]]
-                             if (length(parts)==2) paste(trimws(parts[2]),trimws(parts[1])) else n
-                           })),
-                           '+baseball+twitter" target="_blank">',
-                           '&#x1F426; Search</a>')
-    ) %>%
-    filter(
-      !is.na(Name),
-      trimws(Name) != "",
-      grepl(" ", trimws(Name))
+                           gsub(" ","+",sapply(Pitcher, format_name)),
+                           '+baseball+twitter" target="_blank">&#x1F426; Search</a>')
     ) %>%
+    filter(!is.na(Name), trimws(Name)!="", grepl(" ",trimws(Name))) %>%
     select(Name, Level, Team, Pitches, `FB Velo`, `Zone%`, `Strike%`,
            `K's`, `BB's`, `K/BB`, `Whiff%`, `Chase%`, `Hard Hit%`,
            `Stuff+`, `Location+`, `Plot`, `Twitter`) %>%
@@ -316,9 +288,8 @@ ui <- fluidPage(
       .plot-btn:hover { background:#003366; }
 
       table.dataTable tbody td a {
-        color:#002147; font-weight:600; font-size:12px;
-        text-decoration:none; background:#e8f0fe; border-radius:4px;
-        padding:3px 8px; display:inline-block;
+        color:#002147; font-weight:600; font-size:12px; text-decoration:none;
+        background:#e8f0fe; border-radius:4px; padding:3px 8px; display:inline-block;
       }
       table.dataTable tbody td a:hover { background:#002147; color:white; }
 
@@ -330,16 +301,13 @@ ui <- fluidPage(
                    box-shadow:0 8px 32px rgba(0,0,0,0.25);
                    max-height:92vh; overflow-y:auto; }
       .modal-close { position:absolute; top:14px; right:18px; font-size:22px;
-                     cursor:pointer; color:#888; background:none; border:none;
-                     line-height:1; }
+                     cursor:pointer; color:#888; background:none; border:none; }
       .modal-close:hover { color:#002147; }
-      .modal-title { font-size:17px; font-weight:700; color:#002147;
-                     margin:0 0 4px 0; }
+      .modal-title    { font-size:17px; font-weight:700; color:#002147; margin:0 0 4px 0; }
       .modal-subtitle { font-size:12px; color:#888; margin:0 0 16px 0; }
-      .section-label { font-size:12px; font-weight:700; color:#002147;
-                       text-transform:uppercase; letter-spacing:0.4px;
-                       margin:16px 0 8px 0; border-top:1px solid #eee;
-                       padding-top:14px; }
+      .section-label  { font-size:12px; font-weight:700; color:#002147;
+                        text-transform:uppercase; letter-spacing:0.4px;
+                        margin:16px 0 8px 0; border-top:1px solid #eee; padding-top:14px; }
 
       #splash { position:fixed; top:0; left:0; width:100%; height:100%;
                 background:#002147; display:flex; flex-direction:column;
@@ -375,25 +343,21 @@ ui <- fluidPage(
     tags$script(HTML("
       $(document).ready(function() {
 
-        // ── splash ────────────────────────────────────────────────────────────
         setTimeout(function() {
           $('#splash').addClass('fade-out');
           setTimeout(function() { $('#splash').remove(); }, 800);
         }, 2800);
 
-        // ── plot button — delegated so it works after table renders ───────────
         $(document).on('click', '.plot-btn', function() {
           var pitcher = $(this).data('pitcher');
           Shiny.setInputValue('selected_pitcher', pitcher, {priority: 'event'});
         });
 
-        // ── close modal ───────────────────────────────────────────────────────
         $(document).on('click', '#modal_close_btn', function() {
           $('#modal_wrapper').hide();
           Shiny.setInputValue('modal_closed', Math.random(), {priority: 'event'});
         });
 
-        // close on backdrop click
         $(document).on('click', '#modal_wrapper', function(e) {
           if ($(e.target).is('#modal_wrapper')) {
             $('#modal_wrapper').hide();
@@ -404,7 +368,7 @@ ui <- fluidPage(
     "))
   ),
 
-  # ── Splash ───────────────────────────────────────────────────────────────────
+  # splash
   tags$div(id="splash",
     tags$img(src="Butler-Bulldogs-Logo-1990.png"),
     tags$h1("Butler Baseball Transfer Portal"),
@@ -412,7 +376,7 @@ ui <- fluidPage(
     tags$div(class="bar-track", tags$div(class="bar-fill"))
   ),
 
-  # ── Header ───────────────────────────────────────────────────────────────────
+  # header
   tags$div(class="header",
     tags$div(
       tags$h1("Butler Baseball Transfer Portal Dashboard"),
@@ -421,7 +385,7 @@ ui <- fluidPage(
     tags$img(src="Butler-Bulldogs-Logo-1990.png", height="52px")
   ),
 
-  # ── Filters ──────────────────────────────────────────────────────────────────
+  # filters
   tags$div(class="filters",
     tags$div(
       tags$div("Level", class="filter-label"),
@@ -442,18 +406,16 @@ ui <- fluidPage(
     )
   ),
 
-  # ── Main content ─────────────────────────────────────────────────────────────
+  # main
   tags$div(class="main",
     uiOutput("main_ui")
   ),
 
-  # ── Modal (hidden until triggered) ───────────────────────────────────────────
+  # modal
   tags$div(
-    id    = "modal_wrapper",
-    class = "modal-overlay",
-    style = "display:none;",
+    id="modal_wrapper", class="modal-overlay", style="display:none;",
     tags$div(
-      class = "modal-box",
+      class="modal-box",
       tags$button("✕", id="modal_close_btn", class="modal-close"),
       uiOutput("modal_header"),
       plotOutput("movement_plot", height="400px"),
@@ -466,25 +428,39 @@ ui <- fluidPage(
 # ── Server ─────────────────────────────────────────────────────────────────────
 server <- function(input, output, session) {
 
-  # ── Data ────────────────────────��────────────────────────────────────────────
+  # load data + compute models once per level change
   raw_data <- reactive({
     req(input$level)
-    tryCatch(
-      load_data(input$level),
-      error = function(e) {
-        showNotification(paste("Failed to load:", e$message), type="error")
-        NULL
-      }
-    )
+    tryCatch({
+      df <- load_data(input$level)
+      list(
+        df           = df,
+        stuff_scores = tryCatch(
+          compute_stuff_plus(df),
+          error=function(e) tibble(Pitcher=character(), `Stuff+`=numeric())
+        ),
+        loc_scores   = tryCatch(
+          compute_location_plus(df),
+          error=function(e) tibble(Pitcher=character(), `Location+`=numeric())
+        )
+      )
+    }, error = function(e) {
+      showNotification(paste("Failed to load:", e$message), type="error")
+      NULL
+    })
   })
 
   stats_table <- reactive({
     req(raw_data(), input$min_pitches)
     if (input$position == "Pitcher")
-      build_pitcher_stats(raw_data(), input$min_pitches)
+      build_pitcher_stats(
+        raw_data()$df,
+        input$min_pitches,
+        raw_data()$stuff_scores,
+        raw_data()$loc_scores
+      )
   })
 
-  # ── Main UI ──────────────────────────────────────────────────────────────────
   output$main_ui <- renderUI({
     if (input$position == "Pitcher") {
       tagList(
@@ -497,7 +473,6 @@ server <- function(input, output, session) {
     }
   })
 
-  # ── Pitcher leaderboard table ─────────────────────────────────────────────────
   output$pitcher_table <- renderDT({
     req(stats_table(), nrow(stats_table()) > 0)
     dt <- stats_table()
@@ -510,6 +485,8 @@ server <- function(input, output, session) {
     # whiff_range      <- c(15, 35)
     # chase_range      <- c(25, 40)
     # hardhit_range    <- c(25, 42)
+    # stuff_range      <- c(90, 110)
+    # loc_range        <- c(90, 110)
     # ─────────────────────────────────────────────────────────────────────────
 
     datatable(
@@ -518,16 +495,16 @@ server <- function(input, output, session) {
       escape    = FALSE,
       selection = "none",
       options   = list(
-        pageLength   = 25,
-        lengthMenu   = c(25, 50, 100),
-        scrollX      = TRUE,
-        order        = list(list(3, "desc")),
-        orderMulti   = FALSE,
-        dom          = "lfrtip",
-        columnDefs = list(
-          list(className = "dt-left",   targets = 0:1),
-          list(className = "dt-center", targets = 2:16),
-          list(orderable = FALSE,       targets = c(15, 16))
+        pageLength  = 25,
+        lengthMenu  = c(25, 50, 100),
+        scrollX     = TRUE,
+        order       = list(list(3, "desc")),
+        orderMulti  = FALSE,
+        dom         = "lfrtip",
+        columnDefs  = list(
+          list(className="dt-left",   targets=0:1),
+          list(className="dt-center", targets=2:16),
+          list(orderable=FALSE,       targets=c(15,16))
         ),
         initComplete = JS("function(settings, json) {
           $('#loading_msg').hide();
@@ -536,13 +513,13 @@ server <- function(input, output, session) {
     )
   })
 
-  # ── Modal content ─────────────────────────────────────────────────────────────
+  # modal
   current_pitcher <- reactiveVal(NULL)
 
   observeEvent(input$selected_pitcher, {
     req(input$selected_pitcher, raw_data())
     current_pitcher(input$selected_pitcher)
-    shinyjs::show("modal_wrapper")
+    shinyjs::delay(100, shinyjs::show("modal_wrapper"))
   })
 
   observeEvent(input$modal_closed, {
@@ -551,7 +528,7 @@ server <- function(input, output, session) {
 
   pitcher_plot_data <- reactive({
     req(current_pitcher(), raw_data())
-    raw_data() %>%
+    raw_data()$df %>%
       filter(Pitcher == current_pitcher()) %>%
       mutate(PitchType = clean_pitch_type(TaggedPitchType)) %>%
       filter(!is.na(PitchType), !is.na(HorzBreak), !is.na(InducedVertBreak))
@@ -572,7 +549,6 @@ server <- function(input, output, session) {
   output$movement_plot <- renderPlot({
     req(pitcher_plot_data(), nrow(pitcher_plot_data()) > 0)
     pdata <- pitcher_plot_data()
-
     parts        <- strsplit(current_pitcher(), ", ")[[1]]
     display_name <- if (length(parts)==2) paste(trimws(parts[2]),trimws(parts[1])) else current_pitcher()
 
@@ -632,7 +608,7 @@ server <- function(input, output, session) {
       group_by(`Pitch Type`=PitchType) %>%
       summarise(
         `#`         = n(),
-        `Usage%`    = round(n() / nrow(pdata) * 100, 1),
+        `Usage%`    = round(n()/nrow(pdata)*100, 1),
         Velo        = round(mean(RelSpeed,         na.rm=TRUE), 1),
         iVB         = round(mean(InducedVertBreak, na.rm=TRUE), 1),
         HB          = round(mean(HorzBreak,        na.rm=TRUE), 1),
@@ -641,8 +617,8 @@ server <- function(input, output, session) {
         RelS        = round(mean(RelSide,           na.rm=TRUE), 1),
         VAA         = round(mean(VertApprAngle,     na.rm=TRUE), 1),
         HAA         = round(mean(HorzApprAngle,     na.rm=TRUE), 1),
-        `Zone%`     = round(sum(IsZone,    na.rm=TRUE)/n()*100, 1),
-        `Strike%`   = round(sum(IsStrike,  na.rm=TRUE)/n()*100, 1),
+        `Zone%`     = round(sum(IsZone,   na.rm=TRUE)/n()*100, 1),
+        `Strike%`   = round(sum(IsStrike, na.rm=TRUE)/n()*100, 1),
         `Whiff%`    = round(ifelse(sum(IsSwing)==0, NA,
                                    sum(IsWhiff)/sum(IsSwing)*100), 1),
         `Chase%`    = round(ifelse(sum(IsOutZone)==0, NA,