Merge pull request #979 from cloudinary/feature/hide-connection-string

pereirinha · web-flow · commit b5dc3766378d · 2024-09-17T18:26:10.000+01:00
Wizard improvements
diff --git a/css/cloudinary.css b/css/cloudinary.css
diff --git a/css/gallery-block-rtl.css b/css/gallery-block-rtl.css
diff --git a/js/block-editor.asset.php b/js/block-editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => 'a517612ccdaff27b97a1');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => '6d7c14c34904052ff5b5');
diff --git a/js/cloudinary.js b/js/cloudinary.js
diff --git a/js/deactivate.asset.php b/js/deactivate.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '999d433fe37be4ac75a6');
+<?php return array('dependencies' => array(), 'version' => 'f405be0196ee03c352da');
diff --git a/js/gallery-block.asset.php b/js/gallery-block.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '40acc964c4846bfc3a1c');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '0fe7242cf29e22d47b4b');
diff --git a/js/gallery-init.asset.php b/js/gallery-init.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'ccd0bf28dc6e7e0372eb');
+<?php return array('dependencies' => array(), 'version' => '0196bb57bf9b757da5e1');
diff --git a/js/gallery.asset.php b/js/gallery.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-block-editor', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '92e750daff597bc257ba');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-block-editor', 'wp-components', 'wp-components/build-style/style.css', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => 'e43d4fd3e99784efb0ae');
diff --git a/js/inline-loader.asset.php b/js/inline-loader.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'a638105d39fc8265e2f3');
+<?php return array('dependencies' => array(), 'version' => '980f7ffe080efd9cda16');
diff --git a/js/lazy-load.asset.php b/js/lazy-load.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'b96bfd96de232250aa92');
+<?php return array('dependencies' => array(), 'version' => '5f8a7db86fbec1eede6b');
diff --git a/js/media-modal.asset.php b/js/media-modal.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'b44f2e54e7f389c16f67');
+<?php return array('dependencies' => array(), 'version' => 'ce85f4351f448371cc26');
diff --git a/js/terms-order.asset.php b/js/terms-order.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'e1bf5df8efbf2d4112f7');
+<?php return array('dependencies' => array(), 'version' => 'cf1ff7190192713c8dae');
diff --git a/js/video-init.asset.php b/js/video-init.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '44e1b69b81ff3dbdc83c');
+<?php return array('dependencies' => array(), 'version' => '01eb0d63ab6dd18040af');
diff --git a/php/ui/component/class-on-off.php b/php/ui/component/class-on-off.php
@@ -96,6 +96,17 @@ protected function input( $struct ) {
 			$struct['attributes']['type'] = 'hidden';
 		}
 
+		if (
+			true === $this->setting->get_param( 'disabled', false )
+			|| $this->is_readonly()
+			|| (
+				true === $this->setting->get_param( 'main_required', false )
+				&& empty( $this->setting->get_param( 'main', array() ) )
+			)
+		) {
+			$struct['attributes']['disabled'] = 'disabled';
+		}
+
 		return $struct;
 	}
 
diff --git a/src/css/components/ui/_ui-components.scss b/src/css/components/ui/_ui-components.scss
@@ -95,6 +95,10 @@
 		.button.wp-color-result {
 			border-color: #d0d0d0;
 		}
