Update app.R

app.R

@@ -173,7 +173,7 @@ ui <- fluidPage(
           h3("Pitch Metrics Summary"),
           DTOutput("movement_stats"),
           h3("Location Plot (Editable)"),
-          plotlyOutput("location_plot", height="600px")  # <— new location plot
+          plotlyOutput("location_plot", height="600px")
         )
       )
     ),
@@ -197,7 +197,7 @@ server <- function(input, output, session){
   processed_data <- reactiveVal(NULL)
   plot_data      <- reactiveVal(NULL)
   selected_pitch <- reactiveVal(NULL)
-  selected_keys  <- reactiveVal(integer(0))  # works for either chart
+  selected_keys  <- reactiveVal(integer(0))
 
   # quick-select buttons
   observeEvent(input$select_all_cols,    { updateCheckboxGroupInput(session,"columns_to_remove", selected = columns_to_remove) })
@@ -231,13 +231,13 @@ server <- function(input, output, session){
       have <- intersect(names(df), num_cols)
       df[have] <- lapply(df[have], function(x) suppressWarnings(as.numeric(x)))
 
-df <- df %>% distinct()
+      df <- df %>% distinct()
 
-if (!".uid" %in% names(df)) df$.uid <- seq_len(nrow(df))
-
-processed_data(df)
-plot_data(df)
+      # Create unique identifiers
+      if (!".uid" %in% names(df)) df$.uid <- seq_len(nrow(df))
 
+      processed_data(df)
+      plot_data(df)
 
       if ("Pitcher" %in% names(df)) {
         choices <- sort(unique(df$Pitcher[!is.na(df$Pitcher)]))
@@ -275,85 +275,91 @@ plot_data(df)
     datatable(processed_data(), options=list(scrollX=TRUE, pageLength=10), filter="top")
   })
 
-pitcher_df <- reactive({
-  req(plot_data(), input$pitcher_select)
-  plot_data() %>%
-    filter(Pitcher == input$pitcher_select) %>%
-    filter(!is.na(HorzBreak), !is.na(InducedVertBreak), !is.na(RelSpeed))
-})
-
-output$movement_plot <- renderPlotly({
-  d <- pitcher_df()
-  validate(need(nrow(d) > 0, "No data for selected pitcher"))
-
-  plot_ly(
-    data = d, source = "mv", type = "scatter", mode = "markers",
-    x = ~HorzBreak, y = ~InducedVertBreak,
-    text = ~paste0(
-      "<b>", TaggedPitchType, "</b>",
-      "<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 ""
-    ),
-    hoverinfo = "text",
-    key = ~row_key,
-    color = ~factor(TaggedPitchType),      
-    colors = pitch_colors,                 
-    marker = list(size = 10)
-  ) |>
-    layout(
-      title = paste("Pitch Movement Chart -", input$pitcher_select),
-      xaxis = list(title="Horizontal Break (in)", range=c(-25,25), zeroline=TRUE),
-      yaxis = list(title="Induced Vertical Break (in)", range=c(-25,25), zeroline=TRUE),
-      dragmode = if (input$selection_mode == "drag") "select" else "zoom"
+  pitcher_df <- reactive({
+    req(plot_data(), input$pitcher_select)
+    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
+  })
+
+  output$movement_plot <- renderPlotly({
+    d <- pitcher_df()
+    validate(need(nrow(d) > 0, "No data for selected pitcher"))
+
+    plot_ly(
+      data = d, source = "mv", type = "scatter", mode = "markers",
+      x = ~HorzBreak, y = ~InducedVertBreak,
+      text = ~paste0(
+        "<b>", TaggedPitchType, "</b>",
+        "<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 ""
+      ),
+      hoverinfo = "text",
+      key = ~.uid,
+      color = ~factor(TaggedPitchType),      
+      colors = pitch_colors,                 
+      marker = list(size = 10)
     ) |>
-    config(displaylogo = FALSE)
-})
-
-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>",
-      "<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 = ~row_key,
-    color = ~factor(TaggedPitchType),      # <-- data-driven
-    colors = pitch_colors,                 # <-- your palette
-    marker = list(size = 9)
-  ) |>
-    layout(
-      title = "Pitch Location (Editable)",
-      xaxis = list(title="Plate X (ft)", range=c(-2,2), zeroline=TRUE),
-      yaxis = list(title="Plate Z (ft)", range=c(0,4.5), zeroline=TRUE),
-      dragmode = if (input$selection_mode == "drag") "select" else "zoom",
-      shapes = list(
-        list(type="rect", x0=-0.8303, x1=0.8303, y0=1.6, y1=3.5,
-             line=list(color="black", width=1), fillcolor="rgba(0,0,0,0)"),
-        list(type="path",
-             path="M -0.708 0.15 L 0.708 0.15 L 0.708 0.3 L 0 0.5 L -0.708 0.3 Z",
-             line=list(color="black", width=0.8))
-      )
+      layout(
+        title = paste("Pitch Movement Chart -", input$pitcher_select),
+        xaxis = list(title="Horizontal Break (in)", range=c(-25,25), zeroline=TRUE),
+        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)
+  })
+
+  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>",
+        "<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,
+      color = ~factor(TaggedPitchType),
+      colors = pitch_colors,
+      marker = list(size = 9)
     ) |>
-    config(displaylogo = FALSE)
-})
+      layout(
+        title = "Pitch Location (Editable)",
+        xaxis = list(title="Plate X (ft)", range=c(-2,2), zeroline=TRUE),
+        yaxis = list(title="Plate Z (ft)", range=c(0,4.5), zeroline=TRUE),
+        dragmode = if (input$selection_mode == "drag") "select" else "zoom",
+        shapes = list(
+          list(type="rect", x0=-0.8303, x1=0.8303, y0=1.6, y1=3.5,
+               line=list(color="black", width=1), fillcolor="rgba(0,0,0,0)"),
+          list(type="path",
+               path="M -0.708 0.15 L 0.708 0.15 L 0.708 0.3 L 0 0.5 L -0.708 0.3 Z",
+               line=list(color="black", width=0.8))
+        )
+      ) |>
+      config(displaylogo = FALSE)
+  })
 
   # ---- Click handlers (single mode) for both plots ----
   show_pitch_modal <- function(hit_row){
     selected_pitch(list(
       pitcher = input$pitcher_select,
-      row_key = hit_row$row_key[1],
+      uid = hit_row$.uid[1],
       data = hit_row[1,],
       original_type = hit_row$TaggedPitchType[1]
     ))
@@ -377,16 +383,21 @@ output$location_plot <- renderPlotly({
 
   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)
+    clk <- event_data("plotly_click", source="mv")
+    req(nrow(as.data.frame(clk))>0)
     key <- clk$key[[1]]
-    d <- pitcher_df(); hit <- d[d$row_key == key, ]
+    d <- pitcher_df()
+    hit <- d[d$.uid == key, ]
     if (nrow(hit)==1) show_pitch_modal(hit)
   })
