Read subjectId off URL

Author: bbimber

LDK/resources/web/LDK/panel/TabbedReportPanel.js

@@ -1071,8 +1071,8 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
         return filter ? Ext4.apply({}, filter) : null;
     },
 
-    getFiltersFromUrl: function(){
-        var context = {};
+    getFiltersFromUrl: function(context){
+        context = context || {};
 
         if (document.location.hash){
             var token = document.location.hash.split('#');
@@ -1302,18 +1302,11 @@ Ext4.define('LDK.panel.TabbedReportPanel', {
             if (report)
                 this.silentlySetActiveTab(report);
         }
-        else if (this.defaultTab) {
-            var tab = tabPanel.down('#' + this.defaultTab);
-            tabPanel.suspendEvents();
-            tab.suspendEvents();
-            tabPanel.setActiveTab(tab);
-            tab.resumeEvents();
-            tabPanel.resumeEvents();
-        }
 
         //populate initial fields
         var shouldChange = true;
-        this.initialContext = this.getFiltersFromUrl();
+
+        this.initialContext = this.getFiltersFromUrl(this.initialContext);
         var filterType = this.initialContext.inputType;
         if (filterType){
             var radio = this.down('#inputType');

laboratory/resources/web/laboratory/panel/DataBrowserPanel.js

@@ -0,0 +1,58 @@
+Ext4.define('Laboratory.panel.DataBrowserPanel', {
+    extend: 'LDK.panel.TabbedReportPanel',
+
+    initComponent: function(){
+        Ext4.ns('Laboratory.tabbedReports');
+
+        Ext4.apply(this, {
+            //defaultReport: 'abstract',
+            reportNamespace: Laboratory.tabbedReports
+        });
+
+        Ext4.Msg.wait('Loading...');
+        Laboratory.Utils.getDataItems({
+            types: ['tabbedReports'],
+            scope: this,
+            success: this.onDataLoad,
+            failure: LDK.Utils.getErrorCallback()
+        });
+
+        this.callParent();
+    },
+
+    onDataLoad: function(results){
+        Ext4.Msg.hide();
+        this.reports = [];
+        Ext4.each(results.tabbedReports, function(report){
+            LDK.Assert.assertNotEmpty('Tabbed Report is null', report);
+            if (report && report.key){
+                report.id = report.key.replace(/:/g, '_');
+                report.category = report.reportCategory;
+
+                if (report.targetContainer){
+                    report.containerPath = report.targetContainer;
+                }
+                this.reports.push(report);
+            }
+        }, this);
+
+        this.reports = LDK.Utils.sortByProperty(this.reports, 'name', false);
+        this.reports = LDK.Utils.sortByProperty(this.reports, 'reportCategory', false);
+
+        this.createTabPanel();
+    },
+
+    filterTypes: [{
+        xtype: 'ldk-singlesubjectfiltertype',
+        inputValue: LDK.panel.SingleSubjectFilterType.filterName,
+        label: LDK.panel.SingleSubjectFilterType.DEFAULT_LABEL
+    },{
+        xtype: 'ldk-multisubjectfiltertype',
+        inputValue: LDK.panel.MultiSubjectFilterType.filterName,
+        label: LDK.panel.MultiSubjectFilterType.label
+    },{
+        xtype: 'ldk-nofiltersfiltertype',
+        inputValue: LDK.panel.NoFiltersFilterType.filterName,
+        label: LDK.panel.NoFiltersFilterType.label
+    }]
+});

laboratory/src/org/labkey/laboratory/view/dataBrowser.jsp

@@ -27,6 +27,11 @@
     public void addClientDependencies(ClientDependencies dependencies)
     {
         dependencies.add("laboratory.context");
+        dependencies.add("/laboratory/panel/DataBrowserPanel.js");
+        dependencies.add("LDK/panel/AbstractFilterType.js");
+        dependencies.add("LDK/panel/SingleSubjectFilterType.js");
+        dependencies.add("LDK/panel/MultiSubjectFilterType.js");
+        dependencies.add("LDK/panel/NoFiltersFilterType.js");
     }
 
     private String getFilterConfig()
@@ -59,53 +64,13 @@
 <div id="<%=h(wpId)%>"></div>
 
 <script type="text/javascript" nonce="<%=getScriptNonce()%>">
-    Ext4.onReady(function(){
-        var webpartId = <%=q(wpId)%>;
-
-        Ext4.define('Laboratory.panel.TabbedReportPanel', {
-            extend: 'LDK.panel.TabbedReportPanel',
-
-            initComponent: function(){
-                Ext4.ns('Laboratory.tabbedReports');
-
-                Ext4.apply(this, {
-                    //defaultReport: 'abstract',
-                    reportNamespace: Laboratory.tabbedReports
-                });
-
-                Ext4.Msg.wait('Loading...');
-                Laboratory.Utils.getDataItems({
-                    types: ['tabbedReports'],
-                    scope: this,
-                    success: this.onDataLoad,
-                    failure: LDK.Utils.getErrorCallback()
-                });
-
-                this.callParent();
-            },
-
-            onDataLoad: function(results){
-                Ext4.Msg.hide();
-                this.reports = [];
-                Ext4.each(results.tabbedReports, function(report){
-                    LDK.Assert.assertNotEmpty('Tabbed Report is null', report);
-                    if (report && report.key){
-                        report.id = report.key.replace(/:/g, '_');
-                        report.category = report.reportCategory;
-
-                        if (report.targetContainer){
-                            report.containerPath = report.targetContainer;
-                        }
-                        this.reports.push(report);
-                    }
-                }, this);
-
-                this.reports = LDK.Utils.sortByProperty(this.reports, 'name', false);
-                this.reports = LDK.Utils.sortByProperty(this.reports, 'reportCategory', false);
-
-                this.createTabPanel();
-            },
+    var subjectId = LABKEY.ActionURL.getParameter('subjectId');
 
+    Ext4.onReady(function(){
+        Ext4.create('Laboratory.panel.DataBrowserPanel', {
+            initialContext: subjectId ? {
+                subjects: subjectId
+            } : null,
             filterTypes: [{
                 xtype: 'ldk-singlesubjectfiltertype',
                 inputValue: LDK.panel.SingleSubjectFilterType.filterName,
@@ -119,8 +84,6 @@
                 inputValue: LDK.panel.NoFiltersFilterType.filterName,
                 label: LDK.panel.NoFiltersFilterType.label
             }]
-        });
-
-        Ext4.create('Laboratory.panel.TabbedReportPanel').render(webpartId);
+        }).render(<%=q(wpId)%>);
     });
 </script>