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-2506 - "No valid data found" error in several overview tabs when there is no value of an object property #777

Open
wants to merge 8 commits into
base: release-2.8.x
Choose a base branch
from
Open

TASK-2506 - "No valid data found" error in several overview tabs when there is no value of an object property #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
043ef76
wc - Commented out the section using AnalysisRegistry
gpveronica May 23, 2023
2f21645
wc - Removed AnalysisRegistry import
gpveronica May 23, 2023
c2dcc9b
wc - Moved AnalysisRegistry to deprecated
gpveronica May 23, 2023
f5cc584
wc - Removed AnalysisRegistry
gpveronica May 23, 2023
62072a0
wc - Moved knockout test folder to deprecated
gpveronica May 23, 2023
e6c4992
wc - Moved opencga-knockout-folder to deprecated
gpveronica May 23, 2023
cfdb939
wc - Moved to deprecated (using AnalysisRegistry)
gpveronica May 23, 2023
6c87f3a
Merge branch 'release-2.8.x' into TASK-2506
gpveronica May 24, 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
1 change: 0 additions & 1 deletion src/sites/iva/iva-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import UtilsNew from "../../core/utils-new.js";
import NotificationUtils from "../../webcomponents/commons/utils/notification-utils.js";
import NotificationManager from "../../core/notification-manager.js";

