From d46bd3357af4ad2df1859b5d00c27d97919df964 Mon Sep 17 00:00:00 2001
From: jgilber2 <jgilber2@its.jnj.com>
Date: Tue, 1 Oct 2024 13:40:44 -0700
Subject: [PATCH] Fix for conceptset ids in cd - requires no api change

---
 R/cohort-diagnostics-conceptsInDataSource.R                  | 5 +----
 R/cohort-diagnostics-main.R                                  | 1 +
 .../testthat/test-cohort-diagnostics-conceptsInDataSource.R  | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/R/cohort-diagnostics-conceptsInDataSource.R b/R/cohort-diagnostics-conceptsInDataSource.R
index 33819cbe..26a6f88f 100644
--- 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
index c669aaf9..7000c1ea 100644
--- 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
index 5196c153..90873d45 100644
--- 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()