+  
   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)
+    clk <- event_data("plotly_click", source="loc")
+    req(nrow(as.data.frame(clk))>0)
     key <- clk$key[[1]]
-    d <- pitcher_df(); hit <- d[d$row_key == key, ]
+    d <- pitcher_df()
+    hit <- d[d$.uid == key, ]
     if (nrow(hit)==1) show_pitch_modal(hit)
   })
 
@@ -407,41 +418,31 @@ output$location_plot <- renderPlotly({
     )
   })
 
-observeEvent(input$update_pitch, {
-  info <- selected_pitch(); req(info)
-  new_type <- input$modal_new_pitch_type; req(new_type)
+  observeEvent(input$update_pitch, {
+    info <- selected_pitch()
+    req(info)
+    new_type <- input$modal_new_pitch_type
+    req(new_type)
 
-  cur <- plot_data(); req("Pitcher" %in% names(cur))
-  cur$TaggedPitchType <- as.character(cur$TaggedPitchType)   # ensure character
+    cur <- plot_data()
+    req("Pitcher" %in% names(cur))
+    cur$TaggedPitchType <- as.character(cur$TaggedPitchType)
 
-  uid <- info$uid
-  hit_idx <- which(cur$.uid == uid)
+    uid <- info$uid
+    hit_idx <- which(cur$.uid == uid)
 
-  if (length(hit_idx) == 1) {
-    cur$TaggedPitchType[hit_idx] <- new_type
-    plot_data(cur); processed_data(cur)
-    removeModal()
-    showNotification("Updated pitch tag.", type="message", duration=3)
-    selected_pitch(NULL)
-  } else {
-    showNotification("Could not map selection back to dataset.", type="error")
-  }
-}) 
-
-    # map row_key back to absolute index for this pitcher slice
-    idx_pitcher <- which(cur$Pitcher == info$pitcher)
-    if (length(idx_pitcher) >= info$row_key && info$row_key > 0) {
-      abs_row <- idx_pitcher[info$row_key]
-      cur$TaggedPitchType[abs_row] <- new_type
-      plot_data(cur); processed_data(cur)
+    if (length(hit_idx) == 1) {
+      cur$TaggedPitchType[hit_idx] <- new_type
+      plot_data(cur)
+      processed_data(cur)
       removeModal()
-      showNotification(paste("Updated pitch from", info$original_type, "to", new_type),
-                       type="message", duration=3)
+      showNotification("Updated pitch tag.", type="message", duration=3)
       selected_pitch(NULL)
     } else {
       showNotification("Could not map selection back to dataset.", type="error")
     }
-  })
+  }) 
+
   observeEvent(input$cancel_edit, { removeModal(); selected_pitch(NULL) })
 
   # ---- Drag select (either chart) ----
