SWC-7937

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"),
 

src/main/java/org/sagebionetworks/web/client/jsinterop/DownloadCartPageProps.java

@@ -1,29 +1,14 @@
 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;
 
 @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();
   }
 }

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;
     }

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<org.sagebionetworks.web.client.place.DownloadCartPlace> {
+  implements Presenter<org.sagebionetworks.web.client.place.DownloadCartPlace> {
 
   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);
-  }
 }

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);
   }
 

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

@@ -47,7 +47,6 @@ public void render() {
       null,
       null,
       newBundle -> {},
-      null,
       true,
       false,
       true,

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);
-  }
 }

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

@@ -15,26 +15,18 @@ public class DownloadCartPageViewImpl implements DownloadCartPageView {
   ReactComponent container;
 
   private Header headerWidget;
-  private Presenter presenter;
 
   @Inject
   public DownloadCartPageViewImpl(Header headerWidget) {
     container = new ReactComponent();
     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

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);

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();

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) {

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);
 }

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);
-  }
 }