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 release 501 into develop #5418

Merged
merged 4 commits into from
Jun 6, 2024
Merged

merge release 501 into develop #5418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c23324e
SWC-6864
jay-hodgson Jun 5, 2024
35b31e0
Merge pull request #5416 from jay-hodgson/SWC-6864
xschildw Jun 5, 2024
662a713
SWC-6865
jay-hodgson Jun 6, 2024
b4d4b37
Merge pull request #5417 from jay-hodgson/SWC-6865
xschildw Jun 6, 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
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/GWTWrapperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class GWTWrapperImpl implements GWTWrapper {

@Override
public String getHostPageBaseURL() {
return GWT.getHostPageBaseURL();
return getHostpageUrl();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/widget/entity/EntityBadge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public void onFailure(Throwable caught) {
}

public void onSuccess(AddBatchOfFilesToDownloadListResponse result) {
String href = "DownloadCart:0";
String href = "/DownloadCart:0";
popupUtils.showInfo(
entityHeader.getName() + EntityBadge.ADDED_TO_DOWNLOAD_LIST,
href,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/widget/entity/EntityListRowBadge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public void onFailure(Throwable caught) {
}

public void onSuccess(AddBatchOfFilesToDownloadListResponse result) {
String href = "DownloadCart:0";
String href = "/DownloadCart:0";
popupUtils.showInfo(
entityName + EntityBadge.ADDED_TO_DOWNLOAD_LIST,
href,
Expand Down
6 changes: 5 additions & 1 deletion .../java/org/sagebionetworks/web/client/widget/entity/renderer/ButtonLinkWidgetViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,17 @@ public ButtonLinkWidgetViewImpl(
public void configure(
WikiPageKey wikiKey,
String buttonText,
final String url,
String url,
boolean isHighlight,
final boolean openInNewWindow
) {
clear();
button.setText(buttonText);
if (isHighlight) button.setType(ButtonType.INFO);
// Detect old #!, and direct to the right place
if (url.startsWith("#!")) {
url = "/" + url.substring("#!".length());
}
button.setHref(url);
if (openInNewWindow) {
button
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityBadgeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ public void testOnAddToDownloadListV2() {
verify(mockPopupUtils)
.showInfo(
header.getName() + EntityBadge.ADDED_TO_DOWNLOAD_LIST,
"DownloadCart:0",
"/DownloadCart:0",
DisplayConstants.VIEW_DOWNLOAD_LIST
);
verify(mockEventBus).fireEvent(any(DownloadListUpdatedEvent.class));
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityListRowBadgeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public void testOnAddToDownloadListV2() {
verify(mockPopupUtils)
.showInfo(
entityName + EntityBadge.ADDED_TO_DOWNLOAD_LIST,
"DownloadCart:0",
"/DownloadCart:0",
DisplayConstants.VIEW_DOWNLOAD_LIST
);
verify(mockEventBus).fireEvent(any(DownloadListUpdatedEvent.class));
Expand Down
Loading