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

TASK-4847 - Visualisation of desired data fields within the IVA from customer data models #826

Merged
merged 77 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
b73c662
core: add new bioinfo links
imedina Oct 22, 2023
d2d8dea
conf: update config files
imedina Oct 22, 2023
13f030c
core: initial implementation
imedina Oct 22, 2023
379b1b7
Fix and improve grid settings configuration
imedina Oct 23, 2023
d0c7538
wc - Fixed bug disorder as array
gpveronica Oct 27, 2023
1f4bf29
Merge branch 'develop' into TASk-4847
gpveronica Oct 30, 2023
e0e900d
wc - Added TOOL_ID to variant browser
gpveronica Oct 30, 2023
86a03a9
wc - Fixed user settings path in some browsers
gpveronica Oct 30, 2023
e3c4174
wc - Fixed visibility of columns Job ID and SampleIDs
gpveronica Oct 30, 2023
04de6dd
wc - Fixed visibility of some columns
gpveronica Oct 30, 2023
c017fa7
wc - Fixed exclude from Settings Annotations
gpveronica Oct 30, 2023
fc541e6
wc - Fixed settings path in test files for test-app
gpveronica Oct 30, 2023
0108094
wc - Fixed version variable
gpveronica Oct 31, 2023
41e3178
wc - Fixed Job browser TOOL_ID
gpveronica Oct 31, 2023
96851b1
wc - Fixed *_SNV to *_CNV in component ID
gpveronica Oct 31, 2023
43cefea
wc - Fixed tests path and tool id
gpveronica Oct 31, 2023
c0b99f7
wc - Added tool id
gpveronica Oct 31, 2023
7b497c3
wc - Fixed cohort grid tests
gpveronica Oct 31, 2023
b91cf33
wc - Fixed extensions for disease panel, no multicolumn anymore
gpveronica Oct 31, 2023
5fd9776
wc - Fixed tests for disease panel
gpveronica Oct 31, 2023
dba3ba1
wc - Fixed test for file
gpveronica Oct 31, 2023
f27562a
wc - Fixed test for individual
gpveronica Nov 2, 2023
8b7f437
wc - Fixed test for job
gpveronica Nov 2, 2023
059bed1
wc - Fixed test for variant browser cancer
gpveronica Nov 2, 2023
b535575
wc - Fixed test for variant interpreter grid germline
gpveronica Nov 2, 2023
f865e64
wc - Fixed test for sample
gpveronica Nov 2, 2023
202ab91
wc - Fixed test variant browser grid
gpveronica Nov 2, 2023
45513a0
wc - Fixed test variant browser grid and minor improvements
gpveronica Nov 2, 2023
8b96761
wc: fix COMPONENT_ID format in interpreter browsers #TASK-5194
jmjuanes Nov 3, 2023
4687d14
wc: minor fixes in interpreter grid #TASK-5194
jmjuanes Nov 3, 2023
84bdf1e
wc: add toolId to clinical-analysis-group #TASK-5194
jmjuanes Nov 3, 2023
e998536
wc: minor style fixes in clinical analysis group #TASK-5194
jmjuanes Nov 3, 2023
369df4b
wc: fix toolId in clinical analysis browser and grid #TASK-5194
jmjuanes Nov 3, 2023
8447e95
wc: fix toolId observer in clinical analysis grid #TASK-5194
jmjuanes Nov 3, 2023
fb32792
wc: fix toolId in cohort browser and grid #TASK-5194
jmjuanes Nov 3, 2023
6485818
wc: fix toolId in disease panel browser and grid #TASK-5194
jmjuanes Nov 3, 2023
0c19025
wc: fix toolId in family browser and grid #TASK-5194
jmjuanes Nov 3, 2023
36f33a8
wc: fix toolId in file browser and grid #TASK-5194
jmjuanes Nov 3, 2023
3b3655c
wc: fix toolId in individual browser and grid #TASK-5194
jmjuanes Nov 3, 2023
90a1747
wc: fix toolId in job browser and grid #TASK-5194
jmjuanes Nov 3, 2023
ff1ed08
wc: fix toolId in sample browser and grid #TASK-5194
jmjuanes Nov 3, 2023
9c0871d
wc: fix toolId in variant browser and grid #TASK-5194
jmjuanes Nov 3, 2023
c9765fb
test: fix COMPONENT_ID in all catalog and variant browsers #TASK-5194
jmjuanes Nov 3, 2023
03a2e77
test: fix COMPONENT_ID in job browser test #TASK-5194
jmjuanes Nov 3, 2023
455ca9f
wc - Added annotation tests
gpveronica Nov 6, 2023
838828d
wc - Added comment on how to use annotation tests
gpveronica Nov 6, 2023
86d0992
wc - Individual Annotations minor improvement
gpveronica Nov 6, 2023
b227d81
test: improve component for testing sample browser TASK-4847
jmjuanes Nov 6, 2023
028e079
test: fix sample-browser-grid tests #TASK-4847
jmjuanes Nov 6, 2023
e67d6f5
wc: remove fallback properties for sample browser grid test #TASK-4847
jmjuanes Nov 6, 2023
50db173
Merge branch 'TASK-4847' of github.com:opencb/jsorolla into TASK-4847
jmjuanes Nov 6, 2023
28100ef
wc: remove properties fallback values in other catalog browsers tests…
jmjuanes Nov 6, 2023
13056f8
test: fix detail tabs tests for individual browser #TASK-4847
jmjuanes Nov 6, 2023
44898a1
wc: minor fixes in individual browser test component #TASK-4847
jmjuanes Nov 6, 2023
5335ffd
wc: fix cohort browser test component #TASK-4847
jmjuanes Nov 6, 2023
2910386
test: fix tests for cohort browser #TASK-4847
jmjuanes Nov 6, 2023
6e36113
wc: remove unused properties passed to cohort browser test #TASK-4847
jmjuanes Nov 6, 2023
735f57c
wc: rename selected row variable in sample and individual browsers co…
jmjuanes Nov 6, 2023
ee9adeb
wc: fix disease panels browser test component #TASK-4847
jmjuanes Nov 6, 2023
235ea9b
test: fix tests for disease panels browser #TASK-4847
jmjuanes Nov 6, 2023
b8df839
wc: fix family browser test component #TASK-4847
jmjuanes Nov 6, 2023
d90a600
test: fix detail tests in family browser #TASK-4847
jmjuanes Nov 6, 2023
42d64e5
test: fix detail tests for file browser #TASK-4847
jmjuanes Nov 6, 2023
42d329f
wc: fix file browser test component #TASK-4847
jmjuanes Nov 6, 2023
3c74c03
wc: fix job browser test component #TASK-4847
jmjuanes Nov 6, 2023
a0b4f0d
test: fix detail tests for job browser #TASK-4847
jmjuanes Nov 6, 2023
3fd72c5
wc: removed unused properties in catalog browsers tests #TASK-4847
jmjuanes Nov 6, 2023
866e6eb
wc: minor fixes in catalog browsers test components #TASK-4847
jmjuanes Nov 6, 2023
ceb4f45
wc: remove unused variable in individual browser test component #TASK…
jmjuanes Nov 6, 2023
d48667b
test: fix typo in a test name #TASK-4847
jmjuanes Nov 6, 2023
23c0056
wc: remove unused imports in some browser test components #TASK-4847
jmjuanes Nov 6, 2023
e2cfb63
wc - Minor change
gpveronica Nov 6, 2023
a9bd78b
Merge branch 'TASK-4847' of github.com:opencb/jsorolla into TASK-4847
gpveronica Nov 6, 2023
dbdd5fe
wc - Fixed defect, optional chaining in annotations
gpveronica Nov 9, 2023
b5f1352
wc - Fixed cohort query, added annotationSets to include
gpveronica Nov 10, 2023
42dd9b7
wc - Fixed annotationSets added to query in file and job
gpveronica Nov 10, 2023
130f384
Merged branch 'develop' into TASK-4847
gpveronica Nov 10, 2023
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
47 changes: 16 additions & 31 deletions cypress/e2e/iva/cohort-browser-grid.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ context("Cohort Browser Grid", () => {
});
});

