Fix for incorrect type return in annotation value selections. (#255)

kanaverse · Feb 1, 2024 · 25ab4a9 · 25ab4a9
1 parent e6d0658
commit 25ab4a9
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "kana",
   "description": "Single-cell data analysis in the browser",
-  "version": "3.0.21",
+  "version": "3.0.22",
   "author": {
     "name": "Jayaram Kancherla",
     "email": "[email protected]",

diff --git a/src/components/CellAnnotation/index.js b/src/components/CellAnnotation/index.js
@@ -507,6 +507,13 @@ const CellAnnotation = (props) => {
                 props?.setSelectedCellAnnCluster(tmpselection);
                 setClusIdx(1);
               } else {
+                // do the best
+                if (annotationObj[props?.selectedCellAnnAnnotation].values.constructor.name.includes("Float")) {
+                  tmpselection = parseFloat(tmpselection)
+                } else if (annotationObj[props?.selectedCellAnnAnnotation].values.constructor.name.includes("Int")) {
+                  tmpselection = parseInt(tmpselection)
+                }
+
                 props?.setSelectedCellAnnCluster(tmpselection);
                 setClusIdx(clusSel.map((x) => String(x)).indexOf(tmpselection));
               }

diff --git a/src/components/ExploreMode/index.js b/src/components/ExploreMode/index.js
@@ -639,7 +639,7 @@ export function ExplorerMode() {
   scranWorker.onmessage = (msg) => {
     const payload = msg.data;
 
-    console.log("ON EXPLORE MAIN::RCV::", payload);
+    // console.log("ON EXPLORE MAIN::RCV::", payload);
 
     // process any error messages
     if (payload) {

diff --git a/src/components/FeatureSets/index.js b/src/components/FeatureSets/index.js
@@ -887,6 +887,13 @@ const FeatureSetEnrichment = (props) => {
                   parseInt(tmpselection.replace("Cluster ", "")) - 1;
               } else if (default_selection === props?.selectedFsetAnnotation) {
                 tmpselection = tmpselection.replace("Custom Selection ", "");
+              } else {
+                // do the best
+                if (annotationObj[props?.selectedFsetAnnotation].values.constructor.name.includes("Float")) {
+                  tmpselection = parseFloat(tmpselection)
+                } else if (annotationObj[props?.selectedFsetAnnotation].values.constructor.name.includes("Int")) {
+                  tmpselection = parseInt(tmpselection)
+                }
               }
 
               props?.setSelectedFsetCluster(tmpselection);
@@ -957,6 +964,13 @@ const FeatureSetEnrichment = (props) => {
                       "Custom Selection ",
                       ""
                     );
+                  } else {
+                    // do the best
+                    if (annotationObj[props?.selectedFsetAnnotation].values.constructor.name.includes("Float")) {
+                      tmpselection = parseFloat(tmpselection)
+                    } else if (annotationObj[props?.selectedFsetAnnotation].values.constructor.name.includes("Int")) {
+                      tmpselection = parseInt(tmpselection)
+                    }
                   }
                   props?.setSelectedFsetVSCluster(tmpselection);
 

diff --git a/src/components/Markers/index.js b/src/components/Markers/index.js
@@ -809,6 +809,13 @@ const MarkerPlot = (props) => {
                 default_selection === props?.selectedMarkerAnnotation
               ) {
                 tmpselection = tmpselection.replace("Custom Selection ", "");
+              } else {
+                // do the best
+                if (annotationObj[props?.selectedMarkerAnnotation].values.constructor.name.includes("Float")) {
+                  tmpselection = parseFloat(tmpselection)
+                } else if (annotationObj[props?.selectedMarkerAnnotation].values.constructor.name.includes("Int")) {
+                  tmpselection = parseInt(tmpselection)
+                }
               }
 
               props?.setSelectedCluster(tmpselection);
@@ -878,6 +885,13 @@ const MarkerPlot = (props) => {
                       "Custom Selection ",
                       ""
                     );
+                  } else {
+                    // do the best
+                    if (annotationObj[props?.selectedMarkerAnnotation].values.constructor.name.includes("Float")) {
+                      tmpselection = parseFloat(tmpselection)
+                    } else if (annotationObj[props?.selectedMarkerAnnotation].values.constructor.name.includes("Int")) {
+                      tmpselection = parseInt(tmpselection)
+                    }
                   }
                   props?.setSelectedVSCluster(tmpselection);
 

diff --git a/src/workers/KanaDBHandler.js b/src/workers/KanaDBHandler.js
@@ -317,7 +317,7 @@ function remove_file(id, file_store, meta_store) {
     };
 
     request.onerror = event => {
-      console.log(event);
+      // console.log(event);
       reject(new Error(`failed to retrieve file metadata ${id} from KanaDB: ${event.target.errorCode}`));
     };
   });