Skip to content

Merge discvr-26.7 to develop #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbimber merged 7 commits into from
Jul 4, 2026
Merged

Merge discvr-26.7 to develop #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99ac948
CSP exceptions
bbimber Jun 9, 2026
a17d682
actions/checkout@v3 -> v7
bbimber Jun 22, 2026
18f084e
Update node dependencies
bbimber Jun 22, 2026
a6f9d0d
Update node dependencies
bbimber Jun 22, 2026
7c3b9f1
Merge discvr-26.3 to discvr-26.7
bbimber Jul 3, 2026
671c645
Merge pull request #226 from bimberlabinternal/26.7_fb_merge
bbimber Jul 3, 2026
b424a04
Merge discvr-26.7 to develop
bbimber Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/branch_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mGAP/src/org/labkey/mgap/mGAPModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
475 changes: 231 additions & 244 deletions mcc/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mcc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion mcc/src/client/U24Dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
13 changes: 11 additions & 2 deletions mcc/src/client/components/dashboard/BarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand Down
2 changes: 1 addition & 1 deletion mcc/src/org/labkey/mcc/MccModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down