fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-09-15 20:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pin the 'unassigned' annotation value/label to bottom of list (#1018)

Browse Source 
* pin unassigned label to bottom of category list

* pin unassigned label to bottom of category list
This commit is contained in:
Bruce Martin
2019-11-05 09:22:39 -08:00
committed by GitHub
parent 341d3015f0
commit 461084eca1
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/categorical/category.js
View File

@@ -208,7 +208,9 @@ class Category extends React.Component {
const { isTruncated } = categoricalSelection[metadataField];
const cat = categoricalSelection[metadataField];
const optTuples = sortedCategoryValues([...cat.categoryValueIndices]);
const optTuples = sortedCategoryValues(isUserAnno, [
...cat.categoryValueIndices
]);
const optTuplesAsKey = _.map(optTuples, t => t[0]).join(""); // animation
return (

21
client/src/components/categorical/util.js
View File

@@ -4,16 +4,29 @@
// index is range array
// return sorted index
import isNumber from "is-number";
/*
Sort category values (labels) in the order we want for presentation.
const sortedCategoryValues = values => {
TL;DR: numeric sort for number-like strings, then strings in case-ignoring alpha
order. Except, when isUserAnno is true, pin globals.unassignedCategoryLabel
to the end.
*/
import isNumber from "is-number";
import * as globals from "../../globals";
const sortedCategoryValues = (isUserAnno, values) => {
/* this sort could be memoized for perf */
const strings = [];
const ints = [];
const unassigned = [];
values.forEach(v => {
if (isNumber(v[0])) {
if (isUserAnno && v[0] === globals.unassignedCategoryLabel) {
unassigned.push(v);
} else if (isNumber(v[0])) {
ints.push(v);
} else {
strings.push(v);
@@ -28,7 +41,7 @@ const sortedCategoryValues = values => {
ints.sort((a, b) => +a[0] - +b[0]);
return ints.concat(strings);
return ints.concat(strings, unassigned);
};
export default sortedCategoryValues;