diff --git a/src/encoded/schemas/variant_sample.json b/src/encoded/schemas/variant_sample.json
index 47021620e6..030a94628c 100644
--- a/src/encoded/schemas/variant_sample.json
+++ b/src/encoded/schemas/variant_sample.json
@@ -509,31 +509,41 @@
},
"variant.genes.genes_ensg.display_title": {
"title": "Gene Transcript",
- "order": 25
+ "order": 25,
+ "sort_fields": [
+ { "field": "variant.genes.genes_ensg.display_title", "title": "Gene" },
+ { "field": "variant.genes.genes_most_severe_transcript", "title": "Most Severe Transcript" }
+ ]
},
"variant.genes.genes_most_severe_hgvsc": {
"title": "Variant",
- "order": 27,
- "sort_fields": [
- { "field": "variant.genes.genes.most_severe_hgvsc", "title": "Most Severe HGVSC" }
- ]
+ "order": 27
},
"variant.genes.genes_most_severe_consequence.coding_effect": {
"title": "Coding Effect",
"order": 28,
"sort_fields": [
- { "fields": "variant.genes.genes_most_severe_consequence.coding_effect", "title": "Coding Effect" }
+ { "field": "variant.genes.genes_most_severe_consequence.coding_effect", "title": "Coding Effect" }
]
},
"variant.gnomad_af": {
"title": "GnomAD",
"aggregation_type": "stats",
"number_step": "any",
- "order": 60
+ "order": 60,
+ "sort_fields": [
+ { "field": "variant.gnomad_af", "title": "Gnomad AF" },
+ { "field": "variant.max_pop_af_af_popmax", "title": "Gnomad AF Population Max" }
+ ]
},
"variant.cadd_phred": {
"title": "Predictors",
- "order": 61
+ "order": 61,
+ "sort_fields": [
+ { "field": "variant.cadd_phred", "title": "Cadd Phred Score" },
+ { "field": "variant.spliceai_maxds", "title": "SpliceAI Max DS"},
+ { "field": "variant.conservation_phylop100", "title": "PhyloP 100 Score"}
+ ]
},
"bam_snapshot": {
"title": "Genome Snapshot",
diff --git a/src/encoded/static/components/browse/columnExtensionMap.js b/src/encoded/static/components/browse/columnExtensionMap.js
index 46eca6e197..c617343e8c 100644
--- a/src/encoded/static/components/browse/columnExtensionMap.js
+++ b/src/encoded/static/components/browse/columnExtensionMap.js
@@ -315,7 +315,7 @@ export const columnExtensionMap = {
/** "Bioinformatics" column title */
'sample_processing.analysis_type': {
'render' : function renderBioinformaticsColumn(result, parentProps){
- const { '@id' : resultHrefPath, sample = null, sample_processing = null } = result;
+ const { '@id' : resultHrefPath, sample = null, sample_processing = null, vcf_file = null } = result;
if (!sample_processing) return null; // Unsure if possible, but fallback to null / '-' in case so (not showing datetitle etc)
const {
analysis_type: mainTitle = null,
@@ -323,7 +323,7 @@ export const columnExtensionMap = {
} = sample_processing;
const {
files = [],
- processed_files = []
+ // processed_files = []
} = sample || {};
let status = null;
@@ -343,23 +343,17 @@ export const columnExtensionMap = {
}
}
- // If fastQs are present...
+ // If fastQs are present... check if ingested
if (status === "in progress") {
- // Check if VCFs have been ingested & if QCs passed
- for (let j = 0; j < processed_files.length; j++) {
- const procFile = processed_files[j];
- const { file_ingestion_status: ingestionStatus = null, file_format = null } = procFile || {};
- const { file_format: fileType } = file_format || {};
- if ((fileType === "vcf_gz" || fileType === "gvcf_gz")
- && ingestionStatus === "Ingested") {
- statusTip = "Variants are ingested";
- status = "complete";
-
- // TODO: Add QC status from overall QC status once implemented
- } // Else, not VCF or not yet ingested, ignore
+ const { file_ingestion_status: ingestionStatus = null } = vcf_file || {};
+ if (ingestionStatus && ingestionStatus === "Ingested") {
+ statusTip = "Variants are ingested";
+ status = "complete";
}
}
+ // Check if overall QCs passed (not yet implemented) -- to add later
+
// Unlikely to show in non-Case item results, so didn't add Case filter
return (
@@ -467,11 +461,12 @@ export const columnExtensionMap = {
}
},
'bam_snapshot': {
+ 'noSort' : true,
'render' : function(result, props) {
const { bam_snapshot = null, uuid = null } = result;
if (bam_snapshot) {
return (
-