From 8d69ebf3f2d16f21c88cf368eb6d84e88ef9d0bf Mon Sep 17 00:00:00 2001 From: Jyothish NT Date: Tue, 20 Oct 2020 16:22:57 +0100 Subject: [PATCH] Initial replacement of selected-species --- .../app/browser/browser-app-bar/BrowserAppBar.tsx | 4 ++-- .../containers/app-bar/CustomDownloadAppBar.tsx | 4 ++-- .../entity-viewer-app-bar/EntityViewerAppBar.tsx | 4 ++-- .../SpeciesSelectorAppBar.tsx | 13 +++++++++---- .../species-title-area/SpeciesTitleArea.tsx | 2 +- .../homepage-species-bar/HomepageSpeciesBar.tsx | 9 +++++++-- .../FocusableSelectedSpecies.scss | 0 .../FocusableSelectedSpecies.tsx | 0 .../SelectedSpeciesDisplayName.tsx | 0 .../SimpleSelectedSpecies.scss | 0 .../SimpleSelectedSpecies.tsx | 0 .../index.ts | 3 ++- .../selected-species-common.scss | 0 .../selectedSpeciesHelpers.ts | 0 .../SelectedSpecies.scss | 0 .../SelectedSpecies.test.tsx | 0 .../SelectedSpecies.tsx | 0 .../SelectedSpeciesContent.tsx | 0 .../src/shared/components/selected-species/index.ts | 3 +-- .../MultiLineSpeciesWrapper.tsx | 4 ++-- .../SingleLineSpeciesWrapper.tsx | 6 +++--- .../speciesTabsWrapperHelpers.ts | 4 ++-- .../selected-species/SelectedSpecies.stories.tsx | 2 +- 23 files changed, 34 insertions(+), 24 deletions(-) rename src/ensembl/src/shared/components/{selected-species => old-selected-species}/FocusableSelectedSpecies.scss (100%) rename src/ensembl/src/shared/components/{selected-species => old-selected-species}/FocusableSelectedSpecies.tsx (100%) rename src/ensembl/src/shared/components/{selected-species => old-selected-species}/SelectedSpeciesDisplayName.tsx (100%) rename src/ensembl/src/shared/components/{selected-species => old-selected-species}/SimpleSelectedSpecies.scss (100%) rename src/ensembl/src/shared/components/{selected-species => old-selected-species}/SimpleSelectedSpecies.tsx (100%) rename src/ensembl/src/shared/components/{new-selected-species => old-selected-species}/index.ts (80%) rename src/ensembl/src/shared/components/{new-selected-species => old-selected-species}/selected-species-common.scss (100%) rename src/ensembl/src/shared/components/{new-selected-species => old-selected-species}/selectedSpeciesHelpers.ts (100%) rename src/ensembl/src/shared/components/{new-selected-species => selected-species}/SelectedSpecies.scss (100%) rename src/ensembl/src/shared/components/{new-selected-species => selected-species}/SelectedSpecies.test.tsx (100%) rename src/ensembl/src/shared/components/{new-selected-species => selected-species}/SelectedSpecies.tsx (100%) rename src/ensembl/src/shared/components/{new-selected-species => selected-species}/SelectedSpeciesContent.tsx (100%) diff --git a/src/ensembl/src/content/app/browser/browser-app-bar/BrowserAppBar.tsx b/src/ensembl/src/content/app/browser/browser-app-bar/BrowserAppBar.tsx index 53dadf8c8..37745daea 100644 --- a/src/ensembl/src/content/app/browser/browser-app-bar/BrowserAppBar.tsx +++ b/src/ensembl/src/content/app/browser/browser-app-bar/BrowserAppBar.tsx @@ -28,7 +28,7 @@ import { getEnabledCommittedSpecies } from 'src/content/app/species-selector/sta import AppBar, { HelpAndDocumentation } from 'src/shared/components/app-bar/AppBar'; -import { FocusableSelectedSpecies } from 'src/shared/components/selected-species'; +import { SelectedSpecies } from 'src/shared/components/selected-species'; import SpeciesTabsWrapper from 'src/shared/components/species-tabs-wrapper/SpeciesTabsWrapper'; import { RootState } from 'src/store'; @@ -43,7 +43,7 @@ type BrowserAppBarProps = { const BrowserAppBar = (props: BrowserAppBarProps) => { const speciesTabs = useMemo(() => { return props.species.map((species, index) => ( - { const speciesTabs = props.species.map((species, index) => ( - { const speciesTabs = useMemo(() => { return props.species.map((species, index) => ( - void; onSpeciesDelete: (genomeId: string) => void; }; @@ -65,6 +64,10 @@ export const SpeciesSelectorAppBar = (props: Props) => { ); }; +const showSpeciesHomepage = () => { + return; +}; + const SelectedSpeciesList = (props: Props) => { const shouldLinkToGenomeBrowser = props.selectedSpecies.filter(({ isEnabled }) => isEnabled).length > 0; @@ -73,8 +76,9 @@ const SelectedSpeciesList = (props: Props) => { )); @@ -90,6 +94,7 @@ const mapStateToProps = (state: RootState) => ({ }); const mapDispatchToProps = { + showSpeciesHomepage: showSpeciesHomepage, toggleSpeciesUse: toggleSpeciesUseAndSave, onSpeciesDelete: deleteSpeciesAndSave }; diff --git a/src/ensembl/src/content/app/species/components/species-title-area/SpeciesTitleArea.tsx b/src/ensembl/src/content/app/species/components/species-title-area/SpeciesTitleArea.tsx index 0cb2ac218..8b62dfa6b 100644 --- a/src/ensembl/src/content/app/species/components/species-title-area/SpeciesTitleArea.tsx +++ b/src/ensembl/src/content/app/species/components/species-title-area/SpeciesTitleArea.tsx @@ -18,7 +18,7 @@ import React, { useEffect } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import classNames from 'classnames'; -import { getDisplayName } from 'src/shared/components/new-selected-species/selectedSpeciesHelpers'; +import { getDisplayName } from 'src/shared/components/selected-species/selectedSpeciesHelpers'; import { isSidebarOpen as getSidebarStatus } from 'src/content/app/species/state/sidebar/speciesSidebarSelectors'; import { getCommittedSpeciesById } from 'src/content/app/species-selector/state/speciesSelectorSelectors'; diff --git a/src/ensembl/src/content/home/components/homepage-species-bar/HomepageSpeciesBar.tsx b/src/ensembl/src/content/home/components/homepage-species-bar/HomepageSpeciesBar.tsx index 3e14521dd..07ff008c7 100644 --- a/src/ensembl/src/content/home/components/homepage-species-bar/HomepageSpeciesBar.tsx +++ b/src/ensembl/src/content/home/components/homepage-species-bar/HomepageSpeciesBar.tsx @@ -23,12 +23,13 @@ import { getEnabledCommittedSpecies } from 'src/content/app/species-selector/sta import AppBar from 'src/shared/components/app-bar/AppBar'; import SpeciesTabsWrapper from 'src/shared/components/species-tabs-wrapper/SpeciesTabsWrapper'; -import { SimpleSelectedSpecies } from 'src/shared/components/selected-species'; +import { SelectedSpecies } from 'src/shared/components/selected-species'; import { RootState } from 'src/store'; import { CommittedItem } from 'src/content/app/species-selector/types/species-search'; import styles from './HomepageSpeciesBar.scss'; +import { handleSelectedSpecies } from 'src/content/app/species-selector/state/speciesSelectorActions'; type Props = { species: CommittedItem[]; @@ -52,7 +53,11 @@ const HomepageSpeciesBar = (props: Props) => { ); } else { const speciesItems = props.species.map((species, index) => ( - + )); barContent = ; } diff --git a/src/ensembl/src/shared/components/selected-species/FocusableSelectedSpecies.scss b/src/ensembl/src/shared/components/old-selected-species/FocusableSelectedSpecies.scss similarity index 100% rename from src/ensembl/src/shared/components/selected-species/FocusableSelectedSpecies.scss rename to src/ensembl/src/shared/components/old-selected-species/FocusableSelectedSpecies.scss diff --git a/src/ensembl/src/shared/components/selected-species/FocusableSelectedSpecies.tsx b/src/ensembl/src/shared/components/old-selected-species/FocusableSelectedSpecies.tsx similarity index 100% rename from src/ensembl/src/shared/components/selected-species/FocusableSelectedSpecies.tsx rename to src/ensembl/src/shared/components/old-selected-species/FocusableSelectedSpecies.tsx diff --git a/src/ensembl/src/shared/components/selected-species/SelectedSpeciesDisplayName.tsx b/src/ensembl/src/shared/components/old-selected-species/SelectedSpeciesDisplayName.tsx similarity index 100% rename from src/ensembl/src/shared/components/selected-species/SelectedSpeciesDisplayName.tsx rename to src/ensembl/src/shared/components/old-selected-species/SelectedSpeciesDisplayName.tsx diff --git a/src/ensembl/src/shared/components/selected-species/SimpleSelectedSpecies.scss b/src/ensembl/src/shared/components/old-selected-species/SimpleSelectedSpecies.scss similarity index 100% rename from src/ensembl/src/shared/components/selected-species/SimpleSelectedSpecies.scss rename to src/ensembl/src/shared/components/old-selected-species/SimpleSelectedSpecies.scss diff --git a/src/ensembl/src/shared/components/selected-species/SimpleSelectedSpecies.tsx b/src/ensembl/src/shared/components/old-selected-species/SimpleSelectedSpecies.tsx similarity index 100% rename from src/ensembl/src/shared/components/selected-species/SimpleSelectedSpecies.tsx rename to src/ensembl/src/shared/components/old-selected-species/SimpleSelectedSpecies.tsx diff --git a/src/ensembl/src/shared/components/new-selected-species/index.ts b/src/ensembl/src/shared/components/old-selected-species/index.ts similarity index 80% rename from src/ensembl/src/shared/components/new-selected-species/index.ts rename to src/ensembl/src/shared/components/old-selected-species/index.ts index 839f6392d..54dbebcdc 100644 --- a/src/ensembl/src/shared/components/new-selected-species/index.ts +++ b/src/ensembl/src/shared/components/old-selected-species/index.ts @@ -14,4 +14,5 @@ * limitations under the License. */ -export { default as SelectedSpecies } from './SelectedSpecies'; +export { default as SimpleSelectedSpecies } from './SimpleSelectedSpecies'; +export { default as FocusableSelectedSpecies } from './FocusableSelectedSpecies'; diff --git a/src/ensembl/src/shared/components/new-selected-species/selected-species-common.scss b/src/ensembl/src/shared/components/old-selected-species/selected-species-common.scss similarity index 100% rename from src/ensembl/src/shared/components/new-selected-species/selected-species-common.scss rename to src/ensembl/src/shared/components/old-selected-species/selected-species-common.scss diff --git a/src/ensembl/src/shared/components/new-selected-species/selectedSpeciesHelpers.ts b/src/ensembl/src/shared/components/old-selected-species/selectedSpeciesHelpers.ts similarity index 100% rename from src/ensembl/src/shared/components/new-selected-species/selectedSpeciesHelpers.ts rename to src/ensembl/src/shared/components/old-selected-species/selectedSpeciesHelpers.ts diff --git a/src/ensembl/src/shared/components/new-selected-species/SelectedSpecies.scss b/src/ensembl/src/shared/components/selected-species/SelectedSpecies.scss similarity index 100% rename from src/ensembl/src/shared/components/new-selected-species/SelectedSpecies.scss rename to src/ensembl/src/shared/components/selected-species/SelectedSpecies.scss diff --git a/src/ensembl/src/shared/components/new-selected-species/SelectedSpecies.test.tsx b/src/ensembl/src/shared/components/selected-species/SelectedSpecies.test.tsx similarity index 100% rename from src/ensembl/src/shared/components/new-selected-species/SelectedSpecies.test.tsx rename to src/ensembl/src/shared/components/selected-species/SelectedSpecies.test.tsx diff --git a/src/ensembl/src/shared/components/new-selected-species/SelectedSpecies.tsx b/src/ensembl/src/shared/components/selected-species/SelectedSpecies.tsx similarity index 100% rename from src/ensembl/src/shared/components/new-selected-species/SelectedSpecies.tsx rename to src/ensembl/src/shared/components/selected-species/SelectedSpecies.tsx diff --git a/src/ensembl/src/shared/components/new-selected-species/SelectedSpeciesContent.tsx b/src/ensembl/src/shared/components/selected-species/SelectedSpeciesContent.tsx similarity index 100% rename from src/ensembl/src/shared/components/new-selected-species/SelectedSpeciesContent.tsx rename to src/ensembl/src/shared/components/selected-species/SelectedSpeciesContent.tsx diff --git a/src/ensembl/src/shared/components/selected-species/index.ts b/src/ensembl/src/shared/components/selected-species/index.ts index 54dbebcdc..839f6392d 100644 --- a/src/ensembl/src/shared/components/selected-species/index.ts +++ b/src/ensembl/src/shared/components/selected-species/index.ts @@ -14,5 +14,4 @@ * limitations under the License. */ -export { default as SimpleSelectedSpecies } from './SimpleSelectedSpecies'; -export { default as FocusableSelectedSpecies } from './FocusableSelectedSpecies'; +export { default as SelectedSpecies } from './SelectedSpecies'; diff --git a/src/ensembl/src/shared/components/species-tabs-wrapper/MultiLineSpeciesWrapper.tsx b/src/ensembl/src/shared/components/species-tabs-wrapper/MultiLineSpeciesWrapper.tsx index 703f700a6..c5bfc7c8f 100644 --- a/src/ensembl/src/shared/components/species-tabs-wrapper/MultiLineSpeciesWrapper.tsx +++ b/src/ensembl/src/shared/components/species-tabs-wrapper/MultiLineSpeciesWrapper.tsx @@ -20,11 +20,11 @@ import { nonBreakingSpace } from 'src/shared/constants/strings'; import styles from './MultiLineSpeciesWrapper.scss'; -import { Props as SimpleSelectedSpeciesProps } from 'src/shared/components/selected-species/SimpleSelectedSpecies'; +import { Props as SelectedSpeciesProps } from 'src/shared/components/selected-species/SelectedSpecies'; import { Props as SpeciesSelectorSelectedSpeciesProps } from 'src/content/app/species-selector/components/selected-species/SelectedSpecies'; type MultiLineSelectedSpeciesProps = - | SimpleSelectedSpeciesProps + | SelectedSpeciesProps | SpeciesSelectorSelectedSpeciesProps; export type Props = { diff --git a/src/ensembl/src/shared/components/species-tabs-wrapper/SingleLineSpeciesWrapper.tsx b/src/ensembl/src/shared/components/species-tabs-wrapper/SingleLineSpeciesWrapper.tsx index 95d0ee2e1..96f723306 100644 --- a/src/ensembl/src/shared/components/species-tabs-wrapper/SingleLineSpeciesWrapper.tsx +++ b/src/ensembl/src/shared/components/species-tabs-wrapper/SingleLineSpeciesWrapper.tsx @@ -22,11 +22,11 @@ import { getSpeciesItemWidths } from './speciesTabsWrapperHelpers'; import styles from './SingleLineSpeciesWrapper.scss'; -import { Props as FocusableSelectedSpeciesProps } from 'src/shared/components/selected-species/FocusableSelectedSpecies'; +import { Props as SelectedSpeciesProps } from 'src/shared/components/selected-species/SelectedSpecies'; export type Props = { isWrappable: false; - speciesTabs: ReactElement[]; + speciesTabs: ReactElement[]; link?: React.ReactNode | null; }; @@ -36,7 +36,7 @@ const animationCalculator = ({ containerRef, containerWidth }: { - items: FocusableSelectedSpeciesProps[]; + items: SelectedSpeciesProps[]; hoveredItemIndex: number | null; containerRef: React.RefObject; containerWidth: number; diff --git a/src/ensembl/src/shared/components/species-tabs-wrapper/speciesTabsWrapperHelpers.ts b/src/ensembl/src/shared/components/species-tabs-wrapper/speciesTabsWrapperHelpers.ts index 1086d17fc..42c5defb7 100644 --- a/src/ensembl/src/shared/components/species-tabs-wrapper/speciesTabsWrapperHelpers.ts +++ b/src/ensembl/src/shared/components/species-tabs-wrapper/speciesTabsWrapperHelpers.ts @@ -16,7 +16,7 @@ import { getFullSpeciesItemWidth } from 'src/shared/components/selected-species/selectedSpeciesHelpers'; -import { Props as FocusableSelectedSpeciesProps } from 'src/shared/components/selected-species/FocusableSelectedSpecies'; +import { Props as SelectedSpeciesProps } from 'src/shared/components/selected-species/SelectedSpecies'; const SPACE_BETWEEN_SPECIES = 7; @@ -24,7 +24,7 @@ export const getSpeciesItemWidths = ({ items, containerWidth }: { - items: Array; + items: Array; containerWidth: number; }) => { const naturalItemWidths = items.map((item) => diff --git a/src/ensembl/stories/shared-components/selected-species/SelectedSpecies.stories.tsx b/src/ensembl/stories/shared-components/selected-species/SelectedSpecies.stories.tsx index 64cda076a..f13533885 100644 --- a/src/ensembl/stories/shared-components/selected-species/SelectedSpecies.stories.tsx +++ b/src/ensembl/stories/shared-components/selected-species/SelectedSpecies.stories.tsx @@ -16,7 +16,7 @@ import React from 'react'; -import SelectedSpecies from 'src/shared/components/new-selected-species/SelectedSpecies'; +import SelectedSpecies from 'src/shared/components/selected-species/SelectedSpecies'; import speciesData from '../species-tabs-wrapper/speciesData'; -- GitLab