From 9ee278998f81a9006ff7ff75c6d9000b5ff1f601 Mon Sep 17 00:00:00 2001 From: Jay Hodgson Date: Tue, 19 Nov 2024 09:48:29 -0800 Subject: [PATCH 1/2] SWC-7173 --- .../EntityActionControllerImpl.java | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java index 9aee572f89..adb4cf135d 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java @@ -712,34 +712,9 @@ private void configureReportViolation() { actionMenu.setActionListener( Action.REPORT_VIOLATION, (action, event) -> { - // report abuse via Jira issue collector - String userId = WebConstants.ANONYMOUS, email = - WebConstants.ANONYMOUS, displayName = WebConstants.ANONYMOUS, synId = - entity.getId(); - UserProfile userProfile = - authenticationController.getCurrentUserProfile(); - if (userProfile != null) { - userId = userProfile.getOwnerId(); - displayName = DisplayUtils.getDisplayName(userProfile); - email = DisplayUtils.getPrimaryEmail(userProfile); - } - - ginInjector - .getSynapseJSNIUtils() - .showJiraIssueCollector( - "", // summary - FLAG_ISSUE_DESCRIPTION_PART_1 + - gwt.getCurrentURL() + - FLAG_ISSUE_DESCRIPTION_PART_2, - FLAG_ISSUE_COLLECTOR_URL, - userId, - displayName, - email, - synId, // Synapse data object ID - REVIEW_DATA_REQUEST_COMPONENT_ID, - null, // AR ID - FLAG_ISSUE_PRIORITY - ); + popupUtils.openInNewWindow( + "https://sagebionetworks.jira.com/servicedesk/customer/portal/20" + ); } ); } From 9f272bab653510091287252bbe2dcc759c0a3497 Mon Sep 17 00:00:00 2001 From: Jay Hodgson Date: Tue, 19 Nov 2024 09:54:07 -0800 Subject: [PATCH 2/2] extract constant, update test --- .../controller/EntityActionControllerImpl.java | 7 +------ .../web/shared/WebConstants.java | 2 ++ .../EntityActionControllerImplTest.java | 17 +++-------------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java index adb4cf135d..1315e2b195 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java @@ -10,11 +10,6 @@ import static org.sagebionetworks.web.client.utils.FutureUtils.getFuture; import static org.sagebionetworks.web.client.widget.entity.browse.EntityFilter.CONTAINER; import static org.sagebionetworks.web.client.widget.entity.browse.EntityFilter.PROJECT; -import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_COLLECTOR_URL; -import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_DESCRIPTION_PART_1; -import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_DESCRIPTION_PART_2; -import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_PRIORITY; -import static org.sagebionetworks.web.shared.WebConstants.REVIEW_DATA_REQUEST_COMPONENT_ID; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; @@ -713,7 +708,7 @@ private void configureReportViolation() { Action.REPORT_VIOLATION, (action, event) -> { popupUtils.openInNewWindow( - "https://sagebionetworks.jira.com/servicedesk/customer/portal/20" + WebConstants.PRIVACY_SECURITY_COMPLIANCE_HELP_CENTER_URL ); } ); diff --git a/src/main/java/org/sagebionetworks/web/shared/WebConstants.java b/src/main/java/org/sagebionetworks/web/shared/WebConstants.java index babab624de..c1a7adebec 100644 --- a/src/main/java/org/sagebionetworks/web/shared/WebConstants.java +++ b/src/main/java/org/sagebionetworks/web/shared/WebConstants.java @@ -31,6 +31,8 @@ public class WebConstants { public static final String DOCS_BASE_URL = "https://help.synapse.org/"; public static final String DOCS_URL = DOCS_BASE_URL + "docs/"; + public static final String PRIVACY_SECURITY_COMPLIANCE_HELP_CENTER_URL = + "https://sagebionetworks.jira.com/servicedesk/customer/portal/20"; public static final String PROVENANCE_API_URL = DOCS_URL + "Provenance.1972470373.html"; public static final String SHARING_SETTINGS_URL = diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/EntityActionControllerImplTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/EntityActionControllerImplTest.java index 45a5c4354c..ff0e7994e0 100755 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/EntityActionControllerImplTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/EntityActionControllerImplTest.java @@ -5330,20 +5330,9 @@ public void testReportViolation() { // Call under test - invocation actionListenerCaptor.getValue().onAction(Action.REPORT_VIOLATION, null); - verify(mockJsniUtils) - .showJiraIssueCollector( - "", // summary - FLAG_ISSUE_DESCRIPTION_PART_1 + - url + - WebConstants.FLAG_ISSUE_DESCRIPTION_PART_2, // description - FLAG_ISSUE_COLLECTOR_URL, - ownerId, - DisplayUtils.getDisplayName(firstName, lastName, username), - email, - entityId, // Synapse data object ID - REVIEW_DATA_REQUEST_COMPONENT_ID, - null, // Access requirement ID - FLAG_ISSUE_PRIORITY + verify(mockPopupUtils) + .openInNewWindow( + WebConstants.PRIVACY_SECURITY_COMPLIANCE_HELP_CENTER_URL ); } }