Skip to content

[bot] Merge 25.7 to develop #2545

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
github-actions merged 11 commits into from
Jul 9, 2025
Merged

[bot] Merge 25.7 to develop #2545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7615619
Fix data region column name references (#2526)
labkey-tchad Jul 2, 2025
38b3bed
Add EntityBulkUpdateDialog.getSelectionFieldHelpBlockText() (#2531)
labkey-nicka Jul 3, 2025
98c705c
Alan's 25.7 Issues (#2535)
labkey-alan Jul 3, 2025
39f09ec
Use OS-specific file separator for expected file paths (#2536)
labkey-tchad Jul 3, 2025
645e434
Add test for "Reset" email notifications settings (#2534)
labkey-adam Jul 5, 2025
f46ec8a
Issue 53394: FileInput revert removal of the "-fileUpload" suffix fro…
cnathe Jul 7, 2025
3b57c5e
Merge 25.3 to 25.7
labkey-klum Jul 8, 2025
77aea55
A couple more CSP enhancements (#2530)
labkey-tchad Jul 8, 2025
b9e62b7
Merge 25.3 to release25.7-SNAPSHOT (#2539)
labkey-teamcity Jul 8, 2025
a3968ce
Avoid generating fields names with reserved substitution format patte…
labkey-tchad Jul 9, 2025
1956403
Merge 25.7 to develop
labkey-teamcity Jul 9, 2025
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
6 changes: 6 additions & 0 deletions data/reports/knitr_no_scriptpad.rhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,11 @@ end.rcode-->
<p>Well, everything seems to be working. Let's ask R what is the
value of &pi;? Of course it is <!--rinline pi -->.</p>

<span>Nonce check: <span id="nonce-check-result">FAIL</span></span>

<script>
document.getElementById('nonce-check-result').innerText = "SUCCESS";
</script>

</body>
</html>
6 changes: 6 additions & 0 deletions data/reports/knitr_no_scriptpad.rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ library(knitr)
knit('knitr-minimal.Rmd')
```

<span>Nonce check: <span id="nonce-check-result">FAIL</span></span>

<script>
document.getElementById('nonce-check-result').innerText = "SUCCESS";
</script>

## Conclusion

Markdown is super easy to write. Go to **knitr** [homepage](http://yihui.name/knitr) for details.
15 changes: 15 additions & 0 deletions data/reports/nonce_check.rhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<title>Test script nonce in Knitr HTML</title>
</head>
<body>

<span>Nonce check: <span id="nonce-check-result">FAIL</span></span>

<script>
document.getElementById('nonce-check-result').innerText = "SUCCESS";
</script>

</body>
</html>
6 changes: 6 additions & 0 deletions modules/scriptpad/resources/reports/schemas/script_rhtml.rhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,11 @@ end.rcode-->
<p>Well, everything seems to be working. Let's ask R what is the
value of &pi;? Of course it is <!--rinline pi -->.</p>

<span>Nonce check: <span id="nonce-check-result">FAIL</span></span>

<script>
document.getElementById('nonce-check-result').innerText = "SUCCESS";
</script>

</body>
</html>
6 changes: 6 additions & 0 deletions modules/scriptpad/resources/reports/schemas/script_rmd.rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ library(knitr)
knit('knitr-minimal.Rmd')
```

<span>Nonce check: <span id="nonce-check-result">FAIL</span></span>

<script>
document.getElementById('nonce-check-result').innerText = "SUCCESS";
</script>

## Conclusion

Markdown is super easy to write. Go to **knitr** [homepage](http://yihui.name/knitr) for details.
6 changes: 3 additions & 3 deletions src/org/labkey/test/TestFileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static String getFileContents(Path path)
{
try
{
return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
return Files.readString(path);
}
catch (IOException fail)
{
Expand Down Expand Up @@ -306,7 +306,7 @@ public static Set<File> getSampleDataDirs()
if (sampledataDirsFile.exists())
{
String path = getFileContents(sampledataDirsFile);
_sampledataDirs.addAll(Arrays.stream(path.split(";")).map(File::new).collect(Collectors.toList()));
_sampledataDirs.addAll(Arrays.stream(path.split(";")).map(File::new).toList());
}
else
{
Expand All @@ -317,7 +317,7 @@ public static Set<File> getSampleDataDirs()
// We know where the modules live; no reason to insist that sampledata.dirs exists.
Files.walkFileTree(modulesDir, Collections.emptySet(), 2, new SimpleFileVisitor<>(){
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException
public @NotNull FileVisitResult preVisitDirectory(@NotNull Path dir, @NotNull BasicFileAttributes attrs)
{
if (dir.equals(modulesDir))
{
Expand Down
Loading