diff --git a/assets/api/genome.ts b/assets/api/genome.ts index a594fbe..c923301 100644 --- a/assets/api/genome.ts +++ b/assets/api/genome.ts @@ -94,6 +94,9 @@ export interface GenomeMetadataGene { checkm_completeness: number checkm_contamination: number checkm_strain_heterogeneity: number + checkm2_completeness: number + checkm2_contamination: number + checkm2_model: string lsu_5s_count: number ssu_count: number lsu_23s_count: number diff --git a/assets/images/stats/r220/genome-category-per-rank.svg b/assets/images/stats/r220/genome-category-per-rank.svg new file mode 100644 index 0000000..1c607c6 --- /dev/null +++ b/assets/images/stats/r220/genome-category-per-rank.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/stats/r220/genome-quality-species-small.jpg b/assets/images/stats/r220/genome-quality-species-small.jpg new file mode 100644 index 0000000..d285b98 Binary files /dev/null and b/assets/images/stats/r220/genome-quality-species-small.jpg differ diff --git a/assets/images/stats/r220/genome-quality-species.png b/assets/images/stats/r220/genome-quality-species.png new file mode 100644 index 0000000..50f99bd Binary files /dev/null and b/assets/images/stats/r220/genome-quality-species.png differ diff --git a/assets/images/stats/r220/genomic-stats-genomes.svg b/assets/images/stats/r220/genomic-stats-genomes.svg new file mode 100644 index 0000000..e9fdb9e --- /dev/null +++ b/assets/images/stats/r220/genomic-stats-genomes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/stats/r220/genomic-stats-species.svg b/assets/images/stats/r220/genomic-stats-species.svg new file mode 100644 index 0000000..ef62845 --- /dev/null +++ b/assets/images/stats/r220/genomic-stats-species.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/stats/r220/ncbi-compare-genomes.svg b/assets/images/stats/r220/ncbi-compare-genomes.svg new file mode 100644 index 0000000..25231f8 --- /dev/null +++ b/assets/images/stats/r220/ncbi-compare-genomes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/stats/r220/ncbi-compare-species.svg b/assets/images/stats/r220/ncbi-compare-species.svg new file mode 100644 index 0000000..8c642a5 --- /dev/null +++ b/assets/images/stats/r220/ncbi-compare-species.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/stats/r220/nomenclatural-per-rank.svg b/assets/images/stats/r220/nomenclatural-per-rank.svg new file mode 100644 index 0000000..79e373b --- /dev/null +++ b/assets/images/stats/r220/nomenclatural-per-rank.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/stats/r220/red-archaea-small.png b/assets/images/stats/r220/red-archaea-small.png new file mode 100644 index 0000000..4e28b38 Binary files /dev/null and b/assets/images/stats/r220/red-archaea-small.png differ diff --git a/assets/images/stats/r220/red-archaea.png b/assets/images/stats/r220/red-archaea.png new file mode 100644 index 0000000..bb36f57 Binary files /dev/null and b/assets/images/stats/r220/red-archaea.png differ diff --git a/assets/images/stats/r220/red-bacteria-small.png b/assets/images/stats/r220/red-bacteria-small.png new file mode 100644 index 0000000..6c8220e Binary files /dev/null and b/assets/images/stats/r220/red-bacteria-small.png differ diff --git a/assets/images/stats/r220/red-bacteria.png b/assets/images/stats/r220/red-bacteria.png new file mode 100644 index 0000000..457c344 Binary files /dev/null and b/assets/images/stats/r220/red-bacteria.png differ diff --git a/assets/images/stats/r220/sp-rep-type.svg b/assets/images/stats/r220/sp-rep-type.svg new file mode 100644 index 0000000..dff6403 --- /dev/null +++ b/assets/images/stats/r220/sp-rep-type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/models/taxon-history.ts b/assets/models/taxon-history.ts index 4a92292..ef8155e 100644 --- a/assets/models/taxon-history.ts +++ b/assets/models/taxon-history.ts @@ -9,6 +9,7 @@ export enum TaxonHistoryRelease { R202 = "202", R207 = "207", R214 = "214", + R220 = "220", NCBI = "NCBI" } @@ -22,6 +23,7 @@ export const TaxonHistoryReleases = [ TaxonHistoryRelease.R202, TaxonHistoryRelease.R207, TaxonHistoryRelease.R214, + TaxonHistoryRelease.R220, TaxonHistoryRelease.NCBI ] diff --git a/components/advanced/SearchRule.vue b/components/advanced/SearchRule.vue index 10bcb31..6f74d5a 100644 --- a/components/advanced/SearchRule.vue +++ b/components/advanced/SearchRule.vue @@ -176,20 +176,29 @@ function sortText(a: string, b: string): number { } function sortColumns(a: Column, b: Column): number { - // Sort based on group (override) - if (a.group == b.group) { - return sortText(a.display, b.display) + // Priority order for groups + const order = ['General', 'Taxonomic Information', 'Genome Characteristics', 'NCBI Metadata']; + + // If both columns are in the same group, sort by display text + if (a.group === b.group) { + return sortText(a.display, b.display); } else { - if (a.group == 'General') { - return 1 - } else if (a.group == 'Taxonomic Information') { - return 1 - } else if (a.group == 'Genome Characteristics') { - return 1 - } else if (a.group == 'NCBI Metadata') { - return 1 + // Compare the groups by predefined order + const indexA = order.indexOf(a.group); + const indexB = order.indexOf(b.group); + + // If both groups are found in the order array + if (indexA !== -1 && indexB !== -1) { + return indexA - indexB; + } else if (indexA !== -1) { + // Group A is in order array, but Group B is not + return -1; + } else if (indexB !== -1) { + // Group B is in order array, but Group A is not + return 1; } else { - return sortText(a.group, b.group) + // Neither group is in the order array, sort alphabetically + return sortText(a.group, b.group); } } } diff --git a/components/genome/GenomeCharacteristics.vue b/components/genome/GenomeCharacteristics.vue index 8b51864..40ce100 100644 --- a/components/genome/GenomeCharacteristics.vue +++ b/components/genome/GenomeCharacteristics.vue @@ -1,410 +1,462 @@ - - GTDB representative of species - - + + - + diff --git a/components/genome/GenomeTaxonHistory.vue b/components/genome/GenomeTaxonHistory.vue index baafee4..359d1f7 100644 --- a/components/genome/GenomeTaxonHistory.vue +++ b/components/genome/GenomeTaxonHistory.vue @@ -177,7 +177,7 @@ export default Vue.extend({ methods: { // Compute the taxon history URL for the current taxon getHistUrl(taxon: string) { - return `/taxon-history?from=R80&to=R214&query=${encodeURIComponent(taxon)}` + return `/taxon-history?from=R80&to=R220&query=${encodeURIComponent(taxon)}` }, // Retrieve the taxon history for this accession diff --git a/components/stats/REDr220.vue b/components/stats/REDr220.vue new file mode 100644 index 0000000..68d9d43 --- /dev/null +++ b/components/stats/REDr220.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/components/taxon-history/TaxonHistoryFullTaxonomy.vue b/components/taxon-history/TaxonHistoryFullTaxonomy.vue index 0aa9272..b74f4ef 100644 --- a/components/taxon-history/TaxonHistoryFullTaxonomy.vue +++ b/components/taxon-history/TaxonHistoryFullTaxonomy.vue @@ -41,7 +41,7 @@ -