Update app.R

app.R

@@ -1,4 +1,3 @@
-# app.R
 library(shiny)
 library(shinydashboard)
 library(DT)
@@ -82,11 +81,12 @@ ui <- fluidPage(
       animation:shimmer 3s linear infinite;}
     @keyframes shimmer{0%{background-position:-200% 0;}100%{background-position:200% 0;}}
     h3{ color:black; font-weight:600; margin-top:25px; margin-bottom:15px; padding-bottom:8px; border-bottom:2px solid #007BA7; }
-    h4{ color:white; font-weight:500; margin-top:20px; margin-bottom:12px; }
+    h4{ color:black; font-weight:500; margin-top:20px; margin-bottom:12px; }
     h1{ color:#007BA7; font-weight:700; margin-bottom:20px; text-shadow:1px 1px 2px rgba(0,0,0,0.1); }
     label{ font-weight:500; color:peru; margin-bottom:5px; }
     thead th{ background:#F8F9FA; color:#2C3E50; font-weight:600; text-align:center!important; padding:10px!important; }
     .brand-teal{ color:darkcyan; } .brand-bronze{ color:peru; }
+    .info-box { background-color:#f0f8ff; padding:10px; border-radius:5px; margin:10px 0; border-left:4px solid darkcyan; }
     "))
   ),
 
@@ -139,19 +139,24 @@ ui <- fluidPage(
     tabPanel("Pitch Movement Chart",
       fluidRow(
         column(3, selectInput("pitcher_select","Select Pitcher:", choices=NULL, selected=NULL)),
-        column(3, h4("Selection Mode:"),
+        column(3, 
+          h4("Selection Mode:"),
           radioButtons("selection_mode","",
-            choices = list("Single Click"="single","Drag Select"="drag"),
-            selected="single", inline=TRUE)),
+            choices = list("Single Click (Edit One)"="single","Drag Select (Edit Multiple)"="drag"),
+            selected="single", inline=FALSE)
+        ),
         column(6,
           conditionalPanel(
             condition = "input.selection_mode == 'drag'",
-            h4("Bulk Edit:"),
-            fluidRow(
-              column(8, selectInput("bulk_pitch_type","Change all selected to:",
-                choices=c("Fastball","Sinker","Cutter","Slider","Curveball","ChangeUp","Splitter","Knuckleball","Other"),
-                selected="Fastball")),
-              column(4, br(), actionButton("apply_bulk_change","Apply to Selected", class="btn-success"))
+            div(class="info-box",
+              h4("Bulk Edit Mode:", style="margin-top:0; color:darkcyan;"),
+              fluidRow(
+                column(7, selectInput("bulk_pitch_type","Change selected pitches to:",
+                  choices=c("Fastball","Sinker","Cutter","Slider","Curveball","ChangeUp","Splitter","Knuckleball","Other"),
+                  selected="Fastball")),
+                column(5, br(), actionButton("apply_bulk_change","Apply Changes", class="btn-success btn-block"))
+              ),
+              actionButton("clear_selection","Clear Selection", class="btn-warning btn-sm", style="margin-top:10px;")
             )
           )
         )
@@ -162,12 +167,14 @@ ui <- fluidPage(
           plotlyOutput("movement_plot", height="600px"),
           conditionalPanel(
             condition = "input.selection_mode == 'drag'",
-            div(style="background-color:#f0f8ff; padding:10px; border-radius:5px; margin:10px 0; border-left:4px solid darkcyan;",
+            div(class="info-box",
                 h4("Selected Points:", style="margin-top:0; color:darkcyan;"),
                 textOutput("selection_info")
             )
           ),
-          verbatimTextOutput("click_info")
+          div(style="padding:10px; background-color:#fff3cd; border-radius:5px; margin-top:10px;",
+              textOutput("status_info")
+          )
         ),
         column(4,
           h3("Pitch Metrics Summary"),
@@ -196,8 +203,9 @@ server <- function(input, output, session){
   # reactives
   processed_data <- reactiveVal(NULL)
   plot_data      <- reactiveVal(NULL)
-  selected_pitch <- reactiveVal(NULL)
+  selected_pitch_uid <- reactiveVal(NULL)
   selected_keys  <- reactiveVal(integer(0))
+  plot_version   <- reactiveVal(0)  # Force plot refresh
 
   # quick-select buttons
   observeEvent(input$select_all_cols,    { updateCheckboxGroupInput(session,"columns_to_remove", selected = columns_to_remove) })
@@ -233,18 +241,25 @@ server <- function(input, output, session){
 
       df <- df %>% distinct()
 
-      # Create unique identifiers
-      if (!".uid" %in% names(df)) df$.uid <- seq_len(nrow(df))
+      # Create unique identifiers - CRITICAL for tracking
+      if (!".uid" %in% names(df)) {
+        df$.uid <- seq_len(nrow(df))
+      }
 
       processed_data(df)
       plot_data(df)
+      plot_version(plot_version() + 1)
 
       if ("Pitcher" %in% names(df)) {
         choices <- sort(unique(df$Pitcher[!is.na(df$Pitcher)]))
-        if (length(choices)) updateSelectInput(session,"pitcher_select", choices = choices, selected = choices[1])
+        if (length(choices)) {
+          updateSelectInput(session,"pitcher_select", choices = choices, selected = choices[1])
+        }
       }
+      
+      showNotification("File processed successfully!", type="message", duration=3)
     }, error = function(e){
-      showNotification(paste("Error processing file:", e$message), type="error")
+      showNotification(paste("Error processing file:", e$message), type="error", duration=5)
     })
   })
 
@@ -275,19 +290,19 @@ server <- function(input, output, session){
     datatable(processed_data(), options=list(scrollX=TRUE, pageLength=10), filter="top")
   })
 
+  # Get current pitcher's data
   pitcher_df <- reactive({
     req(plot_data(), input$pitcher_select)
+    plot_version()  # Depend on version to trigger updates
+    
     d <- plot_data() %>%
       filter(Pitcher == input$pitcher_select) %>%
       filter(!is.na(HorzBreak), !is.na(InducedVertBreak), !is.na(RelSpeed))
     
-    # Add row_key for this pitcher's subset
-    if (nrow(d) > 0) {
-      d$row_key <- seq_len(nrow(d))
-    }
     d
   })
 
+  # Movement plot
   output$movement_plot <- renderPlotly({
     d <- pitcher_df()
     validate(need(nrow(d) > 0, "No data for selected pitcher"))
@@ -300,10 +315,11 @@ server <- function(input, output, session){
         "<br>Velo: ", round(RelSpeed,1), " mph",
         "<br>IVB: ", round(InducedVertBreak,1), " in",
         "<br>HB: ", round(HorzBreak,1), " in",
-        if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else ""
+        if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else "",
+        "<br>UID: ", .uid
       ),
       hoverinfo = "text",
-      key = ~.uid,
+      customdata = ~.uid,  # Use customdata for reliable key tracking
       color = ~factor(TaggedPitchType),      
       colors = pitch_colors,                 
       marker = list(size = 10)
@@ -314,33 +330,35 @@ server <- function(input, output, session){
         yaxis = list(title="Induced Vertical Break (in)", range=c(-25,25), zeroline=TRUE),
         dragmode = if (input$selection_mode == "drag") "select" else "zoom"
       ) |>
-      config(displaylogo = FALSE)
+      config(displaylogo = FALSE, modeBarButtonsToRemove = c("lasso2d"))
   })
 
+  # Location plot
   output$location_plot <- renderPlotly({
     d <- pitcher_df()
     validate(need(nrow(d) > 0, "No data for selected pitcher"))
 
-plot_ly(
-  data = d, source = "loc",
-  type = "scatter", mode = "markers",
-  x = ~PlateLocSide, y = ~PlateLocHeight,
-  text = ~paste0(
-    "<b>", TaggedPitchType, "</b>",
-    if ("PitchNo" %in% names(d)) paste0("<br>Pitch #: ", PitchNo) else "",
-    "<br>Velo: ", round(RelSpeed, 1), " mph",
-    "<br>X: ", round(PlateLocSide, 2),
-    "<br>Z: ", round(PlateLocHeight, 2),
-    "<br>IVB: ", round(InducedVertBreak, 1), " in",
-    "<br>HB: ", round(HorzBreak, 1), " in",
-    if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else ""
-  ),
-  hoverinfo = "text",
-  key = ~.uid,  # or ~PitchUID / ~PitchNo if you don't have .uid
-  color = ~factor(TaggedPitchType),
-  colors = pitch_colors,
-  marker = list(size = 9)
-) |>
+    plot_ly(
+      data = d, source = "loc",
+      type = "scatter", mode = "markers",
+      x = ~PlateLocSide, y = ~PlateLocHeight,
+      text = ~paste0(
+        "<b>", TaggedPitchType, "</b>",
+        if ("PitchNo" %in% names(d)) paste0("<br>Pitch #: ", PitchNo) else "",
+        "<br>Velo: ", round(RelSpeed, 1), " mph",
+        "<br>X: ", round(PlateLocSide, 2),
+        "<br>Z: ", round(PlateLocHeight, 2),
+        "<br>IVB: ", round(InducedVertBreak, 1), " in",
+        "<br>HB: ", round(HorzBreak, 1), " in",
+        if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else "",
+        "<br>UID: ", .uid
+      ),
+      hoverinfo = "text",
+      customdata = ~.uid,
+      color = ~factor(TaggedPitchType),
+      colors = pitch_colors,
+      marker = list(size = 9)
+    ) |>
       layout(
         title = "Pitch Location (Editable)",
         xaxis = list(title="Plate X (ft)", range=c(-2,2), zeroline=TRUE),
@@ -354,123 +372,182 @@ plot_ly(
                line=list(color="black", width=0.8))
         )
       ) |>
-      config(displaylogo = FALSE)
+      config(displaylogo = FALSE, modeBarButtonsToRemove = c("lasso2d"))
   })
 
-  # ---- Click handlers (single mode) for both plots ----
-  show_pitch_modal <- function(hit_row){
-    selected_pitch(list(
-      pitcher = input$pitcher_select,
-      uid = hit_row$.uid[1],
-      data = hit_row[1,],
-      original_type = hit_row$TaggedPitchType[1]
-    ))
-    showModal(
-      modalDialog(
-        title = tags$h3("Selected Pitch Details:", style="color: darkcyan;"),
-        verbatimTextOutput("selected_pitch_info"),
-        tags$br(),
-        tags$label("Change Pitch Type To:", style="color: peru; font-weight: 600;"),
-        selectInput("modal_new_pitch_type", NULL,
-                    choices = c("Fastball","Sinker","Cutter","Slider","Curveball",
-                                "ChangeUp","Splitter","Knuckleball","Other"),
-                    selected = selected_pitch()[["data"]][["TaggedPitchType"]]),
-        tags$br(),
-        actionButton("update_pitch","Update Pitch Type", class="btn-primary btn-lg"),
-        actionButton("cancel_edit","Cancel", class="btn-default"),
-        easyClose = TRUE, footer = NULL, size = "m"
-      )
-    )
-  }
-
+  # ---- SINGLE CLICK MODE ----
   observeEvent(event_data("plotly_click", source="mv"), {
     req(input$selection_mode == "single")
     clk <- event_data("plotly_click", source="mv")
-    req(nrow(as.data.frame(clk))>0)
-    key <- clk$key[[1]]
+    req(!is.null(clk), nrow(as.data.frame(clk)) > 0)
+    
+    # Get UID from customdata
+    uid <- clk$customdata[[1]]
+    req(!is.null(uid))
+    
     d <- pitcher_df()
-    hit <- d[d$.uid == key, ]
-    if (nrow(hit)==1) show_pitch_modal(hit)
+    hit <- d[d$.uid == uid, ]
+    
+    if (nrow(hit) == 1) {
+      selected_pitch_uid(uid)
+      showModal(
+        modalDialog(
+          title = tags$h3("Edit Pitch Type", style="color: darkcyan;"),
+          tags$div(
+            tags$strong("Pitcher: "), input$pitcher_select, tags$br(),
+            if ("PitchNo" %in% names(hit) && !is.na(hit$PitchNo)) 
+              tagList(tags$strong("Pitch No: "), hit$PitchNo, tags$br()),
+            tags$strong("Current Type: "), tags$span(hit$TaggedPitchType, style="color: peru; font-size: 16px;"), tags$br(),
+            tags$strong("Velocity: "), round(hit$RelSpeed, 1), " mph", tags$br(),
+            tags$strong("Horizontal Break: "), round(hit$HorzBreak, 1), " in", tags$br(),
+            tags$strong("Induced Vertical Break: "), round(hit$InducedVertBreak, 1), " in", tags$br(),
+            if ("SpinRate" %in% names(hit) && !is.na(hit$SpinRate)) 
+              tagList(tags$strong("Spin Rate: "), round(hit$SpinRate, 0), " rpm", tags$br()),
+            tags$br()
+          ),
+          tags$label("Change Pitch Type To:", style="color: peru; font-weight: 600;"),
+          selectInput("modal_new_pitch_type", NULL,
+                      choices = c("Fastball","Sinker","Cutter","Slider","Curveball",
+                                  "ChangeUp","Splitter","Knuckleball","Other"),
+                      selected = hit$TaggedPitchType),
+          tags$br(),
+          footer = tagList(
+            actionButton("update_pitch","Update Pitch Type", class="btn-primary"),
+            actionButton("cancel_edit","Cancel", class="btn-default")
+          ),
+          easyClose = TRUE, size = "m"
+        )
+      )
+    }
   })
   
   observeEvent(event_data("plotly_click", source="loc"), {
     req(input$selection_mode == "single")
     clk <- event_data("plotly_click", source="loc")
-    req(nrow(as.data.frame(clk))>0)
-    key <- clk$key[[1]]
+    req(!is.null(clk), nrow(as.data.frame(clk)) > 0)
+    
+    uid <- clk$customdata[[1]]
+    req(!is.null(uid))
+    
     d <- pitcher_df()
-    hit <- d[d$.uid == key, ]
-    if (nrow(hit)==1) show_pitch_modal(hit)
+    hit <- d[d$.uid == uid, ]
+    
+    if (nrow(hit) == 1) {
+      selected_pitch_uid(uid)
+      showModal(
+        modalDialog(
+          title = tags$h3("Edit Pitch Type", style="color: darkcyan;"),
+          tags$div(
+            tags$strong("Pitcher: "), input$pitcher_select, tags$br(),
+            if ("PitchNo" %in% names(hit) && !is.na(hit$PitchNo)) 
+              tagList(tags$strong("Pitch No: "), hit$PitchNo, tags$br()),
+            tags$strong("Current Type: "), tags$span(hit$TaggedPitchType, style="color: peru; font-size: 16px;"), tags$br(),
+            tags$strong("Velocity: "), round(hit$RelSpeed, 1), " mph", tags$br(),
+            tags$strong("Location: "), "(", round(hit$PlateLocSide, 2), ", ", round(hit$PlateLocHeight, 2), ")", tags$br(),
+            tags$br()
+          ),
+          tags$label("Change Pitch Type To:", style="color: peru; font-weight: 600;"),
+          selectInput("modal_new_pitch_type", NULL,
+                      choices = c("Fastball","Sinker","Cutter","Slider","Curveball",
+                                  "ChangeUp","Splitter","Knuckleball","Other"),
+                      selected = hit$TaggedPitchType),
+          tags$br(),
+          footer = tagList(
+            actionButton("update_pitch","Update Pitch Type", class="btn-primary"),
+            actionButton("cancel_edit","Cancel", class="btn-default")
+          ),
+          easyClose = TRUE, size = "m"
+        )
+      )
+    }
   })
 
-output$selected_pitch_info <- renderText({
-  info <- selected_pitch()
-  if (is.null(info)) return("No pitch selected")
-  d <- info$data
-  
-  paste(
-    paste("Pitcher:", info$pitcher),
-    if ("PitchNo" %in% names(d) && !is.na(d$PitchNo)) paste("PitchNo:", d$PitchNo) else "",
-    paste("Current Type:", d$TaggedPitchType),
-    paste("Velocity:", round(d$RelSpeed, 1), "mph"),
-    paste("Horizontal Break:", round(d$HorzBreak, 1), "inches"),
-    paste("Induced Vertical Break:", round(d$InducedVertBreak, 1), "inches"),
-    if ("SpinRate" %in% names(d) && !is.na(d$SpinRate)) paste("Spin Rate:", round(d$SpinRate, 0), "rpm") else "",
-    if ("Date" %in% names(d) && !is.na(d$Date)) paste("Date:", format(as.Date(d$Date))) else "",
-    sep = "\n"
-  )
-})
-
+  # Update single pitch
   observeEvent(input$update_pitch, {
-    info <- selected_pitch()
-    req(info)
+    uid <- selected_pitch_uid()
+    req(uid)
     new_type <- input$modal_new_pitch_type
     req(new_type)
 
     cur <- plot_data()
-    req("Pitcher" %in% names(cur))
+    req(nrow(cur) > 0)
     cur$TaggedPitchType <- as.character(cur$TaggedPitchType)
 
-    uid <- info$uid
     hit_idx <- which(cur$.uid == uid)
 
     if (length(hit_idx) == 1) {
+      old_type <- cur$TaggedPitchType[hit_idx]
       cur$TaggedPitchType[hit_idx] <- new_type
+      
       plot_data(cur)
       processed_data(cur)
+      plot_version(plot_version() + 1)  # Force refresh
+      
       removeModal()
-      showNotification("Updated pitch tag.", type="message", duration=3)
-      selected_pitch(NULL)
+      showNotification(
+        paste("Updated pitch from", old_type, "to", new_type), 
+        type="message", 
+        duration=2
+      )
+      selected_pitch_uid(NULL)
     } else {
-      showNotification("Could not map selection back to dataset.", type="error")
+      showNotification("Error: Could not find pitch to update.", type="error")
     }
-  }) 
+  })
 
-  observeEvent(input$cancel_edit, { removeModal(); selected_pitch(NULL) })
+  observeEvent(input$cancel_edit, { 
+    removeModal()
+    selected_pitch_uid(NULL)
+  })
 
-  # ---- Drag select (either chart) ----
+  # ---- DRAG SELECT MODE ----
   observeEvent(event_data("plotly_selected", source="mv"), {
     req(input$selection_mode == "drag")
     ev <- event_data("plotly_selected", source="mv")
-    if (!is.null(ev) && length(ev$key)) selected_keys(unique(as.integer(ev$key)))
+    
+    if (!is.null(ev) && "customdata" %in% names(ev)) {
+      keys <- unique(as.integer(ev$customdata))
+      selected_keys(keys)
+    } else {
+      selected_keys(integer(0))
+    }
   })
   
   observeEvent(event_data("plotly_selected", source="loc"), {
     req(input$selection_mode == "drag")
     ev <- event_data("plotly_selected", source="loc")
-    if (!is.null(ev) && length(ev$key)) selected_keys(unique(as.integer(ev$key)))
+    
+    if (!is.null(ev) && "customdata" %in% names(ev)) {
+      keys <- unique(as.integer(ev$customdata))
+      selected_keys(keys)
+    } else {
+      selected_keys(integer(0))
+    }
+  })
+
+  # Clear selection button
+  observeEvent(input$clear_selection, {
+    selected_keys(integer(0))
+    showNotification("Selection cleared", type="message", duration=2)
   })
 
-  # selection info text
+  # Selection info
   output$selection_info <- renderText({
     keys <- selected_keys()
-    if (!length(keys)) return("No points selected.")
+    if (!length(keys)) return("No points selected. Use drag/lasso to select multiple pitches.")
+    
     d <- pitcher_df()
     sel <- d[d$.uid %in% keys, ]
+    
+    if (nrow(sel) == 0) return("Selected points not found in current pitcher's data.")
+    
     cnt <- sort(table(sel$TaggedPitchType), decreasing = TRUE)
-    paste(nrow(sel), "points selected:", paste(names(cnt), "(", cnt, ")", collapse=", "))
+    breakdown <- paste(names(cnt), "(", cnt, ")", collapse=", ")
+    
+    paste(nrow(sel), "pitches selected:", breakdown)
   })
 
+  # Apply bulk changes
   observeEvent(input$apply_bulk_change, {
     req(input$selection_mode == "drag")
     keys <- selected_keys()
@@ -479,37 +556,54 @@ output$selected_pitch_info <- renderText({
     req(new_type)
 
     cur <- plot_data()
-    req("Pitcher" %in% names(cur))
+    req(nrow(cur) > 0)
     cur$TaggedPitchType <- as.character(cur$TaggedPitchType)
 
-    uids <- as.integer(keys)
-    hit_idx <- which(cur$.uid %in% uids & cur$Pitcher == input$pitcher_select)
+    # Only update pitches from current pitcher
+    hit_idx <- which(cur$.uid %in% keys & cur$Pitcher == input$pitcher_select)
 
     if (length(hit_idx) == 0) {
       showNotification("No matching rows found for bulk edit.", type="warning")
       return()
     }
 
+    # Store old types for notification
+    old_types <- unique(cur$TaggedPitchType[hit_idx])
+    
+    # Update
     cur$TaggedPitchType[hit_idx] <- new_type
     plot_data(cur)
     processed_data(cur)
+    plot_version(plot_version() + 1)  # Force refresh
+    
     selected_keys(integer(0))
-    showNotification(paste("Updated", length(hit_idx), "pitches to", new_type),
-                     type="message", duration=3)
+    
+    showNotification(
+      paste("✓ Updated", length(hit_idx), "pitches to", new_type),
+      type="message", 
+      duration=3
+    )
   })
 
-  # click info small text
-  output$click_info <- renderText({
-    info <- selected_pitch()
-    if (is.null(info)) "No point selected yet. Click a point to edit its pitch type."
-    else paste("Last selected pitch:", info$original_type,
-               "| Position (HB, IVB): (", round(info$data$HorzBreak,1), ",",
-               round(info$data$InducedVertBreak,1), ")")
+  # Status info
+  output$status_info <- renderText({
+    if (input$selection_mode == "single") {
+      "Mode: Single Click - Click any point to edit its pitch type"
+    } else {
+      keys <- selected_keys()
+      if (length(keys) > 0) {
+        paste("Mode: Drag Select -", length(keys), "pitches selected. Choose type and click 'Apply Changes'")
+      } else {
+        "Mode: Drag Select - Use drag/lasso tool to select multiple pitches, then apply bulk changes"
+      }
+    }
   })
 
-  # metrics table
+  # Metrics table
   output$movement_stats <- renderDT({
     req(plot_data(), input$pitcher_select)
+    plot_version()  # Depend on version
+    
     data <- plot_data()
     movement_stats <- data %>%
       filter(Pitcher == input$pitcher_select) %>%
@@ -532,7 +626,9 @@ output$selected_pitch_info <- renderText({
                    PitchCall %in% c("StrikeSwinging","FoulBallNotFieldable","FoulBall","InPlay") &
                    (PlateLocSide < -0.95 | PlateLocSide > 0.95 | PlateLocHeight < 1.6 | PlateLocHeight > 3.5), 1, 0)
       )
+    
     total_pitches <- nrow(movement_stats)
+    
     summary_stats <- movement_stats %>%
       group_by(`Pitch Type` = pitch_group) %>%
       summarise(
@@ -551,6 +647,7 @@ output$selected_pitch_info <- renderText({
         `Chase%` = sprintf("%.1f%%", round(mean(chase, na.rm=TRUE)*100,1)),
         .groups = "drop"
       ) %>% arrange(desc(Count))
+    
     datatable(summary_stats, options=list(pageLength=15, dom='t', scrollX=TRUE), rownames=FALSE) %>%
       formatStyle(columns = names(summary_stats), fontSize='12px')
   })
@@ -578,7 +675,14 @@ output$selected_pitch_info <- renderText({
   
   output$downloadData <- downloadHandler(
     filename = function(){ paste0("app_ready_COA_", Sys.Date(), ".csv") },
-    content  = function(file){ write.csv(processed_data(), file, row.names=FALSE) }
+    content  = function(file){ 
+      df_out <- processed_data()
+      # Remove internal UID column before export
+      if (".uid" %in% names(df_out)) {
+        df_out <- df_out %>% select(-.uid)
+      }
+      write.csv(df_out, file, row.names=FALSE)
+    }
   )
 }