+
+		.button.hidden {
+			display: none;
+		}
 	}
 
 	&-error {
diff --git a/src/css/components/ui/controls/_on-off.scss b/src/css/components/ui/controls/_on-off.scss
@@ -68,6 +68,7 @@
 
 			input:disabled + & {
 				opacity: 0.4;
+				pointer-events: none;
 			}
 
 			input:checked + & {
diff --git a/src/css/components/ui/wizard/_connect.scss b/src/css/components/ui/wizard/_connect.scss
@@ -25,6 +25,7 @@
 		padding: 5px 11px;
 		border-radius: 14px;
 		font-weight: bold;
+		margin-inline-start: 1em;
 
 		&.active {
 			display: inline-flex;
diff --git a/src/js/components/wizard.js b/src/js/components/wizard.js
@@ -55,6 +55,13 @@ const Wizard = {
 		const connectionInput = document.getElementById(
 			'connect.cloudinary_url'
 		);
+		const updateConnection = document.getElementById( 'update-connection' );
+		const didSave = false;
+
+		updateConnection.addEventListener( 'click', () => {
+			connectionInput.parentNode.classList.remove( 'hidden' );
+			updateConnection.classList.add( 'hidden' );
+		} );
 
 		[ ...navs ].forEach( ( button ) => {
 			button.addEventListener( 'click', () => {
@@ -94,8 +101,10 @@ const Wizard = {
 				}, 500 );
 			}
 		} );
-		if ( this.config.cldString.length ) {
-			connectionInput.value = this.config.cldString;
+
+		if ( this.config.cldString ) {
+			connectionInput.parentNode.classList.add( 'hidden' );
+			updateConnection.classList.remove( 'hidden' );
 		}
 
 		this.getTab( this.config.tab );
@@ -155,7 +164,11 @@ const Wizard = {
 		return this.tabs[ `tab-icon-${ this.config.tab }` ];
 	},
 	getTab( tab ) {
-		if ( 4 === tab && window.localStorage.getItem( this.storageKey ) ) {
+		if (
+			4 === tab &&
+			window.localStorage.getItem( this.storageKey ) &&
+			! this.didSave
+		) {
 			// Place a save and wait, before moving.
 			this.saveConfig();
 			return;
@@ -179,7 +192,7 @@ const Wizard = {
 				break;
 			case 2:
 				this.show( this.back );
-				if ( ! this.config.cldString.length ) {
+				if ( ! this.config.cldString ) {
 					this.lockNext();
 					setTimeout( () => {
 						document
@@ -191,22 +204,21 @@ const Wizard = {
 				}
 				break;
 			case 3:
-				if ( ! this.config.cldString.length ) {
+				if ( ! this.config.cldString ) {
 					document.location.hash = '1';
 					return;
 				}
 				this.show( this.lock );
 				this.show( this.back );
 				break;
 			case 4:
-				if ( ! this.config.cldString.length ) {
+				if ( ! this.config.cldString ) {
 					document.location.hash = '1';
 					return;
 				}
 				this.hide( this.tabBar );
 				this.hide( this.next );
 				this.hide( this.back );
-				this.saveConfig();
 				break;
 		}
 		this.setConfig( 'tab', tab );
@@ -284,16 +296,22 @@ const Wizard = {
 	saveConfig() {
 		this.lockNext();
 		this.next.innerText = __( 'Setting up Cloudinary', 'cloudinary' );
+		this.didSave = true;
+
 		apiFetch( {
 			path: cldData.wizard.saveURL,
 			data: this.config,
 			method: 'POST',
-		} ).then( ( result ) => {
-			this.next.innerText = __( 'Next', 'cloudinary' );
-			this.unlockNext();
-			this.getTab( 4 );
-			window.localStorage.removeItem( this.storageKey );
-		} );
+		} )
+			.then( ( result ) => {
+				this.next.innerText = __( 'Next', 'cloudinary' );
+				this.unlockNext();
+				this.getTab( 4 );
+				window.localStorage.removeItem( this.storageKey );
+			} )
+			.fail( ( error ) => {
+				this.didSave = false;
+			} );
 	},
 };
 
diff --git a/ui-definitions/components/wizard.php b/ui-definitions/components/wizard.php
@@ -31,11 +31,10 @@
 	'saveNonce' => wp_create_nonce( 'wp_rest' ),
 	'config'    => array(
 		'tab'          => $current_tab,
-		'cldString'    => $cloudinary_url,
+		'cldString'    => ! empty( $cloudinary_url ),
 		'mediaLibrary' => $autosync,
 		'nonMedia'     => $nonmedia,
 		'advanced'     => $advanced,
-
 	),
 );
 
@@ -142,6 +141,7 @@
 						</div>
 						<input type="text" class="connection-string cld-ui-input regular-text" name="connect[cloudinary_url]" id="connect.cloudinary_url" value="" placeholder="cloudinary://API_KEY:API_SECRET@CLOUD_NAME">
 					</div>
+					<button id="update-connection" class="button button-primary hidden"><?php esc_html_e( 'Update the connection string', 'cloudinary' ); ?></button>
 					<span id="connection-success" class="cld-wizard-connect-status success">
 						<span class="dashicons dashicons-yes-alt"></span> <?php esc_html_e( 'Connected!', 'cloudinary' ); ?>
 					</span>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => 'a517612ccdaff27b97a1');`
	`1`	`+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => '6d7c14c34904052ff5b5');`