cob-cli 2.6.0 → 2.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "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

@@ -29,11 +29,17 @@ def updateUser(auditFields,instanceFields) {
 	def userm = actionPacks.get("userm");
 	def updates = [:]
 	auditFields.each { auditField ->
-		if( auditField.op == "creator" && msg.action == "update") return
+		if( auditField.op == "creator" && msg.action == "update" && msg.value(auditField.name) != null) return
 		if( auditField.args == "usermRef") {
 			updates << [(auditField.name) : userm.getUser(msg.user).data._links.self]
-		} else {
+
+		} 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
+			if(msg.action == 'update' && !msg.diff) return // Only continues if there is at least one change
+			updates << [(auditField.name) : "" + msg._timestamp_]
 		}
 	}
 	return updates
@@ -63,7 +69,7 @@ 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|usermRef|time)/
 		if(matcher) {
 			def op = matcher[0][1]
 			def arg = matcher[0][2]

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

@@ -2,7 +2,7 @@
 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|usermRef|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)
@@ -12,6 +12,9 @@ cob.custom.customize.push(function (core, utils, ui) {
             if(/[$]audit\.(creator|updater)\.usermRef/.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/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 {