@steedos/standard-process-approval 2.5.3-beta.2 → 2.5.3-beta.21

package/main/default/objectTranslations/action_field_updates.en/action_field_updates.en.objectTranslation.yml

@@ -48,7 +48,7 @@ fields:
     description: This check box only identifies whether or not the workflow rules for the object with which the field update is associated are reevaluated. For field updates across objects, these workflow rules are never reevaluated, and all workflow rules for the object to which they are to be updated are always reevaluated.
 listviews:
   all:
-    label: All
+    label: All Updates
 CustomLabels:
   action_field_updates_field_operation_options_null: A blank value (null)
   action_field_updates_field_operation_options_formula: Use a formula to set the new value

package/main/default/objectTranslations/process_definition.en/process_definition.en.objectTranslation.yml

@@ -123,7 +123,7 @@ groups:
   recall_actions: Recall Actions
 listviews:
   all:
-    label: All
+    label: All Approval Processes
 actions:
   enable:
     label: Enable

package/main/default/objectTranslations/workflow_notifications.en/workflow_notifications.en.objectTranslation.yml

@@ -4,10 +4,13 @@ description:
 fields:
   name:
     label: API Name
-    help: 
+    help: >-
+      Can only contain lowercase letters and numbers, must start with a letter,
+      cannot end with an underscore character or contain two consecutive
+      underscore characters
     description: 
   label:
-    label: 
+    label: Label
     help: 
     description: 
   object_name:
@@ -23,18 +26,18 @@ fields:
     help:
     description:
   assigned_users:
-    label:
+    label: Assigned Users
     help:
     description:
   assigned_user_field:
-    label:
+    label: Assigned User Field
     help:
     description:
 groups:
   select_assigned_user: Select Assigned User
 listviews:
   all:
-    label: All
+    label: All Workflow Notifications
 CustomLabels:
   workflow_notifications_field__error_process_node_process_definition_required: Please select "Approval Process" for this Approval Step and then create "Workflow Notification"!
   workflow_notifications_field__error_process_definition_object_required: Please select "Object" for this Approval Process and then create "Workflow Notification"!

package/main/default/objectTranslations/workflow_outbound_messages.en/workflow_outbound_messages.en.objectTranslation.yml

@@ -4,7 +4,10 @@ description:
 fields:
   name:
     label: API Name
-    help: 
+    help: >-
+      Can only contain lowercase letters and numbers, must start with a letter,
+      cannot end with an underscore character or contain two consecutive
+      underscore characters
     description:
   label:
     label: Label
@@ -36,7 +39,7 @@ fields:
     description:
 listviews:
   all:
-    label: All
+    label: All Outbound Message Actions
 actions:
   customize:
     label: Customize

package/main/default/objectTranslations/workflow_rule.en/workflow_rule.en.objectTranslation.yml

@@ -7,15 +7,15 @@ fields:
     help: 
     description: 
   name:
-    label: 
+    label: Api Name
     help: 
     description: 
   label:
-    label: 
+    label: Label
     help: 
     description: 
   active:
-    label: 
+    label: Enable
     help: 
     description: 
   trigger_type:
@@ -30,8 +30,8 @@ fields:
         value: onCreateOrTriggeringUpdate
     description: 
   formula:
-    label: 
-    help: 
+    label: Formula
+    help: Run Immediate Actions if the following criteria are met.
     description: 
   updates_field_actions:
     label: Field Update
@@ -46,9 +46,12 @@ fields:
     help: 
     description: 
   description:
-    label: 
+    label: Description
     help: 
     description: 
+  filters:
+    label: Filters
+    help: Run Time-Dependent Actions if the following filters are met.
   time_triggers:
     label: Time Triggers
   time_triggers.$:
@@ -73,7 +76,7 @@ groups:
   time_triggers: Time-Dependent Action
 listviews:
   all:
-    label: All
+    label: All Workflow Rules
 CustomLabels:
   workflow_rule_field_trigger_type_options_onAllChanges: 
   workflow_rule_field_trigger_type_options_onCreateOnly: 

package/main/default/objectTranslations/workflow_rule.zh-CN/workflow_rule.zh-CN.objectTranslation.yml

@@ -31,7 +31,7 @@ fields:
     description: 
   formula:
     label: 公式
-    help: 
+    help: 满足以下公式时执行即时操作
     description: 
   updates_field_actions:
     label: 字段更新
@@ -49,6 +49,9 @@ fields:
     label: 描述
     help: 
     description: 
