cob-cli 2.6.2 → 2.8.0

package/customizations/keywords.js

@@ -1,5 +1,5 @@
 exports.option = {
-  name: 'Keywords - Add a keyword for use in definitions (https://learning.cultofbits.com)', 
+  name: 'Keywords - Add a keyword for use in definitions (https://learning.cultofbits.com/docs/cob-platform/admins/managing-information/available-customizations/)', 
   short: "Keywords",
   followUp: [ {
     type: 'list',
@@ -7,7 +7,8 @@ exports.option = {
     message: 'Select one?',
     choices: [
         require("./keywords.calc").option,
-        require("./keywords.audit").option
+        require("./keywords.audit").option,
+        require("./keywords.log").option
     ]}
   ]
 }

package/customizations/keywords.log.js

@@ -0,0 +1,17 @@
+exports.option = {
+  name: 'Log - Allows for $log in definitions (https://learning.cultofbits.com/docs/cob-platform/admins/managing-information/available-customizations/log/)', 
+  short: "Log",
+  questions: [
+  ],
+  customization: async function (answers) {
+      console.log("\nApplying Log keyword customizations ...")
+
+      const { copy } = require("../lib/task_lists/customize_copy");
+      const { mergeFiles } = require("../lib/task_lists/customize_mergeFiles");
+      const fe_target = "./recordm/customUI/"
+      await copy("../../templates/keywords/log/frontend",fe_target)
+      const be_target = "./integrationm/"
+      await copy("../../templates/keywords/log/backend",be_target)
+      await mergeFiles("Keyword.Log")
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cob-cli",
-  "version": "2.6.2",
+  "version": "2.8.0",
   "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/frontend/common/css/_dualColumn.css

@@ -0,0 +1,46 @@
+/* Overall good practive - not column related but specialy relevant inside columns */
+li.custom-dualColumn ol.fields > li > table > tbody > tr > td:nth-child(1) {
+  min-width: 70px;
+}
+li.custom-dualColumn ol.fields > li > table > tbody > tr > td:nth-child(2) {
+  min-width: 160px;
+}
+li.custom-dualColumn ol.fields  li > table > tbody > tr > td:nth-child(3),
+li.custom-dualColumn ol.fields  li > table > tbody > tr > td:nth-child(3) input {
+  max-width: 230px !important;
+  width: -webkit-fill-available;
+}
+  
+/* $style[dualColumn] */
+li.custom-dualColumn > ol.fields{
+  display: flex;
+  flex-wrap: wrap;
+}
+li.custom-dualColumn > ol.fields > li  {
+  flex-basis:49%;
+}
+li.custom-dualColumn  ol.fields > li > table > tbody > tr > td:nth-child(3) {
+  width: unset;
+}
+li.custom-dualColumn  ol.fields > li > table > tbody > tr > td:nth-child(4) {
+  display: none;
+}
+
+/* $style[singleColumn] */
+li.custom-dualColumn > ol.fields > li.custom-singleColumn  {
+  flex-basis:100%;
+}
+
+/* $style[column] */
+li.custom-column > table {
+  display: none
+}
+.cob-app .instance-detail-container div.instance-container li.custom-column > ol.fields {
+  border:none;
+  background-color: unset;
+  margin:unset;
+}
+.cob-app .instance-detail-container .instance-container .fields-container li.custom-column.field-group {
+  margin:unset;
+  padding: unset;
+}

package/templates/frontend/common/css/_global.css

@@ -0,0 +1,12 @@
+/* Overall good practive - not column related but specialy relevant inside columns */
+.cob-app .instance-detail-container div.instance-container ol.fields > li > table > tbody > tr > td:nth-child(1) {
+    min-width: 70px;
+}
+.cob-app .instance-detail-container div.instance-container ol.fields > li > table > tbody > tr > td:nth-child(2) {
+    min-width: 160px;
+}
+.cob-app .instance-detail-container div.instance-container ol.fields  li > table > tbody > tr > td:nth-child(3),
+.cob-app .instance-detail-container div.instance-container ol.fields  li > table > tbody > tr > td:nth-child(3) input {
+    max-width: 230px;
+    width: -webkit-fill-available;
+}

package/templates/frontend/common/css/_mobile.css

@@ -59,12 +59,8 @@
       width:30px !important;
       max-width:30px !important;
    }
-   ol.fields .custom-comentarios table > tbody > tr > td:nth-child(1) {
-      min-width:70px !important;
-      width:70px !important;
-      max-width:70px !important;
-   }
-   ol.fields table > tbody > tr > td:nth-child(2) {
+   ol.fields table > tbody > tr > td:nth-child(2),
+   ol.fields table > tbody > tr > td:nth-child(2) label {
       width:100px !important;
       min-width:100px !important;
    }
@@ -91,11 +87,7 @@
       min-width:0px !important;
       max-width:0px !important;
    }
-   /* labels constantes */
-   .cob-app .instance-detail-container div.instance-container ol.fields > li > table label {
-      max-width: 150px !important;
-      min-width: 150px !important;
-   }
+
    /* selects constantes */
    .cob-app .instance-detail-container ol.fields table > tbody > tr > td:nth-child(3) > div.inline > select,
    .cob-app .instance-detail-container select {

package/templates/frontend/common/css/customizations.__MERGE__.css

@@ -1,3 +1,5 @@
+@import "_global.css";
 @import "_history.css";
 @import "_hidden.css";
-@import "_mobile.css";
+@import "_mobile.css";
+@import "_dualColumn.css";

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

@@ -16,6 +16,7 @@ if (msg.product == "recordm-definition") cacheOfAuditFieldsForDefinition.invalid
 // ========================================================================================================
 def auditFields = cacheOfAuditFieldsForDefinition.get(msg.type, { getAuditFields(msg.type) })
 if (auditFields.size() > 0
+	&& msg.product == "recordm"
 	&& msg.user != "integrationm"
 	&& msg.action =~ "add|update" ) {
 
@@ -30,7 +31,7 @@ def getAuditFieldsUpdates(auditFields,instanceFields) {
 	auditFields.each { auditField ->
 		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 == "usermURI") {
+		if( auditField.args == "uri") {
 			updates << [(auditField.name) : actionPacks.get("userm").getUser(msg.user).data._links.self]
 
 		} else if( auditField.args == "username") {
@@ -46,8 +47,7 @@ def getAuditFieldsUpdates(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")
@@ -68,14 +68,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|usermURI|time)/
+		def matcher = field.description.toString() =~ /[$]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,18 +2,19 @@
 cob.custom.customize.push(function (core, utils, ui) {
     core.customizeAllInstances((instance, presenter) => 
     {
-        let userFPs = presenter.findFieldPs( fp => /[$]audit\.(creator|updater)\.(username|usermURI|time)/.exec(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(fp.getValue() && (!instance.isNew() || presenter.isGroupEdit())) return //Don't do nothing if field is not empty AND it's an update 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)\.usermURI/.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())
+                setInterval(() =>  fp.setValue(Date.now()),15000)
             }
         })
     })

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

@@ -119,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")
@@ -156,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/log/backend/scripts/_log.groovy

@@ -0,0 +1,99 @@
+import groovy.transform.Field
+import org.codehaus.jettison.json.JSONObject
+
+import com.google.common.cache.*
+import java.util.concurrent.TimeUnit
+
+// ========================================================================================================
+if (msg.product != "recordm-definition" && msg.product != "recordm" ) return
+
+@Field static cacheOfLogFieldsForDefinition = CacheBuilder.newBuilder()
+        .expireAfterWrite(5, TimeUnit.MINUTES)
+        .build();
+
+if (msg.product == "recordm-definition") cacheOfLogFieldsForDefinition.invalidate(msg.type)
+
+// ========================================================================================================
+def logFields = cacheOfLogFieldsForDefinition.get(msg.type, { getLogFields(msg.type) })
+if( logFields.size() > 0
+	&& msg.product == "recordm"
+	&& msg.user != "integrationm"
+	&& msg.action =~ "add|update" 
+) {
+	def updates = getLogUpdates(logFields)
+	def result = recordm.update(messageMap.type, "recordmInstanceId:" + messageMap.instance.id, updates);
+    if (updates) log.info("[\$log] UPDATE '${msg.type}' id:${msg.instance.id}, updates: ${updates}, result:${result} ");
+}
+
+// ========================================================================================================
+
+def getLogUpdates(logFields){
+    def updates = [:]
+    def currentUser = actionPacks.get("userm").getUser(msg.user).data.name;
+
+	logFields.each { logField ->
+		def commentLogs = msg.value(logField.name);
+		def newComment = msg.value(logField.sourceField);
+		def fieldMsg = getFieldMessage(logField.stateField);
+
+		if( newComment != null || msg.field(logField.stateField).changed() ){
+			def newLogEntry = "#### " + (new Date()).format('yyyy-MM-dd HH:mm:ss').toString() + " - " + currentUser;
+			newLogEntry += " [$fieldMsg] "
+			newLogEntry +="\n\n";
+			newLogEntry += newComment != null ? newComment : "";
+			newLogEntry +="\n\n";
+
+			if(commentLogs!=null) {
+				newLogEntry +=  "======================================================================\n";
+			}
+			updates << [(logField.name) : "" + newLogEntry + (commentLogs ?: "")];
+			updates << [(logField.sourceField) :  ""];		
+		}
+	}
+    return updates
+}
+
+def getFieldMessage(field){
+	String newValue = msg.value(field) ?: "";
+    if( msg.field(field).changed() ){
+        String oldValue = msg.oldInstance.value(field) ?: "";
+        return "$field: $oldValue -> $newValue";
+    } else {
+        return "$field:  $newValue";
+    }
+}
+
+// ========================================================================================================
+def getLogFields(definitionName) {
+	log.info("[\$log] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+
+	// Obtém detalhes da definição
+	def definitionEncoded = URLEncoder.encode(definitionName, "utf-8").replace("+", "%20")
+	def resp = actionPacks.rmRest.get( "recordm/definitions/name/${definitionEncoded}".toString(), [:], "");
+	JSONObject definition = new JSONObject(resp);
+
+	def fieldsSize = definition.fieldDefinitions.length();
+
+	def fields = [:]
+	(0..fieldsSize-1).each { index ->
+		def fieldDefinition  = definition.fieldDefinitions.getJSONObject(index)
+		def fieldDescription = fieldDefinition.get("description")
+		def fieldDefId       = fieldDefinition.get("id")
+		def fieldName        = fieldDefinition.get("name");
+		fields[fieldDefId]   = [name:fieldName, description: fieldDescription]
+	}
+
+	// Finalmente obtém a lista de campos que é necessário calcular
+	def auditFields = [];
+	fields.each { fieldId,field -> 
+		def matcher = field.description.toString() =~ /[$]log\(([^(]+),\s*([^(]+)\)/
+		if(matcher) {
+			def sourceField = matcher[0][1]
+			def stateField = matcher[0][2]
+			auditFields << [name: field.name, sourceField : sourceField, stateField : stateField]
+		}
+	}
+	log.info("[\$log] Update 'logFields' for '$definitionName': $auditFields");
+	log.info("[\$log] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
+	return auditFields
+}

package/templates/keywords/log/frontend/css/_log.css

@@ -0,0 +1,5 @@
+
+/* Aproxima novo comentário do log de comentários */
+.cob-app .instance-detail-container div.instance-container ol.fields > li.custom-reduceDistanceToNextField {
+    margin-bottom: -23px;
+}

package/templates/keywords/log/frontend/css/customizations.__MERGE__.css

@@ -0,0 +1 @@
+@import "_log.css";