- BZ-1014173: showing required domain specific tasks by process defin…

…ition

jbpm-console-ng-business-domain/jbpm-console-ng-business-domain-api/src/main/java/org/jbpm/console/ng/bd/service/DataServiceEntryPoint.java

@@ -29,6 +29,8 @@
 @Remote
 public interface DataServiceEntryPoint {
 
+    Map<String, String> getServiceTasks(String processId);
+
     Collection<ProcessInstanceSummary> getProcessInstances();
 
     Collection<ProcessInstanceSummary> getProcessInstancesByDeploymentId(String sessionId, List<Integer> states);

jbpm-console-ng-business-domain/jbpm-console-ng-business-domain-backend/src/main/java/org/jbpm/console/ng/bd/backend/server/DataServiceEntryPointImpl.java

@@ -56,6 +56,12 @@ public class DataServiceEntryPointImpl implements DataServiceEntryPoint {
     @Inject
     BPMN2DataService bpmn2Service;
 
+    @Override
+    public Map<String, String> getServiceTasks(String processId){
+        return bpmn2Service.getAllServiceTasks(processId);
+    }
+
+
     @Override
     public Collection<ProcessInstanceSummary> getProcessInstances() {
         return ProcessInstanceHelper.adaptCollection(dataService.getProcessInstances());

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/java/org/jbpm/console/ng/pr/client/editors/definition/details/ProcessDefDetailsPresenter.java

@@ -79,6 +79,8 @@ public interface ProcessDefDetailsView extends UberView<ProcessDefDetailsPresent
         HTML getUsersGroupsListBox();
 
         HTML getProcessDataListBox();
+
+        HTML getProcessServicesListBox();
 
         HTML getSubprocessListBox();
 
@@ -148,10 +150,17 @@ public void callback( List<TaskDefSummary> tasks ) {
                 view.getNroOfHumanTasksText().setText( String.valueOf( tasks.size() ) );
                 view.getHumanTasksListBox().setText("");
                 SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
-                for ( TaskDefSummary t : tasks ) {
-                   safeHtmlBuilder.appendEscapedLines(t.getName() +"\n" );
+                if(tasks.isEmpty()){
+                    safeHtmlBuilder.appendEscapedLines("No User Tasks defined in this process");
+                    view.getHumanTasksListBox().setStyleName("muted");
+                    view.getHumanTasksListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+                }else{
+                    for ( TaskDefSummary t : tasks ) {
+                       safeHtmlBuilder.appendEscapedLines(t.getName() +"\n" );
+                    }
+                    view.getHumanTasksListBox().setHTML(safeHtmlBuilder.toSafeHtml());
                 }
-                view.getHumanTasksListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+
             }
         } ).getAllTasksDef( processId );
 
@@ -160,10 +169,17 @@ public void callback( List<TaskDefSummary> tasks ) {
             public void callback( Map<String, String> entities ) {
                 view.getUsersGroupsListBox().setText("");
                 SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
-                for ( String key : entities.keySet() ) {
-                    safeHtmlBuilder.appendEscapedLines(entities.get( key ) + " - " + key +"\n");
+                if(entities.keySet().isEmpty()){
+                    safeHtmlBuilder.appendEscapedLines("No user or group used in this process");
+                    view.getUsersGroupsListBox().setStyleName("muted");
+                    view.getUsersGroupsListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+                }else{
+                    for ( String key : entities.keySet() ) {
+                        safeHtmlBuilder.appendEscapedLines(entities.get( key ) + " - " + key +"\n");
+                    }
+                    view.getUsersGroupsListBox().setHTML(safeHtmlBuilder.toSafeHtml());
                 }
-                view.getUsersGroupsListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+
             }
         } ).getAssociatedEntities( processId );
 
@@ -172,10 +188,17 @@ public void callback( Map<String, String> entities ) {
             public void callback( Map<String, String> inputs ) {
                 view.getProcessDataListBox().setText("");
                 SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
-                for ( String key : inputs.keySet() ) {
-                    safeHtmlBuilder.appendEscapedLines(key + " - " + inputs.get( key ) +"\n");
+                if(inputs.keySet().isEmpty()){
+                    safeHtmlBuilder.appendEscapedLines("No process variables defined for this process");
+                    view.getProcessDataListBox().setStyleName("muted");
+                    view.getProcessDataListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+                }else{
+                    for ( String key : inputs.keySet() ) {
+                        safeHtmlBuilder.appendEscapedLines(key + " - " + inputs.get( key ) +"\n");
+                    }
+                    view.getProcessDataListBox().setHTML(safeHtmlBuilder.toSafeHtml());
                 }
-                view.getProcessDataListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+
             }
         } ).getRequiredInputData( processId );
 
@@ -184,10 +207,17 @@ public void callback( Map<String, String> inputs ) {
             public void callback( Collection<String> subprocesses ) {
                 view.getSubprocessListBox().setText("");
                 SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
-                for ( String key : subprocesses ) {
-                    safeHtmlBuilder.appendEscapedLines(key + "\n");
+                if(subprocesses.isEmpty()){
+                    safeHtmlBuilder.appendEscapedLines("No subproceses required by this process");
+                    view.getSubprocessListBox().setStyleName("muted");
+                    view.getSubprocessListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+                }else{
+                    for ( String key : subprocesses ) {
+                        safeHtmlBuilder.appendEscapedLines(key + "\n");
+                    }
+                    view.getSubprocessListBox().setHTML(safeHtmlBuilder.toSafeHtml());
                 }
-                view.getSubprocessListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+
             }
         } ).getReusableSubProcesses( processId );
 
@@ -209,6 +239,27 @@ public void callback( Path processPath ) {
                 changeStyleRow(process.getName(), process.getVersion());
             }
         } ).getProcessById( processId );
