Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: build data from ncbi and add organisms with assembly lists (#208) #209

Merged
merged 30 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e890443
revert: "correcting spelling of VEuPathDB (#202)"
hunterckx Jan 15, 2025
73ed726
feat: update genome list to use data from ncbi (#177)
hunterckx Nov 16, 2024
1f06c62
feat: restore gene model url (#177)
hunterckx Nov 17, 2024
1fa8373
feat: relabel "organisms" to "genomes" (#177)
hunterckx Nov 17, 2024
d2695a1
feat: rename "organism" to "taxon" (#177)
hunterckx Nov 17, 2024
e43026f
feat: add tags to genome list (#177)
hunterckx Nov 18, 2024
20fba07
feat: add organism list (#177)
hunterckx Nov 19, 2024
fed6a79
fix: make `isRef` a string to avoid error when searching filters (#177)
hunterckx Dec 5, 2024
42ff576
feat: fix build from ncbi and report on accession matches (#177)
hunterckx Dec 5, 2024
065c841
feat: build catalog (#177)
hunterckx Dec 5, 2024
f29bad9
feat: match only `accession` with both `genBank` and `refSeq` (#177)
hunterckx Dec 6, 2024
b749959
fix: "is ref" filter labels (#177)
hunterckx Dec 6, 2024
9da9021
chore: build catalog (#177)
hunterckx Dec 11, 2024
9aa5874
feat: make genome taxa the same as organism taxa and add strain field…
hunterckx Dec 12, 2024
625a365
feat: link to filtered genomes from organism list (#177)
hunterckx Dec 12, 2024
d7935a9
feat: add strain to genomes list (#177)
hunterckx Dec 12, 2024
9c7338a
feat: hardcode organism assembly count as 1 (#177)
hunterckx Dec 12, 2024
d4a8841
fix: account for pagination when getting genomes (#177)
hunterckx Dec 12, 2024
62d7edb
feat: add underline to genome links in organisms list (#177)
hunterckx Dec 12, 2024
b1226dd
content: re-apply "correcting spelling of VEuPathDB (#202)"
d-callan Jan 6, 2025
fcf3575
feat: remove links to genomes list (#208)
hunterckx Jan 15, 2025
ff061a1
feat: add genomes to organism model (#208)
hunterckx Jan 15, 2025
dbbf8c1
feat: add basic organism detail page with genome list (#208)
hunterckx Jan 15, 2025
68d70f7
feat: make organism genome list full-width and without row number (#208)
hunterckx Jan 16, 2025
dc24f63
feat: remove detail page back button (#208)
hunterckx Jan 16, 2025
ee9547d
feat: remove genomes to assemblies in interface (#208)
hunterckx Jan 16, 2025
977522c
feat: restore assemblies navigation link (#208)
hunterckx Jan 16, 2025
0b3b8d6
feat: adjust columns for organisms and assemblies (#208)
hunterckx Jan 16, 2025
e52fc0c
feat: remove organisms warning (#208)
hunterckx Jan 16, 2025
f1321d5
feat: remove styled link component as it appears to now be unnecessar…
hunterckx Jan 16, 2025
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
34 changes: 24 additions & 10 deletions app/apis/catalog/brc-analytics-catalog/common/entities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,31 @@ export enum ANALYSIS_METHOD {
export type BRCCatalog = BRCDataCatalogGenome;

export interface BRCDataCatalogGenome {
chromosomes: number;
contigs: number;
geneModelUrl: string;
genomeVersionAssemblyId: string;
accession: string;
annotationStatus: string | null;
chromosomes: number | null;
coverage: string | null;
gcPercent: number;
geneModelUrl: string | null;
isRef: string;
length: number;
level: string;
ncbiTaxonomyId: string;
organism: string;
species: string;
strain: string;
supercontigs: number;
ucscBrowserUrl: string;
vEuPathDBProject: string;
scaffoldCount: number;
scaffoldL50: number;
scaffoldN50: number;
strain: string | null;
tags: string[];
taxon: string;
ucscBrowserUrl: string | null;
}

export interface BRCDataCatalogOrganism {
assemblyCount: number;
genomes: BRCDataCatalogGenome[];
ncbiTaxonomyId: string;
tags: string[];
taxon: string;
}

export interface EntitiesResponse<R> {
Expand Down
10 changes: 7 additions & 3 deletions app/apis/catalog/brc-analytics-catalog/common/utils.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import { BRCDataCatalogGenome } from "./entities";
import { BRCDataCatalogGenome, BRCDataCatalogOrganism } from "./entities";

export function getGenomeId(genome: BRCDataCatalogGenome): string {
return sanitizeEntityId(genome.genomeVersionAssemblyId);
return sanitizeEntityId(genome.accession);
}

export function getGenomeTitle(genome?: BRCDataCatalogGenome): string {
if (!genome) return "";
return `${genome.species} - ${genome.strain}`;
return `${genome.taxon}`;
}

export function getOrganismId(organism: BRCDataCatalogOrganism): string {
return sanitizeEntityId(organism.ncbiTaxonomyId);
}

export function sanitizeEntityId(entityId?: string): string {
Expand Down
2 changes: 1 addition & 1 deletion app/components/Entity/components/AnalysisMethod/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ import { ANALYSIS_METHOD } from "../../../../apis/catalog/brc-analytics-catalog/
export interface Props {
analysisMethod: ANALYSIS_METHOD;
content: ReactNode;
geneModelUrl: string;
geneModelUrl: string | null;
genomeVersionAssemblyId: string;
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { SubTitle } from "@databiosphere/findable-ui/lib/components/Layout/compo
import { TEXT_HEADING } from "@databiosphere/findable-ui/lib/theme/common/typography";
import { HeroTitle as Typography } from "@databiosphere/findable-ui/src/components/common/Title/title.styles";
import { ReactNode } from "react";
import { BackButton } from "./components/BackButton/backButton";
import {
DetailViewHeroHeadline,
DetailViewHero as DetailViewHeroLayout,
Expand All @@ -29,7 +28,6 @@ export const DetailViewHero = ({
<DetailViewHeroLayout>
{(breadcrumbs || title) && (
<DetailViewHeroHeadline>
<BackButton />
<HeroHeader>
{breadcrumbs}
<HeroTitle>
Expand Down
2 changes: 2 additions & 0 deletions app/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ export {
BackPageContentSideColumn,
BackPageContentSingleColumn,
} from "@databiosphere/findable-ui/lib/components/Layout/components/BackPage/backPageView.styles";
export { DetailViewTable } from "@databiosphere/findable-ui/lib/components/Detail/components/DetailViewTable/detailViewTable";
export { Logo } from "@databiosphere/findable-ui/lib/components/Layout/components/Header/components/Content/components/Logo/logo";
export { Link } from "@databiosphere/findable-ui/lib/components/Links/components/Link/link";
export { BasicCell } from "@databiosphere/findable-ui/lib/components/Table/components/TableCell/components/BasicCell/basicCell";
export { NTagCell } from "@databiosphere/findable-ui/lib/components/Table/components/TableCell/components/NTagCell/nTagCell";
export { CopyText } from "./common/CopyText/copyText";
export { AnalysisMethod } from "./Entity/components/AnalysisMethod/analysisMethod";
export { AnalysisMethods } from "./Entity/components/AnalysisMethods/analysisMethods";
Expand Down
4 changes: 2 additions & 2 deletions app/utils/galaxy-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const WORKFLOW_LANDING_URL_PREFIX =
export async function getWorkflowLandingUrl(
workflowId: WORKFLOW_ID,
referenceGenome: string,
geneModelUrl: string
geneModelUrl: string | null
): Promise<string> {
const body: WorkflowLandingsBody = {
public: true,
Expand Down Expand Up @@ -74,7 +74,7 @@ function buildFastaUrl(identifier: string): string {
function getWorkflowLandingsRequestState(
workflowId: WORKFLOW_ID,
referenceGenome: string,
geneModelUrl: string
geneModelUrl: string | null
): WorkflowLandingsBodyRequestState {
if (workflowId === WORKFLOW_ID.VARIANT_CALLING && geneModelUrl) {
return {
Expand Down
Loading
Loading