Fix for conceptset ids in cd - requires no api change

OHDSI · Oct 1, 2024 · d46bd33 · d46bd33
1 parent 942c6ea
commit d46bd33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/R/cohort-diagnostics-conceptsInDataSource.R b/R/cohort-diagnostics-conceptsInDataSource.R
@@ -136,6 +136,7 @@ conceptsInDataSourceModule <- function(id,
                                        selectedDatabaseIds,
                                        targetCohortId,
                                        selectedConceptSets,
+                                       conceptSetIds,
                                        databaseTable = dataSource$dbTable) {
   ns <- shiny::NS(id)
   shiny::moduleServer(id, function(input, output, session) {
@@ -158,10 +159,6 @@ conceptsInDataSourceModule <- function(id,
       return(data)
     })
 
-    conceptSetIds <- shiny::reactive({
-      selectedConceptSets()
-    })
-
     getResolvedConcepts <- shiny::reactive({
       output <- resolvedConceptSet(
         dataSource = dataSource,

diff --git a/R/cohort-diagnostics-main.R b/R/cohort-diagnostics-main.R
@@ -667,6 +667,7 @@ cohortDiagnosticsServer <- function(id,
                                  selectedDatabaseIds = selectedDatabaseIds,
                                  targetCohortId = targetCohortId,
                                  selectedConceptSets = selectedConceptSets,
+                                 conceptSetIds = conceptSetIds,
                                  databaseTable = databaseTable)
     }
 

diff --git a/tests/testthat/test-cohort-diagnostics-conceptsInDataSource.R b/tests/testthat/test-cohort-diagnostics-conceptsInDataSource.R
@@ -6,7 +6,8 @@ shiny::testServer(conceptsInDataSourceModule, args = list(
   selectedCohort = shiny::reactive({ 14096 }),
   selectedDatabaseIds = shiny::reactive({"Eunomia"}),
   targetCohortId = shiny::reactive({14096}),
-  selectedConceptSets = shiny::reactive({ NULL })
+  selectedConceptSets = shiny::reactive({ NULL }),
+  conceptSetIds = shiny::reactive({ NULL })
 ), {
 
   conceptsInDataSourceReactive()