More cleanup in NavItems / TabbedReports

Author: bbimber

laboratory/src/org/labkey/laboratory/LaboratoryController.java

@@ -1792,7 +1792,17 @@ public ApiResponse execute(GetDataItemsForm form, BindException errors)
                     ensureModuleActive(item);
 
                     if (form.isIncludeAll() || item.isVisible(getContainer(), getUser()))
-                        json.add(item.toJSON(getContainer(), getUser()));
+                    {
+                        JSONObject jo = item.toJSON(getContainer(), getUser());
+                        if (jo == null)
+                        {
+                            _log.error("Invalid JSON for tabbedReport item: " + item.getPropertyManagerKey());
+                        }
+                        else
+                        {
+                            json.add(jo);
+                        }
+                    }
                 }
                 results.put(LaboratoryService.NavItemCategory.tabbedReports.name(), json);
             }

laboratory/src/org/labkey/laboratory/LaboratoryDataProvider.java

@@ -330,10 +330,15 @@ public List<NavItem> getSubjectIdSummary(Container c, User u, String subjectId)
     @Override
     public List<TabbedReportItem> getTabbedReportItems(Container c, User u)
     {
+        if (!c.getActiveModules().contains(getOwningModule()))
+        {
+            return Collections.emptyList();
+        }
+
         List<TabbedReportItem> items = new ArrayList<>();
         QueryCache cache = new QueryCache();
 
-        NavItem nav = new QueryImportNavItem(this, LaboratoryModule.SCHEMA_NAME, "Samples", LaboratoryService.NavItemCategory.samples, "Samples", cache);
+        NavItem nav = getReportItems(c, u).get(0);
         TabbedReportItem item = new QueryTabbedReportItem(cache, this, LaboratoryModule.SCHEMA_NAME, "Samples", "Samples", "Samples");
         item.setQueryCache(cache);
         item.setVisible(nav.isVisible(c, u));