fix cdn.jsdelivr SSL , improve UI UX , upgrade java

trieu · May 2, 2024 · 516040f · 516040f
1 parent 347accc
commit 516040f
Show file tree

Hide file tree

Showing 74 changed files with 523 additions and 135 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -31,10 +31,11 @@
 * How to setup LEO CDP
 * How to monitor system
 
-## [0.9.0] - 2024-04-10
+## [0.9.0] - 2024-05-02
 
 ### Added
 
+- [Campaign UI] show automated flow using mermaid.js
 - [Admin UI] show menu user guide
 - [Campaign] UI to listing campaigns
 - [Profile] show duplicate profile to merge data manually
@@ -66,6 +67,7 @@
 
 ### Fixed
 
+- [User Authorization]
 - [Data Deduplication] improve UI UX in profile list and profile info
 - update and ranking
 - check status of Activation Rule before run a scheduled job

diff --git a/configs/database-query-template.aql b/configs/database-query-template.aql
@@ -454,13 +454,6 @@ AQL_GET_TOUCHPOINTS_BY_FILTER =>
 	RETURN p
 ;
 
-AQL_GET_TOP_1000_TOUCHPOINTS_BY_PROFILE =>
-	FOR p in cdp_profile 
-	FILTER p._key == @profileId
-	    FOR t IN cdp_touchpoint
-	        FILTER t._key IN p.top1000Touchpoints
-	        RETURN t
-;
 
 AQL_UPDATE_CONTEXT_SESSION_AFTER_MERGE =>
 	FOR d IN cdp_contextsession
@@ -505,7 +498,6 @@ AQL_GET_TOUCHPOINT_REPORT_FOR_PROFILE =>
 	RETURN {"touchpoint":t, "eventCount": eventCount}
 ;
 
