diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 45f5644..c5d8ad3 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -25,12 +25,21 @@
uses
+
+ uses
+
+
+ uses
+
uses
uses
+
+ uses
+
uses
@@ -52,6 +61,9 @@
uses
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index e45ece9..c2dece0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,14 @@
tabular-data-extractcodelist-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
+
+ org.gcube.portlets.user
+ tabular-data-unionwizard-widget
+ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 46c5718..6316e3a 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -28,6 +28,7 @@ import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows;
import org.gcube.portlets.user.td.tablewidget.client.rows.EditRowDialog;
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
import org.gcube.portlets.user.td.taskswidget.client.TdTaskController;
+import org.gcube.portlets.user.td.unionwizardwidget.client.UnionWizardTD;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridContextMenuItemEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridHeaderColumnMenuItemEvent;
@@ -525,6 +526,7 @@ public class TabularDataController {
case TABLEFILTER:
break;
case TABLEUNION:
+ openTableUnionWizard();
break;
case TABLEGROUPBY:
openGroupBy();
@@ -822,6 +824,41 @@ public class TabularDataController {
}
+ protected void openTableUnionWizard() {
+ GWT.runAsync(new RunAsyncCallback() {
+
+ public void onSuccess() {
+ openWizard();
+ UnionWizardTD unionWizard = new UnionWizardTD(
+ trId,"Union", eventBus);
+
+ unionWizard.addListener(new WizardListener() {
+ public void failed(Throwable throwable, String reason,
+ String details) {
+ UtilsGXT3.alert(reason, details);
+ resumeUIState();
+ }
+
+ public void completed(TRId id) {
+ openTable(id);
+
+ }
+
+ public void aborted() {
+ resumeUIState();
+ }
+ });
+
+ unionWizard.show();
+ }
+
+ public void onFailure(Throwable reason) {
+ asyncCodeLoadingFailed(reason);
+ }
+ });
+
+ }
+
/**
*
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
index 4b2256f..061e526 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
@@ -83,8 +83,7 @@ public class ModifyToolBar {
filterButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
- // eventBus.fireEvent(new
- // ImportTableEvent(ImportTableType.JSON));
+ //eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEFILTER));
}
});
@@ -101,8 +100,7 @@ public class ModifyToolBar {
unionButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
- // eventBus.fireEvent(new
- // ImportTableEvent(ImportTableType.JSON));
+ eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEUNION));
}
});
@@ -206,8 +204,7 @@ public class ModifyToolBar {
annotationButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
- // eventBus.fireEvent(new
- // ImportTableEvent(ImportTableType.JSON));
+ //eventBus.fireEvent(new RibbonEvent(RibbonType.ANNOTATIONADD));
}
});
@@ -332,7 +329,7 @@ public class ModifyToolBar {
case TABLECURATION:
// Table
filterButton.disable();
- unionButton.disable();
+ unionButton.enable();
groupbyButton.enable();
aggregateButton.disable();
addRowButton.enable();
diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index f9fd52e..def3044 100644
--- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -40,13 +40,17 @@
name='org.gcube.portlets.user.td.extractcodelistwidget.ExtractCodelistWizardTD' />
+
+
+
+
-
+
diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index adb927e..01cdfab 100644
--- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -39,6 +39,8 @@
name='org.gcube.portlets.user.td.extractcodelistwidget.ExtractCodelistWizardTD' />
+
+