upgrade and improve system

trieu · Sep 24, 2024 · 956291f · 956291f
1 parent 6d727b3
commit 956291f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 12 deletions.
diff --git a/NOTES-FOR-NEW-SETUP.md b/NOTES-FOR-NEW-SETUP.md
@@ -80,8 +80,7 @@ Set Linux configs to scale on high load
 	curl -OL https://download.arangodb.com/arangodb311/DEBIAN/Release.key
 	sudo apt-key add - < Release.key
 	echo 'deb https://download.arangodb.com/arangodb311/DEBIAN/ /' | sudo tee /etc/apt/sources.list.d/arangodb.list
-	sudo apt-get install apt-transport-https
-	sudo apt-get update && sudo apt-get install arangodb3=3.11.9-1
+	sudo apt-get install apt-transport-https; sudo apt-get update && sudo apt-get install arangodb3=3.11.9-1
 
 [ArangoDB on CentOS or Rocky Linux](https://idroot.us/install-arangodb-centos-8/)
 
@@ -106,8 +105,7 @@ Set Linux configs to scale on high load
 		deb https://nginx.org/packages/mainline/ubuntu/ jammy nginx
 		deb-src https://nginx.org/packages/mainline/ubuntu/ jammy nginx
 
-	sudo apt-get remove nginx-common
-	sudo apt-get update ; sudo apt-get install nginx; sudo service nginx start
+	sudo apt-get remove nginx-common; sudo apt-get update ; sudo apt-get install nginx; sudo service nginx start
 
 [Install nginx on Rocky Linux 9](https://www.digitalocean.com/community/tutorials/how-to-install-nginx-on-rocky-linux-9)
 

diff --git a/configs/database-query-template.aql b/configs/database-query-template.aql
@@ -1313,8 +1313,14 @@ AQL_UPDATE_AUTHORIZATION_FOR_PROFILES_BY_JOURNEY =>
 AQL_DELETE_ALL_DEAD_VISITORS =>
 	LET c = LENGTH(
 		FOR p in cdp_profile
-		FILTER (CHAR_LENGTH(p.firstName) == 0 AND CHAR_LENGTH(p.lastName) == 0 AND CHAR_LENGTH(p.primaryEmail) == 0 AND CHAR_LENGTH(p.primaryPhone) == 0 AND CHAR_LENGTH(p.crmRefId) == 0 
-				AND p.type == 0 AND p.totalLeadScore == 0)  OR p.status == -44
+		FILTER (CHAR_LENGTH(p.firstName) == 0 AND
+		        CHAR_LENGTH(p.lastName) == 0 AND
+		        CHAR_LENGTH(p.primaryEmail) == 0 AND
+		        CHAR_LENGTH(p.primaryPhone) == 0 AND
+		        CHAR_LENGTH(p.crmRefId) == 0 AND
+		        p.type == 0 AND
+		        p.totalLeadScore == 0) OR
+		       p.status == -44
 		RETURN p._key
 	)
 	RETURN c 

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/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
diff --git a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.segment.details.js b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.segment.details.js
diff --git a/resources/app-templates/leocdp-admin/main-view.html b/resources/app-templates/leocdp-admin/main-view.html
@@ -217,6 +217,9 @@
 	                $('#userDisplayName').text(dn).attr('title', tt);
 	                window.currentUserProfile = systemUser;
 
+	                // websocket
+	                registerUserToGetNotifications(systemUser);
+
 	                if(role === 6) {
 	                	// hasSuperAdminRole === true
 	                	$("#nav_system_management").show();
@@ -344,6 +347,10 @@
 
 			// show main menu guide
 			initMainMenuGuide();
+
+
 		}
-	};
+	}
+
+
 </script>
diff --git a/resources/app-templates/leocdp-admin/modules/customer/segment-details.html b/resources/app-templates/leocdp-admin/modules/customer/segment-details.html
@@ -113,7 +113,7 @@ <h5 class="page-header" id="page_breadcrumb" > </h5>
 	       	<li>
 				<a href="javascript:" data-target-tab="panel_segment_data_exporting" title="Data Exporting" > <i class="fa fa-upload" aria-hidden="true"></i> Data Exporting </a>
 	       	</li>
-	       	<li>
+	       	<li style="display: none;" >
 				<a href="javascript:" data-target-tab="panel_segment_data_connection" title="Data Connection" > <i class="fa fa-exchange" aria-hidden="true"></i> Data Connection </a>
 	       	</li>
 	       	<li id="segment_data_enrichment" >