Merge branch 'fixAdditionalInstructions330-749' into 'stable-3_3_0'

Corrige exibição das instruções adicionais no fluxo de trabalho - 3.3.0

See merge request softwares-pkp/plugins_ojs/dataverse!182

Author: JhonathanLepidus

classes/dispatchers/DatasetTabDispatcher.inc.php

@@ -31,14 +31,14 @@ public function addResearchDataTab(string $hookName, array $params): bool
         $tabTemplate = $this->plugin->getTemplateResource('datasetTab/noResearchData.tpl');
 
         if (!is_null($study)) {
-            $configurationDAO = DAORegistry::getDAO('DataverseConfigurationDAO');
-            $configuration = $configurationDAO->get($submission->getData('contextId'));
-            $additionalInstructions = $configuration->getLocalizedData('additionalInstructions');
-
-            $templateMgr->assign('dataverseAdditionalInstructions', $additionalInstructions);
             $tabTemplate = $this->plugin->getTemplateResource('datasetTab/datasetData.tpl');
         }
 
+        $configurationDAO = DAORegistry::getDAO('DataverseConfigurationDAO');
+        $configuration = $configurationDAO->get($submission->getData('contextId'));
+        $additionalInstructions = $configuration->getLocalizedData('additionalInstructions');
+        $templateMgr->assign('dataverseAdditionalInstructions', $additionalInstructions);
+
         $output .= sprintf(
             '<tab id="datasetTab" label="%s" :badge="researchDataCount">%s</tab>',
             __("plugins.generic.dataverse.researchData"),

cypress/tests/Test03_ResearchDataDeposit.spec.js

@@ -151,6 +151,7 @@ describe('Research data deposit', function () {
 
 		cy.waitDatasetTabLoading('datasetTab');
 
+		cy.contains('Additional instructions about research data submission');
 		cy.contains('Delete research data').should('be.disabled');
 		cy.get('div[aria-labelledby="dataset_metadata-button"] > form button[label="Save"]').should('be.disabled');
 
@@ -193,7 +194,6 @@ describe('Research data deposit', function () {
 		cy.waitDatasetTabLoading('datasetTab');
 		cy.get('button[aria-controls="dataset_files"]').click();
 
-		cy.contains('Additional instructions about research data submission');
 		cy.get('button').contains('Add research data').click();
 		cy.fixture('dummy.pdf', 'base64').then((fileContent) => {
 			cy.get('#datasetFileForm-datasetFile-hiddenFileId').upload({
@@ -225,6 +225,7 @@ describe('Research data deposit', function () {
 		cy.contains('Delete research data').click();
 		cy.get('[data-modal="delete"] button').contains('Yes').click();
 		cy.contains('No research data transferred.');
+		cy.contains('Additional instructions about research data submission');
 
 		cy.get('button[aria-controls="dataStatement"]').click();
 		cy.get('#dataStatement input[name="researchDataSubmitted"]').should('not.be.checked');

styles/datasetDataTab.css

@@ -80,4 +80,11 @@ div:not(:last-child) > .pkp_controllers_grid {
 .pkpPublication__tabs.pkpTabs--side .pkpTab .pkpForm.researchData__stateForm {
     margin: 0;
     border: none;
+}
+
+#dataverseAdditionalInstructions {
+    margin-top: 1.5rem;
+    line-height: 1.5rem;
+    font-size: 0.875rem;
+    text-align: justify;
 }

templates/datasetTab/datasetData.tpl

@@ -90,11 +90,6 @@
                         </pkp-form>
                     </modal-content>
                 </modal>
-                {if $dataverseAdditionalInstructions}
-                    <div id="dataverseAdditionalInstructions" style="margin-top: 1.5rem;line-height: 1.5rem;font-size: 0.875rem;">
-                        {$dataverseAdditionalInstructions}
-                    </div>
-                {/if}
             </div>
         </tab>
     </tabs>
@@ -111,4 +106,9 @@
             </pkp-form>
         </modal-content>
     </modal>
+    {if $dataverseAdditionalInstructions}
+        <div id="dataverseAdditionalInstructions" style="padding: 0 2rem;">
+            {$dataverseAdditionalInstructions}
+        </div>
+    {/if}
 </section>

templates/datasetTab/noResearchData.tpl

@@ -76,4 +76,9 @@
 			</div>
 		</modal-content>
 	</modal>
+	{if $dataverseAdditionalInstructions}
+		<div id="dataverseAdditionalInstructions">
+			{$dataverseAdditionalInstructions}
+		</div>
+	{/if}
 </section>