-
 AQL_GET_TOUCHPOINT_FLOW_STATISTICS =>
 	LET stats = 
 	(

diff --git a/deps/jackson-annotations-2.14.2.jar b/deps/jackson-annotations-2.14.2.jar
diff --git a/deps/jackson-annotations-2.16.0.jar b/deps/jackson-annotations-2.16.0.jar
diff --git a/deps/jackson-core-2.14.2.jar b/deps/jackson-core-2.14.2.jar
diff --git a/deps/jackson-core-2.16.0.jar b/deps/jackson-core-2.16.0.jar
diff --git a/deps/jackson-databind-2.14.2.jar b/deps/jackson-databind-2.14.2.jar
diff --git a/deps/jackson-databind-2.16.0.jar b/deps/jackson-databind-2.16.0.jar
diff --git a/deps/jackson-dataformat-cbor-2.14.2.jar b/deps/jackson-dataformat-cbor-2.14.2.jar
diff --git a/deps/jackson-dataformat-cbor-2.16.0.jar b/deps/jackson-dataformat-cbor-2.16.0.jar
diff --git a/deps/jackson-dataformat-yaml-2.14.2.jar b/deps/jackson-dataformat-yaml-2.14.2.jar
diff --git a/deps/jackson-dataformat-yaml-2.16.0.jar b/deps/jackson-dataformat-yaml-2.16.0.jar
diff --git a/deps/jackson-datatype-jsr310-2.14.2.jar → deps/jackson-datatype-jsr310-2.16.0.jar b/deps/jackson-datatype-jsr310-2.14.2.jar → deps/jackson-datatype-jsr310-2.16.0.jar
diff --git a/deps/jackson-module-scala_2.13-2.14.2.jar → deps/jackson-module-scala_2.13-2.16.0.jar b/deps/jackson-module-scala_2.13-2.14.2.jar → deps/jackson-module-scala_2.13-2.16.0.jar
diff --git a/deps/kafka-clients-3.3.2.jar b/deps/kafka-clients-3.3.2.jar
diff --git a/deps/kafka-clients-3.7.0.jar b/deps/kafka-clients-3.7.0.jar
diff --git a/deps/kafka-streams-3.3.2.jar b/deps/kafka-streams-3.3.2.jar
diff --git a/deps/kafka-streams-3.7.0.jar b/deps/kafka-streams-3.7.0.jar
diff --git a/deps/kotlin-stdlib-1.6.20.jar b/deps/kotlin-stdlib-1.6.20.jar
diff --git a/deps/kotlin-stdlib-1.9.10.jar b/deps/kotlin-stdlib-1.9.10.jar
diff --git a/deps/kotlin-stdlib-common-1.6.20.jar b/deps/kotlin-stdlib-common-1.6.20.jar
diff --git a/deps/kotlin-stdlib-common-1.9.10.jar b/deps/kotlin-stdlib-common-1.9.10.jar
diff --git a/deps/kotlin-stdlib-jdk7-1.6.10.jar b/deps/kotlin-stdlib-jdk7-1.6.10.jar
diff --git a/deps/kotlin-stdlib-jdk7-1.9.10.jar b/deps/kotlin-stdlib-jdk7-1.9.10.jar
diff --git a/deps/kotlin-stdlib-jdk8-1.6.10.jar b/deps/kotlin-stdlib-jdk8-1.6.10.jar
diff --git a/deps/kotlin-stdlib-jdk8-1.9.10.jar b/deps/kotlin-stdlib-jdk8-1.9.10.jar
diff --git a/deps/okhttp-4.10.0.jar b/deps/okhttp-4.10.0.jar
diff --git a/deps/okhttp-4.12.0.jar b/deps/okhttp-4.12.0.jar
diff --git a/deps/okio-jvm-3.0.0.jar b/deps/okio-jvm-3.0.0.jar
diff --git a/deps/okio-jvm-3.6.0.jar b/deps/okio-jvm-3.6.0.jar
diff --git a/deps/rocksdbjni-7.1.2.jar → deps/rocksdbjni-7.9.2.jar b/deps/rocksdbjni-7.1.2.jar → deps/rocksdbjni-7.9.2.jar
diff --git a/deps/scala-library-2.13.10.jar → deps/scala-library-2.13.12.jar b/deps/scala-library-2.13.10.jar → deps/scala-library-2.13.12.jar
diff --git a/deps/snakeyaml-1.33.jar b/deps/snakeyaml-1.33.jar
diff --git a/deps/snakeyaml-2.2.jar b/deps/snakeyaml-2.2.jar
diff --git a/deps/snappy-java-1.1.10.5.jar b/deps/snappy-java-1.1.10.5.jar
diff --git a/deps/snappy-java-1.1.8.4.jar b/deps/snappy-java-1.1.8.4.jar
diff --git a/deps/zstd-jni-1.5.2-1.jar b/deps/zstd-jni-1.5.2-1.jar
diff --git a/deps/zstd-jni-1.5.5-6.jar b/deps/zstd-jni-1.5.5-6.jar
diff --git a/leo-data-processing-starter-v_0.9.0.jar b/leo-data-processing-starter-v_0.9.0.jar
diff --git a/leo-main-starter-v_0.9.0.jar b/leo-main-starter-v_0.9.0.jar
diff --git a/leo-observer-starter-v_0.9.0.jar b/leo-observer-starter-v_0.9.0.jar
diff --git a/leo-scheduler-starter-v_0.9.0.jar b/leo-scheduler-starter-v_0.9.0.jar
diff --git a/public/html/leo-event-proxy.html b/public/html/leo-event-proxy.html
@@ -150,7 +150,7 @@
     	}
 
   		var cbKey = "20231107";
