From 1e272f51e110f6f7f39e6cece9fab75cbbdc39f0 Mon Sep 17 00:00:00 2001
From: Jhon <jhon@lepidus.com.br>
Date: Thu, 10 Oct 2024 15:11:33 -0400
Subject: [PATCH 1/4] Fix interference with the user assignment form

Issue: documentacao-e-tarefas/scielo#707

Signed-off-by: Jhon <jhon@lepidus.com.br>
---
 classes/dispatchers/DatasetTabDispatcher.inc.php | 1 +
 js/DataverseWorkflowPage.js                      | 2 +-
 locale/en_US/locale.po                           | 6 ++++++
 locale/es_ES/locale.po                           | 6 ++++++
 locale/pt_BR/locale.po                           | 6 ++++++
 templates/datasetTab/datasetData.tpl             | 8 ++++----
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/classes/dispatchers/DatasetTabDispatcher.inc.php b/classes/dispatchers/DatasetTabDispatcher.inc.php
index 67517daf..55434c27 100644
--- a/classes/dispatchers/DatasetTabDispatcher.inc.php
+++ b/classes/dispatchers/DatasetTabDispatcher.inc.php
@@ -211,6 +211,7 @@ private function setupResearchDataUpdate(Submission $submission, DataverseStudy
             'confirmPublishDatasetMessage' => __('plugins.generic.dataverse.modal.confirmDatasetPublish', [
                 'serverUrl' => $configuration->getDataverseServerUrl(),
             ]),
+            'loadingCitationMsg' => __('plugins.generic.dataverse.metadataForm.loadingDatasetCitation'),
             'datasetCitationUrl' => $dispatcher->url($request, ROUTE_API, $context->getPath(), 'datasets/' . $study->getId() . '/citation'),
             'canSendEmail' => in_array(ROLE_ID_MANAGER, $userRoles),
             'hasDepositedDataset' => true
diff --git a/js/DataverseWorkflowPage.js b/js/DataverseWorkflowPage.js
index ec04532b..0e0a5cc6 100644
--- a/js/DataverseWorkflowPage.js
+++ b/js/DataverseWorkflowPage.js
@@ -307,7 +307,7 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
                 return;
             }
             var self = this;
