diff --git a/js/components/advancedSearch/advancedSearch.html b/js/components/advancedSearch/advancedSearch.html index 1fc3fa160..0c60f1adb 100644 --- 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()" />
diff --git a/js/components/circe/components/ConceptSetBrowser.js b/js/components/circe/components/ConceptSetBrowser.js index 7c5752df1..5a2f0d6eb 100644 --- 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 index 97d59be2a..00dd33eb7 100644 --- a/js/components/circe/components/ConceptSetBrowserTemplate.html +++ b/js/components/circe/components/ConceptSetBrowserTemplate.html @@ -7,10 +7,6 @@
- - - -