it("should hidden columns [Date,Type]",() => {
const columns = ["Cohort ID","Date","Type"];
it("should hide columns [Cohort ID,Creation Date]",() => {
const columns = ["Cohort ID","Creation Date"];
cy.get(`${browserGrid} thead th`)
.as("headerColumns");

Expand Down Expand Up @@ -290,49 +290,34 @@ context("Cohort Browser Grid", () => {
.find("li")
.contains("New Catalog Tab")
.click()
.should('be.visible');
.should("be.visible");
});
});

context("detail tab", () => {
it("should render", () => {
cy.get(browserDetail)
cy.get("detail-tabs")
.should("be.visible");
});

it("should display info from the selected row",() => {
BrowserTest.getColumnIndexByHeader("Cohort ID")
cy.get("@indexColumn")
.then((indexColumn) => {
const indexRow = 2
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get(`tbody tr`)
.eq(indexRow)
.click() // select the row
.find("td")
.eq(indexColumn)
.invoke("text")
.as("textRow")
});

cy.get("@textRow")
.then((textRow) => {
cy.get("detail-tabs > div.panel")
.invoke("text")
.then((text) => {
const textTab = text.trim().split(" ");
expect(textRow).to.equal(textTab[1].trim());
});
});
it("should display info from the selected row", () => {
const cohort = "FIN";
cy.get(`tbody tr[data-uniqueid="${cohort}"]`)
.find(`td:first`)
.trigger("click");

cy.get(`detail-tabs h3`)
.should("contain.text", `Cohort ${cohort}`);
});

it("should display 'JSON Data' Tab", () => {
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get(`detail-tabs > div.detail-tabs > ul`)
.find("li")
.contains("JSON Data")
.click()
.should('be.visible');
.trigger("click");

cy.get("json-viewer")
.should("be.visible");
});
});
});
39 changes: 11 additions & 28 deletions cypress/e2e/iva/disease-panel-browser-grid.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ context("Disease Panel Browser Grid", () => {
});
});

