-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add an initial, skeleton page for Variant Entity Viewer, with appropr…
…iate routing (#1073) - Added a new, so far mostly empty, view for the Entity Viewer that will evolve into a view for variants - Updated server-side fetch code for EntityViewer pages — split it into gene data fetching vs variant data fetching - Picking an allele (first alternative allele) and adding it as a url parameter
- Loading branch information
Showing
12 changed files
with
804 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /** | ||
| * See the NOTICE file distributed with this work for additional information | ||
| * regarding copyright ownership. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { useNavigate } from 'react-router-dom'; | ||
|
|
||
| import * as urlFor from 'src/shared/helpers/urlHelper'; | ||
|
|
||
| import { useAppSelector, useAppDispatch } from 'src/store'; | ||
| import useEntityViewerIds from 'src/content/app/entity-viewer/hooks/useEntityViewerIds'; | ||
| import useEntityViewerUrlCheck from 'src/content/app/entity-viewer/hooks/useEntityViewerUrlChecks'; | ||
|
|
||
| import { getBreakpointWidth } from 'src/global/globalSelectors'; | ||
| import { getGenomeById } from 'src/shared/state/genome/genomeSelectors'; | ||
| import { | ||
| isEntityViewerSidebarOpen, | ||
| getEntityViewerSidebarModalView | ||
| } from 'src/content/app/entity-viewer/state/sidebar/entityViewerSidebarSelectors'; | ||
|
|
||
| import { deleteActiveEntityIdAndSave } from 'src/content/app/entity-viewer/state/general/entityViewerGeneralSlice'; | ||
| import { toggleSidebar } from 'src/content/app/entity-viewer/state/sidebar/entityViewerSidebarSlice'; | ||
|
|
||
| import { StandardAppLayout } from 'src/shared/components/layout'; | ||
| import EntityViewerSidebarToolstrip from './shared/components/entity-viewer-sidebar/entity-viewer-sidebar-toolstrip/EntityViewerSidebarToolstrip'; | ||
| import EntityViewerSidebarModal from 'src/content/app/entity-viewer/shared/components/entity-viewer-sidebar/entity-viewer-sidebar-modal/EntityViewerSidebarModal'; | ||
| import EntityViewerTopbar from './shared/components/entity-viewer-topbar/EntityViewerTopbar'; | ||
| import GeneView from './gene-view/GeneView'; | ||
| import GeneViewSidebar from './gene-view/components/gene-view-sidebar/GeneViewSideBar'; | ||
| import GeneViewSidebarTabs from './gene-view/components/gene-view-sidebar-tabs/GeneViewSidebarTabs'; | ||
| import MissingFeatureError from 'src/shared/components/error-screen/url-errors/MissingFeatureError'; | ||
|
|
||
| const EntityViewerForGene = () => { | ||
| const { activeGenomeId, activeEntityId } = useEntityViewerIds(); | ||
| const { | ||
| genomeIdInUrl, | ||
| entityIdInUrl, | ||
| isFetching: isVerifyingUrl, | ||
| isMissingEntity | ||
| } = useEntityViewerUrlCheck(); | ||
| const genome = useAppSelector((state) => | ||
| getGenomeById(state, activeGenomeId ?? '') | ||
| ); | ||
| const isSidebarOpen = useAppSelector(isEntityViewerSidebarOpen); | ||
| const isSidebarModalOpen = Boolean( | ||
| useAppSelector(getEntityViewerSidebarModalView) | ||
| ); | ||
| const viewportWidth = useAppSelector(getBreakpointWidth); | ||
| const dispatch = useAppDispatch(); | ||
| const navigate = useNavigate(); | ||
|
|
||
| const openEntityViewerInterstitial = () => { | ||
| dispatch(deleteActiveEntityIdAndSave()); | ||
| navigate(urlFor.entityViewer({ genomeId: genomeIdInUrl })); | ||
| }; | ||
|
|
||
| if (!activeGenomeId || !activeEntityId || isVerifyingUrl) { | ||
| return null; | ||
| } | ||
|
|
||
| if (isMissingEntity) { | ||
| return ( | ||
| <MissingFeatureError | ||
| featureId={entityIdInUrl as string} | ||
| genome={genome} | ||
| showTopBar={true} | ||
| onContinue={openEntityViewerInterstitial} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <StandardAppLayout | ||
| mainContent={<GeneView />} | ||
| topbarContent={<EntityViewerTopbar />} | ||
| sidebarContent={ | ||
| <SidebarContent isSidebarModalOpen={isSidebarModalOpen} /> | ||
| } | ||
| sidebarNavigation={<GeneViewSidebarTabs />} | ||
| sidebarToolstripContent={<EntityViewerSidebarToolstrip />} | ||
| isSidebarOpen={isSidebarOpen} | ||
| onSidebarToggle={() => dispatch(toggleSidebar())} | ||
| isDrawerOpen={false} | ||
| viewportWidth={viewportWidth} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| const SidebarContent = (props: { isSidebarModalOpen: boolean }) => { | ||
| return props.isSidebarModalOpen ? ( | ||
| <EntityViewerSidebarModal /> | ||
| ) : ( | ||
| <GeneViewSidebar /> | ||
| ); | ||
| }; | ||
|
|
||
| export default EntityViewerForGene; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /** | ||
| * See the NOTICE file distributed with this work for additional information | ||
| * regarding copyright ownership. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
|
|
||
| import { useAppSelector, useAppDispatch } from 'src/store'; | ||
|
|
||
| import { getBreakpointWidth } from 'src/global/globalSelectors'; | ||
| import { | ||
| isEntityViewerSidebarOpen, | ||
| getEntityViewerSidebarModalView | ||
| } from 'src/content/app/entity-viewer/state/sidebar/entityViewerSidebarSelectors'; | ||
|
|
||
| import { toggleSidebar } from 'src/content/app/entity-viewer/state/sidebar/entityViewerSidebarSlice'; | ||
|
|
||
| import { StandardAppLayout } from 'src/shared/components/layout'; | ||
| import EntityViewerSidebarToolstrip from './shared/components/entity-viewer-sidebar/entity-viewer-sidebar-toolstrip/EntityViewerSidebarToolstrip'; | ||
| import EntityViewerSidebarModal from 'src/content/app/entity-viewer/shared/components/entity-viewer-sidebar/entity-viewer-sidebar-modal/EntityViewerSidebarModal'; | ||
| import VariantView from './variant-view/VariantView'; | ||
|
|
||
| const EntityViewerForVariant = () => { | ||
| const isSidebarOpen = useAppSelector(isEntityViewerSidebarOpen); | ||
| const isSidebarModalOpen = Boolean( | ||
| useAppSelector(getEntityViewerSidebarModalView) | ||
| ); | ||
|
|
||
| const viewportWidth = useAppSelector(getBreakpointWidth); | ||
| const dispatch = useAppDispatch(); | ||
|
|
||
| return ( | ||
| <StandardAppLayout | ||
| mainContent={<VariantView />} | ||
| topbarContent={<div>Variant summary for top bar goes here</div>} | ||
| sidebarContent={ | ||
| <SidebarContent isSidebarModalOpen={isSidebarModalOpen} /> | ||
| } | ||
| sidebarNavigation={null} | ||
| sidebarToolstripContent={<EntityViewerSidebarToolstrip />} | ||
| isSidebarOpen={isSidebarOpen} | ||
| onSidebarToggle={() => dispatch(toggleSidebar())} | ||
| isDrawerOpen={false} | ||
| viewportWidth={viewportWidth} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| const SidebarContent = (props: { isSidebarModalOpen: boolean }) => { | ||
| return props.isSidebarModalOpen ? ( | ||
| <EntityViewerSidebarModal /> | ||
| ) : ( | ||
| <div>Variant information for sidebar goes here</div> | ||
| ); | ||
| }; | ||
|
|
||
| export default EntityViewerForVariant; |
Oops, something went wrong.