diff --git a/deps/query-builder-2.1.1.jar b/deps/query-builder-2.1.1.jar index ac1f1529..382439d7 100644 Binary files a/deps/query-builder-2.1.1.jar and b/deps/query-builder-2.1.1.jar differ diff --git a/leo-data-processing-starter-v_0.9.0.jar b/leo-data-processing-starter-v_0.9.0.jar index 653925c7..0e9c23b0 100644 Binary files a/leo-data-processing-starter-v_0.9.0.jar and b/leo-data-processing-starter-v_0.9.0.jar differ diff --git a/leo-main-starter-v_0.9.0.jar b/leo-main-starter-v_0.9.0.jar index 5abe85c6..277a1e48 100644 Binary files a/leo-main-starter-v_0.9.0.jar and b/leo-main-starter-v_0.9.0.jar differ diff --git a/leo-observer-starter-v_0.9.0.jar b/leo-observer-starter-v_0.9.0.jar index 0d075f9a..104d15d2 100644 Binary files a/leo-observer-starter-v_0.9.0.jar and b/leo-observer-starter-v_0.9.0.jar differ diff --git a/leo-scheduler-starter-v_0.9.0.jar b/leo-scheduler-starter-v_0.9.0.jar index d6c87751..d93dfe50 100644 Binary files a/leo-scheduler-starter-v_0.9.0.jar and b/leo-scheduler-starter-v_0.9.0.jar differ diff --git a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.core-admin.js b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.core-admin.js index 93980fb9..c3ce8511 100644 --- a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.core-admin.js +++ b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.core-admin.js @@ -18,7 +18,7 @@ const getOperatorsForStringField=function(){return"equal not_equal is_null is_no function roundNumber(a,b){return Number(Math.round(a+"e"+b)+"e-"+b)}function getCheckedBoxIcon(a){var b='\x3ci style\x3d"font-size:1.5em;color:#3300ff" class\x3d"fa fa-check-square-o" aria-hidden\x3d"true"\x3e\x3c/i\x3e';a||(b='\x3ci style\x3d"font-size:1.5em;color:#3300ff" class\x3d"fa fa-square-o" aria-hidden\x3d"true"\x3e\x3c/i\x3e');return b} function getTableRowCheckedBox(a,b,d,c){b=b.substring(1)+"_"+d;return'\x3cdiv class\x3d"datatable_text text-center datatable_row_checkbox" onclick\x3d"datatableRowCheckboxHandler(this)" data-row-checkbox-id\x3d"'+b+'" \x3e\x3ci id\x3d"row_checkbox_'+(b+'" data-item-id\x3d"'+d+'" data-handler-name\x3d"'+a+'" class\x3d"'+(c?"fa fa-check-square-o":"fa fa-square-o")+'" aria-hidden\x3d"true" data-selected\x3d"'+(c?"1":"0")+'" \x3e\x3c/i\x3e\x3c/div\x3e')} function datatableRowCheckboxHandler(a){a=$(a).data("row-checkbox-id");a=$("#row_checkbox_"+a);var b=a.data("selected"),d=a.data("handler-name"),c=a.data("item-id");d=window[d];"0"==b?(a.attr("class","fa fa-check-square-o").data("selected","1"),"function"===typeof d&&d(!0,c)):(a.attr("class","fa fa-square-o").data("selected","0"),"function"===typeof d&&d(!1,c))} -function checkToAddUrlValueToDOM(a){return 0===a.trim().indexOf("http")?$("\x3ca/\x3e").attr("href",a).attr("target","_blank").html(a)[0].outerHTML:a}function buildSystemUserInfoLink(a){var b="#calljs-leoCdpRouter('User_Login_Report','"+a+"')";return $("\x3ca/\x3e").attr("href",b).html(a)[0].outerHTML}const mapClipboardJS={}; +function checkToAddUrlValueToDOM(a){return"string"===typeof a&&0===a.trim().indexOf("http")?$("\x3ca/\x3e").attr("href",a).attr("target","_blank").html(a)[0].outerHTML:a}function buildSystemUserInfoLink(a){var b="#calljs-leoCdpRouter('User_Login_Report','"+a+"')";return $("\x3ca/\x3e").attr("href",b).html(a)[0].outerHTML}const mapClipboardJS={}; function addHandlerCopyCodeButton(a,b){return null==mapClipboardJS[b]?(mapClipboardJS[b]=!0,new ClipboardJS(b,{text:function(d){notifySuccessMessage("Successfully copied to clipboard!");return getCodeMirrorNative(a).getDoc().getValue()}}),!0):!1} function getCodeMirrorNative(a){"string"===typeof a&&(a=document.querySelector(a));if(null===a)throw Error("Element does not reference a CodeMirror instance.");return-1b;b++)a=a.replace(RegExp("àáãảạăằắẳẵặâầấẩẫậèéẻẽẹêềếểễệđùúủũụưừứửữựòóỏõọôồốổỗộơờớởỡợìíỉĩịäëïîöüûñçýỳỹỵỷ"[b],"gi"),"aaaaaaaaaaaaaaaaaeeeeeeeeeeeduuuuuuuuuuuoooooooooooooooooiiiiiaeiiouuncyyyyy"[b]);return a=a.toLowerCase().trim().replace(/[^a-z0-9\-]/g,"-").replace(/-+/g,"-")}const CheckBoxIcon=function(a){jsGrid.Field.call(this,a)}; diff --git a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.segment.builder.js b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.segment.builder.js index a4af13b7..daba6c9d 100644 --- a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.segment.builder.js +++ b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.segment.builder.js @@ -1,19 +1,19 @@ -'use strict';const getOperators=function(){var a=_.union(getOperatorsForStringField(),getOperatorsForNumberField());a.push({type:"after",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"before",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"compare_month_and_day",nb_inputs:1,multiple:!0,apply_to:["date"]});a.push({type:"compare_month_and_day_between",nb_inputs:2,multiple:!0,apply_to:["date"]});a.push({type:"compare_month_and_day_with_now",nb_inputs:0,multiple:!0,apply_to:["date"]}); -a.push({type:"compare_year_month_day_with_now",nb_inputs:0,multiple:!0,apply_to:["date"]});a.push({type:"is_today",nb_inputs:0,multiple:!0,apply_to:["date"]});a.push({type:"is_valid_date",nb_inputs:0,multiple:!0,apply_to:["date"]});a.push({type:"is_not_valid_date",nb_inputs:0,multiple:!0,apply_to:["date"]});a.push({type:"contains_any",optgroup:"List Operator",nb_inputs:1,multiple:!0,apply_to:["string","number","boolean"]});a.push({type:"not_contains_any",optgroup:"List Operator",nb_inputs:1,multiple:!0, -apply_to:["string","number","boolean"]});a.push({type:"has_key",optgroup:"Key Operator",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"not_has_key",optgroup:"Key Operator",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"sub_field_contains",optgroup:"Sub Field",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"sub_field_equals",optgroup:"Sub Field",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"data_equals",optgroup:"Data Filter",nb_inputs:1,multiple:!0, -apply_to:["string","number","boolean"]});a.push({type:"data_less_than",optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string","number"]});a.push({type:"data_equals_or_less_than",optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string","number"]});a.push({type:"data_greater_than",optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string","number"]});a.push({type:"data_equals_or_greater_than",optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string","number"]});a.push({type:"data_contains", -optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"data_from",optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string"]});a.push({type:"in_journey_map",optgroup:"Data Filter",nb_inputs:1,multiple:!0,apply_to:["string"]});return a},getTouchpointHubHosts=function(a){var e={};for(const [f,b]of Object.entries(a))if(0===f.indexOf("http"))try{var g=(new URL(f)).host.replace("www.","");e[g]=b}catch(h){console.error(f),console.error(h)}return e},afterUpdateQueryBuilder= -function(a,e){console.log("afterUpdateQueryBuilder",a,e);a=e.operator.type;a="compare_month_and_day_with_now"===a||"compare_year_month_day_with_now"===a;if("datepicker"===e.filter.plugin){e=e.$el.find(".rule-value-container input");var g=moment.utc().local().format("YYYY-MM-DD"),f=e.val();a&&""===f&&e.val(g);console.log("afterUpdateQueryBuilder "+e.val());e.datepicker("update")}},buildSegmentDateFilter=function(a,e,g){return{id:a,label:e,type:"date",placeholder:"yyyy-mm-dd",validation:{format:"yyyy-mm-dd", -allow_empty_value:!1},valueSetter:function(f,b){console.log("buildSegmentDateFilter.valueSetter ",b);b="string"===typeof b?[b]:b;b="object"===typeof b?b:[];0=d&&(c="LGBT");return'\x3cdiv class\x3d"datatable_text" style\x3d"font-size:10.8px;" \x3e'+c+"\x3c/div\x3e"},targets:2,orderable:!1},{render:function(d,c,k){return'\x3cdiv class\x3d"datatable_text" style\x3d"font-size:11px;" \x3e\x3ca title\x3d"Profile Email" href\x3d"#calljs-leoCdpRouter(\'Customer_Profile_Info\',\''+ (k.id+"')\" \x3e"+textTruncate("string"===typeof d?d:"-",24)+"\x3c/a\x3e\x3c/div\x3e")},targets:3,orderable:!1},{render:function(d,c,k){return'\x3cdiv class\x3d"datatable_text" style\x3d"font-size:11px;" \x3e\x3ca title\x3d"Profile Phone" href\x3d"#calljs-leoCdpRouter(\'Customer_Profile_Info\',\''+(k.id+"')\" \x3e"+textTruncate("string"===typeof d?d:"-",20)+"\x3c/a\x3e\x3c/div\x3e")},targets:4,orderable:!1},{render:function(d,c,k){d=k.lastTouchpoint?k.lastTouchpoint.name:"";return'\x3cdiv class\x3d"datatable_text" style\x3d"font-size:11px;" title\x3d"'+ d+'" \x3e'+textTruncate(d,45)+"\x3c/div\x3e"},targets:5,orderable:!1},{render:function(d,c,k){return'\x3cdiv class\x3d"datatable_text text-center"\x3e'+d+"\x3c/div\x3e"},targets:6,orderable:!1},{render:function(d,c,k){return'\x3cdiv class\x3d"datatable_text text-center"\x3e'+d+"\x3c/div\x3e"},targets:7,orderable:!1},{render:function(d,c,k){return'\x3cdiv class\x3d"datatable_text text-center"\x3e'+d+"\x3c/div\x3e"},targets:8,orderable:!1},{render:function(d,c,k){return d?'\x3cdiv class\x3d"small"\x3e'+ -moment.utc(d).local().format("YYYY-MM-DD HH:mm:ss")+"\x3c/div\x3e":""},targets:9,orderable:!1}],b=getUserSession();if("string"===typeof b){var h=a.DataTable({lengthMenu:[[20,30,50],[20,30,50]],processing:!0,serverSide:!0,searching:!1,serverMethod:"POST",ajax:{url:e,contentType:"application/json",beforeSend:function(d){$("#btn-run-querybuilder, #btn-reset-querybuilder").attr("disabled","disabled");d.setRequestHeader("leouss",b)},data:loadProfileViewForSegmentParams},columnDefs:f,columns:[{data:"id"}, -{data:"type"},{data:"gender"},{data:"primaryEmail"},{data:"primaryPhone"},{data:"lastTouchpoint"},{data:"dataQualityScore"},{data:"totalLeadScore"},{data:"totalCLV"},{data:"updatedAt"}]});h.on("draw",function(){$("#btn-run-querybuilder, #btn-reset-querybuilder").removeAttr("disabled");var d=h.rows().count();console.log("loadProfileViewForSegment is displayed in table, count: "+d);g&&0