Merge branch 'dontSendDeleteEmail330-769' into 'stable-3_3_0'

JhonathanLepidus · JhonathanLepidus · commit 9f2ecd295b05 · 2025-04-23T16:35:08.000-04:00
Adiciona opção para não enviar e-mail ao excluir dataset - 3.3.0

See merge request softwares-pkp/plugins_ojs/dataverse!196
diff --git a/api/v1/datasets/DatasetHandler.inc.php b/api/v1/datasets/DatasetHandler.inc.php
@@ -311,7 +311,8 @@ public function deleteDataset($slimRequest, $response, $args)
         $deleteMessage = null;
 
         $requestParams = $slimRequest->getParsedBody();
-        if (isset($requestParams['deleteMessage'])) {
+        $sendDeleteEmail = (int) $requestParams['sendDeleteEmail'];
+        if ($sendDeleteEmail == 1 && isset($requestParams['deleteMessage'])) {
             $deleteMessage = $requestParams['deleteMessage'];
         }
 
diff --git a/classes/dispatchers/DatasetTabDispatcher.inc.php b/classes/dispatchers/DatasetTabDispatcher.inc.php
@@ -293,13 +293,22 @@ public function getDeleteDatasetForm(
         ])->addGroup([
             'id' => 'default',
             'pageId' => 'default',
-        ])->addField(new \PKP\components\forms\FieldRichTextarea('deleteMessage', [
+        ])->addField(new \PKP\components\forms\FieldOptions('sendDeleteEmail', [
+            'label' => __('common.sendEmail'),
+            'type' => 'radio',
+            'options' => [
+                ['value' => 1, 'label' => __('plugins.generic.dataverse.researchData.delete.sendEmail.yes')],
+                ['value' => 0, 'label' => __('plugins.generic.dataverse.researchData.delete.sendEmail.no')],
+            ],
+            'value' => 1,
+            'groupId' => 'default'
+        ]))->addField(new \PKP\components\forms\FieldRichTextarea('deleteMessage', [
             'label' => __('plugins.generic.dataverse.researchData.delete.emailNotification'),
             'value' => $mail->getBody(),
+            'showWhen' => ['sendDeleteEmail', 1],
             'groupId' => 'default'
         ]));
 
-
         return $deleteDatasetForm;
     }
 
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -30,7 +30,7 @@ Cypress.Commands.add('waitDatasetTabLoading', function(tabToLeave, alreadyOnData
 	}
 
 	cy.contains('h1', 'Research data', {timeout:10000});
-	cy.contains('#datasetData .value', 'Demo Dataverse, ', {timeout:10000});
+	cy.get('#datasetCitation', {timeout:10000});
 
 	cy.get('#' + tabToLeave + '-button').click();
 });
