cob-cli 2.6.0 → 2.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.6.0",
+  "version": "2.6.3",
   "description": "A command line utility to help Cult of Bits partners develop with higher speed and reusing common code and best practices.",
   "preferGlobal": true,
   "repository": {

package/templates/keywords/audit/backend/scripts/_audit.groovy

@@ -5,35 +5,40 @@ import com.google.common.cache.*
 import java.util.concurrent.TimeUnit
 
 // ========================================================================================================
+if (msg.product != "recordm-definition" && msg.product != "recordm" ) return
+
 @Field static cacheOfAuditFieldsForDefinition = CacheBuilder.newBuilder()
         .expireAfterWrite(5, TimeUnit.MINUTES)
         .build();
 
 if (msg.product == "recordm-definition") cacheOfAuditFieldsForDefinition.invalidate(msg.type)
-def auditFields = cacheOfAuditFieldsForDefinition.get(msg.type, { getAuditFields(msg.type) })
 
 // ========================================================================================================
-
+def auditFields = cacheOfAuditFieldsForDefinition.get(msg.type, { getAuditFields(msg.type) })
 if (auditFields.size() > 0
-	&& msg.product == "recordm"
 	&& msg.user != "integrationm"
 	&& msg.action =~ "add|update" ) {
 
-	def updates = updateUser(auditFields,msg.instance.fields)
+	def updates = getAuditFieldsUpdates(auditFields,msg.instance.fields)
     def result = actionPacks.recordm.update(msg.type, "recordmInstanceId:" + msg.instance.id, updates);
-	/**/log.info("[\$audit] ACTUALIZADA '${msg.type}' {{id:${msg.instance.id}, result:${result}, updates: ${updates}}}");
+	if(updates) log.info("[\$audit] UPDATE '${msg.type}' id:${msg.instance.id}, updates: ${updates}, result:${result.getStatus()} | ${result.getStatusInfo()} ");
 }
 
 // ========================================================================================================
-def updateUser(auditFields,instanceFields) {
-	def userm = actionPacks.get("userm");
+def getAuditFieldsUpdates(auditFields,instanceFields) {
 	def updates = [:]
 	auditFields.each { auditField ->
-		if( auditField.op == "creator" && msg.action == "update") return
-		if( auditField.args == "usermRef") {
-			updates << [(auditField.name) : userm.getUser(msg.user).data._links.self]
-		} else {
+		if( auditField.op == "creator" && msg.action == "update" && msg.value(auditField.name) != null) return // 'creator' fields are only changed in 'update' if the previous value was empty (meaning it was a field that was not visible)
+		if( msg.action == 'update' && !msg.diff) return // Only continues if there is at least one change
+		if( auditField.args == "uri") {
+			updates << [(auditField.name) : actionPacks.get("userm").getUser(msg.user).data._links.self]
+
+		} else if( auditField.args == "username") {
 			updates << [(auditField.name) : msg.user]
+			
+		} else if( auditField.args == "time") {
+			if(msg.action == 'add' && Math.abs(msg.value(auditField.name, Long.class)?:0 - msg._timestamp_) < 30000) return // Ignore changes less then 30s
+			updates << [(auditField.name) : "" + msg._timestamp_]
 		}
 	}
 	return updates
@@ -41,8 +46,7 @@ def updateUser(auditFields,instanceFields) {
 
 // ========================================================================================================
 def getAuditFields(definitionName) {
-	/**/log.info("[\$audit] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
-	/**/log.info("[\$audit] Update auditFields for $definitionName ... ");
+	log.info("[\$audit] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
 
 	// Obtém detalhes da definição
 	def definitionEncoded = URLEncoder.encode(definitionName, "utf-8").replace("+", "%20")
@@ -63,14 +67,14 @@ def getAuditFields(definitionName) {
 	// Finalmente obtém a lista de campos que é necessário calcular
 	def auditFields = [];
 	fields.each { fieldId,field -> 
-		def matcher = field.description =~ /[$]audit\.(creator|updater)\.(username|usermRef)/
+		def matcher = field.description =~ /[$]audit\.(creator|updater)\.(username|uri|time)/
 		if(matcher) {
 			def op = matcher[0][1]
 			def arg = matcher[0][2]
 			auditFields << [fieldId: fieldId, name:field.name, op : op, args: arg]
 		}
 	}
-	log.info("[\$audit] fields for '$definitionName': $auditFields");
-	/**/log.info("[\$audit] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+	log.info("[\$audit] Update 'auditFields' for '$definitionName': $auditFields");
+	log.info("[\$audit] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
 	return auditFields
 }

package/templates/keywords/audit/frontend/js/cob/_audit.js

@@ -2,16 +2,19 @@
 cob.custom.customize.push(function (core, utils, ui) {
     core.customizeAllInstances((instance, presenter) => 
     {
-        let userFPs = presenter.findFieldPs( fp => /[$]audit\.(creator|updater)\.(username|usermRef)/.exec(fp.field.fieldDefinition.description && fp.field.fieldDefinition.description) )
+        let userFPs = presenter.findFieldPs( fp => /[$]audit\.(creator|updater)\.(username|uri|time)/.exec(fp.field.fieldDefinition.description) )
         userFPs.forEach( fp => {
             fp.disable()
             if(!instance.isNew() || presenter.isGroupEdit()) return //Only update if it's on create interface (updates will only be changed by the backend)
             if(/[$]audit\.(creator|updater)\.username/.exec(fp.field.fieldDefinition.description)) {
                 fp.setValue(core.getCurrentLoggedInUser())
             }
-            if(/[$]audit\.(creator|updater)\.usermRef/.exec(fp.field.fieldDefinition.description)) {
+            if(/[$]audit\.(creator|updater)\.uri/.exec(fp.field.fieldDefinition.description)) {
                 fp.setValue(core.getCurrentLoggedInUserUri())
             }
+            if(/[$]audit\.(creator|updater)\.time/.exec(fp.field.fieldDefinition.description)) {               
+                fp.setValue(Date.now())
+            }
         })
     })
 });

package/templates/keywords/calc/backend/scripts/_calc.groovy

@@ -7,14 +7,16 @@ import com.google.common.cache.*
 import java.util.concurrent.TimeUnit
 
 // ========================================================================================================
+if (msg.product != "recordm-definition" && msg.product != "recordm" ) return
+
 @Field static cacheOfCalcFieldsForDefinition = CacheBuilder.newBuilder()
         .expireAfterWrite(5, TimeUnit.MINUTES)
         .build();
 
 if (msg.product == "recordm-definition") cacheOfCalcFieldsForDefinition.invalidate(msg.type)
-def calculationFields = cacheOfCalcFieldsForDefinition.get(msg.type, { getAllCalculationFields(msg.type) })
 
 // ========================================================================================================
+def calculationFields = cacheOfCalcFieldsForDefinition.get(msg.type, { getAllCalculationFields(msg.type) })
 if (calculationFields.size() > 0
 	&& msg.product == "recordm"
 	&& msg.user != "integrationm"
@@ -22,7 +24,7 @@ if (calculationFields.size() > 0
 
 	def updates = executeCalculations(calculationFields, msg.instance.fields)
     def result = actionPacks.recordm.update(messageMap.type, "recordmInstanceId:" + messageMap.instance.id, updates);
-	log.info("[\$calc] ACTUALIZADA '${messageMap.type}' {{id:${messageMap.instance.id}, result:${result}, updates: ${updates}}}");
+	if(updates) log.info("[\$calc] UPDATE '${msg.type}' id:${msg.instance.id}, updates: ${updates}, result:${result.getStatus()} | ${result.getStatusInfo()} ");
 }
 
 // ==================================================
@@ -117,7 +119,6 @@ def getAllAplicableValuesForVarName(fieldId,varName,varFieldIds,instanceFields,t
 // ========================================================================================================
 def getAllCalculationFields(definitionName) {
 	log.info("[\$calc] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
-	log.info("[\$calc] update calculationFields for $definitionName... ");
 
 	// Obtém detalhes da definição
 	def definitionEncoded = URLEncoder.encode(definitionName, "utf-8").replace("+", "%20")
@@ -154,7 +155,7 @@ def getAllCalculationFields(definitionName) {
 		}
 		previousId = fieldId
 	}
-	log.info("[\$calc] fields for '$definitionName': $calculationFields");	
+	log.info("[\$calc] Update 'calculationFields' for '$definitionName': $calculationFields");	
 	log.info("[\$calc] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
 	return calculationFields
 }

package/templates/keywords/calc/frontend/js/cob/_calc.js

@@ -17,7 +17,7 @@ function calc_automation(instance, presenter) {
     //=========================================================
     function getAllCalculationsFields() {
         return presenter
-            .findFieldPs( fp => fp.field.fieldDefinition.description && fp.field.fieldDefinition.description.includes("$calc.") )
+            .findFieldPs( fp => /[$]calc\.(.*)/.exec(fp.field.fieldDefinition.description) )
             .map( calculationFp => {
                 calculationFp.disable()
                 return {