Merge branch 'release-3.x.x' into TASK-6850

opencb · Sep 23, 2024 · 6dae7aa · 6dae7aa
2 parents a77abb3 + a61760a
commit 6dae7aa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/src/webcomponents/commons/forms/select-field-filter.js b/src/webcomponents/commons/forms/select-field-filter.js
@@ -108,6 +108,11 @@ export default class SelectFieldFilter extends LitElement {
         }
 
         this.select.empty();
+
+        // Force to unbind 'select2:select' and 'select2:unselect' listeners
+        this.select.off("select2:select");
+        this.select.off("select2:unselect");
+
         const options = this.data.map(item => this.getOptions(item));
 
         const selectConfig = {

diff --git a/src/webcomponents/commons/layouts/custom-footer.js b/src/webcomponents/commons/layouts/custom-footer.js
@@ -151,7 +151,7 @@ export default class CustomFooter extends LitElement {
                     <div class="d-flex gap-3">
                         <div class="footer-item footer-section-text">
                             <a class="text-white" href="https://github.com/opencb/jsorolla" target="blank">
-                                ${this.appName || "IVA (JSorolla)"} <sup>${this.version || this.config?.version}</sup>
+                                ${this.appName || "IVA (JSorolla)"} <sup>v${this.version || this.config?.version}</sup>
                             </a>
                         </div>
                         ${this.host?.opencga ? html `

diff --git a/src/webcomponents/commons/opencga-browser.js b/src/webcomponents/commons/opencga-browser.js
@@ -318,7 +318,7 @@ export default class OpencgaBrowser extends LitElement {
 
     renderButtonViews() {
         return html `
-            <div class="content-pills mb-3" role="toolbar" aria-label="toolbar">
+            <div class="d-flex gap-1 mb-3" role="toolbar" aria-label="toolbar">
                 ${(this._config.views || []).map(view => html`
                     <button
                         type="button"

diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-browser-template.js b/src/webcomponents/variant/interpretation/variant-interpreter-browser-template.js
@@ -387,7 +387,8 @@ class VariantInterpreterBrowserTemplate extends LitElement {
             <button class="${`btn btn-success ${this.activeView === id ? "active" : ""}`}" @click="${() => this.onChangeView(id)}">
                 <i class="${`fa fa-${icon} icon-padding`}" aria-hidden="true"></i>
                 <strong>${title}</strong>
-            </button>`;
+            </button>
+        `;
     }
 
     render() {
@@ -435,7 +436,7 @@ class VariantInterpreterBrowserTemplate extends LitElement {
 
                 <div class="flex-grow-1">
                     <!-- View toolbar -->
-                    <div class="content-pills mb-3" role="toolbar" aria-label="toolbar">
+                    <div class="d-flex gap-1 mb-3" role="toolbar" aria-label="toolbar">
                         ${this.renderViewButton("table", "Table Result", "table")}
                         ${!this.settings?.hideGenomeBrowser ? this.renderViewButton("genome-browser", "Genome Browser", "dna") : nothing}
                     </div>

diff --git a/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js b/src/webcomponents/variant/interpretation/variant-interpreter-rearrangement-grid.js
@@ -376,7 +376,6 @@ export default class VariantInterpreterRearrangementGrid extends LitElement {
         this.table.bootstrapTable({
             theadClasses: "table-light",
             buttonsClass: "light",
-            data: variants,
             columns: this._getDefaultColumns(),
             sidePagination: "server",
             // Josemi Note 2024-01-31: we have added the ajax function for local variants for getting genes info
@@ -663,6 +662,7 @@ export default class VariantInterpreterRearrangementGrid extends LitElement {
                     events: {
                         "click a": this.onActionClick.bind(this)
                     },
+                    visible: this._config?.showActions,
                     excludeFromExport: true,
                     excludeFromSettings: true,
                 }
@@ -1042,7 +1042,7 @@ export default class VariantInterpreterRearrangementGrid extends LitElement {
             showReview: true,
             showEditReview: true,
             showSelectCheckbox: false,
-            showActions: false,
+            showActions: true,
             multiSelection: false,
             nucleotideGenotype: true,
             hideVcfFileData: false,

diff --git a/src/webcomponents/variant/variant-browser.js b/src/webcomponents/variant/variant-browser.js
@@ -346,24 +346,24 @@ export default class VariantBrowser extends LitElement {
 
                 <div class="col-md-10">
                     <!-- TAB buttons -->
-                    <div class="content-pills mb-3" role="toolbar" aria-label="toolbar">
+                    <div class="d-flex gap-1 mb-3" role="toolbar" aria-label="toolbar">
                         <button
                             type="button"
-                            class="${`btn btn-success ${this.activeTab === "table-tab" ? "active" : ""} content-pills`}"
+                            class="${`btn btn-success ${this.activeTab === "table-tab" ? "active" : ""}`}"
                             @click="${() => this.changeView("table-tab")}">
                             <i class="fa fa-table icon-padding" aria-hidden="true"></i>
                             <strong>Table Result</strong>
                         </button>
                         <button
                             type="button"
-                            class="${`btn btn-success ${this.activeTab === "facet-tab" ? "active" : ""} content-pills`}"
+                            class="${`btn btn-success ${this.activeTab === "facet-tab" ? "active" : ""}`}"
                             @click="${() => this.changeView("facet-tab")}">
                             <i class="fas fa-chart-bar icon-padding" aria-hidden="true"></i>
                             <strong>Aggregation Stats</strong>
                         </button>
                         <button
                             type="button"
-                            class="${`btn btn-success ${this.activeTab === "genome-tab" ? "active" : ""} content-pills`}"
+                            class="${`btn btn-success ${this.activeTab === "genome-tab" ? "active" : ""}`}"
                             @click="${() => this.changeView("genome-tab")}">
                             <i class="fas fa-dna icon-padding" aria-hidden="true"></i>
                             <strong>Genome Browser</strong>