Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions @types/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ export interface DatasetAsset {
fileType: CXG_DATASET_FILE_TYPE;
}

export type DatasetQueryOrgan = string;

export interface IntegratedAtlas {
analysisPortals: AnalysisPortal[];
assay: string[];
Expand All @@ -128,25 +126,22 @@ export interface Network {
BICCNPublications?: BICCNPublication[];
contact: Contact;
coordinators: Coordinator[];
datasetQueryOrgans: DatasetQueryOrgan[];
datasetURL?: string;
key: NetworkKey;
name: string;
path: string;
}

export type NetworkParam = {
network: Network;
projectsResponses: ProjectsResponse[];
};

export interface AtlasContext extends NetworkContext {
atlas: Atlas;
projectsResponses: ProjectsResponse[];
}

export interface NetworkContext {
network: Network;
projectsResponses: ProjectsResponse[];
}

export interface AtlasModule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ import { TABLE_OPTIONS } from "./constants";

export const MainColumn = (): JSX.Element => {
const { browserURL } = useSiteConfig();
const { network, projectsResponses } = useAtlas();
const { projectsResponses } = useAtlas();
return (
<BackPageContentSingleColumn>
{/* Atlas Datasets Description */}
<FluidPaper>
<MDXSection>
<AtlasDatasetsDescription
networkName={network.name.toLowerCase()}
datasetURL={network.datasetURL}
/>
<AtlasDatasetsDescription />
</MDXSection>
</FluidPaper>
{/* Atlas Datasets */}
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,10 @@ import {
PRIORITY,
StatusIcon,
} from "@databiosphere/findable-ui/lib/components/common/StatusIcon/statusIcon";
import { Link } from "@databiosphere/findable-ui/lib/components/Links/components/Link/link";
import { Typography } from "@mui/material";
import { Network } from "../../../../../../../../../@types/network";
import { NETWORKS_ROUTE } from "../../../../../../../../../constants/routes";
import { getBioNetworkName } from "../../../../../../../../../viewModelBuilders/viewModelBuilders";
import { BiotechIcon } from "../../../../../../../../common/CustomIcon/components/BiotechIcon/biotechIcon";
import { Section, SectionContent } from "./networkAtlasesEmpty.styles";
import { TYPOGRAPHY_PROPS } from "@databiosphere/findable-ui/lib/styles/common/mui/typography";

export interface NetworkAtlasesEmptyProps {
network: Network;
Expand All @@ -20,7 +16,7 @@ export interface NetworkAtlasesEmptyProps {
export const NetworkAtlasesEmpty = ({
network,
}: NetworkAtlasesEmptyProps): JSX.Element => {
const { name, path: networkPath } = network;
const { name } = network;
const bioNetworkName = getBioNetworkName(name);
return (
<FluidPaper>
Expand All @@ -30,14 +26,6 @@ export const NetworkAtlasesEmpty = ({
<SectionTitle
title={`${bioNetworkName} Network atlases are still under development.`}
/>
<Typography variant={TYPOGRAPHY_PROPS.VARIANT.BODY_400_2_LINES}>
Meanwhile, individual{" "}
<Link
label={`HCA ${bioNetworkName} Datasets`}
url={`${NETWORKS_ROUTE}/${networkPath}/datasets`}
/>{" "}
are available as potential source datasets for integrated atlases.
</Typography>
</SectionContent>
</Section>
</FluidPaper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ import { useRouter } from "next/router";
import { Network } from "../../../../../../@types/network";
import {
NETWORKS_PATTERN,
NETWORK_DATASETS_PATTERN,
NETWORK_PUBLICATIONS_PATTERN,
} from "../../../../../../constants/routes";
import { useNetwork } from "../../../../../../contexts/networkContext";
import { getBioNetworkName } from "../../../../../../viewModelBuilders/viewModelBuilders";

export const Tabs = (): JSX.Element => {
const router = useRouter();
Expand Down Expand Up @@ -42,18 +40,12 @@ export const Tabs = (): JSX.Element => {
* @returns network tabs.
*/
function buildTabs(network: Network): Tab[] {
const { atlases, BICCNPublications, name } = network;
const { BICCNPublications } = network;
const tabs = [];
tabs.push({
label: "Network Overview",
value: NETWORKS_PATTERN,
});
if (atlases.length === 0) {
tabs.push({
label: `HCA ${getBioNetworkName(name)} Datasets`,
value: NETWORK_DATASETS_PATTERN,
});
}
if (BICCNPublications && BICCNPublications.length > 0) {
tabs.push({
icon: (
Expand Down
Loading