it("should hidden columns [Disorders,Source,Extra column]",() => {
it("should hide columns [Disorders,Source,Extra column]",() => {
const columns = ["Disorders","Source","Extra column"];
cy.get("disease-panel-grid thead th")
.as("headerColumns");
Expand Down Expand Up @@ -345,40 +345,23 @@ context("Disease Panel Browser Grid", () => {
});

it("should display info from the selected row",() => {
BrowserTest.getColumnIndexByHeader("Panel ID");
cy.get("@indexColumn")
.then(indexColumn => {
const indexRow = 2;
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get("tbody tr")
.eq(indexRow)
.click() // select the row
.find("td")
.eq(indexColumn)
.invoke("text")
.as("textRow");
});

cy.get("@textRow")
.then((textRow) => {
const textRowTrimmed = textRow.trim();
cy.get("detail-tabs > div.panel")
.invoke("text")
.then((text) => {
const textTab = text.trim().split(" ");
expect(textRowTrimmed).to.equal(textTab[2].trim());
});
});
const panel = "Familial_non_syndromic_congenital_heart_disease-PanelAppId-212";
cy.get(`tbody tr[data-uniqueid="${panel}"]`)
.find(`td:first`)
.trigger("click");

cy.get(`detail-tabs h3`)
.should("contain.text", `Disease Panel ${panel}`);
});

it("should display 'JSON Data' Tab", () => {
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get("@detail")
.find("li")
.contains("JSON Data")
.click()
.trigger("click");

cy.get("json-viewer")
.should("be.visible");
});
});

});
42 changes: 14 additions & 28 deletions cypress/e2e/iva/family-browser-grid.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ context("Family Browser Grid", () => {
});
});

