Merge branch 'release-2.12.x' into TASK-6003

opencb · Apr 16, 2024 · 7c969fb · 7c969fb
2 parents 7f8b92f + d51f579
commit 7c969fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-grid.js
@@ -562,7 +562,8 @@ export default class VariantInterpreterGrid extends LitElement {
                                     colspan: 1,
                                     formatter: this.vcfDataFormatter,
                                     halign: this.displayConfigDefault.header.horizontalAlign,
-                                    visible: this.gridCommons.isColumnVisible(columnId, "VCF_Data"),
+                                    excludeFromSettings: true,
+                                    visible: !this._config.hideVcfFileData,
                                 });
                             }
                         }
@@ -1079,7 +1080,8 @@ export default class VariantInterpreterGrid extends LitElement {
                             });
                         },
                         align: "center",
-                        visible: this.gridCommons.isColumnVisible(samples[i].id, "sampleGenotypes"),
+                        excludeFromSettings: true,
+                        visible: !this._config.hideSampleGenotypes,
                     });
                 }
             }
@@ -1127,7 +1129,8 @@ export default class VariantInterpreterGrid extends LitElement {
                             });
                         },
                         align: "center",
-                        visible: this.gridCommons.isColumnVisible(samples[i].id, "sampleGenotypes"),
+                        excludeFromSettings: true,
+                        visible: !this._config.hideSampleGenotypes,
                     });
                 }
             }
@@ -1545,6 +1548,8 @@ export default class VariantInterpreterGrid extends LitElement {
             hidePopulationFrequencies: false,
             hideClinicalInfo: false,
             hideDeleteriousness: false,
+            hideSampleGenotypes: false,
+            hideVcfFileData: false,
 
             quality: {
                 qual: 30,

diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js
@@ -544,7 +544,8 @@ export default class VariantInterpreterRearrangementGrid extends LitElement {
                                 colspan: 1,
                                 formatter: (value, row) => this.vcfDataFormatter(value, row[index], field),
                                 halign: "center",
-                                visible: this.gridCommons.isColumnVisible(id),
+                                excludeFromSettings: true,
+                                visible: !this._config.hideVcfFileData,
                             });
                         });
                     });
@@ -1104,6 +1105,7 @@ export default class VariantInterpreterRearrangementGrid extends LitElement {
             showActions: false,
             multiSelection: false,
             nucleotideGenotype: true,
+            hideVcfFileData: false,
 
             alleleStringLengthMax: 50,