mirror of
https://github.com/chanzuckerberg/cellxgene.git
synced 2026-10-09 07:18:11 +08:00
remove all linting errors on client/src (#1463)
* run eslint --fix * camelcase * camelCase config part 1 * part 2 * part 3 - removing subscripts * fix "class-methods-use-this" * fix "class-methods-use-this" * fix eslint ignores * add eslint ignore for set state in update * reformat comments to appease eslint * add a11y features * sort-comp fix * a11y fix * add ignore for set state in update * add a11y htmlFor * remove unused toast * remove unnecessary bind * add ignore for set state in update * add rel="noopener noreferrer" Using target="_blank" without rel="noopener noreferrer" is a security risk: see https://mathiasbynens.github.io/rel-noopener * use arrow function to bind * remove unused definitions/declarations * prettier * remove unused state * add comments to empty catch blocks remove curly brackets * escape ' * use eqeqeq * switch from default export * remove ignore log * remove static * fix import * revert subscripting config * clean-up * remove unnecessary subscript * fix new errors from master * change category click handler to a class property * fix camelcase changes that slipped by * unused import * Fix newly introduced ESLint errors from addGenes
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
export const jest_env = process.env.JEST_ENV;
|
export const jestEnv = process.env.JEST_ENV;
|
||||||
export const appPort = process.env.CXG_SERVER_PORT;
|
export const appPort = process.env.CXG_SERVER_PORT;
|
||||||
export const appUrlBase =
|
export const appUrlBase =
|
||||||
process.env.CXG_URL_BASE || `http://localhost:${appPort}`;
|
process.env.CXG_URL_BASE || `http://localhost:${appPort}`;
|
||||||
export const DEV = jest_env === "dev";
|
export const DEV = jestEnv === "dev";
|
||||||
export const DEBUG = jest_env === "debug";
|
export const DEBUG = jestEnv === "debug";
|
||||||
export const DATASET = "pbmc3k";
|
export const DATASET = "pbmc3k";
|
||||||
|
|
||||||
if (DEBUG) jest.setTimeout(100000);
|
if (DEBUG) jest.setTimeout(100000);
|
||||||
|
|||||||
@@ -7,7 +7,10 @@ import { appUrlBase, DATASET } from "./config";
|
|||||||
import { setupTestBrowser } from "./testBrowser";
|
import { setupTestBrowser } from "./testBrowser";
|
||||||
import { datasets } from "./data";
|
import { datasets } from "./data";
|
||||||
|
|
||||||
let browser, page, utils, cxgActions;
|
let browser;
|
||||||
|
let page;
|
||||||
|
let utils;
|
||||||
|
let cxgActions;
|
||||||
const data = datasets[DATASET];
|
const data = datasets[DATASET];
|
||||||
|
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
@@ -34,9 +37,9 @@ describe("did launch", () => {
|
|||||||
try {
|
try {
|
||||||
await utils.clickOn("tos-cookies-accept", { timeout: 500 });
|
await utils.clickOn("tos-cookies-accept", { timeout: 500 });
|
||||||
} catch {
|
} catch {
|
||||||
console.warn("No terms of service footer detected.")
|
console.warn("No terms of service footer detected.");
|
||||||
}
|
}
|
||||||
page.waitFor(50); // give the footer a chance to disappear
|
page.waitFor(50); // give the footer a chance to disappear
|
||||||
const result = await page.$("[data-testid='tos-cookies-accept']");
|
const result = await page.$("[data-testid='tos-cookies-accept']");
|
||||||
expect(result).toBeNull();
|
expect(result).toBeNull();
|
||||||
});
|
});
|
||||||
@@ -130,7 +133,7 @@ describe("gene entry", () => {
|
|||||||
testGenes
|
testGenes
|
||||||
);
|
);
|
||||||
expect(allHistograms).toEqual(expect.arrayContaining(testGenes));
|
expect(allHistograms).toEqual(expect.arrayContaining(testGenes));
|
||||||
expect(allHistograms.length).toEqual(testGenes.length);
|
expect(allHistograms).toHaveLength(testGenes.length);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -144,7 +147,7 @@ describe("differential expression", () => {
|
|||||||
expect(allHistograms).toEqual(
|
expect(allHistograms).toEqual(
|
||||||
expect.arrayContaining(data.diffexp["gene-results"])
|
expect.arrayContaining(data.diffexp["gene-results"])
|
||||||
);
|
);
|
||||||
expect(allHistograms.length).toEqual(data.diffexp["gene-results"].length);
|
expect(allHistograms).toHaveLength(data.diffexp["gene-results"].length);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ import { appUrlBase, DATASET } from "./config";
|
|||||||
import { setupTestBrowser } from "./testBrowser";
|
import { setupTestBrowser } from "./testBrowser";
|
||||||
import { datasets } from "./data";
|
import { datasets } from "./data";
|
||||||
|
|
||||||
let browser, page, utils, actions;
|
let browser;
|
||||||
|
let page;
|
||||||
|
let utils;
|
||||||
|
let actions;
|
||||||
const data = datasets[DATASET];
|
const data = datasets[DATASET];
|
||||||
|
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
|
|||||||
@@ -12,9 +12,13 @@ import { appUrlBase, DEBUG, DEV, DATASET } from "./config";
|
|||||||
import { puppeteerUtils, cellxgeneActions } from "./puppeteerUtils";
|
import { puppeteerUtils, cellxgeneActions } from "./puppeteerUtils";
|
||||||
import { datasets } from "./data";
|
import { datasets } from "./data";
|
||||||
|
|
||||||
let browser, page, utils, cxgActions, spy;
|
let browser;
|
||||||
|
let page;
|
||||||
|
let utils;
|
||||||
|
let cxgActions;
|
||||||
|
let spy;
|
||||||
const browserViewport = { width: 1280, height: 960 };
|
const browserViewport = { width: 1280, height: 960 };
|
||||||
let data = datasets[DATASET].features;
|
const data = datasets[DATASET].features;
|
||||||
|
|
||||||
if (DEBUG) jest.setTimeout(100000);
|
if (DEBUG) jest.setTimeout(100000);
|
||||||
if (DEV) jest.setTimeout(10000);
|
if (DEV) jest.setTimeout(10000);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { PromiseLimit } from "../../src/util/promiseLimit";
|
import PromiseLimit from "../../src/util/promiseLimit";
|
||||||
import { range } from "../../src/util/range";
|
import { range } from "../../src/util/range";
|
||||||
|
|
||||||
const delay = (t) => new Promise((resolve, reject) => setTimeout(resolve, t));
|
const delay = (t) => new Promise((resolve, reject) => setTimeout(resolve, t));
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class CspHashPlugin {
|
|||||||
.createHash("sha256")
|
.createHash("sha256")
|
||||||
.update(str, "utf8")
|
.update(str, "utf8")
|
||||||
.digest("base64");
|
.digest("base64");
|
||||||
return "sha256-" + hash;
|
return `sha256-${hash}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
doBinaryRequest,
|
doBinaryRequest,
|
||||||
dispatchNetworkErrorMessageToUser,
|
dispatchNetworkErrorMessageToUser,
|
||||||
} from "../util/actionHelpers";
|
} from "../util/actionHelpers";
|
||||||
import { PromiseLimit } from "../util/promiseLimit";
|
import PromiseLimit from "../util/promiseLimit";
|
||||||
import { requestReembed, reembedResetWorldToUniverse } from "./reembed";
|
import { requestReembed, reembedResetWorldToUniverse } from "./reembed";
|
||||||
import { loadUserColorConfig } from "../util/stateManager/colorHelpers";
|
import { loadUserColorConfig } from "../util/stateManager/colorHelpers";
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import {
|
|||||||
saveInProgress: state.autosave?.saveInProgress ?? false,
|
saveInProgress: state.autosave?.saveInProgress ?? false,
|
||||||
lastSavedObsAnnotations: state.autosave?.lastSavedObsAnnotations,
|
lastSavedObsAnnotations: state.autosave?.lastSavedObsAnnotations,
|
||||||
error: state.autosave?.error,
|
error: state.autosave?.error,
|
||||||
writableCategoriesEnabled: state.config?.parameters?.["annotations"] ?? false,
|
writableCategoriesEnabled: state.config?.parameters?.annotations ?? false,
|
||||||
}))
|
}))
|
||||||
class FilenameDialog extends React.Component {
|
class FilenameDialog extends React.Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import * as globals from "../../globals";
|
|
||||||
import actions from "../../actions";
|
import actions from "../../actions";
|
||||||
import FilenameDialog from "./filenameDialog";
|
import FilenameDialog from "./filenameDialog";
|
||||||
|
|
||||||
@@ -11,7 +10,7 @@ import FilenameDialog from "./filenameDialog";
|
|||||||
saveInProgress: state.autosave?.saveInProgress ?? false,
|
saveInProgress: state.autosave?.saveInProgress ?? false,
|
||||||
lastSavedObsAnnotations: state.autosave?.lastSavedObsAnnotations,
|
lastSavedObsAnnotations: state.autosave?.lastSavedObsAnnotations,
|
||||||
error: state.autosave?.error,
|
error: state.autosave?.error,
|
||||||
writableCategoriesEnabled: state.config?.parameters?.["annotations"] ?? false,
|
writableCategoriesEnabled: state.config?.parameters?.annotations ?? false,
|
||||||
initialDataLoadComplete: state.autosave?.initialDataLoadComplete,
|
initialDataLoadComplete: state.autosave?.initialDataLoadComplete,
|
||||||
}))
|
}))
|
||||||
class Autosave extends React.Component {
|
class Autosave extends React.Component {
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class Category extends React.Component {
|
|||||||
} else if (categoryCount.selectedCatCount < categoryCount.totalCatCount) {
|
} else if (categoryCount.selectedCatCount < categoryCount.totalCatCount) {
|
||||||
/* to be explicit... */
|
/* to be explicit... */
|
||||||
this.checkbox.indeterminate = true;
|
this.checkbox.indeterminate = true;
|
||||||
this.setState({ isChecked: false });
|
this.setState({ isChecked: false }); // eslint-disable-line react/no-did-update-set-state
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -77,14 +77,15 @@ class Category extends React.Component {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
toggleAll() {
|
handleCategoryClick = () => {
|
||||||
const { dispatch, metadataField } = this.props;
|
const { annotations, metadataField, onExpansionChange } = this.props;
|
||||||
dispatch({
|
const editingCategory =
|
||||||
type: "categorical metadata filter all of these",
|
annotations.isEditingCategoryName &&
|
||||||
metadataField,
|
annotations.categoryBeingEdited === metadataField;
|
||||||
});
|
if (!editingCategory) {
|
||||||
this.setState({ isChecked: true });
|
onExpansionChange(metadataField);
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
toggleNone() {
|
toggleNone() {
|
||||||
const { dispatch, metadataField } = this.props;
|
const { dispatch, metadataField } = this.props;
|
||||||
@@ -95,6 +96,15 @@ class Category extends React.Component {
|
|||||||
this.setState({ isChecked: false });
|
this.setState({ isChecked: false });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toggleAll() {
|
||||||
|
const { dispatch, metadataField } = this.props;
|
||||||
|
dispatch({
|
||||||
|
type: "categorical metadata filter all of these",
|
||||||
|
metadataField,
|
||||||
|
});
|
||||||
|
this.setState({ isChecked: true });
|
||||||
|
}
|
||||||
|
|
||||||
handleToggleAllClick() {
|
handleToggleAllClick() {
|
||||||
const { isChecked } = this.state;
|
const { isChecked } = this.state;
|
||||||
// || this.checkbox.indeterminate === false
|
// || this.checkbox.indeterminate === false
|
||||||
@@ -115,6 +125,8 @@ class Category extends React.Component {
|
|||||||
globals.categoryDisplayStringMaxLength
|
globals.categoryDisplayStringMaxLength
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const checkboxID = `category-select-${metadataField}`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
@@ -135,8 +147,8 @@ class Category extends React.Component {
|
|||||||
alignItems: "flex-start",
|
alignItems: "flex-start",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<label className="bp3-control bp3-checkbox">
|
<label htmlFor={checkboxID} className="bp3-control bp3-checkbox">
|
||||||
<input disabled checked type="checkbox" />
|
<input disabled id={checkboxID} checked type="checkbox" />
|
||||||
<span className="bp3-control-indicator" />
|
<span className="bp3-control-indicator" />
|
||||||
</label>
|
</label>
|
||||||
<Tooltip
|
<Tooltip
|
||||||
@@ -174,9 +186,7 @@ class Category extends React.Component {
|
|||||||
metadataField,
|
metadataField,
|
||||||
categoricalSelection,
|
categoricalSelection,
|
||||||
isColorAccessor,
|
isColorAccessor,
|
||||||
annotations,
|
|
||||||
isExpanded,
|
isExpanded,
|
||||||
onExpansionChange,
|
|
||||||
schema,
|
schema,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
@@ -185,6 +195,8 @@ class Category extends React.Component {
|
|||||||
return this.renderIsStillLoading();
|
return this.renderIsStillLoading();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const checkboxID = `category-select-${metadataField}`;
|
||||||
|
|
||||||
const isUserAnno =
|
const isUserAnno =
|
||||||
schema?.annotations?.obsByName[metadataField]?.writable ?? false;
|
schema?.annotations?.obsByName[metadataField]?.writable ?? false;
|
||||||
const isTruncated = _.get(
|
const isTruncated = _.get(
|
||||||
@@ -225,8 +237,9 @@ class Category extends React.Component {
|
|||||||
alignItems: "flex-start",
|
alignItems: "flex-start",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<label className="bp3-control bp3-checkbox">
|
<label className="bp3-control bp3-checkbox" htmlFor={checkboxID}>
|
||||||
<input
|
<input
|
||||||
|
id={checkboxID}
|
||||||
data-testclass="category-select"
|
data-testclass="category-select"
|
||||||
data-testid={`${metadataField}:category-select`}
|
data-testid={`${metadataField}:category-select`}
|
||||||
onChange={this.handleToggleAllClick.bind(this)}
|
onChange={this.handleToggleAllClick.bind(this)}
|
||||||
@@ -251,19 +264,19 @@ class Category extends React.Component {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
|
role="menuitem"
|
||||||
|
tabIndex="0"
|
||||||
data-testid={`${metadataField}:category-expand`}
|
data-testid={`${metadataField}:category-expand`}
|
||||||
|
onKeyPress={(e) => {
|
||||||
|
if (e.key === "Enter") {
|
||||||
|
this.handleCategoryClick();
|
||||||
|
}
|
||||||
|
}}
|
||||||
style={{
|
style={{
|
||||||
cursor: "pointer",
|
cursor: "pointer",
|
||||||
display: "inline-block",
|
display: "inline-block",
|
||||||
}}
|
}}
|
||||||
onClick={() => {
|
onClick={this.handleCategoryClick}
|
||||||
const editingCategory =
|
|
||||||
annotations.isEditingCategoryName &&
|
|
||||||
annotations.categoryBeingEdited === metadataField;
|
|
||||||
if (!editingCategory) {
|
|
||||||
onExpansionChange(metadataField);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
{isUserAnno ? (
|
{isUserAnno ? (
|
||||||
<Icon style={{ marginRight: 5 }} icon="tag" iconSize={16} />
|
<Icon style={{ marginRight: 5 }} icon="tag" iconSize={16} />
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import LabelInput from "./labelInput";
|
|||||||
import { labelPrompt } from "./labelUtil";
|
import { labelPrompt } from "./labelUtil";
|
||||||
|
|
||||||
@connect((state) => ({
|
@connect((state) => ({
|
||||||
writableCategoriesEnabled: state.config?.parameters?.["annotations"] ?? false,
|
writableCategoriesEnabled: state.config?.parameters?.annotations ?? false,
|
||||||
schema: state.world?.schema,
|
schema: state.world?.schema,
|
||||||
config: state.config,
|
config: state.config,
|
||||||
ontology: state.ontology,
|
ontology: state.ontology,
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ export default class LabelInput extends React.PureComponent {
|
|||||||
* popoverProps -- will be passed to <Suggest>
|
* popoverProps -- will be passed to <Suggest>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/* maxinum number of suggestions */
|
||||||
|
static QueryResultLimit = 100;
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
@@ -103,9 +106,6 @@ export default class LabelInput extends React.PureComponent {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
/* maxinum number of suggestions */
|
|
||||||
static QueryResultLimit = 100;
|
|
||||||
|
|
||||||
filterLabels(query) {
|
filterLabels(query) {
|
||||||
const { labelSuggestions } = this.props;
|
const { labelSuggestions } = this.props;
|
||||||
if (!labelSuggestions) return [];
|
if (!labelSuggestions) return [];
|
||||||
|
|||||||
@@ -62,6 +62,8 @@ class CategoryValue extends React.Component {
|
|||||||
prevProps.metadataField !== metadataField ||
|
prevProps.metadataField !== metadataField ||
|
||||||
prevProps.categoryIndex !== categoryIndex
|
prevProps.categoryIndex !== categoryIndex
|
||||||
) {
|
) {
|
||||||
|
// adequately checked to prevent looping
|
||||||
|
// eslint-disable-next-line react/no-did-update-set-state
|
||||||
this.setState({
|
this.setState({
|
||||||
editedLabelText: this.currentLabel(),
|
editedLabelText: this.currentLabel(),
|
||||||
});
|
});
|
||||||
@@ -327,6 +329,8 @@ class CategoryValue extends React.Component {
|
|||||||
annotations.isEditingLabelName &&
|
annotations.isEditingLabelName &&
|
||||||
annotations.labelEditable.label === categoryIndex;
|
annotations.labelEditable.label === categoryIndex;
|
||||||
|
|
||||||
|
const valueToggleLabel = `value-toggle-checkbox-${displayString}`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={i}
|
key={i}
|
||||||
@@ -360,8 +364,13 @@ class CategoryValue extends React.Component {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<div style={{ display: "flex", alignItems: "baseline" }}>
|
<div style={{ display: "flex", alignItems: "baseline" }}>
|
||||||
<label className="bp3-control bp3-checkbox" style={{ margin: 0 }}>
|
<label
|
||||||
|
htmlFor={valueToggleLabel}
|
||||||
|
className="bp3-control bp3-checkbox"
|
||||||
|
style={{ margin: 0 }}
|
||||||
|
>
|
||||||
<input
|
<input
|
||||||
|
id={valueToggleLabel}
|
||||||
onChange={selected ? this.toggleOff : this.toggleOn}
|
onChange={selected ? this.toggleOff : this.toggleOn}
|
||||||
data-testclass="categorical-value-select"
|
data-testclass="categorical-value-select"
|
||||||
data-testid={`categorical-value-select-${metadataField}-${displayString}`}
|
data-testid={`categorical-value-select-${metadataField}-${displayString}`}
|
||||||
|
|||||||
@@ -7,11 +7,6 @@ const ToastTopCenter = Toaster.create({
|
|||||||
position: Position.TOP,
|
position: Position.TOP,
|
||||||
});
|
});
|
||||||
|
|
||||||
const ToastBottomCenter = Toaster.create({
|
|
||||||
className: "recipe-toaster",
|
|
||||||
position: Position.BOTTOM,
|
|
||||||
});
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
A "user" error - eg, bad input
|
A "user" error - eg, bad input
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -262,7 +262,7 @@ class AddGenes extends React.Component {
|
|||||||
}}
|
}}
|
||||||
itemListPredicate={filterGenes}
|
itemListPredicate={filterGenes}
|
||||||
onActiveItemChange={(item) => this.setState({ activeItem: item })}
|
onActiveItemChange={(item) => this.setState({ activeItem: item })}
|
||||||
itemRenderer={renderGene.bind(this)}
|
itemRenderer={renderGene}
|
||||||
items={varIndex || ["No genes"]}
|
items={varIndex || ["No genes"]}
|
||||||
popoverProps={{ minimal: true }}
|
popoverProps={{ minimal: true }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import setupSVGandBrushElements from "./setupSVGandBrush";
|
|||||||
import _camera from "../../util/camera";
|
import _camera from "../../util/camera";
|
||||||
import _drawPoints from "./drawPointsRegl";
|
import _drawPoints from "./drawPointsRegl";
|
||||||
import { isTypedArray } from "../../util/typeHelpers";
|
import { isTypedArray } from "../../util/typeHelpers";
|
||||||
import styles from "./graph.css";
|
|
||||||
|
|
||||||
import GraphOverlayLayer from "./overlays/graphOverlayLayer";
|
import GraphOverlayLayer from "./overlays/graphOverlayLayer";
|
||||||
import CentroidLabels from "./overlays/centroidLabels";
|
import CentroidLabels from "./overlays/centroidLabels";
|
||||||
@@ -190,7 +189,7 @@ class Graph extends React.Component {
|
|||||||
tool: null,
|
tool: null,
|
||||||
container: null,
|
container: null,
|
||||||
cameraRender: 0,
|
cameraRender: 0,
|
||||||
viewport
|
viewport,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,7 +208,10 @@ class Graph extends React.Component {
|
|||||||
|
|
||||||
// create all default rendering transformations
|
// create all default rendering transformations
|
||||||
const modelTF = createModelTF();
|
const modelTF = createModelTF();
|
||||||
const projectionTF = createProjectionTF(this.reglCanvas.width, this.reglCanvas.height);
|
const projectionTF = createProjectionTF(
|
||||||
|
this.reglCanvas.width,
|
||||||
|
this.reglCanvas.height
|
||||||
|
);
|
||||||
|
|
||||||
// initial draw to canvas
|
// initial draw to canvas
|
||||||
this.renderPoints(
|
this.renderPoints(
|
||||||
@@ -250,7 +252,8 @@ class Graph extends React.Component {
|
|||||||
} = this.props;
|
} = this.props;
|
||||||
const { regl, toolSVG, camera, modelTF, viewport } = this.state;
|
const { regl, toolSVG, camera, modelTF, viewport } = this.state;
|
||||||
let { projectionTF } = this.state;
|
let { projectionTF } = this.state;
|
||||||
const hasResized = prevState.viewport.height !== this.reglCanvas.height ||
|
const hasResized =
|
||||||
|
prevState.viewport.height !== this.reglCanvas.height ||
|
||||||
prevState.viewport.width !== this.reglCanvas.width;
|
prevState.viewport.width !== this.reglCanvas.width;
|
||||||
let stateChanges = {};
|
let stateChanges = {};
|
||||||
let needsRepaint = hasResized;
|
let needsRepaint = hasResized;
|
||||||
@@ -261,7 +264,10 @@ class Graph extends React.Component {
|
|||||||
const { drawPoints, pointBuffer, colorBuffer, flagBuffer } = this.state;
|
const { drawPoints, pointBuffer, colorBuffer, flagBuffer } = this.state;
|
||||||
|
|
||||||
if (hasResized) {
|
if (hasResized) {
|
||||||
projectionTF = createProjectionTF(this.reglCanvas.width, this.reglCanvas.height);
|
projectionTF = createProjectionTF(
|
||||||
|
this.reglCanvas.width,
|
||||||
|
this.reglCanvas.height
|
||||||
|
);
|
||||||
stateChanges = {
|
stateChanges = {
|
||||||
...stateChanges,
|
...stateChanges,
|
||||||
projectionTF,
|
projectionTF,
|
||||||
@@ -322,7 +328,10 @@ class Graph extends React.Component {
|
|||||||
...stateChanges,
|
...stateChanges,
|
||||||
...this.createToolSVG(),
|
...this.createToolSVG(),
|
||||||
};
|
};
|
||||||
} else if ((viewport.height && viewport.width && !toolSVG) || selectionTool !== prevProps.selectionTool ) {
|
} else if (
|
||||||
|
(viewport.height && viewport.width && !toolSVG) ||
|
||||||
|
selectionTool !== prevProps.selectionTool
|
||||||
|
) {
|
||||||
// first time or change of selection tool
|
// first time or change of selection tool
|
||||||
stateChanges = { ...stateChanges, ...this.createToolSVG() };
|
stateChanges = { ...stateChanges, ...this.createToolSVG() };
|
||||||
} else if (prevProps.graphInteractionMode !== graphInteractionMode) {
|
} else if (prevProps.graphInteractionMode !== graphInteractionMode) {
|
||||||
@@ -349,6 +358,7 @@ class Graph extends React.Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (Object.keys(stateChanges).length > 0) {
|
if (Object.keys(stateChanges).length > 0) {
|
||||||
|
// Preventing update loop via stateChanges and diff checks
|
||||||
// eslint-disable-next-line react/no-did-update-set-state
|
// eslint-disable-next-line react/no-did-update-set-state
|
||||||
this.setState(stateChanges);
|
this.setState(stateChanges);
|
||||||
}
|
}
|
||||||
@@ -371,12 +381,11 @@ class Graph extends React.Component {
|
|||||||
const { viewportRef } = this.props;
|
const { viewportRef } = this.props;
|
||||||
return {
|
return {
|
||||||
height: viewportRef.clientHeight,
|
height: viewportRef.clientHeight,
|
||||||
width: viewportRef.clientWidth
|
width: viewportRef.clientWidth,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
handleCanvasEvent = (e) => {
|
||||||
handleCanvasEvent = e => {
|
|
||||||
const { camera, projectionTF } = this.state;
|
const { camera, projectionTF } = this.state;
|
||||||
if (e.type !== "wheel") e.preventDefault();
|
if (e.type !== "wheel") e.preventDefault();
|
||||||
if (camera.handleEvent(e, projectionTF)) {
|
if (camera.handleEvent(e, projectionTF)) {
|
||||||
@@ -547,12 +556,8 @@ class Graph extends React.Component {
|
|||||||
vec2.transformMat3(xy, xy, projectionTF);
|
vec2.transformMat3(xy, xy, projectionTF);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
Math.round(
|
Math.round(((xy[0] + 1) * viewport.width) / 2),
|
||||||
(xy[0] + 1) * viewport.width / 2
|
Math.round(-((xy[1] + 1) / 2 - 1) * viewport.height),
|
||||||
),
|
|
||||||
Math.round(
|
|
||||||
-((xy[1] + 1) / 2 - 1) * viewport.height
|
|
||||||
)
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -698,7 +703,7 @@ class Graph extends React.Component {
|
|||||||
count: this.count,
|
count: this.count,
|
||||||
projView,
|
projView,
|
||||||
nPoints: universe.nObs,
|
nPoints: universe.nObs,
|
||||||
minViewportDimension: Math.min(width, height)
|
minViewportDimension: Math.min(width, height),
|
||||||
});
|
});
|
||||||
regl._gl.flush();
|
regl._gl.flush();
|
||||||
}
|
}
|
||||||
@@ -744,9 +749,11 @@ class Graph extends React.Component {
|
|||||||
cameraTF={cameraTF}
|
cameraTF={cameraTF}
|
||||||
modelTF={modelTF}
|
modelTF={modelTF}
|
||||||
projectionTF={projectionTF}
|
projectionTF={projectionTF}
|
||||||
handleCanvasEvent={graphInteractionMode === "zoom" ? this.handleCanvasEvent : undefined}
|
handleCanvasEvent={
|
||||||
|
graphInteractionMode === "zoom" ? this.handleCanvasEvent : undefined
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<CentroidLabels/>
|
<CentroidLabels />
|
||||||
</GraphOverlayLayer>
|
</GraphOverlayLayer>
|
||||||
<svg
|
<svg
|
||||||
id="lasso-layer"
|
id="lasso-layer"
|
||||||
@@ -756,13 +763,11 @@ class Graph extends React.Component {
|
|||||||
position: "absolute",
|
position: "absolute",
|
||||||
top: 0,
|
top: 0,
|
||||||
left: 0,
|
left: 0,
|
||||||
zIndex: 1
|
zIndex: 1,
|
||||||
}}
|
}}
|
||||||
width={viewport.width}
|
width={viewport.width}
|
||||||
height={viewport.height}
|
height={viewport.height}
|
||||||
pointerEvents={
|
pointerEvents={graphInteractionMode === "select" ? "auto" : "none"}
|
||||||
graphInteractionMode === "select" ? "auto" : "none"
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
<canvas
|
<canvas
|
||||||
width={viewport.width}
|
width={viewport.width}
|
||||||
@@ -777,7 +782,9 @@ class Graph extends React.Component {
|
|||||||
}}
|
}}
|
||||||
className="graph-canvas"
|
className="graph-canvas"
|
||||||
data-testid="layout-graph"
|
data-testid="layout-graph"
|
||||||
ref={canvas => { this.reglCanvas = canvas; }}
|
ref={(canvas) => {
|
||||||
|
this.reglCanvas = canvas;
|
||||||
|
}}
|
||||||
onMouseDown={this.handleCanvasEvent}
|
onMouseDown={this.handleCanvasEvent}
|
||||||
onMouseUp={this.handleCanvasEvent}
|
onMouseUp={this.handleCanvasEvent}
|
||||||
onMouseMove={this.handleCanvasEvent}
|
onMouseMove={this.handleCanvasEvent}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
/* eslint-disable max-classes-per-file */
|
|
||||||
/* eslint-disable jsx-a11y/mouse-events-have-key-events */
|
|
||||||
import React, { PureComponent } from "react";
|
import React, { PureComponent } from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
|
|
||||||
@@ -26,7 +24,7 @@ class CentroidLabels extends PureComponent {
|
|||||||
// Notify overlay layer of display change
|
// Notify overlay layer of display change
|
||||||
overlayToggled("centroidLabels", displayChangeOn);
|
overlayToggled("centroidLabels", displayChangeOn);
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
@@ -59,6 +57,7 @@ class CentroidLabels extends PureComponent {
|
|||||||
|
|
||||||
labelSVGS.push(
|
labelSVGS.push(
|
||||||
<g
|
<g
|
||||||
|
// label is unique so disabling eslint rule
|
||||||
// eslint-disable-next-line react/no-array-index-key
|
// eslint-disable-next-line react/no-array-index-key
|
||||||
key={label}
|
key={label}
|
||||||
className="centroid-label"
|
className="centroid-label"
|
||||||
@@ -66,6 +65,8 @@ class CentroidLabels extends PureComponent {
|
|||||||
data-testclass="centroid-label"
|
data-testclass="centroid-label"
|
||||||
data-testid={`${label}-centroid-label`}
|
data-testid={`${label}-centroid-label`}
|
||||||
>
|
>
|
||||||
|
{/* The mouse actions for centroid labels do not have a screen reader alternative */}
|
||||||
|
{/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
|
||||||
<text
|
<text
|
||||||
transform={inverseTransform}
|
transform={inverseTransform}
|
||||||
textAnchor="middle"
|
textAnchor="middle"
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ import React, { PureComponent, cloneElement } from "react";
|
|||||||
|
|
||||||
import styles from "../graph.css";
|
import styles from "../graph.css";
|
||||||
|
|
||||||
export default
|
export default class GraphOverlayLayer extends PureComponent {
|
||||||
class GraphOverlayLayer extends PureComponent {
|
|
||||||
/*
|
/*
|
||||||
This component takes its children (assumed in the data coordinate space ([0, 1] range, origin in bottom left corner))
|
This component takes its children (assumed in the data coordinate space ([0, 1] range, origin in bottom left corner))
|
||||||
and transforms itself multiple times resulting in screen space ([0, screenWidth/Height] range, origin in top left corner)
|
and transforms itself multiple times resulting in screen space ([0, screenWidth/Height] range, origin in top left corner)
|
||||||
@@ -49,7 +48,6 @@ class GraphOverlayLayer extends PureComponent {
|
|||||||
handleCanvasEvent,
|
handleCanvasEvent,
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
style
|
|
||||||
} = this.props;
|
} = this.props;
|
||||||
const { display } = this.state;
|
const { display } = this.state;
|
||||||
|
|
||||||
@@ -63,7 +61,7 @@ class GraphOverlayLayer extends PureComponent {
|
|||||||
cameraTF
|
cameraTF
|
||||||
)} ${this.reverseMatrixScaleTransformString(
|
)} ${this.reverseMatrixScaleTransformString(
|
||||||
projectionTF
|
projectionTF
|
||||||
)} scale(1 2) scale(1 ${1 / (-height)}) scale(2 1) scale(${1 / width} 1)`;
|
)} scale(1 2) scale(1 ${1 / -height}) scale(2 1) scale(${1 / width} 1)`;
|
||||||
|
|
||||||
// Copy the children passed with the overlay and add the inverse transform and onDisplayChange props
|
// Copy the children passed with the overlay and add the inverse transform and onDisplayChange props
|
||||||
const newChildren = React.Children.map(children, (child) =>
|
const newChildren = React.Children.map(children, (child) =>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { connect } from "react-redux";
|
|||||||
import * as globals from "../../globals";
|
import * as globals from "../../globals";
|
||||||
import Logo from "../framework/logo";
|
import Logo from "../framework/logo";
|
||||||
|
|
||||||
@connect(state => ({
|
@connect((state) => ({
|
||||||
datasetTitle: state.config?.displayNames?.dataset ?? "",
|
datasetTitle: state.config?.displayNames?.dataset ?? "",
|
||||||
aboutURL: state.config?.links?.["about-dataset"],
|
aboutURL: state.config?.links?.["about-dataset"],
|
||||||
scatterplotXXaccessor: state.controls.scatterplotXXaccessor,
|
scatterplotXXaccessor: state.controls.scatterplotXXaccessor,
|
||||||
@@ -75,7 +75,7 @@ class LeftSideBar extends React.Component {
|
|||||||
title={datasetTitle}
|
title={datasetTitle}
|
||||||
>
|
>
|
||||||
{aboutURL ? (
|
{aboutURL ? (
|
||||||
<a href={aboutURL} target="_blank">
|
<a href={aboutURL} target="_blank" rel="noopener noreferrer">
|
||||||
{displayTitle}
|
{displayTitle}
|
||||||
</a>
|
</a>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@@ -45,7 +45,9 @@ class CellSetButton extends React.PureComponent {
|
|||||||
<AnchorButton
|
<AnchorButton
|
||||||
type="button"
|
type="button"
|
||||||
disabled={differential.diffExp}
|
disabled={differential.diffExp}
|
||||||
onClick={this.set.bind(this)}
|
onClick={() => {
|
||||||
|
this.set();
|
||||||
|
}}
|
||||||
data-testid={`cellset-button-${eitherCellSetOneOrTwo}`}
|
data-testid={`cellset-button-${eitherCellSetOneOrTwo}`}
|
||||||
>
|
>
|
||||||
{eitherCellSetOneOrTwo}
|
{eitherCellSetOneOrTwo}
|
||||||
|
|||||||
@@ -1,14 +1,7 @@
|
|||||||
// jshint esversion: 6
|
// jshint esversion: 6
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import {
|
import { Button, ButtonGroup, AnchorButton, Tooltip } from "@blueprintjs/core";
|
||||||
Popover,
|
|
||||||
Button,
|
|
||||||
ButtonGroup,
|
|
||||||
AnchorButton,
|
|
||||||
Tooltip,
|
|
||||||
Position,
|
|
||||||
} from "@blueprintjs/core";
|
|
||||||
import * as globals from "../../globals";
|
import * as globals from "../../globals";
|
||||||
import styles from "./menubar.css";
|
import styles from "./menubar.css";
|
||||||
import actions from "../../actions";
|
import actions from "../../actions";
|
||||||
@@ -21,16 +14,9 @@ import CellSetButton from "./cellSetButtons";
|
|||||||
celllist1: state.differential?.celllist1,
|
celllist1: state.differential?.celllist1,
|
||||||
celllist2: state.differential?.celllist2,
|
celllist2: state.differential?.celllist2,
|
||||||
diffexpMayBeSlow: state.config?.parameters?.["diffexp-may-be-slow"] ?? false,
|
diffexpMayBeSlow: state.config?.parameters?.["diffexp-may-be-slow"] ?? false,
|
||||||
diffexpCellcountMax: state.config?.limits?.diffexp_cellcount_max,
|
diffexpCellcountMax: state.config?.limits?.["diffexp_cellcount_max"],
|
||||||
}))
|
}))
|
||||||
class DiffexpButtons extends React.Component {
|
class DiffexpButtons extends React.Component {
|
||||||
constructor(props) {
|
|
||||||
super(props);
|
|
||||||
this.state = {
|
|
||||||
userDismissedPopover: false,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
computeDiffExp = () => {
|
computeDiffExp = () => {
|
||||||
const { dispatch, differential } = this.props;
|
const { dispatch, differential } = this.props;
|
||||||
if (differential.celllist1 && differential.celllist2) {
|
if (differential.celllist1 && differential.celllist2) {
|
||||||
@@ -54,16 +40,9 @@ class DiffexpButtons extends React.Component {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
handlePopoverDismiss = () => {
|
|
||||||
this.setState({
|
|
||||||
userDismissedPopover: true,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
/* diffexp-related buttons may be disabled */
|
/* diffexp-related buttons may be disabled */
|
||||||
const { differential, diffexpMayBeSlow, diffexpCellcountMax } = this.props;
|
const { differential, diffexpMayBeSlow, diffexpCellcountMax } = this.props;
|
||||||
const { userDismissedPopover } = this.state;
|
|
||||||
|
|
||||||
const haveBothCellSets =
|
const haveBothCellSets =
|
||||||
!!differential.celllist1 && !!differential.celllist2;
|
!!differential.celllist1 && !!differential.celllist2;
|
||||||
@@ -86,7 +65,7 @@ class DiffexpButtons extends React.Component {
|
|||||||
diffexpCellcountMax;
|
diffexpCellcountMax;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ButtonGroup className={styles.menubarButton} >
|
<ButtonGroup className={styles.menubarButton}>
|
||||||
<CellSetButton
|
<CellSetButton
|
||||||
{...this.props} // eslint-disable-line react/jsx-props-no-spreading
|
{...this.props} // eslint-disable-line react/jsx-props-no-spreading
|
||||||
eitherCellSetOneOrTwo={1}
|
eitherCellSetOneOrTwo={1}
|
||||||
|
|||||||
@@ -69,9 +69,7 @@ class Embedding extends React.PureComponent {
|
|||||||
const { layoutChoice } = this.props;
|
const { layoutChoice } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ButtonGroup
|
<ButtonGroup className={styles.menubarButton}>
|
||||||
className={styles.menubarButton}
|
|
||||||
>
|
|
||||||
<Popover
|
<Popover
|
||||||
target={
|
target={
|
||||||
<Tooltip
|
<Tooltip
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// jshint esversion: 6
|
// jshint esversion: 6
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import { Button, ButtonGroup, AnchorButton, Tooltip } from "@blueprintjs/core";
|
import { ButtonGroup, AnchorButton, Tooltip } from "@blueprintjs/core";
|
||||||
|
|
||||||
import * as globals from "../../globals";
|
import * as globals from "../../globals";
|
||||||
import styles from "./menubar.css";
|
import styles from "./menubar.css";
|
||||||
@@ -28,7 +28,7 @@ import DiffexpButtons from "./diffexpButtons";
|
|||||||
scatterplotYYaccessor: state.controls.scatterplotYYaccessor,
|
scatterplotYYaccessor: state.controls.scatterplotYYaccessor,
|
||||||
celllist1: state.differential.celllist1,
|
celllist1: state.differential.celllist1,
|
||||||
celllist2: state.differential.celllist2,
|
celllist2: state.differential.celllist2,
|
||||||
libraryVersions: state.config?.library_versions, // eslint-disable-line camelcase
|
libraryVersions: state.config?.["library_versions"],
|
||||||
undoDisabled: state["@@undoable/past"].length === 0,
|
undoDisabled: state["@@undoable/past"].length === 0,
|
||||||
redoDisabled: state["@@undoable/future"].length === 0,
|
redoDisabled: state["@@undoable/future"].length === 0,
|
||||||
aboutLink: state.config?.links?.["about-dataset"],
|
aboutLink: state.config?.links?.["about-dataset"],
|
||||||
@@ -207,9 +207,10 @@ class MenuBar extends React.Component {
|
|||||||
const { pendingClipPercentiles } = this.state;
|
const { pendingClipPercentiles } = this.state;
|
||||||
|
|
||||||
// constants used to create selection tool button
|
// constants used to create selection tool button
|
||||||
const [selectionTooltip, selectionButtonIcon] = selectionTool === "brush"
|
const [selectionTooltip, selectionButtonIcon] =
|
||||||
? ["Brush selection", "Lasso selection"]
|
selectionTool === "brush"
|
||||||
: ["select", "polygon-filter"];
|
? ["Brush selection", "Lasso selection"]
|
||||||
|
: ["select", "polygon-filter"];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -245,80 +246,82 @@ class MenuBar extends React.Component {
|
|||||||
handleClipCommit={this.handleClipCommit}
|
handleClipCommit={this.handleClipCommit}
|
||||||
isClipDisabled={this.isClipDisabled}
|
isClipDisabled={this.isClipDisabled}
|
||||||
handleClipOnKeyPress={this.handleClipOnKeyPress}
|
handleClipOnKeyPress={this.handleClipOnKeyPress}
|
||||||
handleClipPercentileMaxValueChange={this.handleClipPercentileMaxValueChange}
|
handleClipPercentileMaxValueChange={
|
||||||
handleClipPercentileMinValueChange={this.handleClipPercentileMinValueChange}
|
this.handleClipPercentileMaxValueChange
|
||||||
|
}
|
||||||
|
handleClipPercentileMinValueChange={
|
||||||
|
this.handleClipPercentileMinValueChange
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<Embedding />
|
<Embedding />
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content="When a category is colored by, show labels on the graph"
|
content="When a category is colored by, show labels on the graph"
|
||||||
position="bottom"
|
position="bottom"
|
||||||
disabled={graphInteractionMode === "zoom"}
|
disabled={graphInteractionMode === "zoom"}
|
||||||
>
|
>
|
||||||
<AnchorButton
|
<AnchorButton
|
||||||
className={styles.menubarButton}
|
className={styles.menubarButton}
|
||||||
type="button"
|
type="button"
|
||||||
data-testid="centroid-label-toggle"
|
data-testid="centroid-label-toggle"
|
||||||
icon="property"
|
icon="property"
|
||||||
onClick={this.handleCentroidChange}
|
onClick={this.handleCentroidChange}
|
||||||
active={showCentroidLabels}
|
active={showCentroidLabels}
|
||||||
intent={showCentroidLabels ? "primary" : "none"}
|
intent={showCentroidLabels ? "primary" : "none"}
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<ButtonGroup
|
<ButtonGroup className={styles.menubarButton}>
|
||||||
className={styles.menubarButton}
|
<Tooltip
|
||||||
>
|
content={selectionTooltip}
|
||||||
<Tooltip
|
position="bottom"
|
||||||
content={selectionTooltip}
|
hoverOpenDelay={globals.tooltipHoverOpenDelay}
|
||||||
position="bottom"
|
>
|
||||||
hoverOpenDelay={globals.tooltipHoverOpenDelay}
|
<AnchorButton
|
||||||
>
|
type="button"
|
||||||
<AnchorButton
|
data-testid="mode-lasso"
|
||||||
type="button"
|
icon={selectionButtonIcon}
|
||||||
data-testid="mode-lasso"
|
active={graphInteractionMode === "select"}
|
||||||
icon={selectionButtonIcon}
|
onClick={() => {
|
||||||
active={graphInteractionMode === "select"}
|
dispatch({
|
||||||
onClick={() => {
|
type: "change graph interaction mode",
|
||||||
dispatch({
|
data: "select",
|
||||||
type: "change graph interaction mode",
|
});
|
||||||
data: "select"
|
}}
|
||||||
});
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
<Tooltip
|
||||||
|
content="Drag to pan, scroll to zoom"
|
||||||
|
position="bottom"
|
||||||
|
hoverOpenDelay={globals.tooltipHoverOpenDelay}
|
||||||
|
>
|
||||||
|
<AnchorButton
|
||||||
|
type="button"
|
||||||
|
data-testid="mode-pan-zoom"
|
||||||
|
icon="zoom-in"
|
||||||
|
active={graphInteractionMode === "zoom"}
|
||||||
|
onClick={() => {
|
||||||
|
dispatch({
|
||||||
|
type: "change graph interaction mode",
|
||||||
|
data: "zoom",
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Tooltip>
|
||||||
|
</ButtonGroup>
|
||||||
|
<Subset
|
||||||
|
subsetPossible={this.subsetPossible()}
|
||||||
|
subsetResetPossible={this.subsetResetPossible()}
|
||||||
|
handleSubset={() => {
|
||||||
|
dispatch(actions.setWorldToSelection());
|
||||||
|
dispatch({ type: "increment graph render counter" });
|
||||||
|
}}
|
||||||
|
handleSubsetReset={() => {
|
||||||
|
dispatch(actions.resetWorldToUniverse());
|
||||||
|
dispatch({ type: "increment graph render counter" });
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
{disableDiffexp ? null : <DiffexpButtons />}
|
||||||
<Tooltip
|
</div>
|
||||||
content="Drag to pan, scroll to zoom"
|
);
|
||||||
position="bottom"
|
|
||||||
hoverOpenDelay={globals.tooltipHoverOpenDelay}
|
|
||||||
>
|
|
||||||
<AnchorButton
|
|
||||||
type="button"
|
|
||||||
data-testid="mode-pan-zoom"
|
|
||||||
icon="zoom-in"
|
|
||||||
active={graphInteractionMode === "zoom"}
|
|
||||||
onClick={() => {
|
|
||||||
dispatch({
|
|
||||||
type: "change graph interaction mode",
|
|
||||||
data: "zoom"
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Tooltip>
|
|
||||||
</ButtonGroup>
|
|
||||||
<Subset
|
|
||||||
subsetPossible={this.subsetPossible()}
|
|
||||||
subsetResetPossible={this.subsetResetPossible()}
|
|
||||||
handleSubset={() => {
|
|
||||||
dispatch(actions.setWorldToSelection());
|
|
||||||
dispatch({ type: "increment graph render counter" });
|
|
||||||
}}
|
|
||||||
handleSubsetReset={() => {
|
|
||||||
dispatch(actions.resetWorldToUniverse());
|
|
||||||
dispatch({ type: "increment graph render counter" });
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
{disableDiffexp ? null : <DiffexpButtons/>}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ class Scatterplot extends React.PureComponent {
|
|||||||
viewport: {
|
viewport: {
|
||||||
height: null,
|
height: null,
|
||||||
width: null,
|
width: null,
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +190,7 @@ class Scatterplot extends React.PureComponent {
|
|||||||
svg,
|
svg,
|
||||||
drawPoints,
|
drawPoints,
|
||||||
projectionTF,
|
projectionTF,
|
||||||
viewport
|
viewport,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,20 +286,11 @@ class Scatterplot extends React.PureComponent {
|
|||||||
return {
|
return {
|
||||||
viewport: {
|
viewport: {
|
||||||
height: window.height,
|
height: window.height,
|
||||||
width: window.width
|
width: window.width,
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
handleResize = () => {
|
|
||||||
const { state } = this.state;
|
|
||||||
const viewport = this.getViewportDimensions();
|
|
||||||
this.setState({
|
|
||||||
...state,
|
|
||||||
viewport,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
static setupScales(expressionX, expressionY) {
|
static setupScales(expressionX, expressionY) {
|
||||||
const xScale = d3
|
const xScale = d3
|
||||||
.scaleLinear()
|
.scaleLinear()
|
||||||
@@ -316,6 +307,15 @@ class Scatterplot extends React.PureComponent {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleResize = () => {
|
||||||
|
const { state } = this.state;
|
||||||
|
const viewport = this.getViewportDimensions();
|
||||||
|
this.setState({
|
||||||
|
...state,
|
||||||
|
viewport,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
updateViewportDimensions = () => {
|
updateViewportDimensions = () => {
|
||||||
this.setState(this.getViewportDimensions());
|
this.setState(this.getViewportDimensions());
|
||||||
};
|
};
|
||||||
@@ -390,7 +390,7 @@ class Scatterplot extends React.PureComponent {
|
|||||||
minViewportDimension: Math.min(
|
minViewportDimension: Math.min(
|
||||||
viewport.width - globals.leftSidebarWidth || width,
|
viewport.width - globals.leftSidebarWidth || width,
|
||||||
viewport.height || height
|
viewport.height || height
|
||||||
)
|
),
|
||||||
});
|
});
|
||||||
regl._gl.flush();
|
regl._gl.flush();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ import {
|
|||||||
Colors,
|
Colors,
|
||||||
Icon,
|
Icon,
|
||||||
} from "@blueprintjs/core";
|
} from "@blueprintjs/core";
|
||||||
import * as globals from "../../globals";
|
|
||||||
import { termsOfServiceToast } from "../framework/toasters";
|
|
||||||
|
|
||||||
const CookieDecision = "cxg.cookieDecision";
|
const CookieDecision = "cxg.cookieDecision";
|
||||||
|
|
||||||
@@ -26,12 +24,14 @@ function storageGet(key, defaultValue = null) {
|
|||||||
function storageSet(key, value) {
|
function storageSet(key, value) {
|
||||||
try {
|
try {
|
||||||
window.localStorage.setItem(key, value);
|
window.localStorage.setItem(key, value);
|
||||||
} catch {}
|
} catch {
|
||||||
|
// continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@connect((state) => ({
|
@connect((state) => ({
|
||||||
tosURL: state.config?.parameters?.about_legal_tos,
|
tosURL: state.config?.parameters?.["about_legal_tos"],
|
||||||
privacyURL: state.config?.parameters?.about_legal_privacy,
|
privacyURL: state.config?.parameters?.["about_legal_privacy"],
|
||||||
}))
|
}))
|
||||||
class TermsPrompt extends React.PureComponent {
|
class TermsPrompt extends React.PureComponent {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
@@ -59,7 +59,9 @@ class TermsPrompt extends React.PureComponent {
|
|||||||
if (window.cookieDecisionCallback instanceof Function) {
|
if (window.cookieDecisionCallback instanceof Function) {
|
||||||
try {
|
try {
|
||||||
window.cookieDecisionCallback();
|
window.cookieDecisionCallback();
|
||||||
} catch (e) {}
|
} catch (e) {
|
||||||
|
// continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -82,6 +84,7 @@ class TermsPrompt extends React.PureComponent {
|
|||||||
}}
|
}}
|
||||||
href={tosURL}
|
href={tosURL}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
>
|
>
|
||||||
terms of service
|
terms of service
|
||||||
</a>
|
</a>
|
||||||
@@ -103,6 +106,7 @@ class TermsPrompt extends React.PureComponent {
|
|||||||
}}
|
}}
|
||||||
href={privacyURL}
|
href={privacyURL}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
>
|
>
|
||||||
privacy policy
|
privacy policy
|
||||||
</a>
|
</a>
|
||||||
@@ -118,12 +122,10 @@ class TermsPrompt extends React.PureComponent {
|
|||||||
<Drawer
|
<Drawer
|
||||||
onclose={this.drawerClose}
|
onclose={this.drawerClose}
|
||||||
isOpen={isOpen}
|
isOpen={isOpen}
|
||||||
size={"120px"}
|
size="120px"
|
||||||
position={Position.BOTTOM}
|
position={Position.BOTTOM}
|
||||||
canOutsideClickClose={false}
|
canOutsideClickClose={false}
|
||||||
hasBackdrop={
|
hasBackdrop /* if the user can't use the app or click outside to dismiss, that should be visually represented with a backdrop */
|
||||||
true /* if the user can't use the app or click outside to dismiss, that should be visually represented with a backdrop */
|
|
||||||
}
|
|
||||||
enforceFocus={false}
|
enforceFocus={false}
|
||||||
autoFocus={false}
|
autoFocus={false}
|
||||||
portal={false}
|
portal={false}
|
||||||
@@ -149,12 +151,9 @@ class TermsPrompt extends React.PureComponent {
|
|||||||
onClick={this.handleOK}
|
onClick={this.handleOK}
|
||||||
data-testid="tos-cookies-accept"
|
data-testid="tos-cookies-accept"
|
||||||
>
|
>
|
||||||
I'm OK with cookies!
|
I'm OK with cookies!
|
||||||
</Button>{" "}
|
</Button>{" "}
|
||||||
<Button
|
<Button onClick={this.handleNo} data-testid="tos-cookies-reject">
|
||||||
onClick={this.handleNo}
|
|
||||||
data-testid="tos-cookies-reject"
|
|
||||||
>
|
|
||||||
No thanks
|
No thanks
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
// jshint esversion: 6
|
// jshint esversion: 6
|
||||||
/* eslint-disable no-console */
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import ReactDOM from "react-dom";
|
import ReactDOM from "react-dom";
|
||||||
import { Provider } from "react-redux";
|
import { Provider } from "react-redux";
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ const ColorsReducer = (
|
|||||||
case "annotation: delete label": {
|
case "annotation: delete label": {
|
||||||
const { world } = nextSharedState;
|
const { world } = nextSharedState;
|
||||||
const { colorMode, colorAccessor } = state;
|
const { colorMode, colorAccessor } = state;
|
||||||
const { metadataField, colors } = action;
|
const { metadataField } = action;
|
||||||
if (
|
if (
|
||||||
colorMode !== "color by categorical metadata" ||
|
colorMode !== "color by categorical metadata" ||
|
||||||
colorAccessor !== metadataField
|
colorAccessor !== metadataField
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ const LayoutChoice = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
case "reembed: add reembedding": {
|
case "reembed: add reembedding": {
|
||||||
const name = action.schema.name;
|
const { name } = action.schema;
|
||||||
const available = Array.from(new Set(state.available).add(name));
|
const available = Array.from(new Set(state.available).add(name));
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
|
|||||||
@@ -9,11 +9,12 @@ const Ontology = (
|
|||||||
) => {
|
) => {
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
case "configuration load complete": {
|
case "configuration load complete": {
|
||||||
/* eslint-disable camelcase */
|
|
||||||
const enabled =
|
const enabled =
|
||||||
action.config?.parameters?.annotations_cell_ontology_enabled ?? false;
|
action.config?.parameters?.["annotations_cell_ontology_enabled"] ??
|
||||||
const terms = action.config?.parameters?.annotations_cell_ontology_terms;
|
false;
|
||||||
/* eslint-enable camelcase */
|
const terms =
|
||||||
|
action.config?.parameters?.["annotations_cell_ontology_terms"];
|
||||||
|
|
||||||
const termSet = new Set(terms);
|
const termSet = new Set(terms);
|
||||||
return {
|
return {
|
||||||
...state,
|
...state,
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ const WorldReducer = (
|
|||||||
const { dim } = action;
|
const { dim } = action;
|
||||||
|
|
||||||
// we don't clip anything except for varData and obsAnnotations
|
// we don't clip anything except for varData and obsAnnotations
|
||||||
let unclipped = state.unclipped;
|
let { unclipped } = state;
|
||||||
if (dim == "varData" || dim == "obsAnnotations") {
|
if (dim === "varData" || dim === "obsAnnotations") {
|
||||||
unclipped = {
|
unclipped = {
|
||||||
...unclipped,
|
...unclipped,
|
||||||
[dim]: universe[dim].clone(),
|
[dim]: universe[dim].clone(),
|
||||||
@@ -298,7 +298,7 @@ const WorldReducer = (
|
|||||||
const { obsLayout: origObsLayout, schema: origSchema } = state;
|
const { obsLayout: origObsLayout, schema: origSchema } = state;
|
||||||
const { embedding, schema: embeddingSchema } = action;
|
const { embedding, schema: embeddingSchema } = action;
|
||||||
|
|
||||||
const { dims, name } = embeddingSchema;
|
const { dims } = embeddingSchema;
|
||||||
let obsLayout = origObsLayout;
|
let obsLayout = origObsLayout;
|
||||||
let schema = origSchema;
|
let schema = origSchema;
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
/* eslint-disable max-classes-per-file */
|
||||||
/**
|
/**
|
||||||
Label indexing - map a label to & from an integer offset. See Dataframe
|
Label indexing - map a label to & from an integer offset. See Dataframe
|
||||||
for how this is used.
|
for how this is used.
|
||||||
@@ -23,7 +24,6 @@ function extent(tarr) {
|
|||||||
return [min, max];
|
return [min, max];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* eslint-disable class-methods-use-this */
|
|
||||||
class IdentityInt32Index {
|
class IdentityInt32Index {
|
||||||
/*
|
/*
|
||||||
identity/noop index, with small assumptions that labels are int32
|
identity/noop index, with small assumptions that labels are int32
|
||||||
@@ -41,11 +41,13 @@ class IdentityInt32Index {
|
|||||||
return k;
|
return k;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eslint-disable-next-line class-methods-use-this
|
||||||
getOffset(i) {
|
getOffset(i) {
|
||||||
// label to offset
|
// label to offset
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eslint-disable-next-line class-methods-use-this
|
||||||
getLabel(i) {
|
getLabel(i) {
|
||||||
// offset to label
|
// offset to label
|
||||||
return i;
|
return i;
|
||||||
@@ -93,9 +95,6 @@ class IdentityInt32Index {
|
|||||||
return this.__promote(labelArray);
|
return this.__promote(labelArray);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* eslint-enable class-methods-use-this */
|
|
||||||
|
|
||||||
/* eslint-disable class-methods-use-this */
|
|
||||||
class DenseInt32Index {
|
class DenseInt32Index {
|
||||||
/*
|
/*
|
||||||
DenseInt32Index indexes integer labels, and uses Int32Array typed arrays
|
DenseInt32Index indexes integer labels, and uses Int32Array typed arrays
|
||||||
@@ -177,9 +176,7 @@ class DenseInt32Index {
|
|||||||
return this.__promote(labelArray);
|
return this.__promote(labelArray);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* eslint-enable class-methods-use-this */
|
|
||||||
|
|
||||||
/* eslint-disable class-methods-use-this */
|
|
||||||
class KeyIndex {
|
class KeyIndex {
|
||||||
/*
|
/*
|
||||||
KeyIndex indexes arbitrary JS primitive types, and uses a Map()
|
KeyIndex indexes arbitrary JS primitive types, and uses a Map()
|
||||||
@@ -223,6 +220,7 @@ class KeyIndex {
|
|||||||
return this.rindex.length;
|
return this.rindex.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eslint-disable-next-line class-methods-use-this
|
||||||
subsetLabels(labelArray) {
|
subsetLabels(labelArray) {
|
||||||
return new KeyIndex(labelArray);
|
return new KeyIndex(labelArray);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ return Promise.all([
|
|||||||
plimit.add(() => fetch('/baz'))
|
plimit.add(() => fetch('/baz'))
|
||||||
])
|
])
|
||||||
*/
|
*/
|
||||||
export class PromiseLimit {
|
export default class PromiseLimit {
|
||||||
constructor(maxConcurrency) {
|
constructor(maxConcurrency) {
|
||||||
this.queue = new Set();
|
this.queue = new Set();
|
||||||
this.maxConcurrency = maxConcurrency;
|
this.maxConcurrency = maxConcurrency;
|
||||||
|
|||||||
@@ -5,6 +5,6 @@
|
|||||||
export default (n) => {
|
export default (n) => {
|
||||||
return n
|
return n
|
||||||
.toExponential()
|
.toExponential()
|
||||||
.replace(/e[\+\-0-9]*$/, "")
|
.replace(/e[+\-0-9]*$/, "")
|
||||||
.replace(/^0\.?0*|\./, "").length;
|
.replace(/^0\.?0*|\./, "").length;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// eslint-disable-next-line max-classes-per-file
|
||||||
import PositiveIntervals from "./positiveIntervals";
|
import PositiveIntervals from "./positiveIntervals";
|
||||||
import BitArray from "./bitArray";
|
import BitArray from "./bitArray";
|
||||||
import {
|
import {
|
||||||
@@ -409,7 +410,7 @@ class ImmutableScalarDimension extends _ImmutableBaseDimension {
|
|||||||
this.index = makeSortIndex(array);
|
this.index = makeSortIndex(array);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* eslint-disable class-methods-use-this */
|
// eslint-disable-next-line class-methods-use-this
|
||||||
_createValueArray(data, mapf, array) {
|
_createValueArray(data, mapf, array) {
|
||||||
// create dimension value array
|
// create dimension value array
|
||||||
const len = data.length;
|
const len = data.length;
|
||||||
@@ -419,7 +420,6 @@ class ImmutableScalarDimension extends _ImmutableBaseDimension {
|
|||||||
}
|
}
|
||||||
return larray;
|
return larray;
|
||||||
}
|
}
|
||||||
/* eslint-enable class-methods-use-this */
|
|
||||||
|
|
||||||
select(spec) {
|
select(spec) {
|
||||||
const { mode } = spec;
|
const { mode } = spec;
|
||||||
@@ -466,7 +466,7 @@ class ImmutableScalarDimension extends _ImmutableBaseDimension {
|
|||||||
const ranges = [];
|
const ranges = [];
|
||||||
const r = [
|
const r = [
|
||||||
lowerBoundIndirect(value, index, lo, 0, value.length),
|
lowerBoundIndirect(value, index, lo, 0, value.length),
|
||||||
!!inclusive
|
inclusive
|
||||||
? upperBoundIndirect(value, index, hi, 0, value.length)
|
? upperBoundIndirect(value, index, hi, 0, value.length)
|
||||||
: lowerBoundIndirect(value, index, hi, 0, value.length),
|
: lowerBoundIndirect(value, index, hi, 0, value.length),
|
||||||
];
|
];
|
||||||
@@ -514,11 +514,10 @@ class ImmutableEnumDimension extends ImmutableScalarDimension {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/* eslint-disable class-methods-use-this */
|
// eslint-disable-next-line class-methods-use-this
|
||||||
selectRange() {
|
selectRange() {
|
||||||
throw new Error("range selection unsupported on Enumerated dimension");
|
throw new Error("range selection unsupported on Enumerated dimension");
|
||||||
}
|
}
|
||||||
/* eslint-enable class-methods-use-this */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class ImmutableSpatialDimension extends _ImmutableBaseDimension {
|
class ImmutableSpatialDimension extends _ImmutableBaseDimension {
|
||||||
|
|||||||
Reference in New Issue
Block a user