From 37f9a789b6188dae4507d8f91cce359332fbfacb Mon Sep 17 00:00:00 2001 From: Tom Elliott Date: Thu, 21 Dec 2023 17:42:37 +1300 Subject: [PATCH] Release/2023.12 -> dev (#361) * Release/2023.11.9000 (#356) * fix release generator script * Track 'iNZightVIT/Lite2' changes (#293) * Create new branch tracking iNZightVIT/Lite2 changes * fix conflicts * modes? * ui fix * fix import * fix lite2 env variable * prevent dataset to show before confirm * fix url import * remove comments * fix rdata data selection bug * fix(server): LITE_ -> CAS_; bug in decryption code; import wkb, openssl - Replace LITE_ with CAS_ (for now) given this is still a hard-coded solution - fix parentheses in the raw2char / aes_cbc_decrypt logic - remove wkb code and just import the wkb package (minimal overhead) - remove library calls, use namespacing instead (openssl, wkb) * wrap LITE2 if * add function sample_if_lite2 * fix lite2 UI * fix datetime --------- Co-authored-by: Charco Hui * lite_config * fix(server): Pre-build df and assign to rvalues It seems that row.names() and colnames() are triggering the reload, and by refactoring slightly the loading-loop seems to go away. * prevent reading ENV unless required * delim option on failed import (#340) * remove keys after reading data * rename plot_selector (#342) * Update NEWS.md * (shared): Generalize handling of config Store config as an unaltered list; display version info on landing page. Minor refactor of some parameter handling. * fix(shared): Store config in session$userData Store LITE_VERSION and LITE_CONFIG in the session$userData object * fix(shared): Find remaining variables to prefix * fix(ui): Remove export data for CAS * fix(shared): Uncommnet export data component * fix(shared): Disable menu options in CAS mode * remove gpairs dependency * update news * remove gpairs from imports (closes #25) * fix(server): Set shiny host to 0.0.0.0 * update the correct dockerfile * fix(server): Disable loading R directory (does not exist) * fix arg * Remove log error message (#348) * fix(server): Set shiny host to 0.0.0.0 * update the correct dockerfile * fix(server): Disable loading R directory (does not exist) * fix arg * fix(server): Suppress warnings produced by iNZightMapRegions() * additional import options (#353) Co-authored-by: Mona Lisa * feat(ui): #352 Track disconnects (#355) * feat(ui): #352 Track disconnects Closes: #352 * Bugfix/351 residual flipping (#354) * fix(ui): 351 Use observeEvent instead of observe and isolate After swapping v1 and v2, some reactive connection awakens and gets triggered by the save residuals button. * remove terourou * Data lifecycle management (#349) * fix(server): #304 Delete data after importing * bump version --------- Co-authored-by: Charco Hui Co-authored-by: Charco Hui Co-authored-by: Mona Lisa * update version --------- Co-authored-by: Charco Hui Co-authored-by: Charco Hui Co-authored-by: Mona Lisa --- DESCRIPTION | 2 +- NEWS.md | 2 +- server.R | 16 +++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d22bb1f8..47c22492 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: iNZightLite Type: Shiny Application Title: iNZight Lite -Version: 2023.11.9000 +Version: 2023.12 Authors@R: c( person("Charco", "Hui", role = c("aut", "cre"), email = "charco.hui@auckland.ac.nz"), diff --git a/NEWS.md b/NEWS.md index 229f80da..cd384676 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Pre-release, 2023.11.9000 +# Pre-release, 2023.12 - fix bug in Model Fitting module (panel had a duplicate ID, resulting in some weird behaviour) - remove gpairs dependency diff --git a/server.R b/server.R index ae684169..d2ae4f12 100644 --- a/server.R +++ b/server.R @@ -73,10 +73,7 @@ shinyServer(function(input, output, session) { } cat("Version: ", session$userData$LITE_VERSION, "\n") }) - - # observeEvent(session$userData$LITE_VERSION, { - # print("hi") - # }) + # init_lite_logs() # updateQueryString( # queryString = paste0("?v=lite&sessionId=", LITE_SESSION_ID_) @@ -157,7 +154,7 @@ shinyServer(function(input, output, session) { if(!(!is.null(session$userData$LITE_VERSION) && session$userData$LITE_VERSION == "CAS")) { return(rvalues) } - + if(new_sample) { rvalues$sample.num = ifelse(nrow(d) > 2000, 500, round(nrow(d) / 4)) rvalues$sample.row = sort(sample(1:nrow(d), rvalues$sample.num)) @@ -192,7 +189,7 @@ shinyServer(function(input, output, session) { get.data.set = reactive({ values$data.set }) - + get.data.set.display = reactive({ if(!is.null(session$userData$LITE_VERSION) && session$userData$LITE_VERSION == "CAS") { values$data.sample @@ -200,7 +197,7 @@ shinyServer(function(input, output, session) { values$data.set } }) - + get.data.restore = reactive({ values$data.restore }) @@ -439,7 +436,7 @@ shinyServer(function(input, output, session) { source("panels/F1_QuickExplore/1_quick.explore.ui.R", local = TRUE) source("panels/F1_QuickExplore/2_quick.explore.server.R", local = TRUE) } - + ##----------------------## ## Time Series Module ## ##----------------------## @@ -494,7 +491,7 @@ shinyServer(function(input, output, session) { source("panels/F7_Multivariate//1_Multivariate.panel-ui.R", local = TRUE) source("panels/F7_Multivariate//2_Multivariate.panel-server.R", local = TRUE) } - + ##-------## ## VIT ## ##-------## @@ -619,4 +616,5 @@ shinyServer(function(input, output, session) { } } }) + })