Merge branch 'develop' into TASk-4847

Signed-off-by: gpveronica <[email protected]>
opencb · Oct 30, 2023 · 1f4bf29 · 1f4bf29
2 parents d0c7538 + 1b6a48a
commit 1f4bf29
Show file tree

Hide file tree

Showing 16 changed files with 160 additions and 1,465 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -17,8 +17,6 @@
 import UtilsNew from "../../core/utils-new.js";
 import CustomActions from "./custom-actions.js";
 import ExtensionsManager from "../extensions-manager.js";
-import CatalogGridFormatter from "./catalog-grid-formatter";
-
 
 export default class GridCommons {
 
@@ -273,19 +271,9 @@ export default class GridCommons {
         }
     }
 
-    isColumnVisible(colName) {
+    isColumnVisible(colName, parentName) {
         if (this.config.columns?.length > 0) {
-            // return this.config.columns.some(column => column === colName || column.split(":")[0] === colName);
-
-            // let found = false;
-            // for (const column of this.config.columns) {
-            //     if (column === colName || column.split(":")[0] === colName) {
-            //         found = true;
-            //     }
-            // }
-            // return found;
-
-            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
diff --git a/src/webcomponents/study/deprecated/variable-manager.js b/src/webcomponents/study/deprecated/variable-manager.js