Merge pull request #435 from SCCapstone/search-tags-dynamic

better searching alg
SCCapstone · Mar 31, 2023 · 35caacc · 35caacc
2 parents bbef27e + 874312a
commit 35caacc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/delta_web/delta/frontend/src/components/csvFile/CsvFileTable.js b/delta_web/delta/frontend/src/components/csvFile/CsvFileTable.js
@@ -38,7 +38,7 @@ const CsvFileTable = (props) => {
   }, []);
 
   // probably should return some spinner
-  if (csvFiles == null) return <div data-testid="csv_file_table-1"></div>;
+  if (csvFiles == null) return <div data-testid="csv_file_table-1"></div>
 
   return (
     <div data-testid="csv_file_table-1">

diff --git a/delta_web/delta/frontend/src/components/data_transfer/PublicCsvFileTable.js b/delta_web/delta/frontend/src/components/data_transfer/PublicCsvFileTable.js
@@ -83,7 +83,20 @@ const PublicCsvFileTable = (props) =>{
     if(arrStrTagSearch.length > 0){
       filteredCsvs.forEach((csvFile)=>{
         const arrStrFileTags= csvFile.tags.map((strObj)=>strObj.text);
-        const isSubset =arrStrTagSearch.every(searchTag=>arrStrFileTags.includes(searchTag));
+        var isSubset = false;
+        for(let strSearchTag of arrStrTagSearch){
+          for(let strFileTag of arrStrFileTags){
+            if(strFileTag.toLowerCase().includes(strSearchTag.toLowerCase())){
+              isSubset = true;
+            }
+          }
+        }
+        arrStrTagSearch.every((searchTag)=> 
+        {
+
+          arrStrFileTags.includes(searchTag)
+        }
+        );
         if(!isSubset){
           // can safely remove file
           filteredCsvs = filteredCsvs.filter((e)=>{return e != csvFile})