Merge pull request #5482 from Sage-Bionetworks/release-508

merge Release 508 into develop

package.json

@@ -34,7 +34,7 @@
     "react-transition-group": "2.6.0",
     "sass": "^1.63.6",
     "spark-md5": "^3.0.2",
-    "synapse-react-client": "3.3.5",
+    "synapse-react-client": "3.3.6",
     "universal-cookie": "^4.0.4",
     "xss": "^1.0.15"
   },

src/main/java/org/sagebionetworks/web/client/FeatureFlagKey.java

@@ -10,7 +10,8 @@ public enum FeatureFlagKey {
   WIKI_DIFF_TOOL("WIKI_DIFF_TOOL"),
   CUSTOM_STORAGE_LOCATION_SETTINGS("CUSTOM_STORAGE_LOCATION_SETTINGS"),
   CHALLENGE_SUBMISSION_SETTINGS("CHALLENGE_SUBMISSION_SETTINGS"),
-  SRC_BASED_AR_MODAL_WIZARD("SRC_BASED_AR_MODAL_WIZARD");
+  SRC_BASED_AR_MODAL_WIZARD("SRC_BASED_AR_MODAL_WIZARD"),
+  HOMEPAGE_V2("HOMEPAGE_V2");
 
   private final String key;
 

src/main/java/org/sagebionetworks/web/client/presenter/SearchPresenter.java

@@ -292,7 +292,9 @@ public String getCurrentSearchJSON() {
   private SearchQuery checkForJson(String queryString) {
     SearchQuery query = getBaseSearchQuery();
 
-    query.setQueryTerm(Arrays.asList(queryString.split(" ")));
+    query.setQueryTerm(
+      Arrays.asList(queryString.replace("%20", " ").split(" "))
+    );
 
     // if query parses into SearchQuery, use that, otherwise use it as a
     // search Term

src/main/java/org/sagebionetworks/web/client/view/HomeViewImpl.java

@@ -6,11 +6,16 @@
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
+import org.sagebionetworks.web.client.DisplayUtils;
+import org.sagebionetworks.web.client.FeatureFlagConfig;
+import org.sagebionetworks.web.client.FeatureFlagKey;
 import org.sagebionetworks.web.client.GlobalApplicationState;
 import org.sagebionetworks.web.client.context.SynapseReactClientFullContextPropsProvider;
+import org.sagebionetworks.web.client.cookie.CookieProvider;
 import org.sagebionetworks.web.client.jsinterop.React;
 import org.sagebionetworks.web.client.jsinterop.ReactNode;
 import org.sagebionetworks.web.client.jsinterop.SRC;
+import org.sagebionetworks.web.client.jsinterop.SynapseHomepageProps;
 import org.sagebionetworks.web.client.jsinterop.SynapseHomepageV2Props;
 import org.sagebionetworks.web.client.widget.ReactComponent;
 import org.sagebionetworks.web.client.widget.header.Header;
@@ -26,34 +31,54 @@ public interface HomeViewImplUiBinder
   private Header headerWidget;
   private SynapseReactClientFullContextPropsProvider propsProvider;
   private GlobalApplicationState globalAppState;
+  private FeatureFlagConfig featureFlagConfig;
+  private static final String PROJECT_VIEW_ID = "syn23593547.3";
 
   @Inject
   public HomeViewImpl(
     HomeViewImplUiBinder binder,
     Header headerWidget,
     final SynapseReactClientFullContextPropsProvider propsProvider,
-    GlobalApplicationState globalAppState
+    GlobalApplicationState globalAppState,
+    FeatureFlagConfig featureFlagConfig
   ) {
     initWidget(binder.createAndBindUi(this));
 
     this.headerWidget = headerWidget;
     this.propsProvider = propsProvider;
     this.globalAppState = globalAppState;
-
+    this.featureFlagConfig = featureFlagConfig;
     headerWidget.configure();
   }
 
   @Override
   public void render() {
     scrollToTop();
-    SynapseHomepageV2Props props = SynapseHomepageV2Props.create(href -> {
-      globalAppState.handleRelativePathClick(href);
-    });
-    ReactNode component = React.createElementWithSynapseContext(
-      SRC.SynapseComponents.SynapseHomepageV2,
-      props,
-      propsProvider.getJsInteropContextProps()
-    );
+    ReactNode component;
+
+    if (
+      featureFlagConfig.isFeatureEnabled(FeatureFlagKey.HOMEPAGE_V2.getKey())
+    ) {
+      SynapseHomepageV2Props props = SynapseHomepageV2Props.create(href -> {
+        globalAppState.handleRelativePathClick(href);
+      });
+      component =
+        React.createElementWithSynapseContext(
+          SRC.SynapseComponents.SynapseHomepageV2,
+          props,
+          propsProvider.getJsInteropContextProps()
+        );
+    } else {
+      //TODO: SWC-6999: Once V2 is released, delete this conditional
+      SynapseHomepageProps props = SynapseHomepageProps.create(PROJECT_VIEW_ID);
+      component =
+        React.createElementWithSynapseContext(
+          SRC.SynapseComponents.SynapseHomepage,
+          props,
+          propsProvider.getJsInteropContextProps()
+        );
+    }
+
     container.render(component);
   }
 

src/test/java/org/sagebionetworks/web/unitclient/presenter/SearchPresenterTest.java

@@ -245,4 +245,15 @@ public void testSetPlaceWithJsonSynapseIdAsSearchTerm() throws Exception {
 
     verify(mockPlaceChanger).goTo(new Synapse(term));
   }
+
+  @Test
+  public void testEncodedQueryTerm() throws Exception {
+    searchPresenter.setPlace(new Search("Alzheimer's%20Disease"));
+    SearchQuery expectedQuery = SearchQueryUtils.getDefaultSearchQuery();
+    expectedQuery.setQueryTerm(
+      Arrays.asList(new String[] { "Alzheimer's", "Disease" })
+    );
+    verify(mockJsClient)
+      .getSearchResults(eq(expectedQuery), any(AsyncCallback.class));
+  }
 }

yarn.lock

@@ -101,6 +101,11 @@
     "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
+"@brainhubeu/[email protected]":
+  version "1.19.26"
+  resolved "https://registry.yarnpkg.com/@brainhubeu/react-carousel/-/react-carousel-1.19.26.tgz#57de7b934596ede7a42ab07c46e5942574180447"
+  integrity sha512-+YO8cJrJEk+QDZTQM+i7ct5Ouy0LyoVHQD4fomdsV+3AQmWUkMVZNBYmxFMvhRQVFKreTTzyKuGPkhDKilL/CQ==
+
 "@choojs/findup@^0.2.0":
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@choojs/findup/-/findup-0.2.1.tgz#ac13c59ae7be6e1da64de0779a0a7f03d75615a3"
@@ -5765,12 +5770,13 @@ svg-path-sdf@^1.1.3:
     parse-svg-path "^0.1.2"
     svg-path-bounds "^1.0.1"
 
-[email protected].5:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.3.5.tgz#f0c1634ec59e5d8198a2223b7b91f06d85a81a54"
-  integrity sha512-9Ow/eJmO/s+HgQGCkg60+q+jBuCJetmsZgu8mW1ctxUHKXD2WZbhMKRMk0QdCmHLEK1GNfqS7+38XFp/BjfJaQ==
+[email protected].6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.3.6.tgz#d896dc94d6cf6de545d6243f1792bdd539846a4d"
+  integrity sha512-oE9lIULQ1aC8pipTFiuzQryt6a216Fy5Q15m9hCfRifvNVGEHdjL2Ew5KV6fscu2RLkMIBqjjl5DaFhuLjgdUg==
   dependencies:
     "@apidevtools/json-schema-ref-parser" "^9.1.2"
+    "@brainhubeu/react-carousel" "1.19.26"
     "@emotion/react" "^11.11.4"
     "@emotion/styled" "^11.11.0"
     "@mui/icons-material" "^5.15.13"
@@ -5810,7 +5816,6 @@ [email protected]:
     markdown-it "^14.1.0"
     markdown-it-br "^1.0.0"
     markdown-it-center-text "^1.0.4"
-    markdown-it-emphasis-alt "^1.0.8"
     markdown-it-inline-comments "^1.0.1"
     markdown-it-strikethrough-alt "^1.0.0"
     markdown-it-sub-alt "^1.0.0"