Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Deprecated S3 Image Upload Code [master] #223

Merged
merged 4 commits into from
Mar 24, 2025
Merged

Remove Deprecated S3 Image Upload Code [master] #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a43c1f
feat: remove the AWS S3 upload files from the plugin
Juzar10 Mar 21, 2025
6b897e3
fix: phpcs issue
Juzar10 Mar 21, 2025
a1adcfe
Merge branch 'master' of https://github.com/rtCamp/easydam into fix/r…
Juzar10 Mar 24, 2025
3178e13
fix: remove unnecessary deleted file again
Juzar10 Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion assets/src/css/media-library.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
padding-left: 0 !important;
}

.media-library-upload-to-s3 {
.media-library-bulk-actions {

&.hidden {
display: none;
}
}

/**
* EXIF data styles.
*/
Expand Down
52 changes: 0 additions & 52 deletions assets/src/js/media-library/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,55 +182,3 @@ if ( ! isFolderOrgDisabled() ) {
inputElement.value = 'Date Range';
} );
}

/**
* TOOD: Find some good place to put this code.
*/
// document.addEventListener( 'DOMContentLoaded', function() {
// const uploadLinks = document.querySelectorAll( '.upload-to-s3' );

// uploadLinks.forEach( function( link ) {
// link.addEventListener( 'click', function( e ) {
// e.preventDefault(); // Prevent default link action

// const postId = this.getAttribute( 'data-post-id' );
// this.textContent = 'UPLOADING...';
// this.style.pointerEvents = 'none';

// // Send AJAX request to handle the upload
// const data = new FormData();
// data.append( 'action', 'upload_to_s3' );
// data.append( 'post_id', postId );
// data.append( 'nonce', easydamMediaLibrary.nonce );

// fetch( easydamMediaLibrary.ajaxUrl, {
// method: 'POST',
// body: data,
// } )
// .then( ( response ) => {
// if ( ! response.ok ) {
// throw new Error( 'Network response was not ok' );
// }
// return response.json();
// } )
// .then( ( responseData ) => {
// this.style.pointerEvents = 'auto';

// if ( responseData.success ) {
// const newLink = document.createElement( 'a' );
// newLink.href = responseData.data.url;
// newLink.target = '_blank';
// newLink.textContent = 'LINK';
// this.textContent = '';
// this.appendChild( newLink );
// } else {
// this.textContent = 'Upload Failed';
// }
// } )
// .catch( () => {
// this.textContent = 'Upload Failed';
// } );
// } );
// } );
// } );

14 changes: 0 additions & 14 deletions assets/src/js/media-library/views/attachment-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
import MediaLibraryTaxonomyFilter from './filters/media-library-taxonomy-filter';
import MediaDateRangeFilter from './filters/media-date-range-filter';
// import MediaUploadToS3 from './filters/media-upload-to-s3';
import MediaRetranscode from './filters/media-retranscode';

import { isLicenseValid, isUploadPage, isFolderOrgDisabled } from '../utility';
Expand Down Expand Up @@ -62,19 +61,6 @@ export default AttachmentsBrowser?.extend( {
);
}

// Comment out the S3 button code until confirmed.

// if ( MediaUploadToS3 && ! wp?.media?.frame?.el ) {
// this.toolbar.set(
// 'MediaUploadToS3',
// new MediaUploadToS3( {
// controller: this.controller,
// model: this.collection.props,
// priority: -75,
// } ).render(),
// );
// }

