Merge pull request #978 from cloudinary/feature/add-cloud-name-to-dashboard

pereirinha · web-flow · commit 8f87b39d4e17 · 2024-09-17T16:01:41.000+01:00
Add cloud name to dashboard
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' => '6d7c14c34904052ff5b5');
+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => 'a517612ccdaff27b97a1');
diff --git a/js/deactivate.asset.php b/js/deactivate.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'f405be0196ee03c352da');
+<?php return array('dependencies' => array(), 'version' => '999d433fe37be4ac75a6');
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' => '0fe7242cf29e22d47b4b');
+<?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');
diff --git a/js/gallery-init.asset.php b/js/gallery-init.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '0196bb57bf9b757da5e1');
+<?php return array('dependencies' => array(), 'version' => 'ccd0bf28dc6e7e0372eb');
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' => 'e43d4fd3e99784efb0ae');
+<?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');
diff --git a/js/inline-loader.asset.php b/js/inline-loader.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '980f7ffe080efd9cda16');
+<?php return array('dependencies' => array(), 'version' => 'a638105d39fc8265e2f3');
diff --git a/js/lazy-load.asset.php b/js/lazy-load.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '5f8a7db86fbec1eede6b');
+<?php return array('dependencies' => array(), 'version' => 'b96bfd96de232250aa92');
diff --git a/js/media-modal.asset.php b/js/media-modal.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'ce85f4351f448371cc26');
+<?php return array('dependencies' => array(), 'version' => 'b44f2e54e7f389c16f67');
diff --git a/js/terms-order.asset.php b/js/terms-order.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'cf1ff7190192713c8dae');
+<?php return array('dependencies' => array(), 'version' => 'e1bf5df8efbf2d4112f7');
diff --git a/js/video-init.asset.php b/js/video-init.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '01eb0d63ab6dd18040af');
+<?php return array('dependencies' => array(), 'version' => '44e1b69b81ff3dbdc83c');
diff --git a/php/class-dashboard.php b/php/class-dashboard.php
@@ -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',
 					),
diff --git a/src/css/components/ui/_ui-components.scss b/src/css/components/ui/_ui-components.scss
@@ -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;
diff --git a/ui-definitions/settings-sidebar.php b/ui-definitions/settings-sidebar.php
@@ -20,9 +20,17 @@
 		'type'        => 'panel',
 		'title'       => __( 'Account status', 'cloudinary' ),
 		'description' => function () {
-			$data = get_plugin_instance()->settings->get_value( 'last_usage' );
+			$plugin     = get_plugin_instance();
+			$data       = $plugin->settings->get_value( 'last_usage' );
+			$cloud_name = $plugin->components['connect']->get_cloud_name();
 
-			return $data['plan'];
+			ob_start();
+			?>
+				<?php echo esc_html( $data['plan'] ); ?>
+				<br />
+				<span class="cld-ui-description-cloudname cloudname">@<?php echo esc_html( $cloud_name ); ?></span>
+			<?php
+			return ob_get_clean();
 		},
 		'collapsible' => 'open',
 		array(
@@ -65,7 +73,6 @@
 
 			/* translators: %s is the percentage optimized. */
 			return sprintf( __( '%s Optimized', 'cloudinary' ), $percentage );
-
 		},
 		'collapsible' => 'closed',
 		array(

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' => '6d7c14c34904052ff5b5');`
	`1`	`+<?php return array('dependencies' => array('react', 'wp-components', 'wp-data', 'wp-i18n'), 'version' => 'a517612ccdaff27b97a1');`