Merge pull request #553 from chanzuckerberg/main

staging deploy 1/5/23
chanzuckerberg · Jan 5, 2023 · 261776d · 261776d
2 parents 59077b0 + 61bd2b6
commit 261776d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 216 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -150,7 +150,7 @@
     "eslint-plugin-compat": "^3.8.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-filenames": "^1.3.2",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^24.3.5",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.23.2",

diff --git a/client/src/components/categorical/value/index.tsx b/client/src/components/categorical/value/index.tsx
@@ -2,9 +2,7 @@ import { connect } from "react-redux";
 import React from "react";
 import * as d3 from "d3";
 
-import {
-  Classes,
-} from "@blueprintjs/core";
+import { Classes } from "@blueprintjs/core";
 import * as globals from "../../../globals";
 // @ts-expect-error ts-migrate(2307) FIXME: Cannot find module '../categorical.css' or its cor... Remove this comment to see the full error message
 import styles from "../categorical.css";
@@ -193,7 +191,7 @@ class CategoryValue extends React.Component<Props, InternalStateProps> {
     If and only if true, update the component
     */
     const { state } = this;
-    const {props} = this;
+    const { props } = this;
     const { categoryIndex, categorySummary, isSelected } = props;
     const {
       categoryIndex: newCategoryIndex,
@@ -347,7 +345,7 @@ class CategoryValue extends React.Component<Props, InternalStateProps> {
         /* get all the keys d[1] as an array, then find the sum */
         .domain([0, d3.sum(Array.from(occupancy.values()))])
         .range([0, width]);
-      const {categories} = schema.annotations.obsByName[colorAccessor];
+      const { categories } = schema.annotations.obsByName[colorAccessor];
 
       const dfColumn = colorData.col(colorAccessor);
       const categoryValues = dfColumn.summarizeCategorical().categories;
@@ -502,7 +500,7 @@ class CategoryValue extends React.Component<Props, InternalStateProps> {
         }}
         // @ts-expect-error ts-migrate(2322) FIXME: Type '{ obsOrVarContinuousFieldDisplayName: any; d... Remove this comment to see the full error message
         obsOrVarContinuousFieldDisplayName={colorAccessor}
-        domainLabel={label}
+        domainLabel={this.currentLabelAsString()}
         height={STACKED_BAR_HEIGHT}
         width={STACKED_BAR_WIDTH}
       />

diff --git a/client/src/components/categorical/value/occupancy.tsx b/client/src/components/categorical/value/occupancy.tsx
diff --git a/client/src/components/miniHistogram/index.tsx b/client/src/components/miniHistogram/index.tsx
@@ -98,7 +98,7 @@ export default class MiniHistogram extends React.PureComponent {
         />
         <div key="text" style={{ fontSize: "14px" }}>
           <p style={{ margin: "0" }}>
-            This histograms shows the distribution of{" "}
+            This histogram shows the distribution of{" "}
             <strong>{obsOrVarContinuousFieldDisplayName}</strong> within{" "}
             <strong>{domainLabel}</strong>.
             <br />