gCubeSystem
/
tabular-data-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refs #3249: TDM - Fix back button behavior 

https://support.d4science.org/issues/3249

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@128056 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2016-04-13 14:22:57 +00:00
parent 634904a6a8
commit b659a1aa7d
4 changed files with 88 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-10-0"
date="2015-10-15">
<Change>Fix back button behavior [issue #3249]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-9-0"
date="2015-10-15">
<Change>Added support to WorkspaceExplorer [issue #428]</Change>

2
pom.xml
View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-manager</artifactId>
<version>2.9.0-SNAPSHOT</version>
<version>2.10.0-SNAPSHOT</version>
<packaging>war</packaging>

32
src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
View File

@ -1,16 +1,21 @@
package org.gcube.portlets.user.td.client;
import org.gcube.portlets.user.gcubewidgets.client.ClientScopeHelper;
import org.gcube.portlets.user.td.client.ribbon.TabularDataRibbon;
import org.gcube.portlets.user.td.client.rpc.TabularDataService;
import org.gcube.portlets.user.td.client.rpc.TabularDataServiceAsync;
import org.gcube.portlets.user.td.mainboxwidget.client.MainBoxPanel;
import org.gcube.portlets.user.td.toolboxwidget.client.ToolBoxPanel;
import org.gcube.portlets.user.td.wizardwidget.client.util.UtilsGXT3;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.user.client.Window.Location;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.core.client.util.Margins;
@ -58,13 +63,34 @@ public class TabularDataPortlet implements EntryPoint {
// onModuleLoad2
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
public void execute() {
loadMainPanel();
loadScope();
}
});
}
private void loadScope() {
ClientScopeHelper.getService().setScope(Location.getHref(),
new AsyncCallback<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if(result){
loadMainPanel();
} else {
UtilsGXT3.info("Attention", "ClientScopeHelper has returned a false value!");
}
}
protected void loadMainPanel() {
@Override
public void onFailure(Throwable caught) {
UtilsGXT3.alert("Error", "Error setting scope: "+caught.getLocalizedMessage());
caught.printStackTrace();
}
});
}
private void loadMainPanel() {
TabularDataController controller = new TabularDataController();
EventBus eventBus = controller.getEventBus();
@ -116,7 +142,7 @@ public class TabularDataPortlet implements EntryPoint {
controller.restoreUISession();
}
protected void bind(BorderLayoutContainer mainWidget) {
private void bind(BorderLayoutContainer mainWidget) {
try {
RootPanel root = RootPanel.get(JSP_TAG_ID);
Log.info("Root Panel: " + root);

102
src/main/webapp/WEB-INF/web.xml
View File

@ -11,21 +11,22 @@
<servlet-name>jUnitHostImpl</servlet-name>
<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
</servlet>
<!-- Scope Helper -->
<servlet>
<servlet-name>scopeService</servlet-name>
<servlet-class>org.gcube.portlets.user.gcubewidgets.server.ScopeServiceImpl</servlet-class>
</servlet>
<!-- Base Service -->
<servlet>
<servlet-name>tdservlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.mainboxwidget.server.TabularDataServiceImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- Base Service
<servlet>
<servlet-name>tdservlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.server.TabularDataServiceImpl</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>-->
<!-- Base Service <servlet> <servlet-name>tdservlet</servlet-name> <servlet-class>org.gcube.portlets.user.td.server.TabularDataServiceImpl</servlet-class>
<load-on-startup>1</load-on-startup> </servlet> -->
<!-- TDWidget -->
<servlet>
@ -43,25 +44,25 @@
<servlet-name>TDGWTService</servlet-name>
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl</servlet-class>
</servlet>
<!-- Retrieve Chart File Servlet -->
<servlet>
<servlet-name>RetrieveChartFileServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.RetrieveChartFileServlet</servlet-class>
</servlet>
<!-- Retrieve File and Discover Mime Type Servlet -->
<servlet>
<servlet-name>RetrieveFileAndDiscoverMimeTypeServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.RetrieveFileAndDiscoverMimeTypeServlet</servlet-class>
</servlet>
<!-- TD RStudio Servlet -->
<servlet>
<servlet-name>TDRStudioServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDRStudioServlet</servlet-class>
</servlet>
<!-- TD Expression -->
<servlet>
@ -91,12 +92,12 @@
<servlet-name>tdTemplateServiceImpl</servlet-name>
<servlet-class>org.gcube.portlets.user.tdtemplate.server.TdTemplateServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>templateColumnOperationService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdtemplateoperation.server.TemplateColumnOperationServiceImpl</servlet-class>
</servlet>
<!-- TD Column Operation -->
<servlet>
@ -123,15 +124,15 @@
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.CodelistMappingUploadServlet</servlet-class>
</servlet>
<!-- Workspace Explorer -->
<servlet>
<servlet-name>workspaceExplorer</servlet-name>
<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
</servlet>
<!-- CSV Import Wizard Workspace -->
@ -143,7 +144,7 @@
</servlet> <servlet> <servlet-name>uploadServlet</servlet-name> <servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
</servlet> -->
<!-- Check Session Expired -->
<servlet>
@ -151,38 +152,38 @@
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
</servlet>
<!-- STATISTICAL -->
<!-- STATISTICAL -->
<servlet>
<servlet-name>StatisticalManagerAlgorithmsWidgetServlet</servlet-name>
<servlet-class>org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.StatisticalManagerWidgetServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>DownloadService</servlet-name>
<servlet-class>org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.DownloadServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>tdwService</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
</servlet>
<servlet>
<servlet-name>tdwServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
</servlet>
<!-- TD Logs -->
<!-- TD Logs -->
<servlet>
<servlet-name>TDLogsServlet</servlet-name>
<servlet-class>org.gcube.portlets.user.td.gwtservice.server.TDLogsServlet</servlet-class>
</servlet>
<!-- Servlets Mapping -->
@ -191,8 +192,13 @@
<servlet-name>jUnitHostImpl</servlet-name>
<url-pattern>/tabulardataportlet/junithost/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>scopeService</servlet-name>
<url-pattern>/tabulardataportlet/scopeService</url-pattern>
</servlet-mapping>
<!-- Base Service -->
<servlet-mapping>
<servlet-name>tdservlet</servlet-name>
@ -215,20 +221,20 @@
<servlet-name>TDGWTService</servlet-name>
<url-pattern>/tabulardataportlet/TDGWTService</url-pattern>
</servlet-mapping>
<!-- Retrieve Chart File Servlet -->
<servlet-mapping>
<servlet-name>RetrieveChartFileServlet</servlet-name>
<url-pattern>/tabulardataportlet/RetrieveChartFileServlet</url-pattern>
</servlet-mapping>
<!-- Retrieve File And Discover Mime Type Servlet -->
<servlet-mapping>
<servlet-name>RetrieveFileAndDiscoverMimeTypeServlet</servlet-name>
<url-pattern>/tabulardataportlet/RetrieveFileAndDiscoverMimeTypeServlet</url-pattern>
</servlet-mapping>
<!-- TD RStudio -->
<!-- TD RStudio -->
<servlet-mapping>
<servlet-name>TDRStudioServlet</servlet-name>
<url-pattern>/tabulardataportlet/TDRStudioServlet</url-pattern>
@ -262,12 +268,12 @@
<servlet-name>tdTemplateServiceImpl</servlet-name>
<url-pattern>/tabulardataportlet/tdtemplate</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-mapping>
<servlet-name>templateColumnOperationService</servlet-name>
<url-pattern>/tabulardataportlet/templateColumnOperationService</url-pattern>
</servlet-mapping>
<!-- TD Column Operation -->
<servlet-mapping>
@ -291,13 +297,13 @@
<servlet-name>CodelistMappingUploadServlet</servlet-name>
<url-pattern>/tabulardataportlet/CodelistMappingUploadServlet</url-pattern>
</servlet-mapping>
<!-- Workspace Explorer -->
<servlet-mapping>
<servlet-name>workspaceExplorer</servlet-name>
<url-pattern>/tabulardataportlet/WorkspaceExplorerService</url-pattern>
</servlet-mapping>
<!-- CSV Import Wizard Workspace -->
<!-- <servlet-mapping> <servlet-name>CSVImportServiceWorkspace</servlet-name>
<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
@ -320,30 +326,30 @@
<servlet-name>StatisticalManagerAlgorithmsWidgetServlet</servlet-name>
<url-pattern>/tabulardataportlet/statman</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>DownloadService</servlet-name>
<url-pattern>/tabulardataportlet/DownloadService</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>tdwService</servlet-name>
<url-pattern>/tabulardataportlet/tdw</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>tdwServlet</servlet-name>
<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
</servlet-mapping>
<!-- TD logs -->
<servlet-mapping>
<servlet-name>TDLogsServlet</servlet-name>
<url-pattern>/tabulardataportlet/TDLogsServlet</url-pattern>
</servlet-mapping>
<!-- Default page to serve -->
<welcome-file-list>
<welcome-file>tabulardataportlet.html</welcome-file>