if ( isLicenseValid() && isUploadPage() ) {
if ( MediaRetranscode ) {
this.toolbar.set(
Expand Down
6 changes: 4 additions & 2 deletions assets/src/js/media-library/views/filters/media-retranscode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@ MediaRetranscode = MediaRetranscode?.extend( {

render() {
wp.media.view.Button.prototype.render.apply( this, arguments );

if ( this.controller.isModeActive( 'select' ) ) {
this.$el.addClass( 'media-library-upload-to-s3' );
this.$el.addClass( 'media-library-bulk-actions' );
} else {
this.$el.addClass( 'media-library-upload-to-s3 hidden' );
this.$el.addClass( 'media-library-bulk-actions hidden' );
}

this.toggleDisabled();
return this;
},
Expand Down
105 changes: 0 additions & 105 deletions assets/src/js/media-library/views/filters/media-upload-to-s3.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions godam.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ function rtgodam_action_links( $links, $file ) {
add_filter( 'plugin_action_links', 'rtgodam_action_links', 11, 2 );
add_filter( 'network_admin_plugin_action_links', 'rtgodam_action_links', 11, 2 );

/**
* Autoloader for the vendor directory.
*/
require RTGODAM_PATH . 'vendor/autoload.php';

/**
* Runs when the plugin is activated.
*/
Expand Down
96 changes: 0 additions & 96 deletions inc/classes/class-media-library-ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,6 @@ public function setup_hooks() {
add_filter( 'wp_prepare_attachment_for_js', array( $this, 'add_media_transcoding_status_js' ), 10, 2 );

add_action( 'pre_delete_term', array( $this, 'delete_child_media_folder' ), 10, 2 );

// TODO: think about merging this hooks and other to media-filters, as they are related to media library.
$offload_media = get_option( EasyDAM_Constants::S3_STORAGE_OPTIONS );
$offload_media = isset( $offload_media['offLoadMedia'] ) ? $offload_media['offLoadMedia'] : false;

$offload_media = false; // disabling the S3 bucket for now.

if ( $offload_media ) {
add_filter( 'manage_media_columns', array( $this, 'add_media_column' ) );
add_action( 'manage_media_custom_column', array( $this, 'media_column_value' ), 10, 2 );
add_filter( 'wp_prepare_attachment_for_js', array( $this, 'add_media_folder_to_attachment' ), 10, 2 );
add_filter( 'bulk_actions-upload', array( $this, 'add_bulk_actions' ) );
}

add_action( 'delete_attachment', array( $this, 'handle_media_deletion' ), 10, 1 );
}

Expand Down Expand Up @@ -109,88 +95,6 @@ public function delete_child_media_folder( $term, $taxonomy ) {
foreach ( $children as $child ) {
wp_delete_term( $child->term_id, $taxonomy );
}

}

/**
* Add media column.
*
* @param array $columns Columns.
*
* @return array $columns Columns.
*/
public function add_media_column( $columns ) {
$columns['s3_url'] = 'S3 URL';

return $columns;
}

/**
* Add media column value.
*
* @param string $column_name Column name.
* @param int $post_id Post ID.
*
* @return void
*/
public function media_column_value( $column_name, $post_id ) {

// Check if post_id is attachment type and is an image.
if ( 'attachment' === get_post_type( $post_id ) ) {
$attachment = get_post( $post_id );

if ( 'image' !== substr( $attachment->post_mime_type, 0, 5 ) ) {
return;
}

if ( 's3_url' === $column_name ) {
$s3_url = get_post_meta( $post_id, 's3_url', true );

if ( empty( $s3_url ) ) {
?>
<a class="upload-to-s3" href="#" data-post-id="<?php echo esc_attr( $post_id ); ?>"><i class="dashicons dashicons-upload"></i></a>
<?php
} else {
?>
<a href="<?php echo esc_url( $s3_url ); ?>" target="_blank"><?php esc_html_e( 'LINK', 'godam' ); ?></a>
<?php
}
}
}
}

/**
* Add bulk actions.
*
* @param array $actions Bulk actions.
*
* @return array $actions Bulk actions.
*/
public function add_bulk_actions( $actions ) {
$actions['upload_to_s3'] = __( 'Upload to S3', 'godam' );
return $actions;
}

/**
* Upload media to S3.
*
* @param array $response Attachment response.
* @param WP_Post $attachment Attachment object.
*
* @return array $response Attachment response.
*/
public function add_media_folder_to_attachment( $response, $attachment ) {

// Check if S3 url is present to S3 attachment meta.
$s3_url = get_post_meta( $attachment->ID, 's3_url', true );

if ( ! empty( $s3_url ) ) {
$response['s3_url'] = $s3_url;
} else {
$response['s3_url'] = false;
}

return $response;
}

/**
Expand Down
12 changes: 0 additions & 12 deletions inc/classes/class-plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
use RTGODAM\Inc\REST_API\Transcoding;
use RTGODAM\Inc\REST_API\Analytics;

use RTGODAM\Inc\Providers\Media_Filters;

/**
* Class Plugin.
*/
Expand All @@ -51,16 +49,6 @@ protected function __construct() {
$this->load_taxonomies();
$this->load_plugin_configs();
$this->load_rest_api();

// TODO: think of a better place to put this.
$offload_media = get_option( EasyDAM_Constants::S3_STORAGE_OPTIONS );
$offload_media = isset( $offload_media['offLoadMedia'] ) ? $offload_media['offLoadMedia'] : false;

$offload_media = false; // disabling the S3 bucket for now

if ( $offload_media ) {
Media_Filters::get_instance();
}
}

/**
Expand Down
Loading