mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-10-01 14:08:12 +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
222 lines
6.3 KiB
JavaScript
222 lines
6.3 KiB
JavaScript
// jshint esversion: 6
|
|
import React from "react";
|
|
import { Button } from "@blueprintjs/core";
|
|
import { connect } from "react-redux";
|
|
import * as globals from "../../globals";
|
|
import Category from "./category";
|
|
import { AnnotationsHelpers, ControlsHelpers } from "../../util/stateManager";
|
|
import AnnoDialog from "./annoDialog";
|
|
import AnnoSelect from "./annoSelect";
|
|
import LabelInput from "./labelInput";
|
|
import { labelPrompt } from "./labelUtil";
|
|
import actions from "../../actions";
|
|
|
|
@connect((state) => ({
|
|
writableCategoriesEnabled: state.config?.parameters?.annotations ?? false,
|
|
schema: state.annoMatrix?.schema,
|
|
ontology: state.ontology,
|
|
}))
|
|
class Categories extends React.Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.state = {
|
|
createAnnoModeActive: false,
|
|
newCategoryText: "",
|
|
categoryToDuplicate: null,
|
|
expandedCats: new Set(),
|
|
};
|
|
}
|
|
|
|
handleCreateUserAnno = (e) => {
|
|
const { dispatch } = this.props;
|
|
const { newCategoryText, categoryToDuplicate } = this.state;
|
|
dispatch(
|
|
actions.annotationCreateCategoryAction(
|
|
newCategoryText,
|
|
categoryToDuplicate
|
|
)
|
|
);
|
|
this.setState({
|
|
createAnnoModeActive: false,
|
|
categoryToDuplicate: null,
|
|
newCategoryText: "",
|
|
});
|
|
e.preventDefault();
|
|
};
|
|
|
|
handleEnableAnnoMode = () => {
|
|
this.setState({ createAnnoModeActive: true });
|
|
};
|
|
|
|
handleDisableAnnoMode = () => {
|
|
this.setState({
|
|
createAnnoModeActive: false,
|
|
categoryToDuplicate: null,
|
|
newCategoryText: "",
|
|
});
|
|
};
|
|
|
|
handleModalDuplicateCategorySelection = (d) => {
|
|
this.setState({ categoryToDuplicate: d });
|
|
};
|
|
|
|
categoryNameError = (name) => {
|
|
/*
|
|
return false if this is a LEGAL/acceptable category name or NULL/empty string,
|
|
or return an error type.
|
|
*/
|
|
|
|
/* allow empty string */
|
|
if (name === "") return false;
|
|
|
|
/*
|
|
test for uniqueness against *all* annotation names, not just the subset
|
|
we render as categorical.
|
|
*/
|
|
const { schema } = this.props;
|
|
const allCategoryNames = schema.annotations.obs.columns.map((c) => c.name);
|
|
|
|
/* check category name syntax */
|
|
const error = AnnotationsHelpers.annotationNameIsErroneous(name);
|
|
if (error) {
|
|
return error;
|
|
}
|
|
|
|
/* disallow duplicates */
|
|
if (allCategoryNames.indexOf(name) !== -1) {
|
|
return "duplicate";
|
|
}
|
|
|
|
/* otherwise, no error */
|
|
return false;
|
|
};
|
|
|
|
handleChange = (name) => {
|
|
this.setState({ newCategoryText: name });
|
|
};
|
|
|
|
handleSelect = (name) => {
|
|
this.setState({ newCategoryText: name });
|
|
};
|
|
|
|
instruction = (name) => {
|
|
return labelPrompt(
|
|
this.categoryNameError(name),
|
|
"New, unique category name",
|
|
":"
|
|
);
|
|
};
|
|
|
|
onExpansionChange = (catName) => {
|
|
const { expandedCats } = this.state;
|
|
if (expandedCats.has(catName)) {
|
|
const _expandedCats = new Set(expandedCats);
|
|
_expandedCats.delete(catName);
|
|
this.setState({ expandedCats: _expandedCats });
|
|
} else {
|
|
const _expandedCats = new Set(expandedCats);
|
|
_expandedCats.add(catName);
|
|
this.setState({ expandedCats: _expandedCats });
|
|
}
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
createAnnoModeActive,
|
|
categoryToDuplicate,
|
|
newCategoryText,
|
|
expandedCats,
|
|
} = this.state;
|
|
const { writableCategoriesEnabled, schema, ontology } = this.props;
|
|
const ontologyEnabled = ontology?.enabled ?? false;
|
|
/* all names, sorted in display order. Will be rendered in this order */
|
|
const allCategoryNames = ControlsHelpers.selectableCategoryNames(
|
|
schema
|
|
).sort();
|
|
|
|
return (
|
|
<div
|
|
style={{
|
|
padding: globals.leftSidebarSectionPadding,
|
|
}}
|
|
>
|
|
<AnnoDialog
|
|
isActive={createAnnoModeActive}
|
|
title="Create new category"
|
|
instruction={this.instruction(newCategoryText)}
|
|
cancelTooltipContent="Close this dialog without creating a category."
|
|
primaryButtonText="Create new category"
|
|
primaryButtonProps={{ "data-testid": "submit-category" }}
|
|
text={newCategoryText}
|
|
validationError={this.categoryNameError(newCategoryText)}
|
|
handleSubmit={this.handleCreateUserAnno}
|
|
handleCancel={this.handleDisableAnnoMode}
|
|
annoInput={
|
|
<LabelInput
|
|
labelSuggestions={ontologyEnabled ? ontology.terms : null}
|
|
onChange={this.handleChange}
|
|
onSelect={this.handleSelect}
|
|
inputProps={{
|
|
"data-testid": "new-category-name",
|
|
leftIcon: "tag",
|
|
intent: "none",
|
|
autoFocus: true,
|
|
}}
|
|
newLabelMessage="New category"
|
|
/>
|
|
}
|
|
annoSelect={
|
|
<AnnoSelect
|
|
handleModalDuplicateCategorySelection={
|
|
this.handleModalDuplicateCategorySelection
|
|
}
|
|
categoryToDuplicate={categoryToDuplicate}
|
|
allCategoryNames={allCategoryNames}
|
|
/>
|
|
}
|
|
/>
|
|
|
|
{/* READ ONLY CATEGORICAL FIELDS */}
|
|
{/* this is duplicative but flat, could be abstracted */}
|
|
{allCategoryNames.map((catName) =>
|
|
!schema.annotations.obsByName[catName].writable ? (
|
|
<Category
|
|
key={catName}
|
|
metadataField={catName}
|
|
onExpansionChange={this.onExpansionChange}
|
|
isExpanded={expandedCats.has(catName)}
|
|
createAnnoModeActive={createAnnoModeActive}
|
|
/>
|
|
) : null
|
|
)}
|
|
{/* WRITEABLE FIELDS */}
|
|
{allCategoryNames.map((catName) =>
|
|
schema.annotations.obsByName[catName].writable ? (
|
|
<Category
|
|
key={catName}
|
|
metadataField={catName}
|
|
onExpansionChange={this.onExpansionChange}
|
|
isExpanded={expandedCats.has(catName)}
|
|
createAnnoModeActive={createAnnoModeActive}
|
|
/>
|
|
) : null
|
|
)}
|
|
|
|
{writableCategoriesEnabled ? (
|
|
<div>
|
|
<Button
|
|
data-testid="open-annotation-dialog"
|
|
onClick={this.handleEnableAnnoMode}
|
|
intent="primary"
|
|
>
|
|
Create new category
|
|
</Button>
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default Categories;
|