Skip to content

Commit d9be412

Browse files
Merge branch 'fixSingleFileScenario330-909' into 'stable-3_3_0'
Corrige cenário onde apenas arquivo README é enviado - 3.3.0 See merge request softwares-pkp/plugins_ojs/dataverse!229
2 parents cbfc6ef + 2d74846 commit d9be412

8 files changed

Lines changed: 26 additions & 8 deletions

File tree

api/v1/datasets/DatasetHandler.inc.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ public function addDataset($slimRequest, $response, $args)
211211
return $response->withStatus(404)->withJsonError('plugins.generic.dataverse.error.readmeFileRequired');
212212
}
213213

214+
if (count($draftDatasetFiles) == 1) {
215+
return $response->withStatus(404)->withJsonError('plugins.generic.dataverse.error.notSolelyReadmeFile');
216+
}
217+
214218
$submission = Services::get('submission')->get($submissionId);
215219

216220
import('plugins.generic.dataverse.classes.factories.SubmissionDatasetFactory');
@@ -227,7 +231,7 @@ public function addDataset($slimRequest, $response, $args)
227231
$depositInfo = $datasetService->deposit($submission, $dataset);
228232
if ($depositInfo['status'] != 'Success') {
229233
return $response->withStatus(403)->withJsonError(
230-
$depositInfo['message'].'.author',
234+
$depositInfo['message'] . '.author',
231235
$depositInfo['messageParams']
232236
);
233237
}

classes/dispatchers/DraftDatasetFilesDispatcher.inc.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,10 @@ private function validateResearchDataReadme(SubmissionSubmitStep2Form $form): vo
126126
$form->addError('dataverseStep2ValidationError', __("plugins.generic.dataverse.error.readmeFileRequired"));
127127
$form->addErrorField('dataverseStep2ValidationError');
128128
}
129+
130+
if (count($draftDatasetFiles) == 1) {
131+
$form->addError('dataverseStep2ValidationError', __("plugins.generic.dataverse.error.notSolelyReadmeFile"));
132+
$form->addErrorField('dataverseStep2ValidationError');
133+
}
129134
}
130135
}

cypress/tests/Test03_ResearchDataDeposit.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('Research data deposit', function () {
6868
cy.get('button').contains('Finish Submission').click();
6969
cy.wait(1000);
7070
cy.get('button.pkpModalConfirmButton').click();
71-
cy.get('div:contains("To submit research data, it is necessary to send at least one file.")');
71+
cy.get('div:contains("To submit research data, it is necessary to send at least one file, accompanied by a README file")');
7272
cy.get('div:contains("Please ensure that you have chosen and submitted research data files in step 2 of the submission.")');
7373

7474
cy.get('#submitTabs a:contains("2. Upload Submission")').click();

locale/en_US/locale.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ msgid "plugins.generic.dataverse.log.sendDatasetDeleteEmail"
109109
msgstr "Email sent to {$email} notifying the deletion of research data."
110110

111111
msgid "plugins.generic.dataverse.error.researchDataRequired"
112-
msgstr "To submit research data, it is necessary to send at least one file.<br>"
112+
msgstr "To submit research data, it is necessary to send at least one file, accompanied by a README file.<br>"
113113
"Please ensure that you have chosen and submitted research data files in step 2 of the submission."
114114

115115
msgid "plugins.generic.dataverse.error.datasetSubjectRequired"
@@ -119,6 +119,9 @@ msgstr "The subject of the research data is required.<br>"
119119
msgid "plugins.generic.dataverse.error.readmeFileRequired"
120120
msgstr "It is mandatory to send a README file, in PDF or TXT format, to accompany the research data files"
121121

122+
msgid "plugins.generic.dataverse.error.notSolelyReadmeFile"
123+
msgstr "The research data cannot consist solely of the README file"
124+
122125
msgid "plugins.generic.dataverse.error.getFailed"
123126
msgstr "Error getting research data to Dataverse: {$error}"
124127

locale/es_ES/locale.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ msgid "plugins.generic.dataverse.log.sendDatasetDeleteEmail"
112112
msgstr "Correo electrónico enviado a {$email} para notificar la eliminación de los datos de investigación."
113113

114114
msgid "plugins.generic.dataverse.error.researchDataRequired"
115-
msgstr "Para enviar datos de investigación, es necesario enviar al menos un archivo.<br>"
115+
msgstr "Para enviar datos de investigación, es necesario enviar al menos un archivo, acompañado de un archivo README.<br>"
116116
"Asegúrate de haber seleccionado y enviado archivos de datos de investigación en el paso 2 del envío."
117117

118118
msgid "plugins.generic.dataverse.error.datasetSubjectRequired"
@@ -122,6 +122,9 @@ msgstr "El asunto de los datos de investigación es obligatorio.<br>"
122122
msgid "plugins.generic.dataverse.error.readmeFileRequired"
123123
msgstr "Es obligatorio enviar un archivo README, en formato PDF o TXT, que acompañe a los archivos de datos de la investigación"
124124

125+
msgid "plugins.generic.dataverse.error.notSolelyReadmeFile"
126+
msgstr "Los datos de investigación no pueden consistir únicamente en el archivo README"
127+
125128
msgid "plugins.generic.dataverse.error.getFailed"
126129
msgstr "Erro al obtener datos de investigación en Dataverse: {$error}"
127130

locale/pt_BR/locale.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ msgid "plugins.generic.dataverse.log.sendDatasetDeleteEmail"
112112
msgstr "Email enviado para {$email} notificando a exclusão dos dados de pesquisa"
113113

114114
msgid "plugins.generic.dataverse.error.researchDataRequired"
115-
msgstr "Para submeter dados de pesquisa é necessário enviar pelo menos um arquivo.<br>"
115+
msgstr "Para submeter dados de pesquisa é necessário enviar pelo menos um arquivo, acompanhado de um arquivo README.<br>"
116116
"Certifique-se que você escolheu e enviou arquivos de dados de pesquisa no passo 2 da submissão."
117117

118118
msgid "plugins.generic.dataverse.error.datasetSubjectRequired"
@@ -122,6 +122,9 @@ msgstr "O assunto dos dados de pesquisa é obrigatório.<br>"
122122
msgid "plugins.generic.dataverse.error.readmeFileRequired"
123123
msgstr "É obrigatório o envio de um arquivo README, em formato PDF ou TXT, que acompanhe os arquivos de dados de pesquisa"
124124

125+
msgid "plugins.generic.dataverse.error.notSolelyReadmeFile"
126+
msgstr "Os dados da pesquisa não podem ser constituídos apenas pelo arquivo README"
127+
125128
msgid "plugins.generic.dataverse.error.getFailed"
126129
msgstr "Erro ao obter dados de pesquisa no Dataverse: {$error}"
127130

upgrade.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE install SYSTEM "../../../lib/pkp/dtd/install.dtd">
33

4-
<install version="2.8.9.2">
4+
<install version="2.8.9.3">
55
<migration
66
class="plugins.generic.dataverse.classes.migration.APITokenEncryptionMigration"
77
/>

version.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<version>
1414
<application>dataverse</application>
1515
<type>plugins.generic</type>
16-
<release>2.8.9.2</release>
17-
<date>2026-05-14</date>
16+
<release>2.8.9.3</release>
17+
<date>2026-05-18</date>
1818
<lazy-load>1</lazy-load>
1919
<class>DataversePlugin</class>
2020
</version>

0 commit comments

Comments
 (0)