[ATL-58] Transform search data JSON to a human friendly format in ann…

…otations tab
OHDSI · Oct 29, 2024 · 965b08d · 965b08d
1 parent ad1ed68
commit 965b08d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/js/components/conceptAddBox/concept-add-box.js b/js/components/conceptAddBox/concept-add-box.js
@@ -157,10 +157,10 @@ define([
 
       sharedState.activeConceptSet(conceptSet);
 
-      const filterConcept = JSON.parse(localStorage?.getItem('data-filter-concept') || null);
-      const filterConceptSet = JSON.parse(localStorage?.getItem('data-filter-conceptset') || null);
+      const filterSource = localStorage?.getItem('filter-source') || null;
+      const filterData = JSON.parse(localStorage?.getItem('filter-data') || null);
       const datasAdded = JSON.parse(localStorage?.getItem('data-add-selected-concept') || null) || [];
-      const dataSearch = { filterConceptSet, filterConcept }
+      const dataSearch = { filterData, filterSource }
       const payloadAdd = this.conceptsToAdd().map(item => {
         return {
           "searchData": dataSearch,

diff --git a/js/components/faceted-datatable.js b/js/components/faceted-datatable.js
@@ -98,15 +98,21 @@ define(['knockout', 'text!./faceted-datatable.html', 'crossfilter', 'utils/Commo
 
 		self.updateFilters = function (data, event) {
 			const currentPath = window.location?.href;
-			if(currentPath?.includes('/conceptset/')){
-				self.setDataLocalStorage(data, 'data-filter-conceptset');
+			if (currentPath?.includes('/conceptset/')) {
+				if (currentPath?.includes('/included-sourcecodes')) {
+					localStorage.setItem('filter-source', 'Included Source Codes');
+				} else if (currentPath?.includes('/included')) {
+					localStorage.setItem('filter-source', 'Included Concepts');
+				}
+				self.setDataLocalStorage(data, 'filter-data');
 			}
 			const isAddConcept = currentPath?.split('?').reduce((prev, curr) => prev || curr.includes('search'), false) &&
-								currentPath?.split('?').reduce((prev, curr) => prev || curr.includes('query'), false) ||
-								currentPath?.includes('/concept/')
+				currentPath?.split('?').reduce((prev, curr) => prev || curr.includes('query'), false) ||
+				currentPath?.includes('/concept/')
 
-			if(isAddConcept){
-				self.setDataObjectLocalStorage(data, 'data-filter-concept')
+			if (isAddConcept) {
+				localStorage.setItem('filter-source', 'Search');
+				self.setDataObjectLocalStorage(data, 'filter-data')
 			}
 			var facet = data.facet;
 			data.selected(!data.selected());

diff --git a/js/pages/concept-sets/components/tabs/conceptset-annotation.js b/js/pages/concept-sets/components/tabs/conceptset-annotation.js
@@ -36,7 +36,7 @@ define([
                   if (r.searchData === null || r.searchData === undefined || !r.searchData) {
                       return 'N/A';
                   } else {
-                      return `<p>${JSON.stringify(r.searchData)}</p>`
+                      return `<p>${r.searchData}</p>`
                   }
               },
               sortable: false
@@ -101,7 +101,7 @@ define([
 
     objectMap(obj) {
       const newObject = {};
-      const keysNotToParse = ['createdBy', 'createdDate', 'vocabularyVersion', 'conceptSetVersion'];
+      const keysNotToParse = ['createdBy', 'createdDate', 'vocabularyVersion', 'conceptSetVersion', 'searchData'];
       Object.keys(obj).forEach((key) => {
         if (typeof obj[key] === 'string' && !keysNotToParse.includes(key)) {
           newObject[key] = JSON.parse(obj[key] || null);

diff --git a/js/pages/concept-sets/conceptset-manager.js b/js/pages/concept-sets/conceptset-manager.js
@@ -480,9 +480,9 @@ define([
 		}
 
 		removeDataFilterStorage(){
-			localStorage.removeItem('data-filter-conceptset');
+			localStorage.removeItem('filter-data');
+			localStorage.removeItem('filter-source');
 			localStorage.removeItem('data-remove-selected-concept');
-			localStorage.removeItem('data-filter-concept');
 			localStorage.removeItem('data-add-selected-concept');
 		}
 

diff --git a/js/pages/vocabulary/components/search.js b/js/pages/vocabulary/components/search.js
@@ -369,14 +369,14 @@ define([
 		}
 
 		async executeSearch() {
-			const filterObjString = localStorage.getItem('data-filter-concept')
+			const filterObjString = localStorage.getItem('filter-data')
 			let filterObj = filterObjString ? JSON.parse(filterObjString): {}
 
 			filterObj = {
 				...filterObj,
 				searchText: this.currentSearch() 
 			}
-			localStorage.setItem('data-filter-concept', JSON.stringify(filterObj))
+			localStorage.setItem('filter-data', JSON.stringify(filterObj))
 
 			if (!this.currentSearch() && !this.showAdvanced()) {
 				this.data([]);