improve UI UX

trieu · Mar 13, 2024 · c23ede6 · c23ede6
1 parent d2eab01
commit c23ede6
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 14 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -64,6 +64,7 @@
 
 ### Fixed
 
+- [Data Deduplication] improve UI UX in profile list and profile info
 - update and ranking
 - check status of Activation Rule before run a scheduled job
 - fix bugs update profile for non-admin system user 

diff --git a/resources/app-templates/leocdp-admin/common-resources-min/leocdp.profile.js b/resources/app-templates/leocdp-admin/common-resources-min/leocdp.profile.js
diff --git a/resources/app-templates/leocdp-admin/modules/customer/customer-profile-info.html b/resources/app-templates/leocdp-admin/modules/customer/customer-profile-info.html
@@ -1213,11 +1213,15 @@ <h4 class="highlight_text" > <i class="fa fa-list-ol" aria-hidden="true"></i> To
              // Deduplicate must worok with active profile only
              var btnDeduplicate = $('#btn_profile_deduplicate');
              if(profileData.status === 1){
-            	 btnDeduplicate.click(deduplicateCurrentProfile);
+            	btnDeduplicate.click(function(){ 
+            		deduplicateCurrentProfileDialog(); 
+            	});
              }
              else {
             	 btnDeduplicate.attr('disabled','disabled');
              }
          });
     }   
+
+
 </script>
diff --git a/resources/app-templates/leocdp-admin/modules/customer/customer-profile-list.html b/resources/app-templates/leocdp-admin/modules/customer/customer-profile-list.html
@@ -307,14 +307,14 @@ <h5 style="font-weight: bold;">Profile Type</h5>
     	});
 	}
 
-	var okMergeDuplicateProfile = function(){
-		$('#mergeDuplicateProfileDialog').modal('hide');	
+	var okDeduplicateAllProfiles = function(){
+		$('#deduplicateAllProfilesDialog').modal('hide');	
 		LeoAdminApiUtil.callPostAdminApi('/cdp/profiles/merge-duplicates', {'mergeStrategy' : 'automation'}, function (json) {
             if (json.httpCode === 0 && json.errorMessage === '') {
     			if(json.data){
     				iziToast.info({
-    		    	    title: 'Merge Duplicate Profile',
-    		    	    message: 'LEO CDP is processing all profiles in the database. It takes several minutes for this job'
+    		    	    title: 'Profile Data Deduplication',
+    		    	    message: 'CDP is processing for profile deduplication. It takes several minutes to do this job'
     		    	});
     			}
 
@@ -325,7 +325,7 @@ <h5 style="font-weight: bold;">Profile Type</h5>
 	}
 
 	var showMergeDuplicateProfileDialog = function() {
-		$('#mergeDuplicateProfileDialog').modal({ backdrop: 'static', keyboard: false, focus: true });
+		$('#deduplicateAllProfilesDialog').modal({ backdrop: 'static', keyboard: false, focus: true });
 	}
 
 	var refreshAllProfiles = function(){

diff --git a/resources/app-templates/leocdp-admin/templates/tpl-customer-profile-info.html b/resources/app-templates/leocdp-admin/templates/tpl-customer-profile-info.html
@@ -527,24 +527,47 @@ <h4 class="modal-title"> Creat New Observed Event </h4>
     </div>
 </div>
 
-<!-- Merge Duplicate Profile -->
-<div class="modal fade" id="mergeDuplicateProfileDialog" role="dialog">
+<!-- Merge Duplicate for all Profiles -->
+<div class="modal fade" id="deduplicateAllProfilesDialog" role="dialog">
     <div class="modal-dialog">
         <!-- Modal content-->
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h3 class="modal-title"> <i class="fa fa-compress" aria-hidden="true"></i> Merge Duplicate Profile </h3>
+                <h3 class="modal-title"> <i class="fa fa-compress" aria-hidden="true"></i> Deduplicate All Profiles </h3>
             </div>
 			<div class="modal-body">
                 <div class="alert alert-info">
-                    <h4> <i class="fa fa-question-circle-o" aria-hidden="true"></i>  Do you want to merge all duplicate profiles in the database ? </h4>
+                    <h4> <i class="fa fa-question-circle-o" aria-hidden="true"></i>  Do you want to do data deduplication ? </h4>
                 </div>
-                <input id="delete_callback" type="hidden" name="delete_callback" value="removeCustomerProfile6RB1XvM8P28pX7U2mCwzDL">
             </div>
             <div class="modal-footer">
             	<button type="button" class="btn btn-primary" data-dismiss="modal"> <i class="fa fa-minus-circle" aria-hidden="true"></i> CANCEL </button>
-                <button type="button" class="btn btn-goto-router" onclick="okMergeDuplicateProfile()"> <i class="fa fa-check" aria-hidden="true"></i> OK </button>
+                <button type="button" class="btn btn-goto-router" onclick="okDeduplicateAllProfiles()"> <i class="fa fa-check" aria-hidden="true"></i> OK </button>
+            </div>
+        </div>
+
+    </div>
+</div>
+
+
+<!-- Merge Duplicate from Current Profile -->
+<div class="modal fade" id="deduplicateCurrentProfileDialog" role="dialog">
+    <div class="modal-dialog">
+        <!-- Modal content-->
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h3 class="modal-title"> <i class="fa fa-compress" aria-hidden="true"></i> Deduplicate Current Profile </h3>
+            </div>
+			<div class="modal-body">
+                <div class="alert alert-info">
+                    <h4> <i class="fa fa-question-circle-o" aria-hidden="true"></i>  Do you want to do data deduplication ? </h4>
+                </div>
+            </div>
+            <div class="modal-footer">
+            	<button type="button" class="btn btn-primary" data-dismiss="modal"> <i class="fa fa-minus-circle" aria-hidden="true"></i> CANCEL </button>
+                <button type="button" class="btn btn-goto-router" onclick="deduplicateCurrentProfile()"> <i class="fa fa-check" aria-hidden="true"></i> OK </button>
             </div>
         </div>