Skip to content

Commit 8d3ca4b

Browse files
committed
Merge branch 'fix_dataverse_required_metadata_display-3_4_0_i917' into 'main'
Corrige exibição dos campos obrigatórios do Dataverse See merge request softwares-pkp/plugins_ojs/dataverse!232
2 parents 789f13f + df60566 commit 8d3ca4b

4 files changed

Lines changed: 27 additions & 22 deletions

File tree

classes/components/forms/DraftDatasetFileForm.php

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
namespace APP\plugins\generic\dataverse\classes\components\forms;
44

5-
use PKP\components\forms\FormComponent;
6-
use PKP\components\forms\FieldUpload;
7-
use PKP\components\forms\FieldOptions;
85
use APP\core\Application;
9-
use PKP\facades\Locale;
6+
use PKP\components\forms\FieldOptions;
7+
use PKP\components\forms\FieldUpload;
8+
use PKP\components\forms\FormComponent;
109
use PKP\db\DAORegistry;
11-
use APP\plugins\generic\dataverse\dataverseAPI\DataverseClient;
12-
use APP\plugins\generic\dataverse\classes\exception\DataverseException;
10+
use PKP\facades\Locale;
1311

1412
class DraftDatasetFileForm extends FormComponent
1513
{
@@ -23,20 +21,21 @@ public function __construct($action, $context)
2321
$temporaryFileApiUrl = $this->getTemporaryFileApiUrl($context);
2422

2523
$this->addField(new FieldUpload('datasetFile', [
26-
'isRequired' => true,
2724
'label' => __('plugins.generic.dataverse.modal.addFile.datasetFileLabel'),
25+
'isRequired' => true,
26+
'value' => null,
2827
'options' => [
2928
'url' => $temporaryFileApiUrl,
3029
]
3130
]))
32-
->addField(new FieldOptions('termsOfUse', [
33-
'isRequired' => true,
34-
'label' => __('plugins.generic.dataverse.termsOfUse.label'),
35-
'options' => [
36-
['value' => true, 'label' => __('plugins.generic.dataverse.termsOfUse.description', $termsOfUseParams)],
37-
],
38-
'value' => false
39-
]));
31+
->addField(new FieldOptions('termsOfUse', [
32+
'isRequired' => true,
33+
'label' => __('plugins.generic.dataverse.termsOfUse.label'),
34+
'options' => [
35+
['value' => true, 'label' => __('plugins.generic.dataverse.termsOfUse.description', $termsOfUseParams)],
36+
],
37+
'value' => false
38+
]));
4039
}
4140

4241
private function getTemporaryFileApiUrl($context): string
@@ -49,7 +48,6 @@ private function getTemporaryFileApiUrl($context): string
4948
private function getTermsOfUseData($contextId)
5049
{
5150
$locale = Locale::getLocale();
52-
$dataverseClient = new DataverseClient();
5351
$configuration = DAORegistry::getDAO('DataverseConfigurationDAO')->get($contextId);
5452
$termsOfUse = $configuration->getLocalizedData('termsOfUse', $locale);
5553

dataverseAPI/actions/DataverseCollectionActions.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
namespace APP\plugins\generic\dataverse\dataverseAPI\actions;
44

5-
use APP\plugins\generic\dataverse\dataverseAPI\actions\interfaces\DataverseCollectionActionsInterface;
65
use APP\plugins\generic\dataverse\classes\entities\DataverseCollection;
76
use APP\plugins\generic\dataverse\classes\entities\DataverseResponse;
8-
use APP\plugins\generic\dataverse\dataverseAPI\actions\DataverseActions;
7+
use APP\plugins\generic\dataverse\dataverseAPI\actions\interfaces\DataverseCollectionActionsInterface;
98

109
class DataverseCollectionActions extends DataverseActions implements DataverseCollectionActionsInterface
1110
{
@@ -111,7 +110,7 @@ public function getRequiredMetadata(): array
111110
if (is_null($dataverseRequiredMetadata) || $currentCacheTime > self::ONE_DAY_SECONDS) {
112111
$cache->flush();
113112

114-
$args = 'returnDatasetFieldTypes=true&onlyDisplayedOnCreate=true';
113+
$args = 'returnDatasetFieldTypes=true';
115114
$uri = $this->getCurrentDataverseURI() . '/metadatablocks?' . $args;
116115
$response = $this->nativeAPIRequest('GET', $uri);
117116
$responseBody = json_decode($response->getBody(), true);
@@ -178,7 +177,7 @@ private function filterRequiredFields(array $fields): array
178177
{
179178
$metadataToFilter = [
180179
'title', 'dsDescriptionValue', 'subject', 'authorName', 'authorIdentifierScheme', 'subject',
181-
'datasetContactName', 'datasetContactEmail', 'depositor', 'publicationCitation'
180+
'datasetContactName', 'datasetContactEmail', 'depositor', 'publicationCitation', 'producerName'
182181
];
183182
$filteredFields = [];
184183

js/ui/components/DatasetFilesListPanel.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ pkp.Vue.component('dataset-files-list-panel', {
124124
},
125125
addFileFormSuccess(data) {
126126
this.refreshItems();
127+
this.clearForm();
127128
this.$modal.hide('addDatasetFileModal');
128129
},
129130
openDeleteFileModal(fileId, fileName) {
@@ -219,6 +220,13 @@ pkp.Vue.component('dataset-files-list-panel', {
219220
termsOfUseFieldOption.label = termsOfUseFieldOption.label.replace('{$dataverseName}', r.dataverseName);
220221
},
221222
});
223+
},
224+
clearForm() {
225+
let form = {...this.form};
226+
Object.keys(form.fields).forEach((key) => {
227+
form.fields[key].value = null;
228+
});
229+
this.form = form;
222230
}
223231
},
224232
render: function (h) {

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>3.4.3.0</release>
17-
<date>2026-05-25</date>
16+
<release>3.4.3.1</release>
17+
<date>2026-06-17</date>
1818
<lazy-load>1</lazy-load>
1919
<class>DataversePlugin</class>
2020
</version>

0 commit comments

Comments
 (0)