Merge branch 'fixSubmitVersionForm-575' into 'main'

Conserta problema com submissão de versões See merge request softwares-pkp/plugins_ojs/authorVersion!5
lepidus · Aug 14, 2023 · d73e241 · d73e241
2 parents ef44f4d + a439731
commit d73e241
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/AuthorVersionPlugin.inc.php b/AuthorVersionPlugin.inc.php
@@ -62,7 +62,7 @@ public function setAuthorCanPublishVersion($hookName, $params)
 
     public function addOurFieldsToPublicationSchema($hookName, $params)
     {
-        $schema =& $params[0];
+        $schema = & $params[0];
 
         $schema->properties->{'versionJustification'} = (object) [
             'type' => 'string',
@@ -89,7 +89,7 @@ public function preventsDuplicationOfVersionJustification($hookName, $params)
 
     public function addWorkflowModifications($hookName, $params)
     {
-        $templateMgr =& $params[1];
+        $templateMgr = & $params[1];
         $request = PKPApplication::get()->getRequest();
 
         $templateMgr->registerFilter("output", array($this, 'addVersionJustificationButtonFilter'));
@@ -129,10 +129,9 @@ private function addSubmitVersionForm($templateMgr, $request)
     {
         $context = $request->getContext();
         $submission = $templateMgr->get_template_vars('submission');
-        $publication = $submission->getLatestPublication();
 
         $this->import('classes.components.forms.SubmitVersionForm');
-        $submitVersionUrl = $request->getDispatcher()->url($request, ROUTE_API, $context->getPath(), 'authorVersion/submitVersion', null, null, ['publicationId' => $publication->getId()]);
+        $submitVersionUrl = $request->getDispatcher()->url($request, ROUTE_API, $context->getPath(), 'authorVersion/submitVersion', null, null, ['submissionId' => $submission->getId()]);
         $submitVersionForm = new SubmitVersionForm($submitVersionUrl);
 
         $workflowComponents = $templateMgr->getState('components');
@@ -167,7 +166,7 @@ public function setupAuthorVersionHandler($hookName, $request)
     public function showVersionJustificationOnPreprintDetails($hookName, $params)
     {
         $templateMgr = $params[1];
-        $output =& $params[2];
+        $output = & $params[2];
 
         $publication = $templateMgr->get_template_vars('publication');
 
@@ -245,7 +244,7 @@ public function newVersionSubmissionTabFilter($output, $templateMgr)
 
     public function modifySubmissionQueryBuilder($hookName, $args)
     {
-        $submissionQB =& $args[0];
+        $submissionQB = & $args[0];
         $requestArgs = $args[1];
 
         if (empty($requestArgs['newVersionSubmitted'])) {

diff --git a/api/v1/authorVersion/AuthorVersionHandler.inc.php b/api/v1/authorVersion/AuthorVersionHandler.inc.php
@@ -41,10 +41,17 @@ public function submitVersion($slimRequest, $response, $args)
         $queryParams = $slimRequest->getQueryParams();
 
         $versionJustification = $requestParams['versionJustification'];
-        $publicationId = (int) $queryParams['publicationId'];
+        $submissionId = (int) $queryParams['submissionId'];
+
+        $submissionService = Services::get('submission');
+        $submission = $submissionService->get($submissionId);
+        $publication = $submission->getLatestPublication();
+
+        if(!is_null($publication->getData('versionJustification'))) {
+            return $response->withStatus(400);
+        }
 
         $publicationService = Services::get('publication');
-        $publication = $publicationService->get($publicationId);
         $publicationService->edit($publication, ['versionJustification' => $versionJustification], $this->getRequest());
 
         $this->sendSubmittedVersionEmail($publication, $versionJustification);

diff --git a/cypress/tests/Test3_submitVersion.spec.js b/cypress/tests/Test3_submitVersion.spec.js
@@ -35,4 +35,18 @@ describe('Author Version - Submit new version', function () {
         cy.get('h2:contains("Version justification")');
         cy.contains(versionJustification);
     })
+    it('Checks if version submission works if performed just after version creation', function () {
+        cy.login('zwoods', null, 'publicknowledge');
+        cy.get('#archive-button').click();
+        cy.contains('View Woods').click({force: true});
+        cy.get('button:contains("Create New Version")').click();
+        cy.wait(2000);
+
+        cy.get('button:contains("Submit New Version")').click();
+        cy.get('input[name="versionJustification"]').clear().type(versionJustification, {delay: 0});
+        cy.get('div[modalname="submitVersion"] button:contains("Submit")').click();
+
+        cy.get('button:contains("Version justification")').click();
+        cy.contains(versionJustification);
+    });
 });
diff --git a/version.xml b/version.xml
@@ -12,8 +12,8 @@
 <version>
 	<application>authorVersion</application>
 	<type>plugins.generic</type>
-	<release>1.2.4.0</release>
-	<date>2023-08-10</date>
+	<release>1.2.5.0</release>
+	<date>2023-08-14</date>
 	<lazy-load>1</lazy-load>
 	<class>AuthorVersionPlugin</class>
 </version>