Fix demo app and update package dependencies (#202)

* chore: update dependencies * fix: demo app to use new interfaces --------- Co-authored-by: Jakub Sobolewski <[email protected]>
Appsilon · Aug 31, 2023 · ed1c67e · ed1c67e
1 parent f2f19e1
commit ed1c67e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -44,7 +44,8 @@ Suggests:
   RColorBrewer,
   rmarkdown,
   sass,
-  shiny.router,
+  shiny.i18n (>= 0.3.0),
+  shiny.router (>= 0.3.1),
   shinyjs,
   sortable,
   stringi,

diff --git a/inst/examples/demo/app.R b/inst/examples/demo/app.R
@@ -12,36 +12,25 @@ library(dplyr)
 i18n <- Translator$new(translation_csvs_path = "translation")
 i18n$set_translation_language("en")
 
-# Add shiny.router dependencies manually: they are not picked up because they're added in a non-standard way.
-shiny::addResourcePath("shiny.router", system.file("www", package = "shiny.router"))
-shiny_router_js_src <- file.path("shiny.router", "shiny.router.js")
-shiny_router_script_tag <- shiny::tags$script(type = "text/javascript", src = shiny_router_js_src)
-
 lang_options <- list(
   list(key = "en", text = "English"),
   list(key = "pl", text = "Polish")
 )
 
-details_list_columns <- function() {
+details_list_columns <- function(i18n) {
   tibble(
     fieldName = c("rep_name", "date", "deal_amount", "client_name", "city", "is_closed"),
     name = c(i18n$t("Sales rep"), i18n$t("Close date"), i18n$t("Amount"), i18n$t("Client"), i18n$t("City"), i18n$t("Is closed?")),
     key = fieldName
   )
 }
 
-router <- make_router(
-  route("/", homePage(i18n)),
-  route("other", analysisPage(i18n))
-)
-
 sass(sass_file("style.scss"), output = "www/style.css")
 
 ui <- fluentPage(
   tags$head(
     tags$link(href = "style.css", rel = "stylesheet", type = "text/css"),
-    shiny_router_script_tag,
-    shiny.i18n::usei18n(i18n)
+    usei18n(i18n)
   ),
   div(
     class = "grid-container",
@@ -53,22 +42,28 @@ ui <- fluentPage(
         Dropdown.shinyInput("language", options = lang_options, value = "en")
       )
     ),
-    div(class = "main", router$ui),
+    div(
+      class = "main",
+      router_ui(
+        route("/", homePage(i18n)),
+        route("other", analysisPage(i18n))
+      )
+    ),
     div(class = "footer", footer(i18n))
   )
 )
 
 server <- function(input, output, session) {
-  router$server(input, output, session)
+  router_server(root_page = "/")
   tr <- reactiveVal()
-  
+
   observeEvent(input$language, {
     lang <- input$language
-    update_lang(session, lang)
+    update_lang(lang)
     i18n$set_translation_language(lang)
     tr(i18n)
   })
-  
+
   observe({
     req(tr())
     newOptions <- purrr::map(lang_options, ~ list(key = .x$key, text = tr()$t(.x$text)))
@@ -118,7 +113,7 @@ server <- function(input, output, session) {
 
   output$filteredSalesReps <- renderUI({
     items_list <- if(nrow(filteredDeals()) > 0){
-      DetailsList(items = filteredDeals(), columns = details_list_columns())
+      DetailsList(items = filteredDeals(), columns = details_list_columns(i18n))
     } else {
       p(i18n$t("No matching transactions."))
     }