Merge branch 'portTo34' into 'main'

Adapt plugin code to OJS 3.4 See merge request softwares-pkp/plugins_ojs/deleteIncompleteSubmissions!1
lepidus · Jun 20, 2024 · 9a3b4f8 · 9a3b4f8
2 parents d0068b5 + 8f0ae0a
commit 9a3b4f8
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 38 deletions.
diff --git a/DeleteIncompleteSubmissionsPlugin.inc.php → DeleteIncompleteSubmissionsPlugin.php b/DeleteIncompleteSubmissionsPlugin.inc.php → DeleteIncompleteSubmissionsPlugin.php
@@ -1,6 +1,24 @@
 <?php
 
-import('lib.pkp.classes.plugins.GenericPlugin');
+/**
+ * @file plugins/generic/deleteIncompleteSubmissions/deleteIncompleteSubmissions.php
+ *
+ * Copyright (c) 2024 Lepidus Tecnologia
+ * Distributed under the GNU GPL v3. For full terms see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt
+ *
+ * @class DeleteIncompleteSubmissionsPlugin
+ * @ingroup plugins_generic_deleteIncompleteSubmissions
+ *
+ */
+
+namespace APP\plugins\generic\deleteIncompleteSubmissions;
+
+use PKP\plugins\GenericPlugin;
+use PKP\linkAction\LinkAction;
+use PKP\linkAction\request\AjaxModal;
+use APP\core\Application;
+use PKP\core\JSONMessage;
+use APP\plugins\generic\deleteIncompleteSubmissions\settings\DeleteIncompleteSubmissionsSettingsForm;
 
 class DeleteIncompleteSubmissionsPlugin extends GenericPlugin
 {
@@ -33,7 +51,6 @@ public function getCanDisable()
     public function getActions($request, $actionArgs)
     {
         $router = $request->getRouter();
-        import('lib.pkp.classes.linkAction.request.AjaxModal');
         return array_merge(
             $this->getEnabled() ? [
                 new LinkAction(
@@ -51,7 +68,6 @@ public function manage($args, $request)
         switch ($request->getUserVar('verb')) {
             case 'deletion':
                 $context = $request->getContext();
-                $this->import('form.DeleteIncompleteSubmissionsSettingsForm');
                 $form = new DeleteIncompleteSubmissionsSettingsForm($this, $context->getId());
 
                 if ($request->getUserVar('save')) {

diff --git a/README.md b/README.md
@@ -2,9 +2,13 @@
 
 This plugin allows editors to delete incomplete submissions from the journal.
 
+It allows the editor to set a threshold, in days, to safeguard the deletion of submissions that are not meant to be deleted at the moment.
+
 # Compatibility
 
-This plugin is compatible with OJS 3.3.0
+This plugin is compatible with **OJS 3.4.0**
+
+For compatibility with other versions of OJS, please refer to this repository branches.
 
 # Installation
 
@@ -14,7 +18,7 @@ Upload the package in the `Website > Plugins` section of the Dashboard.
 
 # Usage
 
-After installing the plugin, it will appear in the plugins list, from there, activate the plugin, then expand the options in the arrow, and click on the `Delete submissions...` option:
+After installing the plugin, it will appear in the plugins list, from there, activate the plugin, then expand the options in the arrow, and click on the ***`Delete submissions...`*** action:
 
 ![](screenshots/plugin-options.png)
 

diff --git a/index.php b/index.php
diff --git a/locale/en_US/locale.po → locale/en/locale.po b/locale/en_US/locale.po → locale/en/locale.po
diff --git a/locale/es_ES/locale.po → locale/es/locale.po b/locale/es_ES/locale.po → locale/es/locale.po
diff --git a/...IncompleteSubmissionsSettingsForm.inc.php → ...leteIncompleteSubmissionsSettingsForm.php b/...IncompleteSubmissionsSettingsForm.inc.php → ...leteIncompleteSubmissionsSettingsForm.php
@@ -1,6 +1,13 @@
 <?php
 
-import('lib.pkp.classes.form.Form');
+namespace APP\plugins\generic\deleteIncompleteSubmissions\settings;
+
+use APP\template\TemplateManager;
+use PKP\form\Form;
+use PKP\form\validation\FormValidatorCSRF;
+use PKP\form\validation\FormValidatorPost;
+use APP\core\Application;
+use APP\facades\Repo;
 
 class DeleteIncompleteSubmissionsSettingsForm extends Form
 {
@@ -47,17 +54,19 @@ public function execute(...$functionArgs)
 
     private function deleteIncompleteSubmissions(int $deletionThreshold): void
     {
-        $submissionService = Services::get('submission');
-        $submissions = $submissionService->getMany([
-            'contextId' => $this->contextId, 'isIncomplete' => true, 'daysInactive' => $deletionThreshold
-        ]);
-
-        foreach ($submissions as $submission) {
-            try {
-                $submissionService->delete($submission);
-            } catch (\Throwable $th) {
-                error_log('The submission  ' . $submission->getId() . ' was not deleted. Reason:' . $th->getMessage());
+        $submissions = Repo::submission()
+            ->getCollector()
+            ->filterByContextIds([$this->contextId])
+            ->filterByIncomplete(true)
+            ->filterByDaysInactive($deletionThreshold)
+            ->getMany();
+
+        try {
+            foreach ($submissions as $submission) {
+                Repo::submission()->delete($submission);
             }
+        } catch (\Throwable $th) {
+            error_log('The submission  ' . $submission->getId() . ' was not deleted. Reason:' . $th->getMessage());
         }
     }
 }
diff --git a/version.xml b/version.xml
@@ -13,6 +13,6 @@
 <version>
 	<application>deleteIncompleteSubmissions</application>
 	<type>plugins.generic</type>
-	<release>0.1.3.0</release>
-	<date>2024-02-14</date>
+	<release>0.2.0.0</release>
+	<date>2024-06-20</date>
 </version>