diff --git a/cypress/tests/Test03_ResearchDataDeposit.spec.js b/cypress/tests/Test03_ResearchDataDeposit.spec.js
@@ -124,8 +124,8 @@ describe('Research data deposit', function () {
 		cy.get('form[id=submitStep4Form] button:contains("Finish Submission")').click();
 		cy.wait(1000);
 		cy.get('button.pkpModalConfirmButton').click();
-
-		cy.waitJQuery();
+		cy.wait(7000);
+		
 		cy.get('h2:contains("Submission complete")');
 
 		cy.contains('Review this submission').click();
@@ -379,6 +379,11 @@ describe('Research data deposit', function () {
 
 		cy.waitDatasetTabLoading('datasetTab');
 		cy.contains('Delete research data').click();
+		cy.contains('Send an email notification to the dataset contact');
+		cy.contains('Do not send an email notification');
+		cy.getTinyMceContent('deleteDataset-deleteMessage-control')
+			.should('contain', 'The research data from the manuscript submission "' + submission.title + '" has been removed');
+
 		cy.setTinyMceContent('deleteDataset-deleteMessage-control', 'Your research data has been deleted.');
 		cy.get('#deleteDataset-deleteMessage-control').click();
 		cy.get('[data-modal="deleteDataset"] button').contains('Delete and send email').click();
diff --git a/js/DataverseWorkflowPage.js b/js/DataverseWorkflowPage.js
@@ -236,7 +236,7 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
                     
                     if (self.hasDepositedDataset) {
                         let deleteDatasetForm = self.components.deleteDataset;
-                        let deleteMessageField = deleteDatasetForm.fields[0];
+                        let deleteMessageField = deleteDatasetForm.fields[1];
                         deleteMessageField.value = deleteMessageField.value.replace('{$dataverseName}', self.dataverseName);
                     }
 
@@ -338,7 +338,6 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
                 return;
             }
             var self = this;
-            this.datasetCitation = this.loadingCitationMsg;
             $.ajax({
                 url: self.datasetCitationUrl,
                 type: 'GET',
diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po
@@ -211,6 +211,12 @@ msgstr "Files"
 msgid "plugins.generic.dataverse.researchData.delete"
 msgstr "Delete research data"
 
+msgid "plugins.generic.dataverse.researchData.delete.sendEmail.yes"
+msgstr "Send an email notification to the dataset contact"
+
+msgid "plugins.generic.dataverse.researchData.delete.sendEmail.no"
+msgstr "Do not send an email notification"
+
 msgid "plugins.generic.dataverse.researchData.delete.emailNotification"
 msgstr "Email notification"
 
diff --git a/locale/es_ES/locale.po b/locale/es_ES/locale.po
@@ -214,6 +214,12 @@ msgstr "Archivos"
 msgid "plugins.generic.dataverse.researchData.delete"
 msgstr "Eliminar datos de investigación"
 
+msgid "plugins.generic.dataverse.researchData.delete.sendEmail.yes"
+msgstr "Enviar una notificación por correo electrónico al contacto del conjunto de datos"
+
+msgid "plugins.generic.dataverse.researchData.delete.sendEmail.no"
+msgstr "No enviar una notificación por correo electrónico"
+
 msgid "plugins.generic.dataverse.researchData.delete.emailNotification"
 msgstr "Notificación por correo electrónico"
 
diff --git a/locale/pt_BR/locale.po b/locale/pt_BR/locale.po
@@ -214,6 +214,12 @@ msgstr "Arquivos"
 msgid "plugins.generic.dataverse.researchData.delete"
 msgstr "Excluir dados de pesquisa"
 
+msgid "plugins.generic.dataverse.researchData.delete.sendEmail.yes"
+msgstr "Enviar uma notificação por e-mail para o contato do conjunto de dados"
+
+msgid "plugins.generic.dataverse.researchData.delete.sendEmail.no"
+msgstr "Não enviar uma notificação por e-mail"
+
 msgid "plugins.generic.dataverse.researchData.delete.emailNotification"
 msgstr "Notificação por e-mail"
 
diff --git a/templates/datasetTab/datasetData.tpl b/templates/datasetTab/datasetData.tpl
@@ -27,7 +27,8 @@
         </template>
     </pkp-header>
     <span class="value">
-        <p v-html="datasetCitation"></p>
+        <p id="loadingDatasetCitation" v-if="dataset && !datasetCitation">{{ loadingCitationMsg }}</p>
+        <p id="datasetCitation" v-if="datasetCitation" v-html="datasetCitation"></p>
     </span>
     <tabs label="Dataset data">
         <tab
diff --git a/version.xml b/version.xml
@@ -13,8 +13,8 @@
 <version>
 	<application>dataverse</application>
 	<type>plugins.generic</type>
-	<release>2.7.11.0</release>
-	<date>2025-04-17</date>
+	<release>2.7.12.0</release>
+	<date>2025-04-23</date>
 	<lazy-load>1</lazy-load>
 	<class>DataversePlugin</class>
 </version>

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,8 @@ public function deleteDataset($slimRequest, $response, $args)`
`311`	`311`	`$deleteMessage = null;`
`312`	`312`
`313`	`313`	`$requestParams = $slimRequest->getParsedBody();`
`314`		`- if (isset($requestParams['deleteMessage'])) {`
	`314`	`+ $sendDeleteEmail = (int) $requestParams['sendDeleteEmail'];`
	`315`	`+ if ($sendDeleteEmail == 1 && isset($requestParams['deleteMessage'])) {`
`315`	`316`	`$deleteMessage = $requestParams['deleteMessage'];`
`316`	`317`	`}`
`317`	`318`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ Cypress.Commands.add('waitDatasetTabLoading', function(tabToLeave, alreadyOnData`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`cy.contains('h1', 'Research data', {timeout:10000});`
`33`		`- cy.contains('#datasetData .value', 'Demo Dataverse, ', {timeout:10000});`
	`33`	`+ cy.get('#datasetCitation', {timeout:10000});`
`34`	`34`
`35`	`35`	`cy.get('#' + tabToLeave + '-button').click();`
`36`	`36`	`});`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {`
`236`	`236`
`237`	`237`	`if (self.hasDepositedDataset) {`
`238`	`238`	`let deleteDatasetForm = self.components.deleteDataset;`
`239`		`- let deleteMessageField = deleteDatasetForm.fields[0];`
	`239`	`+ let deleteMessageField = deleteDatasetForm.fields[1];`
`240`	`240`	`deleteMessageField.value = deleteMessageField.value.replace('{$dataverseName}', self.dataverseName);`
`241`	`241`	`}`
`242`	`242`
`@@ -338,7 +338,6 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {`
`338`	`338`	`return;`
`339`	`339`	`}`
`340`	`340`	`var self = this;`
`341`		`- this.datasetCitation = this.loadingCitationMsg;`
`342`	`341`	`$.ajax({`
`343`	`342`	`url: self.datasetCitationUrl,`
`344`	`343`	`type: 'GET',`