shiny updates

- supporting new ShinyAppBuilder version (but keeping backwards compatible for older version)
- updating reticulate minimum package version

DESCRIPTION

@@ -39,7 +39,7 @@ Imports:
     polspline,
     pROC,
     PRROC,
-    reticulate (> 1.16),
+    reticulate (>= 1.30),
     rlang,
     SqlRender (>= 1.1.3),
     survival,

R/ViewShinyPlp.R

@@ -136,15 +136,45 @@ viewPlps <- function(databaseSettings){
   connection <- ResultModelManager::ConnectionHandler$new(connectionDetails)
   databaseSettings$connectionDetailSettings <- NULL
 
-  # set database settings into system variables
+  shinyAppVersion <- strsplit(x = as.character(utils::packageVersion('ShinyAppBuilder')), split = '\\.')[[1]]
+
+  if((shinyAppVersion[1] <= 1 & shinyAppVersion[2] < 2)){
+    # Old code to be backwards compatable
+    config <- ParallelLogger::loadSettingsFromJson(
+      fileName = system.file(
+        'shinyConfig.json', 
+        package = "PatientLevelPrediction"
+      )
+    )
+    # set database settings into system variables
   Sys.setenv("resultDatabaseDetails_prediction" = as.character(ParallelLogger::convertSettingsToJson(databaseSettings)))
-
-  config <- ParallelLogger::loadSettingsFromJson(
-    fileName = system.file(
-      'shinyConfig.json', 
-      package = "PatientLevelPrediction"
+  ShinyAppBuilder::viewShiny(
+    config = config, 
+    connection = connection
     )
+  } else{
+    ohdsiModulesVersion <- strsplit(x = as.character(utils::packageVersion('OhdsiShinyModules')), split = '\\.')[[1]]
+    if(ohdsiModulesVersion[1]>=1 & ohdsiModulesVersion[2]>= 2){
+      config <- ParallelLogger::loadSettingsFromJson(
+        fileName = system.file(
+          'shinyConfigUpdate.json', 
+          package = "PatientLevelPrediction"
+        )
       )
+      databaseSettings$plpTablePrefix = databaseSettings$tablePrefix
+      databaseSettings$cgTablePrefix = databaseSettings$tablePrefix
+      databaseSettings$databaseTable = 'database_meta_table'
+      databaseSettings$databaseTablePrefix = databaseSettings$tablePrefix
+    ShinyAppBuilder::viewShiny(
+      config = config, 
+      connection = connection, 
+      resultDatabaseSettings = databaseSettings
+        )
+    } else{
+      ParallelLogger::logWarn('Need to update package OhdsiShinyModules')
+    }
+
+  }
+
 
-  ShinyAppBuilder::viewShiny(config = config, connection = connection)
 }

inst/shinyConfigUpdate.json

@@ -0,0 +1,26 @@
+{
+  "shinyModules": [
+    {
+      "id": "about",
+      "tabName": "About",
+      "tabText": "About",
+      "shinyModulePackage": "OhdsiShinyModules",
+      "uiFunction": "aboutViewer",
+      "serverFunction": "aboutServer",
+      "infoBoxFile": "aboutHelperFile()",
+      "icon": "info",
+      "order": 1
+    },
+    {
+      "id": "prediction",
+      "tabName": "Prediction",
+      "tabText": "Prediction",
+      "shinyModulePackage": "OhdsiShinyModules",
+      "uiFunction": "patientLevelPredictionViewer",
+      "serverFunction": "patientLevelPredictionServer",
+      "infoBoxFile": "patientLevelPredictionHelperFile()",
+      "icon": "chart-line",
+      "order": 2
+    }
+  ]
+}