diff --git a/cypress/e2e/iva/variant-interpreter-grid-cancer-cnv.cy.js b/cypress/e2e/iva/variant-interpreter-grid-cancer-cnv.cy.js index 9e849e7587..5f641ec015 100644 --- a/cypress/e2e/iva/variant-interpreter-grid-cancer-cnv.cy.js +++ b/cypress/e2e/iva/variant-interpreter-grid-cancer-cnv.cy.js @@ -168,7 +168,7 @@ context("Variant Interpreter Grid Cancer CNV", () => { it("should display Cohort Stats (Population Frequencies) tooltip", () => { cy.get("tbody tr:first > td") - .eq(8) + .eq(10) .within(() => { cy.get("a") .trigger("mouseover"); @@ -177,7 +177,7 @@ context("Variant Interpreter Grid Cancer CNV", () => { .should("be.visible"); }); - it("should display reference population frequencies tooltip", () => { + it.skip("should display reference population frequencies tooltip", () => { cy.get("tbody tr:first > td") .eq(9) .within(() => { diff --git a/cypress/e2e/iva/variant-interpreter-grid-cancer.cy.js b/cypress/e2e/iva/variant-interpreter-grid-cancer.cy.js index 8b0b8dd009..fcacff7031 100644 --- a/cypress/e2e/iva/variant-interpreter-grid-cancer.cy.js +++ b/cypress/e2e/iva/variant-interpreter-grid-cancer.cy.js @@ -210,7 +210,7 @@ context("Variant Interpreter Grid Cancer", () => { it("should display cohort stats (population frequencies) tooltip", () => { cy.get("tbody tr:first > td") - .eq(8) + .eq(10) .within(() => { cy.get("a").trigger("mouseover"); }); @@ -220,7 +220,7 @@ context("Variant Interpreter Grid Cancer", () => { it("should reference population frequencies tooltip", () => { cy.get("tbody tr:first > td") - .eq(9) + .eq(11) .within(() => { cy.get("a") .trigger("mouseover"); diff --git a/cypress/e2e/iva/variant-interpreter-grid-germline.cy.js b/cypress/e2e/iva/variant-interpreter-grid-germline.cy.js index 3b21ca27e5..8ff4d37102 100644 --- a/cypress/e2e/iva/variant-interpreter-grid-germline.cy.js +++ b/cypress/e2e/iva/variant-interpreter-grid-germline.cy.js @@ -174,7 +174,7 @@ context("Variant Interpreter Grid Germiline", () => { it("should display cohort stats (Population Frequencies) tooltip", () => { cy.get("tbody tr:first > td") - .eq(8) + .eq(9) .within(() => { cy.get("a") .trigger("mouseover"); @@ -185,7 +185,7 @@ context("Variant Interpreter Grid Germiline", () => { it("should display reference population frequencies tooltip", () => { cy.get("tbody tr:first > td") - .eq(9) + .eq(10) .within(() => { cy.get("a") .trigger("mouseover"); @@ -196,7 +196,7 @@ context("Variant Interpreter Grid Germiline", () => { it("should display ACMG Prediction (Classification) tooltip", () => { cy.get("tbody tr:first > td") - .eq(14) + .eq(15) .within(() => { cy.get("a") .trigger("mouseover"); diff --git a/src/sites/iva/conf/browsers.settings.js b/src/sites/iva/conf/browsers.settings.js index 924664f245..dfaab64cb5 100644 --- a/src/sites/iva/conf/browsers.settings.js +++ b/src/sites/iva/conf/browsers.settings.js @@ -718,7 +718,25 @@ const INTERPRETER_SETTINGS = { ], }, { - id: "methods" + id: "methods", + items: [ + { + type: "SINGLE", + methods: [ + {id: "exomiser"}, + ], + }, + { + type: "FAMILY", + methods: [ + {id: "exomiser"}, + ], + }, + { + type: "CANCER", + methods: [], + }, + ], }, { id: "variant-browser", diff --git a/src/webcomponents/commons/grid-commons.js b/src/webcomponents/commons/grid-commons.js index dd562c9b98..27a7ba4493 100644 --- a/src/webcomponents/commons/grid-commons.js +++ b/src/webcomponents/commons/grid-commons.js @@ -272,9 +272,9 @@ export default class GridCommons { } } - isColumnVisible(colName) { + isColumnVisible(colName, parentName) { if (this.config.columns?.length > 0) { - return this.config.columns.includes(colName); + return this.config.columns.includes(colName) || this.config.columns.includes(parentName); } else { // Columns are visible by default. return true; diff --git a/src/webcomponents/deprecated/select-field-token.js b/src/webcomponents/deprecated/select-field-token.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/webcomponents/study/deprecated/variable-manager.js b/src/webcomponents/study/deprecated/variable-manager.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/webcomponents/variant/analysis/deprecated/test/knockout.20201029141213.SChLEA.js b/src/webcomponents/variant/analysis/deprecated/test/knockout.20201029141213.SChLEA.js deleted file mode 100644 index b8f24cfb2c..0000000000 --- a/src/webcomponents/variant/analysis/deprecated/test/knockout.20201029141213.SChLEA.js +++ /dev/null @@ -1,378 +0,0 @@ -export default [ - { - "sampleId": "ISDBM322015", - "sex": "MALE", - "phenotypes": [ - { - "id": "HP:0000519", - "name": "Developmental cataract", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0000545", - "name": "Myopia", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:611597", - "name": "Cataract, Autosomal Dominant, Multiple Types 1", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 1, - "byType": { - "HOM_ALT": 1, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "BRCA2", - "transcripts": [ - { - "id": "ENST00000470094", - "biotype": "nonsense_mediated_decay", - "variants": [ - { - "id": "13:32959534:A:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "1579.7800000000002", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] - }, - { - "sampleId": "ISDBM322016", - "sex": "MALE", - "phenotypes": [ - { - "id": "HP:0000545", - "name": "Myopia", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0000519", - "name": "Developmental cataract", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:611597", - "name": "Cataract, Autosomal Dominant, Multiple Types 1", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 2, - "byType": { - "HOM_ALT": 3, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "BRCA2", - "transcripts": [ - { - "id": "ENST00000470094", - "biotype": "nonsense_mediated_decay", - "variants": [ - { - "id": "13:32959199:C:T", - "genotype": "1/1", - "filter": "PASS", - "qual": "161.63", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - }, - { - "id": "13:32971425:T:C", - "genotype": "1/1", - "filter": "PASS", - "qual": "162.35", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000533776", - "biotype": "retained_intron", - "variants": [ - { - "id": "13:32971425:T:C", - "genotype": "1/1", - "filter": "PASS", - "qual": "162.35", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - }, - { - "id": "13:32977496:C:A", - "genotype": "1/1", - "filter": "PASS", - "qual": "121.58", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001632", - "name": "downstream_gene_variant" - } - ] - } - ] - } - ] - } - ] - }, - { - "sampleId": "ISDBM322017", - "sex": "FEMALE", - "phenotypes": [ - { - "id": "HP:0000545", - "name": "Myopia", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0002077", - "name": "Migraine with aura", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:300125", - "name": "Migraine, Familial Typical, Susceptibility To, 2", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 2, - "byType": { - "HOM_ALT": 1, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "BRCA2", - "transcripts": [ - { - "id": "ENST00000470094", - "biotype": "nonsense_mediated_decay", - "variants": [ - { - "id": "13:32971425:T:C", - "genotype": "1/1", - "filter": "PASS", - "qual": "162.35", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000533776", - "biotype": "retained_intron", - "variants": [ - { - "id": "13:32971425:T:C", - "genotype": "1/1", - "filter": "PASS", - "qual": "162.35", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] - }, - { - "sampleId": "ISDBM322018", - "sex": "FEMALE", - "phenotypes": [ - { - "id": "HP:0002077", - "name": "Migraine with aura", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0000958", - "name": "Dry skin", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:300125", - "name": "Migraine, Familial Typical, Susceptibility To, 2", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 2, - "byType": { - "HOM_ALT": 2, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "BRCA2", - "transcripts": [ - { - "id": "ENST00000470094", - "biotype": "nonsense_mediated_decay", - "variants": [ - { - "id": "13:32959534:A:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "1579.7800000000002", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - }, - { - "id": "13:32971425:T:C", - "genotype": "1/1", - "filter": "PASS", - "qual": "162.35", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000533776", - "biotype": "retained_intron", - "variants": [ - { - "id": "13:32971425:T:C", - "genotype": "1/1", - "filter": "PASS", - "qual": "162.35", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] - } -]; diff --git a/src/webcomponents/variant/analysis/deprecated/test/knockout.20201103172343.kFIvpr.gene.js b/src/webcomponents/variant/analysis/deprecated/test/knockout.20201103172343.kFIvpr.gene.js deleted file mode 100644 index 9de6c81aff..0000000000 --- a/src/webcomponents/variant/analysis/deprecated/test/knockout.20201103172343.kFIvpr.gene.js +++ /dev/null @@ -1,521 +0,0 @@ -export default [{ - "id": "ENSG00000105737", - "name": "GRIK5", - "chromosome": "19", - "start": 42502473, - "end": 42573650, - "strand": "-", - "biotype": "protein_coding", - "annotation": { - "diseases": [ - { - "id": "umls:C0036341", - "name": "Schizophrenia", - "score": 0.21548465, - "numberOfPubmeds": 5, - "associationTypes": [ - "Biomarker, GeneticVariation" - ], - "sources": [ - "BeFree", - "CTD_human", - "GAD" - ], - "source": "disgenet" - }, - { - "id": "umls:C0035126", - "name": "Reperfusion Injury", - "score": 0.1, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "RGD" - ], - "source": "disgenet" - }, - { - "id": "umls:C0036572", - "name": "Seizures", - "score": 0.1, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "RGD" - ], - "source": "disgenet" - }, - { - "id": "umls:C0014556", - "name": "Epilepsy, Temporal Lobe", - "score": 0.1, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "RGD" - ], - "source": "disgenet" - }, - { - "id": "umls:C0005586", - "name": "Bipolar Disorder", - "score": 0.002600572, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker, GeneticVariation" - ], - "sources": [ - "BeFree", - "GAD" - ], - "source": "disgenet" - }, - { - "id": "umls:C0004352", - "name": "Autistic Disorder", - "score": 0.0017010274, - "numberOfPubmeds": 6, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0011581", - "name": "Depressive Disorder", - "score": 0.00056700915, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0162872", - "name": "Aortic Aneurysm, Thoracic", - "score": 0.00056700915, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C1510586", - "name": "Autism spectrum disorders", - "score": 0.00056700915, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0812393", - "name": "depression", - "score": 0.00056700915, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0011570", - "name": "Depression", - "score": 0.00056700915, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0028768", - "name": "Obsessive-Compulsive Disorder", - "score": 0.00056700915, - "numberOfPubmeds": 2, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0011124", - "name": "Decreased Libido", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0549622", - "name": "Sexual Dysfunction", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0023448", - "name": "Leukemia, Lymphoid", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C1292769", - "name": "Precursor B-cell lymphoblastic leukemia", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0003469", - "name": "Anxiety Disorders", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0006012", - "name": "Borderline Personality Disorder", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0036877", - "name": "sexual dysfunction", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0023449", - "name": "ACUTE LYMPHOCYTIC LEUKEMIA", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0525045", - "name": "Mood Disorders", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0006287", - "name": "Bronchopulmonary Dysplasia", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0007137", - "name": "Carcinoma, Squamous Cell", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - }, - { - "id": "umls:C0014548", - "name": "Epilepsy, Generalized", - "score": 0.00028350457, - "numberOfPubmeds": 1, - "associationTypes": [ - "Biomarker" - ], - "sources": [ - "BeFree" - ], - "source": "disgenet" - } - ], - "drugs": [ - { - "geneName": "GRIK5", - "drugName": "4185", - "source": "dgidb", - "studyType": "GuideToPharmacologyInteractions", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "4231", - "source": "dgidb", - "studyType": "GuideToPharmacologyInteractions", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "4075", - "source": "dgidb", - "studyType": "GuideToPharmacologyInteractions", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "4085", - "source": "dgidb", - "studyType": "GuideToPharmacologyInteractions", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "4317", - "source": "dgidb", - "studyType": "GuideToPharmacologyInteractions", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "4181", - "source": "dgidb", - "studyType": "GuideToPharmacologyInteractions", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "TEZAMPANEL", - "source": "dgidb", - "studyType": "TdgClinicalTrial", - "type": "n/a" - }, - { - "geneName": "GRIK5", - "drugName": "DB00142", - "source": "dgidb", - "studyType": "DrugBank", - "type": "n/a" - } - ] - }, - "individuals": [ - { - "id": "ISDBM322016", - "sampleId": "ISDBM322016", - "transcripts": [ - { - "id": "ENST00000602210", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000454993", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - }, - { - "id": "ISDBM322018", - "sampleId": "ISDBM322018", - "transcripts": [ - { - "id": "ENST00000602210", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000454993", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - }, - { - "id": "ISDBM322015", - "sampleId": "ISDBM322015", - "transcripts": [ - { - "id": "ENST00000594528", - "biotype": "nonsense_mediated_decay", - "variants": [ - { - "id": "19:42554437:C:A", - "genotype": "1/1", - "filter": "PASS", - "qual": "45.769999999999996", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] -}]; diff --git a/src/webcomponents/variant/analysis/deprecated/test/knockout.20201103172343.kFIvpr.individuals.js b/src/webcomponents/variant/analysis/deprecated/test/knockout.20201103172343.kFIvpr.individuals.js deleted file mode 100644 index 6760254f79..0000000000 --- a/src/webcomponents/variant/analysis/deprecated/test/knockout.20201103172343.kFIvpr.individuals.js +++ /dev/null @@ -1,243 +0,0 @@ -export default [ - { - "sampleId": "ISDBM322015", - "sex": "MALE", - "phenotypes": [ - { - "id": "HP:0000519", - "name": "Developmental cataract", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0000545", - "name": "Myopia", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:611597", - "name": "Cataract, Autosomal Dominant, Multiple Types 1", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 1, - "byType": { - "HOM_ALT": 1, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "GRIK5", - "transcripts": [ - { - "id": "ENST00000594528", - "biotype": "nonsense_mediated_decay", - "variants": [ - { - "id": "19:42554437:C:A", - "genotype": "1/1", - "filter": "PASS", - "qual": "45.769999999999996", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001621", - "name": "NMD_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] - }, - { - "sampleId": "ISDBM322016", - "sex": "MALE", - "phenotypes": [ - { - "id": "HP:0000545", - "name": "Myopia", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0000519", - "name": "Developmental cataract", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:611597", - "name": "Cataract, Autosomal Dominant, Multiple Types 1", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 2, - "byType": { - "HOM_ALT": 1, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "GRIK5", - "transcripts": [ - { - "id": "ENST00000602210", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000454993", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] - }, - { - "sampleId": "ISDBM322018", - "sex": "FEMALE", - "phenotypes": [ - { - "id": "HP:0002077", - "name": "Migraine with aura", - "source": "HPO", - "status": "OBSERVED" - }, - { - "id": "HP:0000958", - "name": "Dry skin", - "source": "HPO", - "status": "OBSERVED" - } - ], - "disorders": [ - { - "id": "OMIM:300125", - "name": "Migraine, Familial Typical, Susceptibility To, 2", - "source": "OMIM" - } - ], - "stats": { - "numGenes": 1, - "numTranscripts": 2, - "byType": { - "HOM_ALT": 1, - "COMP_HET": 0, - "HET_ALT": 0, - "DELETION_OVERLAP": 0 - } - }, - "genes": [ - { - "name": "GRIK5", - "transcripts": [ - { - "id": "ENST00000602210", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - }, - { - "id": "ENST00000454993", - "biotype": "retained_intron", - "variants": [ - { - "id": "19:42506044:C:G", - "genotype": "1/1", - "filter": "PASS", - "qual": "34.02", - "knockoutType": "HOM_ALT", - "sequenceOntologyTerms": [ - { - "accession": "SO:0001619", - "name": "non_coding_transcript_variant" - }, - { - "accession": "SO:0001627", - "name": "intron_variant" - } - ] - } - ] - } - ] - } - ] - } -]; diff --git a/src/webcomponents/variant/analysis/deprecated/test/opencga-knockout-analysis-result.html b/src/webcomponents/variant/analysis/deprecated/test/opencga-knockout-analysis-result.html deleted file mode 100644 index 29fc1ebb52..0000000000 --- a/src/webcomponents/variant/analysis/deprecated/test/opencga-knockout-analysis-result.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-grid-config.js b/src/webcomponents/variant/interpretation/variant-interpreter-grid-config.js index 8d05b40c29..2171185bad 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-grid-config.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-grid-config.js @@ -68,19 +68,29 @@ export default class VariantInterpreterGridConfig extends LitElement { let lastSubColumn = 0; for (const gridColumn of this.gridColumns[0]) { if (gridColumn.rowspan === 2) { - this.selectColumnData.push({id: gridColumn.id, name: gridColumn.columnTitle || gridColumn.title}); - if (typeof gridColumn.visible === "undefined" || gridColumn.visible) { - this.selectedColumns.push(gridColumn.id); + if (!gridColumn.excludeFromSettings) { + this.selectColumnData.push({ + id: gridColumn.id, + name: gridColumn.columnTitle || gridColumn.title, + }); + if (typeof gridColumn.visible === "undefined" || gridColumn.visible) { + this.selectedColumns.push(gridColumn.id); + } } } else { const option = {id: gridColumn.id, name: gridColumn.columnTitle || gridColumn.title, fields: []}; for (let i = lastSubColumn; i < lastSubColumn + gridColumn.colspan; i++) { - option.fields.push({id: this.gridColumns[1][i].id, name: this.gridColumns[1][i].title}); + if (!this.gridColumns[1][i].excludeFromSettings) { + option.fields.push({ + id: this.gridColumns[1][i].id, + name: this.gridColumns[1][i].title, + }); + } if (typeof this.gridColumns[1][i].visible === "undefined" || this.gridColumns[1][i].visible) { this.selectedColumns.push(this.gridColumns[1][i].id); } } - if (option.fields[0].id) { + if (option.fields[0]?.id) { this.selectColumnData.push(option); } lastSubColumn += gridColumn.colspan; @@ -97,9 +107,6 @@ export default class VariantInterpreterGridConfig extends LitElement { case "genotype.type": this.config.genotype.type = e.detail.value; break; - case "showHgvs": - this.config.showHgvs = e.detail.value; - break; case "geneSet.ensembl": case "geneSet.refseq": case "consequenceType.all": @@ -278,15 +285,6 @@ export default class VariantInterpreterGridConfig extends LitElement { width: 6, } }, - { - title: "Show HGVS column", - field: "showHgvs", - type: "checkbox", - text: "Show HGVS", - display: { - width: 6, - } - } ] }, { diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js index 9545c94231..39a7e100ab 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js @@ -639,7 +639,7 @@ export default class VariantInterpreterGrid extends LitElement { colspan: 1, formatter: this.vcfDataFormatter, halign: "center", - visible: this.gridCommons.isColumnVisible(columnId), + visible: this.gridCommons.isColumnVisible(columnId, "VCF_Data"), }); } } @@ -699,7 +699,7 @@ export default class VariantInterpreterGrid extends LitElement { colspan: 1, formatter: (value, row) => VariantGridFormatter.hgvsFormatter(row, this._config), halign: "center", - visible: !!this._config.showHgvs && this.gridCommons.isColumnVisible("hgvs"), + visible: this.gridCommons.isColumnVisible("hgvs"), }, { id: "consequenceType", @@ -732,6 +732,7 @@ export default class VariantInterpreterGrid extends LitElement { formatter: VariantInterpreterGridFormatter.roleInCancerFormatter.bind(this), halign: "center", visible: this.clinicalAnalysis.type?.toUpperCase() === "CANCER" && this.gridCommons.isColumnVisible("evidences"), + excludeFromSettings: !(this.clinicalAnalysis.type?.toUpperCase() === "CANCER"), }, { id: "VCF_Data", @@ -739,7 +740,6 @@ export default class VariantInterpreterGrid extends LitElement { rowspan: 1, colspan: vcfDataColumns?.length, halign: "center", - visible: vcfDataColumns?.length > 1 }, { id: "cohort", @@ -885,7 +885,8 @@ export default class VariantInterpreterGrid extends LitElement {
  • - CellBase 5.1 ${this.opencgaSession?.project.cellbase.version === "v5.1" ? "(current)" : ""} + + CellBase 5.1 ${this.opencgaSession?.project.cellbase.version === "v5.1" ? "(current)" : ""}
  • @@ -931,6 +932,7 @@ export default class VariantInterpreterGrid extends LitElement { "click a": (e, value, row) => this.onActionClick(e, value, row) }, visible: this._config?.showActions, + excludeFromSettings: true, excludeFromExport: true // this is used in opencga-export // visible: this._config.showActions && !this._config?.columns?.hidden?.includes("actions") }, @@ -945,7 +947,7 @@ export default class VariantInterpreterGrid extends LitElement { formatter: (value, row) => VariantGridFormatter.caddScaledFormatter(value, row), align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("cadd"), + visible: this.gridCommons.isColumnVisible("cadd", "deleteriousness"), }, { id: "spliceai", @@ -956,7 +958,7 @@ export default class VariantInterpreterGrid extends LitElement { formatter: (value, row) => VariantGridFormatter.spliceAIFormatter(value, row), align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("spliceai"), + visible: this.gridCommons.isColumnVisible("spliceai", "deleteriousness"), }, ...vcfDataColumns, { @@ -967,7 +969,7 @@ export default class VariantInterpreterGrid extends LitElement { rowspan: 1, formatter: VariantGridFormatter.clinicalTraitAssociationFormatter, align: "center", - visible: !this._config.hideClinicalInfo && this.gridCommons.isColumnVisible("clinvar"), + visible: !this._config.hideClinicalInfo && this.gridCommons.isColumnVisible("clinvar", "clinicalInfo"), }, { id: "cosmic", @@ -977,7 +979,7 @@ export default class VariantInterpreterGrid extends LitElement { rowspan: 1, formatter: VariantGridFormatter.clinicalTraitAssociationFormatter, align: "center", - visible: !this._config.hideClinicalInfo && this.gridCommons.isColumnVisible("cosmic"), + visible: !this._config.hideClinicalInfo && this.gridCommons.isColumnVisible("cosmic", "clinicalInfo"), }, { id: "hotspots", @@ -987,7 +989,7 @@ export default class VariantInterpreterGrid extends LitElement { rowspan: 1, formatter: VariantGridFormatter.clinicalCancerHotspotsFormatter, align: "center", - visible: !this._config.hideClinicalInfo && this.gridCommons.isColumnVisible("hotspots"), + visible: !this._config.hideClinicalInfo && this.gridCommons.isColumnVisible("hotspots", "clinicalInfo"), }, // Interpretation methods column { @@ -1000,19 +1002,19 @@ export default class VariantInterpreterGrid extends LitElement { return VariantInterpreterGridFormatter.exomiserScoresFormatter(value, variant); }, align: "center", - visible: this.clinicalAnalysis?.interpretation?.method?.name === "interpretation-exomiser", + visible: this.clinicalAnalysis?.interpretation?.method?.name === "interpretation-exomiser" && this.gridCommons.isColumnVisible("exomiser", "methods"), + excludeFromSettings: !(this.clinicalAnalysis?.interpretation?.method?.name === "interpretation-exomiser"), }, // Interpretation Column { id: "reported", title: "Interpreted and/or
    Reported", - // field: "prediction", + field: "reported", rowspan: 1, colspan: 1, formatter: (value, row) => VariantGridFormatter.reportedVariantFormatter(value, this.queriedVariants[row.id]), align: "center", - // visible: this.clinicalAnalysis.type.toUpperCase() === "SINGLE" || this.clinicalAnalysis.type.toUpperCase() === "FAMILY" - visible: this.gridCommons.isColumnVisible("reported"), + visible: this.gridCommons.isColumnVisible("reported", "interpretation"), }, { id: "prediction", @@ -1027,7 +1029,7 @@ export default class VariantInterpreterGrid extends LitElement { align: "center", visible: ( (this.clinicalAnalysis.type?.toUpperCase() === "SINGLE" || this.clinicalAnalysis.type?.toUpperCase() === "FAMILY") && - this.gridCommons.isColumnVisible("prediction") + this.gridCommons.isColumnVisible("prediction", "interpretation") ), }, { @@ -1045,6 +1047,7 @@ export default class VariantInterpreterGrid extends LitElement { "click input": e => this.onVariantCheck(e) }, visible: this._config.showSelectCheckbox, + excludeFromSettings: true, excludeFromExport: true // this is used in opencga-export }, { @@ -1062,6 +1065,7 @@ export default class VariantInterpreterGrid extends LitElement { events: { "click button": e => this.onVariantReview(e) }, + excludeFromSettings: true, visible: this.review || this._config?.showReview, excludeFromExport: true // this is used in opencga-export }, @@ -1155,7 +1159,7 @@ export default class VariantInterpreterGrid extends LitElement { formatter: VariantInterpreterGridFormatter.sampleGenotypeFormatter, align: "center", nucleotideGenotype: true, - visible: this.gridCommons.isColumnVisible(samples[i].id), + visible: this.gridCommons.isColumnVisible(samples[i].id, "sampleGenotypes"), }); } } @@ -1204,7 +1208,7 @@ export default class VariantInterpreterGrid extends LitElement { formatter: VariantInterpreterGridFormatter.sampleGenotypeFormatter, align: "center", nucleotideGenotype: true, - visible: this.gridCommons.isColumnVisible(samples[i].id), + visible: this.gridCommons.isColumnVisible(samples[i].id, "sampleGenotypes"), }); } } diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-methods.js b/src/webcomponents/variant/interpretation/variant-interpreter-methods.js index 0b8607b08a..836f1979db 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter-methods.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter-methods.js @@ -15,7 +15,6 @@ */ import {LitElement, html} from "lit"; -import UtilsNew from "../../../core/utils-new.js"; import "../../commons/view/detail-tabs.js"; import "../../clinical/analysis/rd-tiering-analysis.js"; import "../../clinical/analysis/exomiser-analysis.js"; @@ -43,46 +42,36 @@ class VariantInterpreterMethods extends LitElement { clinicalAnalysisId: { type: String }, - config: { - type: Object - } + settings: { + type: Object, + }, }; } _init() { - this._prefix = UtilsNew.randomString(8); this._config = this.getDefaultConfig(); } - connectedCallback() { - super.connectedCallback(); - } - update(changedProperties) { - if (changedProperties.has("opencgaSession")) { - this.opencgaSessionObserver(); - } if (changedProperties.has("clinicalAnalysisId")) { this.clinicalAnalysisIdObserver(); } - // if (changedProperties.has("clinicalAnalysis")) { - // this.clinicalAnalysisObserver(); - // } - super.update(changedProperties); - } - opencgaSessionObserver() { - this._config = this.getDefaultConfig(); - this.requestUpdate(); + if (changedProperties.has("opencgaSession") || changedProperties.has("clinicalAnalysis") || changedProperties.has("settings")) { + this._config = this.getDefaultConfig(); + } + + super.update(changedProperties); } clinicalAnalysisIdObserver() { if (this.opencgaSession?.opencgaClient && this.clinicalAnalysisId) { this.opencgaSession.opencgaClient.clinical() - .info(this.clinicalAnalysisId, {study: this.opencgaSession.study.fqn}) + .info(this.clinicalAnalysisId, { + study: this.opencgaSession.study.fqn, + }) .then(response => { this.clinicalAnalysis = response.responses[0].results[0]; - // this.requestUpdate(); }) .catch(response => { console.error("An error occurred fetching clinicalAnalysis: ", response); @@ -91,12 +80,23 @@ class VariantInterpreterMethods extends LitElement { } render() { - // Check Project exists - if (!this.opencgaSession.project) { + if (!this.opencgaSession?.project) { return html`

    No public projects available to browse. Please login to continue

    -
    `; + + `; + } + + // If no methods have been configured, we will display a warning message + if (!this._config || this._config.items.length === 0) { + return html` +
    + +
    + `; } return html` @@ -111,79 +111,54 @@ class VariantInterpreterMethods extends LitElement { getDefaultConfig() { const items = []; - if (this.clinicalAnalysis) { - const probandId = this.clinicalAnalysis.proband.id; - - if (this.clinicalAnalysis.type.toUpperCase() === "SINGLE") { - items.push({ - id: "exomiser", - name: "Exomiser", - render: (clinicalAnalysis, active, opencgaSession) => { - return html` -
    - - - -
    - `; - }, - }); - } - - if (this.clinicalAnalysis.type.toUpperCase() === "FAMILY") { - items.push({ - id: "exomiser", - name: "Exomiser", - active: true, - render: (clinicalAnalysis, active, opencgaSession) => { - return html` -
    - - - -
    - `; - }, - }); - items.push({ - id: "rd-tiering", - name: "RD Tiering", - render: (clinicalAnalysis, active, opencgaSession) => { - return html` -
    - - - -
    - `; - }, - }); - } - - if (this.clinicalAnalysis.type.toUpperCase() === "CANCER") { - items.push({ - id: "", - name: "Cancer Analysis", - render: (clinicalAnalysis, active, opencgaSession) => { - return html` -
    - - `; - }, - }); - } + `; + }, + }); + } + + if (method.id === "rd-tiering" || method.id === "rdtiering") { + items.push({ + id: "rd-tiering", + name: "RD Tiering", + render: (clinicalAnalysis, active, opencgaSession) => { + const toolParams = { + clinicalAnalysis: clinicalAnalysis.id, + panels: clinicalAnalysis.panels?.map(panel => panel.id).join(","), + }; + return html` +
    + + + +
    + `; + }, + }); + } + }); } return { diff --git a/src/webcomponents/variant/interpretation/variant-interpreter.js b/src/webcomponents/variant/interpretation/variant-interpreter.js index 6f3a2a8f49..a1acb9af85 100644 --- a/src/webcomponents/variant/interpretation/variant-interpreter.js +++ b/src/webcomponents/variant/interpretation/variant-interpreter.js @@ -30,6 +30,7 @@ import "../custom/steiner-report.js"; import "../../commons/opencga-active-filters.js"; import "../../download-button.js"; import "../../loading-spinner.js"; +import "../../clinical/clinical-analysis-review.js"; import NotificationUtils from "../../commons/utils/notification-utils.js"; class VariantInterpreter extends LitElement { @@ -378,10 +379,9 @@ class VariantInterpreter extends LitElement { -->
    -
    ${this._config?.tools?.map(item => html` - ${!item.hidden ? html` + ${(typeof item.visible === "undefined" || !!item.visible) ? html` @@ -434,7 +434,7 @@ class VariantInterpreter extends LitElement { + .settings="${this._config.tools.find(tool => tool.id === "methods")}">
    ` : null} diff --git a/src/webcomponents/variant/variant-browser-grid.js b/src/webcomponents/variant/variant-browser-grid.js index 2275e2ad2c..973d8d20fe 100644 --- a/src/webcomponents/variant/variant-browser-grid.js +++ b/src/webcomponents/variant/variant-browser-grid.js @@ -132,7 +132,10 @@ export default class VariantBrowserGrid extends LitElement { } configObserver() { - this._config = {...this.getDefaultConfig(), ...this.config}; + this._config = { + ...this.getDefaultConfig(), + ...this.config, + }; this.gridCommons = new GridCommons(this.gridId, this, this._config); // Config for the grid toolbar @@ -551,7 +554,7 @@ export default class VariantBrowserGrid extends LitElement { formatter: VariantInterpreterGridFormatter.sampleGenotypeFormatter, align: "center", nucleotideGenotype: true, - visible: this.gridCommons.isColumnVisible(this.samples[i].id), + visible: this.gridCommons.isColumnVisible(this.samples[i].id, "samples"), }); } } @@ -577,7 +580,7 @@ export default class VariantBrowserGrid extends LitElement { formatter: this.cohortFormatter, align: "center", eligible: true, - visible: this.gridCommons.isColumnVisible(study.id), + visible: this.gridCommons.isColumnVisible(study.id, "cohorts"), }); } } @@ -617,7 +620,7 @@ export default class VariantBrowserGrid extends LitElement { colspan: 1, formatter: this.populationFrequenciesFormatter, align: "center", - visible: this.gridCommons.isColumnVisible(this.populationFrequencies.studies[j].id), + visible: this.gridCommons.isColumnVisible(this.populationFrequencies.studies[j].id, "popfreq"), }); } } @@ -758,6 +761,7 @@ export default class VariantBrowserGrid extends LitElement { }, // ...ExtensionsManager.getColumns("variant-browser-grid"), { + id: "select", title: "Select", rowspan: 2, colspan: 1, @@ -766,7 +770,8 @@ export default class VariantBrowserGrid extends LitElement { events: { "click input": this.onCheck.bind(this) }, - visible: this._config.showSelectCheckbox + visible: this._config.showSelectCheckbox, + excludeFromSettings: true, // If true, this column will not be visible in Settings column }, { id: "actions", @@ -850,7 +855,8 @@ export default class VariantBrowserGrid extends LitElement { "click a": (e, value, row) => this.onActionClick(e, value, row) }, visible: this._config?.showActions, - excludeFromExport: true // this is used in opencga-export + excludeFromSettings: true, + excludeFromExport: true, // this is used in opencga-export }, ], [ @@ -862,7 +868,7 @@ export default class VariantBrowserGrid extends LitElement { rowspan: 1, formatter: this.siftPproteinScoreFormatter.bind(this), halign: "center", - visible: this.gridCommons.isColumnVisible("SIFT") + visible: this.gridCommons.isColumnVisible("SIFT", "deleteriousness") }, { id: "polyphen", @@ -872,7 +878,7 @@ export default class VariantBrowserGrid extends LitElement { rowspan: 1, formatter: this.polyphenProteinScoreFormatter.bind(this), halign: "center", - visible: this.gridCommons.isColumnVisible("polyphen") + visible: this.gridCommons.isColumnVisible("polyphen", "deleteriousness") }, { id: "revel", @@ -882,7 +888,7 @@ export default class VariantBrowserGrid extends LitElement { rowspan: 1, formatter: this.revelProteinScoreFormatter.bind(this), halign: "center", - visible: this.gridCommons.isColumnVisible("revel") + visible: this.gridCommons.isColumnVisible("revel", "deleteriousness") }, { id: "cadd", @@ -893,10 +899,10 @@ export default class VariantBrowserGrid extends LitElement { formatter: (value, row) => VariantGridFormatter.caddScaledFormatter(value, row), align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("cadd") + visible: this.gridCommons.isColumnVisible("cadd", "deleteriousness") }, { - id: "splaiceai", + id: "spliceai", title: "SpliceAI", field: "spliceai", colspan: 1, @@ -904,7 +910,7 @@ export default class VariantBrowserGrid extends LitElement { formatter: (value, row) => VariantGridFormatter.spliceAIFormatter(value, row), align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("spliceai") + visible: this.gridCommons.isColumnVisible("spliceai", "deleteriousness") }, { id: "phylop", @@ -915,7 +921,7 @@ export default class VariantBrowserGrid extends LitElement { formatter: this.conservationFormatter, align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("phylop") + visible: this.gridCommons.isColumnVisible("phylop", "conservation") }, { id: "phastCons", @@ -926,7 +932,7 @@ export default class VariantBrowserGrid extends LitElement { formatter: this.conservationFormatter, align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("phastCons") + visible: this.gridCommons.isColumnVisible("phastCons", "conservation") }, { id: "gerp", @@ -937,7 +943,7 @@ export default class VariantBrowserGrid extends LitElement { formatter: this.conservationFormatter, align: "right", halign: "center", - visible: this.gridCommons.isColumnVisible("gerp") + visible: this.gridCommons.isColumnVisible("gerp", "conservation") // visible: this.opencgaSession.project.organism.assembly.toUpperCase() === "GRCH37" }, ...sampleColumns, @@ -951,7 +957,7 @@ export default class VariantBrowserGrid extends LitElement { rowspan: 1, formatter: VariantGridFormatter.clinicalTraitAssociationFormatter, align: "center", - visible: this.gridCommons.isColumnVisible("clinvar") + visible: this.gridCommons.isColumnVisible("clinvar", "clinicalInfo") }, { id: "cosmic", @@ -961,7 +967,7 @@ export default class VariantBrowserGrid extends LitElement { rowspan: 1, formatter: VariantGridFormatter.clinicalTraitAssociationFormatter, align: "center", - visible: this.gridCommons.isColumnVisible("cosmic") + visible: this.gridCommons.isColumnVisible("cosmic", "clinicalInfo") }, ] ];