Skip to content

Commit 07aaa02

Browse files
Merge branch 'fixDataverseNameExpiredToken340-813' into 'main'
Corrige erro na obtenção do nome do repositório Dataverse - 3.4.0 See merge request softwares-pkp/plugins_ojs/dataverse!206
2 parents a091770 + 5c24f4c commit 07aaa02

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

classes/dispatchers/DataStatementDispatcher.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ public function viewDataStatement(string $hookName, array $params): bool
231231
$output = &$params[2];
232232

233233
$dataStatementService = new DataStatementService();
234-
$allDataStatementTypes = $dataStatementService->getDataStatementTypes();
235-
unset($allDataStatementTypes[DataStatementService::DATA_STATEMENT_TYPE_DATAVERSE_SUBMITTED]);
234+
$allDataStatementTypes = $dataStatementService->getDataStatementTypes(false);
236235

237236
$templateMgr->assign('dataStatementConsts', $dataStatementService->getConstantsForTemplates());
238237
$templateMgr->assign('dataStatementMessages', $allDataStatementTypes);

dataverseAPI/actions/DataverseCollectionActions.php

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public function get(): DataverseCollection
2727
$response = $this->nativeAPIRequest('GET', $uri);
2828
$dataverseCollection = $this->createDataverseCollection($response);
2929

30-
$cache->setEntireCache($dataverseCollection);
30+
if (!empty($dataverseCollection->getName())) {
31+
$cache->setEntireCache($dataverseCollection);
32+
}
3133
}
3234

3335
return $dataverseCollection;
@@ -51,7 +53,9 @@ public function getRoot(): DataverseCollection
5153
$response = $this->nativeAPIRequest('GET', $uri);
5254
$rootDataverseCollection = $this->createDataverseCollection($response);
5355

54-
$cache->setEntireCache($rootDataverseCollection);
56+
if (!empty($rootDataverseCollection->getName())) {
57+
$cache->setEntireCache($rootDataverseCollection);
58+
}
5559
}
5660

5761
return $rootDataverseCollection;
@@ -102,6 +106,15 @@ public function publish(): void
102106
private function createDataverseCollection(DataverseResponse $response): DataverseCollection
103107
{
104108
$jsonContent = json_decode($response->getBody(), true);
109+
if ($jsonContent['status'] != 'OK'
110+
|| empty($jsonContent['data'])
111+
|| !isset($jsonContent['data']['name'])
112+
) {
113+
$dummyDataverseCollection = new DataverseCollection();
114+
$dummyDataverseCollection->setName('');
115+
return $dummyDataverseCollection;
116+
}
117+
105118
$dataverseCollectionData = $jsonContent['data'];
106119
$dataverseCollection = new DataverseCollection();
107120
$dataverseCollection->setAllData($dataverseCollectionData);

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.3.2.0</release>
17-
<date>2025-06-06</date>
16+
<release>3.3.3.0</release>
17+
<date>2025-08-15</date>
1818
<lazy-load>1</lazy-load>
1919
<class>DataversePlugin</class>
2020
</version>

0 commit comments

Comments
 (0)