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

TASK-6073 - Variant Browser active filter have important issues to fix #907

Merged
merged 6 commits into from
Apr 22, 2024
Merged

TASK-6073 - Variant Browser active filter have important issues to fix #907

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
16b9657
wc: Use prepared and executed objects instead of modifying the query …
jmjuanes Apr 19, 2024
e6ce6bc
wc: Remove commented code in variant-browser #TASK-6073
jmjuanes Apr 19, 2024
4dc17db
wc: Remove checking that query object exists in queryObserver method …
jmjuanes Apr 19, 2024
0577bf7
wc: Fix disabling Search button while query is executed in variant-br…
jmjuanes Apr 22, 2024
3486880
wc: Add missing value property in study-filter #TASK-6073
jmjuanes Apr 22, 2024
f94cea3
wc: Fix generating list of selected studies in study-filter #TASK-6073
jmjuanes Apr 22, 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
34 changes: 15 additions & 19 deletions src/webcomponents/variant/variant-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ export default class VariantBrowser extends LitElement {
this.COMPONENT_ID = "variant-browser";
this._prefix = UtilsNew.randomString(8);

// this.results = [];
// this._showInitMessage = true;

this.searchActive = true;
this.facetActive = true;
this.query = {};
Expand Down Expand Up @@ -147,8 +144,8 @@ export default class VariantBrowser extends LitElement {

opencgaSessionObserver() {
if (this?.opencgaSession?.study?.fqn) {
this._query = {study: this.opencgaSession.study.fqn};
this.preparedQuery = {study: this.opencgaSession.study.fqn};
this.preparedQuery = {};
this.executedQuery = {};

// TODO FIXME
/** temp fix this.onRun(): when you switch study this.facetQuery contains the old study when you perform a new Aggregation query.
Expand All @@ -162,13 +159,11 @@ export default class VariantBrowser extends LitElement {
queryObserver() {
if (this.opencgaSession?.study?.fqn) {
// NOTE UtilsNew.objectCompare avoid repeating remote requests.
if (!UtilsNew.objectCompare(this.query, this._query)) {
this._query = {study: this.opencgaSession.study.fqn, ...this.query};
if (!UtilsNew.objectCompare(this.query, this.executedQuery)) {
this.preparedQuery = {...this.query};
this.executedQuery = {...this.query};

LitUtils.dispatchCustomEvent(this, "queryChange", undefined, this.preparedQuery);
// this.detail = {};
this.searchActive = false; // Disable search button
}
}
Expand Down Expand Up @@ -198,10 +193,7 @@ export default class VariantBrowser extends LitElement {
}

async onRun() {
// NOTE notifySearch() triggers this chain: notifySearch -> onQueryFilterSearch() on iva-app.js -> this.queries updated -> queryObserver() in variant-browser
// queryObserver() here stops the repetition of the remote request by checking if it has changed
this.query = {...this.preparedQuery};
// updates this.queries in iva-app
this.executedQuery = {...this.preparedQuery};
this.notifySearch(this.preparedQuery);

this.facetQueryBuilder();
Expand All @@ -216,6 +208,7 @@ export default class VariantBrowser extends LitElement {
} else {
this.facetQuery = null;
}*/
this.requestUpdate();
}

changeView(id) {
Expand All @@ -236,16 +229,19 @@ export default class VariantBrowser extends LitElement {

onActiveFilterChange(e) {
VariantUtils.validateQuery(e.detail);
this.query = {study: this.opencgaSession.study.fqn, ...e.detail};
this.notifySearch(this.query);
this.preparedQuery = {...e.detail};
this.executedQuery = {...e.detail};
this.notifySearch(this.preparedQuery);
this.facetQueryBuilder();
this.requestUpdate();
}

onActiveFilterClear() {
this.query = {study: this.opencgaSession.study.fqn};
this.preparedQuery = {...this.query};
this.notifySearch(this.query);
this.preparedQuery = {};
this.executedQuery = {};
this.notifySearch(this.preparedQuery);
this.facetQueryBuilder();
this.requestUpdate();
}

onFacetQueryChange(e) {
Expand All @@ -260,7 +256,7 @@ export default class VariantBrowser extends LitElement {
this.requestUpdate();
}

onActiveFacetClear(e) {
onActiveFacetClear() {
this.selectedFacet = {};
this.onRun();
this.requestUpdate();
Expand Down Expand Up @@ -325,7 +321,7 @@ export default class VariantBrowser extends LitElement {
<div role="tabpanel" class="tab-pane active" id="filters_tab">
<variant-browser-filter
.opencgaSession=${this.opencgaSession}
.query="${this.query}"
.query="${this.preparedQuery}"
.cellbaseClient="${this.cellbaseClient}"
.config="${this._config.filter}"
@queryChange="${this.onQueryFilterChange}"
Expand Down
Loading