+  filters:
+    label: 过滤条件
+    help: 满足以下过滤条件时执行依赖于时间的操作
   time_triggers:
     label: 时间触发器
   time_triggers.$:

package/main/default/objects/workflow-actions/workflow_rule.object.yml

@@ -36,7 +36,8 @@ fields:
     type: textarea
     is_wide: true
     required: false
-    group: Rule Criteria
+    group: Immediate Actions
+    inlineHelpText: Run Immediate Actions if the following criteria are met.
   updates_field_actions:
     group: Immediate Actions
     type: lookup
@@ -98,6 +99,7 @@ fields:
     # visible_on: "{{global.mode ==='read' ? true : false}}"
     depend_on:
       - object_name
+    inlineHelpText: Run Time-Dependent Actions if the following filters are met.
     group: 依赖于时间的工作流操作
   time_triggers:
     type: grid

package/main/default/services/action_field_updates.service.js

@@ -2,7 +2,7 @@
  * @Description: 提供action_field_updates(字段更新对象)需要的数据接口
  */
 
-const objectql = require("@steedos/objectql");
+const register = require("@steedos/metadata-registrar");
 const steedosI18n = require("@steedos/i18n");
 const _ = require("lodash");
 const clone = require("clone");
@@ -93,14 +93,14 @@ module.exports = {
                 if(!objectName){
                     return []
                 }
-                const objectConfig = await objectql.getObjectConfig(objectName);
+                const objectConfig = await register.getObjectConfig(objectName);
                 steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
 
                 const options = [{ label: objectConfig.label, value: objectConfig.name }];
                 for (fieldName in objectConfig.fields) {
                     const field = objectConfig.fields[fieldName]
                     if (field && field.type === 'master_detail' && _.isString(field.reference_to)) {
-                        const referenceToObjectConfig = await objectql.getObjectConfig(field.reference_to);
+                        const referenceToObjectConfig = await register.getObjectConfig(field.reference_to);
                         steedosI18n.translationObject(lng, referenceToObjectConfig.name, referenceToObjectConfig);
                         if (referenceToObjectConfig) {
                             options.push({
@@ -126,13 +126,13 @@ module.exports = {
 
                 let mainObjectName = null;
                 if (targetObject && targetObject != objectName) {
-                    const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
+                    const targetField = await register.getObjectConfig(objectName).fields[targetObject];
                     mainObjectName = targetField && targetField.reference_to;
                 } else {
                     mainObjectName = objectName;
                 }
 
-                const objectConfig = await objectql.getObjectConfig(mainObjectName);
+                const objectConfig = await register.getObjectConfig(mainObjectName);
                 const options = [];
                 if (objectConfig) {
                     steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
@@ -164,13 +164,13 @@ module.exports = {
 
                 let mainObjectName = null;
                 if (targetObject && targetObject != objectName) {
-                    const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
+                    const targetField = await register.getObjectConfig(objectName).fields[targetObject];
                     mainObjectName = targetField && targetField.reference_to;
                 } else {
                     mainObjectName = objectName;
                 }
 
-                const objectConfig = await objectql.getObjectConfig(mainObjectName);
+                const objectConfig = await register.getObjectConfig(mainObjectName);
                 const options = [];
                 if (objectConfig) {
                     steedosI18n.translationObject(lng, objectConfig.name, objectConfig);
@@ -208,13 +208,13 @@ module.exports = {
 
                 let mainObjectName = null;
                 if (targetObject && targetObject != objectName) {
-                    const targetField = await objectql.getObjectConfig(objectName).fields[targetObject];
+                    const targetField = await register.getObjectConfig(objectName).fields[targetObject];
                     mainObjectName = targetField && targetField.reference_to;
                 } else {
                     mainObjectName = objectName;
                 }
 
-                const objectConfig = await objectql.getObjectConfig(mainObjectName);
+                const objectConfig = await register.getObjectConfig(mainObjectName);
                 let literal_value_schema = {
                     "type": "text",
                     "name": "literal_value",

package/main/default/triggers/process_definition.trigger.js

@@ -1,6 +1,7 @@
 const _ = require("underscore");
 const util = require('@steedos/standard-objects').util;
 const objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
 const InternalData = require('@steedos/standard-objects').internalData;
 
 function setSpaceAndOwner(record, that){
@@ -55,12 +56,12 @@ module.exports = {
         let filters = InternalData.parserFilters(this.query.filters)
         let approvalProcesses = [];
         if(filters.name){
-            approvalProcess = objectql.getSourceApprovalProcess(filters.name);
+            approvalProcess = register.getSourceApprovalProcess(filters.name);
             if(approvalProcess){
                 approvalProcesses.push(approvalProcess);
             }
         }else{
-            approvalProcesses = objectql.getSourceApprovalProcesses();
+            approvalProcesses = register.getSourceApprovalProcesses();
         }
 
         if (filters.object_name){
@@ -77,12 +78,12 @@ module.exports = {
         let filters = InternalData.parserFilters(this.query.filters)
         let approvalProcesses = [];
         if(filters.name){
-            approvalProcess = objectql.getSourceApprovalProcess(filters.name);
+            approvalProcess = register.getSourceApprovalProcess(filters.name);
             if(approvalProcess){
                 approvalProcesses.push(approvalProcess);
             }
         }else{
-            approvalProcesses = objectql.getSourceApprovalProcesses();
+            approvalProcesses = register.getSourceApprovalProcesses();
         }
 
         if (filters.object_name){
@@ -99,12 +100,12 @@ module.exports = {
         let filters = InternalData.parserFilters(this.query.filters)
         let approvalProcesses = [];
         if(filters.name){
-            approvalProcess = objectql.getSourceApprovalProcess(filters.name);
+            approvalProcess = register.getSourceApprovalProcess(filters.name);
             if(approvalProcess){
                 approvalProcesses.push(approvalProcess);
             }
         }else{
-            approvalProcesses = objectql.getSourceApprovalProcesses();
+            approvalProcesses = register.getSourceApprovalProcesses();
         }
 
         if (filters.object_name){

package/main/default/triggers/workflow_rule.trigger.js

@@ -1,13 +1,14 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2021-08-30 12:06:41
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-07-29 16:03:50
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-05-30 17:29:53
  * @Description: 
  */
 const _ = require("underscore");
 const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
+const register = require("@steedos/metadata-registrar")
 const InternalData = require('@steedos/standard-objects').internalData;
 
 const getInternalWorkflowRules = function(sourceWorkflowRules, filters){
@@ -40,10 +41,10 @@ module.exports = {
         let filters = InternalData.parserFilters(this.query.filters)
         let workflowRules = [];
         if(filters.object_name){
-            workflowRules = objectql.getObjectWorkflowRules(filters.object_name);
+            workflowRules = register.getObjectWorkflowRules(filters.object_name);
             delete filters.object_name;
         }else{
-            workflowRules = objectql.getAllWorkflowRules();
+            workflowRules = register.getAllWorkflowRules();
         }
 
         workflowRules = getInternalWorkflowRules(workflowRules, filters);
@@ -56,10 +57,10 @@ module.exports = {
         let filters = InternalData.parserFilters(this.query.filters)
         let workflowRules = [];
         if(filters.object_name){
-            workflowRules = objectql.getObjectWorkflowRules(filters.object_name);
+            workflowRules = register.getObjectWorkflowRules(filters.object_name);
             delete filters.object_name;
         }else{
-            workflowRules = objectql.getAllWorkflowRules();
+            workflowRules = register.getAllWorkflowRules();
         }
         
         workflowRules = getInternalWorkflowRules(workflowRules, filters);
@@ -72,10 +73,10 @@ module.exports = {
         let filters = InternalData.parserFilters(this.query.filters)
         let workflowRules = [];
         if(filters.object_name){
-            workflowRules = objectql.getObjectWorkflowRules(filters.object_name);
+            workflowRules = register.getObjectWorkflowRules(filters.object_name);
             delete filters.object_name;
         }else{
-            workflowRules = objectql.getAllWorkflowRules();
+            workflowRules = register.getAllWorkflowRules();
         }
         
         workflowRules = getInternalWorkflowRules(workflowRules, filters);
@@ -87,7 +88,7 @@ module.exports = {
     afterFindOne: async function(){
         if(_.isEmpty(this.data.values)){
             let id = this.id
-            let workflowRule = objectql.getWorkflowRule(id);
+            let workflowRule = register.getWorkflowRule(id);
             if(workflowRule){
                 this.data.values = workflowRule;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-process-approval",
-    "version": "2.5.3-beta.2",
+    "version": "2.5.3-beta.21",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,10 +10,10 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "2.5.3-beta.2"
+        "@steedos/process": "2.5.3-beta.21"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
+    "gitHead": "b4313a2ef5d18ef1cf9271bd3c89b2d6fe52d65b"
 }