Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse…

…WebClient into SWC-6765
Sage-Bionetworks · Apr 19, 2024 · 0b24195 · 0b24195
2 parents 7921f94 + 8903f6a
commit 0b24195
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -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>

diff --git a/src/main/java/org/sagebionetworks/web/client/view/ProfileViewImpl.java b/src/main/java/org/sagebionetworks/web/client/view/ProfileViewImpl.java
@@ -59,7 +59,7 @@ public interface ProfileViewImplUiBinder
 
   HTML noChallengesHtml = new HTML();
   public static final String NO_CHALLENGES_HTML =
-    "<p><a href=\"http://sagebionetworks.org/challenges/\" target=\"_blank\">Challenges</a> are open science, collaborative competitions for evaluating and comparing computational algorithms or solutions to problems.</p>";
+    "<p><a href=\"https://help.synapse.org/docs/Challenges.1985184148.html\" target=\"_blank\">Challenges</a> are open science, collaborative competitions for evaluating and comparing computational algorithms or solutions to problems.</p>";
 
   public static final String CHALLENGE_TAB_HELP_TEXT =
     "&#10;Challenges are open science, collaborative competitions for evaluating and comparing computational algorithms or solutions to problems.";
@@ -253,38 +253,41 @@ public ProfileViewImpl(
       }
     });
 
-    teamSearchButton.addClickHandler(event ->
-      presenter.goTo(new TeamSearch(teamSearchTextBox.getValue()))
+    teamSearchButton.addClickHandler(
+      event -> presenter.goTo(new TeamSearch(teamSearchTextBox.getValue()))
     );
-    projectSearchButton.addClickHandler(event ->
-      presenter.goTo(new Search(projectSearchTextBox.getValue()))
+    projectSearchButton.addClickHandler(
+      event -> presenter.goTo(new Search(projectSearchTextBox.getValue()))
     );
 
-    moreChallengesButton.addClickHandler(event -> presenter.getMoreChallenges()
+    moreChallengesButton.addClickHandler(
+      event -> presenter.getMoreChallenges()
     );
     showChallengesLoading(false);
 
-    favoritesFilter.addClickHandler(event ->
-      presenter.applyFilterClicked(ProjectFilterEnum.FAVORITES, null)
+    favoritesFilter.addClickHandler(
+      event -> presenter.applyFilterClicked(ProjectFilterEnum.FAVORITES, null)
     );
-    allProjectsFilter.addClickHandler(event ->
-      presenter.applyFilterClicked(ProjectFilterEnum.ALL, null)
+    allProjectsFilter.addClickHandler(
+      event -> presenter.applyFilterClicked(ProjectFilterEnum.ALL, null)
     );
-    myProjectsFilter.addClickHandler(event ->
-      presenter.applyFilterClicked(ProjectFilterEnum.CREATED_BY_ME, null)
+    myProjectsFilter.addClickHandler(
+      event ->
+        presenter.applyFilterClicked(ProjectFilterEnum.CREATED_BY_ME, null)
     );
-    sharedDirectlyWithMeFilter.addClickHandler(event ->
-      presenter.applyFilterClicked(
-        ProjectFilterEnum.SHARED_DIRECTLY_WITH_ME,
-        null
-      )
+    sharedDirectlyWithMeFilter.addClickHandler(
+      event ->
+        presenter.applyFilterClicked(
+          ProjectFilterEnum.SHARED_DIRECTLY_WITH_ME,
+          null
+        )
     );
 
-    projectNameColumnHeader.setSortingListener(headerName ->
-      presenter.sort(ProjectListSortColumn.PROJECT_NAME)
+    projectNameColumnHeader.setSortingListener(
+      headerName -> presenter.sort(ProjectListSortColumn.PROJECT_NAME)
     );
-    lastActivityOnColumnHeader.setSortingListener(headerName ->
-      presenter.sort(ProjectListSortColumn.LAST_ACTIVITY)
+    lastActivityOnColumnHeader.setSortingListener(
+      headerName -> presenter.sort(ProjectListSortColumn.LAST_ACTIVITY)
     );
   }
 

diff --git a/...main/java/org/sagebionetworks/web/client/widget/entity/renderer/PlotlyWidgetViewImpl.java b/...main/java/org/sagebionetworks/web/client/widget/entity/renderer/PlotlyWidgetViewImpl.java
@@ -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.

diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/ChallengeTab.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/ChallengeTab.java
@@ -45,7 +45,7 @@ public ChallengeTab(
       "Challenge",
       "challenge",
       "Challenges are open science, collaborative competitions for evaluating and comparing computational algorithms or solutions to problems.",
-      "http://sagebionetworks.org/platforms/",
+      "https://help.synapse.org/docs/Challenges.1985184148.html",
       EntityArea.CHALLENGE
     );
     tab.configureOrientationBanner(