Skip to content

Commit

Permalink
Merge pull request #5299 from jinjunoh/SWC-6668A
Browse files Browse the repository at this point in the history
  • Loading branch information
nickgros authored Feb 22, 2024
2 parents 5c5458a + 6d5324f commit 924c76e
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 576 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@
import org.sagebionetworks.web.client.widget.table.explore.TableEntityWidgetV2;
import org.sagebionetworks.web.client.widget.table.modal.download.DownloadTableQueryModalWidget;
import org.sagebionetworks.web.client.widget.table.modal.fileview.CreateTableViewWizard;
import org.sagebionetworks.web.client.widget.table.modal.fileview.SqlDefinedTableEditor;
import org.sagebionetworks.web.client.widget.table.modal.fileview.ViewDefaultColumns;
import org.sagebionetworks.web.client.widget.table.modal.upload.UploadTableModalWidget;
import org.sagebionetworks.web.client.widget.table.v2.QueryTokenProvider;
Expand Down Expand Up @@ -763,8 +762,6 @@ public interface PortalGinInjector extends Ginjector {

CreateDatasetOrCollection getCreateDatasetOrCollection();

SqlDefinedTableEditor getSqlDefinedTableEditor();

UploadTableModalWidget getUploadTableModalWidget();

SqlDefinedEditorModalWidget getSqlDefinedEditorModalWidget();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,6 @@
import org.sagebionetworks.web.client.widget.table.modal.fileview.EntityContainerListWidgetViewImpl;
import org.sagebionetworks.web.client.widget.table.modal.fileview.EntityViewScopeWidgetView;
import org.sagebionetworks.web.client.widget.table.modal.fileview.EntityViewScopeWidgetViewImpl;
import org.sagebionetworks.web.client.widget.table.modal.fileview.SqlDefinedTableEditorView;
import org.sagebionetworks.web.client.widget.table.modal.fileview.SqlDefinedTableEditorViewImpl;
import org.sagebionetworks.web.client.widget.table.modal.fileview.SubmissionViewScopeWidgetView;
import org.sagebionetworks.web.client.widget.table.modal.fileview.SubmissionViewScopeWidgetViewImpl;
import org.sagebionetworks.web.client.widget.table.modal.fileview.ViewDefaultColumns;
Expand Down Expand Up @@ -1446,8 +1444,6 @@ protected void configure() {
bind(ContainerClientsHelp.class).to(ContainerClientsHelpImpl.class);

bind(FileDownloadMenuItemView.class).to(FileDownloadMenuItemViewImpl.class);
bind(SqlDefinedTableEditorView.class)
.to(SqlDefinedTableEditorViewImpl.class);
bind(SqlDefinedEditorModalWidgetView.class)
.to(SqlDefinedEditorModalWidgetViewImpl.class);
bind(ChallengeWidgetView.class).to(ChallengeWidgetViewImpl.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
import org.sagebionetworks.web.client.widget.sharing.AccessControlListModalWidget;
import org.sagebionetworks.web.client.widget.statistics.StatisticsPlotWidget;
import org.sagebionetworks.web.client.widget.table.modal.fileview.CreateTableViewWizard;
import org.sagebionetworks.web.client.widget.table.modal.fileview.SqlDefinedTableEditor;
import org.sagebionetworks.web.client.widget.table.modal.fileview.TableType;
import org.sagebionetworks.web.client.widget.table.modal.upload.UploadTableModalWidget;
import org.sagebionetworks.web.client.widget.table.modal.wizard.ModalWizardWidget.WizardCallback;
Expand Down Expand Up @@ -276,7 +275,6 @@ public class EntityActionControllerImpl
AddFolderDialogWidget addFolderDialogWidget;
CreateTableViewWizard createTableViewWizard;
CreateDatasetOrCollection createDatasetOrCollection;
SqlDefinedTableEditor sqlDefinedTableEditor;
SqlDefinedEditorModalWidget sqlDefinedEditorModalWidget;
boolean isShowingVersion = false;
WizardCallback entityUpdatedWizardCallback;
Expand Down Expand Up @@ -439,14 +437,6 @@ private AccessControlListModalWidget getAccessControlListModalWidget() {
return accessControlListModalWidget;
}

private SqlDefinedTableEditor getSqlDefinedTableEditor() {
if (sqlDefinedTableEditor == null) {
sqlDefinedTableEditor = ginInjector.getSqlDefinedTableEditor();
this.view.addWidget(sqlDefinedTableEditor.asWidget());
}
return sqlDefinedTableEditor;
}

private CreateTableViewWizard getCreateTableViewWizard() {
if (createTableViewWizard == null) {
createTableViewWizard = ginInjector.getCreateTableViewWizard();
Expand Down Expand Up @@ -1971,35 +1961,6 @@ public void onAddTable() {
);
}

public void onAddMaterializedView() {
preflightController.checkCreateEntity(
entityBundle,
MaterializedView.class.getName(),
() -> {
// to create a MaterializedView, we need to know the definingSQL
getSqlDefinedTableEditor()
.configure(
entityBundle.getEntity().getId(),
EntityType.materializedview
)
.show();
}
);
}

public void onAddVirtualTable() {
preflightController.checkCreateEntity(
entityBundle,
VirtualTable.class.getName(),
() -> {
// to create a MaterializedView, we need to know the definingSQL
getSqlDefinedTableEditor()
.configure(entityBundle.getEntity().getId(), EntityType.virtualtable)
.show();
}
);
}

private void postCheckCreateDatasetOrCollection(TableType type) {
CreateDatasetOrCollection dialog = getCreateDatasetOrCollection();
dialog.configure(entityBundle.getEntity().getId(), type);
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 924c76e

Please sign in to comment.