+
+        dataServices.call( new RemoteCallback<Map<String, String>>() {
+            @Override
+            public void callback( Map<String, String> services ) {
+                view.getProcessServicesListBox().setText("");
+                SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+                if(services.keySet().isEmpty()){
+                    safeHtmlBuilder.appendEscaped("No services required for this process");
+                    view.getProcessServicesListBox().setStyleName("muted");
+                    view.getProcessServicesListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+                }else{
+                    for ( String key : services.keySet() ) {
+                        safeHtmlBuilder.appendEscapedLines(key + " - " + services.get( key ) +"\n");
+                    }
+                    view.getProcessServicesListBox().setHTML(safeHtmlBuilder.toSafeHtml());
+                }
+
+            }
+        } ).getServiceTasks( processId );
+
+
     }
 
     @OnOpen

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/java/org/jbpm/console/ng/pr/client/editors/definition/details/ProcessDefDetailsViewImpl.html

@@ -56,6 +56,12 @@
           <label data-field="processDataListBox"/>
         </div>
       </div>
+      <div class="control-group">
+        <strong><label class="control-label" for="processServicesListBox" data-field="processServicesListLabel"></label></strong>
+        <div class="controls readonly">
+          <label data-field="processServicesListBox"/>
+        </div>
+      </div>
 
     </div>
   </div>

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/java/org/jbpm/console/ng/pr/client/editors/definition/details/ProcessDefDetailsViewImpl.java

@@ -71,6 +71,10 @@ public class ProcessDefDetailsViewImpl extends Composite implements ProcessDefDe
     @Inject
     @DataField
     public HTML processDataListBox;
+
+    @Inject
+    @DataField
+    public HTML processServicesListBox;
 
     @Inject
     @DataField
@@ -112,6 +116,10 @@ public class ProcessDefDetailsViewImpl extends Composite implements ProcessDefDe
     @Inject
     @DataField
     public Label processDataListLabel;