@@ -450,6 +451,7 @@ observeEvent(input$update_pitch, {
     ev <- event_data("plotly_selected", source="mv")
     if (!is.null(ev) && length(ev$key)) selected_keys(unique(as.integer(ev$key)))
   })
+  
   observeEvent(event_data("plotly_selected", source="loc"), {
     req(input$selection_mode == "drag")
     ev <- event_data("plotly_selected", source="loc")
@@ -460,33 +462,38 @@ observeEvent(input$update_pitch, {
   output$selection_info <- renderText({
     keys <- selected_keys()
     if (!length(keys)) return("No points selected.")
-    d <- pitcher_df(); sel <- d[d$row_key %in% keys, ]
+    d <- pitcher_df()
+    sel <- d[d$.uid %in% keys, ]
     cnt <- sort(table(sel$TaggedPitchType), decreasing = TRUE)
     paste(nrow(sel), "points selected:", paste(names(cnt), "(", cnt, ")", collapse=", "))
   })
 
-observeEvent(input$apply_bulk_change, {
-  req(input$selection_mode == "drag")
-  keys <- selected_keys(); req(length(keys) > 0)
-  new_type <- input$bulk_pitch_type; req(new_type)
+  observeEvent(input$apply_bulk_change, {
+    req(input$selection_mode == "drag")
+    keys <- selected_keys()
+    req(length(keys) > 0)
+    new_type <- input$bulk_pitch_type
+    req(new_type)
 
-  cur <- plot_data(); req("Pitcher" %in% names(cur))
-  cur$TaggedPitchType <- as.character(cur$TaggedPitchType)   # ensure character
+    cur <- plot_data()
+    req("Pitcher" %in% names(cur))
+    cur$TaggedPitchType <- as.character(cur$TaggedPitchType)
 
-  # keys from plotly are .uid values
-  uids <- as.integer(keys)
-  hit_idx <- which(cur$.uid %in% uids & cur$Pitcher == input$pitcher_select)
+    uids <- as.integer(keys)
+    hit_idx <- which(cur$.uid %in% uids & cur$Pitcher == input$pitcher_select)
 
-  if (length(hit_idx) == 0) {
-    showNotification("No matching rows found for bulk edit.", type="warning"); return()
-  }
+    if (length(hit_idx) == 0) {
+      showNotification("No matching rows found for bulk edit.", type="warning")
+      return()
+    }
 
-  cur$TaggedPitchType[hit_idx] <- new_type
-  plot_data(cur); processed_data(cur)
-  selected_keys(integer(0))
-  showNotification(paste("Updated", length(hit_idx), "pitches to", new_type),
-                   type="message", duration=3)
-})
+    cur$TaggedPitchType[hit_idx] <- new_type
+    plot_data(cur)
+    processed_data(cur)
+    selected_keys(integer(0))
+    showNotification(paste("Updated", length(hit_idx), "pitches to", new_type),
+                     type="message", duration=3)
+  })
 
   # click info small text
   output$click_info <- renderText({
@@ -544,10 +551,11 @@ observeEvent(input$apply_bulk_change, {
     datatable(summary_stats, options=list(pageLength=15, dom='t', scrollX=TRUE), rownames=FALSE) %>%
       formatStyle(columns = names(summary_stats), fontSize='12px')
   })
-
+  
   # data summary + download
   output$data_summary <- renderText({
-    req(processed_data()); df <- processed_data()
+    req(processed_data())
+    df <- processed_data()
     paste(
       paste("Total rows:", nrow(df)),
       paste("Total columns:", ncol(df)),
@@ -555,11 +563,16 @@ observeEvent(input$apply_bulk_change, {
         if ("Date" %in% names(df) && !all(is.na(df$Date))) {
           paste(min(as.Date(df$Date), na.rm=TRUE), "to", max(as.Date(df$Date), na.rm=TRUE))
         } else "Date column not available"),
-      paste("Unique pitchers:", if ("Pitcher" %in% names(df)) length(unique(df$Pitcher[!is.na(df$Pitcher)])) else "Pitcher column not available"),
-      paste("Pitch types:", if ("TaggedPitchType" %in% names(df)) paste(sort(unique(df$TaggedPitchType[!is.na(df$TaggedPitchType)])), collapse=", ") else "TaggedPitchType column not available"),
+      paste("Unique pitchers:", 
+        if ("Pitcher" %in% names(df)) length(unique(df$Pitcher[!is.na(df$Pitcher)])) 
+        else "Pitcher column not available"),
+      paste("Pitch types:", 
+        if ("TaggedPitchType" %in% names(df)) paste(sort(unique(df$TaggedPitchType[!is.na(df$TaggedPitchType)])), collapse=", ") 
+        else "TaggedPitchType column not available"),
       sep = "\n"
     )
   })
+  
   output$downloadData <- downloadHandler(
     filename = function(){ paste0("app_ready_COA_", Sys.Date(), ".csv") },
     content  = function(file){ write.csv(processed_data(), file, row.names=FALSE) }