merge branch optimze-cuorses

DAnn2012 · Jul 24, 2024 · b1be47c · b1be47c
2 parents 6138897 + 7a09090
commit b1be47c
Show file tree

Hide file tree

Showing 31 changed files with 732 additions and 676 deletions.
diff --git a/assets/src/apps/js/admin/pages/tools/database/upgrade.js b/assets/src/apps/js/admin/pages/tools/database/upgrade.js
@@ -11,14 +11,14 @@ const upgradeDB = () => {
 	const elStatusUpgrade = elToolUpgradeDB.find( '.wrapper-lp-status-upgrade' );
 	const elWrapperUpgradeMessage = elToolUpgradeDB.find( '.wrapper-lp-upgrade-message' );
 	let checkValidBeforeUpgrade = null;
+	const elMessageUpgrading = $( 'input[name=message-when-upgrading]' ).val();
 
 	if ( elWrapperTermsUpgrade.length ) { // Show Terms Upgrade.
 		lpModalOverlay.setContentModal( elWrapperTermsUpgrade.html() );
 
 		const elTermUpdate = lpModalOverlay.elLPOverlay.find( '.terms-upgrade' );
 		const elLPAgreeTerm = elTermUpdate.find( 'input[name=lp-agree-term]' );
 		const elTermMessage = elTermUpdate.find( '.error' );
-		const elMessageUpgrading = $( 'input[name=message-when-upgrading]' ).val();
 
 		checkValidBeforeUpgrade = function() {
 			elTermMessage.hide();
@@ -28,7 +28,6 @@ const upgradeDB = () => {
 				handleAjax( '/lp/v1/database/agree_terms', { agree_terms: 1 }, {} );
 
 				lpModalOverlay.elFooter.find( '.learn-press-notice' ).remove();
-				lpModalOverlay.elFooter.prepend( '<span class="learn-press-notice">' + elMessageUpgrading + '</span>' );
 				lpModalOverlay.setContentModal( elStatusUpgrade.html() );
 
 				return true;
@@ -53,11 +52,17 @@ const upgradeDB = () => {
 	lpModalOverlay.elBtnYes.text( 'Upgrade' );
 	lpModalOverlay.elBtnYes.show();
 	lpModalOverlay.elBtnNo.text( 'Cancel' );
-	lpModalOverlay.callBackYes = function() {
+	lpModalOverlay.callBackYes = function( e ) {
 		if ( ! checkValidBeforeUpgrade() ) {
 			return;
 		}
 
+		const target = e.target;
+		// Show message note when upgrading.
+		if ( target.innerText === 'Upgrade' ) {
+			lpModalOverlay.elFooter.prepend( '<span class="learn-press-notice">' + elMessageUpgrading + '</span>' );
+		}
+
 		isUpgrading = 1;
 
 		lpModalOverlay.elBtnYes.hide();
@@ -141,6 +146,7 @@ const upgradeDB = () => {
 						lpModalOverlay.setContentModal( elWrapperUpgradeMessage.html() );
 					}, 1000 );
 					lpModalOverlay.elFooter.find( '.learn-press-notice' ).remove();
+					lpModalOverlay.elBtnNo.text( 'Close' );
 					lpModalOverlay.elBtnNo.show();
 					lpModalOverlay.elBtnNo.on( 'click', () => {
 						window.location.reload();

diff --git a/assets/src/apps/js/utils/lp-modal-overlay.js b/assets/src/apps/js/utils/lp-modal-overlay.js
@@ -37,7 +37,7 @@ const lpModalOverlay = {
 			e.stopPropagation();
 
 			if ( 'function' === typeof lpModalOverlay.callBackYes ) {
-				lpModalOverlay.callBackYes();
+				lpModalOverlay.callBackYes( e );
 			}
 		} );
 

diff --git a/assets/src/js/admin/admin.js b/assets/src/js/admin/admin.js
@@ -1,4 +1,4 @@
-import { searchUserOnListPost, searchUserOrder, selectAuthorCourse, selectCoInstructor } from './init-tom-select.js';
+import { defaultInitTomSelect, searchUserOnListPost } from './init-tom-select.js';
 
 ( function( $ ) {
 	/**
@@ -212,8 +212,6 @@ import { searchUserOnListPost, searchUserOrder, selectAuthorCourse, selectCoInst
 }( jQuery ) );
 
 document.addEventListener( 'DOMContentLoaded', () => {
-	selectAuthorCourse();
 	searchUserOnListPost();
-	searchUserOrder();
-	selectCoInstructor();
+	defaultInitTomSelect();
 } );