Merge branch 'develop' into uat

Author: Marco Pereirinha

css/cloudinary.css

@@ -146,7 +146,7 @@
     "terser-webpack-plugin": "^4.2.3",
     "tippy.js": "^6.3.1",
     "typescript": "^4.0.5",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^4.2.0",
     "webpackbar": "^5.0.2"
   },

js/cloudinary.js

@@ -60,6 +60,9 @@ public function no_assets() {
 	 * @return array
 	 */
 	public function register_settings( $pages ) {
+
+		$plugin = $this->plugin;
+
 		$pages['dashboard'] = array(
 			'page_title'          => __( 'Cloudinary Dashboard', 'cloudinary' ),
 			'menu_title'          => __( 'Dashboard', 'cloudinary' ),
@@ -154,7 +157,7 @@ public function register_settings( $pages ) {
 											'cld-toggle',
 											'hidden',
 										),
-										'title'       => __( 'View errored assets', 'cloudinary' ),
+										'title'     => __( 'View errored assets', 'cloudinary' ),
 									),
 								),
 								array(
@@ -183,7 +186,7 @@ public function register_settings( $pages ) {
 											'cld-toggle',
 											'hidden',
 										),
-										'title'       => __( 'Retry sync assets with errors', 'cloudinary' ),
+										'title'     => __( 'Retry sync assets with errors', 'cloudinary' ),
 									),
 								),
 							),
@@ -357,7 +360,11 @@ public function register_settings( $pages ) {
 				),
 				array(
 					'type'  => 'panel',
-					'title' => __( 'Plan details', 'cloudinary' ),
+					'title' => function () use ( $plugin ) {
+						$cloud_name = $plugin->components['connect']->get_cloud_name();
+						/* Translators: placeholder is the Cloudinary cloud name. */
+						return sprintf( __( 'Plan details for @%s', 'cloudinary' ), esc_html( $cloud_name ) );
+					},
 					array(
 						'type' => 'plan_details',
 					),

package-lock.json

@@ -53,10 +53,15 @@ protected function set_param_array( $parts, $param, $value ) {
 			return $new;
 		}
 
-		if ( '' === $key ) {
-			$new[] = $value;
+		if ( is_array( $new ) ) {
+			if ( '' === $key ) {
+				$new[] = $value;
+			} else {
+				$new[ $key ] = $value;
+			}
 		} else {
-			$new[ $key ] = $value;
+			// There's likely a problem here, as we're setting an array key on a non-array.
+			$new = array();
 		}
 		// @TODO: I took ksort out, need to check that it doesn't have any problems being.
 

package.json

@@ -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;
 	}
 

php/class-dashboard.php

@@ -57,6 +57,10 @@
 			font-size: $size-panel-description;
 		}
 
+		.cloudname {
+			font-style: italic;
+		}
+
 		.button:not(.wp-color-result) {
 			background-color: $color-cld-blue;
 			color: #fff;
@@ -91,6 +95,10 @@
 		.button.wp-color-result {
 			border-color: #d0d0d0;
 		}
+
+		.button.hidden {
+			display: none;
+		}
 	}
 
 	&-error {

php/traits/trait-params.php

@@ -68,6 +68,7 @@
 
 			input:disabled + & {
 				opacity: 0.4;
+				pointer-events: none;
 			}
 
 			input:checked + & {

php/ui/component/class-on-off.php

@@ -25,6 +25,7 @@
 		padding: 5px 11px;
 		border-radius: 14px;
 		font-weight: bold;
+		margin-inline-start: 1em;
 
 		&.active {
 			display: inline-flex;