Merge pull request #11 from cristianonicolai/kie-server-for-workbench

Migrate human task information on process definition details
mswiderski · Jun 8, 2016 · 2282664 · 2282664
2 parents 42ee766 + 208c321
commit 2282664
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 24 deletions.
diff --git a/...ole-ng-business-domain-api/src/main/java/org/jbpm/console/ng/bd/model/TaskDefSummary.java b/...ole-ng-business-domain-api/src/main/java/org/jbpm/console/ng/bd/model/TaskDefSummary.java
@@ -24,14 +24,18 @@ public class TaskDefSummary implements Serializable {
     private long id;
     private String name;
 
-    public TaskDefSummary(long id, String name) {
-        super();
+    public TaskDefSummary(long id, final String name) {
+        this(name);
         this.id = id;
-        this.name = name;
+    }
 
+    public TaskDefSummary(final String name) {
+        super();
+        this.name = name;
     }
 
     public TaskDefSummary() {
+        super();
     }
 
     public long getId() {

diff --git a/...pi/src/main/java/org/jbpm/console/ng/pr/service/integration/RemoteRuntimeDataService.java b/...pi/src/main/java/org/jbpm/console/ng/pr/service/integration/RemoteRuntimeDataService.java
@@ -25,7 +25,7 @@
 import org.jbpm.console.ng.bd.model.ProcessInstanceSummary;
 import org.jbpm.console.ng.bd.model.ProcessSummary;
 import org.jbpm.console.ng.bd.model.RuntimeLogSummary;
-import org.kie.internal.query.QueryFilter;
+import org.jbpm.console.ng.bd.model.TaskDefSummary;
 
 @Remote
 public interface RemoteRuntimeDataService {
@@ -47,4 +47,7 @@ public interface RemoteRuntimeDataService {
     List<ProcessSummary> getProcessesByFilter(String serverTemplateId, String textSearch, Integer page, Integer pageSize);
 
     ProcessSummary getProcessesByContainerIdProcessId(String serverTemplateId, String containerId, String processId);
-}
+
+    List<TaskDefSummary> getProcessUserTasks(String serverTemplateId, String containerId, String processId);
+
+}
diff --git a/.../java/org/jbpm/console/ng/pr/backend/server/integration/RemoteRuntimeDataServiceImpl.java b/.../java/org/jbpm/console/ng/pr/backend/server/integration/RemoteRuntimeDataServiceImpl.java
@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
@@ -29,10 +30,11 @@
 import org.jbpm.console.ng.bd.model.ProcessInstanceSummary;
 import org.jbpm.console.ng.bd.model.ProcessSummary;
 import org.jbpm.console.ng.bd.model.RuntimeLogSummary;
+import org.jbpm.console.ng.bd.model.TaskDefSummary;
 import org.jbpm.console.ng.bd.model.UserTaskSummary;
 import org.jbpm.console.ng.pr.service.integration.RemoteRuntimeDataService;
-import org.kie.internal.query.QueryFilter;
 import org.kie.server.api.model.definition.ProcessDefinition;
+import org.kie.server.api.model.definition.UserTaskDefinitionList;
 import org.kie.server.api.model.instance.NodeInstance;
 import org.kie.server.api.model.instance.ProcessInstance;
 import org.kie.server.api.model.instance.TaskEventInstance;
@@ -236,6 +238,15 @@ public ProcessSummary getProcessesByContainerIdProcessId(String serverTemplateId
         return summary;
     }
 
+    @Override
+    public List<TaskDefSummary> getProcessUserTasks(final String serverTemplateId, final String containerId, final String processId){
+        ProcessServicesClient processServicesClient = getClient(serverTemplateId, ProcessServicesClient.class);
+
+        final UserTaskDefinitionList userTaskDefinitionList = processServicesClient.getUserTaskDefinitions(containerId, processId);
+
+        return userTaskDefinitionList.getItems().stream().map(t -> new TaskDefSummary(t.getName())).collect(Collectors.toList());
+    }
+
     @Override
     public List<RuntimeLogSummary> getRuntimeLogs(String serverTemplateId, Long processInstanceId) {
         List<NodeInstance> processInstanceHistory = getProcessInstanceHistory(serverTemplateId, processInstanceId);

diff --git a/.../pr/client/editors/definition/details/advance/AdvancedViewProcessDefDetailsPresenter.java b/.../pr/client/editors/definition/details/advance/AdvancedViewProcessDefDetailsPresenter.java
@@ -24,7 +24,6 @@
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.IsWidget;
-import org.jboss.errai.bus.client.api.messaging.Message;
 import org.jboss.errai.common.client.api.Caller;
 import org.jboss.errai.common.client.api.RemoteCallback;
 import org.jbpm.console.ng.bd.model.ProcessDefinitionKey;
@@ -173,35 +172,45 @@ private void refreshAssociatedEntities( Map<String, String[]> entities ) {
         }
     }
 
-    private void refreshTaskDef( List<TaskDefSummary> tasks ) {
-        view.getNroOfHumanTasksText().setText(
-                String.valueOf( tasks.size() ) );
+    private void refreshTaskDef( final String serverTemplateId, final String deploymentId, final String processId ) {
+        view.getNroOfHumanTasksText().setText( "" );
         view.getHumanTasksListBox().setText( "" );
-        SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
-        if (tasks.isEmpty()) {
-            safeHtmlBuilder.appendEscapedLines(constants.NoUserTasksDefinedInThisProcess());
-            view.getHumanTasksListBox().setStyleName( "muted" );
-            view.getHumanTasksListBox().setHTML(
-                    safeHtmlBuilder.toSafeHtml() );
-        } else {
-            for (TaskDefSummary t : tasks) {
-                safeHtmlBuilder.appendEscapedLines( t.getName() + "\n" );
+
+        processDefService.call(new RemoteCallback<List<TaskDefSummary>>() {
+
+            @Override
+            public void callback(final List<TaskDefSummary> userTaskSummaries) {
+                view.getNroOfHumanTasksText().setText( String.valueOf(userTaskSummaries.size()) );
+
+                SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+                if (userTaskSummaries.isEmpty()) {
+                    safeHtmlBuilder.appendEscapedLines(constants.NoUserTasksDefinedInThisProcess());
+                    view.getHumanTasksListBox().setStyleName( "muted" );
+                    view.getHumanTasksListBox().setHTML(
+                            safeHtmlBuilder.toSafeHtml() );
+                } else {
+                    for (TaskDefSummary t : userTaskSummaries) {
+                        safeHtmlBuilder.appendEscapedLines( t.getName() + "\n" );
+                    }
+                    view.getHumanTasksListBox().setHTML(
+                            safeHtmlBuilder.toSafeHtml() );
+                }
             }
-            view.getHumanTasksListBox().setHTML(
-                    safeHtmlBuilder.toSafeHtml() );
-        }
+
+        }, new DefaultErrorCallback()).getProcessUserTasks(serverTemplateId, deploymentId, processId);
+
     }
 
     @Override
-    protected void refreshProcessDef( String serverTemplateId, final String deploymentId, final String processId ) {
+    protected void refreshProcessDef( final String serverTemplateId, final String deploymentId, final String processId ) {
 
         processDefService.call( new RemoteCallback<ProcessSummary>() {
 
             @Override
             public void callback( ProcessSummary process ) {
                 if (process != null) {
 
-//                    refreshTaskDef( process. );
+                    refreshTaskDef( serverTemplateId, deploymentId, processId );
 
                     refreshAssociatedEntities( process.getAssociatedEntities() );