it("should hidden columns [Case ID,Phenotypes]",() => {
it("should hide columns [Case ID,Phenotypes]",() => {
const columns = ["Case ID","Phenotypes"];
cy.get(`${browserGrid} thead th`)
.as("headerColumns");
Expand Down Expand Up @@ -298,44 +298,30 @@ context("Family Browser Grid", () => {
});
});

context("detail tab",{tags: ["@shortTask","@testTask"]}, () => {
context("detail tab", {tags: ["@shortTask","@testTask"]}, () => {
it("should render", () => {
cy.get(browserDetail)
.should("be.visible");
});

it("should display info from the selected row",() => {
BrowserTest.getColumnIndexByHeader("Family");
cy.get("@indexColumn")
.then((indexColumn) => {
const indexRow = 1;
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get("tbody tr")
.eq(indexRow)
.click() // select the row
.find("td")
.eq(indexColumn)
.invoke("text")
.as("textRow");
});

cy.get("@textRow")
.then((textRow) => {
cy.get("detail-tabs > div.panel")
.invoke("text")
.then((text) => {
const textTab = text.trim().split(" ");
expect(textRow).to.equal(textTab[1].trim());
});
});
it("should display info from the selected row", () => {
const family = "919278";
cy.get(`tbody tr[data-uniqueid="${family}"]`)
.find(`td`)
.eq(1)
.trigger("click");

cy.get(`detail-tabs h3`)
.should("contain.text", `Family ${family}`);
});

it("should display 'JSON Data' Tab", () => {
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get("detail-tabs > div.detail-tabs > ul")
.find("li")
.contains("JSON Data")
.click()
.trigger("click");

cy.get("json-viewer")
.should("be.visible");
});
});
Expand Down
50 changes: 17 additions & 33 deletions cypress/e2e/iva/file-browser-grid.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ context("File Browser Grid", () => {
const browserDetail = "file-detail";

beforeEach(() => {
cy.visit("#file-browser-grid")
cy.visit("#file-browser-grid");
cy.waitUntil(() => {
return cy.get(browserGrid)
.should("be.visible");
Expand Down Expand Up @@ -151,8 +151,8 @@ context("File Browser Grid", () => {
});
});

it("should hidden columns [Directory,Format,Bioformat]",() => {
const columns = ["Directory","Format","Bioformat"];
it("should hide columns [Name,Format]",() => {
const columns = ["Name","Format"];
cy.get(`${browserGrid} thead th`)
.as("headerColumns");

Expand Down Expand Up @@ -229,7 +229,7 @@ context("File Browser Grid", () => {
it("should display 'Extra Column' column", () => {
cy.get("thead th")
.contains("Extra column")
.should('be.visible');
.should("be.visible");
});

it("should display 'New Catalog Tab' Tab", () => {
Expand All @@ -238,50 +238,34 @@ context("File Browser Grid", () => {
.find("li")
.contains("New Catalog Tab")
.click()
.should('be.visible');
.should("be.visible");
});
});


context("detail tab", () => {
it("should render", () => {
cy.get(browserDetail)
.should("be.visible");
});

it("should display info from the selected row",() => {
BrowserTest.getColumnIndexByHeader("Name")
cy.get("@indexColumn")
.then((indexColumn) => {
const indexRow = 2
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get(`tbody tr`)
.eq(indexRow)
.click() // select the row
.find("td")
.eq(indexColumn)
.invoke("text")
.as("textRow")
});

cy.get("@textRow")
.then((textRow) => {
cy.get("detail-tabs > div.panel")
.invoke("text")
.then((text) => {
const textTab = text.split(":");
expect(textRow).to.equal(textTab[1].trim());
});
});
it("should display info from the selected row", () => {
const file = "chinese:HG007_GRCh38_1_22_v4.2.1_benchmark.vcf.gz";
cy.get(`tbody tr[data-uniqueid="${file}"]`)
.find(`td:first`)
.trigger("click");

cy.get(`detail-tabs h3`)
.should("contain.text", `File ${file}`);
});

it("should display 'Preview' Tab", () => {
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.get(`detail-tabs > div.detail-tabs > ul`)
.find("li")
.contains("Preview")
.click()
.should('be.visible');
.trigger("click");

cy.get("file-preview")
.should("be.visible");
});
});
});
Loading