remove old doi widget and pull new DOI widget out of alpha mode

src/main/java/org/sagebionetworks/web/client/PortalGinModule.java

@@ -217,8 +217,6 @@
 import org.sagebionetworks.web.client.widget.entity.BigPromptModalViewImpl;
 import org.sagebionetworks.web.client.widget.entity.ChallengeBadgeView;
 import org.sagebionetworks.web.client.widget.entity.ChallengeBadgeViewImpl;
-import org.sagebionetworks.web.client.widget.entity.DoiWidgetView;
-import org.sagebionetworks.web.client.widget.entity.DoiWidgetViewImpl;
 import org.sagebionetworks.web.client.widget.entity.EditFileMetadataModalView;
 import org.sagebionetworks.web.client.widget.entity.EditFileMetadataModalViewImpl;
 import org.sagebionetworks.web.client.widget.entity.EditFileMetadataModalWidget;
@@ -917,7 +915,6 @@ protected void configure() {
 		bind(QuestionContainerWidgetView.class).to(QuestionContainerWidgetViewImpl.class);
 
 		// DoiWidget
-		bind(DoiWidgetView.class).to(DoiWidgetViewImpl.class);
 		bind(DoiWidgetV2View.class).to(DoiWidgetV2ViewImpl.class);
 		bind(CreateOrUpdateDoiModalView.class).to(CreateOrUpdateDoiModalViewImpl.class);
 

src/main/java/org/sagebionetworks/web/client/widget/entity/EntityMetadata.java

@@ -15,10 +15,8 @@
 import org.sagebionetworks.repo.model.file.UploadDestination;
 import org.sagebionetworks.repo.model.file.UploadType;
 import org.sagebionetworks.repo.model.table.TableEntity;
-import org.sagebionetworks.web.client.DisplayUtils;
 import org.sagebionetworks.web.client.SynapseJSNIUtils;
 import org.sagebionetworks.web.client.SynapseJavascriptClient;
-import org.sagebionetworks.web.client.cookie.CookieProvider;
 import org.sagebionetworks.web.client.widget.doi.DoiWidgetV2;
 import org.sagebionetworks.web.client.widget.entity.EntityMetadataView.Presenter;
 import org.sagebionetworks.web.client.widget.entity.annotation.AnnotationsRendererWidget;
@@ -34,39 +32,29 @@ public class EntityMetadata implements Presenter {
 
 	private EntityMetadataView view;
 	private AnnotationsRendererWidget annotationsWidget;
-	private DoiWidget doiWidget;
 	private DoiWidgetV2 doiWidgetV2;
 	private FileHistoryWidget fileHistoryWidget;
 	private SynapseJavascriptClient jsClient;
 	private SynapseJSNIUtils jsni;
 	private org.sagebionetworks.web.client.widget.entity.restriction.v2.RestrictionWidget restrictionWidgetV2;
-	private CookieProvider cookies;
 
 	boolean isShowingAnnotations, isShowingFileHistory;
 	@Inject
 	public EntityMetadata(EntityMetadataView view,
-						  DoiWidget doiWidget,
 						  DoiWidgetV2 doiWidgetV2,
 			AnnotationsRendererWidget annotationsWidget,
 			FileHistoryWidget fileHistoryWidget, 
 			SynapseJavascriptClient jsClient, 
 			SynapseJSNIUtils jsni,
-			RestrictionWidget restrictionWidgetV2,
-			CookieProvider cookies) {
+			RestrictionWidget restrictionWidgetV2) {
 		this.view = view;
-		this.doiWidget = doiWidget;
 		this.doiWidgetV2 = doiWidgetV2;
 		this.annotationsWidget = annotationsWidget;
 		this.fileHistoryWidget = fileHistoryWidget;
 		this.jsClient = jsClient;
 		this.jsni = jsni;
 		this.restrictionWidgetV2 = restrictionWidgetV2;
-		this.cookies = cookies;
-		if (DisplayUtils.isInTestWebsite(cookies)) {
-			this.view.setDoiWidget(doiWidgetV2);
-		} else {
-			this.view.setDoiWidget(doiWidget);
-		}
+		this.view.setDoiWidget(doiWidgetV2);
 		this.view.setAnnotationsRendererWidget(annotationsWidget);
 		this.view.setFileHistoryWidget(fileHistoryWidget);
 		this.view.setRestrictionWidgetV2(restrictionWidgetV2);
@@ -96,11 +84,7 @@ public void configure(EntityBundle bundle, Long versionNumber, ActionMenuWidget
 					|| en instanceof Folder || en instanceof DockerRepository);
 		}
 		configureStorageLocation(en);
-		if (DisplayUtils.isInTestWebsite(cookies)) {
-			doiWidgetV2.configure(bundle.getDoiAssociation());
-		} else {
-			doiWidget.configure(bundle.getDoi(), en.getId());
-		}
+		doiWidgetV2.configure(bundle.getDoiAssociation());
 		annotationsWidget.configure(bundle, canEdit, isCurrentVersion);
 		restrictionWidgetV2.configure(en, bundle.getPermissions().getCanChangePermissions());
 		isShowingAnnotations = false;
@@ -130,7 +114,6 @@ public void setFileHistoryVisible(boolean visible) {
 	}
 
 	public void clear() {
-		doiWidget.clear();
 		doiWidgetV2.clear();
 		view.clear();
 	}