Merge branch 'fixRorRecommendationForOJS330-888' into 'stable-3_3_0'

Fixes the author's ROR recommendation notification and adds a record in the activity log when the message is successfully sent.

See merge request softwares-pkp/plugins_ojs/OASwitchboard!40

Author: YvesLepidus

OASwitchboardPlugin.inc.php

@@ -27,6 +27,7 @@ public function register($category, $path, $mainContextId = null)
             $resources = new Resources($this);
             HookRegistry::register('Publication::publish', [$message, 'sendToOASwitchboard']);
             HookRegistry::register('TemplateManager::display', [$resources, 'addWorkflowNotificationsJavaScript']);
+            HookRegistry::register('NotificationManager::getNotificationMessage', [$resources, 'addMessageToInformationNotification']);
         }
         return $success;
     }

classes/Message.inc.php

@@ -24,12 +24,14 @@ public function sendToOASwitchboard($hookName, $args)
             if ($publication->getData('status') === STATUS_PUBLISHED) {
                 $OASwitchboard = new OASwitchboardService($this->plugin, $contextId, $submission);
                 $OASwitchboard->sendP1PioMessage();
+                $keyMessage = 'plugins.generic.OASwitchboard.sendMessageWithSuccess';
+                $this->sendNotification($userId, __($keyMessage), NOTIFICATION_TYPE_SUCCESS);
+                $this->registerSubmissionEventLog($request, $submission, $keyMessage);
                 if (!OASwitchboardService::isRorAssociated($submission)) {
-                    $keyMessage = 'plugins.generic.OASwitchboard.postRequirementsError.recipient';
-                    $this->sendNotification($userId, __($keyMessage), NOTIFICATION_TYPE_WARNING);
+                    $keyMessage = 'plugins.generic.OASwitchboard.rorRecommendation';
+                    $this->sendNotification($userId, __($keyMessage), NOTIFICATION_TYPE_INFORMATION);
                     $this->registerSubmissionEventLog($request, $submission, $keyMessage);
                 }
-                $this->sendNotification($userId, __('plugins.generic.OASwitchboard.sendMessageWithSuccess'), NOTIFICATION_TYPE_SUCCESS);
             }
         } catch (P1PioException $e) {
             $this->sendNotification($userId, $e->getMessage(), NOTIFICATION_TYPE_WARNING);

classes/Resources.inc.php

@@ -41,4 +41,13 @@ public function addWorkflowNotificationsJavaScript($hookName, $args)
 
         return false;
     }
+
+    public function addMessageToInformationNotification($hookName, $args)
+    {
+        $notification = & $args[0];
+        $message = & $args[1];
+        $notificationSettingsDao = DAORegistry::getDAO('NotificationSettingsDAO');
+        $notificationSettings = $notificationSettingsDao->getNotificationSettings($notification->getId());
+        $message = $notificationSettings['contents'];
+    }
 }

cypress/tests/Test4_sendMessageSuccess.cy.js

@@ -54,7 +54,7 @@ describe('Send P1-PIO message with success', function () {
         cy.get('.pkpPublication > .pkpHeader > .pkpHeader__actions > button.pkpButton').contains("Schedule For Publication").click();
         cy.get('.pkpFormPage__footer button:contains("Publish")').click();
 
-        cy.get('.app__notifications').contains("At least one author of the article must have a ROR associated with their affiliation.");
+        cy.get('.app__notifications').contains("At least one author should have a ROR ID linked to their affiliation (requires the ROR plugin) for the message to be sent to the affiliation.");
         cy.get('.app__notifications').contains("The message was successfully sent to the OA Switchboard");
     })
 })

locale/en_US/locale.po

@@ -44,8 +44,8 @@ msgstr "Server error when sending message. The OA Switchboard API server encount
 msgid "plugins.generic.OASwitchboard.postRequirementsError"
 msgstr "We don't have the mandatory data for sending the message to the OA Switchboard, please check the submission activity log to understand the pending requirements."
 
-msgid "plugins.generic.OASwitchboard.postRequirementsError.recipient"
-msgstr "At least one author of the article must have a ROR associated with their affiliation."
+msgid "plugins.generic.OASwitchboard.rorRecommendation"
+msgstr "At least one author should have a ROR ID linked to their affiliation (requires the ROR plugin) for the message to be sent to the affiliation."
 
 msgid "plugins.generic.OASwitchboard.postRequirementsError.familyName"
 msgstr "The family name of an author must be present."

locale/es_ES/locale.po

@@ -44,8 +44,8 @@ msgstr "Error del servidor al enviar el mensaje. El servidor de la API de OA Swi
 msgid "plugins.generic.OASwitchboard.postRequirementsError"
 msgstr "No tenemos los datos obligatorios para enviar el mensaje al OA Switchboard, por favor revise el Registro de actividad de lo envío para entender los requisitos pendientes."
 
-msgid "plugins.generic.OASwitchboard.postRequirementsError.recipient"
-msgstr "Al menos uno de los autores del artículo debe tener un ROR asociado con su afiliación."
+msgid "plugins.generic.OASwitchboard.rorRecommendation"
+msgstr "Al menos un autor debe tener un ID ROR vinculado a su afiliación (requiere el plugin ROR) para que el mensaje sea enviado a la afiliación."
 
 msgid "plugins.generic.OASwitchboard.postRequirementsError.familyName"
 msgstr "El apellido de un autor debe estar presente."

locale/pt_BR/locale.po

@@ -44,8 +44,8 @@ msgstr "Erro do servidor ao enviar a mensagem. O servidor da API do OA Switchboa
 msgid "plugins.generic.OASwitchboard.postRequirementsError"
 msgstr "Não temos os dados obrigatórios para envio da mensagem para o OA Switchboard, verifique o histórico de atividades da submissão para entender os requisitos pendentes."
 
-msgid "plugins.generic.OASwitchboard.postRequirementsError.recipient"
-msgstr "Pelo menos um autor do artigo deve ter um ROR associado à sua afiliação."
+msgid "plugins.generic.OASwitchboard.rorRecommendation"
+msgstr "Pelo menos um autor deve ter um ID ROR vinculado à sua afiliação (requer o plugin ROR) para que a mensagem seja enviada à afiliação."
 
 msgid "plugins.generic.OASwitchboard.postRequirementsError.familyName"
 msgstr "O sobrenome de um autor deve estar presente."

version.xml

@@ -12,8 +12,8 @@
 <version>
 	<application>OASwitchboard</application>
 	<type>plugins.generic</type>
-	<release>1.1.1.2</release>
-	<date>2024-09-20</date>
+	<release>1.1.1.3</release>
+	<date>2024-09-23</date>
 	<lazy-load>1</lazy-load>
 	<class>OASwitchboardPlugin</class>
 </version>