Skip to content

Commit

Permalink
Merge pull request #5367 from jay-hodgson/PORTALS-2985
Browse files Browse the repository at this point in the history
  • Loading branch information
jay-hodgson authored Apr 23, 2024
2 parents c1f5b53 + 237d1d1 commit be1151c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"react-transition-group": "2.6.0",
"sass": "^1.63.6",
"spark-md5": "^3.0.2",
"synapse-react-client": "3.2.9",
"synapse-react-client": "3.2.10",
"universal-cookie": "^4.0.4",
"xss": "^1.0.15"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.sagebionetworks.web.client.place.Home;
import org.sagebionetworks.web.client.place.LoginPlace;
import org.sagebionetworks.web.client.widget.FullWidthAlert;
import org.sagebionetworks.web.client.widget.OrientationBanner;
import org.sagebionetworks.web.client.widget.ReactComponentDiv;

public class HeaderViewImpl extends Composite implements HeaderView {
Expand All @@ -36,6 +37,9 @@ public interface Binder extends UiBinder<Widget, HeaderViewImpl> {}
@UiField
Div header;

@UiField
Div donationBannerContainer;

@UiField
FullWidthAlert cookieNotificationAlert;

Expand Down Expand Up @@ -72,7 +76,8 @@ public interface Binder extends UiBinder<Widget, HeaderViewImpl> {}
public HeaderViewImpl(
Binder binder,
SynapseReactClientFullContextPropsProvider propsProvider,
PortalGinInjector ginInjector
PortalGinInjector ginInjector,
OrientationBanner donationBanner
) {
this.initWidget(binder.createAndBindUi(this));
this.ginInjector = ginInjector;
Expand All @@ -84,6 +89,18 @@ public HeaderViewImpl(
presenter.onNIHNotificationDismissed();
});

donationBanner.configure(
"Donate",
"Support Open Science and Radical Collaboration with Sage Bionetworks",
"Join us as we advance collaborative biomedical research tackling today's most pressing health challenges. Your contribution is crucial to breaking down barriers and accelerating the creation of transformative treatments and technologies. Thank you for being a part of this vital mission and helping us drive innovation forward.",
"Donate to Sage",
event -> {
Window.open("https://sagebionetworks.org/donate", "_blank", "");
},
null,
null
);
donationBannerContainer.add(donationBanner.asWidget());
initClickHandlers();
clear();
rerenderNavBar();
Expand Down Expand Up @@ -210,5 +227,6 @@ public void setPortalAlertVisible(boolean visible, JSONObjectAdapter json) {
@Override
public void setNIHAlertVisible(boolean visible) {
nihNotificationAlert.setVisible(visible);
donationBannerContainer.setVisible(!visible);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,6 @@
primaryCTAHref="https://sagebionetworks.jira.com/servicedesk/customer/portal/9/group/26/create/162"
addStyleNames="nihNotificationAlert"
/>
<bh:Div ui:field="donationBannerContainer" />
</bh:Div>
</ui:UiBinder>
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5066,10 +5066,10 @@ svg-path-sdf@^1.1.3:
parse-svg-path "^0.1.2"
svg-path-bounds "^1.0.1"

[email protected].9:
version "3.2.9"
resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.2.9.tgz#d1ac2e850f0739238d3c51e7e594dd3a253718c5"
integrity sha512-HA0Dvu9cLZR7jmoG6yDkDs+/eCSaV4ITTr347VkvLKnT9VpxWSk/+jwjiy4bONeG6kasMndncVJxF4YXOQQF8A==
[email protected].10:
version "3.2.10"
resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.2.10.tgz#34bebef47d89cb4d51ca40d2bba3f3a9e74fa857"
integrity sha512-77IUM+Z8v5UEA0zZ8nEkpOgczmiudXV69QybNH+qTaCrvPGJAKcElwWeflXiNBVSAi/0zdH/vP7BqRXgUu19zw==
dependencies:
"@apidevtools/json-schema-ref-parser" "^9.1.2"
"@brainhubeu/react-carousel" "1.19.26"
Expand Down

0 comments on commit be1151c

Please sign in to comment.