Fix transformations icon and ensured the image and text overlay columns are enabled by default

Author: aatanasovdev

php/class-relate.php

@@ -116,10 +116,11 @@ public static function update_transformations_overlay( $attachment_id, $overlay_
 	 *
 	 * @param int  $attachment_id The attachment ID.
 	 * @param bool $as_string     Set the output to a string.
+	 * @param bool $free_transformations_only If true, only return the base transformations without overlays.
 	 *
 	 * @return array|string
 	 */
-	public static function get_transformations( $attachment_id, $as_string = false ) {
+	public static function get_transformations( $attachment_id, $as_string = false, $free_transformations_only = false ) {
 		static $media, $cache = array();
 		if ( ! $media ) {
 			$media = get_plugin_instance()->get_component( 'media' );
@@ -136,12 +137,14 @@ public static function get_transformations( $attachment_id, $as_string = false )
 		$relationship    = Relationship::get_relationship( $attachment_id );
 		$transformations = $relationship->transformations;
 
-		$text_overlay    = self::get_overlay( $attachment_id, 'text_overlay' );
-		$image_overlay   = self::get_overlay( $attachment_id, 'image_overlay' );
+		if ( ! $free_transformations_only ) {
+			$text_overlay  = self::get_overlay( $attachment_id, 'text_overlay' );
+			$image_overlay = self::get_overlay( $attachment_id, 'image_overlay' );
 
-		// Merge transformations with overlays.
-		$parts = array_filter( array( $transformations, $image_overlay, $text_overlay ) );
-		$transformations = ! empty( $parts ) ? implode( '/', $parts ) : '';
+			// Merge transformations with overlays.
+			$parts           = array_filter( array( $transformations, $image_overlay, $text_overlay ) );
+			$transformations = ! empty( $parts ) ? implode( '/', $parts ) : '';
+		}
 
 		if ( ! $as_string ) {
 			$transformations = ! empty( $transformations ) ? $media->get_transformations_from_string( $transformations, $relationship->asset_type ) : array();

php/class-utils.php

@@ -296,6 +296,8 @@ public static function get_table_sql() {
 	  sync_type varchar(45) DEFAULT NULL,
 	  post_state varchar(12) DEFAULT NULL,
 	  transformations text DEFAULT NULL,
+	  text_overlay text DEFAULT NULL,
+	  image_overlay text DEFAULT NULL,
 	  signature varchar(45) DEFAULT NULL,
 	  public_hash varchar(45) DEFAULT NULL,
 	  url_hash varchar(45) DEFAULT NULL,

php/media/class-global-transformations.php

@@ -659,7 +659,7 @@ public function transformations_column_value( $column_name, $attachment_id ) {
 			$item = $this->media->plugin->get_component( 'assets' )->get_asset( $attachment_id, 'dataset' );
 			if ( ! empty( $item['data']['public_id'] ) ) {
 				$text            = __( 'Add Effects', 'cloudinary' );
-				$transformations = Relate::get_transformations( $attachment_id, true );
+				$transformations = Relate::get_transformations( $attachment_id, true, true );
 				$text_overlay    = Relate::get_overlay( $attachment_id, 'text_overlay' );
 				$image_overlay   = Relate::get_overlay( $attachment_id, 'image_overlay' );
 				$args            = array(