-	   	var leoObserverJsUrl = "https://cdn.jsdelivr.net/gh/USPA-Technology/[email protected]/js/leo-observer/leo.observer.min.js?cb="+cbKey;
+	   	var leoObserverJsUrl = "https://gcore.jsdelivr.net/gh/USPA-Technology/[email protected]/js/leo-observer/leo.observer.min.js?cb="+cbKey;
 	   	var isDev = ROOT_DOMAIN === "obs.example.com";
   		if(isDev) { 
 			leoObserverJsUrl = "https://obs.example.com/public/js/leo-observer/leo.observer.js?cb="+(new Date().getTime());

diff --git a/public/images/dcdp.png b/public/images/dcdp.png
diff --git a/public/images/ttg-logo.jpg b/public/images/ttg-logo.jpg
diff --git a/public/js/leo-form/leo.form.loader.js b/public/js/leo-form/leo.form.loader.js
@@ -6,7 +6,7 @@
     lang = lang || 'us';
 
     // FIXME
-    var cdnUrl = window.leoFormBaseUrl || 'https://cdn.jsdelivr.net/gh/USPA-Technology/leo-cdp-static-files@latest/js/leo-form/';
+    var cdnUrl = window.leoFormBaseUrl || 'https://gcore.jsdelivr.net/gh/USPA-Technology/leo-cdp-static-files@latest/js/leo-form/';
 
     var formSchemaUrl = cdnUrl + 'leo.form.iframe.' + lang + '.js';
     var jsForm = '<script src="' + formSchemaUrl + '"><\/script>'

diff --git a/public/mediaplayer/mediaplayer.one.min.js b/public/mediaplayer/mediaplayer.one.min.js
diff --git a/resources/app-templates/content-hub/backup-index.html b/resources/app-templates/content-hub/backup-index.html
@@ -55,9 +55,9 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/lscache/1.3.0/lscache.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.11.0/underscore-min.js" ></script>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/jsv.min.js"></script>
+    <script src="https://gcore.jsdelivr.net/npm/[email protected]/lib/jsv.min.js"></script>
 
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/lib/jsonform.min.js"></script>
+    <script src="https://gcore.jsdelivr.net/npm/[email protected]/lib/jsonform.min.js"></script>
 
     <script src="//{{baseStaticUrl}}/public/js/utils/mdl-chips-input.js"></script>
     <script src="//{{baseStaticUrl}}/public/js/utils/handlebars.min.js"></script>
@@ -206,7 +206,7 @@
 		    window.leoObserverId = "4Ql9nCEbJKgHcSRwtJhWdV";
 
 		    window.leoObserverLogDomain = "demotrack.leocdp.net";
-		    window.leoObserverCdnDomain = "cdn.jsdelivr.net/gh/USPA-Technology/leo-cdp-static-files";
+		    window.leoObserverCdnDomain = "gcore.jsdelivr.net/gh/USPA-Technology/leo-cdp-static-files";
             window.leoAdServerDomain = "demo.leocdp.net";
 
 			window.srcTouchpointName = encodeURIComponent(document.title);

diff --git a/resources/app-templates/content-hub/index.html b/resources/app-templates/content-hub/index.html
@@ -20,13 +20,13 @@
 		rel="stylesheet">
 
 	<!-- Icons -->
-	<link href="https://cdn.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet">
-	<link href="https://cdn.jsdelivr.net/npm/[email protected]/css/boxicons.min.css" rel="stylesheet">
+	<link href="https://gcore.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet">
+	<link href="https://gcore.jsdelivr.net/npm/[email protected]/css/boxicons.min.css" rel="stylesheet">
 	<script src="https://unpkg.com/[email protected]/dist/ionicons.js"></script>
 
   <!-- Icons -->
-  <link href="https://cdn.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet">
-  <link href="https://cdn.jsdelivr.net/npm/[email protected]/css/boxicons.min.css" rel="stylesheet">
+  <link href="https://gcore.jsdelivr.net/npm/[email protected]/fonts/remixicon.css" rel="stylesheet">
+  <link href="https://gcore.jsdelivr.net/npm/[email protected]/css/boxicons.min.css" rel="stylesheet">
   <script src="https://unpkg.com/[email protected]/dist/ionicons.js"></script>
 
   <!-- Vendor CSS Files -->
@@ -51,7 +51,7 @@
 		<div class="container d-flex align-items-center">
 			<div class="logo mr-auto">
 				<!-- Uncomment below if you prefer to use an image logo -->
-				<a href="/"><img src="https://cdn.jsdelivr.net/gh/USPA-Technology/leo-cdp-static-files@latest/images/leo-cdp-logo.png" alt="LEO CDP" class="img-fluid"></a>
+				<a href="/"><img src="https://gcore.jsdelivr.net/gh/USPA-Technology/leo-cdp-static-files@latest/images/leo-cdp-logo.png" alt="LEO CDP" class="img-fluid"></a>
 			</div>
 			<nav class="nav-menu d-none d-lg-block">
 				<ul>

diff --git a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.campaign.js b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.campaign.js