Move batch delete logic into the pages and files classes

config/sections/files.php

@@ -235,8 +235,7 @@
 						);
 					}
 
-					$ids    = $this->requestBody('ids');
-					$errors = [];
+					$ids = $this->requestBody('ids');
 
 					// check if the section has enough files after the deletion
 					if ($section->total() - count($ids) < $section->min()) {
@@ -245,26 +244,7 @@
 						);
 					}
 
-					// delete all files and collect errors
-					foreach ($ids as $id) {
-						try {
-							$section->kirby()->file($id)?->delete();
-						} catch (Throwable $e) {
-							$errors[] = [
-								'label'  => $id,
-								'message' => $e->getMessage()
-							];
-						}
-					}
-
-					// throw an error if not all files could be deleted
-					if ($errors !== []) {
-						throw new Exception(
-							message: 'Not all files could be deleted',
-							details: $errors
-						);
-					}
-
+					$section->models()->delete($ids);
 					return true;
 				}
 			]

config/sections/pages.php

@@ -334,8 +334,7 @@
 						);
 					}
 
-					$ids    = $this->requestBody('ids');
-					$errors = [];
+					$ids = $this->requestBody('ids');
 
 					// check if the section has enough pages after the deletion
 					if ($section->total() - count($ids) < $section->min()) {
@@ -344,26 +343,7 @@
 						);
 					}
 
-					// delete all pages and collect errors
-					foreach ($ids as $id) {
-						try {
-							$section->kirby()->page($id)?->delete();
-						} catch (Throwable $e) {
-							$errors[] = [
-								'label'  => $id,
-								'message' => $e->getMessage()
-							];
-						}
-					}
-
-					// throw an error if not all pages could be deleted
-					if ($errors !== []) {
-						throw new Exception(
-							message: 'Not all pages could be deleted',
-							details: $errors
-						);
-					}
-
+					$section->models()->delete($ids);
 					return true;
 				}
 			]

src/Cms/Files.php

@@ -2,9 +2,12 @@
 
 namespace Kirby\Cms;
 
+use Exception;
 use Kirby\Exception\InvalidArgumentException;
+use Kirby\Exception\NotFoundException;
 use Kirby\Filesystem\F;
 use Kirby\Uuid\HasUuids;
+use Throwable;
 
 /**
  * The `$files` object extends the general
@@ -93,6 +96,40 @@ public function changeSort(array $files, int $offset = 0): static
 		return $this;
 	}
 
+	/**
+	 * Deletes the files with the given IDs
+	 * if they exist in the collection
+	 *
+	 * @throws \Kirby\Exception\Exception If not all files could be deleted
+	 */
+	public function delete(array $ids): void
+	{
+		$exceptions = [];
+
+		// delete all pages and collect errors
+		foreach ($ids as $id) {
+			try {
+				$model = $this->get($id);
+
+				if ($model instanceof File === false) {
+					throw new NotFoundException(
+						key: 'file.notFound'
+					);
+				}
+
+				$model->delete();
+			} catch (Throwable $e) {
+				$exceptions[$id] = $e;
+			}
+		}
+
+		if ($exceptions !== []) {
+			throw new Exception(
+				message: 'Not all files could be deleted',
+			);
+		}
+	}
+
 	/**
 	 * Creates a files collection from an array of props
 	 */

src/Cms/Pages.php

@@ -2,8 +2,11 @@
 
 namespace Kirby\Cms;
 
+use Kirby\Exception\Exception;
 use Kirby\Exception\InvalidArgumentException;
+use Kirby\Exception\NotFoundException;
 use Kirby\Uuid\HasUuids;
+use Throwable;
 
 /**
  * The `$pages` object refers to a
@@ -118,6 +121,40 @@ public function code(): Files
 		return $this->files()->filter('type', 'code');
 	}
 
+	/**
+	 * Deletes the pages with the given IDs
+	 * if they exist in the collection
+	 *
+	 * @throws \Kirby\Exception\Exception If not all pages could be deleted
+	 */
+	public function delete(array $ids): void
+	{
+		$exceptions = [];
+
+		// delete all pages and collect errors
+		foreach ($ids as $id) {
+			try {
+				$model = $this->get($id);
+
+				if ($model instanceof Page === false) {
+					throw new NotFoundException(
+						key: 'page.notFound'
+					);
+				}
+
+				$model->delete();
+			} catch (Throwable $e) {
+				$exceptions[$id] = $e;
+			}
+		}
+
+		if ($exceptions !== []) {
+			throw new Exception(
+				message: 'Not all pages could be deleted',
+			);
+		}
+	}
+
 	/**
 	 * Returns all documents of all children
 	 */