Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove all uses of old DOI widget and bring new one out of alpha mode #3696

Closed
wants to merge 3 commits into from
Closed

remove all uses of old DOI widget and bring new one out of alpha mode #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee62d2f
disable minting DOIs via old method
nickgros Nov 1, 2018
685a44c
"under maintenance" instead of "temporarily disabled"
nickgros Nov 2, 2018
a7859c8
remove old doi widget and pull new DOI widget out of alpha mode
nickgros Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/org/sagebionetworks/web/client/PortalGinModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
115 changes: 0 additions & 115 deletions src/main/java/org/sagebionetworks/web/client/widget/entity/DoiWidget.java
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/main/java/org/sagebionetworks/web/client/widget/entity/DoiWidgetView.java
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions src/main/java/org/sagebionetworks/web/client/widget/entity/DoiWidgetViewImpl.java
View file
Open in desktop

This file was deleted.

23 changes: 3 additions & 20 deletions src/main/java/org/sagebionetworks/web/client/widget/entity/EntityMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -130,7 +114,6 @@ public void setFileHistoryVisible(boolean visible) {
}

public void clear() {
doiWidget.clear();
doiWidgetV2.clear();
view.clear();
}
Expand Down