[MediaWiki-commits] [Gerrit] wikimedia...rainbow[master]: Add bookmarking states
Chelsyx has submitted this change and it was merged. Change subject: Add bookmarking states .. Add bookmarking states In Shiny 0.14, RStudio added a way to bookmark the state of the dashboard. Previously, we've used the shinyURL R package, but this way we use something that is now built into Shiny. Bug: T145478 Change-Id: I0852673581c87a89d95da9f14715fc093daac6a6 --- A global.R M server.R M ui.R R www/custom.js 4 files changed, 263 insertions(+), 345 deletions(-) Approvals: Chelsyx: Verified; Looks good to me, approved diff --git a/global.R b/global.R new file mode 100644 index 000..6300d25 --- /dev/null +++ b/global.R @@ -0,0 +1 @@ +enableBookmarking(store = "url") diff --git a/server.R b/server.R index 17a3679..5ac100c 100644 --- a/server.R +++ b/server.R @@ -6,11 +6,11 @@ existing_date <- Sys.Date() - 1 -shinyServer(function(input, output, session) { +function(input, output, session) { if (Sys.Date() != existing_date) { # Create a Progress object -progress <- shiny::Progress$new(session, min = 0, max = 1) +progress <- shiny::Progress$new() progress$set(message = "Downloading desktop data", value = 0) read_desktop() progress$set(message = "Downloading apps data", value = 0.1) @@ -30,11 +30,6 @@ progress$set(message = "Finished downloading datasets", value = 1) existing_date <<- Sys.Date() progress$close() - } - - # Wrap time_frame_range to provide global settings - time_frame_range <- function(input_local_timeframe, input_local_daterange) { -return(polloi::time_frame_range(input_local_timeframe, input_local_daterange, input$timeframe_global, input$daterange_global)) } ## Desktop value boxes @@ -69,7 +64,6 @@ output$desktop_event_plot <- renderDygraph({ desktop_dygraph_set %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_event)) %>% - polloi::subset_by_date_range(time_frame_range(input$desktop_event_timeframe, input$desktop_event_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Desktop search events, by day") %>% dyRangeSelector %>% dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom") @@ -78,7 +72,6 @@ output$desktop_load_plot <- renderDygraph({ desktop_load_data %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_load)) %>% - polloi::subset_by_date_range(time_frame_range(input$desktop_load_timeframe, input$desktop_load_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Load time (ms)", title = "Desktop load times, by day", use_si = FALSE) %>% dyRangeSelector %>% dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom") @@ -87,7 +80,6 @@ output$paulscore_approx_plot_fulltext <- renderDygraph({ paulscore_fulltext %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_paulscore_approx)) %>% - polloi::subset_by_date_range(time_frame_range(input$paulscore_approx_timeframe, input$paulscore_approx_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "PaulScore", title = "PaulScore for fulltext searches, by day", use_si = FALSE, group = "paulscore_approx") %>% dyRangeSelector %>% dyLegend(labelsDiv = "paulscore_approx_legend", show = "always") @@ -96,7 +88,6 @@ output$paulscore_approx_plot_autocomplete <- renderDygraph({ paulscore_autocomplete %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_paulscore_approx)) %>% - polloi::subset_by_date_range(time_frame_range(input$paulscore_approx_timeframe, input$paulscore_approx_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "PaulScore", title = "PaulScore for autocomplete searches, by day", use_si = FALSE, group = "paulscore_approx") %>% dyRangeSelector %>% dyLegend(labelsDiv = "paulscore_approx_legend", show = "always") @@ -134,7 +125,6 @@ output$mobile_event_plot <- renderDygraph({ mobile_dygraph_set %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_event)) %>% - polloi::subset_by_date_range(time_frame_range(input$mobile_event_timeframe, input$mobile_event_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Mobile search events, by day") %>% dyRangeSelector }) @@ -142,7 +132,6 @@ output$mobile_load_plot <- renderDygraph({ mobile_load_data %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_load)) %>% - polloi::subset_by_date_range(time_frame_range(input$mobile_load_timeframe, input$mobile_load_timeframe_dater
[MediaWiki-commits] [Gerrit] wikimedia...rainbow[master]: Add bookmarking states
Bearloga has uploaded a new change for review. https://gerrit.wikimedia.org/r/311155 Change subject: Add bookmarking states .. Add bookmarking states In Shiny 0.14, RStudio added a way to bookmark the state of the dashboard. Previously, we've used the shinyURL R package, but this way we use something that is now built into Shiny. Bug: T145478 Change-Id: I0852673581c87a89d95da9f14715fc093daac6a6 --- A global.R M server.R M ui.R R www/custom.js 4 files changed, 263 insertions(+), 345 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow refs/changes/55/311155/1 diff --git a/global.R b/global.R new file mode 100644 index 000..6300d25 --- /dev/null +++ b/global.R @@ -0,0 +1 @@ +enableBookmarking(store = "url") diff --git a/server.R b/server.R index 17a3679..5ac100c 100644 --- a/server.R +++ b/server.R @@ -6,11 +6,11 @@ existing_date <- Sys.Date() - 1 -shinyServer(function(input, output, session) { +function(input, output, session) { if (Sys.Date() != existing_date) { # Create a Progress object -progress <- shiny::Progress$new(session, min = 0, max = 1) +progress <- shiny::Progress$new() progress$set(message = "Downloading desktop data", value = 0) read_desktop() progress$set(message = "Downloading apps data", value = 0.1) @@ -30,11 +30,6 @@ progress$set(message = "Finished downloading datasets", value = 1) existing_date <<- Sys.Date() progress$close() - } - - # Wrap time_frame_range to provide global settings - time_frame_range <- function(input_local_timeframe, input_local_daterange) { -return(polloi::time_frame_range(input_local_timeframe, input_local_daterange, input$timeframe_global, input$daterange_global)) } ## Desktop value boxes @@ -69,7 +64,6 @@ output$desktop_event_plot <- renderDygraph({ desktop_dygraph_set %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_event)) %>% - polloi::subset_by_date_range(time_frame_range(input$desktop_event_timeframe, input$desktop_event_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Desktop search events, by day") %>% dyRangeSelector %>% dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom") @@ -78,7 +72,6 @@ output$desktop_load_plot <- renderDygraph({ desktop_load_data %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_desktop_load)) %>% - polloi::subset_by_date_range(time_frame_range(input$desktop_load_timeframe, input$desktop_load_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Load time (ms)", title = "Desktop load times, by day", use_si = FALSE) %>% dyRangeSelector %>% dyEvent(as.Date("2016-07-12"), "A (schema switch)", labelLoc = "bottom") @@ -87,7 +80,6 @@ output$paulscore_approx_plot_fulltext <- renderDygraph({ paulscore_fulltext %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_paulscore_approx)) %>% - polloi::subset_by_date_range(time_frame_range(input$paulscore_approx_timeframe, input$paulscore_approx_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "PaulScore", title = "PaulScore for fulltext searches, by day", use_si = FALSE, group = "paulscore_approx") %>% dyRangeSelector %>% dyLegend(labelsDiv = "paulscore_approx_legend", show = "always") @@ -96,7 +88,6 @@ output$paulscore_approx_plot_autocomplete <- renderDygraph({ paulscore_autocomplete %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_paulscore_approx)) %>% - polloi::subset_by_date_range(time_frame_range(input$paulscore_approx_timeframe, input$paulscore_approx_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "PaulScore", title = "PaulScore for autocomplete searches, by day", use_si = FALSE, group = "paulscore_approx") %>% dyRangeSelector %>% dyLegend(labelsDiv = "paulscore_approx_legend", show = "always") @@ -134,7 +125,6 @@ output$mobile_event_plot <- renderDygraph({ mobile_dygraph_set %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_event)) %>% - polloi::subset_by_date_range(time_frame_range(input$mobile_event_timeframe, input$mobile_event_timeframe_daterange)) %>% polloi::make_dygraph(xlab = "Date", ylab = "Events", title = "Mobile search events, by day") %>% dyRangeSelector }) @@ -142,7 +132,6 @@ output$mobile_load_plot <- renderDygraph({ mobile_load_data %>% polloi::smoother(smooth_level = polloi::smooth_switch(input$smoothing_global, input$smoothing_mobile_load)) %>% - polloi::subset_by_date_range(time_fra