run prettier(2.0.5) (#1438)

client/src/components/categorical/annoDialog.js

@@ -2,11 +2,11 @@ import React from "react";
 import { connect } from "react-redux";
 import { Button, Tooltip, Dialog, Classes, Colors } from "@blueprintjs/core";
 
-@connect(state => ({
+@connect((state) => ({
   colorAccessor: state.colors.colorAccessor,
   categoricalSelection: state.categoricalSelection,
   annotations: state.annotations,
-  universe: state.universe
+  universe: state.universe,
 }))
 class AnnoDialog extends React.PureComponent {
   constructor(props) {
@@ -30,13 +30,13 @@ class AnnoDialog extends React.PureComponent {
       primaryButtonText,
       secondaryButtonText,
       handleSecondaryButtonSubmit,
-      primaryButtonProps
+      primaryButtonProps,
     } = this.props;
 
     return (
       <Dialog icon="tag" title={title} isOpen={isActive} onClose={handleCancel}>
         <form
-          onSubmit={e => {
+          onSubmit={(e) => {
             e.preventDefault();
           }}
         >
@@ -48,7 +48,7 @@ class AnnoDialog extends React.PureComponent {
                 style={{
                   marginTop: 7,
                   visibility: validationError ? "visible" : "hidden",
-                  color: Colors.ORANGE3
+                  color: Colors.ORANGE3,
                 }}
               >
                 {errorMessage}

client/src/components/categorical/annoSelect.js

@@ -3,11 +3,11 @@ import { connect } from "react-redux";
 import { Button, MenuItem } from "@blueprintjs/core";
 import { Select } from "@blueprintjs/select";
 
-@connect(state => ({
+@connect((state) => ({
   colorAccessor: state.colors.colorAccessor,
   categoricalSelection: state.categoricalSelection,
   annotations: state.annotations,
-  universe: state.universe
+  universe: state.universe,
 }))
 class DuplicateCategorySelect extends React.PureComponent {
   constructor(props) {
@@ -19,7 +19,7 @@ class DuplicateCategorySelect extends React.PureComponent {
     const {
       allCategoryNames,
       categoryToDuplicate,
-      handleModalDuplicateCategorySelection
+      handleModalDuplicateCategorySelection,
     } = this.props;
     return (
       <div>
@@ -37,7 +37,7 @@ class DuplicateCategorySelect extends React.PureComponent {
             return <MenuItem onClick={handleClick} key={d} text={d} />;
           }}
           noResults={<MenuItem disabled text="No results." />}
-          onItemSelect={d => {
+          onItemSelect={(d) => {
             handleModalDuplicateCategorySelection(d);
           }}
         >

client/src/components/categorical/category/annoMenuCategory.js

@@ -6,11 +6,11 @@ import {
   MenuItem,
   Popover,
   Position,
-  PopoverInteractionKind
+  PopoverInteractionKind,
 } from "@blueprintjs/core";
 
-@connect(state => ({
-  annotations: state.annotations
+@connect((state) => ({
+  annotations: state.annotations,
 }))
 class AnnoMenuCategory extends React.PureComponent {
   constructor(props) {
@@ -22,7 +22,7 @@ class AnnoMenuCategory extends React.PureComponent {
     const { dispatch, metadataField } = this.props;
     dispatch({
       type: "annotation: activate add new label mode",
-      data: metadataField
+      data: metadataField,
     });
   };
 
@@ -31,7 +31,7 @@ class AnnoMenuCategory extends React.PureComponent {
 
     dispatch({
       type: "annotation: activate category edit mode",
-      data: metadataField
+      data: metadataField,
     });
   };
 
@@ -39,7 +39,7 @@ class AnnoMenuCategory extends React.PureComponent {
     const { dispatch, metadataField } = this.props;
     dispatch({
       type: "annotation: delete category",
-      metadataField
+      metadataField,
     });
   };
 
@@ -50,7 +50,7 @@ class AnnoMenuCategory extends React.PureComponent {
       isUserAnno,
       createText,
       editText,
-      deleteText
+      deleteText,
     } = this.props;
 
     return (

client/src/components/categorical/labelInput.js

@@ -31,7 +31,7 @@ export default class LabelInput extends React.PureComponent {
     const queryResults = this.filterLabels(query);
     this.state = {
       query,
-      queryResults
+      queryResults,
     };
   }
 
@@ -42,7 +42,7 @@ export default class LabelInput extends React.PureComponent {
     const queryResults = this.filterLabels(query);
     this.setState({
       query,
-      queryResults
+      queryResults,
     });
 
     const { onChange } = this.props;
@@ -57,7 +57,7 @@ export default class LabelInput extends React.PureComponent {
     if (target !== query && onSelect) onSelect(target, event);
   };
 
-  handleKeyDown = e => {
+  handleKeyDown = (e) => {
     /* 
     prevent these events from propagating to containing form/dialog
     and causing further side effects (eg, closing dialog, submitting
@@ -72,7 +72,7 @@ export default class LabelInput extends React.PureComponent {
     }
   };
 
-  handleChange = e => {
+  handleChange = (e) => {
     const { onChange } = this.props;
     if (onChange) onChange(e.target.value);
   };
@@ -112,16 +112,18 @@ export default class LabelInput extends React.PureComponent {
 
     /* empty query is wildcard */
     if (query === "") {
-      return labelSuggestions.slice(0, LabelInput.QueryResultLimit).map(l => ({
-        target: l,
-        score: -10000
-      }));
+      return labelSuggestions
+        .slice(0, LabelInput.QueryResultLimit)
+        .map((l) => ({
+          target: l,
+          score: -10000,
+        }));
     }
 
     /* else, do a fuzzy query */
     const options = {
       limit: LabelInput.QueryResultLimit,
-      threshold: -10000 // don't return bad results
+      threshold: -10000, // don't return bad results
     };
     let queryResults = fuzzysort.go(query, labelSuggestions, options);
     /* exact match will always be first in list */
@@ -149,18 +151,18 @@ export default class LabelInput extends React.PureComponent {
 
     const popoverProps = {
       minimal: true,
-      ...props.popoverProps
+      ...props.popoverProps,
     };
     const inputProps = {
       ...props.inputProps,
-      autoFocus: false
+      autoFocus: false,
     };
     const { queryResults } = this.state;
     return (
       <>
         <Suggest
           fill
-          inputValueRenderer={i => i.target}
+          inputValueRenderer={(i) => i.target}
           items={queryResults}
           itemRenderer={this.renderLabelSuggestion}
           onItemSelect={this.handleItemSelect}

client/src/components/categorical/labelUtil.js

@@ -4,60 +4,60 @@ import { Colors } from "@blueprintjs/core";
 import { AnnotationsHelpers } from "../../util/stateManager";
 
 export function isLabelErroneous(label, metadataField, ontology, schema) {
-	/*
+  /*
     return false if this is a LEGAL/acceptable category name or NULL/empty string,
     or return an error type.
     */
 
-	/* allow empty string */
-	if (label === "") return false;
+  /* allow empty string */
+  if (label === "") return false;
 
-	/* check for label syntax errors, but allow terms in ontology */
-	const termInOntology = ontology?.termSet.has(label) ?? false;
-	const error = AnnotationsHelpers.annotationNameIsErroneous(label);
-	if (error && !termInOntology) return error;
+  /* check for label syntax errors, but allow terms in ontology */
+  const termInOntology = ontology?.termSet.has(label) ?? false;
+  const error = AnnotationsHelpers.annotationNameIsErroneous(label);
+  if (error && !termInOntology) return error;
 
-	/* disallow duplicates */
-	const { obsByName } = schema.annotations;
-	if (obsByName[metadataField].categories.indexOf(label) !== -1)
-		return "duplicate";
+  /* disallow duplicates */
+  const { obsByName } = schema.annotations;
+  if (obsByName[metadataField].categories.indexOf(label) !== -1)
+    return "duplicate";
 
-	/* otherwise, no error */
-	return false;
+  /* otherwise, no error */
+  return false;
 }
 
 /* all other errors - map code to human error message */
 const errorMessageMap = {
-	"empty-string": "Blank names not allowed",
-	duplicate: "Name must be unique",
-	"trim-spaces": "Leading and trailing spaces not allowed",
-	"illegal-characters":
-		"Only alphanumeric and special characters (-_.) allowed",
-	"multi-space-run": "Multiple consecutive spaces not allowed"
+  "empty-string": "Blank names not allowed",
+  duplicate: "Name must be unique",
+  "trim-spaces": "Leading and trailing spaces not allowed",
+  "illegal-characters":
+    "Only alphanumeric and special characters (-_.) allowed",
+  "multi-space-run": "Multiple consecutive spaces not allowed",
 };
 
 export function labelPrompt(err, prolog, epilog) {
-	let errPrompt = null;
-	if (err) {
-		let errMsg = errorMessageMap[err] ?? "error";
-		errMsg = errMsg[0].toLowerCase() + errMsg.slice(1);
-		errPrompt = (
-			<span
-				style={{
-					marginTop: 7,
-					color: Colors.ORANGE3
-				}}
-			>
-				{errMsg}
-			</span>
-		);
-	}
-	return (
-		<span>
-			{prolog}
-			{err ? " - " : null}
-			{errPrompt}
-			{epilog}
-		</span>
-	);
+  let errPrompt = null;
+  if (err) {
+    let errMsg = errorMessageMap[err] ?? "error";
+    errMsg = errMsg[0].toLowerCase() + errMsg.slice(1);
+    errPrompt = (
+      <span
+        style={{
+          marginTop: 7,
+          color: Colors.ORANGE3,
+        }}
+      >
+        {errMsg}
+      </span>
+    );
+  }
+  return (
+    <span>
+      {prolog}
+      {err ? " - " : null}
+      {errPrompt}
+      {epilog}
+    </span>
+  );
 }