Merge discvr-26.7 to develop

Author: bbimber

.github/workflows/branch_release.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
 
       - name: Create branches and PRs
         uses: LabKey/gitHubActions/branch-release@develop

.github/workflows/merge_release.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
 
       - name: Merge PR
         uses: LabKey/gitHubActions/merge-release@develop

mGAP/src/org/labkey/mgap/mGAPModule.java

@@ -109,7 +109,7 @@ public void doStartupAfterSpringConfig(ModuleContext moduleContext)
         SystemMaintenance.addTask(new mGapMaintenanceTask());
 
         ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Connection, "https://code.jquery.com", "https://*.fontawesome.com");
-        ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Style, "https://code.jquery.com", "https://www.gstatic.com");
+        ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Style, "https://code.jquery.com", "https://www.gstatic.com", "https://fonts.googleapis.com");
         ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Font, "https://*.fontawesome.com", "https://fonts.googleapis.com", "https://fonts.gstatic.com");
         ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Connection, "https://oss.maxcdn.com");
 

mcc/package-lock.json

@@ -26,7 +26,7 @@
     "google-palette": "^1.1.1"
   },
   "devDependencies": {
-    "@labkey/build": "^9.1.0",
+    "@labkey/build": "^9.1.5",
     "@types/chart.js": "^2.9.41",
     "@types/jexl": "^2.3.4",
     "@types/jquery": "^3.5.32",

mcc/package.json

@@ -5,7 +5,7 @@ import { ActionURL, Filter, getServerContext, Query } from '@labkey/api';
 
 import PieChart from '../components/dashboard/PieChart';
 import BarChart, { ColorType } from '../components/dashboard/BarChart';
-import { ActiveElement, Chart, ChartEvent } from 'chart.js/dist/types/index';
+import { ActiveElement, Chart, ChartEvent } from 'chart.js';
 
 export function Dashboard() {
     const [demographics, setDemographics] = useState<[]>(null);

mcc/src/client/U24Dashboard/Dashboard.tsx

@@ -1,6 +1,15 @@
 import React, { useEffect, useRef } from 'react';
-import { BarController, BarElement, CategoryScale, Chart, Legend, LinearScale, Tooltip } from 'chart.js';
-import { ActiveElement, ChartEvent } from 'chart.js/dist/types/index';
+import {
+    ActiveElement,
+    BarController,
+    BarElement,
+    CategoryScale,
+    Chart,
+    ChartEvent,
+    Legend,
+    LinearScale,
+    Tooltip
+} from 'chart.js';
 
 Chart.register(Legend, BarController, BarElement, CategoryScale, LinearScale, Tooltip);
 

mcc/src/client/components/dashboard/BarChart.tsx

@@ -139,7 +139,7 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
         SystemMaintenance.addTask(new MccMaintenanceTask());
 
         ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Connection, "https://cdn.datatables.net", "https://code.jquery.com", "https://*.fontawesome.com", "https://oss.maxcdn.com");
-        ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Style, "https://cdn.datatables.net", "https://code.jquery.com", "https://www.gstatic.com");
+        ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Style, "https://cdn.datatables.net", "https://code.jquery.com", "https://www.gstatic.com", "https://fonts.googleapis.com");
         ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Image, "https://cdn.datatables.net");
         ContentSecurityPolicyFilter.registerAllowedSources(this.getClass().getName(), Directive.Font, "https://*.fontawesome.com", "https://fonts.googleapis.com", "https://www.gstatic.com");
     }