From 226e2649f71d6dfa9e876a877a3d92b6511dd465 Mon Sep 17 00:00:00 2001
From: Corey McKrill <916023+coreymckrill@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:10:55 -0700
Subject: [PATCH] Add delete button to single file view

---
 .../woocommerce/client/legacy/css/admin.scss  |  6 +++
 .../Admin/Logging/FileV2/FileController.php   |  2 +-
 .../Admin/Logging/FileV2/ListTable.php        |  2 +-
 .../Internal/Admin/Logging/PageController.php | 37 ++++++++++++++++---
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/plugins/woocommerce/client/legacy/css/admin.scss b/plugins/woocommerce/client/legacy/css/admin.scss
index 1750ef6749d..1e63ceb6c37 100644
--- a/plugins/woocommerce/client/legacy/css/admin.scss
+++ b/plugins/woocommerce/client/legacy/css/admin.scss
@@ -1348,6 +1348,12 @@ table.wc_status_table--tools {
 	}
 }
 
+.wc-logs-single-file-actions {
+	margin-left: auto;
+	display: flex;
+	gap: 0.5em;
+}
+
 .wc-logs-entries {
 	background: #f6f7f7;
 	border: 1px solid #c3c4c7;
diff --git a/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/FileController.php b/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/FileController.php
index 9b356f3e6a0..7842b4ccdc3 100644
--- a/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/FileController.php
+++ b/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/FileController.php
@@ -181,7 +181,7 @@ class FileController {
 		if ( count( $result ) < 1 ) {
 			return new WP_Error(
 				'wc_log_file_error',
-				esc_html__( 'Could not read the specified file.', 'woocommerce' )
+				esc_html__( 'This file does not exist.', 'woocommerce' )
 			);
 		}
 
diff --git a/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/ListTable.php b/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/ListTable.php
index 50c87f3322c..3469fa5942e 100644
--- a/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/ListTable.php
+++ b/plugins/woocommerce/src/Internal/Admin/Logging/FileV2/ListTable.php
@@ -229,7 +229,7 @@ class ListTable extends WP_List_Table {
 		<input
 			id="cb-select-<?php echo esc_attr( $item->get_file_id() ); ?>"
 			type="checkbox"
-			name="file[]"
+			name="file_id[]"
 			value="<?php echo esc_attr( $item->get_file_id() ); ?>"
 		/>
 		<label for="cb-select-<?php echo esc_attr( $item->get_hash() ); ?>">
diff --git a/plugins/woocommerce/src/Internal/Admin/Logging/PageController.php b/plugins/woocommerce/src/Internal/Admin/Logging/PageController.php
index e3d4b846248..602a7c29158 100644
--- a/plugins/woocommerce/src/Internal/Admin/Logging/PageController.php
+++ b/plugins/woocommerce/src/Internal/Admin/Logging/PageController.php
@@ -177,9 +177,14 @@ class PageController {
 		if ( is_wp_error( $file ) ) {
 			?>
 			<div class="notice notice-error notice-inline">
-				<p>
-					<?php echo wp_kses_post( $file->get_error_message() ); ?>
-				</p>
+				<?php echo wp_kses_post( wpautop( $file->get_error_message() ) ); ?>
+				<?php
+				printf(
+					'<p><a href="%1$s">%2$s</a></p>',
+					esc_url( $this->get_logs_tab_url() ),
+					esc_html__( 'Return to the file list.', 'woocommerce' )
+				);
+				?>
 			</div>
 			<?php
 
@@ -189,6 +194,14 @@ class PageController {
 		$rotations         = $this->file_controller->get_file_rotations( $file->get_file_id() );
 		$rotation_url_base = add_query_arg( 'view', 'single_file', $this->get_logs_tab_url() );
 
+		$delete_url = add_query_arg(
+			array(
+				'action'  => 'delete',
+				'file_id' => array( $file->get_file_id() ),
+			),
+			wp_nonce_url( $this->get_logs_tab_url(), 'bulk-log-files' )
+		);
+
 		$stream      = $file->get_stream();
 		$line_number = 1;
 
@@ -234,6 +247,16 @@ class PageController {
 					</ul>
 				</nav>
 			<?php endif; ?>
+			<div class="wc-logs-single-file-actions">
+				<?php
+				// Delete button.
+				printf(
+					'<a href="%1$s" class="button button-secondary">%2$s</a>',
+					esc_url( $delete_url ),
+					esc_html__( 'Delete permanently', 'woocommerce' )
+				);
+				?>
+			</div>
 		</header>
 		<section id="logs-entries" class="wc-logs-entries">
 			<?php while ( ! feof( $stream ) ) : ?>
@@ -367,12 +390,16 @@ class PageController {
 		if ( $action ) {
 			check_admin_referer( 'bulk-log-files' );
 
+			if ( ! current_user_can( 'manage_woocommerce' ) ) {
+				wp_die( esc_html__( 'You do not have permission to manage log files.', 'woocommerce' ) );
+			}
+
 			$sendback = remove_query_arg( array( 'deleted' ), wp_get_referer() );
 
-			// Multiple file[] params will be filtered separately, but assigned to $files as an array.
+			// Multiple file_id[] params will be filtered separately, but assigned to $files as an array.
 			$file_ids = filter_input(
 				INPUT_GET,
-				'file',
+				'file_id',
 				FILTER_CALLBACK,
 				array(
 					'options' => function( $file ) {