+
+    @Inject
+    @DataField
+    public Label processServicesListLabel;
 
     @Inject
     private Event<NotificationEvent> notification;
@@ -144,7 +152,7 @@ public void onDoubleClick( DoubleClickEvent event ) {
         usersGroupsListLabel.setText( constants.User_And_Groups() );
         subprocessListLabel.setText( constants.SubProcesses() );
         processDataListLabel.setText( constants.Process_Variables() );
-
+        processServicesListLabel.setText( constants.Services() );
 
     }
 
@@ -173,7 +181,12 @@ public HTML getUsersGroupsListBox() {
     public HTML getProcessDataListBox() {
         return processDataListBox;
     }
-
+
+    @Override
+    public HTML getProcessServicesListBox() {
+        return processServicesListBox;
+    }
+
     @Override
     public HTML getSubprocessListBox() {
         return subprocessListBox;

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/java/org/jbpm/console/ng/pr/client/i18n/Constants.java

@@ -193,4 +193,6 @@ public interface Constants extends Messages {
 
     String Process_Variables_Refreshed();
 
+    String Services();
+
 }

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/resources/org/jbpm/console/ng/pr/client/i18n/Constants.properties

@@ -78,4 +78,5 @@ New_Instance=New Instance
 Bulk_Abort=Bulk Abort
 Process_Model=Process Model
 Views=Views
-Process_Variables_Refreshed=Process Variables Refreshed
+Process_Variables_Refreshed=Process Variables Refreshed
+Services=Services

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/resources/org/jbpm/console/ng/pr/client/i18n/Constants_de.properties

@@ -1,4 +1,4 @@
-No_Process_Definitions_Available=Noch keine Prozessdefinitionen verfügbar
+No_Process_Definitions_Available=Noch keine Prozessdefinitionen verf\u00c3\u00bcgbar
 Reload_Repository=Repository neu laden
 Name=Name
 Version=Version
@@ -17,7 +17,7 @@ Completed=Abgeschlossen
 Suspended=Ausgesetzt
 Initiator=Initiator
 Process_Instances_Refreshed=Prozessinstanzen aktualisiert
-No_Process_Instances_Available=Noch keine Prozessinstanzen verfügbar
+No_Process_Instances_Available=Noch keine Prozessinstanzen verf\u00c3\u00bcgbar
 Aborting_Process_Instance_Not_Allowed=Abbruch der Prozessinstanz nicht erlaubt (die prozessinstanz ist nicht aktiv)
 Aborting_Process_Instance=Breche Prozessinstanz ab
 Signaling_Process_Instance=Signalisiere Prozessinstanz
@@ -29,35 +29,35 @@ Filter=Filter
 Process_Instances=Prozessinstanzen
 Variable_History=Variablenhistorie
 Edit_Variable=Variable bearbeiten
-Last_Modification=Letzte Änderung
+Last_Modification=Letzte \u00c3\u0084nderung
 Value=Wert
 Type=Typ
-No_Variables_Available=Keine Prozessvariablen verfügbar
+No_Variables_Available=Keine Prozessvariablen verf\u00c3\u00bcgbar
 Refresh=Aktualisieren
 View_Process_Instances=Prozessinstanzen ansehen
 New_Process_Instance=Neue Prozessinstanz
 View_Process_Model=Prozessmodell ansehen
 Process_Definition_Name=Prozessdefinitionsname
-Human_Tasks_Count=Menschliche Aufgaben Zählung
+Human_Tasks_Count=Menschliche Aufgaben Z\u00c3\u00a4hlung
 Domain_Name=Domain
 Human_Tasks=Menschliche Aufgaben
 User_And_Groups=Benutzer und Gruppen
 SubProcesses=Sub-Prozesse
 Process_Variables=Prozessvariablen
 Process_Definition_Details=Prozessdefinitionsdetails
 Previous_Value=Vorheriger Wert
-No_History_For_This_Variable=Keine Historie verfügbar für diese Variable
+No_History_For_This_Variable=Keine Historie verf\u00c3\u00bcgbar f\u00c3\u00bcr diese Variable
 Process_Definition_Details_Refreshed=Prozessdefinitionsdetails aktualisiert
 Process_Definitions=Prozessdefinitionen
 Process_Instance_Details=Prozessinstanzdetails
 Process_Instance_ID=Prozessinstanz-ID
 Process_Definition_Package=Prozessdefinitionspaket
 Process_Definition_Version=Prozessdefinitionsversion
 Process_Instance_State=Prozessinstanzstatus
-Current_Activities=Aktuelle Aktivitäten
+Current_Activities=Aktuelle Aktivit\u00c3\u00a4ten
 Process_Instance_Log=Prozessinstanzprotokoll
 Process_Instances_Details_Refreshed=Prozessinstanzdetails aktualisiert
-Clear=Löschen
+Clear=L\u00c3\u00b6schen
 Save=Speichern
 Variables_Name=Variablenname
 Variable_Value=Variablenwert
@@ -68,3 +68,4 @@ Signal_Ref=Ereignistyp
 Process_Diagram=Prozessdiagramm
 Please_Wait=Bitte warten
 Processes_Refreshed_From_The_Repo=Prozess aus Repository aktualisiert
+Services=Services

jbpm-console-ng-process-runtime/jbpm-console-ng-process-runtime-client/src/main/resources/org/jbpm/console/ng/pr/client/i18n/Constants_es_AR.properties

@@ -1,15 +1,15 @@
-No_Process_Definitions_Available=No hay disponibles definiciones de procesos todavía
+No_Process_Definitions_Available=No hay disponibles definiciones de procesos todav\u00c3\u00ada
 Reload_Repository=Recargar repositorio
 Name=Nombre
 # auto translated by TM merge from project: JBoss EAP - Installation Guide, version: 5.1.0, DocId: Upgrading_The_Platform_via_JON
-Version=Versión
+Version=Versi\u00c3\u00b3n
 # auto translated by TM merge from project: JBoss AS Console, version: master, DocId: src/main/java/org/jboss/as/console/client/core/UIConstants
 Details=Detalles
 # auto translated by TM merge from project: Drools Workbench, version: 6.0.0, DocId: org.drools/drools-wb-guided-scorecard-editor-client/org/drools/workbench/screens/guided/scorecard/client/resources/i18n/GuidedScoreCardConstants
 Actions=Acciones
 # auto translated by TM merge from project: JBoss AS Console, version: master, DocId: src/main/java/org/jboss/as/console/client/core/UIConstants
 Start=Iniciar
-Signal=Señal
+Signal=Se\u00c3\u00b1al
 Abort=Abortar
 # auto translated by TM merge from project: JBoss SOA - Administration Guide, version: 4.3.5, DocId: JON_for_SOA
 Start_Date=Fecha de inicio
@@ -26,46 +26,46 @@ Completed=Completado
 Suspended=Suspendido
 Initiator=Iniciator
 Process_Instances_Refreshed=Instancias de procesos actualizadas
-No_Process_Instances_Available=No hay disponibles instancias de procesos todavía
-Aborting_Process_Instance_Not_Allowed=No se permite abortar la instancia del proceso (la instancia del proceso no está activa)
+No_Process_Instances_Available=No hay disponibles instancias de procesos todav\u00c3\u00ada
+Aborting_Process_Instance_Not_Allowed=No se permite abortar la instancia del proceso (la instancia del proceso no est\u00c3\u00a1 activa)
 # auto translated by TM merge from project: jBPM Console, version: 6.0.0, DocId: org.jbpm/jbpm-console-ng-executor-service-client/org/jbpm/console/ng/es/client/i18n/Constants
 Aborting_Process_Instance=Abortando la instancia del proceso
 # auto translated by TM merge from project: jBPM Console, version: 6.0.0, DocId: org.jbpm/jbpm-console-ng-executor-service-client/org/jbpm/console/ng/es/client/i18n/Constants
-Signaling_Process_Instance=Señalando la instancia del proceso
-Signaling_Process_Instance_Not_Allowed=No se permite señalar la instancia del proceso (la instancia del proceso no está activa)
-Bulk_Signal=Señal en masa
+Signaling_Process_Instance=Se\u00c3\u00b1alando la instancia del proceso
+Signaling_Process_Instance_Not_Allowed=No se permite se\u00c3\u00b1alar la instancia del proceso (la instancia del proceso no est\u00c3\u00a1 activa)
+Bulk_Signal=Se\u00c3\u00b1al en masa
 Related_To_Me=Relacionado conmigo
 Showing=Mostrando\:
 Filter=Filtro
 Process_Instances=Instancias de procesos
 Variable_History=Historial de variables
 Edit_Variable=Modificar variable
-Last_Modification=Ultima modificación
+Last_Modification=Ultima modificaci\u00c3\u00b3n
 Value=Valor
 Type=Tipo
 No_Variables_Available=No hay disponibles variables de procesos
 Refresh=Refrescar
 View_Process_Instances=Ver instancias de procesos
 New_Process_Instance=Nueva instancia de proceso
 View_Process_Model=Ver modelo de proceso
-Process_Definition_Name=Nombre de definición del proceso
+Process_Definition_Name=Nombre de definici\u00c3\u00b3n del proceso
 Human_Tasks_Count=Conteo de tareas humanas
 Domain_Name=Dominio
 Human_Tasks=Tareas humanas
 User_And_Groups=Usuarios y grupos
 SubProcesses=Subprocesos
 Process_Variables=Variables de procesos
-Process_Definition_Details=Detalles de definición del proceso
+Process_Definition_Details=Detalles de definici\u00c3\u00b3n del proceso
 Previous_Value=Valor anterior
 No_History_For_This_Variable=No hay un historial disponible para esta variable
-Process_Definition_Details_Refreshed=Detalles de definición del proceso actualizados
+Process_Definition_Details_Refreshed=Detalles de definici\u00c3\u00b3n del proceso actualizados
 # auto translated by TM merge from project: jBPM Console, version: 6.0.0, DocId: org.jbpm/jbpm-console-ng-bpm-home-client/org/jbpm/console/ng/bh/client/i18n/Constants
 Process_Definitions=Definiciones de procesos
 # auto translated by TM merge from project: jBPM Console, version: 6.0.0, DocId: org.jbpm/jbpm-console-ng-executor-service-client/org/jbpm/console/ng/es/client/i18n/Constants
 Process_Instance_Details=Detalles de la instancia del proceso
 Process_Instance_ID=Id de l instancia del proceso
-Process_Definition_Package=Paquete de definición del proceso
-Process_Definition_Version=Versión de definición del proceso
+Process_Definition_Package=Paquete de definici\u00c3\u00b3n del proceso
+Process_Definition_Version=Versi\u00c3\u00b3n de definici\u00c3\u00b3n del proceso
 Process_Instance_State=Estado de la instancia del proceso
 Current_Activities=Actividades actuales
 Process_Instance_Log=Registro de instancia del proceso
@@ -77,9 +77,10 @@ Save=Guardar
 Variables_Name=Nombre de variable
 Variable_Value=Valor de variable
 Variables_History=Historial de las variables de procesos
-Signalling_Process_Instance=Señalando la instancia del proceso
+Signalling_Process_Instance=Se\u00c3\u00b1alando la instancia del proceso
 Event=Evento
 Signal_Ref=Tipo de evento
 Process_Diagram=Diagrama del proceso
 Please_Wait=Por favor espere
 Processes_Refreshed_From_The_Repo=Proceso actualizado del repositorio
+Services=Servicios