Skip to content

Commit 021d4ad

Browse files
committed
wc: variant components refactoring
1 parent 8ce32e0 commit 021d4ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+108
-235
lines changed

src/core/webcomponents/alignment/gene-coverage-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
19-
import GridCommons from "../variant/grid-commons.js";
19+
import GridCommons from "../commons/grid-commons.js";
2020
import "../commons/opencb-grid-toolbar.js";
2121
import "../loading-spinner.js";
2222
// import DATA from "./data.js";

src/core/webcomponents/clinical/clinical-analysis-audit-browser.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import {classMap} from "/web_modules/lit-html/directives/class-map.js";
1919
import UtilsNew from "../../utilsNew.js";
20-
import "../tool-header.js";
20+
import "../commons/tool-header.js";
2121
import "../variant/interpretation/variant-interpreter-grid.js";
2222
import "../variant/interpretation/variant-interpreter-detail.js";
2323
import "../variant/opencga-variant-filter.js";
24-
import GridCommons from "../variant/grid-commons.js";
24+
import GridCommons from "../commons/grid-commons.js";
2525

2626
class ClinicalAnalysisAuditBrowser extends LitElement {
2727

src/core/webcomponents/clinical/clinical-analysis-interpretation-editor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import {html, LitElement} from "/web_modules/lit-element.js";
1818
import {classMap} from "/web_modules/lit-html/directives/class-map.js";
1919
import UtilsNew from "../../utilsNew.js";
20-
import GridCommons from "../variant/grid-commons.js";
20+
import GridCommons from "../commons/grid-commons.js";
2121
import ClinicalAnalysisManager from "../clinical/clinical-analysis-manager.js";
2222

2323

src/core/webcomponents/clinical/opencga-clinical-analysis-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import {classMap} from "/web_modules/lit-html/directives/class-map.js";
1919
import OpencgaCatalogUtils from "../../clients/opencga/opencga-catalog-utils.js";
2020
import UtilsNew from "../../utilsNew.js";
21-
import GridCommons from "../variant/grid-commons.js";
21+
import GridCommons from "../commons/grid-commons.js";
2222
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2323
import "../commons/opencb-grid-toolbar.js";
2424

src/core/webcomponents/clinical/opencga-clinical-portal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import OpencgaCatalogUtils from "../../clients/opencga/opencga-catalog-utils.js";
1919
import UtilsNew from "../../utilsNew.js";
2020
import PolymerUtils from "../PolymerUtils.js";
21-
import "../tool-header.js";
21+
import "../commons/tool-header.js";
2222
import "./opencga-clinical-review-cases.js";
2323
import "./opencga-clinical-analysis-writer.js";
2424
import "./../opencga/catalog/panel/opencga-panel-browser.js";

src/core/webcomponents/cohort/opencga-cohort-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
19-
import GridCommons from "../variant/grid-commons.js";
19+
import GridCommons from "../commons/grid-commons.js";
2020
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2121
import PolymerUtils from "../PolymerUtils.js";
2222

src/core/webcomponents/variant/grid-commons.js src/core/webcomponents/commons/grid-commons.js

+2
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ export default class GridCommons {
172172
}
173173
}));
174174
}
175+
176+
// This init all grid tooltips
175177
UtilsNew.initTooltip(this.context);
176178
}
177179

src/core/webcomponents/json-viewer.js src/core/webcomponents/commons/json-viewer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2015-2019 OpenCB
1+
/*
2+
* Copyright 2015-2016 OpenCB
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
1515
*/
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
18-
import UtilsNew from "../utilsNew.js";
19-
import "./download-button.js";
18+
import UtilsNew from "../../utilsNew.js";
19+
import "../download-button.js";
2020