-            this.datasetCitation = this.__('common.loading') + '...';
+            this.datasetCitation = this.loadingCitationMsg;
             $.ajax({
                 url: self.datasetCitationUrl,
                 type: 'GET',
diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po
index 9fb5ddf3..ee3217b1 100644
--- a/locale/en_US/locale.po
+++ b/locale/en_US/locale.po
@@ -210,6 +210,12 @@ msgstr "Publish research data"
 msgid "plugins.generic.dataverse.dataset.titlePrefix"
 msgstr "Replication data for: "
 
+msgid "plugins.generic.dataverse.metadataForm.loadingDataset"
+msgstr "Loading research data information..."
+
+msgid "plugins.generic.dataverse.metadataForm.loadingDatasetCitation"
+msgstr "Loading citation..."
+
 msgid "plugins.generic.dataverse.metadataForm.title"
 msgstr "Title"
 
diff --git a/locale/es_ES/locale.po b/locale/es_ES/locale.po
index 922d2668..a798d8c2 100644
--- a/locale/es_ES/locale.po
+++ b/locale/es_ES/locale.po
@@ -213,6 +213,12 @@ msgstr "Publicar datos de investigación"
 msgid "plugins.generic.dataverse.dataset.titlePrefix"
 msgstr "Datos de réplica: "
 
+msgid "plugins.generic.dataverse.metadataForm.loadingDataset"
+msgstr "Cargando información de los datos de investigación..."
+
+msgid "plugins.generic.dataverse.metadataForm.loadingDatasetCitation"
+msgstr "Cargando citación..."
+
 msgid "plugins.generic.dataverse.metadataForm.title"
 msgstr "Título"
 
diff --git a/locale/pt_BR/locale.po b/locale/pt_BR/locale.po
index 59eecdcc..d9446383 100644
--- a/locale/pt_BR/locale.po
+++ b/locale/pt_BR/locale.po
@@ -213,6 +213,12 @@ msgstr "Publicar dados de pesquisa"
 msgid "plugins.generic.dataverse.dataset.titlePrefix"
 msgstr "Dados de replicação para: "
 
+msgid "plugins.generic.dataverse.metadataForm.loadingDataset"
+msgstr "Carregando informações dos dados de pesquisa..."
+
+msgid "plugins.generic.dataverse.metadataForm.loadingDatasetCitation"
+msgstr "Carregando citação..."
+
 msgid "plugins.generic.dataverse.metadataForm.title"
 msgstr "Título"
 
diff --git a/templates/datasetTab/datasetData.tpl b/templates/datasetTab/datasetData.tpl
index 22eaf610..f4b56489 100644
--- a/templates/datasetTab/datasetData.tpl
+++ b/templates/datasetTab/datasetData.tpl
@@ -1,13 +1,13 @@
 <span v-if="datasetIsLoading">
     <spinner></spinner>
-    {{ __('common.loading')}} ...
+    {translate key="plugins.generic.dataverse.metadataForm.loadingDataset"}
 </span>
-<section v-if="!datasetIsLoading" id="datasetData" class="item datasetData -pkpClearfix">
+<section id="datasetData" class="item datasetData -pkpClearfix">
     <pkp-header>
         <h1>
             {translate key="plugins.generic.dataverse.researchData"}
         </h1>
-        <template slot="actions">
+        <template v-if="!datasetIsLoading" slot="actions">
             <pkp-button
                 @click="openDeleteDatasetModal"
                 :is-warnable="true"
@@ -45,7 +45,7 @@
                     <pkp-header slot="header">
                         <h2>{{ components.datasetFiles.title }}</h2>
                         <spinner v-if="components.datasetFiles.isLoading"></spinner>
-                        <template slot="actions">
+                        <template v-if="!datasetIsLoading" slot="actions">
                             <pkp-button 
                                 ref="fileModalButton"
                                 @click="openAddFileModal"

From 72822a98f8eb727b09467db1d3626f0810a07b66 Mon Sep 17 00:00:00 2001
From: Jhon <jhon@lepidus.com.br>
Date: Thu, 10 Oct 2024 15:13:02 -0400
Subject: [PATCH 2/4] Updates version.xml

Issue: documentacao-e-tarefas/scielo#707

Signed-off-by: Jhon <jhon@lepidus.com.br>
---
 version.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.xml b/version.xml
index 0389f971..90ec7f85 100644
--- a/version.xml
+++ b/version.xml
@@ -13,8 +13,8 @@
 <version>
 	<application>dataverse</application>
 	<type>plugins.generic</type>
-	<release>2.6.0.0</release>
-	<date>2024-09-24</date>
+	<release>2.6.1.0</release>
+	<date>2024-10-10</date>
 	<lazy-load>1</lazy-load>
 	<class>DataversePlugin</class>
 </version>

From 858347b8e2e16db515544cc3abae32468441691e Mon Sep 17 00:00:00 2001
From: Jhon <jhon@lepidus.com.br>
Date: Thu, 10 Oct 2024 16:29:36 -0400
Subject: [PATCH 3/4] Fixes problem with loading of form elements

Issue: documentacao-e-tarefas/scielo#707

Signed-off-by: Jhon <jhon@lepidus.com.br>
---
 js/DataverseWorkflowPage.js          | 4 ++++
 templates/datasetTab/datasetData.tpl | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/DataverseWorkflowPage.js b/js/DataverseWorkflowPage.js
index 0e0a5cc6..0a6ef468 100644
--- a/js/DataverseWorkflowPage.js
+++ b/js/DataverseWorkflowPage.js
@@ -23,6 +23,10 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
         },
 
         datasetIsPublished: function () {
+            if (this.datasetIsLoading) {
+                return false;
+            }
+
             return this.dataset.versionState === 'RELEASED';
         },
 
diff --git a/templates/datasetTab/datasetData.tpl b/templates/datasetTab/datasetData.tpl
index f4b56489..0ef2ab9f 100644
--- a/templates/datasetTab/datasetData.tpl
+++ b/templates/datasetTab/datasetData.tpl
@@ -7,7 +7,7 @@
         <h1>
             {translate key="plugins.generic.dataverse.researchData"}
         </h1>
-        <template v-if="!datasetIsLoading" slot="actions">
+        <template slot="actions">
             <pkp-button
                 @click="openDeleteDatasetModal"
                 :is-warnable="true"
@@ -45,7 +45,7 @@
                     <pkp-header slot="header">
                         <h2>{{ components.datasetFiles.title }}</h2>
                         <spinner v-if="components.datasetFiles.isLoading"></spinner>
-                        <template v-if="!datasetIsLoading" slot="actions">
+                        <template slot="actions">
                             <pkp-button 
                                 ref="fileModalButton"
                                 @click="openAddFileModal"

From 135d734bd12819980cd21b0126a618d8d715d7e2 Mon Sep 17 00:00:00 2001
From: Jhon <jhon@lepidus.com.br>
Date: Thu, 10 Oct 2024 16:42:22 -0400
Subject: [PATCH 4/4] Improves datasetIsPublished method

Issue: documentacao-e-tarefas/scielo#707

Signed-off-by: Jhon <jhon@lepidus.com.br>
---
 js/DataverseWorkflowPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/DataverseWorkflowPage.js b/js/DataverseWorkflowPage.js
index 0a6ef468..29299808 100644
--- a/js/DataverseWorkflowPage.js
+++ b/js/DataverseWorkflowPage.js
@@ -24,7 +24,7 @@ var DataverseWorkflowPage = $.extend(true, {}, pkp.controllers.WorkflowPage, {
 
         datasetIsPublished: function () {
             if (this.datasetIsLoading) {
-                return false;
+                return true;
             }
 
             return this.dataset.versionState === 'RELEASED';