From 0b76acbedef1b97fc07c585514c7be7857def71e Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 11 Apr 2023 15:35:22 +0200
Subject: [PATCH] Change the draft version to be the next one after the latest
 published [SCI-8237]

---
 app/javascript/vue/protocol/modals/publish_protocol.vue | 2 +-
 app/javascript/vue/protocol/protocolMetadata.vue        | 6 +++---
 app/serializers/protocol_serializer.rb                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/vue/protocol/modals/publish_protocol.vue b/app/javascript/vue/protocol/modals/publish_protocol.vue
index 340e1c50a..ef3f2bbae 100644
--- a/app/javascript/vue/protocol/modals/publish_protocol.vue
+++ b/app/javascript/vue/protocol/modals/publish_protocol.vue
@@ -5,7 +5,7 @@
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
           <h4 class="modal-title">
-            {{ i18n.t('protocols.publish_modal.title', { nr: this.protocol.attributes.version })}}
+            {{ i18n.t('protocols.publish_modal.title', { nr: protocol.attributes.version + 1 })}}
           </h4>
         </div>
         <div class="modal-body">
diff --git a/app/javascript/vue/protocol/protocolMetadata.vue b/app/javascript/vue/protocol/protocolMetadata.vue
index db85c0c66..64d50fe2a 100644
--- a/app/javascript/vue/protocol/protocolMetadata.vue
+++ b/app/javascript/vue/protocol/protocolMetadata.vue
@@ -109,11 +109,11 @@
           return version;
         }
 
-        if (version > 1) {
-          return this.i18n.t('protocols.header.draft_with_from_version', {nr: version});
+        if (version === this.i18n.t('protocols.draft')) {
+          return version;
         }
 
-        return this.i18n.t('protocols.draft')
+        return this.i18n.t('protocols.header.draft_with_from_version', {nr: version});
       }
     },
     methods: {
diff --git a/app/serializers/protocol_serializer.rb b/app/serializers/protocol_serializer.rb
index 0ec850f45..8419ffcca 100644
--- a/app/serializers/protocol_serializer.rb
+++ b/app/serializers/protocol_serializer.rb
@@ -19,9 +19,9 @@ class ProtocolSerializer < ActiveModel::Serializer
   def version
     return object.version_number unless object.in_repository_draft?
 
-    return object.previous_version.version_number + 1 if object.previous_version
+    return object.previous_version.version_number if object.previous_version
 
-    1
+    I18n.t('protocols.draft')
   end
 
   def published