2121
export default class JsonViewer extends LitElement {
2222

src/core/webcomponents/commons/opencga-browser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import "./filters/select-field-filter.js";
2222
import "./opencb-facet-results.js";
2323
import "./facet-filter.js";
2424
import "../loading-spinner.js";
25-
import "../tool-header.js";
25+
import "./tool-header.js";
2626
import "../file/opencga-file-grid.js";
2727
import "../file/opencga-file-filter.js";
2828
import "../file/opencga-file-detail.js";

src/core/webcomponents/simple-chart.js src/core/webcomponents/commons/simple-chart.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2015-2019 OpenCB
1+
/*
2+
* Copyright 2015-2016 OpenCB
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
18-
import UtilsNew from "../utilsNew.js";
18+
import UtilsNew from "../../utilsNew.js";
1919

2020

2121
export default class SimpleChart extends LitElement {

src/core/webcomponents/tool-header.js src/core/webcomponents/commons/tool-header.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/**
2-
* Copyright 2015-2019 OpenCB
1+
/*
2+
* Copyright 2015-2016 OpenCB
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
18-
import UtilsNew from "../utilsNew.js";
18+
import UtilsNew from "../../utilsNew.js";
1919

2020
export default class ToolHeader extends LitElement {
2121

src/core/webcomponents/commons/view/data-form.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import {html, LitElement} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../../utilsNew.js";
19-
import "../../simple-chart.js";
20-
import "../../json-viewer.js";
19+
import "../simple-chart.js";
20+
import "../json-viewer.js";
2121
import "../../tree-viewer.js";
2222
import "../../download-button.js";
2323
import "../../commons/filters/text-field-filter.js";

src/core/webcomponents/commons/view/data-view.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import {html, LitElement} from "/web_modules/lit-element.js";
1818
// import {directive} from "/web_modules/lit-html.js";
1919
import UtilsNew from "../../../utilsNew.js";
20-
import "../../simple-chart.js";
21-
import "../../json-viewer.js";
20+
import "../simple-chart.js";
21+
import "../json-viewer.js";
2222
import "../../download-button.js";
2323

2424
export default class DataView extends LitElement {

src/core/webcomponents/family/opencga-family-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
19-
import GridCommons from "../variant/grid-commons.js";
19+
import GridCommons from "../commons/grid-commons.js";
2020
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2121
import CatalogUtils from "../commons/catalog-utils.js";
2222
import "./opencga-family-filter.js";

src/core/webcomponents/file/opencga-file-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import {NotificationQueue} from "../Notification.js";
20-
import GridCommons from "../variant/grid-commons.js";
20+
import GridCommons from "../commons/grid-commons.js";
2121
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2222
import "../commons/opencb-grid-toolbar.js";
2323
import "../loading-spinner.js";

src/core/webcomponents/file/opencga-file-preview.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
18-
import "../json-viewer.js";
18+
import "../commons/json-viewer.js";
1919
import UtilsNew from "../../utilsNew.js";
2020

2121

src/core/webcomponents/individual/opencga-individual-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import {html, LitElement} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import {NotificationQueue} from "../Notification.js";
20-
import GridCommons from "../variant/grid-commons.js";
20+
import GridCommons from "../commons/grid-commons.js";
2121
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2222
import CatalogUtils from "../commons/catalog-utils.js";
2323
import "../commons/opencb-grid-toolbar.js";

src/core/webcomponents/job/opencga-job-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
19-
import GridCommons from "../variant/grid-commons.js";
19+
import GridCommons from "../commons/grid-commons.js";
2020
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2121
import "../commons/opencb-grid-toolbar.js";
2222
import "../loading-spinner.js";

src/core/webcomponents/opencga/opencga-gene-view.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import PolymerUtils from "../PolymerUtils.js";
20-
import "../variant/opencga-variant-grid.js";
20+
import "../variant/variant-browser-grid.js";
2121
import "../variant/variant-protein-view.js";
22-
import "../variant/opencga-variant-detail-view.js";
22+
import "../variant/variant-browser-detail.js";
2323

2424

2525
export default class OpencgaGeneView extends LitElement {

src/core/webcomponents/opencga/opencga-protein-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import PolymerUtils from "../PolymerUtils.js";
20-
import "./../variant/opencga-variant-grid.js";
20+
import "../variant/variant-browser-grid.js";
2121

2222

2323
export default class OpencgaProteinView extends LitElement {

src/core/webcomponents/opencga/opencga-transcript-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import PolymerUtils from "../PolymerUtils.js";
20-
import "../variant/opencga-variant-grid.js";
20+
import "../variant/variant-browser-grid.js";
2121
import "../variant/variant-protein-view.js";
2222

2323

src/core/webcomponents/sample/opencga-sample-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
19-
import GridCommons from "../variant/grid-commons.js";
19+
import GridCommons from "../commons/grid-commons.js";
2020
import CatalogGridFormatter from "../commons/catalog-grid-formatter.js";
2121
import CatalogUtils from "../commons/catalog-utils.js";
2222
import "../commons/opencb-grid-toolbar.js";

src/core/webcomponents/sample/sample-qc-signature-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import "../commons/view/signature-view.js";
2020
import "../commons/view/data-form.js";
21-
import "../simple-chart.js";
21+
import "../commons/simple-chart.js";
2222

2323
class SampleQcSignatureView extends LitElement {
2424

src/core/webcomponents/sample/sample-variant-stats-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../utilsNew.js";
1919
import ClinicalAnalysisUtils from "../clinical/clinical-analysis-utils.js";
20-
import "../simple-chart.js";
20+
import "../commons/simple-chart.js";
2121
import "../commons/view/data-form.js";
2222

2323
/**

src/core/webcomponents/user/opencga-projects.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import {RestResponse} from "../../clients/rest-response.js";
1919
import UtilsNew from "../../utilsNew.js";
20-
import "../tool-header.js";
20+
import "../commons/tool-header.js";
2121
import {CountUp} from "/node_modules/countup.js/dist/countUp.min.js";
22-
import "../simple-chart.js";
22+
import "../commons/simple-chart.js";
2323

2424
export default class OpencgaProjects extends LitElement {
2525

src/core/webcomponents/variant/analysis/opencga-knockout-analysis-result.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
1818
import {classMap} from "/web_modules/lit-html/directives/class-map.js";
19-
import GridCommons from "../grid-commons.js";
19+
import GridCommons from "../../commons/grid-commons.js";
2020
import UtilsNew from "./../../../utilsNew.js";
2121
import "../../commons/analysis/opencga-analysis-tool.js";
2222
import AnalysisRegistry from "./analysis-registry.js";

src/core/webcomponents/variant/analysis/opencga-knockout-analysis/knockout-gene-grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import {classMap} from "/web_modules/lit-html/directives/class-map.js";
1919
import UtilsNew from "../../../../utilsNew.js";
2020
import AnalysisRegistry from "../analysis-registry.js";
21-
import GridCommons from "../../grid-commons.js";
21+
import GridCommons from "../../../commons/grid-commons.js";
2222
import knockoutDataGene from "../test/knockout.20201103172343.kFIvpr.gene.js";
2323

2424
export default class KnockoutGeneGrid extends LitElement {

src/core/webcomponents/variant/analysis/opencga-knockout-analysis/knockout-individual-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../../../utilsNew.js";
1919
import CatalogGridFormatter from "../../../commons/catalog-grid-formatter.js";
2020
import AnalysisRegistry from "../analysis-registry.js";
21-
import GridCommons from "../../grid-commons.js";
21+
import GridCommons from "../../../commons/grid-commons.js";
2222
import knockoutDataIndividuals from "../test/knockout.20201103172343.kFIvpr.individuals.js";
2323
import "./knockout-individual-variants.js";
2424
import "../../../family/opencga-family-view.js";

src/core/webcomponents/variant/analysis/opencga-knockout-analysis/knockout-variant-view.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import UtilsNew from "../../../../utilsNew.js";
1919
import CatalogGridFormatter from "../../../commons/catalog-grid-formatter.js";
2020
import AnalysisRegistry from "../analysis-registry.js";
21-
import GridCommons from "../../grid-commons.js";
21+
import GridCommons from "../../../commons/grid-commons.js";
2222
import knockoutData from "../test/knockout.20201029141213.SChLEA.js";
2323
import "./knockout-individual-variants.js";
2424
import "../../../family/opencga-family-view.js";

src/core/webcomponents/variant/deprecated/interpretation-history.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {LitElement, html} from "/web_modules/lit-element.js";
1818
import ClinicalAnalysisUtils from "../../clinical/clinical-analysis-utils.js";
1919
import UtilsNew from "../../../utilsNew.js";
2020
import PolymerUtils from "../../PolymerUtils.js";
21-
import "../../tool-header.js";
21+
import "../../commons/tool-header.js";
2222
import "../interpretation/variant-interpreter-grid.js";
2323
import "../interpretation/variant-interpreter-detail.js";
2424
import "../opencga-variant-filter.js";
@@ -31,7 +31,7 @@ import "../../commons/filters/deprecated/ascat-caller-filter.js";
3131
import "../../commons/filters/deprecated/canvas-caller-filter.js";
3232
import "../../commons/filters/deprecated/brass-caller-filter.js";
3333
import "../../commons/filters/deprecated/manta-caller-filter.js";
34-
import GridCommons from "../grid-commons.js";
34+
import GridCommons from "../../commons/grid-commons.js";
3535

3636
class InterpretationHistory extends LitElement {
3737

src/core/webcomponents/variant/opencga-variant-detail.js src/core/webcomponents/variant/deprecated/opencga-variant-detail.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
import {LitElement, html} from "/web_modules/lit-element.js";
18-
import UtilsNew from "./../../utilsNew.js";
19-
import "./annotation/cellbase-variant-annotation-summary.js";
20-
import "./annotation/variant-consequence-type-view.js";
21-
import "./annotation/cellbase-population-frequency-grid.js";
22-
import "./annotation/variant-annotation-clinical-view.js";
23-
import "./opencga-variant-cohort-stats.js";
24-
import "./opencga-variant-samples.js";
18+
import UtilsNew from "../../../utilsNew.js";
19+
import "../annotation/cellbase-variant-annotation-summary.js";
20+
import "../annotation/variant-consequence-type-view.js";
21+
import "../annotation/cellbase-population-frequency-grid.js";
22+
import "../annotation/variant-annotation-clinical-view.js";
23+
import "../variant-cohort-stats.js";
24+
import "../opencga-variant-samples.js";
2525

2626
/**
2727
* @deprecated

src/core/webcomponents/variant/interpretation/variant-interpreter-browser-cancer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import "./variant-interpreter-browser-toolbar.js";
2323
import "./variant-interpreter-grid.js";
2424
import "./variant-interpreter-detail.js";
2525
import "../opencga-variant-filter.js";
26-
import "../../tool-header.js";
26+
import "../../commons/tool-header.js";
2727
import "../../commons/opencga-active-filters.js";
2828
import "../../commons/filters/sample-genotype-filter.js";
2929
import "../../commons/filters/variant-caller-info-filter.js";

src/core/webcomponents/variant/interpretation/variant-interpreter-browser-rd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import "./variant-interpreter-browser-toolbar.js";
2323
import "./variant-interpreter-grid.js";
2424
import "./variant-interpreter-detail.js";
2525
import "../opencga-variant-filter.js";
26-
import "../../tool-header.js";
26+
import "../../commons/tool-header.js";
2727
import "../../commons/opencga-active-filters.js";
2828

2929

src/core/webcomponents/variant/interpretation/variant-interpreter-detail.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ export default class VariantInterpreterDetail extends LitElement {
244244
<!-- Cohort Stats Tab -->
245245
<div id="${this._prefix}cohortStats" role="tabpanel" class="tab-pane">
246246
<div style="width: 90%;padding: 15px">
247-
<opencga-variant-cohort-stats .opencgaSession="${this.opencgaSession}"
248-
.variantId="${this.variant.id}"
249-
.active="${this.detailActiveTabs.cohortStats}">
250-
</opencga-variant-cohort-stats>
247+
<variant-cohort-stats .opencgaSession="${this.opencgaSession}"
248+
.variantId="${this.variant.id}"
249+
.active="${this.detailActiveTabs.cohortStats}">
250+
</variant-cohort-stats>
251251
</div>
252252
</div>
253253

0 commit comments

Comments
 (0)