chore: Rename - Right Sidebar (#1112)

chanzuckerberg · Sep 20, 2024 · 52ec34a · 52ec34a
1 parent ba2087a
commit 52ec34a
Show file tree

Hide file tree

Showing 46 changed files with 205 additions and 213 deletions.
diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml
@@ -2,7 +2,7 @@ stack:
   services:
     explorer:
       image:
-        tag: sha-c15484e5
+        tag: sha-1e81e0f8
       replicaCount: 1
       env:
         # env vars common to all deployment stages

diff --git a/client/src/components/annoDialog.tsx → .../src/components/AnnoDialog/AnnoDialog.tsx b/client/src/components/annoDialog.tsx → .../src/components/AnnoDialog/AnnoDialog.tsx
@@ -5,7 +5,7 @@ import { Button, Dialog, Classes, Colors, Tooltip } from "@blueprintjs/core";
 type State = any;
 
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-class AnnoDialog extends React.PureComponent<{}, State> {
+export class AnnoDialog extends React.PureComponent<{}, State> {
   // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
   constructor(props: {}) {
     super(props);
@@ -113,5 +113,3 @@ class AnnoDialog extends React.PureComponent<{}, State> {
     );
   }
 }
-
-export default AnnoDialog;
diff --git a/client/src/components/App/App.tsx b/client/src/components/App/App.tsx
@@ -11,9 +11,9 @@ import DiffexNotice from "../DiffexNotice/DiffexNotice";
 import BottomBanner from "../BottomBanner/BottomBanner";
 import Container from "../framework/container";
 import Layout from "../framework/layout";
-import LayoutSkeleton from "../framework/layoutSkeleton";
+import { LayoutSkeleton } from "../framework/LayoutSkeleton/LayoutSkeleton";
 import LeftSideBar from "../LeftSidebar/LeftSidebar";
-import RightSideBar from "../rightSidebar";
+import RightSideBar from "../RightSideBar/RightSideBar";
 import Legend from "../Legend/Legend";
 import MenuBar from "../MenuBar/MenuBar";
 import NavBar from "../NavBar/NavBar";

diff --git a/client/src/components/DiffexNotice/DiffexNotice.tsx b/client/src/components/DiffexNotice/DiffexNotice.tsx
@@ -1,7 +1,7 @@
 /* Core dependencies */
 import React, { useState, useEffect } from "react";
 import { noop } from "lodash";
-import { Link } from "../geneExpression/infoPanel/common/style";
+import { Link } from "components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/style";
 import { StyledSnackbar, StyledAlert } from "./style";
 
 interface Props {

diff --git a/client/src/components/labelInput.tsx → .../src/components/LabelInput/LabelInput.tsx b/client/src/components/labelInput.tsx → .../src/components/LabelInput/LabelInput.tsx
@@ -7,7 +7,7 @@ import fuzzysort from "fuzzysort";
 type State = any;
 
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-export default class LabelInput extends React.PureComponent<{}, State> {
+export class LabelInput extends React.PureComponent<{}, State> {
   /*
   Input widget for text labels, which acts like an InputGroup, but will also 
   accept a suggestion list (of labels), with sublime-like suggest search.

diff --git a/client/src/components/rightSidebar/index.tsx → .../components/RightSideBar/RightSideBar.tsx b/client/src/components/rightSidebar/index.tsx → .../components/RightSideBar/RightSideBar.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 
-import GeneExpression from "../geneExpression";
-import InfoPanel from "../geneExpression/infoPanel";
+import GeneExpression from "./components/GeneExpression/GeneExpression";
+import InfoPanel from "./components/GeneExpression/components/InfoPanel/InfoPanel";
 import { RightSidebarWrapper } from "./style";
 
 function RightSidebar() {

diff --git a/...t/src/components/geneExpression/index.tsx → ...ponents/GeneExpression/GeneExpression.tsx b/...t/src/components/geneExpression/index.tsx → ...ponents/GeneExpression/GeneExpression.tsx
@@ -3,13 +3,15 @@ import { connect } from "react-redux";
 import { Button, H4, H5, Icon } from "@blueprintjs/core";
 import { IconNames } from "@blueprintjs/icons";
 
-import GeneSet from "./geneSet";
-import QuickGene from "./quickGene";
-import CreateGenesetDialogue from "./menus/createGenesetDialogue";
-import { track } from "../../analytics";
-import { EVENTS } from "../../analytics/events";
-import * as globals from "../../globals";
-import { Dataframe, DataframeValue } from "../../util/dataframe";
+import { track } from "analytics";
+import { EVENTS } from "analytics/events";
+import { Dataframe, DataframeValue } from "util/dataframe";
+
+import { GeneSet } from "./components/GeneSet/GeneSet";
+import { QuickGene } from "./components/QuickGene/QuickGene";
+import { CreateGenesetDialogue } from "./components/CreateGenesetDialogue/CreateGenesetDialogue";
+
+import * as globals from "~/globals";
 import { MARKER_GENE_SUFFIX_IDENTIFIER } from "./constants";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS.

diff --git a/...xpression/menus/createGenesetDialogue.tsx → ...GenesetDialogue/CreateGenesetDialogue.tsx b/...xpression/menus/createGenesetDialogue.tsx → ...GenesetDialogue/CreateGenesetDialogue.tsx
@@ -3,10 +3,10 @@ import uniq from "lodash.uniq";
 import React from "react";
 import { connect } from "react-redux";
 import { Button, Dialog, Classes, Colors, Tooltip } from "@blueprintjs/core";
-import LabelInput from "../../labelInput";
-import actions from "../../../actions";
-import { track } from "../../../analytics";
-import { EVENTS } from "../../../analytics/events";
+import { LabelInput } from "components/LabelInput/LabelInput";
+import actions from "actions";
+import { track } from "analytics";
+import { EVENTS } from "analytics/events";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS.
 type State = any;
@@ -25,7 +25,7 @@ type State = any;
   genesetsUI: (state as any).genesetsUI,
 }))
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-class CreateGenesetDialogue extends React.PureComponent<{}, State> {
+export class CreateGenesetDialogue extends React.PureComponent<{}, State> {
   // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
   constructor(props: {}) {
     super(props);
@@ -239,5 +239,3 @@ class CreateGenesetDialogue extends React.PureComponent<{}, State> {
     );
   }
 }
-
-export default CreateGenesetDialogue;
diff --git a/.../components/geneExpression/gene/index.tsx → ...s/GeneExpression/components/Gene/Gene.tsx b/.../components/geneExpression/gene/index.tsx → ...s/GeneExpression/components/Gene/Gene.tsx
@@ -12,8 +12,9 @@ import { EVENTS } from "analytics/events";
 import { ActiveTab } from "common/types/entities";
 import { InfoButton, InfoButtonWrapper } from "common/style";
 import Truncate from "common/components/Truncate/Truncate";
+
 import { State, Props, mapStateToProps, mapDispatchToProps } from "./types";
-import { MINI_HISTOGRAM_WIDTH } from "../constants";
+import { MINI_HISTOGRAM_WIDTH } from "../../constants";
 
 class Gene extends React.Component<Props, State> {
   constructor(props: Props) {

diff --git a/...c/components/geneExpression/gene/types.ts → ...s/GeneExpression/components/Gene/types.ts b/...c/components/geneExpression/gene/types.ts → ...s/GeneExpression/components/Gene/types.ts
@@ -1,5 +1,5 @@
-import { AppDispatch, RootState } from "../../../reducers";
-import { DataframeValue } from "../../../util/dataframe";
+import { AppDispatch, RootState } from "reducers";
+import { DataframeValue } from "util/dataframe";
 
 export interface State {
   geneIsExpanded: boolean;

diff --git a/...src/components/geneExpression/geneSet.tsx → ...Expression/components/GeneSet/GeneSet.tsx b/...src/components/geneExpression/geneSet.tsx → ...Expression/components/GeneSet/GeneSet.tsx
@@ -4,18 +4,18 @@ import BrushableHistogram from "common/components/BrushableHistogram/BrushableHi
 import { track } from "analytics";
 import { EVENTS } from "analytics/events";
 import Truncate from "common/components/Truncate/Truncate";
-import Gene from "./gene";
+import Gene from "../Gene/Gene";
 import * as globals from "~/globals";
-import GenesetMenus from "./menus/genesetMenus";
-import EditGenesetNameDialogue from "./menus/editGenesetNameDialogue";
+import { GenesetMenus } from "./components/GeneSetMenus/GenesetMenus";
+import { EditGenesetNameDialogue } from "./components/EditGenesetNameDialogue/EditGenesetNameDialogue";
 
 import { diffexpPopNamePrefix1, diffexpPopNamePrefix2 } from "~/globals";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS.
 type State = any;
 
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-class GeneSet extends React.Component<{}, State> {
+export class GeneSet extends React.Component<{}, State> {
   isGeneExpressionLoadComplete = false;
 
   // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
@@ -175,5 +175,3 @@ class GeneSet extends React.Component<{}, State> {
     );
   }
 }
-
-export default GeneSet;
diff --git a/...ression/menus/editGenesetNameDialogue.tsx → ...tNameDialogue/EditGenesetNameDialogue.tsx b/...ression/menus/editGenesetNameDialogue.tsx → ...tNameDialogue/EditGenesetNameDialogue.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
-import AnnoDialog from "../../annoDialog";
-import LabelInput from "../../labelInput";
+import { AnnoDialog } from "components/AnnoDialog/AnnoDialog";
+import { LabelInput } from "components/LabelInput/LabelInput";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS.
 type State = any;
@@ -20,7 +20,7 @@ type State = any;
   genesets: (state as any).genesets.genesets,
 }))
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-class RenameGeneset extends React.PureComponent<{}, State> {
+export class EditGenesetNameDialogue extends React.PureComponent<{}, State> {
   // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
   constructor(props: {}) {
     super(props);
@@ -150,5 +150,3 @@ class RenameGeneset extends React.PureComponent<{}, State> {
     );
   }
 }
-
-export default RenameGeneset;
diff --git a/...nts/geneExpression/menus/genesetMenus.tsx → .../components/GeneSetMenus/GenesetMenus.tsx b/...nts/geneExpression/menus/genesetMenus.tsx → .../components/GeneSetMenus/GenesetMenus.tsx
@@ -11,12 +11,12 @@ import {
   PopoverInteractionKind,
   Tooltip,
 } from "@blueprintjs/core";
-import * as globals from "../../../globals";
-import actions from "../../../actions";
-import AddGeneToGenesetDialogue from "./addGeneToGenesetDialogue";
-import { track } from "../../../analytics";
-import { EVENTS } from "../../../analytics/events";
-import { MARKER_GENE_SUFFIX_IDENTIFIER } from "../constants";
+import actions from "actions";
+import { track } from "analytics";
+import { EVENTS } from "analytics/events";
+import * as globals from "~/globals";
+import { AddGeneToGenesetDialogue } from "./components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue";
+import { MARKER_GENE_SUFFIX_IDENTIFIER } from "../../../../constants";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS.
 type State = any;
@@ -31,7 +31,7 @@ type State = any;
   colorLoading: (state as any).controls.colorLoading,
 }))
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-class GenesetMenus extends React.PureComponent<{}, State> {
+export class GenesetMenus extends React.PureComponent<{}, State> {
   // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
   constructor(props: {}) {
     super(props);
@@ -179,5 +179,3 @@ class GenesetMenus extends React.PureComponent<{}, State> {
     );
   }
 }
-
-export default GenesetMenus;
diff --git a/...ession/menus/addGeneToGenesetDialogue.tsx → ...esetDialogue/AddGeneToGenesetDialogue.tsx b/...ession/menus/addGeneToGenesetDialogue.tsx → ...esetDialogue/AddGeneToGenesetDialogue.tsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { connect } from "react-redux";
-import AnnoDialog from "../../annoDialog";
-import LabelInput from "../../labelInput";
-import parseBulkGeneString from "../../../util/parseBulkGeneString";
-import actions from "../../../actions";
-import { track } from "../../../analytics";
-import { EVENTS } from "../../../analytics/events";
+import { AnnoDialog } from "components/AnnoDialog/AnnoDialog";
+import { LabelInput } from "components/LabelInput/LabelInput";
+import parseBulkGeneString from "util/parseBulkGeneString";
+import actions from "actions";
+import { track } from "analytics";
+import { EVENTS } from "analytics/events";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS.
 type State = any;
@@ -16,7 +16,7 @@ type State = any;
   genesetsUI: (state as any).genesetsUI,
 }))
 // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
-class AddGeneToGenesetDialogue extends React.PureComponent<{}, State> {
+export class AddGeneToGenesetDialogue extends React.PureComponent<{}, State> {
   // eslint-disable-next-line @typescript-eslint/ban-types --- FIXME: disabled temporarily on migrate to TS.
   constructor(props: {}) {
     super(props);
@@ -102,5 +102,3 @@ class AddGeneToGenesetDialogue extends React.PureComponent<{}, State> {
     );
   }
 }
-
-export default AddGeneToGenesetDialogue;
diff --git a/...onents/geneExpression/infoPanel/index.tsx → ...ession/components/InfoPanel/InfoPanel.tsx b/...onents/geneExpression/infoPanel/index.tsx → ...ession/components/InfoPanel/InfoPanel.tsx
@@ -3,18 +3,18 @@ import { connect } from "react-redux";
 import { AnchorButton, ButtonGroup } from "@blueprintjs/core";
 import { Tabs, Tab } from "@czi-sds/components";
 
+import { ActiveTab } from "common/types/entities";
 import {
   CollapseToggle,
   InfoPanelContent,
   InfoPanelHeader,
   InfoPanelWrapper,
 } from "./style";
-import CellTypeInfo from "./infoPanelCellType";
-import GeneInfo from "./infoPanelGene";
-import DatasetInfo from "./infoPanelDataset";
+import CellTypeInfo from "./components/CellTypeInfo/CellTypeInfo";
+import GeneInfo from "./components/GeneInfo/GeneInfo";
+import DatasetInfo from "./components/DatasetInfo/DatasetInfo";
 import { Props, mapStateToProps } from "./types";
 import useConnect from "./connect";
-import { ActiveTab } from "../../../common/types/entities";
 
 function InfoPanel(props: Props) {
   const { activeTab, dispatch, infoPanelMinimized, infoPanelHidden } = props;

diff --git a/...ion/infoPanel/infoPanelCellType/index.tsx → .../components/CellTypeInfo/CellTypeInfo.tsx b/...ion/infoPanel/infoPanelCellType/index.tsx → .../components/CellTypeInfo/CellTypeInfo.tsx
@@ -1,8 +1,8 @@
 import React, { useMemo } from "react";
 import { connect } from "react-redux";
 import { Props, mapStateToProps } from "./types";
-import InfoPanelContainer from "../common/infoPanelContainer";
-import { CELLGUIDE_URL } from "../common/constants";
+import { InfoPanelContainer } from "../InfoPanelContainer/InfoPanelContainer";
+import { CELLGUIDE_URL } from "../InfoPanelContainer/constants";
 
 function CellTypeInfo(props: Props) {
   const { cellInfo, cellTypes } = props;

diff --git a/...sion/infoPanel/infoPanelCellType/types.ts → ...nfoPanel/components/CellTypeInfo/types.ts b/...sion/infoPanel/infoPanelCellType/types.ts → ...nfoPanel/components/CellTypeInfo/types.ts
@@ -1,4 +1,4 @@
-import { RootState } from "../../../../reducers";
+import { RootState } from "reducers";
 
 export interface Props {
   cellInfo: RootState["controls"]["cellInfo"];

diff --git a/...sion/infoPanel/infoPanelDataset/index.tsx → ...el/components/DatasetInfo/DatasetInfo.tsx b/...sion/infoPanel/infoPanelDataset/index.tsx → ...el/components/DatasetInfo/DatasetInfo.tsx
diff --git a/...ion/infoPanel/infoPanelDataset/connect.ts → ...foPanel/components/DatasetInfo/connect.ts b/...ion/infoPanel/infoPanelDataset/connect.ts → ...foPanel/components/DatasetInfo/connect.ts
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { selectableCategoryNames } from "../../../../util/stateManager/controlsHelpers";
+import { selectableCategoryNames } from "util/stateManager/controlsHelpers";
 import { Props } from "./types";
 
 export function useConnect({
@@ -25,7 +25,7 @@ export function useConnect({
       }
     });
 
-    singleContinuousValues.forEach((value, catName) => {
+    singleContinuousValues.forEach((value: any, catName: any) => {
       singleValues.set(catName, value);
     });
 

diff --git a/...el/infoPanelDataset/datasetInfoFormat.tsx → ...ponents/DatasetInfo/datasetInfoFormat.tsx b/...el/infoPanelDataset/datasetInfoFormat.tsx → ...ponents/DatasetInfo/datasetInfoFormat.tsx
@@ -9,10 +9,10 @@ import {
   Consortium,
   Link,
   PublisherMetadata,
-} from "../../../../common/types/entities";
-import { Category } from "../../../../common/types/schema";
-import * as globals from "../../../../globals";
-import { RootState } from "../../../../reducers";
+} from "common/types/entities";
+import { Category } from "common/types/schema";
+import { RootState } from "reducers";
+import * as globals from "~/globals";
 
 const COLLECTION_LINK_ORDER_BY = [
   "DOI",

diff --git a/...ssion/infoPanel/infoPanelDataset/types.ts → ...InfoPanel/components/DatasetInfo/types.ts b/...ssion/infoPanel/infoPanelDataset/types.ts → ...InfoPanel/components/DatasetInfo/types.ts
@@ -1,4 +1,4 @@
-import { RootState } from "../../../../reducers";
+import { RootState } from "reducers";
 
 export interface Props {
   datasetMetadata: RootState["datasetMetadata"]["datasetMetadata"];

diff --git a/...ression/infoPanel/infoPanelGene/index.tsx → ...nfoPanel/components/GeneInfo/GeneInfo.tsx b/...ression/infoPanel/infoPanelGene/index.tsx → ...nfoPanel/components/GeneInfo/GeneInfo.tsx
@@ -1,10 +1,9 @@
 import React from "react";
 import { connect } from "react-redux";
-import { Props, mapStateToProps } from "./types";
-
-import InfoPanelContainer from "../common/infoPanelContainer";
 
-import { EMPTY_ARRAY } from "../../../../common/constants";
+import { EMPTY_ARRAY } from "common/constants";
+import { Props, mapStateToProps } from "./types";
+import { InfoPanelContainer } from "../InfoPanelContainer/InfoPanelContainer";
 
 function GeneInfo(props: Props) {
   const { geneInfo, geneList } = props;

diff --git a/...pression/infoPanel/infoPanelGene/types.ts → ...ts/InfoPanel/components/GeneInfo/types.ts b/...pression/infoPanel/infoPanelGene/types.ts → ...ts/InfoPanel/components/GeneInfo/types.ts
@@ -1,4 +1,4 @@
-import { RootState } from "../../../../reducers";
+import { RootState } from "reducers";
 
 export interface Props {
   geneInfo: RootState["controls"]["geneInfo"];

diff --git a/...Panel/common/infoPanelContainer/index.tsx → ...InfoPanelContainer/InfoPanelContainer.tsx b/...Panel/common/infoPanelContainer/index.tsx → ...InfoPanelContainer/InfoPanelContainer.tsx
@@ -1,16 +1,15 @@
 import React from "react";
 import { kebabCase } from "lodash";
-import { InfoContainer, InfoWrapper } from "../style";
-import {
-  ErrorInfo,
-  LoadingInfo,
-  NoneSelected,
-  ShowInfo,
-} from "../infoPanelParts";
-import { ExtendedInfoProps } from "../types";
-import InfoSearch from "../infoSearch";
+import { InfoContainer, InfoWrapper } from "./style";
 
-function InfoPanelContainer(props: ExtendedInfoProps) {
+import { ErrorInfo } from "./components/ErrorInfo/ErrorInfo";
+import { NoneSelected } from "./components/NoneSelected/NoneSelected";
+import { LoadingInfo } from "./components/LoadingInfo/LoadingInfo";
+import { ShowInfo } from "./components/ShowInfo/ShowInfo";
+import { ExtendedInfoProps } from "./types";
+import InfoSearch from "./components/InfoSearch/InfoSearch";
+
+export function InfoPanelContainer(props: ExtendedInfoProps) {
   const {
     id,
     name,
@@ -73,5 +72,3 @@ function InfoPanelContainer(props: ExtendedInfoProps) {
     </InfoWrapper>
   );
 }
-
-export default InfoPanelContainer;