cob-cli 2.16.1 → 2.17.0

package/templates/dashboards/dash/package-lock.json

@@ -11355,6 +11355,7 @@
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
       "dev": true,
+      "hasInstallScript": true,
       "optional": true,
       "os": [
         "darwin"
@@ -11765,6 +11766,7 @@
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
       "dev": true,
+      "hasInstallScript": true,
       "optional": true,
       "os": [
         "darwin"

package/templates/dashboards/dash/src/collector.js

@@ -108,7 +108,7 @@ function parseDashboard(raw_dashboard, userInfo) {
                         "ValueClasses": "",
                         "View": "",
                         "ValueAttention": "",
-                        "AttentionClasses": "",
+                        "ValueAttentionClasses": "",
                         "Unit": "",
                     }],
                     "Style Value": "",
@@ -139,7 +139,8 @@ function parseDashboard(raw_dashboard, userInfo) {
                 "OutputVarCalendar": "",
                 "MaxVisibleDayEvents": "",
                 "AllowCreateInstances":"",
-                "CreateDefinition":""
+                "CreateDefinition":"",
+                "EventViews":""
             }],
             "Events": [{
                 "Definition": "",
@@ -199,7 +200,7 @@ function parseDashboard(raw_dashboard, userInfo) {
                     if (v.Value === 'Label') {
                         v.dash_info = {value: v.Arg[0].Arg, state: "ready"}
                     } else if (v.Value === 'link') {
-                        v.dash_info = {value: icon, href: url, state: undefined, isLink: true}
+                        v.dash_info = {value:  v.Arg[1].Arg, href:  v.Arg[0].Arg, state: "ready", isLink: true}
                     } else {
                         // add dash-info values in Totals
                         v.dash_info = dashFunctions[v.Value].apply(this, v['Arg'].map( a =>

package/templates/dashboards/dash/src/components/Board.vue

@@ -2,11 +2,11 @@
     <div :class="classes" :style="image" >
         <template v-for="(item, i) in components">
             <Label    v-if="item['Component'] === 'Label'"    :component="item" :key="i" />
-            <Menu     v-if="item['Component'] === 'Menu'"     :component="item" :key="i" />
+            <Menu     v-if="item['Component'] === 'Menu'"     :component="item" :key="i" :userInfo="userInfo"/>
             <Totals   v-if="item['Component'] === 'Totals'"   :component="item" :key="i" :userInfo="userInfo"/>
             <Kibana   v-if="item['Component'] === 'Kibana'"   :component="item" :key="i" :userInfo="userInfo"/>
-            <Filtro   v-if="item['Component'] === 'Filter'"   :component="item" :key="i" />
-            <Calendar v-if="item['Component'] === 'Calendar'" :component="item" :key="i" />
+            <Filtro   v-if="item['Component'] === 'Filter'"   :component="item" :key="i" :userInfo="userInfo"/>
+            <Calendar v-if="item['Component'] === 'Calendar'" :component="item" :key="i" :userInfo="userInfo"/>
         </template>
     </div>
 </template>

package/templates/dashboards/dash/src/components/Calendar.vue

@@ -26,7 +26,6 @@
   import tippy from 'tippy.js';
   import Instance from "@/components/shared/Instance";
   import Vue from "vue";
-  import {getValue} from "@/utils/EsInstanceUtils";
   import ComponentStatePersistence from "@/model/ComponentStatePersistence";
 
   const DEFAULT_EVENT_COLOR = '#0e7bbe'
@@ -39,7 +38,8 @@
     },
 
     props: {
-      component: Object
+      component: Object,
+      userInfo: Object
     },
 
     data: () => ({
@@ -57,14 +57,15 @@
         timeZone: 'UTC',
         locales: allLocales,
         // Take in consideration updating the initial state value of `activeView` if you change this value
-        initialView: 'dayGridMonth',
+        initialView: 'dayGridWeek',
         headerToolbar: {
           left: 'today prev next',
           center: '',
-          right: 'dayGridMonth,listMonth'
+          right: 'dayGridWeek,dayGridMonth,listMonth'
         },
         buttonText: {
           today: 'Today',
+          week: 'Week',
           month: 'Month',
           list: 'List',
         },
@@ -85,11 +86,14 @@
     }),
 
     created() {
+        this.calendarOptions.initialView = this.eventView[0]
+        this.calendarOptions.headerToolbar.right = this.eventView.join(",")
+        
         this.statePersistence = new ComponentStatePersistence(this.component.id, this.updateCalendarBasedOnPersistedStateChange)
 
         // Setup a dashInfo placeholder for each event source, initially with a zero result query ( "-*") so it has a fast response
         for(let i in this.eventSources) {
-          this.rmEventSources.push( instancesList( this.eventSources[i]['Definition'], "-*", 2000, 0, {validity: 30}) )
+          this.rmEventSources.push( instancesList( this.eventSources[i]['Definition'], "-*", 800, 0, "", {validity: 60}) )
         }
 
         // If configured get the definition id to allow instance creation
@@ -164,6 +168,7 @@
       inputVarCalendar()     { return this.options['InputVarCalendar'] || [] },
       allowCreateInstances() { return this.options['AllowCreateInstances'] === 'TRUE' || false},
       createDefinition()     { return this.options['CreateDefinition'] },
+      eventView()            { return this.options['EventViews'] && this.options['EventViews'].split(',') || ['dayGridWeek','dayGridMonth','listMonth'] },
       outputVar()            { return this.options['OutputVarCalendar'] || '' },
       dayMaxEvents()         { return parseInt(this.options['MaxVisibleDayEvents'], 10) || MAX_VISIBLE_DAY_EVENTS },
       
@@ -180,13 +185,14 @@
             // Calculate date range query part
             let startField = toEsFieldName(this.eventSources[i]['DateStartEventField'])
             let endField   = toEsFieldName(this.eventSources[i]['DateEndEventField'])
-            let dateRangeQuery = `${startField}:[${this.dateRange[0].getTime()} TO ${this.dateRange[1].getTime()}]`
+            let dateRangeQuery = `(${startField}:[${this.dateRange[0].getTime()} TO ${this.dateRange[1].getTime()}])`
             if (endField) {
-              dateRangeQuery += ` OR ${endField}:[${this.dateRange[0].getTime()} TO ${this.dateRange[1].getTime()}]`
+              dateRangeQuery += ` OR (${endField}:[${this.dateRange[0].getTime()} TO ${this.dateRange[1].getTime()}])`
+              dateRangeQuery += ` OR (${startField}:<${this.dateRange[0].getTime()} AND ${endField}:>=${this.dateRange[1].getTime()})`
             }
 
             // Calculate final query
-            const eventQuery = this.eventSources[i]['EventsQuery'] || '*'
+            const eventQuery = this.eventSources[i]['EventsQuery'] && this.eventSources[i]['EventsQuery'].replace(/__USERNAME__/g, this.userInfo.username) || '*'
             const baseQuery = `${eventQuery} AND (${dateRangeQuery})`
             const inputVars = new Set(this.inputVarCalendar.map(inputVar => inputVar['InputVarCalendar']));
             const finalQuery = `${baseQuery} ${[...inputVars].map(inputVar => this.component.vars[inputVar]).join(' ')}`.trim()
@@ -272,13 +278,22 @@
               const startDate = new Date(parseInt(esInstance[startDateField][0], 10))
               const endDate = endDateField ? new Date(parseInt(esInstance[endDateField][0], 10)) : null
 
+              let color
+              if(stateField && stateField.startsWith("#")) {
+                color = stateField
+              } else if(!stateField || !esInstance[stateField]) {
+                color = DEFAULT_EVENT_COLOR
+              } else {
+                color = this.textToRGB(esInstance[stateField][0])
+              }
+
               return {
                 id: `calendar-event-${esInstance.id}`,
                 title: title[0] + (title.length > 1 ? `(${title.length})` : ''),
                 start: startDate,
                 end: endDate,
                 allDay: true,
-                backgroundColor: stateField && esInstance[stateField] ? this.textToRGB(esInstance[stateField][0]) : DEFAULT_EVENT_COLOR,
+                backgroundColor: color,
 
                 // from: https://fullcalendar.io/docs/event-object
                 // In addition to the fields above, you may also include your own non-standard fields in each Event object.

package/templates/dashboards/dash/src/components/Kibana.vue

@@ -34,6 +34,7 @@
             inputs()      { return this.options['InputVarKibana'].map(v => v['InputVarKibana']) },
             inputFilter() {
               let filters = this.inputs.filter(v => this.component.vars[v]).map(v => this.component.vars[v]);
+              if (filters.length == 0) filters.push("*")
               if (this.fixedQuery !== "") filters.push(" AND (" + this.fixedQuery + ")");
               return filters.join(" ")
             },

package/templates/dashboards/dash/src/components/Menu.vue

@@ -19,16 +19,19 @@
 
     export default {
         components: { Attention },
-        props: { component: Object },
+        props: { 
+            component: Object,
+            userInfo: Object
+        },
         computed: {
             options() { return this.component['MenuCustomize'][0] },
             classes() { return this.options['MenuClasses']      || "flex flex-col gap-y-2" },             
             lines() {
                 let lines = this.component['Text'].map( line => ({
                     classes:   line["TextCustomize"][0]['TextClasses'] || "transition ease-in-out duration-300 rounded-md border border-gray-300 border-l-2 border-l-sky-600 shadow-sm transform hover:translate-x-0.5 p-2 bg-white",
-                    icon:      line["TextCustomize"][0]['Icon']        || "",
-                    text:      line['Text']                            || "",
-                    link:      line['Link']                            || "",
+                    icon:      line["TextCustomize"][0]['Icon'] || "",
+                    text:      line['Text'] || "",
+                    link:      line['Link'] && line['Link'].replace(/__USERNAME__/g, this.userInfo.username) || "",
                     groups:    line["TextCustomize"][0]['GroupVisibility'].map(g => g["GroupVisibility"] && g["GroupVisibility"] ).filter(g => g) || [],
                     attention: line["TextCustomize"][0]['AttentionInfo'],
                 }))

package/templates/dashboards/dash/src/components/TotalsValue.vue

@@ -38,12 +38,12 @@
             options()          { return this.valueData['ValueCustomize'][0] },
             view()             { return this.options['View'] },
             attention()        { return this.options['AttentionInfo'] },
-            attentionClasses() { return this.options['AttentionClasses'] },
+            attentionClasses() { return this.options['ValueAttentionClasses'] },
             unit()             { return this.options['Unit'] },
             state()            { return this.valueData.dash_info && this.valueData.dash_info.state || "" },
             updating()         { return this.state === "updating" || this.state === "loading" },
             classes()          { return (this.options['ValueClasses'] || "Default Info") + " S_"+this.valueData.dash_info.state },
-            link()             { return this.valueData.dash_info.href + (this.view ? "?&av=" + this.view : "") },
+            link()             { return this.valueData.dash_info.href + (this.view ? "?av=" + this.view : "") },
             expandedClasses()  { return this.classes.split(/\s/).map(c => specialClasses[c] || c ).join(" ") },
             value() {
                 if(this.valueData.dash_info.state === "loading") return "L"

package/templates/dashboards/dash/src/components/shared/Instance.vue

@@ -9,7 +9,7 @@
            :key="i" 
       >
         <div class='whitespace-nowrap mr-1 text-gray-400 field'>{{ description.name }}:</div>
-        <div class='whitespace-nowrap text-ellipsis overflow-hidden value'>{{ description.value }}</div>
+        <div class='whitespace-nowrap text-ellipsis overflow-hidden value' v-html="description.value"></div>
       </div>
     </div>
   </div>
@@ -46,9 +46,15 @@ export default {
         return this.esInstance._definitionInfo.instanceDescription
             .filter(fieldDefinition => this.esInstance[toEsFieldName(fieldDefinition.name)])
             .map(fieldDefinition => {
+              let value = getValue(this.esInstance, fieldDefinition).join(', ')
+              if(fieldDefinition.description.indexOf("$date")>=0) {
+                value = (new Date(value*1)).toISOString().split('T')[0]
+              } else if(fieldDefinition.description.indexOf("$link")>=0) {
+                value = "<a href='"+getValue(this.esInstance, fieldDefinition)+"'>link</a>"
+              }
               return {
                 name: fieldDefinition.name,
-                value: getValue(this.esInstance, fieldDefinition).join(', ')
+                value: value
               }
             });
       }

package/templates/dashboards/dash/src/definition_dashboard_v1.json

@@ -0,0 +1 @@
+{"id":null,"name":"Dashboard_v1","description":null,"duplicable":null,"state":"enabled","fieldDefinitions":[{"id":null,"name":"Dashboard Info","required":null,"description":"$group","condition":null,"duplicable":false,"fields":[],"order":0,"restricted":false,"rootField":true,"defaultValue":null},{"id":null,"name":"Name","required":null,"description":"$expanded $instanceLabel","condition":null,"duplicable":false,"fields":[],"order":1,"restricted":false,"rootField":true,"defaultValue":null},{"id":null,"name":"DashboardCustomize","required":null,"description":"$[Classes,Image,Width,Grid,Access] $multiple $help[Select the defaults to change] $style[hide] ","condition":null,"duplicable":false,"fields":[{"id":null,"name":"DashboardClasses","required":null,"description":"$default(h-full bg-cover bg-center overflow-auto p-3) Default: h-full bg-cover bg-center overflow-auto p-3","condition":"=Classes","duplicable":false,"fields":[],"order":3,"restricted":false,"rootField":false,"defaultValue":"h-full bg-cover bg-center overflow-auto p-3"},{"id":null,"name":"Image","required":null,"description":"$file Default:none","condition":"=Image","duplicable":false,"fields":[],"order":4,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Width","required":null,"description":"Default: max-w-6xl mx-auto ","condition":"=Width","duplicable":false,"fields":[],"order":5,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Grid","required":null,"description":"$default(grid grid-flow-row-dense md:grid-cols-12) Default: grid grid-flow-row-dense md:grid-cols-12","condition":"=Grid","duplicable":false,"fields":[],"order":6,"restricted":false,"rootField":false,"defaultValue":"grid grid-flow-row-dense md:grid-cols-12"},{"id":null,"name":"GroupAccess","required":null,"description":"$instanceDescription Group allowed to access this dashboard","condition":"=Access","duplicable":true,"fields":[],"order":7,"restricted":false,"rootField":false,"defaultValue":null}],"order":2,"restricted":false,"rootField":true,"defaultValue":null},{"id":null,"name":"URL","required":null,"description":"$link $auto.text(id).join('/recordm/index.html#/cob.custom-resource/',id,'/dash') $instanceDescription","condition":null,"duplicable":false,"fields":[],"order":8,"restricted":false,"rootField":true,"defaultValue":null},{"id":null,"name":"Boards","required":null,"description":"$group","condition":null,"duplicable":false,"fields":[],"order":9,"restricted":false,"rootField":true,"defaultValue":null},{"id":null,"name":"Board","required":null,"description":null,"condition":null,"duplicable":true,"fields":[{"id":null,"name":"BoardCustomize","required":null,"description":"$[Classes,Image] $multiple $help[Select the defaults to change] $style[hide] ","condition":null,"duplicable":false,"fields":[{"id":null,"name":"BoardClasses","required":null,"description":"$default(col-span-12 md:col-span-4 rounded-md border border-gray-300 bg-white bg-opacity-70 p-4 m-1)  Default:col-span-12 md:col-span-4 rounded-md border border-gray-300 bg-white bg-opacity-70 p-4 m-1","condition":"=Classes","duplicable":false,"fields":[],"order":12,"restricted":false,"rootField":false,"defaultValue":"col-span-12 md:col-span-4 rounded-md border border-gray-300 bg-white bg-opacity-70 p-4 m-1"},{"id":null,"name":"Image","required":null,"description":"$file Default: none","condition":"=Image","duplicable":false,"fields":[],"order":13,"restricted":false,"rootField":false,"defaultValue":null}],"order":11,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Component","required":null,"description":"$[Label,Menu,Totals,Kibana,Filter,Calendar] $instanceDescription $style[singleColumn] ","condition":null,"duplicable":true,"fields":[{"id":null,"name":"LabelCustomize","required":null,"description":"$[Classes,Image] $multiple $help[Select the defaults to change] $style[hide] ","condition":"=Label","duplicable":false,"fields":[{"id":null,"name":"LabelClasses","required":null,"description":"$default(text-center font-bold pb-2) Default: text-center font-bold pb-2","condition":"=Classes","duplicable":false,"fields":[],"order":16,"restricted":false,"rootField":false,"defaultValue":"text-center font-bold pb-2"},{"id":null,"name":"Image","required":null,"description":"$file Default: none","condition":"=Image","duplicable":false,"fields":[],"order":17,"restricted":false,"rootField":false,"defaultValue":null}],"order":15,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Label","required":null,"description":null,"condition":"=Label","duplicable":false,"fields":[],"order":18,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"MenuCustomize","required":null,"description":"$[Classes] $multiple $help[Select the defaults to change] $style[hide] ","condition":"=Menu","duplicable":false,"fields":[{"id":null,"name":"MenuClasses","required":null,"description":"$default(flex flex-col gap-y-2) Default: flex flex-col gap-y-2","condition":"=Classes","duplicable":false,"fields":[],"order":20,"restricted":false,"rootField":false,"defaultValue":"flex flex-col gap-y-2"}],"order":19,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Text","required":null,"description":null,"condition":"=Menu","duplicable":true,"fields":[{"id":null,"name":"TextCustomize","required":null,"description":"$[Classes,Icon,Attention,Visibility] $multiple $help[Select the defaults to change] $style[hide] ","condition":null,"duplicable":false,"fields":[{"id":null,"name":"TextClasses","required":null,"description":"$default(transition ease-in-out duration-300 rounded-md border border-gray-300 border-l-2 border-l-sky-600 shadow-sm transform hover:translate-x-0.5 p-2) Default: transition ease-in-out duration-300 rounded-md border border-gray-300 border-l-2 border-l-sky-600 shadow-sm transform hover:translate-x-0.5 p-2","condition":"=Classes","duplicable":false,"fields":[],"order":23,"restricted":false,"rootField":false,"defaultValue":"transition ease-in-out duration-300 rounded-md border border-gray-300 border-l-2 border-l-sky-600 shadow-sm transform hover:translate-x-0.5 p-2"},{"id":null,"name":"Icon","required":null,"description":"Default: none Example: fa-solid fa-circle-chevron-left","condition":"=Icon","duplicable":false,"fields":[],"order":24,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"TextAttention","required":null,"description":"Crisis:<=-5, ActionableBad:-4 .. -1, No action Required:0, ActionableGood:1..4,Extraordinary:>=5","condition":"=Attention","duplicable":false,"fields":[],"order":25,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"GroupVisibility","required":null,"description":"Group allowed to view this menu line","condition":"=Visibility","duplicable":true,"fields":[],"order":26,"restricted":false,"rootField":false,"defaultValue":null}],"order":22,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Link","required":null,"description":null,"condition":null,"duplicable":false,"fields":[],"order":27,"restricted":false,"rootField":false,"defaultValue":null}],"order":21,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"TotalsCustomize","required":null,"description":"$[Classes,InputVar] $multiple $help[Select the defaults to change] $style[hide] ","condition":"=Totals","duplicable":false,"fields":[{"id":null,"name":"TotalsClasses","required":null,"description":"$default(w-full table-auto) Default: w-full table-auto","condition":"=Classes","duplicable":false,"fields":[],"order":29,"restricted":false,"rootField":false,"defaultValue":"w-full table-auto"},{"id":null,"name":"InputVarTotals","required":null,"description":null,"condition":"=InputVar","duplicable":true,"fields":[],"order":30,"restricted":false,"rootField":false,"defaultValue":null}],"order":28,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Line","required":null,"description":null,"condition":"=Totals","duplicable":true,"fields":[{"id":null,"name":"LineCustomize","required":null,"description":"$[LineClasses,TitleClasses] $multiple $help[Select the defaults to change] $style[hide] ","condition":null,"duplicable":false,"fields":[{"id":null,"name":"LineClasses","required":null,"description":"$default(text-right) Default: text-right","condition":"=LineClasses","duplicable":false,"fields":[],"order":33,"restricted":false,"rootField":false,"defaultValue":"text-right"},{"id":null,"name":"TitleClasses","required":null,"description":"$default(text-left p-2) Default: text-left p-2","condition":"=TitleClasses","duplicable":false,"fields":[],"order":34,"restricted":false,"rootField":false,"defaultValue":"text-left p-2"}],"order":32,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Value","required":null,"description":"$[*Label,definitionCount,domainCount,fieldSum,fieldAverage,fieldWeightedAverage,dmEquipmentCount,link] ","condition":null,"duplicable":true,"fields":[{"id":null,"name":"ValueCustomize","required":null,"description":"$[Classes,View,Attention,AttentionClasses,Unit] $multiple $help[Select the defaults to change] $style[hide]","condition":null,"duplicable":false,"fields":[{"id":null,"name":"ValueClasses","required":null,"description":"$default(w-0 p-2) Default: w-0 p-2","condition":"=Classes","duplicable":false,"fields":[],"order":37,"restricted":false,"rootField":false,"defaultValue":"w-0 p-2"},{"id":null,"name":"View","required":null,"description":"Default: none","condition":"=View","duplicable":false,"fields":[],"order":38,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"ValueAttention","required":null,"description":"Crisis:<=-5, ActionableBad:-4 .. -1, No action Required:0, ActionableGood:1..4,Extraordinary:>=5","condition":"=Attention","duplicable":false,"fields":[],"order":39,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"ValueAttentionClasses","required":null,"description":"$default(fa-solid fa-circle pr-1 animate-pulse text-lg align-middle) Default: fa-solid fa-circle pr-1 animate-pulse text-lg align-middle","condition":"=AttentionClasses","duplicable":false,"fields":[],"order":40,"restricted":false,"rootField":false,"defaultValue":"fa-solid fa-circle pr-1 animate-pulse text-lg align-middle"},{"id":null,"name":"Unit","required":null,"description":null,"condition":"=Unit","duplicable":false,"fields":[],"order":41,"restricted":false,"rootField":false,"defaultValue":null}],"order":36,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Arg","required":null,"description":null,"condition":null,"duplicable":true,"fields":[],"order":42,"restricted":false,"rootField":false,"defaultValue":null}],"order":35,"restricted":false,"rootField":false,"defaultValue":"Label"}],"order":31,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"KibanaCustomize","required":null,"description":"$[Classes,InputVar,OutputVar,Query] $multiple $help[Select the defaults to change] $style[hide] ","condition":"=Kibana","duplicable":false,"fields":[{"id":null,"name":"KibanaClasses","required":null,"description":null,"condition":"=Classes","duplicable":false,"fields":[],"order":44,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"InputVarKibana","required":null,"description":null,"condition":"=InputVar","duplicable":true,"fields":[],"order":45,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"OutputVarKibana","required":null,"description":null,"condition":"=OutputVar","duplicable":false,"fields":[],"order":46,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"InputQueryKibana","required":null,"description":"Atenção: espaços no Kibana são OR e não AND","condition":"=Query","duplicable":false,"fields":[],"order":47,"restricted":false,"rootField":false,"defaultValue":null}],"order":43,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"ShareLink","required":null,"description":null,"condition":"=Kibana","duplicable":false,"fields":[],"order":48,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"FilterCustomize","required":null,"description":"$[Classes,Type,Placeholder] $multiple $help[Select the defaults to change] $style[hide] ","condition":"=Filter","duplicable":false,"fields":[{"id":null,"name":"FilterClasses","required":null,"description":null,"condition":"=Classes","duplicable":false,"fields":[],"order":50,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Type","required":null,"description":"$[Text,List,Date]","condition":"=Type","duplicable":false,"fields":[{"id":null,"name":"Alternatives","required":null,"description":null,"condition":"=List","duplicable":false,"fields":[],"order":52,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"DateFilterType","required":null,"description":null,"condition":"=Date","duplicable":false,"fields":[],"order":53,"restricted":false,"rootField":false,"defaultValue":null}],"order":51,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Placeholder","required":null,"description":"$default(Pesquisar...) default: Pesquisar...","condition":"=Placeholder","duplicable":false,"fields":[],"order":54,"restricted":false,"rootField":false,"defaultValue":"Pesquisar..."}],"order":49,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"OutputVarFilter","required":null,"description":null,"condition":"=Filter","duplicable":false,"fields":[],"order":55,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Query","required":null,"description":null,"condition":"=MD List","duplicable":false,"fields":[],"order":56,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"CalendarCustomize","required":null,"description":"$[Classes,InputVar,OutputVar,Settings] $multiple $help[Select the defaults to change] $style[hide] ","condition":"=Calendar","duplicable":false,"fields":[{"id":null,"name":"CalendarClasses","required":null,"description":null,"condition":"=Classes","duplicable":false,"fields":[],"order":58,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"InputVarCalendar","required":null,"description":null,"condition":"=InputVar","duplicable":true,"fields":[],"order":59,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"MaxVisibleDayEvents","required":null,"description":"$number(0) Specify the maximum number of events that will be visible before enabling the +more link. Set to -1 to list all events. Defaults to 3.","condition":"=Settings","duplicable":false,"fields":[],"order":60,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"AllowCreateInstances","required":null,"description":"$[TRUE,FALSE] $default(FALSE)","condition":"=Settings","duplicable":false,"fields":[],"order":61,"restricted":false,"rootField":false,"defaultValue":"FALSE"},{"id":null,"name":"CreateDefinition","required":null,"description":"Name of the Definition of Instances to Create","condition":"=Settings","duplicable":false,"fields":[],"order":62,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"OutputVarCalendar","required":null,"description":null,"condition":"=OutputVar","duplicable":false,"fields":[],"order":63,"restricted":false,"rootField":false,"defaultValue":null}],"order":57,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"Events","required":null,"description":"$group","condition":"=Calendar","duplicable":true,"fields":[{"id":null,"name":"Definition","required":"mandatory","description":"$definition","condition":null,"duplicable":false,"fields":[],"order":65,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"DateStartEventField","required":"mandatory","description":"Name of the definition date field that represents the beginning of the event","condition":null,"duplicable":false,"fields":[],"order":66,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"DateEndEventField","required":null,"description":"Name of the definition date field that represents the end of the event","condition":null,"duplicable":false,"fields":[],"order":67,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"DescriptionEventField","required":"mandatory","description":"Name of the definition field to use as the event description","condition":null,"duplicable":false,"fields":[],"order":68,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"StateEventField","required":null,"description":"Name of the field to calculate the color for the event. If not defined it will use always the same color for all events","condition":null,"duplicable":false,"fields":[],"order":69,"restricted":false,"rootField":false,"defaultValue":null},{"id":null,"name":"EventsQuery","required":null,"description":"Define a query to restrict the results that will appear in the calendar. Defaults to all records in the definition","condition":null,"duplicable":false,"fields":[],"order":70,"restricted":false,"rootField":false,"defaultValue":null}],"order":64,"restricted":false,"rootField":false,"defaultValue":null}],"order":14,"restricted":false,"rootField":false,"defaultValue":null}],"order":10,"restricted":false,"rootField":true,"defaultValue":null}],"version":null}

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

@@ -21,7 +21,7 @@ if (auditFields.size() > 0
 	&& msg.action =~ "add|update" ) {
 
 	def updates = getAuditFieldsUpdates(auditFields,msg.instance.fields)
-    def result = actionPacks.recordm.update(msg.type, "recordmInstanceId:" + msg.instance.id, updates);
+	def result = actionPacks.recordm.update(msg.type, "recordmInstanceId:" + msg.instance.id, updates);
 	if(updates) log.info("[\$audit] UPDATE '${msg.type}' id:${msg.instance.id}, updates: ${updates}, result:${result.getStatus()} | ${result.getStatusInfo()} ");
 }
 
@@ -51,7 +51,7 @@ def getAuditFields(definitionName) {
 
 	// 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(), [:], "");
+	def resp = actionPacks.rmRest.get( "recordm/definitions/name/${definitionEncoded}".toString(), [:], "integrationm");
 	JSONObject definition = new JSONObject(resp);
 
 	def fieldsSize = definition.fieldDefinitions.length();
@@ -59,16 +59,18 @@ def getAuditFields(definitionName) {
 	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]
+		def fieldDescription = fieldDefinition.getString("description")
+		if(fieldDescription){
+			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() =~ /[$]audit\.(creator|updater)\.(username|uri|time)/
+		def matcher = field.description =~ /[$]audit\.(creator|updater)\.(username|uri|time)/
 		if(matcher) {
 			def op = matcher[0][1]
 			def arg = matcher[0][2]

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

@@ -122,7 +122,7 @@ def getAllCalculationFields(definitionName) {
 
 	// 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(), [:], "");
+	def resp = actionPacks.rmRest.get( "recordm/definitions/name/${definitionEncoded}".toString(), [:], "integrationm");
 	JSONObject definition = new JSONObject(resp);
 
 	def fieldsSize = definition.fieldDefinitions.length();

package/templates/keywords/styleResults/frontend/css/_styleResults.css

@@ -0,0 +1,86 @@
+/* Font color Classes */
+.DimRed a,
+.DimGreen a,
+.DimBlue a {
+  color:#a7c7d7;
+}
+.DimRed {
+  color:#fbb;
+}
+.DimGreen {
+  color:#9c9;
+}
+.DimBlue {
+  color:rgb(191, 200, 243);
+}
+.DimOrange {
+  color:rgb(255, 222, 187);
+}
+.DimGray {
+  color:#bebebe;
+}
+.Red {
+	color: red
+}
+.Green {
+	color:green;
+}
+.Blue {
+	color:blue
+}
+.Orange {
+	color:orange;
+}
+.Gray {
+  color:gray;
+}
+
+
+/* Background Color Classes */
+.BgRed {
+	background-color: red;
+}
+.BgGreen {
+	background-color: green;
+}
+.BgBlue{
+	background-color: blue;
+}
+.BgOrange{
+	background-color: orange;
+}
+.BgGray {
+  background-color:gray;
+}
+.BgDimRed {
+  background-color:lightpink;
+}
+.BgDimGreen {
+  background-color:#C1FA77;
+}
+.BgDimBlue {
+	background-color:#def4f9;
+}
+.BgDimOrange {
+	background-color:#FFE0D2;
+}
+.BgDimGray {
+	background-color:#bebebe;
+}
+
+
+.BgRed,
+.BgGreen,
+.BgBlue, 
+.BgOrange,
+.BgGray {
+  color: white;
+  text-align: center;
+} 
+.BgDimRed,
+.BgDimGreen,
+.BgDimBlue, 
+.BgDimOrange,
+.BgDimGray {
+	text-align: center;
+}

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

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

package/templates/keywords/styleResults/frontend/js/cob/_styleResults.js

@@ -0,0 +1,34 @@
+cob.custom.customize.push(function (core, utils, ui) {
+    const toES = (name) => name.toLowerCase().replace(/ /g, '_')
+
+    core.customizeColumn("*","*",function(node, esDoc, fieldInfo){
+        // Check $styleResultColumn
+        const matchColumnRegex = /\$styleResultColumn\((.*)\)/
+        let styleColField = matchColumnRegex.exec(fieldInfo.fieldDefDescription)
+        if(styleColField) {
+            const fieldValue = esDoc[toES(fieldInfo.name)] && esDoc[toES(fieldInfo.name)][0];
+            const relevantMapping = styleColField[1].split(",")
+    
+            for(let mapping of relevantMapping) {
+                let [styleValue, styleClass] = mapping.split(":")
+                if(styleValue.trim() == fieldValue) node.classList.add(styleClass.trim())
+            }
+        }
+    }),
+    
+    core.customizeAllColumns("*",function(node, esDoc, fieldInfo){
+        // Finds $styleResultRows -> ATTENTION: only first occurrence, subsequent $styleResultRows will be ignore
+        // TODO: remove dependency of $styleResultsRow HAVING TO HAVE ALSO $instanceDescription
+        const matchRowsRegex = /\$styleResultRows\((.*)\)/
+        let firstStyleResultsField = esDoc._definitionInfo.instanceDescription.find( field => matchRowsRegex.exec(field.description))
+        if(firstStyleResultsField) {
+            const fieldValue = esDoc[toES(firstStyleResultsField.name)] && esDoc[toES(firstStyleResultsField.name)][0];
+            const relevantMapping = matchRowsRegex.exec(firstStyleResultsField.description)[1].split(",")
+    
+            for(let mapping of relevantMapping) {
+                let [styleValue, styleClass] = mapping.split(":")
+                if(styleValue.trim() == fieldValue) node.classList.add(styleClass.trim())
+            }
+        }
+    })
+})

package/templates/keywords/styleResults/frontend/js/customizations2.__MERGE__.js

@@ -0,0 +1 @@
+import("./cob/_styleResults.js");