diff --git a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/WsTaskExecutorWidget.java b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/WsTaskExecutorWidget.java index ec53f10..7a302f1 100644 --- a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/WsTaskExecutorWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/WsTaskExecutorWidget.java @@ -92,7 +92,7 @@ public class WsTaskExecutorWidget { if(perforRunTaskEvent.getWsItem()!=null && perforRunTaskEvent.getConfiguration()!=null){ String msg = "
Executing the task with configuration:
"; msg+="
"; - msg+="Operator Id: "+perforRunTaskEvent.getConfiguration().getTaskId(); + msg+="Operator Id:
"+perforRunTaskEvent.getConfiguration().getTaskId(); int cParam = perforRunTaskEvent.getConfiguration().getListParameters().size(); msg+="

"; if(cParam>0){ diff --git a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetService.java b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetService.java index fa4d6a7..0ef3bdb 100644 --- a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetService.java +++ b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetService.java @@ -2,6 +2,7 @@ package org.gcube.portlets.widgets.wstaskexecutor.client.rpc; import java.util.List; +import org.gcube.common.workspacetaskexecutor.shared.TaskOperator; import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskComputation; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskConfiguration; @@ -113,4 +114,13 @@ public interface WsTaskExecutorWidgetService extends RemoteService { TaskExecutionStatus executeTheTask(TaskConfiguration taskConfiguration) throws ItemNotExecutableException, TaskNotExecutableException, Exception; + + /** + * Gets the list operators per scope. + * + * @param scope the scope + * @return the list operators per scope + * @throws Exception the exception + */ + List getListOperatorsPerScope(String scope) throws Exception; } diff --git a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetServiceAsync.java b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetServiceAsync.java index f742a00..3fb38ca 100644 --- a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetServiceAsync.java +++ b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/client/rpc/WsTaskExecutorWidgetServiceAsync.java @@ -5,6 +5,7 @@ package org.gcube.portlets.widgets.wstaskexecutor.client.rpc; import java.util.List; +import org.gcube.common.workspacetaskexecutor.shared.TaskOperator; import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskComputation; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskConfiguration; @@ -136,4 +137,15 @@ public interface WsTaskExecutorWidgetServiceAsync { void executeTheTask(TaskConfiguration taskConfiguration, AsyncCallback asyncCallback); + /** + * Gets the list operators per scope. + * + * @param scope the scope + * @param asyncCallback the async callback + * @return the list operators per scope + * @throws Exception the exception + */ + void getListOperatorsPerScope(String scope, AsyncCallback> asyncCallback) throws Exception; + + } diff --git a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/server/WsTaskExecutorWidgetServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/server/WsTaskExecutorWidgetServiceImpl.java index 083d6b5..453b4a0 100644 --- a/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/server/WsTaskExecutorWidgetServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/wstaskexecutor/server/WsTaskExecutorWidgetServiceImpl.java @@ -7,6 +7,7 @@ import java.util.List; import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.workspacetaskexecutor.dataminer.WorkspaceDataMinerTaskExecutor; +import org.gcube.common.workspacetaskexecutor.shared.TaskOperator; import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskComputation; import org.gcube.common.workspacetaskexecutor.shared.dataminer.TaskConfiguration; @@ -304,4 +305,38 @@ public class WsTaskExecutorWidgetServiceImpl extends RemoteServiceServlet implem return exec.monitorRunStatus(configuration, taskComputation); } + + + /** + * Gets the list operators per scope. + * + * @param scope the scope + * @return the list operators per scope + * @throws Exception the exception + */ + @Override + public List getListOperatorsPerScope(String scope) throws Exception{ + + if(scope==null || scope.isEmpty()) + throw new Exception("Invalid scope null"); + + WorkspaceDataMinerTaskExecutor exec = getTaskExecutor(); + String originalScope = ScopeProvider.instance.get(); + + try{ + + ScopeProvider.instance.set(scope); + return exec.getListOperators(); + + }catch(Exception e){ + + }finally{ + if(originalScope!=null) + ScopeProvider.instance.set(originalScope); + } + + return null; + + } + }