import AnalysisRegistry from "../../webcomponents/variant/analysis/analysis-registry.js";
import "../../webcomponents/clinical/clinical-analysis-browser.js";
import "../../webcomponents/clinical/clinical-analysis-portal.js";
import "../../webcomponents/variant/variant-browser.js";
Expand Down
3 changes: 2 additions & 1 deletion src/webcomponents/job/job-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import {LitElement, html} from "lit";
import UtilsNew from "../../core/utils-new.js";
import AnalysisRegistry from "../variant/analysis/analysis-registry.js";
import LitUtils from "../commons/utils/lit-utils.js";
import "../commons/forms/data-form.js";
import "./job-detail-log.js";
Expand Down Expand Up @@ -345,6 +344,7 @@ export default class JobView extends LitElement {
},
],
},
/*
{
title: "Results",
display: {
Expand All @@ -360,6 +360,7 @@ export default class JobView extends LitElement {
},
],
},
*/
{
title: "Job Dependencies",
display: {
Expand Down
4 changes: 2 additions & 2 deletions ...nts/variant/analysis/analysis-registry.js → .../analysis/deprecated/analysis-registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import OpencgaKnockoutAnalysis from "./deprecated/opencga-knockout-analysis.js";
import OpencgaRecessiveGeneAnalysis from "./deprecated/opencga-recessive-gene-analysis.js";
import OpencgaKnockoutAnalysis from "./opencga-knockout-analysis.js";
import OpencgaRecessiveGeneAnalysis from "./opencga-recessive-gene-analysis.js";

export default class AnalysisRegistry {

Expand Down
16 changes: 8 additions & 8 deletions src/webcomponents/variant/analysis/deprecated/opencga-knockout-analysis-result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import {classMap} from "lit/directives/class-map.js";
import GridCommons from "../../../commons/grid-commons.js";
import UtilsNew from "../../../../core/utils-new.js";
import "../../../commons/analysis/opencga-analysis-tool.js";
import AnalysisRegistry from "../analysis-registry.js";
import AnalysisRegistry from "./analysis-registry.js";
import "../../../commons/forms/select-field-filter.js";
import "../opencga-knockout-analysis/knockout-gene-grid.js";
import "../opencga-knockout-analysis/knockout-individual-view.js";
import "../opencga-knockout-analysis/knockout-variant-view.js";
import "./opencga-knockout-analysis/knockout-gene-grid.js";
import "./opencga-knockout-analysis/knockout-individual-view.js";
import "./opencga-knockout-analysis/knockout-variant-view.js";


export default class OpencgaKnockoutAnalysisResult extends LitElement {
Expand Down Expand Up @@ -71,8 +71,8 @@ export default class OpencgaKnockoutAnalysisResult extends LitElement {
}

updated(changedProperties) {
if (changedProperties.has("opencgaSession")) {
}
// if (changedProperties.has("opencgaSession")) {}

if (changedProperties.has("config")) {
this._config = {...this.getDefaultConfig(), ...this.config};
this.requestUpdate();
Expand All @@ -82,7 +82,7 @@ export default class OpencgaKnockoutAnalysisResult extends LitElement {
_changeTab(e) {
e.preventDefault();
const tabId = e.currentTarget.dataset.id;
//the selectors are strictly defined to avoid conflics in tabs in children components
// the selectors are strictly defined to avoid conflics in tabs in children components
$("#opencga-knockout-analysis-result > div > .content-pills", this).removeClass("active");
$("#opencga-knockout-analysis-result > .content-tab-wrapper > .content-tab", this).hide();
$("#" + this._prefix + tabId, this).show();
Expand All @@ -99,7 +99,7 @@ export default class OpencgaKnockoutAnalysisResult extends LitElement {
}

render() {
//wait for opencgaSession to be available because inner components use it
// wait for opencgaSession to be available because inner components use it
return this.opencgaSession ? html`
<div class="container" style="margin-top: 60px">
<div id="opencga-knockout-analysis-result">
Expand Down
8 changes: 4 additions & 4 deletions ...a-knockout-analysis/knockout-gene-grid.js → ...a-knockout-analysis/knockout-gene-grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import {LitElement, html} from "lit";
import {classMap} from "lit/directives/class-map.js";
import UtilsNew from "../../../../core/utils-new.js";
import UtilsNew from "../../../../../core/utils-new.js";
import AnalysisRegistry from "../analysis-registry.js";
import GridCommons from "../../../commons/grid-commons.js";
import GridCommons from "../../../../commons/grid-commons.js";
import knockoutDataGene from "../test/knockout.20201103172343.kFIvpr.gene.js";

export default class KnockoutGeneGrid extends LitElement {
Expand Down Expand Up @@ -99,7 +99,7 @@ export default class KnockoutGeneGrid extends LitElement {
this.table = $("#" + this.gridId);
this.table.bootstrapTable("destroy");
this.table.bootstrapTable({
//data: this.tableData,
// data: this.tableData,
columns: this._initTableColumns(),
sidePagination: "local",
iconsPrefix: GridCommons.GRID_ICONS_PREFIX,
Expand All @@ -115,7 +115,7 @@ export default class KnockoutGeneGrid extends LitElement {
ajax: params => {
this.opencgaSession.opencgaClient.variants().queryKnockoutGene({job: this.jobId, study: this.opencgaSession.study.fqn})
.then(restResponse => {
console.log("restResponse", restResponse)
console.log("restResponse", restResponse);
this.tableData = restResponse.getResults();
params.success(this.tableData);
}).catch(e => {
Expand Down
9 changes: 4 additions & 5 deletions ...-analysis/knockout-individual-variants.js → ...-analysis/knockout-individual-variants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

import {LitElement, html} from "lit";
import UtilsNew from "../../../../core/utils-new.js";
import GridCommons from "../../../commons/grid-commons.js";
import "./../../../commons/view/detail-tabs.js";
import UtilsNew from "../../../../../core/utils-new.js";
import GridCommons from "../../../../commons/grid-commons.js";
import "../../../../commons/view/detail-tabs.js";
import knockoutDataIndividuals from "../test/knockout.20201103172343.kFIvpr.individuals.js";


Expand Down Expand Up @@ -55,8 +55,7 @@ export default class KnockoutIndividualVariants extends LitElement {
}

updated(changedProperties) {
if (changedProperties.has("opencgaSession")) {
}
// if (changedProperties.has("opencgaSession")) {}

if (changedProperties.has("individual")) {
this.prepareData();
Expand Down
8 changes: 4 additions & 4 deletions ...kout-analysis/knockout-individual-view.js → ...kout-analysis/knockout-individual-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*/

import {LitElement, html} from "lit";
import UtilsNew from "../../../../core/utils-new.js";
import CatalogGridFormatter from "../../../commons/catalog-grid-formatter.js";
import UtilsNew from "../../../../../core/utils-new.js";
import CatalogGridFormatter from "../../../../commons/catalog-grid-formatter.js";
import AnalysisRegistry from "../analysis-registry.js";
import GridCommons from "../../../commons/grid-commons.js";
import GridCommons from "../../../../commons/grid-commons.js";
import knockoutDataIndividuals from "../test/knockout.20201103172343.kFIvpr.individuals.js";
import "./knockout-individual-variants.js";
import "../../../family/family-view.js";
import "../../../../family/family-view.js";

export default class KnockoutIndividualView extends LitElement {

Expand Down
9 changes: 4 additions & 5 deletions ...analysis/knockout-variant-allele-pairs.js → ...analysis/knockout-variant-allele-pairs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

import {LitElement, html} from "lit";
import UtilsNew from "../../../../core/utils-new.js";
import GridCommons from "../../../commons/grid-commons.js";
import "./../../../commons/view/detail-tabs.js";
import UtilsNew from "../../../../../core/utils-new.js";
import GridCommons from "../../../../commons/grid-commons.js";
import "../../../../commons/view/detail-tabs.js";
import knockoutDataIndividuals from "../test/knockout.20201103172343.kFIvpr.individuals.js";


Expand Down Expand Up @@ -54,8 +54,7 @@ export default class KnockoutVariantAllelePairs extends LitElement {
}

updated(changedProperties) {
if (changedProperties.has("opencgaSession")) {
}
// if (changedProperties.has("opencgaSession")) {}

if (changedProperties.has("variantId")) {
this.prepareData();
Expand Down
11 changes: 5 additions & 6 deletions ...t-analysis/knockout-variant-individual.js → ...t-analysis/knockout-variant-individual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

import {LitElement, html} from "lit";
import UtilsNew from "../../../../core/utils-new.js";
import GridCommons from "../../../commons/grid-commons.js";
import "./../../../commons/view/detail-tabs.js";
import UtilsNew from "../../../../../core/utils-new.js";
import GridCommons from "../../../../commons/grid-commons.js";
import "../../../../commons/view/detail-tabs.js";
import knockoutDataIndividuals from "../test/knockout.20201103172343.kFIvpr.individuals.js";


Expand Down Expand Up @@ -54,8 +54,7 @@ export default class KnockoutVariantIndividual extends LitElement {
}

updated(changedProperties) {
if (changedProperties.has("opencgaSession")) {
}
// if (changedProperties.has("opencgaSession")) {}

if (changedProperties.has("variant")) {
this.prepareData();
Expand Down Expand Up @@ -86,7 +85,7 @@ export default class KnockoutVariantIndividual extends LitElement {
uniqueId: "id",
pagination: true,
paginationVAlign: "both",
//formatShowingRows: this.gridCommons.formatShowingRows,
// formatShowingRows: this.gridCommons.formatShowingRows,
gridContext: this,
formatLoadingMessage: () => "<div><loading-spinner></loading-spinner></div>",
onClickRow: (row, selectedElement, field) => {
Expand Down
12 changes: 6 additions & 6 deletions ...nockout-analysis/knockout-variant-view.js → ...nockout-analysis/knockout-variant-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/

import {LitElement, html} from "lit";
import UtilsNew from "../../../../core/utils-new.js";
import CatalogGridFormatter from "../../../commons/catalog-grid-formatter.js";
import UtilsNew from "../../../../../core/utils-new.js";
import CatalogGridFormatter from "../../../../commons/catalog-grid-formatter.js";
import AnalysisRegistry from "../analysis-registry.js";
import GridCommons from "../../../commons/grid-commons.js";
import GridCommons from "../../../../commons/grid-commons.js";
import knockoutData from "../test/knockout.20201029141213.SChLEA.js";
import "./knockout-individual-variants.js";
import "./knockout-variant-allele-pairs.js";
import "./knockout-variant-individual.js";
import "../../../family/family-view.js";
import "../../annotation/cellbase-population-frequency-grid.js";
import "../../annotation/variant-annotation-clinical-view.js";
import "../../../../family/family-view.js";
import "../../../annotation/cellbase-population-frequency-grid.js";
import "../../../annotation/variant-annotation-clinical-view.js";


export default class KnockoutVariantView extends LitElement {
Expand Down
2 changes: 1 addition & 1 deletion ...is/test/knockout.20201029141213.SChLEA.js → ...ed/test/knockout.20201029141213.SChLEA.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,4 +375,4 @@ export default [
}
]
}
]
];
0 ...st/knockout.20201103172343.kFIvpr.gene.js → ...st/knockout.20201103172343.kFIvpr.gene.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...kout.20201103172343.kFIvpr.individuals.js → ...kout.20201103172343.kFIvpr.individuals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,4 @@ export default [
}
]
}
]
];
0 ...est/opencga-knockout-analysis-result.html → ...est/opencga-knockout-analysis-result.html
View file
Open in desktop
File renamed without changes.