Add quick search to Browser and Interpretation

opencb · Jan 14, 2019 · 76ffb33 · 76ffb33
1 parent 00b9c97
commit 76ffb33
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/lib/jsorolla b/lib/jsorolla
diff --git a/src/conf/tools.js b/src/conf/tools.js
@@ -24,13 +24,33 @@ const filterMenu = {
     },
     skipSubsections: [],    // controls which subsections are disabled and should not be displayed
     sections: [             // sections and subsections, structure and order is respected
+        // {
+        //     title: "Clinical Interpretation",
+        //     collapsed: false,
+        //     subsections: [
+        //         {
+        //             id: "sample",
+        //             title: "Sample and File Filters",
+        //             showApproximateCount: true,
+        //             showSelectSamples: true,
+        //             inheritanceModes: [
+        //                 {key: "none", text: "Select..."},
+        //                 {key: "autoDominant", text: "Autosomal Dominant"},
+        //                 {key: "autoRecessive", text: "Autosomal Recessive"},
+        //                 {key: "xLinked", text: "X linked"},
+        //                 {key: "yLinked", text: "Y linked"}
+        //             ],
+        //             tooltip: "Filter by sample genotypes"
+        //         }
+        //     ]
+        // },
         {
             title: "Study and Cohorts",
             collapsed: false,
             subsections: [
                 {
                     id: "sample",
-                    title: "Samples",
+                    title: "Sample and File Filters",
                     showApproximateCount: true,
                     showSelectSamples: true,
                     inheritanceModes: [
@@ -214,6 +234,18 @@ const filterMenu = {
     ]
 };
 
+// Prepare Browser and Interpretation filter menu
+// let browserFilterMenu = Object.assign(filterMenu);
+// let browserFilterMenuSections = filterMenu.sections.slice(0);
+// browserFilterMenuSections.splice(0, 1);
+// browserFilterMenu.sections = browserFilterMenuSections;
+// debugger
+//
+// let interpretationFilterMenu = Object.assign(filterMenu);
+// let interpretationFilterMenuSections = filterMenu.sections.slice(0);
+// interpretationFilterMenuSections.splice(1, 1);
+// interpretationFilterMenu.sections = interpretationFilterMenuSections;
+
 const tools = {
     browser: {
         title: "Variant Browser",

diff --git a/src/iva-app.html b/src/iva-app.html
@@ -195,7 +195,7 @@
                                                 <input type="text" class="form-control" id="searchTextBox"
                                                        placeholder="{{config.search.placeholder}}" on-keyup="buildQuery" style="width: 180px;">
                                                 <a style="cursor: pointer">
-                                                    <span class="fa fa-search" aria-hidden="true" on-click="buildQuery"></span>
+                                                    <span class="fa fa-search" aria-hidden="true" on-click="onQuickSearch"></span>
                                                 </a>
                                             </div>
                                         </form>
@@ -276,6 +276,7 @@
                     <div class="content" id="interpretation">
                         <opencga-variant-interpretation opencga-session="{{opencgaSession}}"
                                                         cellbase-client="{{cellbaseClient}}"
+                                                        query="{{interpretationSearchQuery}}"
                                                         active="{{config.tools.interpretation.active}}"
                                                         population-frequencies="{{config.populationFrequencies}}"
                                                         protein-substitution-scores="{{config.proteinSubstitutionScores}}"
@@ -1092,6 +1093,31 @@
                 }
             }
 
+            onQuickSearch(e) {
+                let gene = PolymerUtils.getValue("searchTextBox");
+                if (UtilsNew.isNotUndefinedOrNull(this.tool)) {
+                    let _query = {
+                        xref: gene
+                    };
+                    switch (this.tool) {
+                        case "#browser":
+                            window.location.hash = "browser/" + this.opencgaSession.project.alias + "/" + this.opencgaSession.study.alias;
+                            this.browserSearchQuery = _query;
+                            break;
+                        case "#interpretation":
+                            window.location.hash = "interpretation/" + this.opencgaSession.project.alias + "/" + this.opencgaSession.study.alias;
+                            this.interpretationSearchQuery = _query;
+                            break;
+                        default:
+                            this.tool = "#browser";
+                            window.location.hash = "browser/" + this.opencgaSession.project.alias + "/" + this.opencgaSession.study.alias;
+                            this.browserSearchQuery = _query;
+                            break;
+                    }
+                }
+                // debugger
+            }
+
             quickSearch(e) {
                 debugger
                 this.tool = "#browser";
+88 −21		src/core/webcomponents/opencga/catalog/clinical/opencga-clinical-analysis-creator.html
+65 −11		src/core/webcomponents/opencga/variant/VariantGridFormatter.js
+22 −12		src/core/webcomponents/opencga/variant/opencga-interpreted-variant-grid.html
+192 −167		src/core/webcomponents/opencga/variant/opencga-variant-filter.html
+18 −17		src/core/webcomponents/opencga/variant/opencga-variant-grid.html
+1 −1		src/core/webcomponents/opencga/variant/opencga-variant-interpretation.html