Merge branch 'removeNotFoundDataset-584' into 'main'

Delete dataset data from database when dataset not found in Dataverse See merge request softwares-pkp/plugins_ojs/dataverse!140
lepidus · Aug 28, 2023 · 7c93ebe · 7c93ebe
2 parents b6f9be9 + 7c05e9e
commit 7c93ebe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/classes/dispatchers/DatasetTabDispatcher.inc.php b/classes/dispatchers/DatasetTabDispatcher.inc.php
@@ -52,7 +52,12 @@ private function getDatasetTabContent(Submission $submission): string
             $dataset = $dataverseClient->getDatasetActions()->get($study->getPersistentId());
             return $this->plugin->getTemplateResource('datasetTab/datasetData.tpl');
         } catch (DataverseException $e) {
+            if ($e->getCode() === 404) {
+                DAORegistry::getDAO('DataverseStudyDAO')->deleteStudy($study);
+            }
+
             error_log('Dataverse API error: ' . $e->getMessage());
+
             $templateMgr = TemplateManager::getManager(Application::get()->getRequest());
             $templateMgr->assign('errorMessage', $e->getMessage());
             return $this->plugin->getTemplateResource('datasetTab/researchDataError.tpl');

diff --git a/cypress/tests/Test02_ResearchDataState.spec.js b/cypress/tests/Test02_ResearchDataState.spec.js
@@ -133,6 +133,7 @@ describe('Research data state', function () {
 		cy.get('button[aria-controls="datasetTab"]').click();
 
 		cy.get('button').contains('Upload research data').click();
+		cy.wait(1000);
 		cy.contains('Add research data').click();
 		cy.wait(1000);
 		cy.fixture('dummy.pdf', 'base64').then((fileContent) => {

diff --git a/templates/datasetTab/researchDataError.tpl b/templates/datasetTab/researchDataError.tpl
@@ -4,7 +4,7 @@
     </pkp-header>
     <span class="value">
         <p>
-            {translate key="plugins.generic.dataverse.notification.connectionError" errorMessage=$errorMessage}
+            {translate key="plugins.generic.dataverse.error.getFailed" error=$errorMessage}
         </p>
     </span>
 </section>
diff --git a/version.xml b/version.xml
@@ -13,8 +13,8 @@
 <version>
 	<application>dataverse</application>
 	<type>plugins.generic</type>
-	<release>2.4.2.0</release>
-	<date>2023-08-21</date>
+	<release>2.4.3.0</release>
+	<date>2023-08-28</date>
 	<lazy-load>1</lazy-load>
 	<class>DataversePlugin</class>
 </version>