diff --git a/src/main/java/org/sagebionetworks/web/client/FeatureFlagKey.java b/src/main/java/org/sagebionetworks/web/client/FeatureFlagKey.java index 748208097d..56746c079f 100644 --- a/src/main/java/org/sagebionetworks/web/client/FeatureFlagKey.java +++ b/src/main/java/org/sagebionetworks/web/client/FeatureFlagKey.java @@ -1,48 +1,15 @@ package org.sagebionetworks.web.client; public enum FeatureFlagKey { - // If enabled, use the new React-based provenance visualization - PROVENANCE_V2_VISUALIZATION("PROVENANCE_V2_VISUALIZATION"), - - // If enabled, a Google Map can be used to view the locations of team members on the team page - GOOGLE_MAP("GOOGLE_MAP"), - - // If enabled, allows team members to view projects shared with the team on the team page - VIEW_ASSOCIATED_PROJECTS("VIEW_ASSOCIATED_PROJECTS"), - - // If enabled, show provenance on Docker repository entity pages - PROVENANCE_DOCKER_IMAGES("PROVENANCE_DOCKER_IMAGES"), - - // If enabled, allow viewing & editing the 'description' string field on entities - DESCRIPTION_FIELD("DESCRIPTION_FIELD"), - // Shows options to create various experimental wiki widgets ADD_WIKI_WIDGETS("ADD_WIKI_WIDGETS"), - // Allow using STS and ExternalObjectStore options as custom Storage Locations - CUSTOM_STORAGE_LOCATION_SETTINGS("CUSTOM_STORAGE_LOCATION_SETTINGS"), - - // Allow creating a challenge submission button and form with a JSON Schema - CHALLENGE_SUBMISSION_SETTINGS("CHALLENGE_SUBMISSION_SETTINGS"), - - // If enabled, show the new homepage - HOMEPAGE_V2("HOMEPAGE_V2"), - - // If enabled, sharing settings will appear in a dialog immediately after uploading one or more files. - SHOW_SHARING_SETTINGS_AFTER_UPLOAD("SHOW_SHARING_SETTINGS_AFTER_UPLOAD"), - // If enabled, search bar uses OpenSearch OPENSEARCH_ENABLED("OPENSEARCH_ENABLED"), // If enabled, show the 'Start Grid Session' button in the action menu for table entities SYNAPSE_GRID("SYNAPSE_GRID"), - // If enabled, show the 'Metadata Tab' on project entity pages - METADATA_TAB("METADATA_TAB"), - - // If enabled, show the SRC 'EntityTreeTable' for the "file browser" - ENTITY_TREE_TABLE("ENTITY_TREE_TABLE"), - // If enabled, show the visibility chip on the project title bar PROJECT_VISIBILITY_CHIP("PROJECT_VISIBILITY_CHIP"), diff --git a/src/main/java/org/sagebionetworks/web/client/jsinterop/DownloadCartPageProps.java b/src/main/java/org/sagebionetworks/web/client/jsinterop/DownloadCartPageProps.java index 94be51584b..1cbc2e39ba 100644 --- a/src/main/java/org/sagebionetworks/web/client/jsinterop/DownloadCartPageProps.java +++ b/src/main/java/org/sagebionetworks/web/client/jsinterop/DownloadCartPageProps.java @@ -1,7 +1,5 @@ package org.sagebionetworks.web.client.jsinterop; -import jsinterop.annotations.JsFunction; -import jsinterop.annotations.JsNullable; import jsinterop.annotations.JsOverlay; import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; @@ -9,21 +7,8 @@ @JsType(isNative = true, namespace = JsPackage.GLOBAL, name = "Object") public class DownloadCartPageProps extends ReactComponentProps { - @FunctionalInterface - @JsFunction - public interface OnViewSharingSettingsHandler { - void onViewSharingSettingsClicked(String benefactorEntityId); - } - - @JsNullable - OnViewSharingSettingsHandler onViewSharingSettingsClicked; - @JsOverlay - public static DownloadCartPageProps create( - OnViewSharingSettingsHandler onViewSharingSettingsClicked - ) { - DownloadCartPageProps props = new DownloadCartPageProps(); - props.onViewSharingSettingsClicked = onViewSharingSettingsClicked; - return props; + public static DownloadCartPageProps create() { + return new DownloadCartPageProps(); } } diff --git a/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java b/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java index 4cf23dd8ce..f76db0c715 100644 --- a/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java +++ b/src/main/java/org/sagebionetworks/web/client/jsinterop/QueryWrapperPlotNavProps.java @@ -21,12 +21,6 @@ public interface OnQueryResultBundleCallback { void run(String newQueryResultBundleJson); } - @FunctionalInterface - @JsFunction - public interface OnViewSharingSettingsHandler { - void onViewSharingSettingsClicked(String benefactorEntityId); - } - String name; String initQueryJson; String sql; @@ -37,9 +31,6 @@ public interface OnViewSharingSettingsHandler { @JsNullable OnQueryResultBundleCallback onQueryResultBundleChange; - @JsNullable - OnViewSharingSettingsHandler onViewSharingSettingsClicked; - @JsNullable boolean shouldDeepLink; @@ -75,7 +66,6 @@ public static QueryWrapperPlotNavProps create( String initQueryJson, OnQueryCallback onQueryChange, OnQueryResultBundleCallback onQueryResultBundleChange, - OnViewSharingSettingsHandler onViewSharingSettingsClicked, boolean hideSqlEditorControl, Boolean defaultShowPlots, Boolean defaultShowSearchBox, @@ -91,7 +81,6 @@ public static QueryWrapperPlotNavProps create( props.hideSqlEditorControl = hideSqlEditorControl; props.onQueryChange = onQueryChange; props.onQueryResultBundleChange = onQueryResultBundleChange; - props.onViewSharingSettingsClicked = onViewSharingSettingsClicked; if (tableConfiguration != null) { props.tableConfiguration = tableConfiguration; } diff --git a/src/main/java/org/sagebionetworks/web/client/presenter/DownloadCartPresenter.java b/src/main/java/org/sagebionetworks/web/client/presenter/DownloadCartPresenter.java index 8d61d58d7b..cab60a6b69 100644 --- a/src/main/java/org/sagebionetworks/web/client/presenter/DownloadCartPresenter.java +++ b/src/main/java/org/sagebionetworks/web/client/presenter/DownloadCartPresenter.java @@ -4,28 +4,17 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.ui.AcceptsOneWidget; import javax.inject.Inject; -import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.view.DownloadCartPageView; -import org.sagebionetworks.web.client.widget.sharing.EntityAccessControlListModalWidget; public class DownloadCartPresenter extends AbstractActivity - implements - DownloadCartPageView.Presenter, - Presenter { + implements Presenter { private DownloadCartPageView view; - private EntityAccessControlListModalWidget aclModal; - private PortalGinInjector ginInjector; @Inject - public DownloadCartPresenter( - DownloadCartPageView view, - PortalGinInjector ginInjector - ) { + public DownloadCartPresenter(DownloadCartPageView view) { this.view = view; - view.setPresenter(this); - this.ginInjector = ginInjector; } @Override @@ -39,17 +28,4 @@ public void setPlace( ) { view.render(); } - - private EntityAccessControlListModalWidget getAccessControlListModalWidget() { - if (aclModal == null) { - aclModal = ginInjector.getEntityAccessControlListModalWidget(); - } - return aclModal; - } - - @Override - public void onViewSharingSettingsClicked(String benefactorEntityId) { - getAccessControlListModalWidget().configure(benefactorEntityId, () -> {}); - getAccessControlListModalWidget().setOpen(true); - } } diff --git a/src/main/java/org/sagebionetworks/web/client/presenter/TeamPresenter.java b/src/main/java/org/sagebionetworks/web/client/presenter/TeamPresenter.java index e0c4c6d4d4..db839204fb 100644 --- a/src/main/java/org/sagebionetworks/web/client/presenter/TeamPresenter.java +++ b/src/main/java/org/sagebionetworks/web/client/presenter/TeamPresenter.java @@ -12,8 +12,6 @@ import org.sagebionetworks.repo.model.Team; import org.sagebionetworks.repo.model.TeamMemberTypeFilterOptions; import org.sagebionetworks.repo.model.TeamMembershipStatus; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.GlobalApplicationState; import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.SynapseClientAsync; @@ -81,8 +79,7 @@ public TeamPresenter( GoogleMap map, CookieProvider cookies, IsACTMemberAsyncHandler isACTMemberAsyncHandler, - PortalGinInjector ginInjector, - FeatureFlagConfig featureFlagConfig + PortalGinInjector ginInjector ) { this.view = view; this.ginInjector = ginInjector; @@ -108,9 +105,6 @@ public TeamPresenter( view.setManagerListWidget(managerListWidget.asWidget()); view.setMemberListWidget(memberListWidget.asWidget()); view.setMap(map.asWidget()); - view.setShowMapVisible( - featureFlagConfig.isFeatureEnabled(FeatureFlagKey.GOOGLE_MAP) - ); inviteWidget.setRefreshCallback(refreshCallback); } diff --git a/src/main/java/org/sagebionetworks/web/client/view/DataCatalogPageViewImpl.java b/src/main/java/org/sagebionetworks/web/client/view/DataCatalogPageViewImpl.java index b267e99a20..018de222e5 100644 --- a/src/main/java/org/sagebionetworks/web/client/view/DataCatalogPageViewImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/view/DataCatalogPageViewImpl.java @@ -47,7 +47,6 @@ public void render() { null, null, newBundle -> {}, - null, true, false, true, diff --git a/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageView.java b/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageView.java index adec6a1716..835e92070d 100644 --- a/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageView.java +++ b/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageView.java @@ -7,10 +7,4 @@ public interface DownloadCartPageView extends IsWidget { * Renders the view */ public void render(); - - public void setPresenter(Presenter presenter); - - public interface Presenter { - void onViewSharingSettingsClicked(String benefactorEntityId); - } } diff --git a/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageViewImpl.java b/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageViewImpl.java index 2e778268f3..9ae1a48f1b 100644 --- a/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageViewImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/view/DownloadCartPageViewImpl.java @@ -15,7 +15,6 @@ public class DownloadCartPageViewImpl implements DownloadCartPageView { ReactComponent container; private Header headerWidget; - private Presenter presenter; @Inject public DownloadCartPageViewImpl(Header headerWidget) { @@ -23,18 +22,11 @@ public DownloadCartPageViewImpl(Header headerWidget) { this.headerWidget = headerWidget; } - @Override - public void setPresenter(Presenter presenter) { - this.presenter = presenter; - } - @Override public void render() { Window.scrollTo(0, 0); // scroll user to top of page headerWidget.configure(); - DownloadCartPageProps props = DownloadCartPageProps.create(entityId -> { - presenter.onViewSharingSettingsClicked(entityId); - }); + DownloadCartPageProps props = DownloadCartPageProps.create(); ReactElement component = React.createElementWithSynapseContext( SRC.SynapseComponents.DownloadCartPage, props diff --git a/src/main/java/org/sagebionetworks/web/client/view/TeamView.java b/src/main/java/org/sagebionetworks/web/client/view/TeamView.java index 064d9af8f4..e8694e36ac 100644 --- a/src/main/java/org/sagebionetworks/web/client/view/TeamView.java +++ b/src/main/java/org/sagebionetworks/web/client/view/TeamView.java @@ -65,8 +65,6 @@ public interface Presenter { void showMapModal(); - void setShowMapVisible(boolean visible); - void setManageAccessVisible(boolean visible); void setCommandsVisible(boolean visible); diff --git a/src/main/java/org/sagebionetworks/web/client/view/TeamViewImpl.java b/src/main/java/org/sagebionetworks/web/client/view/TeamViewImpl.java index 27bbf03546..32cbd2924f 100644 --- a/src/main/java/org/sagebionetworks/web/client/view/TeamViewImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/view/TeamViewImpl.java @@ -20,8 +20,6 @@ import org.sagebionetworks.repo.model.Team; import org.sagebionetworks.repo.model.TeamMembershipStatus; import org.sagebionetworks.web.client.DisplayUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.GWTWrapper; import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.widget.FullWidthAlert; @@ -117,7 +115,6 @@ public interface TeamViewImplUiBinder private GWTWrapper gwt; private BigTeamBadge bigTeamBadge; private CookieProvider cookieProvider; - private FeatureFlagConfig featureFlagConfig; private final TeamViewImplUiBinder binder = GWT.create( TeamViewImplUiBinder.class @@ -129,15 +126,13 @@ public TeamViewImpl( Header headerWidget, GWTWrapper gwt, BigTeamBadge bigTeamBadge, - CookieProvider cookieProvider, - FeatureFlagConfig featureFlagConfig + CookieProvider cookieProvider ) { initWidget(binder.createAndBindUi(this)); this.headerWidget = headerWidget; this.gwt = gwt; this.bigTeamBadge = bigTeamBadge; this.cookieProvider = cookieProvider; - this.featureFlagConfig = featureFlagConfig; setDropdownHandlers(); headerWidget.configure(); teamBadgeContainer.clear(); @@ -234,12 +229,7 @@ public void setPresenter(Presenter presenter) { @Override public void showMemberMenuItems() { leaveTeamItem.setVisible(true); - // TODO: remove next line to take out of alpha mode - teamProjectsItem.setVisible( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.VIEW_ASSOCIATED_PROJECTS - ) - ); + teamProjectsItem.setVisible(true); toolsMenu.setVisible(true); } @@ -249,12 +239,7 @@ public void showAdminMenuItems() { deleteTeamItem.setVisible(true); editTeamItem.setVisible(true); inviteMemberItem.setVisible(true); - // TODO: remove next line to take out of alpha mode - teamProjectsItem.setVisible( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.VIEW_ASSOCIATED_PROJECTS - ) - ); + teamProjectsItem.setVisible(true); toolsMenu.setVisible(true); } @@ -326,11 +311,6 @@ public void setMap(Widget w) { mapPanel.add(w); } - @Override - public void setShowMapVisible(boolean visible) { - showMapLink.setVisible(visible); - } - @Override public int getClientHeight() { return Window.getClientHeight(); diff --git a/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidget.java b/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidget.java index 6b623225f4..bf0d5e753d 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidget.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidget.java @@ -8,8 +8,6 @@ import org.sagebionetworks.repo.model.docker.DockerRepository; import org.sagebionetworks.repo.model.entitybundle.v2.EntityBundle; import org.sagebionetworks.web.client.DisplayUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.events.EntityUpdatedEvent; import org.sagebionetworks.web.client.utils.CallbackP; @@ -37,7 +35,6 @@ public class DockerRepoWidget { private boolean canEdit; private DockerRepository entity; private EventBus eventBus; - private FeatureFlagConfig featureFlagConfig; @Inject public DockerRepoWidget( @@ -49,8 +46,7 @@ public DockerRepoWidget( ModifiedCreatedByWidget modifiedCreatedBy, DockerCommitListWidget dockerCommitListWidget, CookieProvider cookies, - EventBus eventBus, - FeatureFlagConfig featureFlagConfig + EventBus eventBus ) { this.view = view; this.wikiPageWidget = wikiPageWidget; @@ -61,7 +57,6 @@ public DockerRepoWidget( this.dockerCommitListWidget = dockerCommitListWidget; this.cookies = cookies; this.eventBus = eventBus; - this.featureFlagConfig = featureFlagConfig; view.setWikiPage(wikiPageWidget.asWidget()); view.setProvenance(provWidget.asWidget()); view.setTitlebar(dockerTitleBar.asWidget()); @@ -84,11 +79,6 @@ public void configure(EntityBundle bundle, EntityActionMenu actionMenu) { configureProvenance(entity.getId()); view.setDockerPullCommand(DOCKER_PULL_COMMAND + entity.getRepositoryName()); dockerCommitListWidget.configure(entity.getId(), false); - view.setProvenanceWidgetVisible( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.PROVENANCE_DOCKER_IMAGES - ) - ); } private void configureProvenance(final String entityId) { diff --git a/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetView.java b/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetView.java index bcebd0cf93..fcca5bb445 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetView.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetView.java @@ -21,6 +21,4 @@ public interface DockerRepoWidgetView { void setModifiedCreatedBy(IsWidget widget); void setDockerCommitListWidget(Widget widget); - - void setProvenanceWidgetVisible(boolean visible); } diff --git a/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetViewImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetViewImpl.java index a521d2963e..8d23b14b8e 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetViewImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/docker/DockerRepoWidgetViewImpl.java @@ -107,9 +107,4 @@ public void setModifiedCreatedBy(IsWidget widget) { public void setDockerCommitListWidget(Widget widget) { dockerCommitListContainer.add(widget); } - - @Override - public void setProvenanceWidgetVisible(boolean visible) { - provenancePanel.setVisible(visible); - } } diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/EntityPageTop.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/EntityPageTop.java index 16c6a361a1..ad3f621718 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/EntityPageTop.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/EntityPageTop.java @@ -27,8 +27,6 @@ import org.sagebionetworks.repo.model.table.Table; import org.sagebionetworks.web.client.DisplayConstants; 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.PlaceChanger; import org.sagebionetworks.web.client.SynapseClientAsync; @@ -96,7 +94,6 @@ public class EntityPageTop implements SynapseWidgetPresenter, IsWidget { private final PlaceChanger placeChanger; private final CookieProvider cookies; private final EventBus eventBus; - private final FeatureFlagConfig featureFlagConfig; private final EntityId2BundleCache entityId2BundleCache; public boolean pushTabUrlToBrowserHistory = false; public static final EntityBundleRequest ALL_PARTS_REQUEST = @@ -146,7 +143,6 @@ public EntityPageTop( GlobalApplicationState globalAppState, EntityId2BundleCache entityId2BundleCache, EventBus eventBus, - FeatureFlagConfig featureFlagConfig, AuthenticationController authenticationController ) { this.view = view; @@ -172,7 +168,6 @@ public EntityPageTop( this.placeChanger = globalAppState.getPlaceChanger(); this.entityId2BundleCache = entityId2BundleCache; this.eventBus = eventBus; - this.featureFlagConfig = featureFlagConfig; this.authenticationController = authenticationController; initTabs(); @@ -764,10 +759,7 @@ public void showSelectedTabs() { getTabVisibilityCallback(EntityArea.CHALLENGE, challengeTab.asTab()) ); - if ( - this.authenticationController.isLoggedIn() && - featureFlagConfig.isFeatureEnabled(FeatureFlagKey.METADATA_TAB) - ) { + if (this.authenticationController.isLoggedIn()) { synapseJavascriptClient.getCurationTasks( new ListCurationTaskRequest().setProjectId(projectHeader.getId()), new AsyncCallback() { diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/RenameEntityModalWidgetImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/RenameEntityModalWidgetImpl.java index ecc2e837ce..962e8e91ce 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/RenameEntityModalWidgetImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/RenameEntityModalWidgetImpl.java @@ -9,8 +9,6 @@ import org.sagebionetworks.repo.model.Entity; import org.sagebionetworks.repo.model.EntityTypeUtils; import org.sagebionetworks.repo.model.table.Table; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.StringUtils; import org.sagebionetworks.web.client.SynapseJavascriptClient; import org.sagebionetworks.web.client.cookie.CookieProvider; @@ -37,20 +35,17 @@ public class RenameEntityModalWidgetImpl implements RenameEntityModalWidget { String startingName; String startingDescription; Callback handler; - FeatureFlagConfig featureFlagConfig; @Inject public RenameEntityModalWidgetImpl( PromptForValuesModalView view, SynapseJavascriptClient jsClient, - CookieProvider cookieProvider, - FeatureFlagConfig featureFlagConfig + CookieProvider cookieProvider ) { super(); this.view = view; this.jsClient = jsClient; this.cookies = cookieProvider; - this.featureFlagConfig = featureFlagConfig; } /** @@ -138,11 +133,8 @@ public void onRename(Entity toRename, Callback handler) { List inputTypes = new ArrayList<>(); inputTypes.add(PromptForValuesModalView.InputType.TEXTBOX); - // Only surfacing description for Table types (behind feature flag for now) - if ( - toRename instanceof Table && - featureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) { + // Only surfacing description for Table types + if (toRename instanceof Table) { prompts.add("Description"); initialValues.add(toRename.getDescription()); inputTypes.add(PromptForValuesModalView.InputType.TEXTAREA); 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 c7704df80a..2170ad2a29 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 @@ -1727,10 +1727,7 @@ private void configureRenameAction() { permissions.getCanEdit() ); String text = RENAME_PREFIX + entityTypeDisplay; - if ( - entityBundle.getEntity() instanceof Table && - featureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) { + if (entityBundle.getEntity() instanceof Table) { text = EDIT_NAME_AND_DESCRIPTION; } actionMenu.setActionText(Action.CHANGE_ENTITY_NAME, text); diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/StorageLocationWidget.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/StorageLocationWidget.java index 50b09947a3..d7b4ef61df 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/StorageLocationWidget.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/controller/StorageLocationWidget.java @@ -20,8 +20,6 @@ import org.sagebionetworks.repo.model.project.ExternalObjectStorageLocationSetting; import org.sagebionetworks.repo.model.project.ExternalS3StorageLocationSetting; import org.sagebionetworks.repo.model.project.StorageLocationSetting; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.SynapseClientAsync; import org.sagebionetworks.web.client.SynapseJavascriptClient; import org.sagebionetworks.web.client.SynapseProperties; @@ -40,7 +38,6 @@ public class StorageLocationWidget CookieProvider cookies; EventBus eventBus; SynapseProperties synapseProperties; - FeatureFlagConfig featureFlagConfig; @Inject public StorageLocationWidget( @@ -50,8 +47,7 @@ public StorageLocationWidget( SynapseAlert synAlert, SynapseProperties synapseProperties, CookieProvider cookies, - EventBus eventBus, - FeatureFlagConfig featureFlagConfig + EventBus eventBus ) { this.view = view; this.synapseClient = synapseClient; @@ -61,7 +57,6 @@ public StorageLocationWidget( this.cookies = cookies; this.synapseProperties = synapseProperties; this.eventBus = eventBus; - this.featureFlagConfig = featureFlagConfig; view.setSynAlertWidget(synAlert); view.setPresenter(this); } @@ -72,10 +67,7 @@ public void configure(EntityBundle entityBundle) { view.setLoading(true); getStorageLocationSetting(); getMyLocationSettingBanners(); - boolean isInAlpha = featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.CUSTOM_STORAGE_LOCATION_SETTINGS - ); - view.setExternalObjectStoreVisible(isInAlpha); + view.setExternalObjectStoreVisible(true); } public void getMyLocationSettingBanners() { @@ -111,10 +103,7 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(UploadDestination uploadDestination) { // if null, then still show the default UI - boolean isInAlpha = featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.CUSTOM_STORAGE_LOCATION_SETTINGS - ); - view.setS3StsVisible(isInAlpha); + view.setS3StsVisible(true); Long defaultStorageId = Long.parseLong( synapseProperties.getSynapseProperty( WebConstants.DEFAULT_STORAGE_ID_PROPERTY_KEY diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/editor/EvaluationSubmissionConfigViewImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/editor/EvaluationSubmissionConfigViewImpl.java index 317af4bad8..b0b1fb042d 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/editor/EvaluationSubmissionConfigViewImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/editor/EvaluationSubmissionConfigViewImpl.java @@ -12,8 +12,6 @@ import org.gwtbootstrap3.client.ui.html.Div; import org.sagebionetworks.web.client.DisplayConstants; import org.sagebionetworks.web.client.DisplayUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.jsinterop.EntityFinderScope; import org.sagebionetworks.web.client.widget.entity.browse.EntityFilter; @@ -89,8 +87,6 @@ public interface EvaluationSubmissionConfigViewImplUiBinder Widget widget; - FeatureFlagConfig featureFlagConfig; - private final EvaluationSubmissionConfigViewImplUiBinder binder = GWT.create( EvaluationSubmissionConfigViewImplUiBinder.class ); @@ -98,12 +94,10 @@ public interface EvaluationSubmissionConfigViewImplUiBinder @Inject public EvaluationSubmissionConfigViewImpl( EntityFinderWidget.Builder entityFinderBuilder, - CookieProvider cookies, - FeatureFlagConfig featureFlagConfig + CookieProvider cookies ) { widget = binder.createAndBindUi(this); this.cookies = cookies; - this.featureFlagConfig = featureFlagConfig; findProjectButton.addClickHandler(event -> { entityFinderBuilder .setInitialScope(EntityFinderScope.ALL_PROJECTS) @@ -195,11 +189,7 @@ public void initView() { @Override public void configure(WikiPageKey wikiKey, Map descriptor) { - submissionTypeOptions.setVisible( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.CHALLENGE_SUBMISSION_SETTINGS - ) - ); + submissionTypeOptions.setVisible(true); String text = descriptor.get(WidgetConstants.UNAVAILABLE_MESSAGE); if (text != null) unavailableMessageField.setValue(text); diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/registration/WidgetRegistrarImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/registration/WidgetRegistrarImpl.java index 648c8d890b..00c0a9009e 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/registration/WidgetRegistrarImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/registration/WidgetRegistrarImpl.java @@ -82,8 +82,6 @@ import org.sagebionetworks.schema.adapter.JSONObjectAdapter; import org.sagebionetworks.schema.adapter.JSONObjectAdapterException; import org.sagebionetworks.web.client.DisplayConstants; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.utils.Callback; import org.sagebionetworks.web.client.widget.WidgetEditorPresenter; @@ -102,17 +100,14 @@ public class WidgetRegistrarImpl implements WidgetRegistrar { PortalGinInjector ginInjector; JSONObjectAdapter adapter; - FeatureFlagConfig featureFlagConfig; @Inject public WidgetRegistrarImpl( PortalGinInjector ginInjector, - JSONObjectAdapter adapter, - FeatureFlagConfig featureFlagConfig + JSONObjectAdapter adapter ) { this.ginInjector = ginInjector; this.adapter = adapter; - this.featureFlagConfig = featureFlagConfig; initWithKnownWidgets(); } @@ -330,15 +325,7 @@ public WidgetRendererPresenter getWidgetRendererForWidgetDescriptorAfterLazyLoad } else if (contentTypeKey.equals(REFERENCE_CONTENT_TYPE)) { presenter = ginInjector.getReferenceRenderer(); } else if (contentTypeKey.equals(PROVENANCE_CONTENT_TYPE)) { - if ( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.PROVENANCE_V2_VISUALIZATION - ) - ) { - presenter = ginInjector.getProvenanceRendererV2(); - } else { - presenter = ginInjector.getProvenanceRenderer(); - } + presenter = ginInjector.getProvenanceRendererV2(); } else if ( contentTypeKey.equals(IMAGE_CONTENT_TYPE) || contentTypeKey.equals(IMAGE_LINK_EDITOR_CONTENT_TYPE) diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/AbstractTablesTab.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/AbstractTablesTab.java index 3e6d1a6447..5d58798b81 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/AbstractTablesTab.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/AbstractTablesTab.java @@ -28,8 +28,6 @@ import org.sagebionetworks.repo.model.table.Table; import org.sagebionetworks.web.client.DisplayUtils; import org.sagebionetworks.web.client.EntityTypeUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.SynapseJSNIUtils; import org.sagebionetworks.web.client.SynapseJavascriptClient; @@ -106,7 +104,6 @@ public abstract class AbstractTablesTab WikiPageWidget wikiPageWidget; Long latestSnapshotVersionNumber; SynapseJavascriptClient jsClient; - FeatureFlagConfig featureFlagConfig; SynapseJSNIUtils jsniUtils; boolean isDraftRequested; @@ -125,12 +122,10 @@ public abstract class AbstractTablesTab public AbstractTablesTab( Tab tab, PortalGinInjector ginInjector, - FeatureFlagConfig featureFlagConfig, SynapseJSNIUtils jsniUtils ) { this.tab = tab; this.ginInjector = ginInjector; - this.featureFlagConfig = featureFlagConfig; this.jsniUtils = jsniUtils; } @@ -345,36 +340,24 @@ protected void updateVersionAndAreaToken( WidgetConstants.PROV_WIDGET_ENTITY_LIST_KEY, DisplayUtils.createEntityVersionString(entityId, newVersion) ); - if ( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.PROVENANCE_V2_VISUALIZATION - ) - ) { - ProvenanceWidget provWidget = ginInjector.getProvenanceRendererV2(); - view.setProvenance(provWidget); - - final boolean canEditProvenance = - entityBundle.getPermissions().getCanCertifiedUserEdit() && - isCurrentVersion; - if (canEditProvenance) { - provWidget.setOnEditProvenance(() -> { - ProvenanceEditorWidget editor = - ginInjector.getProvenanceEditorWidget(); - editor.configure(entityBundle); - editor.show(); - }); - } else { - // clear the callback to prevent stale state - provWidget.setOnEditProvenance(null); - } - - provWidget.configure(configMap); + ProvenanceWidget provWidget = ginInjector.getProvenanceRendererV2(); + view.setProvenance(provWidget); + + final boolean canEditProvenance = + entityBundle.getPermissions().getCanCertifiedUserEdit() && + isCurrentVersion; + if (canEditProvenance) { + provWidget.setOnEditProvenance(() -> { + ProvenanceEditorWidget editor = ginInjector.getProvenanceEditorWidget(); + editor.configure(entityBundle); + editor.show(); + }); } else { - org.sagebionetworks.web.client.widget.provenance.ProvenanceWidget provWidget = - ginInjector.getProvenanceRenderer(); - view.setProvenance(provWidget); - provWidget.configure(configMap); + // clear the callback to prevent stale state + provWidget.setOnEditProvenance(null); } + + provWidget.configure(configMap); version = newVersion; } diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/DatasetsTab.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/DatasetsTab.java index 6ccfc8b45d..bc799a131a 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/DatasetsTab.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/DatasetsTab.java @@ -7,7 +7,6 @@ import org.sagebionetworks.repo.model.EntityType; import org.sagebionetworks.repo.model.table.EntityRefCollectionView; import org.sagebionetworks.web.client.DisplayConstants; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.SynapseJSNIUtils; import org.sagebionetworks.web.client.place.Synapse.EntityArea; @@ -34,13 +33,11 @@ public class DatasetsTab extends AbstractTablesTab { public DatasetsTab( Tab tab, PortalGinInjector ginInjector, - FeatureFlagConfig featureFlagConfig, SynapseJSNIUtils jsniUtils ) { - super(tab, ginInjector, featureFlagConfig, jsniUtils); + super(tab, ginInjector, jsniUtils); this.tab = tab; this.ginInjector = ginInjector; - this.featureFlagConfig = featureFlagConfig; tab.configure(DisplayConstants.DATASETS, EntityArea.DATASETS); } diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/FilesTab.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/FilesTab.java index c9b0433690..a59a031d49 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/FilesTab.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/FilesTab.java @@ -16,8 +16,6 @@ import org.sagebionetworks.repo.model.VersionableEntity; import org.sagebionetworks.repo.model.entitybundle.v2.EntityBundle; 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.PortalGinInjector; import org.sagebionetworks.web.client.SynapseClientAsync; @@ -69,17 +67,11 @@ public class FilesTab { CallbackP entitySelectedCallback; ProvenanceWidget provWidget; AddToDownloadListV2 addToDownloadListWidget; - FeatureFlagConfig featureFlagConfig; @Inject - public FilesTab( - Tab tab, - PortalGinInjector ginInjector, - FeatureFlagConfig featureFlagConfig - ) { + public FilesTab(Tab tab, PortalGinInjector ginInjector) { this.tab = tab; this.ginInjector = ginInjector; - this.featureFlagConfig = featureFlagConfig; tab.configure("Files", EntityArea.FILES); } @@ -311,34 +303,23 @@ public void setTargetBundle(EntityBundle bundle, final Long versionNumber) { ); view.setProvenanceVisible(isFile); if (isFile) { - if ( - featureFlagConfig.isFeatureEnabled( - FeatureFlagKey.PROVENANCE_V2_VISUALIZATION - ) - ) { - provWidget = ginInjector.getProvenanceRendererV2(); - view.setProvenance(provWidget.asWidget()); - - final boolean canEditProvenance = - bundle.getPermissions().getCanCertifiedUserEdit() && isCurrentVersion; - if (canEditProvenance) { - provWidget.setOnEditProvenance(() -> { - ProvenanceEditorWidget editor = - ginInjector.getProvenanceEditorWidget(); - editor.configure(bundle); - editor.show(); - }); - } else { - // clear the callback to prevent stale state - provWidget.setOnEditProvenance(null); - } - provWidget.configure(configMap); + provWidget = ginInjector.getProvenanceRendererV2(); + view.setProvenance(provWidget.asWidget()); + + final boolean canEditProvenance = + bundle.getPermissions().getCanCertifiedUserEdit() && isCurrentVersion; + if (canEditProvenance) { + provWidget.setOnEditProvenance(() -> { + ProvenanceEditorWidget editor = + ginInjector.getProvenanceEditorWidget(); + editor.configure(bundle); + editor.show(); + }); } else { - org.sagebionetworks.web.client.widget.provenance.ProvenanceWidget provWidget = - ginInjector.getProvenanceRenderer(); - view.setProvenance(provWidget.asWidget()); - provWidget.configure(configMap); + // clear the callback to prevent stale state + provWidget.setOnEditProvenance(null); } + provWidget.configure(configMap); } // Wiki Page diff --git a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/TablesTab.java b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/TablesTab.java index 327dd94e3e..f91fa2cbe0 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/TablesTab.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/entity/tabs/TablesTab.java @@ -9,7 +9,6 @@ import org.sagebionetworks.repo.model.table.Dataset; import org.sagebionetworks.repo.model.table.Table; import org.sagebionetworks.web.client.DisplayConstants; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.SynapseJSNIUtils; import org.sagebionetworks.web.client.place.Synapse.EntityArea; @@ -29,13 +28,11 @@ public class TablesTab extends AbstractTablesTab { public TablesTab( Tab tab, PortalGinInjector ginInjector, - FeatureFlagConfig featureFlagConfig, SynapseJSNIUtils jsniUtils ) { - super(tab, ginInjector, featureFlagConfig, jsniUtils); + super(tab, ginInjector, jsniUtils); this.tab = tab; this.ginInjector = ginInjector; - this.featureFlagConfig = featureFlagConfig; tab.configure(DisplayConstants.TABLES, EntityArea.TABLES); } diff --git a/src/main/java/org/sagebionetworks/web/client/widget/table/explore/QueryWrapperPlotNav.java b/src/main/java/org/sagebionetworks/web/client/widget/table/explore/QueryWrapperPlotNav.java index 4072944ea5..fa901480d2 100644 --- a/src/main/java/org/sagebionetworks/web/client/widget/table/explore/QueryWrapperPlotNav.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/table/explore/QueryWrapperPlotNav.java @@ -4,7 +4,6 @@ import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryCallback; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryResultBundleCallback; -import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnViewSharingSettingsHandler; import org.sagebionetworks.web.client.jsinterop.React; import org.sagebionetworks.web.client.jsinterop.ReactElement; import org.sagebionetworks.web.client.jsinterop.SRC; @@ -18,7 +17,6 @@ public QueryWrapperPlotNav( String initQueryJson, OnQueryCallback onQueryChange, OnQueryResultBundleCallback onQueryResultBundleChange, - OnViewSharingSettingsHandler onViewSharingSettingsHandler, boolean hideSqlEditorControl, Boolean defaultShowPlots, Boolean defaultShowSearchBox, @@ -33,7 +31,6 @@ public QueryWrapperPlotNav( initQueryJson, onQueryChange, onQueryResultBundleChange, - onViewSharingSettingsHandler, hideSqlEditorControl, defaultShowPlots, defaultShowSearchBox, diff --git a/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java b/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java index 8a89c90712..561b6874ee 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/table/explore/TableEntityWidgetV2.java @@ -37,7 +37,6 @@ import org.sagebionetworks.web.client.jsinterop.DatasetEditorProps; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryCallback; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryResultBundleCallback; -import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnViewSharingSettingsHandler; import org.sagebionetworks.web.client.jsinterop.ToastMessageOptions; import org.sagebionetworks.web.client.utils.Callback; import org.sagebionetworks.web.client.widget.CopyTextModal; @@ -48,7 +47,6 @@ import org.sagebionetworks.web.client.widget.entity.file.AddToDownloadListV2; import org.sagebionetworks.web.client.widget.entity.menu.v3.Action; import org.sagebionetworks.web.client.widget.entity.menu.v3.EntityActionMenu; -import org.sagebionetworks.web.client.widget.sharing.EntityAccessControlListModalWidget; import org.sagebionetworks.web.client.widget.table.QueryChangeHandler; import org.sagebionetworks.web.client.widget.table.modal.download.DownloadTableQueryModalWidget; import org.sagebionetworks.web.client.widget.table.modal.fileview.TableType; @@ -128,7 +126,6 @@ public static final String noScopeMessage( EntityActionMenu actionMenu; PreflightController preflightController; SessionStorage sessionStorage; - private EntityAccessControlListModalWidget aclModal; private PopupUtilsView popupUtils; EventBus eventBus; private final CreateGridSessionDialog createGridSessionDialog; @@ -441,10 +438,6 @@ private void setQuery(Query query, boolean isFromResults) { } }; - OnViewSharingSettingsHandler onViewSharingSettingsHandler = - entityId -> { - onViewSharingSettingsClicked(entityId); - }; JSONObjectAdapter adapter = ginInjector .getJSONObjectAdapter() .createNew(); @@ -456,7 +449,6 @@ private void setQuery(Query query, boolean isFromResults) { adapter.toJSONString(), onQueryChange, onQueryResultBundleChange, - onViewSharingSettingsHandler, hideSqlEditorControl ); } catch (JSONObjectAdapterException e) { @@ -703,16 +695,4 @@ public Query getCurrentQuery() { public QueryResultBundle getCurrentQueryResultBundle() { return currentQueryResultBundle; } - - private EntityAccessControlListModalWidget getAccessControlListModalWidget() { - if (aclModal == null) { - aclModal = ginInjector.getEntityAccessControlListModalWidget(); - } - return aclModal; - } - - public void onViewSharingSettingsClicked(String benefactorEntityId) { - getAccessControlListModalWidget().configure(benefactorEntityId, () -> {}); - getAccessControlListModalWidget().setOpen(true); - } } diff --git a/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetView.java b/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetView.java index 7fe4207a1a..b3c8b921dd 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetView.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetView.java @@ -6,7 +6,6 @@ import org.sagebionetworks.web.client.jsinterop.DatasetEditorProps; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryCallback; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryResultBundleCallback; -import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnViewSharingSettingsHandler; import org.sagebionetworks.web.client.utils.Callback; /** @@ -92,7 +91,6 @@ void configureQueryWrapperPlotNav( String initQueryJson, OnQueryCallback onQueryBundleRequestChange, OnQueryResultBundleCallback onQueryResultBundleChange, - OnViewSharingSettingsHandler onViewSharingSettingsHandler, boolean hideSqlEditorControl ); diff --git a/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetViewImpl.java b/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetViewImpl.java index 9fdc9d9474..0316dbe84c 100755 --- a/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetViewImpl.java +++ b/src/main/java/org/sagebionetworks/web/client/widget/table/v2/TableEntityWidgetViewImpl.java @@ -17,7 +17,6 @@ import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryCallback; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryResultBundleCallback; -import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnViewSharingSettingsHandler; import org.sagebionetworks.web.client.jsinterop.React; import org.sagebionetworks.web.client.jsinterop.ReactElement; import org.sagebionetworks.web.client.jsinterop.SRC; @@ -210,7 +209,6 @@ public void configureQueryWrapperPlotNav( String initQueryJson, OnQueryCallback onQueryChange, OnQueryResultBundleCallback onQueryResultBundleChange, - OnViewSharingSettingsHandler onViewSharingSettingsHandler, boolean hideSqlEditorControl ) { QueryWrapperPlotNav plotNav = new QueryWrapperPlotNav( @@ -218,7 +216,6 @@ public void configureQueryWrapperPlotNav( initQueryJson, onQueryChange, onQueryResultBundleChange, - onViewSharingSettingsHandler, hideSqlEditorControl, null, null, diff --git a/src/main/resources/org/sagebionetworks/web/client/view/TeamViewImpl.ui.xml b/src/main/resources/org/sagebionetworks/web/client/view/TeamViewImpl.ui.xml index 3c45436669..751613af13 100644 --- a/src/main/resources/org/sagebionetworks/web/client/view/TeamViewImpl.ui.xml +++ b/src/main/resources/org/sagebionetworks/web/client/view/TeamViewImpl.ui.xml @@ -113,7 +113,6 @@ ui:field="showMapLink" text="Show map" icon="MAP_MARKER" - visible="false" /> > callbackPcaptor; @@ -169,8 +164,7 @@ public void setup() { mockGoogleMap, mockCookies, mockIsACTMemberAsyncHandler, - mockGinInjector, - mockFeatureFlagConfig + mockGinInjector ); when(mockTeam.getName()).thenReturn(teamName); AsyncMockStubber @@ -188,8 +182,6 @@ public void setup() { when(mockTeam.getCanPublicJoin()).thenReturn(canPublicJoin); when(mockTeam.getId()).thenReturn(teamId); when(mockTeam.getIcon()).thenReturn(teamIcon); - when(mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.GOOGLE_MAP)) - .thenReturn(true); } private void setIsACT(boolean isACT) { @@ -373,7 +365,6 @@ public void testRefreshMember() { verify(mockView, never()).showAdminMenuItems(); verify(mockGoogleMap, never()).configure(teamId); - verify(mockView).setShowMapVisible(false); // simulate clicking Show Map presenter.onShowMap(); diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/docker/DockerRepoWidgetTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/docker/DockerRepoWidgetTest.java index 2be1aec389..68209620ff 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/docker/DockerRepoWidgetTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/docker/DockerRepoWidgetTest.java @@ -17,7 +17,6 @@ import org.sagebionetworks.repo.model.auth.UserEntityPermissions; import org.sagebionetworks.repo.model.docker.DockerRepository; import org.sagebionetworks.repo.model.entitybundle.v2.EntityBundle; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.utils.CallbackP; import org.sagebionetworks.web.client.widget.docker.DockerCommitListWidget; @@ -72,9 +71,6 @@ public class DockerRepoWidgetTest { @Mock EventBus mockEventBus; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - DockerRepoWidget dockerRepoWidget; String entityId = "syn123"; String repoName = "dockerRepoName"; @@ -98,8 +94,7 @@ public void setUp() { mockModifiedCreatedBy, mockDockerCommitListWidget, mockCookieProvider, - mockEventBus, - mockFeatureFlagConfig + mockEventBus ); when(mockEntity.getId()).thenReturn(entityId); when(mockEntity.getRepositoryName()).thenReturn(repoName); @@ -140,7 +135,6 @@ public void testConfigure() { verify(mockDockerTitleBar).configure(mockEntityBundle, mockActionWidget); verify(mockModifiedCreatedBy).configure(entityId, null); verify(mockDockerCommitListWidget).configure(entityId, false); - verify(mockView).setProvenanceWidgetVisible(false); } @SuppressWarnings("unchecked") diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityPageTopTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityPageTopTest.java index 5476217587..46511fc2d2 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityPageTopTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/EntityPageTopTest.java @@ -13,7 +13,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.sagebionetworks.web.client.FeatureFlagKey.METADATA_TAB; import com.google.gwt.event.shared.EventBus; import com.google.gwt.place.shared.Place; @@ -46,7 +45,6 @@ import org.sagebionetworks.repo.model.table.Dataset; import org.sagebionetworks.repo.model.table.TableEntity; import org.sagebionetworks.web.client.DisplayUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.GlobalApplicationState; import org.sagebionetworks.web.client.PlaceChanger; import org.sagebionetworks.web.client.SynapseClientAsync; @@ -225,9 +223,6 @@ public class EntityPageTopTest { @Mock EntityHeader mockProjectEntityHeader; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - @Mock ListCurationTaskResponse mockCurationTaskList; @@ -281,7 +276,6 @@ public void setUp() { mockGlobalApplicationState, entityId2BundleCache, mockEventBus, - mockFeatureFlagConfig, mockAuthenticationController ); AsyncMockStubber @@ -304,7 +298,6 @@ public void setUp() { when(mockProjectBundle.getAccessControlList()).thenReturn(mockACL); when(mockCookies.getCookie(DisplayUtils.SYNAPSE_TEST_WEBSITE_COOKIE_KEY)) .thenReturn("true"); - when(mockFeatureFlagConfig.isFeatureEnabled(any())).thenReturn(true); EntityPath path = new EntityPath(); path.setPath(Collections.singletonList(mockProjectEntityHeader)); when(mockProjectEntityHeader.getType()).thenReturn(Project.class.getName()); @@ -1517,23 +1510,6 @@ public void testOnChangeSynapsePlaceDifferentEntityIdSameProject() { verify(mockPlaceChanger, never()).goTo(newPlace); } - @Test - public void testHideMetadataTabWhenFeatureDisabled() { - when(mockFeatureFlagConfig.isFeatureEnabled(METADATA_TAB)) - .thenReturn(false); - Synapse.EntityArea area = null; - String areaToken = null; - Long versionNumber = null; - pageTop.configure( - mockProjectBundle, - versionNumber, - mockProjectHeader, - area, - areaToken - ); - verify(mockMetadataInnerTab, never()).setTabListItemVisible(true); - } - @Test public void testHideMetadataTabWhenNoCurationTasks() { AsyncMockStubber diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/RenameEntityModalWidgetTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/RenameEntityModalWidgetTest.java index 3a7985b7d5..b4634bf8ec 100755 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/RenameEntityModalWidgetTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/RenameEntityModalWidgetTest.java @@ -25,8 +25,6 @@ import org.sagebionetworks.repo.model.Entity; import org.sagebionetworks.repo.model.Folder; import org.sagebionetworks.repo.model.table.TableEntity; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.SynapseJavascriptClient; import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.utils.Callback; @@ -50,9 +48,6 @@ public class RenameEntityModalWidgetTest { @Mock Callback mockCallback; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - String startName; String startDescription; String entityDisplayType; @@ -73,12 +68,7 @@ public void before() { entity.setName(startName); entityDisplayType = "Folder"; widget = - new RenameEntityModalWidgetImpl( - mockView, - mockJsClient, - mockCookies, - mockFeatureFlagConfig - ); + new RenameEntityModalWidgetImpl(mockView, mockJsClient, mockCookies); tableEntity = new TableEntity(); tableEntity.setName(startName); @@ -208,11 +198,6 @@ public void testRenameFailed() { @Test public void testOnlyShowDescriptionForTables() { - // Currently behind feature flag - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); AsyncMockStubber .callSuccessWith(new TableEntity()) .when(mockJsClient) @@ -250,12 +235,6 @@ public void testOnlyShowDescriptionForTables() { public void testNullDescriptionWithNoUpdate() { tableEntity.setDescription(null); - // Currently behind feature flag - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - String newDescription = null; widget.onRename(tableEntity, mockCallback); 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 bce565c7e2..25746ae1c3 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 @@ -612,11 +612,6 @@ public Void answer(InvocationOnMock invocation) throws Throwable { @Test public void testConfigureWithTableEntity() { - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -693,11 +688,6 @@ public void testConfigureWithTableEntityNoPermission() { permissions.setCanDelete(canDelete); permissions.setCanChangePermissions(canChangePermission); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -741,11 +731,6 @@ public void testConfigureWithDataset() { boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -806,11 +791,6 @@ public void testConfigureWithDatasetNoPermission() { permissions.setCanDelete(canDelete); permissions.setCanChangePermissions(canChangePermission); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -865,11 +845,6 @@ public void testConfigureWithDatasetSnapshot() { boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -924,11 +899,6 @@ public void testConfigureWithDatasetCollection() { boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -990,11 +960,6 @@ public void testConfigureWithDatasetCollectionNoPermission() { permissions.setCanDelete(canDelete); permissions.setCanChangePermissions(canChangePermission); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1050,11 +1015,6 @@ public void testConfigureWithDatasetCollectionSnapshot() { boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1108,11 +1068,6 @@ public void testConfigureWithEntityView() { boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1163,11 +1118,6 @@ public void testConfigureWithSubmissionView() { boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1217,11 +1167,6 @@ public void testConfigureWithMaterializedView() { entityBundle.setEntity(mockMaterializedView); boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1277,11 +1222,6 @@ public void testConfigureWithMaterializedViewNoPermission() { permissions.setCanDelete(canDelete); permissions.setCanChangePermissions(canChangePermission); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1330,11 +1270,6 @@ public void testConfigureWithVirtualTable() { entityBundle.setEntity(mockVirtualTable); boolean canCertifiedUserEdit = true; permissions.setCanCertifiedUserEdit(canCertifiedUserEdit); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1390,11 +1325,6 @@ public void testConfigureWithVirtualTableNoPermission() { permissions.setCanDelete(canDelete); permissions.setCanChangePermissions(canChangePermission); - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); - controller.configure( mockActionMenu, entityBundle, @@ -1440,10 +1370,6 @@ public void testConfigureWithVirtualTableNoPermission() { @Test public void testDisableFullTextSearch() { - when( - mockFeatureFlagConfig.isFeatureEnabled(FeatureFlagKey.DESCRIPTION_FIELD) - ) - .thenReturn(true); ((TableEntity) entityBundle.getEntity()).setIsSearchEnabled(true); controller.configure( mockActionMenu, diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/StorageLocationWidgetTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/StorageLocationWidgetTest.java index 69696055c3..caeabc46c4 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/StorageLocationWidgetTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/controller/StorageLocationWidgetTest.java @@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -33,8 +34,6 @@ import org.sagebionetworks.repo.model.project.ExternalObjectStorageLocationSetting; import org.sagebionetworks.repo.model.project.ExternalS3StorageLocationSetting; import org.sagebionetworks.repo.model.project.StorageLocationSetting; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.SynapseClientAsync; import org.sagebionetworks.web.client.SynapseJavascriptClient; import org.sagebionetworks.web.client.SynapseProperties; @@ -79,9 +78,6 @@ public class StorageLocationWidgetTest { @Mock EventBus mockEventBus; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - @Captor ArgumentCaptor locationSettingCaptor; @@ -89,12 +85,6 @@ public class StorageLocationWidgetTest { @Before public void setup() { - when( - mockFeatureFlagConfig.isFeatureEnabled( - FeatureFlagKey.CUSTOM_STORAGE_LOCATION_SETTINGS - ) - ) - .thenReturn(false); widget = new StorageLocationWidget( mockView, @@ -103,8 +93,7 @@ public void setup() { mockSynAlert, mockSynapseProperties, mockCookies, - mockEventBus, - mockFeatureFlagConfig + mockEventBus ); folder = new Folder(); folder.setId("syn420"); @@ -175,7 +164,7 @@ public void testGetStorageLocationSettingNull() { widget.getStorageLocationSetting(); // should remain set to the default config verify(mockView).setLoading(false); - verify(mockView).setS3StsVisible(false); + verify(mockView).setS3StsVisible(true); verifyNoMoreInteractions(mockView); } @@ -211,12 +200,6 @@ public void testNullBanner() { @Test public void testGetStorageLocationSettingExternalS3() { - when( - mockFeatureFlagConfig.isFeatureEnabled( - FeatureFlagKey.CUSTOM_STORAGE_LOCATION_SETTINGS - ) - ) - .thenReturn(true); ExternalS3UploadDestination entityStorageLocationSetting = new ExternalS3UploadDestination(); String baseKey = "key"; @@ -254,29 +237,10 @@ public void testS3StsEnabled() { .getDefaultUploadDestination(anyString(), any(AsyncCallback.class)); widget.getStorageLocationSetting(); verify(mockView).selectExternalS3Storage(); - verify(mockView).setS3StsVisible(true); + verify(mockView, times(2)).setS3StsVisible(true); verify(mockView).setS3StsEnabled(true); } - // This test can be deleted once STS is out of alpha mode - @Test - public void testS3StsNotEnabledNotInAlpha() { - ExternalS3UploadDestination entityStorageLocationSetting = - new ExternalS3UploadDestination(); - entityStorageLocationSetting.setBanner(""); - entityStorageLocationSetting.setBucket(""); - entityStorageLocationSetting.setBaseKey(""); - entityStorageLocationSetting.setStsEnabled(false); - AsyncMockStubber - .callSuccessWith(entityStorageLocationSetting) - .when(mockJsClient) - .getDefaultUploadDestination(anyString(), any(AsyncCallback.class)); - widget.getStorageLocationSetting(); - verify(mockView).selectExternalS3Storage(); - verify(mockView).setS3StsVisible(false); - verify(mockView).setS3StsEnabled(false); - } - @Test public void testGetStorageLocationSettingHideSFTP() { ExternalS3UploadDestination entityStorageLocationSetting = diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/registration/WidgetRegistrarImplTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/registration/WidgetRegistrarImplTest.java index 0defcf5042..1b8529443e 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/registration/WidgetRegistrarImplTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/registration/WidgetRegistrarImplTest.java @@ -15,8 +15,6 @@ import org.mockito.MockitoAnnotations; import org.sagebionetworks.schema.adapter.JSONObjectAdapterException; import org.sagebionetworks.schema.adapter.org.json.JSONObjectAdapterImpl; -import org.sagebionetworks.web.client.FeatureFlagConfig; -import org.sagebionetworks.web.client.FeatureFlagKey; import org.sagebionetworks.web.client.PortalGinInjector; import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.widget.WidgetEditorPresenter; @@ -32,9 +30,6 @@ public class WidgetRegistrarImplTest { @Mock PortalGinInjector mockGinInjector; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - Map testImageWidgetDescriptor; String testFileName = "testfile.png"; @@ -51,11 +46,7 @@ public class WidgetRegistrarImplTest { public void setup() { MockitoAnnotations.initMocks(this); widgetRegistrar = - new WidgetRegistrarImpl( - mockGinInjector, - new JSONObjectAdapterImpl(), - mockFeatureFlagConfig - ); + new WidgetRegistrarImpl(mockGinInjector, new JSONObjectAdapterImpl()); testImageWidgetDescriptor = new HashMap(); when(mockGinInjector.getCookieProvider()).thenReturn(mockCookies); } @@ -77,7 +68,7 @@ public void testCreateWidgets() { widgetRegistrar.getWidgetRendererForWidgetDescriptorAfterLazyLoad( WidgetConstants.PROVENANCE_CONTENT_TYPE ); - verify(mockGinInjector).getProvenanceRenderer(); + verify(mockGinInjector).getProvenanceRendererV2(); widgetRegistrar.getWidgetRendererForWidgetDescriptorAfterLazyLoad( WidgetConstants.API_TABLE_CONTENT_TYPE ); @@ -88,17 +79,6 @@ public void testCreateWidgets() { WidgetConstants.LEADERBOARD_CONTENT_TYPE ); verify(mockGinInjector, times(3)).getSynapseAPICallRenderer(); - - when( - mockFeatureFlagConfig.isFeatureEnabled( - FeatureFlagKey.PROVENANCE_V2_VISUALIZATION - ) - ) - .thenReturn(true); - widgetRegistrar.getWidgetRendererForWidgetDescriptorAfterLazyLoad( - WidgetConstants.PROVENANCE_CONTENT_TYPE - ); - verify(mockGinInjector).getProvenanceRendererV2(); } @Test diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/DatasetsTabTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/DatasetsTabTest.java index 8dbec371de..878fb5ea26 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/DatasetsTabTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/DatasetsTabTest.java @@ -44,7 +44,6 @@ import org.sagebionetworks.repo.model.table.SortDirection; import org.sagebionetworks.repo.model.table.SortItem; import org.sagebionetworks.web.client.DisplayUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.GlobalApplicationState; import org.sagebionetworks.web.client.PlaceChanger; import org.sagebionetworks.web.client.PortalGinInjector; @@ -65,7 +64,7 @@ import org.sagebionetworks.web.client.widget.entity.tabs.DatasetsTab; import org.sagebionetworks.web.client.widget.entity.tabs.Tab; import org.sagebionetworks.web.client.widget.entity.tabs.TablesTabView; -import org.sagebionetworks.web.client.widget.provenance.ProvenanceWidget; +import org.sagebionetworks.web.client.widget.provenance.v2.ProvenanceWidget; import org.sagebionetworks.web.client.widget.table.TableListWidget; import org.sagebionetworks.web.client.widget.table.explore.TableEntityWidgetV2; import org.sagebionetworks.web.client.widget.table.v2.QueryTokenProvider; @@ -161,9 +160,6 @@ public class DatasetsTabTest { @Mock SynapseJavascriptClient mockJsClient; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - @Mock SynapseJSNIUtils mockJsniUtils; @@ -193,7 +189,7 @@ public void setUp() { when(mockPortalGinInjector.getQueryTokenProvider()) .thenReturn(mockQueryTokenProvider); when(mockPortalGinInjector.getStuAlert()).thenReturn(mockSynapseAlert); - when(mockPortalGinInjector.getProvenanceRenderer()) + when(mockPortalGinInjector.getProvenanceRendererV2()) .thenReturn(mockProvenanceWidget); when(mockPortalGinInjector.getGlobalApplicationState()) .thenReturn(mockGlobalApplicationState); @@ -204,13 +200,7 @@ public void setUp() { when(mockGlobalApplicationState.getPlaceChanger()) .thenReturn(mockPlaceChanger); - tab = - new DatasetsTab( - mockTab, - mockPortalGinInjector, - mockFeatureFlagConfig, - mockJsniUtils - ); + tab = new DatasetsTab(mockTab, mockPortalGinInjector, mockJsniUtils); tab.setEntitySelectedCallback(mockEntitySelectedCallback); when(mockProjectEntityBundle.getEntity()).thenReturn(mockProjectEntity); diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/FilesTabTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/FilesTabTest.java index 996b8ee7b7..41c6cdc0d2 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/FilesTabTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/FilesTabTest.java @@ -31,7 +31,6 @@ import org.sagebionetworks.repo.model.discussion.DiscussionThreadBundle; import org.sagebionetworks.repo.model.entitybundle.v2.EntityBundle; import org.sagebionetworks.repo.model.file.FileHandle; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.GlobalApplicationState; import org.sagebionetworks.web.client.PlaceChanger; import org.sagebionetworks.web.client.PortalGinInjector; @@ -131,9 +130,6 @@ public class FilesTabTest { @Mock UserEntityPermissions mockPermissions; - @Mock - org.sagebionetworks.web.client.widget.provenance.ProvenanceWidget mockProvenanceWidget; - @Mock ProvenanceWidget mockProvenanceWidgetV2; @@ -167,9 +163,6 @@ public class FilesTabTest { @Mock CookieProvider mockCookies; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - FilesTab tab; String projectEntityId = "syn9"; String projectName = "proyecto"; @@ -192,7 +185,7 @@ public void setUp() { .thenReturn(mockEntityRefreshAlert); when(mockTab.getEntityActionMenu()).thenReturn(mockActionMenuWidget); - tab = new FilesTab(mockTab, mockPortalGinInjector, mockFeatureFlagConfig); + tab = new FilesTab(mockTab, mockPortalGinInjector); when(mockPortalGinInjector.getFilesTabView()).thenReturn(mockView); when(mockPortalGinInjector.getBasicTitleBar()).thenReturn(mockTitleBar); @@ -228,8 +221,6 @@ public void setUp() { when(mockFileEntity.getName()).thenReturn(fileName); when(mockEntityBundle.getPermissions()).thenReturn(mockPermissions); - when(mockPortalGinInjector.getProvenanceRenderer()) - .thenReturn(mockProvenanceWidget); when(mockPortalGinInjector.getProvenanceRendererV2()) .thenReturn(mockProvenanceWidgetV2); when(mockLinkEntity.getLinksTo()).thenReturn(mockReference); @@ -363,7 +354,7 @@ public void testConfigureWithFileWithFileHandles() { verify(mockView).setWikiPageWidgetVisible(true); verify(mockView, times(2)).setFileBrowserVisible(false); - verify(mockPortalGinInjector).getProvenanceRenderer(); + verify(mockPortalGinInjector).getProvenanceRendererV2(); verify(mockView).setRefreshAlert(any()); verify(mockView).setDiscussionText(fileName); diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/TablesTabTest.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/TablesTabTest.java index 97e62a7254..2ad1be3579 100644 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/TablesTabTest.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/entity/tabs/TablesTabTest.java @@ -45,7 +45,6 @@ import org.sagebionetworks.repo.model.table.SortItem; import org.sagebionetworks.repo.model.table.TableEntity; import org.sagebionetworks.web.client.DisplayUtils; -import org.sagebionetworks.web.client.FeatureFlagConfig; import org.sagebionetworks.web.client.GlobalApplicationState; import org.sagebionetworks.web.client.PlaceChanger; import org.sagebionetworks.web.client.PortalGinInjector; @@ -66,7 +65,7 @@ import org.sagebionetworks.web.client.widget.entity.tabs.Tab; import org.sagebionetworks.web.client.widget.entity.tabs.TablesTab; import org.sagebionetworks.web.client.widget.entity.tabs.TablesTabView; -import org.sagebionetworks.web.client.widget.provenance.ProvenanceWidget; +import org.sagebionetworks.web.client.widget.provenance.v2.ProvenanceWidget; import org.sagebionetworks.web.client.widget.table.TableListWidget; import org.sagebionetworks.web.client.widget.table.explore.TableEntityWidgetV2; import org.sagebionetworks.web.client.widget.table.v2.QueryTokenProvider; @@ -177,9 +176,6 @@ public class TablesTabTest { @Mock SynapseJavascriptClient mockJsClient; - @Mock - FeatureFlagConfig mockFeatureFlagConfig; - @Captor ArgumentCaptor> mapCaptor; @@ -192,12 +188,7 @@ public class TablesTabTest { @Before public void setUp() { tab = - new TablesTab( - mockTab, - mockPortalGinInjector, - mockFeatureFlagConfig, - mockJsniUtils - ) { + new TablesTab(mockTab, mockPortalGinInjector, mockJsniUtils) { @Override protected com.google.gwt.user.client.ui.IsWidget createSearchIndexWidget( String entityId, @@ -218,7 +209,7 @@ protected com.google.gwt.user.client.ui.IsWidget createSearchIndexWidget( when(mockPortalGinInjector.getQueryTokenProvider()) .thenReturn(mockQueryTokenProvider); when(mockPortalGinInjector.getStuAlert()).thenReturn(mockSynapseAlert); - when(mockPortalGinInjector.getProvenanceRenderer()) + when(mockPortalGinInjector.getProvenanceRendererV2()) .thenReturn(mockProvenanceWidget); when(mockPortalGinInjector.getGlobalApplicationState()) .thenReturn(mockGlobalApplicationState); diff --git a/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java b/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java index b90a84f2f7..4fe3f1f2e2 100755 --- a/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java +++ b/src/test/java/org/sagebionetworks/web/unitclient/widget/table/explore/TableEntityWidgetV2Test.java @@ -52,7 +52,6 @@ import org.sagebionetworks.web.client.cookie.CookieProvider; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryCallback; import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnQueryResultBundleCallback; -import org.sagebionetworks.web.client.jsinterop.QueryWrapperPlotNavProps.OnViewSharingSettingsHandler; import org.sagebionetworks.web.client.jsinterop.UpdateTableWithCsvDialogProps; import org.sagebionetworks.web.client.security.AuthenticationController; import org.sagebionetworks.web.client.utils.Callback; @@ -65,7 +64,6 @@ import org.sagebionetworks.web.client.widget.entity.menu.v3.Action; import org.sagebionetworks.web.client.widget.entity.menu.v3.ActionListener; import org.sagebionetworks.web.client.widget.entity.menu.v3.EntityActionMenu; -import org.sagebionetworks.web.client.widget.sharing.EntityAccessControlListModalWidget; import org.sagebionetworks.web.client.widget.table.QueryChangeHandler; import org.sagebionetworks.web.client.widget.table.explore.TableEntityWidgetV2; import org.sagebionetworks.web.client.widget.table.modal.download.DownloadTableQueryModalWidget; @@ -126,9 +124,6 @@ public class TableEntityWidgetV2Test { @Mock SynapseJavascriptClient mockJsClient; - @Mock - EntityAccessControlListModalWidget mockACLModalWidget; - @Mock Entity mockEntity; @@ -171,11 +166,6 @@ public class TableEntityWidgetV2Test { @Captor ArgumentCaptor onQueryResultBundleCallbackCaptor; - @Captor - ArgumentCaptor< - OnViewSharingSettingsHandler - > onViewSharingSettingsHandlerCaptor; - @Mock GlobalApplicationState mockGlobalState; @@ -212,8 +202,6 @@ public void before() { when(mockPortalGinInjector.createNewQueryResultEditorWidget()) .thenReturn(mockQueryResultEditorWidget); when(mockPortalGinInjector.getJSONObjectAdapter()).thenReturn(portalJson); - when(mockPortalGinInjector.getEntityAccessControlListModalWidget()) - .thenReturn(mockACLModalWidget); when(mockPortalGinInjector.getSynapseJavascriptClient()) .thenReturn(mockJsClient); AsyncMockStubber @@ -538,7 +526,6 @@ public void testOnExecuteQuery() throws JSONObjectAdapterException { eq(adapter.toJSONString()), onQueryCallbackCaptor.capture(), onQueryResultBundleCallbackCaptor.capture(), - onViewSharingSettingsHandlerCaptor.capture(), eq(expectedHideSqlEditorControl) ); @@ -572,15 +559,6 @@ public void testOnExecuteQuery() throws JSONObjectAdapterException { expectedQueryCount, widget.getCurrentQueryResultBundle().getQueryCount() ); - - // test OnViewSharingSettingsHandler - OnViewSharingSettingsHandler onViewSharingSettingsHandler = - onViewSharingSettingsHandlerCaptor.getValue(); - String testEntityId = "syn0000001"; - onViewSharingSettingsHandler.onViewSharingSettingsClicked(testEntityId); - - verify(mockACLModalWidget).configure(eq(testEntityId), any()); - verify(mockACLModalWidget).setOpen(true); } @Test