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.

Sign up for GitHub

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

Jump to bottom

TASK-5494 - File, fileData and sample filters are not kept when applying a saved filter #858

Merged
merged 6 commits into from
Feb 15, 2024
Merged

TASK-5494 - File, fileData and sample filters are not kept when applying a saved filter #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
562e1a9
wc: fix locked fields in variant interpreter browser RD #TASK-5494
jmjuanes Feb 13, 2024
f6a39f5
wc: comments fixed in variant interpreter browser rd #TAKS-5494
jmjuanes Feb 13, 2024
d1832f2
wc: fix locked fields in variant interpreter browser cancer #TASK-5494
jmjuanes Feb 13, 2024
83fcc4c
wc: fix locked fields in variant interpreter browser cnv #TASK-5494
jmjuanes Feb 13, 2024
d087ee6
wc: fix locked fields in variant interpreter browser rearrangement #T…
jmjuanes Feb 13, 2024
90e51d0
Merge branch 'release-2.12.x' into TASK-5494
jmjuanes Feb 13, 2024
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
12 changes: 8 additions & 4 deletions src/webcomponents/variant/interpretation/variant-interpreter-browser-cancer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,14 @@ class VariantInterpreterBrowserCancer extends LitElement {
}

getDefaultConfig() {
// Add case panels to query object
// TODO should we also check main interpretation panels?
const lockedFields = [{id: "sample"}];

const lockedFields = [
{id: "sample"},
{id: "sampleData"},
{id: "file"},
{id: "fileData"},
];

// Add panels to locked fields
if (this.clinicalAnalysis?.panels?.length > 0 && this.clinicalAnalysis.panelLock) {
lockedFields.push({id: "panel"});
lockedFields.push({id: "panelIntersection"});
Expand Down
5 changes: 4 additions & 1 deletion src/webcomponents/variant/interpretation/variant-interpreter-browser-cnv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,15 @@ class VariantInterpreterBrowserCNV extends LitElement {
}

getDefaultConfig() {
// Add case panels to query object
const lockedFields = [
{id: "sample"},
{id: "sampleData"},
{id: "file"},
{id: "fileData"},
{id: "type"},
];

// Add panels to locked fields
if (this.clinicalAnalysis?.panels?.length > 0 && this.clinicalAnalysis.panelLock) {
lockedFields.push({id: "panel"});
lockedFields.push({id: "panelIntersection"});
Expand Down
12 changes: 8 additions & 4 deletions src/webcomponents/variant/interpretation/variant-interpreter-browser-rd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,14 @@ class VariantInterpreterBrowserRd extends LitElement {
}

getDefaultConfig() {
// Add case panels to query object
// TODO should we also check main interpretation panels?
const lockedFields = [{id: "sample"}];

const lockedFields = [
{id: "sample"},
{id: "sampleData"},
{id: "file"},
{id: "fileData"},
];

// Add panels to locked fields
if (this.clinicalAnalysis?.panels?.length > 0 && this.clinicalAnalysis.panelLock) {
lockedFields.push({id: "panel"});
lockedFields.push({id: "panelIntersection"});
Expand Down
9 changes: 8 additions & 1 deletion src/webcomponents/variant/interpretation/variant-interpreter-browser-rearrangement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,13 @@ class VariantInterpreterBrowserRearrangement extends LitElement {
}

getDefaultConfig() {
const lockedFields = [
{id: "sample"},
{id: "sampleData"},
{id: "file"},
{id: "fileData"},
];

// Prepare dynamic Variant Caller INFO filters
const callers = ["Caveman", "strelka", "Pindel", "ASCAT", "Canvas", "BRASS", "Manta", "TNhaplotyper2", "Pisces", "CRAFT"];
const callerFilters = callers.map(caller => {
Expand Down Expand Up @@ -338,7 +345,7 @@ class VariantInterpreterBrowserRearrangement extends LitElement {
{id: "fileData", separator: ","},
],
hiddenFields: [],
lockedFields: [{id: "sample"}]
lockedFields: lockedFields,
},
callers: [],
sections: [ // sections and subsections, structure and order is respected
Expand Down
Loading