Prevent multiple calls to concept set list when loading cohort editor

OHDSI · Oct 2, 2023 · 74e95ac · 74e95ac
1 parent cb1a150
commit 74e95ac
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/js/components/atlas.cohort-editor.html b/js/components/atlas.cohort-editor.html
@@ -17,6 +17,7 @@
 					<div class="modal-header" data-bind="text: ko.i18n('components.atlasCohortEditor.importConceptSet', 'Import Concept Set From Repository...')"></div>
 					<div class="paddedWrapper">
 						<concept-set-browser params="
+							showModal: $component.showModal,
 							criteriaContext: $component.criteriaContext,
 							cohortConceptSets: $component.currentCohortDefinition().expression().ConceptSets,
 							onActionComplete: $component.onAtlasConceptSetSelectAction,

diff --git a/js/components/circe/components/ConceptSetBrowser.js b/js/components/circe/components/ConceptSetBrowser.js
@@ -79,6 +79,10 @@ define([
 		self.repositoryConceptSetTableId = params.repositoryConceptSetTableId || "repositoryConceptSetTable";
 
 		self.loading = ko.observable(false);
+		self.showModal = params.showModal;
+		self.isComponentUsedAsModal = ko.pureComputed(function() {
+			return(ko.isObservable(self.showModal))
+		});
 		self.repositoryConceptSets = ko.observableArray();
 		self.isProcessing = ko.observable(false);
 
@@ -125,9 +129,18 @@ define([
 
 		// dispose subscriptions
 
-		// startup actions
-		self.loadConceptSetsFromRepository(self.selectedSource()
-			.url);
+		if (self.isComponentUsedAsModal()) {
+			// Add subscription to load concept set
+			// list when the modal is displayed
+			self.showModal.subscribe(() => {
+				if (self.showModal()){
+					self.loadConceptSetsFromRepository(self.selectedSource().url);
+				}
+			});
+		} else {
+			// startup actions
+			self.loadConceptSetsFromRepository(self.selectedSource().url);
+		}
 
 		this.options = {
 			Facets: [

diff --git a/js/components/from-reusables-modal/from-reusables-modal.html b/js/components/from-reusables-modal/from-reusables-modal.html
@@ -55,6 +55,7 @@ <h2 class="selected-reusable-name" data-bind="text: selectedReusable().name"></h
             <div class="modal-header" data-bind="text: ko.i18n('components.conceptSetBuilder.selectConceptSet', 'Select Concept Set...')"></div>
             <div class="paddedWrapper">
                 <concept-set-browser params="
+                        showModal: showCsBrowser,
                         repositoryConceptSetTableId: generateCsTableId(),
                         criteriaContext: criteriaContext,
                         cohortConceptSets: ko.observableArray(),

diff --git a/js/extensions/bindings/datatableBinding.js b/js/extensions/bindings/datatableBinding.js
@@ -298,7 +298,7 @@ define([
 			table.clear();
 
 			// Rebuild table from data source specified in binding
-			if (data.length > 0)
+			if (data && data.length > 0)
 				table.rows.add(data);
 
 			// drawing may access observables, which updating we do not want to trigger a redraw to the table

diff --git a/js/services/AuthAPI.js b/js/services/AuthAPI.js
@@ -517,7 +517,9 @@ define(function(require, exports) {
 
     const executeWithRefresh = async function(httpPromise) {
         const result = await httpPromise;
-        await refreshToken();
+        if (config.userAuthenticationEnabled) {
+            await refreshToken();
+        }
         return result;
     }