Concept sets search - UI rework

OHDSI · Nov 30, 2022 · 771e8c2 · 771e8c2
1 parent cf830a6
commit 771e8c2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/js/components/advancedSearch/advancedSearch.html b/js/components/advancedSearch/advancedSearch.html
@@ -35,7 +35,7 @@
 					element: 'input',
 					extra: 'form-control'
 				}),
-				placeholder: ko.i18n('search.placeholder', 'Type your search here'),
+				placeholder: ko.i18n('cs.browser.searchQueryPlaceholder', 'Search by Concept ID, Concept Code, Concept Name'),
 				disable: loading()" />
             <div class="input-group-btn">
                 <button type="submit" class="btn btn-primary" data-bind="title: ko.i18n('search.buttonTitle', 'Search'), disable: loading()"><i class="fa fa-search"></i></button>

diff --git a/js/components/circe/components/ConceptSetBrowser.js b/js/components/circe/components/ConceptSetBrowser.js
@@ -187,29 +187,25 @@ define([
 
 		// advanced search
 		this.showSearch = ko.observable(false);
-		this.toggleShowSearch =  function () {
-			this.showSearch(!this.showSearch());
-		};
-		this.searchAvailable = ko.observable(false);
-		self.searchConceptSets = async function (searchParams) {
+
+		self.checkSearchAvailable = async function () {
 			self.loading(true);
 			try {
-				const data = await conceptSetService.searchConceptSets(searchParams);
-
-				prepareDataTable(data);
-				self.repositoryConceptSets(data);
+				const data = await conceptSetService.checkSearchAvailable();
+				self.showSearch(data);
 			} catch(e) {
 				throw new Error(e);
 			} finally {
 				self.loading(false);
 			}
 		};
-
-		self.checkSearchAvailable = async function () {
+		self.searchConceptSets = async function (searchParams) {
 			self.loading(true);
 			try {
-				const data = await conceptSetService.checkSearchAvailable();
-				self.searchAvailable(data);
+				const data = await conceptSetService.searchConceptSets(searchParams);
+
+				prepareDataTable(data);
+				self.repositoryConceptSets(data);
 			} catch(e) {
 				throw new Error(e);
 			} finally {

diff --git a/js/components/circe/components/ConceptSetBrowserTemplate.html b/js/components/circe/components/ConceptSetBrowserTemplate.html
@@ -7,10 +7,6 @@
 
         <div data-bind="visible: !loading() && !isProcessing()">
             <div class="conceptset-browser-panel" data-bind="visible: buttonActionEnabled">
-                <!-- ko if: searchAvailable() -->
-                <button type="button" class="btn btn-primary btn-sm" data-bind="click: toggleShowSearch, visible:!showSearch(), text: ko.i18n('cs.browser.searchCS', 'Search Concept Sets')"></button>
-                <button type="button" class="btn btn-danger btn-sm" data-bind="click: toggleShowSearch, visible:showSearch(), text: ko.i18n('cs.browser.closeSearchCS', 'Close Search Concept Sets')"></button>
-                <!-- /ko -->
                 <button type="button" class="btn btn-sm btn-primary new-concept-set" data-bind="click: addConceptSet, css: {disabled: disableConceptSetButton}, text: buttonActionText"></button>
             </div>
             <advanced-search