LabKey · cnathe · Oct 4, 2024 · Sep 20, 2024 · Sep 20, 2024 · Sep 25, 2024
diff --git a/api/src/org/labkey/api/reports/report/ReportDescriptor.java b/api/src/org/labkey/api/reports/report/ReportDescriptor.java
@@ -288,6 +288,11 @@ public void setWasShared()
         _wasShared = true;
     }
 
+    public boolean isInheritable()
+    {
+        return (getFlags() & FLAG_INHERITABLE) != 0;
+    }
+
     @Nullable
     public Integer getAuthor()
     {
@@ -780,7 +785,7 @@ public boolean isInherited(Container c)
             // if the report has been configured to be shared to child folders or is in the shared folder then
             // flag it as inherited.
             //
-            if (((getFlags() & ReportDescriptor.FLAG_INHERITABLE) != 0) || (ContainerManager.getSharedContainer().equals(srcContainer)))
+            if (isInheritable() || (ContainerManager.getSharedContainer().equals(srcContainer)))
             {
                 return !c.equals(srcContainer);
             }

diff --git a/api/src/org/labkey/api/reports/report/view/ReportDesignBean.java b/api/src/org/labkey/api/reports/report/view/ReportDesignBean.java
@@ -292,8 +292,8 @@ void populateFromDescriptor(ReportDescriptor descriptor)
         setCached(BooleanUtils.toBoolean(descriptor.getProperty(ReportDescriptor.Prop.cached)));
 
         setReportAccess(descriptor.getAccess());
-        setShareReport((descriptor.isShared()));
-        setInheritable((descriptor.getFlags() & ReportDescriptor.FLAG_INHERITABLE) != 0);
+        setShareReport(descriptor.isShared());
+        setInheritable(descriptor.isInheritable());
         setRedirectUrl(getViewContext().getActionURL().getParameter(ReportDescriptor.Prop.redirectUrl.name()));
     }
 }
diff --git a/api/src/org/labkey/api/reports/report/view/ReportUtil.java b/api/src/org/labkey/api/reports/report/view/ReportUtil.java
@@ -325,7 +325,7 @@ public static boolean isReportInherited(Container c, Report report)
                 return !ContainerManager.getSharedContainer().equals(c);
             }
 
-            if ((report.getDescriptor().getFlags() & ReportDescriptor.FLAG_INHERITABLE) != 0)
+            if (report.getDescriptor().isInheritable())
             {
                 Container reportContainer = ContainerManager.getForId(report.getDescriptor().getContainerId());
                 if (!c.equals(reportContainer))

diff --git a/assay/package-lock.json b/assay/package-lock.json
diff --git a/assay/package.json b/assay/package.json
@@ -12,7 +12,7 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "5.7.0"
+    "@labkey/components": "5.11.0"
   },
   "devDependencies": {
     "@labkey/build": "7.7.1",

diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -54,7 +54,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "5.10.0",
+    "@labkey/components": "5.11.0",
     "@labkey/themes": "1.3.3"
   },
   "devDependencies": {

diff --git a/core/webapp/vis/src/internal/D3Renderer.js b/core/webapp/vis/src/internal/D3Renderer.js
@@ -15,7 +15,7 @@ LABKEY.vis.internal.Axis = function() {
         tickRectCls, tickRectHeightOffset = 12, tickRectWidthOffset = 8, tickClick, axisSel, tickSel, textSel, gridLineSel,
         borderSel, grid, scalesList = [], gridLinesVisible = 'both', tickDigits, tickValues, tickMax, tickLabelMax,
         tickColor = '#000000', tickTextColor = '#000000', gridLineColor = '#DDDDDD', borderColor = '#000000',
-        tickPadding = 0, tickLength = 8, tickWidth = 1, tickOverlapRotation = 15, gridLineWidth = 1, borderWidth = 1,
+        tickPadding = 0, tickLength = 8, tickWidth = 1, tickOverlapRotation = 25, gridLineWidth = 1, borderWidth = 1,
         fontFamily = 'Roboto, arial, helvetica, sans-serif', fontSize = 11, adjustedStarts, adjustedEnds, xLogGutterBorder = 0, yLogGutterBorder = 0,
         yGutterXOffset = 0, xGutterYOffset = 0, addLogGutterLabel = false, xGridExtension = 0, yGridExtension = 0, logGutterSel;
 

diff --git a/experiment/package-lock.json b/experiment/package-lock.json
diff --git a/experiment/package.json b/experiment/package.json
@@ -13,7 +13,7 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "5.8.2"
+    "@labkey/components": "5.11.0"
   },
   "devDependencies": {
     "@labkey/build": "7.7.1",

diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json
diff --git a/pipeline/package.json b/pipeline/package.json
@@ -14,7 +14,7 @@
     "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
   },
   "dependencies": {
-    "@labkey/components": "5.7.0"
+    "@labkey/components": "5.11.0"
   },
   "devDependencies": {
     "@labkey/build": "7.7.1",

diff --git a/query/src/org/labkey/query/QueryModule.java b/query/src/org/labkey/query/QueryModule.java
@@ -106,6 +106,7 @@
 import org.labkey.query.reports.LinkReport;
 import org.labkey.query.reports.ModuleReportCache;
 import org.labkey.query.reports.ReportAndDatasetChangeDigestProviderImpl;
+import org.labkey.query.reports.ReportAuditProvider;
 import org.labkey.query.reports.ReportImporter;
 import org.labkey.query.reports.ReportNotificationInfoProvider;
 import org.labkey.query.reports.ReportServiceImpl;
@@ -288,6 +289,7 @@ public void doStartup(ModuleContext moduleContext)
             AuditLogService.get().registerAuditType(new QueryExportAuditProvider());
             AuditLogService.get().registerAuditType(new QueryUpdateAuditProvider());
         }
+        AuditLogService.get().registerAuditType(new ReportAuditProvider());
 
         ReportAndDatasetChangeDigestProvider.get().addNotificationInfoProvider(new ReportNotificationInfoProvider());
         DailyMessageDigest.getInstance().addProvider(ReportAndDatasetChangeDigestProvider.get());