mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-10-02 06:18:11 +08:00
* icons, partway * redux for values * onChange * cancel * annotations lifecycle for category names * copy categorical * edit category * add Dataframe.withColsFrom * render user annotations; default add/delete annotation category * add label name to actions * category name edit * error checking improvements * change schema field isUserAnnotation to writable * always have an unassigned label; implement delete label * implement add new label and edit label name * label current cell selection * fix select exact bug in crossfilter * clean up categorical reducer * fix tests * remove debugging printf * implement subset/reset for user annotations * undo redo support for user annotations * remove duplicate button from categories * add modal * remove obsolete duplicate annotation reducers * remove old debugging printf * connect modal to annotation create and dup * initial full-stack wiring * finish up end-to-end wiring * fix existing unit tests * fix pytests to match new schema API * remove debugging printfs * add label file rotation * remove obsolete comment * add fbs encode/decode tests * add tests for writable annotations * simplify code * fix hashing bug with FBS encoding * lint * fix smoke tests * improve error checking in Dataframe.withColsFrom * add unit test for Dataframe.withColsFrom * add unit test for Dataframe.columns and Dataframe.renameCol * fix bug in FBS encode, add better error checks, refactor * add FBS encode/decode test * add clarifying comment * clean up action type names; fix state inconsistency in crossfilter update * change autosave timer to 2.5sec * sort categorical metadata render order so it remains consistent * add temporary autogenerated label for add-new-label operation * fix hover-over label menu interference with cell highlighting * remove debugging code * add missing reducer cases & fix typo * make dataframe memoize more general purpose * add dev mode for annos * fix error on select duplicate * handle zero occupancy categories * correctly maintain unclipped AND clipped world * correctly handle zero length FBS matrix and label files * ensure all writable categorical schema contains an unassigned category * handle case where building occupancy stack for category with no members * dialog for creating label, disable button if duplicate or empty * visually separate writeable * edit category * fix edit category name * remove debugging code * fix edit annotation label * visually define unassigned, change options * Pull in requirements.txt from `master` * label currently selected cells * duplicate label * lint * fix pytest merge issues * rename --label-file to --experimental-label-file * remove debugging console log * spelling error fix; fix bug found in PR review. * lint
165 lines
5.0 KiB
JavaScript
165 lines
5.0 KiB
JavaScript
// jshint esversion: 6
|
|
import React from "react";
|
|
import _ from "lodash";
|
|
import {
|
|
Button,
|
|
Tooltip,
|
|
InputGroup,
|
|
Dialog,
|
|
Classes,
|
|
MenuItem
|
|
} from "@blueprintjs/core";
|
|
import { Select } from "@blueprintjs/select";
|
|
import { connect } from "react-redux";
|
|
import * as globals from "../../globals";
|
|
import Category from "./category";
|
|
|
|
@connect(state => ({
|
|
categoricalSelection: state.categoricalSelection,
|
|
writableCategoriesEnabled: state.config?.parameters?.["label_file"] ?? false,
|
|
schema: state.world?.schema
|
|
}))
|
|
class Categories extends React.Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.state = {
|
|
createAnnoModeActive: false,
|
|
newCategoryText: "",
|
|
categoryToDuplicate: null
|
|
};
|
|
}
|
|
|
|
handleCreateUserAnno = () => {
|
|
const { dispatch } = this.props;
|
|
const { newCategoryText, categoryToDuplicate } = this.state;
|
|
dispatch({
|
|
type: "annotation: create category",
|
|
data: newCategoryText,
|
|
categoryToDuplicate
|
|
});
|
|
this.setState({
|
|
createAnnoModeActive: false,
|
|
categoryToDuplicate: null,
|
|
newCategoryText: ""
|
|
});
|
|
};
|
|
|
|
handleEnableAnnoMode = () => {
|
|
this.setState({ createAnnoModeActive: true });
|
|
};
|
|
|
|
handleDisableAnnoMode = () => {
|
|
this.setState({ createAnnoModeActive: false });
|
|
};
|
|
|
|
handleModalDuplicateCategorySelection = d => {
|
|
this.setState({ categoryToDuplicate: d });
|
|
};
|
|
|
|
render() {
|
|
const { createAnnoModeActive, categoryToDuplicate } = this.state;
|
|
const {
|
|
categoricalSelection,
|
|
writableCategoriesEnabled,
|
|
schema
|
|
} = this.props;
|
|
if (!categoricalSelection) return null;
|
|
|
|
/* all names, sorted in display order. Will be rendered in this order */
|
|
const allCategoryNames = Object.keys(categoricalSelection).sort();
|
|
|
|
return (
|
|
<div
|
|
style={{
|
|
padding: globals.leftSidebarSectionPadding
|
|
}}
|
|
>
|
|
{/* READ ONLY CATEGORICAL FIELDS */}
|
|
{/* this is duplicative but flat, could be abstracted */}
|
|
{_.map(allCategoryNames, catName =>
|
|
!schema.annotations.obsByName[catName].writable ? (
|
|
<Category
|
|
key={catName}
|
|
metadataField={catName}
|
|
createAnnoModeActive={createAnnoModeActive}
|
|
isUserAnno={false}
|
|
/>
|
|
) : null
|
|
)}
|
|
{/* WRITEABLE FIELDS */}
|
|
{_.map(allCategoryNames, catName =>
|
|
schema.annotations.obsByName[catName].writable ? (
|
|
<Category
|
|
key={catName}
|
|
metadataField={catName}
|
|
createAnnoModeActive={createAnnoModeActive}
|
|
isUserAnno
|
|
/>
|
|
) : null
|
|
)}
|
|
{writableCategoriesEnabled ? (
|
|
<div>
|
|
<Dialog
|
|
icon="tag"
|
|
title="Create new category"
|
|
isOpen={createAnnoModeActive}
|
|
onClose={this.handleDisableAnnoMode}
|
|
>
|
|
<div className={Classes.DIALOG_BODY}>
|
|
<div style={{ marginBottom: 20 }}>
|
|
<p>New, unique category name:</p>
|
|
<InputGroup
|
|
autoFocus
|
|
onChange={e =>
|
|
this.setState({ newCategoryText: e.target.value })
|
|
}
|
|
leftIcon="tag"
|
|
/>
|
|
</div>
|
|
<p>
|
|
Optionally duplicate all labels & cell assignments from
|
|
existing category into new category:
|
|
</p>
|
|
<Select
|
|
items={allCategoryNames}
|
|
filterable={false}
|
|
itemRenderer={(d, { handleClick }) => {
|
|
return <MenuItem onClick={handleClick} key={d} text={d} />;
|
|
}}
|
|
noResults={<MenuItem disabled text="No results." />}
|
|
onItemSelect={d => {
|
|
this.handleModalDuplicateCategorySelection(d);
|
|
}}
|
|
>
|
|
{/* children become the popover target; render value here */}
|
|
<Button
|
|
text={
|
|
categoryToDuplicate || "None (all cells 'unassigned')"
|
|
}
|
|
rightIcon="double-caret-vertical"
|
|
/>
|
|
</Select>
|
|
</div>
|
|
<div className={Classes.DIALOG_FOOTER}>
|
|
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
|
|
<Tooltip content="Close this dialog without creating a category.">
|
|
<Button onClick={this.handleDisableAnnoMode}>Cancel</Button>
|
|
</Tooltip>
|
|
<Button onClick={this.handleCreateUserAnno} intent="primary">
|
|
Create new category
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</Dialog>
|
|
<Button onClick={this.handleEnableAnnoMode} intent="primary">
|
|
Create new category
|
|
</Button>
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
);
|
|
}
|
|
}
|
|
|
|
export default Categories;
|