Added services required for the workflow builder app.

Updated data documents. Updated README file. Corrected a typo in the gradle build file.
netvariant · Mar 26, 2019 · 5f7fe70 · 5f7fe70
1 parent ffc027e
commit 5f7fe70
Show file tree

Hide file tree

Showing 12 changed files with 577 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ You may not wish to expose all entity fields in the workflow designer. You can c
 You can define a new workflow type in your component seed data as follows:
 
 ```xml
-<commons.entity.EntityField entityName="moqui.example.Example" fieldTypeEnumId="ENTITY_FLD_TEXT" fieldName="exampleName" displayName="Example Name"/>
+<moqui.entity.EntityField entityName="moqui.example.Example" fieldTypeEnumId="ENTITY_FLD_TEXT" fieldName="exampleName" displayName="Example Name"/>
 ```
 
 ### Design a workflow

diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ task copyDependencies {
  copy {
  from (configurations.runtime
  - project(':framework').configurations.runtime
- - project(':runtime:component:moqui-workflow').configurations.runtime
+ - project(':runtime:component:moqui-elasticsearch').configurations.runtime
  - project(':runtime:component:moqui-workflow').jar.archivePath
  )
  into file(libDir)

diff --git a/data/BasicData.xml b/data/BasicData.xml
@@ -36,4 +36,21 @@
  <!-- Data feeds -->
  <moqui.entity.feed.DataFeed dataFeedId="WorkflowSearch" dataFeedTypeEnumId="DTFDTP_RT_PUSH" indexOnStartEmpty="Y" feedName="Workflow Search" feedReceiveServiceName="org.moqui.search.SearchServices.index#DataDocuments"/>
 
+ <!-- Data documents -->
+ <dataDocuments dataDocumentId="MoquiStatusItem" documentName="Status Item" documentTitle="${description}" indexName="workflow" primaryEntityName="moqui.basic.StatusItem">
+ <fields fieldSeqId="01" fieldPath="statusId"/>
+ <fields fieldSeqId="02" fieldPath="statusCode"/>
+ <fields fieldSeqId="03" fieldPath="description"/>
+ <fields fieldSeqId="04" fieldPath="type:description" fieldNameAlias="statusTypeDescription"/>
+
+ <feeds dataFeedId="WorkflowSearch"/>
+ </dataDocuments>
+ <dataDocuments dataDocumentId="MoquiStatusFlow" documentName="Status Flow" documentTitle="${description}" indexName="workflow" primaryEntityName="moqui.basic.StatusFlow">
+ <fields fieldSeqId="01" fieldPath="statusFlowId"/>
+ <fields fieldSeqId="02" fieldPath="description"/>
+ <fields fieldSeqId="03" fieldPath="type:description" fieldNameAlias="statusTypeDescription"/>
+
+ <feeds dataFeedId="WorkflowSearch"/>
+ </dataDocuments>
+
 </entity-facade-xml>
diff --git a/data/SecurityData.xml b/data/SecurityData.xml
@@ -2,7 +2,7 @@
 <entity-facade-xml type="seed">
 
  <!-- Data documents -->
- <dataDocuments dataDocumentId="User" documentName="User" documentTitle="${username}" indexName="workflow" primaryEntityName="moqui.security.UserAccount">
+ <dataDocuments dataDocumentId="MoquiUser" documentName="User" documentTitle="${username}" indexName="workflow" primaryEntityName="moqui.security.UserAccount">
  <fields fieldSeqId="01" fieldPath="userId"/>
  <fields fieldSeqId="02" fieldPath="username"/>
  <fields fieldSeqId="03" fieldPath="userFullName"/>
@@ -11,7 +11,7 @@
 
  <feeds dataFeedId="WorkflowSearch"/>
  </dataDocuments>
- <dataDocuments dataDocumentId="UserGroup" documentName="User Group" documentTitle="${description}" indexName="workflow" primaryEntityName="moqui.security.UserGroup">
+ <dataDocuments dataDocumentId="MoquiUserGroup" documentName="User Group" documentTitle="${description}" indexName="workflow" primaryEntityName="moqui.security.UserGroup">
  <fields fieldSeqId="01" fieldPath="userGroupId"/>
  <fields fieldSeqId="02" fieldPath="description"/>
 

diff --git a/data/WorkflowData.xml b/data/WorkflowData.xml
@@ -121,7 +121,7 @@
  <moqui.basic.StatusFlowTransition statusFlowId="WorkflowInstanceStatusFlow" statusId="WF_INST_STAT_SUSPEND" toStatusId="WF_INST_STAT_ACTIVE" transitionSequence="1" transitionName="Resume"/>
 
  <!-- Data documents -->
- <dataDocuments dataDocumentId="Workflow" documentName="Workflow" documentTitle="${workflowName}" indexName="workflow" primaryEntityName="moqui.workflow.Workflow">
+ <dataDocuments dataDocumentId="MoquiWorkflow" documentName="Workflow" documentTitle="${workflowName}" indexName="workflow" primaryEntityName="moqui.workflow.Workflow">
  <fields fieldSeqId="01" fieldPath="workflowId"/>
  <fields fieldSeqId="02" fieldPath="workflowName"/>
  <fields fieldSeqId="03" fieldPath="workflowTypeId"/>
@@ -131,7 +131,7 @@
 
  <feeds dataFeedId="WorkflowSearch"/>
  </dataDocuments>
- <dataDocuments dataDocumentId="WorkflowVariable" documentName="Workflow Variable" documentTitle="${variableName}" indexName="workflow" primaryEntityName="moqui.workflow.WorkflowVariable">
+ <dataDocuments dataDocumentId="MoquiWorkflowVariable" documentName="Workflow Variable" documentTitle="${variableName}" indexName="workflow" primaryEntityName="moqui.workflow.WorkflowVariable">
  <fields fieldSeqId="01" fieldPath="variableId"/>
  <fields fieldSeqId="02" fieldPath="workflowId"/>
  <fields fieldSeqId="03" fieldPath="variableName"/>
@@ -141,15 +141,15 @@
 
  <feeds dataFeedId="WorkflowSearch"/>
  </dataDocuments>
- <dataDocuments dataDocumentId="WorkflowInitiator" documentName="Workflow Initiator" documentTitle="${initiatorId}" indexName="workflow" primaryEntityName="moqui.workflow.WorkflowInitiator">
+ <dataDocuments dataDocumentId="MoquiWorkflowInitiator" documentName="Workflow Initiator" documentTitle="${initiatorId}" indexName="workflow" primaryEntityName="moqui.workflow.WorkflowInitiator">
  <fields fieldSeqId="01" fieldPath="initiatorId"/>
  <fields fieldSeqId="02" fieldPath="workflowId"/>
  <fields fieldSeqId="03" fieldPath="creationDate"/>
  <fields fieldSeqId="04" fieldPath="userGroup:description" fieldNameAlias="userGroupDescription"/>
 
  <feeds dataFeedId="WorkflowSearch"/>
  </dataDocuments>
- <dataDocuments dataDocumentId="WorkflowInstanceTask" documentName="Workflow Task" documentTitle="${summary}" indexName="workflow" primaryEntityName="moqui.workflow.WorkflowInstanceTask">
+ <dataDocuments dataDocumentId="MoquiWorkflowInstanceTask" documentName="Workflow Task" documentTitle="${summary}" indexName="workflow" primaryEntityName="moqui.workflow.WorkflowInstanceTask">
  <fields fieldSeqId="01" fieldPath="taskId"/>
  <fields fieldSeqId="02" fieldPath="taskTypeEnumId"/>
  <fields fieldSeqId="03" fieldPath="statusId"/>

diff --git a/service/org/moqui/basic/BasicServices.xml b/service/org/moqui/basic/BasicServices.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<services xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http:https://moqui.org/xsd/service-definition-2.1.xsd">
+
+ <!-- Status item -->
+ <service verb="find" noun="StatusItem" type="java" location="org.moqui.basic.StatusItemService" method="findStatusItems">
+ <in-parameters>
+ <auto-parameters entity-name="moqui.basic.StatusItem"/>
+ <parameter name="pageIndex" type="Integer"/>
+ <parameter name="pageSize" type="Integer"/>
+ <parameter name="orderByField"/>
+ <parameter name="filter"/>
+ </in-parameters>
+ <out-parameters>
+ <parameter name="totalRows" type="Long"/>
+ <parameter name="statusItemList" type="List">
+ <parameter name="statusItem" type="Map">
+ <auto-parameters entity-name="moqui.basic.StatusItem"/>
+ </parameter>
+ </parameter>
+ </out-parameters>
+ </service>
+
+ <!-- Status flow -->
+ <service verb="find" noun="StatusFlow" type="java" location="org.moqui.basic.StatusFlowService" method="findStatusFlows">
+ <in-parameters>
+ <auto-parameters entity-name="moqui.basic.StatusFlow"/>
+ <parameter name="pageIndex" type="Integer"/>
+ <parameter name="pageSize" type="Integer"/>
+ <parameter name="orderByField"/>
+ <parameter name="filter"/>
+ </in-parameters>
+ <out-parameters>
+ <parameter name="totalRows" type="Long"/>
+ <parameter name="statusFlowList" type="List">
+ <parameter name="statusFlow" type="Map">
+ <auto-parameters entity-name="moqui.basic.StatusFlow"/>
+ </parameter>
+ </parameter>
+ </out-parameters>
+ </service>
+ <service verb="find" noun="StatusFlowItem" type="java" location="org.moqui.basic.StatusFlowService" method="findStatusFlowItems">
+ <in-parameters>
+ <parameter name="statusFlowId"/>
+ <parameter name="pageIndex" type="Integer"/>
+ <parameter name="pageSize" type="Integer"/>
+ <parameter name="orderByField"/>
+ </in-parameters>
+ <out-parameters>
+ <parameter name="totalRows" type="Long"/>
+ <parameter name="statusItemList" type="List">
+ <parameter name="statusItem" type="Map">
+ <auto-parameters entity-name="moqui.basic.StatusFlowItemDetail"/>
+ </parameter>
+ </parameter>
+ </out-parameters>
+ </service>
+ <service verb="find" noun="StatusFlowTransition" type="java" location="org.moqui.basic.StatusFlowService" method="findStatusFlowTransitions">
+ <in-parameters>
+ <auto-parameters entity-name="moqui.basic.StatusFlowTransition"/>
+ <parameter name="pageIndex" type="Integer"/>
+ <parameter name="pageSize" type="Integer"/>
+ <parameter name="orderByField"/>
+ </in-parameters>
+ <out-parameters>
+ <parameter name="totalRows" type="Long"/>
+ <parameter name="transitionList" type="List">
+ <parameter name="transition" type="Map">
+ <auto-parameters entity-name="moqui.basic.StatusFlowTransition"/>
+ </parameter>
+ </parameter>
+ </out-parameters>
+ </service>
+
+</services>
diff --git a/service/workflow.rest.xml b/service/workflow.rest.xml
@@ -22,15 +22,29 @@
  <entity name="moqui.basic.Geo" operation="list"/>
  </method>
  </resource>
- <resource name="statusFlow">
- <method type="get">
- <entity name="moqui.basic.StatusFlowItem" operation="list"/>
- </method>
- </resource>
- <resource name="statusItem">
- <method type="get">
- <entity name="moqui.basic.StatusFlowItem" operation="list"/>
- </method>
+ <resource name="status">
+ <resource name="item">
+ <method type="get">
+ <service name="org.moqui.basic.BasicServices.find#StatusItem"/>
+ </method>
+ </resource>
+ <resource name="flow">
+ <method type="get">
+ <service name="org.moqui.basic.BasicServices.find#StatusFlow"/>
+ </method>
+ <id name="statusFlowId">
+ <resource name="item">
+ <method type="get">
+ <service name="org.moqui.basic.BasicServices.find#StatusFlowItem"/>
+ </method>
+ </resource>
+ <resource name="transition">
+ <method type="get">
+ <service name="org.moqui.basic.BasicServices.find#StatusFlowTransition"/>
+ </method>
+ </resource>
+ </id>
+ </resource>
  </resource>
  </resource>