Drop the restore-geometry probe now that the grid is seeded upstream

R/board-server.R

@@ -908,20 +908,6 @@ manage_dock <- function(
           log_debug("active group is now {ag}")
         }
       )
-
-      # The client half of the #473 instrumentation reports here rather than to
-      # a browser console: three reads per restore, each its own event, written
-      # out in the order they were taken. Unwrapped, because `write_log()`
-      # otherwise `strwrap()`s a line this long across two log entries, and a
-      # geometry split down the middle is one nobody can grep a CI run for.
-      observeEvent(
-        input[[dock_input("restore-probe")]],
-        {
-          # nolint next: object_usage_linter.
-          probe <- format_restore_probe(input[[dock_input("restore-probe")]])
-          log_debug("{probe}", asis = TRUE)
-        }
-      )
     }
 
     observeEvent(

R/board-ui.R

@@ -28,8 +28,6 @@ board_ui.dock_board <- function(
     blockr_dock_dep(),
     viewport_probe_ui(id),
     rail_dep(),
-    # Empty unless debug logging is on -- see `probe_restores()`.
-    if (probe_restores()) restore_probe_dep(),
     off_canvas(
       id = NS(id, "blocks_offcanvas"),
       title = "Offcanvas blocks",

R/utils-dock.R

@@ -182,8 +182,6 @@ restore_layout <- function(layout, proxy, blocks = list(),
   # tabComponent to follow suit (#124).
   payload <- lock_panels(payload, locked = is_dock_locked())
 
-  send_restore_probe(payload, proxy)
-
   dockViewR::restore_dock(proxy, unclass(payload))
   invisible(NULL)
 }
@@ -261,125 +259,6 @@ rail_dep <- function() {
   )
 }
 
-# Whether a restore is instrumented for #473. Off unless debug logging is on,
-# because this is a diagnostic and not a feature: it costs a message out and
-# three input round trips back per restore, and it writes to a console nothing
-# prints to at the default level anyway. The same gate has to hold at both ends
-# -- `board_ui()` attaches the client half only under it, and no handler is
-# registered to receive what an ungated send would emit.
-probe_restores <- function() {
-  get_log_level() >= debug_log_level
-}
-
-# Record what a restore starts from, for #473. A rail there renders at the floor
-# dockView puts under an edge group instead of the width it asked for, on a dock
-# with several times the room it needs, and the two candidate triggers are told
-# apart by the dock container's width at the moment `fromJSON` runs. Sent
-# immediately ahead of `restore_dock()` so it rides the same batch and lands
-# before the restore, which is what makes the read the state the restore itself
-# sees; `restore-probe.js` carries the argument for what it collects and why the
-# reading has to happen out there.
-#
-# Rails are what the record is about, so a dock declaring none is not
-# instrumented. The sizes go along because the floor is derived from
-# `collapsed_size` -- a rail sitting exactly on `collapsed_size + 50` is the
-# reported failure, and a reader should not have to know the fixture to see it.
-send_restore_probe <- function(payload, proxy) {
-
-  edges <- payload[["edgeGroups"]]
-
-  if (!probe_restores() || !length(edges)) {
-    return(invisible(NULL))
-  }
-
-  session <- proxy[["session"]]
-
-  session$sendCustomMessage(
-    "blockr-dock-restore-probe",
-    list(
-      id = session$ns(proxy[["id"]]),
-      asked = lapply(edges, restore_probe_sizes)
-    )
-  )
-
-  invisible(NULL)
-}
-
-restore_probe_sizes <- function(edge) {
-  edge[intersect(c("size", "collapsedSize"), names(edge))]
-}
-
-# One line per read, because a console is read top to bottom and a nested dump
-# is not. Every number that separates the two candidate triggers sits on it: the
-# container the restore laid out against, the grid dockView held at that moment,
-# and what each rail got beside what it asked for.
-format_restore_probe <- function(x) {
-
-  paste0(
-    "restore probe ", x[["id"]], " at ", x[["at"]],
-    ": viewport ", probe_px(x[["viewport"]]),
-    ", container ", probe_box(x[["container"]]),
-    ", grid ", probe_box(x[["dock"]]),
-    ", rails ", probe_rails(x[["rails"]], x[["asked"]])
-  )
-}
-
-# A rail is reported as what it got over what it asked for, so a reader can see
-# a squeeze without holding the fixture in their head, and "none" where the read
-# ran before the restore that creates it.
-probe_rails <- function(rails, asked) {
-
-  if (!length(asked)) {
-    return("none declared")
-  }
-
-  paste0(
-    names(asked), " ",
-    chr_ply(
-      names(asked),
-      function(pos) {
-        rail <- rails[[pos]]
-
-        if (is.null(rail)) {
-          return("absent")
-        }
-
-        paste0(probe_px(rail[["width"]]), "/", probe_px(asked[[pos]][["size"]]))
-      }
-    ),
-    collapse = ", "
-  )
-}
-
-probe_box <- function(box) {
-
-  if (is.null(box)) {
-    return("absent")
-  }
-
-  paste0(probe_px(box[["width"]]), "x", probe_px(box[["height"]]))
-}
-
-# Sub-pixel widths are what dockView reports and what a floor lands on, but the
-# fraction never carries the argument, so round rather than print 98.328125.
-probe_px <- function(x) {
-
-  if (!is_number(x)) {
-    return("?")
-  }
-
-  format(round(as.numeric(x)), trim = TRUE)
-}
-
-restore_probe_dep <- function() {
-  htmltools::htmlDependency(
-    "blockr-dock-restore-probe",
-    pkg_version(),
-    src = pkg_file("assets", "js"),
-    script = "restore-probe.js"
-  )
-}
-
 dock_board_ns <- function(dock) {
   coal(dock$board_ns, dock$proxy$session$ns)
 }

tests/testthat/test-board-ui.R

@@ -6,28 +6,9 @@ test_that("dummy board ui test", {
   )
 
   expect_s3_class(ui, "shiny.tag.list")
-  # 11 base elements + the viewport probe + the restore-probe slot + the two
-  # pre-rendered block-browser sidebars (add_block_sidebar,
-  # append_block_sidebar). The probe slot is empty at this log level;
-  # `tagList()` keeps the NULL and htmltools drops it at render.
-  expect_length(ui, 15L)
-})
-
-test_that("the restore probe ships only under debug logging (#473)", {
-
-  board <- new_dock_board(blocks = c(a = new_dataset_block()))
-
-  deps <- function() {
-    chr_xtr(htmltools::findDependencies(board_ui("test", board)), "name")
-  }
-
-  # A diagnostic that reaches a deployment is a diagnostic nobody asked for, so
-  # the gate is the dependency itself rather than a dormant script.
-  expect_false("blockr-dock-restore-probe" %in% deps())
-
-  withr::local_options(blockr.log_level = "debug")
-
-  expect_true("blockr-dock-restore-probe" %in% deps())
+  # 11 base elements + the viewport probe + the two pre-rendered block-browser
+  # sidebars (add_block_sidebar, append_block_sidebar).
+  expect_length(ui, 14L)
 })
 
 # Settings sidebar is mounted with pre-rendered content + a JS-trigger gear