mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-09-23 21:28:11 +08:00
* refactor categorical controls state * lint * fix race condition in tests * fix typo * add missing update on subset * remove obsolete code * update jest and puppeteer major version; update all minors * update when label changes * remove lint from tests; increase timeouts in e2e tests * initial refactoring to new async annomatrix * refine error handling * fix bad merge * add continuous legend * lint * fix memoization in color table creators * partial implementation of user defined annotations * add new annotations action creator file * first pass at user annotations * additional user annotation bug fixes * user annotation auto-save * unit test cleanup * lint * refactor into multiple files * cleanup * add column GC * fix several bugs in user annotations * remove debug code * no anonymous functions * undo redo cleanup * file cleanup * scatterplot * performance * cleanup * remove old code * render in parallel with load * fix race condition * simply graph rendering * render throttle DRY * fix category label order * fix typo in e2e test setup * re-fix the e2e test setup * be more tolerant of races * anno matrix unit tests * temp disable reembedding * pilot port continuous histo to react-async * name change * lint * fix repaint bug * typo fix * update snap to match new ids * world/universe name cleanup * move annoMatrix to src dir * use private underscore naming convention * fix corner case in all selected * name cleanup * add layout control * init edge case * lint * port scatterplot * fix label indexing bug and improve tests * port category to react-async * fix user annotation labelling while subset * select all of prev layout on layout switch * fix race with crossfilter update * prettier lint * fix misleading comment * fix url composition in loader * first pass at crossfilter tests * lint * lint * fix typo * improved error handling for network errors * fix memoization bug * add memo * refactor for performnce * add missing single-value handling in select exact parser * small bugs discovered by tests * lint * additional crossfilter unit tests * remove extraneous comment * add support for automatic category determination * lint * fix render bug in category * take advantage of schema categories guarantee * lint * do not clear history when resetting * enhanced annomatrix gc * lint * finish renaming to follow conventions; fix clone race bug * lint * add priority based loading to improve initial data load UX * crossfilter cache perf * perf tuning * remove timers * documentation * PR review changes * PR review changes * more PR review edits * improve clarity of comment * more PR review fixes * port centroidLabels to use react-async * remove dead code * pr review updates * oops, remove logging
135 lines
3.8 KiB
JavaScript
135 lines
3.8 KiB
JavaScript
/*
|
|
Helpers for schema management
|
|
|
|
TODO: all this would be much more natural if done with a framework
|
|
like immutable.js
|
|
*/
|
|
import _ from "lodash";
|
|
|
|
import fromEntries from "../fromEntries";
|
|
import catLabelSort from "../catLabelSort";
|
|
|
|
/*
|
|
System wide schema assumptions:
|
|
- schema and data wil be consistent (eg, for user-created annotations)
|
|
- schema will be internally self-consistent (eg, index matches columns)
|
|
*/
|
|
|
|
export function indexEntireSchema(schema) {
|
|
/* Index schema for ease of use */
|
|
schema.annotations.obsByName = fromEntries(
|
|
schema.annotations?.obs?.columns?.map((v) => [v.name, v]) ?? []
|
|
);
|
|
schema.annotations.varByName = fromEntries(
|
|
schema.annotations?.var?.columns?.map((v) => [v.name, v]) ?? []
|
|
);
|
|
schema.layout.obsByName = fromEntries(
|
|
schema.layout?.obs?.map((v) => [v.name, v]) ?? []
|
|
);
|
|
schema.layout.varByName = fromEntries(
|
|
schema.layout?.var?.map((v) => [v.name, v]) ?? []
|
|
);
|
|
|
|
return schema;
|
|
}
|
|
|
|
function _copyObsAnno(schema) {
|
|
/* redux copy conventions - WARNING, only for modifying obs annotations */
|
|
return {
|
|
...schema,
|
|
annotations: {
|
|
...schema.annotations,
|
|
obs: _.cloneDeep(schema.annotations.obs),
|
|
},
|
|
};
|
|
}
|
|
|
|
function _copyObsLayout(schema) {
|
|
return {
|
|
...schema,
|
|
layout: {
|
|
...schema.layout,
|
|
obs: _.cloneDeep(schema.layout.obs),
|
|
},
|
|
};
|
|
}
|
|
|
|
function _reindexObsAnno(schema) {
|
|
/* reindex obs annotations ONLY */
|
|
schema.annotations.obsByName = fromEntries(
|
|
schema.annotations.obs.columns.map((v) => [v.name, v])
|
|
);
|
|
return schema;
|
|
}
|
|
|
|
function _reindexObsLayout(schema) {
|
|
schema.layout.obsByName = fromEntries(
|
|
schema.layout.obs.map((v) => [v.name, v])
|
|
);
|
|
return schema;
|
|
}
|
|
|
|
export function removeObsAnnoColumn(schema, name) {
|
|
const newSchema = _copyObsAnno(schema);
|
|
newSchema.annotations.obs.columns = schema.annotations.obs.columns.filter(
|
|
(v) => v.name !== name
|
|
);
|
|
return _reindexObsAnno(newSchema);
|
|
}
|
|
|
|
export function addObsAnnoColumn(schema, name, defn) {
|
|
const newSchema = _copyObsAnno(schema);
|
|
newSchema.annotations.obs.columns.push(defn);
|
|
return _reindexObsAnno(newSchema);
|
|
}
|
|
|
|
export function removeObsAnnoCategory(schema, name, category) {
|
|
/* remove a category from a categorical annotation */
|
|
const categories = schema.annotations.obsByName[name]?.categories;
|
|
if (!categories)
|
|
throw new Error("column does not exist or is not categorical");
|
|
|
|
const idx = categories.indexOf(category);
|
|
if (idx === -1) throw new Error("category does not exist");
|
|
|
|
const newSchema = _reindexObsAnno(_copyObsAnno(schema));
|
|
|
|
/* remove category. Do not need to resort as this can't change presentation order */
|
|
newSchema.annotations.obsByName[name].categories.splice(idx, 1);
|
|
return newSchema;
|
|
}
|
|
|
|
export function addObsAnnoCategory(schema, name, category) {
|
|
/* add a category to a categorical annotation */
|
|
const categories = schema.annotations.obsByName[name]?.categories;
|
|
if (!categories)
|
|
throw new Error("column does not exist or is not categorical");
|
|
|
|
const idx = categories.indexOf(category);
|
|
if (idx !== -1) throw new Error("category already exists");
|
|
|
|
const newSchema = _reindexObsAnno(_copyObsAnno(schema));
|
|
|
|
/* add category, retaining presentation sort order */
|
|
const catAnno = newSchema.annotations.obsByName[name];
|
|
catAnno.categories = catLabelSort(catAnno.writable, [
|
|
...catAnno.categories,
|
|
category,
|
|
]);
|
|
return newSchema;
|
|
}
|
|
|
|
export function addObsLayout(schema, layout) {
|
|
/* add or replace a layout */
|
|
const newSchema = _copyObsLayout(schema);
|
|
newSchema.layout.obs.push(layout);
|
|
return _reindexObsLayout(newSchema);
|
|
}
|
|
|
|
export function removeObsLayout(schema, name) {
|
|
/* remove a layout */
|
|
const newSchema = _copyObsLayout(schema);
|
|
newSchema.layout.obs = schema.layout.obs.filter((v) => v.name !== name);
|
|
return _reindexObsLayout(newSchema);
|
|
}
|