Skip to content
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

Jump to bottom

Merge changes in release-497 to develop #5360

Merged
merged 3 commits into from
Apr 18, 2024
Merged

Merge changes in release-497 to develop #5360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d025f1
Fix react-plotly.js
nickgros Apr 18, 2024
1a7fa7c
clean src/main/webapp/generated
nickgros Apr 18, 2024
94de82c
Merge pull request #5359 from nickgros/fix-plotly
nickgros Apr 18, 2024
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
17 changes: 17 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,23 @@
</configuration>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
<configuration>
<filesets>
<fileset>
<!-- Clean dir where we copy JS/CSS from node_modules -->
<directory>src/main/webapp/generated</directory>
<includes>
<include>**/*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/sagebionetworks/web/client/widget/entity/renderer/PlotlyWidgetViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private static native void _showChart(
) /*-{

try {
var plot = $wnd.createPlotlyComponent($wnd.Plotly);
var plot = $wnd.createPlotlyComponent['default']($wnd.Plotly);

// SWC-3668: We must manually construct an Object from the parent window Object prototype. This is a general GWT js integration issue.
// If we define the layout in the standard way, like "xaxis: {title:"mytitle"}", then Object.getPrototypeOf(obj) === Object.prototype is false.
Expand Down
Loading