From 44468d7009c2477473645a94781c9fbb9671a401 Mon Sep 17 00:00:00 2001 From: kaloster Date: Thu, 19 Sep 2024 09:37:00 -0400 Subject: [PATCH 1/5] chore: Renaming - RightSideBar --- .infra/rdev/values.yaml | 2 +- client/src/components/App/App.tsx | 4 ++-- client/src/components/DiffexNotice/DiffexNotice.tsx | 2 +- .../index.tsx => RightSideBar/RightSideBar.tsx} | 4 ++-- .../components}/geneExpression/constants.ts | 0 .../components}/geneExpression/gene/index.tsx | 1 + .../components}/geneExpression/gene/types.ts | 4 ++-- .../components}/geneExpression/geneSet.tsx | 0 .../components}/geneExpression/index.tsx | 10 ++++++---- .../geneExpression/infoPanel/common/constants.ts | 0 .../infoPanel/common/infoPanelContainer/index.tsx | 0 .../infoPanel/common/infoPanelParts/index.tsx | 0 .../infoPanel/common/infoSearch/connect.ts | 4 ++-- .../infoPanel/common/infoSearch/index.tsx | 0 .../infoPanel/common/infoSearch/style.ts | 0 .../infoPanel/common/infoSearch/types.ts | 2 +- .../geneExpression/infoPanel/common/style.ts | 2 +- .../geneExpression/infoPanel/common/types.ts | 0 .../components}/geneExpression/infoPanel/connect.ts | 4 ++-- .../components}/geneExpression/infoPanel/index.tsx | 2 +- .../infoPanel/infoPanelCellType/index.tsx | 0 .../infoPanel/infoPanelCellType/types.ts | 2 +- .../infoPanel/infoPanelDataset/connect.ts | 4 ++-- .../infoPanel/infoPanelDataset/datasetInfoFormat.tsx | 8 ++++---- .../infoPanel/infoPanelDataset/index.tsx | 0 .../infoPanel/infoPanelDataset/types.ts | 2 +- .../geneExpression/infoPanel/infoPanelGene/index.tsx | 5 ++--- .../geneExpression/infoPanel/infoPanelGene/types.ts | 2 +- .../components}/geneExpression/infoPanel/style.ts | 0 .../components}/geneExpression/infoPanel/types.ts | 4 ++-- .../menus/addGeneToGenesetDialogue.tsx | 12 ++++++------ .../geneExpression/menus/createGenesetDialogue.tsx | 8 ++++---- .../geneExpression/menus/editGenesetNameDialogue.tsx | 4 ++-- .../geneExpression/menus/genesetMenus.tsx | 8 ++++---- .../components}/geneExpression/quickGene.tsx | 12 ++++++------ .../components}/geneExpression/types.ts | 2 +- .../components}/geneExpression/util.ts | 0 .../{rightSidebar => RightSideBar}/style.ts | 0 .../LayoutSkeleton.tsx} | 6 +++--- .../RightSidebarSkeleton/RightSidebarSkeleton.tsx} | 2 +- 40 files changed, 62 insertions(+), 60 deletions(-) rename client/src/components/{rightSidebar/index.tsx => RightSideBar/RightSideBar.tsx} (67%) rename client/src/components/{ => RightSideBar/components}/geneExpression/constants.ts (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/gene/index.tsx (99%) rename client/src/components/{ => RightSideBar/components}/geneExpression/gene/types.ts (90%) rename client/src/components/{ => RightSideBar/components}/geneExpression/geneSet.tsx (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/index.tsx (98%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/constants.ts (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/infoPanelContainer/index.tsx (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/infoPanelParts/index.tsx (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/infoSearch/connect.ts (93%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/infoSearch/index.tsx (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/infoSearch/style.ts (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/infoSearch/types.ts (92%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/style.ts (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/common/types.ts (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/connect.ts (86%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/index.tsx (97%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelCellType/index.tsx (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelCellType/types.ts (84%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelDataset/connect.ts (85%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx (98%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelDataset/index.tsx (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelDataset/types.ts (90%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelGene/index.tsx (93%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/infoPanelGene/types.ts (84%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/style.ts (100%) rename client/src/components/{ => RightSideBar/components}/geneExpression/infoPanel/types.ts (76%) rename client/src/components/{ => RightSideBar/components}/geneExpression/menus/addGeneToGenesetDialogue.tsx (93%) rename client/src/components/{ => RightSideBar/components}/geneExpression/menus/createGenesetDialogue.tsx (98%) rename client/src/components/{ => RightSideBar/components}/geneExpression/menus/editGenesetNameDialogue.tsx (98%) rename client/src/components/{ => RightSideBar/components}/geneExpression/menus/genesetMenus.tsx (97%) rename client/src/components/{ => RightSideBar/components}/geneExpression/quickGene.tsx (96%) rename client/src/components/{ => RightSideBar/components}/geneExpression/types.ts (91%) rename client/src/components/{ => RightSideBar/components}/geneExpression/util.ts (100%) rename client/src/components/{rightSidebar => RightSideBar}/style.ts (100%) rename client/src/components/framework/{layoutSkeleton.tsx => LayoutSkeleton/LayoutSkeleton.tsx} (79%) rename client/src/components/{rightSidebar/rightSidebarSkeleton.tsx => framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx} (94%) diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml index 5ea777a76..5b2215d42 100644 --- a/.infra/rdev/values.yaml +++ b/.infra/rdev/values.yaml @@ -2,7 +2,7 @@ stack: services: explorer: image: - tag: sha-c15484e5 + tag: sha-94cb22a8 replicaCount: 1 env: # env vars common to all deployment stages diff --git a/client/src/components/App/App.tsx b/client/src/components/App/App.tsx index f8c877ca5..dfb4c7aa0 100644 --- 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"; import Header from "../NavBar"; diff --git a/client/src/components/DiffexNotice/DiffexNotice.tsx b/client/src/components/DiffexNotice/DiffexNotice.tsx index e2cac2924..18ea0fea4 100644 --- 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/infoPanel/common/style"; import { StyledSnackbar, StyledAlert } from "./style"; interface Props { diff --git a/client/src/components/rightSidebar/index.tsx b/client/src/components/RightSideBar/RightSideBar.tsx similarity index 67% rename from client/src/components/rightSidebar/index.tsx rename to client/src/components/RightSideBar/RightSideBar.tsx index 7193e640c..cecb7036c 100644 --- a/client/src/components/rightSidebar/index.tsx +++ b/client/src/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"; +import InfoPanel from "./components/geneExpression/infoPanel"; import { RightSidebarWrapper } from "./style"; function RightSidebar() { diff --git a/client/src/components/geneExpression/constants.ts b/client/src/components/RightSideBar/components/geneExpression/constants.ts similarity index 100% rename from client/src/components/geneExpression/constants.ts rename to client/src/components/RightSideBar/components/geneExpression/constants.ts diff --git a/client/src/components/geneExpression/gene/index.tsx b/client/src/components/RightSideBar/components/geneExpression/gene/index.tsx similarity index 99% rename from client/src/components/geneExpression/gene/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/gene/index.tsx index 0d61b6236..8551816de 100644 --- a/client/src/components/geneExpression/gene/index.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/gene/index.tsx @@ -12,6 +12,7 @@ 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"; diff --git a/client/src/components/geneExpression/gene/types.ts b/client/src/components/RightSideBar/components/geneExpression/gene/types.ts similarity index 90% rename from client/src/components/geneExpression/gene/types.ts rename to client/src/components/RightSideBar/components/geneExpression/gene/types.ts index a34ba56b9..92bb7fc09 100644 --- a/client/src/components/geneExpression/gene/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/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/client/src/components/geneExpression/geneSet.tsx b/client/src/components/RightSideBar/components/geneExpression/geneSet.tsx similarity index 100% rename from client/src/components/geneExpression/geneSet.tsx rename to client/src/components/RightSideBar/components/geneExpression/geneSet.tsx diff --git a/client/src/components/geneExpression/index.tsx b/client/src/components/RightSideBar/components/geneExpression/index.tsx similarity index 98% rename from client/src/components/geneExpression/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/index.tsx index ded4b3459..d65d57777 100644 --- a/client/src/components/geneExpression/index.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/index.tsx @@ -3,13 +3,15 @@ import { connect } from "react-redux"; import { Button, H4, H5, Icon } from "@blueprintjs/core"; import { IconNames } from "@blueprintjs/icons"; +import { track } from "analytics"; +import { EVENTS } from "analytics/events"; +import { Dataframe, DataframeValue } from "util/dataframe"; + 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 * 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/client/src/components/geneExpression/infoPanel/common/constants.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/constants.ts similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/constants.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/constants.ts diff --git a/client/src/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx diff --git a/client/src/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx diff --git a/client/src/components/geneExpression/infoPanel/common/infoSearch/connect.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/connect.ts similarity index 93% rename from client/src/components/geneExpression/infoPanel/common/infoSearch/connect.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/connect.ts index 7801f9c40..d5fb4c620 100644 --- a/client/src/components/geneExpression/infoPanel/common/infoSearch/connect.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/connect.ts @@ -1,8 +1,8 @@ import fuzzysort from "fuzzysort"; +import { AppDispatch } from "reducers"; -import actions from "../../../../../actions"; +import actions from "actions"; import { Item } from "./types"; -import { AppDispatch } from "../../../../../reducers"; export default function useConnect({ infoType, diff --git a/client/src/components/geneExpression/infoPanel/common/infoSearch/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/index.tsx similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/infoSearch/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/index.tsx diff --git a/client/src/components/geneExpression/infoPanel/common/infoSearch/style.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/style.ts similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/infoSearch/style.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/style.ts diff --git a/client/src/components/geneExpression/infoPanel/common/infoSearch/types.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/types.ts similarity index 92% rename from client/src/components/geneExpression/infoPanel/common/infoSearch/types.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/types.ts index 2bea61576..92ad1b3c5 100644 --- a/client/src/components/geneExpression/infoPanel/common/infoSearch/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/types.ts @@ -1,4 +1,4 @@ -import { AppDispatch } from "../../../../../reducers"; +import { AppDispatch } from "reducers"; export interface FuzzySortResult { target: string; diff --git a/client/src/components/geneExpression/infoPanel/common/style.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/style.ts similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/style.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/style.ts index 8a3ac7ed9..b6918011e 100644 --- a/client/src/components/geneExpression/infoPanel/common/style.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/style.ts @@ -16,8 +16,8 @@ import { warning100, warning400, } from "util/theme"; -import * as styles from "../../util"; import * as globals from "~/globals"; +import * as styles from "../../util"; export const InfoWrapper = styled.div` display: flex; diff --git a/client/src/components/geneExpression/infoPanel/common/types.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/types.ts similarity index 100% rename from client/src/components/geneExpression/infoPanel/common/types.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/common/types.ts diff --git a/client/src/components/geneExpression/infoPanel/connect.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/connect.ts similarity index 86% rename from client/src/components/geneExpression/infoPanel/connect.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/connect.ts index ba29efea5..59fffd1e4 100644 --- a/client/src/components/geneExpression/infoPanel/connect.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/connect.ts @@ -1,6 +1,6 @@ import { SyntheticEvent, useEffect, useState } from "react"; -import { AppDispatch } from "../../../reducers"; -import { ActiveTab } from "../../../common/types/entities"; +import { AppDispatch } from "reducers"; +import { ActiveTab } from "common/types/entities"; function useConnect({ dispatch, diff --git a/client/src/components/geneExpression/infoPanel/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/index.tsx similarity index 97% rename from client/src/components/geneExpression/infoPanel/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/index.tsx index 32f1de26f..eecc4d1aa 100644 --- a/client/src/components/geneExpression/infoPanel/index.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/index.tsx @@ -3,6 +3,7 @@ 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, @@ -14,7 +15,6 @@ import GeneInfo from "./infoPanelGene"; import DatasetInfo from "./infoPanelDataset"; 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/client/src/components/geneExpression/infoPanel/infoPanelCellType/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/index.tsx similarity index 100% rename from client/src/components/geneExpression/infoPanel/infoPanelCellType/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/index.tsx diff --git a/client/src/components/geneExpression/infoPanel/infoPanelCellType/types.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/types.ts similarity index 84% rename from client/src/components/geneExpression/infoPanel/infoPanelCellType/types.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/types.ts index ddc676d17..7a929ccfa 100644 --- a/client/src/components/geneExpression/infoPanel/infoPanelCellType/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/types.ts @@ -1,4 +1,4 @@ -import { RootState } from "../../../../reducers"; +import { RootState } from "reducers"; export interface Props { cellInfo: RootState["controls"]["cellInfo"]; diff --git a/client/src/components/geneExpression/infoPanel/infoPanelDataset/connect.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/connect.ts similarity index 85% rename from client/src/components/geneExpression/infoPanel/infoPanelDataset/connect.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/connect.ts index 6f9ab58ed..462654e47 100644 --- a/client/src/components/geneExpression/infoPanel/infoPanelDataset/connect.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/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/client/src/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx similarity index 98% rename from client/src/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx index 2dfc5e331..213649f09 100644 --- a/client/src/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/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/client/src/components/geneExpression/infoPanel/infoPanelDataset/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/index.tsx similarity index 100% rename from client/src/components/geneExpression/infoPanel/infoPanelDataset/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/index.tsx diff --git a/client/src/components/geneExpression/infoPanel/infoPanelDataset/types.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/types.ts similarity index 90% rename from client/src/components/geneExpression/infoPanel/infoPanelDataset/types.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/types.ts index 7016ca6fc..753893e0a 100644 --- a/client/src/components/geneExpression/infoPanel/infoPanelDataset/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/types.ts @@ -1,4 +1,4 @@ -import { RootState } from "../../../../reducers"; +import { RootState } from "reducers"; export interface Props { datasetMetadata: RootState["datasetMetadata"]["datasetMetadata"]; diff --git a/client/src/components/geneExpression/infoPanel/infoPanelGene/index.tsx b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/index.tsx similarity index 93% rename from client/src/components/geneExpression/infoPanel/infoPanelGene/index.tsx rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/index.tsx index c2d01f970..a7fb3dc61 100644 --- a/client/src/components/geneExpression/infoPanel/infoPanelGene/index.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/index.tsx @@ -1,11 +1,10 @@ import React from "react"; import { connect } from "react-redux"; -import { Props, mapStateToProps } from "./types"; +import { EMPTY_ARRAY } from "common/constants"; +import { Props, mapStateToProps } from "./types"; import InfoPanelContainer from "../common/infoPanelContainer"; -import { EMPTY_ARRAY } from "../../../../common/constants"; - function GeneInfo(props: Props) { const { geneInfo, geneList } = props; diff --git a/client/src/components/geneExpression/infoPanel/infoPanelGene/types.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/types.ts similarity index 84% rename from client/src/components/geneExpression/infoPanel/infoPanelGene/types.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/types.ts index 0cc0b4fcd..29864cb41 100644 --- a/client/src/components/geneExpression/infoPanel/infoPanelGene/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/types.ts @@ -1,4 +1,4 @@ -import { RootState } from "../../../../reducers"; +import { RootState } from "reducers"; export interface Props { geneInfo: RootState["controls"]["geneInfo"]; diff --git a/client/src/components/geneExpression/infoPanel/style.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/style.ts similarity index 100% rename from client/src/components/geneExpression/infoPanel/style.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/style.ts diff --git a/client/src/components/geneExpression/infoPanel/types.ts b/client/src/components/RightSideBar/components/geneExpression/infoPanel/types.ts similarity index 76% rename from client/src/components/geneExpression/infoPanel/types.ts rename to client/src/components/RightSideBar/components/geneExpression/infoPanel/types.ts index 5d556abf8..258f0fb63 100644 --- a/client/src/components/geneExpression/infoPanel/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/infoPanel/types.ts @@ -1,5 +1,5 @@ -import { ActiveTab } from "../../../common/types/entities"; -import { AppDispatch, RootState } from "../../../reducers"; +import { ActiveTab } from "common/types/entities"; +import { AppDispatch, RootState } from "reducers"; interface StateProps { activeTab: ActiveTab; diff --git a/client/src/components/geneExpression/menus/addGeneToGenesetDialogue.tsx b/client/src/components/RightSideBar/components/geneExpression/menus/addGeneToGenesetDialogue.tsx similarity index 93% rename from client/src/components/geneExpression/menus/addGeneToGenesetDialogue.tsx rename to client/src/components/RightSideBar/components/geneExpression/menus/addGeneToGenesetDialogue.tsx index 4756cf3c9..52641e38d 100644 --- a/client/src/components/geneExpression/menus/addGeneToGenesetDialogue.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/menus/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"; +import LabelInput from "components/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; diff --git a/client/src/components/geneExpression/menus/createGenesetDialogue.tsx b/client/src/components/RightSideBar/components/geneExpression/menus/createGenesetDialogue.tsx similarity index 98% rename from client/src/components/geneExpression/menus/createGenesetDialogue.tsx rename to client/src/components/RightSideBar/components/geneExpression/menus/createGenesetDialogue.tsx index e34784d75..55addf9ef 100644 --- a/client/src/components/geneExpression/menus/createGenesetDialogue.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/menus/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"; +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; diff --git a/client/src/components/geneExpression/menus/editGenesetNameDialogue.tsx b/client/src/components/RightSideBar/components/geneExpression/menus/editGenesetNameDialogue.tsx similarity index 98% rename from client/src/components/geneExpression/menus/editGenesetNameDialogue.tsx rename to client/src/components/RightSideBar/components/geneExpression/menus/editGenesetNameDialogue.tsx index 8ccc81a81..bdcc73bdb 100644 --- a/client/src/components/geneExpression/menus/editGenesetNameDialogue.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/menus/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"; +import LabelInput from "components/labelInput"; // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS. type State = any; diff --git a/client/src/components/geneExpression/menus/genesetMenus.tsx b/client/src/components/RightSideBar/components/geneExpression/menus/genesetMenus.tsx similarity index 97% rename from client/src/components/geneExpression/menus/genesetMenus.tsx rename to client/src/components/RightSideBar/components/geneExpression/menus/genesetMenus.tsx index e7babaf54..30b8c9000 100644 --- a/client/src/components/geneExpression/menus/genesetMenus.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/menus/genesetMenus.tsx @@ -11,11 +11,11 @@ import { PopoverInteractionKind, Tooltip, } from "@blueprintjs/core"; -import * as globals from "../../../globals"; -import actions from "../../../actions"; +import actions from "actions"; +import { track } from "analytics"; +import { EVENTS } from "analytics/events"; +import * as globals from "~/globals"; import AddGeneToGenesetDialogue from "./addGeneToGenesetDialogue"; -import { track } from "../../../analytics"; -import { EVENTS } from "../../../analytics/events"; 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/client/src/components/geneExpression/quickGene.tsx b/client/src/components/RightSideBar/components/geneExpression/quickGene.tsx similarity index 96% rename from client/src/components/geneExpression/quickGene.tsx rename to client/src/components/RightSideBar/components/geneExpression/quickGene.tsx index bf8194bf6..6e1f40180 100644 --- a/client/src/components/geneExpression/quickGene.tsx +++ b/client/src/components/RightSideBar/components/geneExpression/quickGene.tsx @@ -6,13 +6,13 @@ import { ItemRenderer, Suggest } from "@blueprintjs/select"; import { useSelector, useDispatch } from "react-redux"; import { noop } from "lodash"; -import Gene from "./gene"; -import { postUserErrorToast } from "../framework/toasters"; -import actions from "../../actions"; -import { Dataframe, DataframeValue } from "../../util/dataframe"; -import { track } from "../../analytics"; -import { EVENTS } from "../../analytics/events"; +import { postUserErrorToast } from "components/framework/toasters"; +import actions from "actions"; +import { Dataframe, DataframeValue } from "util/dataframe"; +import { track } from "analytics"; +import { EVENTS } from "analytics/events"; +import Gene from "./gene"; import { FuzzySortResult, Item, diff --git a/client/src/components/geneExpression/types.ts b/client/src/components/RightSideBar/components/geneExpression/types.ts similarity index 91% rename from client/src/components/geneExpression/types.ts rename to client/src/components/RightSideBar/components/geneExpression/types.ts index 8534c7e51..bbb150af1 100644 --- a/client/src/components/geneExpression/types.ts +++ b/client/src/components/RightSideBar/components/geneExpression/types.ts @@ -1,4 +1,4 @@ -import { RootState } from "../../reducers"; +import { RootState } from "reducers"; export interface StateProps { annoMatrix: RootState["annoMatrix"]; diff --git a/client/src/components/geneExpression/util.ts b/client/src/components/RightSideBar/components/geneExpression/util.ts similarity index 100% rename from client/src/components/geneExpression/util.ts rename to client/src/components/RightSideBar/components/geneExpression/util.ts diff --git a/client/src/components/rightSidebar/style.ts b/client/src/components/RightSideBar/style.ts similarity index 100% rename from client/src/components/rightSidebar/style.ts rename to client/src/components/RightSideBar/style.ts diff --git a/client/src/components/framework/layoutSkeleton.tsx b/client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx similarity index 79% rename from client/src/components/framework/layoutSkeleton.tsx rename to client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx index 4ec3cd8b0..6805330fe 100644 --- a/client/src/components/framework/layoutSkeleton.tsx +++ b/client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx @@ -4,9 +4,9 @@ import React from "react"; /* App dependencies */ import Controls from "common/components/Controls/Controls"; -import Layout from "./layout"; -import LeftSidebarSkeleton from "../LeftSidebar/LeftSidebarSkeleton"; -import RightSidebarSkeleton from "../rightSidebar/rightSidebarSkeleton"; +import LeftSidebarSkeleton from "components/LeftSidebar/LeftSidebarSkeleton"; +import Layout from "../layout"; +import RightSidebarSkeleton from "./components/RightSidebarSkeleton/RightSidebarSkeleton"; /** * Skeleton layout component displayed when in loading state. diff --git a/client/src/components/rightSidebar/rightSidebarSkeleton.tsx b/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx similarity index 94% rename from client/src/components/rightSidebar/rightSidebarSkeleton.tsx rename to client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx index 80655d1a2..ea5982e8e 100644 --- a/client/src/components/rightSidebar/rightSidebarSkeleton.tsx +++ b/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx @@ -1,7 +1,7 @@ /* Core dependencies */ import { SKELETON } from "@blueprintjs/core/lib/esnext/common/classes"; import React from "react"; -import { RightSidebarWrapper } from "./style"; +import { RightSidebarWrapper } from "components/RightSideBar/style"; /** * Skeleton of right side bar, to be displayed during data load. From 1ca011e82ffaff988dce6c069f44f2df866a7708 Mon Sep 17 00:00:00 2001 From: kaloster Date: Thu, 19 Sep 2024 16:35:31 +0000 Subject: [PATCH 2/5] chore: Rename child components --- .../components/DiffexNotice/DiffexNotice.tsx | 2 +- .../components/RightSideBar/RightSideBar.tsx | 4 +- .../GeneExpression.tsx} | 6 +- .../CreateGenesetDialogueTmp.tsx} | 0 .../components/Gene/Gene.tsx} | 2 +- .../components/Gene}/types.ts | 0 .../components/GeneSet/GeneSet.tsx} | 6 +- .../EditGenesetNameDialogue.tsx} | 0 .../components/GeneSetMenus/GenesetMenus.tsx} | 4 +- .../AddGeneToGenesetDialogue.tsx} | 0 .../components/InfoPanel/InfoPanel.tsx} | 6 +- .../components/CellTypeInfo/CellTypeInfo.tsx} | 4 +- .../components/CellTypeInfo}/types.ts | 0 .../components/DatasetInfo/DatasetInfo.tsx} | 0 .../components/DatasetInfo}/connect.ts | 0 .../DatasetInfo}/datasetInfoFormat.tsx | 0 .../components/DatasetInfo}/types.ts | 0 .../components/GeneInfo/GeneInfo.tsx} | 2 +- .../InfoPanel/components/GeneInfo}/types.ts | 0 .../InfoPanelContainer.tsx} | 17 ++- .../components/ErrorInfo/ErrorInfo.tsx | 25 +++++ .../components/InfoSearch/InfoSearch.tsx} | 0 .../components/InfoSearch}/connect.ts | 0 .../components/InfoSearch}/style.ts | 0 .../components/InfoSearch}/types.ts | 0 .../components/LoadingInfo/LoadingInfo.tsx | 38 +++++++ .../components/NoneSelected/NoneSelected.tsx | 28 +++++ .../components/ShowInfo/ShowInfo.tsx} | 101 +----------------- .../ShowWarningBanner/ShowWarningBanner.tsx | 13 +++ .../InfoPanelContainer}/constants.ts | 0 .../components/InfoPanelContainer}/style.ts | 2 +- .../components/InfoPanelContainer}/types.ts | 0 .../components/InfoPanel}/connect.ts | 0 .../components/InfoPanel}/style.ts | 0 .../components/InfoPanel}/types.ts | 0 .../components/QuickGene/QuickGene.tsx} | 4 +- .../constants.ts | 0 .../types.ts | 0 .../util.ts | 0 39 files changed, 137 insertions(+), 127 deletions(-) rename client/src/components/RightSideBar/components/{geneExpression/index.tsx => GeneExpression/GeneExpression.tsx} (97%) rename client/src/components/RightSideBar/components/{geneExpression/menus/createGenesetDialogue.tsx => GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogueTmp.tsx} (100%) rename client/src/components/RightSideBar/components/{geneExpression/gene/index.tsx => GeneExpression/components/Gene/Gene.tsx} (99%) rename client/src/components/RightSideBar/components/{geneExpression/gene => GeneExpression/components/Gene}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/geneSet.tsx => GeneExpression/components/GeneSet/GeneSet.tsx} (97%) rename client/src/components/RightSideBar/components/{geneExpression/menus/editGenesetNameDialogue.tsx => GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx} (100%) rename client/src/components/RightSideBar/components/{geneExpression/menus/genesetMenus.tsx => GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx} (97%) rename client/src/components/RightSideBar/components/{geneExpression/menus/addGeneToGenesetDialogue.tsx => GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx} (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/index.tsx => GeneExpression/components/InfoPanel/InfoPanel.tsx} (93%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelCellType/index.tsx => GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx} (85%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelCellType => GeneExpression/components/InfoPanel/components/CellTypeInfo}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelDataset/index.tsx => GeneExpression/components/InfoPanel/components/DatasetInfo/DatasetInfo.tsx} (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelDataset => GeneExpression/components/InfoPanel/components/DatasetInfo}/connect.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelDataset => GeneExpression/components/InfoPanel/components/DatasetInfo}/datasetInfoFormat.tsx (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelDataset => GeneExpression/components/InfoPanel/components/DatasetInfo}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelGene/index.tsx => GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx} (91%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/infoPanelGene => GeneExpression/components/InfoPanel/components/GeneInfo}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common/infoPanelContainer/index.tsx => GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx} (79%) create mode 100644 client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ErrorInfo/ErrorInfo.tsx rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common/infoSearch/index.tsx => GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/InfoSearch.tsx} (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common/infoSearch => GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch}/connect.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common/infoSearch => GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch}/style.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common/infoSearch => GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch}/types.ts (100%) create mode 100644 client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/LoadingInfo/LoadingInfo.tsx create mode 100644 client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/NoneSelected/NoneSelected.tsx rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common/infoPanelParts/index.tsx => GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/ShowInfo.tsx} (50%) create mode 100644 client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/components/ShowWarningBanner/ShowWarningBanner.tsx rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common => GeneExpression/components/InfoPanel/components/InfoPanelContainer}/constants.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common => GeneExpression/components/InfoPanel/components/InfoPanelContainer}/style.ts (98%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel/common => GeneExpression/components/InfoPanel/components/InfoPanelContainer}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel => GeneExpression/components/InfoPanel}/connect.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel => GeneExpression/components/InfoPanel}/style.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/infoPanel => GeneExpression/components/InfoPanel}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression/quickGene.tsx => GeneExpression/components/QuickGene/QuickGene.tsx} (98%) rename client/src/components/RightSideBar/components/{geneExpression => GeneExpression}/constants.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression => GeneExpression}/types.ts (100%) rename client/src/components/RightSideBar/components/{geneExpression => GeneExpression}/util.ts (100%) diff --git a/client/src/components/DiffexNotice/DiffexNotice.tsx b/client/src/components/DiffexNotice/DiffexNotice.tsx index 18ea0fea4..ef15460a7 100644 --- 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 "components/RightSideBar/components/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/RightSideBar/RightSideBar.tsx b/client/src/components/RightSideBar/RightSideBar.tsx index cecb7036c..1402692e6 100644 --- a/client/src/components/RightSideBar/RightSideBar.tsx +++ b/client/src/components/RightSideBar/RightSideBar.tsx @@ -1,7 +1,7 @@ import React from "react"; -import GeneExpression from "./components/geneExpression"; -import InfoPanel from "./components/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/client/src/components/RightSideBar/components/geneExpression/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx similarity index 97% rename from client/src/components/RightSideBar/components/geneExpression/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx index d65d57777..d2bc3ca38 100644 --- a/client/src/components/RightSideBar/components/geneExpression/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx @@ -7,9 +7,9 @@ import { track } from "analytics"; import { EVENTS } from "analytics/events"; import { Dataframe, DataframeValue } from "util/dataframe"; -import GeneSet from "./geneSet"; -import QuickGene from "./quickGene"; -import CreateGenesetDialogue from "./menus/createGenesetDialogue"; +import GeneSet from "./components/GeneSet/GeneSet"; +import QuickGene from "./components/QuickGene/QuickGene"; +import CreateGenesetDialogue from "./components/CreateGenesetDialogue/CreateGenesetDialogueTmp"; import * as globals from "~/globals"; import { MARKER_GENE_SUFFIX_IDENTIFIER } from "./constants"; diff --git a/client/src/components/RightSideBar/components/geneExpression/menus/createGenesetDialogue.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogueTmp.tsx similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/menus/createGenesetDialogue.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogueTmp.tsx diff --git a/client/src/components/RightSideBar/components/geneExpression/gene/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/Gene/Gene.tsx similarity index 99% rename from client/src/components/RightSideBar/components/geneExpression/gene/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/Gene/Gene.tsx index 8551816de..48156eb6c 100644 --- a/client/src/components/RightSideBar/components/geneExpression/gene/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/Gene/Gene.tsx @@ -14,7 +14,7 @@ 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 { constructor(props: Props) { diff --git a/client/src/components/RightSideBar/components/geneExpression/gene/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/Gene/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/gene/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/Gene/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/geneSet.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx similarity index 97% rename from client/src/components/RightSideBar/components/geneExpression/geneSet.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx index 2ee439b15..de0c11a26 100644 --- a/client/src/components/RightSideBar/components/geneExpression/geneSet.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx @@ -4,10 +4,10 @@ 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"; diff --git a/client/src/components/RightSideBar/components/geneExpression/menus/editGenesetNameDialogue.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/menus/editGenesetNameDialogue.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx diff --git a/client/src/components/RightSideBar/components/geneExpression/menus/genesetMenus.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx similarity index 97% rename from client/src/components/RightSideBar/components/geneExpression/menus/genesetMenus.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx index 30b8c9000..760e92a88 100644 --- a/client/src/components/RightSideBar/components/geneExpression/menus/genesetMenus.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx @@ -15,8 +15,8 @@ import actions from "actions"; import { track } from "analytics"; import { EVENTS } from "analytics/events"; import * as globals from "~/globals"; -import AddGeneToGenesetDialogue from "./addGeneToGenesetDialogue"; -import { MARKER_GENE_SUFFIX_IDENTIFIER } from "../constants"; +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; diff --git a/client/src/components/RightSideBar/components/geneExpression/menus/addGeneToGenesetDialogue.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/menus/addGeneToGenesetDialogue.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/InfoPanel.tsx similarity index 93% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/InfoPanel.tsx index eecc4d1aa..a3d8a2934 100644 --- a/client/src/components/RightSideBar/components/geneExpression/infoPanel/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/InfoPanel.tsx @@ -10,9 +10,9 @@ import { 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"; diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx similarity index 85% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx index 82a861673..24b4fdb67 100644 --- a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/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/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelCellType/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/DatasetInfo.tsx similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/DatasetInfo.tsx diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/connect.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/connect.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/connect.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/connect.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/datasetInfoFormat.tsx similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/datasetInfoFormat.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/datasetInfoFormat.tsx diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelDataset/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/DatasetInfo/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx similarity index 91% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx index a7fb3dc61..33d0b34e2 100644 --- a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx @@ -3,7 +3,7 @@ import { connect } from "react-redux"; import { EMPTY_ARRAY } from "common/constants"; import { Props, mapStateToProps } from "./types"; -import InfoPanelContainer from "../common/infoPanelContainer"; +import InfoPanelContainer from "../InfoPanelContainer/InfoPanelContainer"; function GeneInfo(props: Props) { const { geneInfo, geneList } = props; diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/infoPanelGene/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx similarity index 79% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx index 14922bfde..8b3f2b33a 100644 --- a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelContainer/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx @@ -1,14 +1,13 @@ 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"; + +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"; function InfoPanelContainer(props: ExtendedInfoProps) { const { diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ErrorInfo/ErrorInfo.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ErrorInfo/ErrorInfo.tsx new file mode 100644 index 000000000..0e11e9b39 --- /dev/null +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ErrorInfo/ErrorInfo.tsx @@ -0,0 +1,25 @@ +import React from "react"; +import { Content, InfoDiv, InfoSymbol, InfoTitle, Link } from "../../style"; +import { BaseInfoProps } from "../../types"; +import { ENTITY_NOT_FOUND, SEARCH_ON_GOOGLE } from "../../constants"; + +export function ErrorInfo(props: BaseInfoProps) { + const { name, infoType } = props; + return ( + + + {name} + + + {ENTITY_NOT_FOUND(infoType)} + + + {SEARCH_ON_GOOGLE} + + + ); +} diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/InfoSearch.tsx similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/InfoSearch.tsx diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/connect.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/connect.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/connect.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/connect.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/style.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/style.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/style.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/style.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoSearch/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/InfoSearch/types.ts diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/LoadingInfo/LoadingInfo.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/LoadingInfo/LoadingInfo.tsx new file mode 100644 index 000000000..07be0534f --- /dev/null +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/LoadingInfo/LoadingInfo.tsx @@ -0,0 +1,38 @@ +import React from "react"; +import { LoadingIndicator } from "@czi-sds/components"; + +import { InfoDiv, InfoSymbol, InfoTitle } from "../../style"; +import { BaseInfoProps } from "../../types"; + +export function LoadingInfo(props: BaseInfoProps) { + const { name } = props; + return ( + + + {name} + +
+
+ + + +
+
+ + ); +} diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/NoneSelected/NoneSelected.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/NoneSelected/NoneSelected.tsx new file mode 100644 index 000000000..2b0805c37 --- /dev/null +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/NoneSelected/NoneSelected.tsx @@ -0,0 +1,28 @@ +import React from "react"; + +import { + CustomIcon, + InfoDiv, + MessageDiv, + NoGeneSelectedDiv, +} from "../../style"; +import { BaseInfoProps } from "../../types"; +import { NO_ENTITY_SELECTED, SELECT_GENE_OR_CELL_TYPE } from "../../constants"; + +export function NoneSelected({ + infoType, +}: { + infoType: BaseInfoProps["infoType"]; +}) { + return ( + + + + + {NO_ENTITY_SELECTED(infoType)} + + {SELECT_GENE_OR_CELL_TYPE} + + + ); +} diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/ShowInfo.tsx similarity index 50% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/ShowInfo.tsx index d3de402b8..6fbd20b7b 100644 --- a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/infoPanelParts/index.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/ShowInfo.tsx @@ -1,113 +1,20 @@ import React from "react"; import { kebabCase } from "lodash"; -import { Icon, LoadingIndicator } from "@czi-sds/components"; import { Content, ContentRow, - CustomIcon, InfoDiv, InfoLabel, InfoOpenIn, InfoSymbol, InfoTitle, Link, - MessageDiv, - NoGeneSelectedDiv, Items, - WarningBanner, -} from "../style"; -import { BaseInfoProps, ExtendedInfoProps } from "../types"; -import { - ENTITY_NOT_FOUND, - NCBI_WARNING, - NO_ENTITY_SELECTED, - OPEN_IN, - SEARCH_ON_GOOGLE, - SELECT_GENE_OR_CELL_TYPE, - LABELS, -} from "../constants"; - -export function LoadingInfo(props: BaseInfoProps) { - const { name } = props; - return ( - - - {name} - -
-
- - - -
-
- - ); -} - -export function NoneSelected({ - infoType, -}: { - infoType: BaseInfoProps["infoType"]; -}) { - return ( - - - - - {NO_ENTITY_SELECTED(infoType)} - - {SELECT_GENE_OR_CELL_TYPE} - - - ); -} - -export function ShowWarningBanner() { - return ( - - - {NCBI_WARNING} - - ); -} - -export function ErrorInfo(props: BaseInfoProps) { - const { name, infoType } = props; - return ( - - - {name} - - - {ENTITY_NOT_FOUND(infoType)} - - - {SEARCH_ON_GOOGLE} - - - ); -} +} from "../../style"; +import { ExtendedInfoProps } from "../../types"; +import { OPEN_IN, LABELS } from "../../constants"; +import { ShowWarningBanner } from "./components/ShowWarningBanner/ShowWarningBanner"; export function ShowInfo(props: ExtendedInfoProps) { const { diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/components/ShowWarningBanner/ShowWarningBanner.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/components/ShowWarningBanner/ShowWarningBanner.tsx new file mode 100644 index 000000000..6878f4d62 --- /dev/null +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/components/ShowInfo/components/ShowWarningBanner/ShowWarningBanner.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import { Icon } from "@czi-sds/components"; +import { WarningBanner } from "../../../../style"; +import { NCBI_WARNING } from "../../../../constants"; + +export function ShowWarningBanner() { + return ( + + + {NCBI_WARNING} + + ); +} diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/constants.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/constants.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/constants.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/constants.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/style.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/style.ts similarity index 98% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/style.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/style.ts index b6918011e..592cb1f14 100644 --- a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/style.ts +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/style.ts @@ -16,8 +16,8 @@ import { warning100, warning400, } from "util/theme"; +import * as styles from "../../../../util"; import * as globals from "~/globals"; -import * as styles from "../../util"; export const InfoWrapper = styled.div` display: flex; diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/common/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/common/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/connect.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/connect.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/connect.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/connect.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/style.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/style.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/style.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/style.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/infoPanel/types.ts b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/infoPanel/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/quickGene.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx similarity index 98% rename from client/src/components/RightSideBar/components/geneExpression/quickGene.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx index 6e1f40180..1e1cacf10 100644 --- a/client/src/components/RightSideBar/components/geneExpression/quickGene.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx @@ -12,12 +12,12 @@ import actions from "actions"; import { Dataframe, DataframeValue } from "util/dataframe"; import { track } from "analytics"; import { EVENTS } from "analytics/events"; -import Gene from "./gene"; +import Gene from "../Gene/Gene"; import { FuzzySortResult, Item, RenderItemProps, -} from "./infoPanel/common/infoSearch/types"; +} from "../InfoPanel/components/InfoPanelContainer/components/InfoSearch/types"; // eslint-disable-next-line @typescript-eslint/no-explicit-any --- FIXME: disabled temporarily on migrate to TS. const usePrevious = (value: any) => { diff --git a/client/src/components/RightSideBar/components/geneExpression/constants.ts b/client/src/components/RightSideBar/components/GeneExpression/constants.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/constants.ts rename to client/src/components/RightSideBar/components/GeneExpression/constants.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/types.ts b/client/src/components/RightSideBar/components/GeneExpression/types.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/types.ts rename to client/src/components/RightSideBar/components/GeneExpression/types.ts diff --git a/client/src/components/RightSideBar/components/geneExpression/util.ts b/client/src/components/RightSideBar/components/GeneExpression/util.ts similarity index 100% rename from client/src/components/RightSideBar/components/geneExpression/util.ts rename to client/src/components/RightSideBar/components/GeneExpression/util.ts From 9ad86ac8e430684adc57e226415317b6304c3ddd Mon Sep 17 00:00:00 2001 From: kaloster Date: Thu, 19 Sep 2024 20:59:38 +0000 Subject: [PATCH 3/5] cleanup --- .infra/rdev/values.yaml | 2 +- .../{annoDialog.tsx => AnnoDialog/AnnoDialog.tsx} | 4 +--- client/src/components/App/App.tsx | 2 +- .../{labelInput.tsx => LabelInput/LabelInput.tsx} | 2 +- client/src/components/RightSideBar/RightSideBar.tsx | 2 +- .../components/GeneExpression/GeneExpression.tsx | 6 +++--- ...teGenesetDialogueTmp.tsx => CreateGenesetDialogue.tsx} | 6 ++---- .../GeneExpression/components/GeneSet/GeneSet.tsx | 8 +++----- .../EditGenesetNameDialogue/EditGenesetNameDialogue.tsx | 8 +++----- .../GeneSet/components/GeneSetMenus/GenesetMenus.tsx | 6 ++---- .../AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx | 8 +++----- .../InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx | 2 +- .../components/InfoPanel/components/GeneInfo/GeneInfo.tsx | 2 +- .../components/InfoPanelContainer/InfoPanelContainer.tsx | 4 +--- .../GeneExpression/components/QuickGene/QuickGene.tsx | 4 +--- .../RightSidebarWrapper.ts} | 0 .../framework/LayoutSkeleton/LayoutSkeleton.tsx | 6 ++---- .../RightSidebarSkeleton/RightSidebarSkeleton.tsx | 6 ++---- 18 files changed, 29 insertions(+), 49 deletions(-) rename client/src/components/{annoDialog.tsx => AnnoDialog/AnnoDialog.tsx} (98%) rename client/src/components/{labelInput.tsx => LabelInput/LabelInput.tsx} (99%) rename client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/{CreateGenesetDialogueTmp.tsx => CreateGenesetDialogue.tsx} (98%) rename client/src/components/{RightSideBar/style.ts => RightSidebarWrapper/RightSidebarWrapper.ts} (100%) diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml index 5b2215d42..0f5b2aa1a 100644 --- a/.infra/rdev/values.yaml +++ b/.infra/rdev/values.yaml @@ -2,7 +2,7 @@ stack: services: explorer: image: - tag: sha-94cb22a8 + tag: sha-dff58887 replicaCount: 1 env: # env vars common to all deployment stages diff --git a/client/src/components/annoDialog.tsx b/client/src/components/AnnoDialog/AnnoDialog.tsx similarity index 98% rename from client/src/components/annoDialog.tsx rename to client/src/components/AnnoDialog/AnnoDialog.tsx index 76677e9d3..b83ce0c8d 100644 --- a/client/src/components/annoDialog.tsx +++ b/client/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 index dfb4c7aa0..472c66275 100644 --- a/client/src/components/App/App.tsx +++ b/client/src/components/App/App.tsx @@ -11,7 +11,7 @@ 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/LayoutSkeleton"; +import { LayoutSkeleton } from "../framework/LayoutSkeleton/LayoutSkeleton"; import LeftSideBar from "../LeftSidebar/LeftSidebar"; import RightSideBar from "../RightSideBar/RightSideBar"; import Legend from "../Legend/Legend"; diff --git a/client/src/components/labelInput.tsx b/client/src/components/LabelInput/LabelInput.tsx similarity index 99% rename from client/src/components/labelInput.tsx rename to client/src/components/LabelInput/LabelInput.tsx index b7c6b0697..f535ff147 100644 --- a/client/src/components/labelInput.tsx +++ b/client/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/RightSideBar.tsx b/client/src/components/RightSideBar/RightSideBar.tsx index 1402692e6..aa78d33f6 100644 --- a/client/src/components/RightSideBar/RightSideBar.tsx +++ b/client/src/components/RightSideBar/RightSideBar.tsx @@ -2,7 +2,7 @@ import React from "react"; import GeneExpression from "./components/GeneExpression/GeneExpression"; import InfoPanel from "./components/GeneExpression/components/InfoPanel/InfoPanel"; -import { RightSidebarWrapper } from "./style"; +import { RightSidebarWrapper } from "../RightSidebarWrapper/RightSidebarWrapper"; function RightSidebar() { return ( diff --git a/client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx b/client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx index d2bc3ca38..d79f20ca6 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/GeneExpression.tsx @@ -7,9 +7,9 @@ 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/CreateGenesetDialogueTmp"; +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"; diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogueTmp.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogue.tsx similarity index 98% rename from client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogueTmp.tsx rename to client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogue.tsx index 55addf9ef..5326d32a8 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogueTmp.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/CreateGenesetDialogue/CreateGenesetDialogue.tsx @@ -3,7 +3,7 @@ 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 "components/labelInput"; +import { LabelInput } from "components/LabelInput/LabelInput"; import actions from "actions"; import { track } from "analytics"; import { EVENTS } from "analytics/events"; @@ -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/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx index de0c11a26..b636af12c 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/GeneSet.tsx @@ -6,8 +6,8 @@ import { EVENTS } from "analytics/events"; import Truncate from "common/components/Truncate/Truncate"; import Gene from "../Gene/Gene"; import * as globals from "~/globals"; -import GenesetMenus from "./components/GeneSetMenus/GenesetMenus"; -import EditGenesetNameDialogue from "./components/EditGenesetNameDialogue/EditGenesetNameDialogue"; +import { GenesetMenus } from "./components/GeneSetMenus/GenesetMenus"; +import { EditGenesetNameDialogue } from "./components/EditGenesetNameDialogue/EditGenesetNameDialogue"; import { diffexpPopNamePrefix1, diffexpPopNamePrefix2 } from "~/globals"; @@ -15,7 +15,7 @@ import { diffexpPopNamePrefix1, diffexpPopNamePrefix2 } from "~/globals"; 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/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx index bdcc73bdb..5c03b66f5 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/EditGenesetNameDialogue/EditGenesetNameDialogue.tsx @@ -1,7 +1,7 @@ import React from "react"; import { connect } from "react-redux"; -import AnnoDialog from "components/annoDialog"; -import LabelInput from "components/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/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx index 760e92a88..89a2a3d32 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/GenesetMenus.tsx @@ -15,7 +15,7 @@ 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 { 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. @@ -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/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx index 52641e38d..aae2a83db 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/GeneSet/components/GeneSetMenus/components/AddGeneToGenesetDialogue/AddGeneToGenesetDialogue.tsx @@ -1,7 +1,7 @@ import React from "react"; import { connect } from "react-redux"; -import AnnoDialog from "components/annoDialog"; -import LabelInput from "components/labelInput"; +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"; @@ -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/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx index 24b4fdb67..b13ac089c 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/CellTypeInfo/CellTypeInfo.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from "react"; import { connect } from "react-redux"; import { Props, mapStateToProps } from "./types"; -import InfoPanelContainer from "../InfoPanelContainer/InfoPanelContainer"; +import { InfoPanelContainer } from "../InfoPanelContainer/InfoPanelContainer"; import { CELLGUIDE_URL } from "../InfoPanelContainer/constants"; function CellTypeInfo(props: Props) { diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx index 33d0b34e2..db3a97bfc 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/GeneInfo/GeneInfo.tsx @@ -3,7 +3,7 @@ import { connect } from "react-redux"; import { EMPTY_ARRAY } from "common/constants"; import { Props, mapStateToProps } from "./types"; -import InfoPanelContainer from "../InfoPanelContainer/InfoPanelContainer"; +import { InfoPanelContainer } from "../InfoPanelContainer/InfoPanelContainer"; function GeneInfo(props: Props) { const { geneInfo, geneList } = props; diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx index 8b3f2b33a..7b96ec8d9 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/InfoPanel/components/InfoPanelContainer/InfoPanelContainer.tsx @@ -9,7 +9,7 @@ import { ShowInfo } from "./components/ShowInfo/ShowInfo"; import { ExtendedInfoProps } from "./types"; import InfoSearch from "./components/InfoSearch/InfoSearch"; -function InfoPanelContainer(props: ExtendedInfoProps) { +export function InfoPanelContainer(props: ExtendedInfoProps) { const { id, name, @@ -72,5 +72,3 @@ function InfoPanelContainer(props: ExtendedInfoProps) { ); } - -export default InfoPanelContainer; diff --git a/client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx b/client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx index 1e1cacf10..9f824b1af 100644 --- a/client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx +++ b/client/src/components/RightSideBar/components/GeneExpression/components/QuickGene/QuickGene.tsx @@ -28,7 +28,7 @@ const usePrevious = (value: any) => { return ref.current; }; -function QuickGene() { +export function QuickGene() { const dispatch = useDispatch(); const [isExpanded, setIsExpanded] = useState(true); @@ -225,5 +225,3 @@ function QuickGene() { ); } - -export default QuickGene; diff --git a/client/src/components/RightSideBar/style.ts b/client/src/components/RightSidebarWrapper/RightSidebarWrapper.ts similarity index 100% rename from client/src/components/RightSideBar/style.ts rename to client/src/components/RightSidebarWrapper/RightSidebarWrapper.ts diff --git a/client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx b/client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx index 6805330fe..ebb0a4c41 100644 --- a/client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx +++ b/client/src/components/framework/LayoutSkeleton/LayoutSkeleton.tsx @@ -6,13 +6,13 @@ import React from "react"; import Controls from "common/components/Controls/Controls"; import LeftSidebarSkeleton from "components/LeftSidebar/LeftSidebarSkeleton"; import Layout from "../layout"; -import RightSidebarSkeleton from "./components/RightSidebarSkeleton/RightSidebarSkeleton"; +import { RightSidebarSkeleton } from "./components/RightSidebarSkeleton/RightSidebarSkeleton"; /** * Skeleton layout component displayed when in loading state. * @returns Markup displaying skeleton. */ -function LayoutSkeleton(): JSX.Element { +export function LayoutSkeleton(): JSX.Element { return ( @@ -32,5 +32,3 @@ function LayoutSkeleton(): JSX.Element { ); } - -export default LayoutSkeleton; diff --git a/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx b/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx index ea5982e8e..9a82398ce 100644 --- a/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx +++ b/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx @@ -1,13 +1,13 @@ /* Core dependencies */ import { SKELETON } from "@blueprintjs/core/lib/esnext/common/classes"; import React from "react"; -import { RightSidebarWrapper } from "components/RightSideBar/style"; +import { RightSidebarWrapper } from "components/RightSidebarWrapper/RightSidebarWrapper"; /** * Skeleton of right side bar, to be displayed during data load. * @returns Markup displaying right side bar skeleton. */ -function RightSidebarSkeleton(): JSX.Element { +export function RightSidebarSkeleton(): JSX.Element { return ( {/* Quick gene search */} @@ -45,5 +45,3 @@ function RightSidebarSkeleton(): JSX.Element { ); } - -export default RightSidebarSkeleton; From 70b1203dee8477c6cb0ce12582aa90d38a7df22c Mon Sep 17 00:00:00 2001 From: kaloster Date: Fri, 20 Sep 2024 09:54:22 -0400 Subject: [PATCH 4/5] update RightSidebarWrapper --- client/src/components/RightSideBar/RightSideBar.tsx | 2 +- .../RightSidebarWrapper.ts => RightSideBar/style.ts} | 0 .../components/RightSidebarSkeleton/RightSidebarSkeleton.tsx | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename client/src/components/{RightSidebarWrapper/RightSidebarWrapper.ts => RightSideBar/style.ts} (100%) diff --git a/client/src/components/RightSideBar/RightSideBar.tsx b/client/src/components/RightSideBar/RightSideBar.tsx index aa78d33f6..1402692e6 100644 --- a/client/src/components/RightSideBar/RightSideBar.tsx +++ b/client/src/components/RightSideBar/RightSideBar.tsx @@ -2,7 +2,7 @@ import React from "react"; import GeneExpression from "./components/GeneExpression/GeneExpression"; import InfoPanel from "./components/GeneExpression/components/InfoPanel/InfoPanel"; -import { RightSidebarWrapper } from "../RightSidebarWrapper/RightSidebarWrapper"; +import { RightSidebarWrapper } from "./style"; function RightSidebar() { return ( diff --git a/client/src/components/RightSidebarWrapper/RightSidebarWrapper.ts b/client/src/components/RightSideBar/style.ts similarity index 100% rename from client/src/components/RightSidebarWrapper/RightSidebarWrapper.ts rename to client/src/components/RightSideBar/style.ts diff --git a/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx b/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx index 9a82398ce..46e68f823 100644 --- a/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx +++ b/client/src/components/framework/LayoutSkeleton/components/RightSidebarSkeleton/RightSidebarSkeleton.tsx @@ -1,7 +1,7 @@ /* Core dependencies */ import { SKELETON } from "@blueprintjs/core/lib/esnext/common/classes"; import React from "react"; -import { RightSidebarWrapper } from "components/RightSidebarWrapper/RightSidebarWrapper"; +import { RightSidebarWrapper } from "components/RightSideBar/style"; /** * Skeleton of right side bar, to be displayed during data load. From a42488d98045278c8501b6fb4fad2ac2d621b297 Mon Sep 17 00:00:00 2001 From: kaloster Date: Fri, 20 Sep 2024 15:20:45 +0000 Subject: [PATCH 5/5] chore: Updated [rdev] values.yaml image tags to sha-1e81e0f8 --- .infra/rdev/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.infra/rdev/values.yaml b/.infra/rdev/values.yaml index 0f5b2aa1a..457e1b262 100644 --- a/.infra/rdev/values.yaml +++ b/.infra/rdev/values.yaml @@ -2,7 +2,7 @@ stack: services: explorer: image: - tag: sha-dff58887 + tag: sha-1e81e0f8 replicaCount: 1 env: # env vars common to all deployment stages