From 4b264db34337356f9d81b83a6c306b2d25ff7756 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 14 Feb 2023 14:59:05 +0100
Subject: [PATCH 1/9] Update the text of the inlink protocol modal [SCI-7909]

---
 .../javascripts/my_modules/protocols.js       | 19 +++++++++++++++----
 app/controllers/protocols_controller.rb       |  1 +
 config/locales/en.yml                         |  5 +++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index 1e909460c..bd04b990f 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -99,12 +99,23 @@ function initLinkUpdate() {
   var updateBtn = modal.find(".modal-footer [data-action='submit']");
   $("[data-action='unlink'], [data-action='revert'], [data-action='update-parent'], [data-action='update-self']")
     .on('ajax:success', function(e, data) {
-      modalTitle.html(data.title);
-      modalBody.html(data.message);
-      updateBtn.text(data.btn_text);
-      modal.attr('data-url', data.url);
+      const modalBodyTemplate = (message, warning) => `<p class="message">${message}</p>
+                                                       <p class="message">${warning || ''}</p>`;
+      const {
+        title,
+        message,
+        warning,
+        btn_text: btnText,
+        url
+      } = data;
+
+      modalTitle.html(title);
+      modalBody.html(modalBodyTemplate(message, warning));
+      updateBtn.text(btnText);
+      modal.attr('data-url', url);
       modal.modal('show');
     });
+
   modal.on('hidden.bs.modal', function() {
     modalBody.html('');
   });
diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index 72eb25a2e..c5d461dfd 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -881,6 +881,7 @@ class ProtocolsController < ApplicationController
         render json: {
           title: t('my_modules.protocols.confirm_link_update_modal.unlink_title'),
           message: t('my_modules.protocols.confirm_link_update_modal.unlink_message'),
+          warning: t('my_modules.protocols.confirm_link_update_modal.unlink_warning'),
           btn_text: t('my_modules.protocols.confirm_link_update_modal.unlink_btn_text'),
           url: unlink_protocol_path(@protocol)
         }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 019b535d7..f8f0a3084 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1074,8 +1074,9 @@ en:
           update_self_title: "Update this protocol with the version stored in the templates"
       confirm_link_update_modal:
         unlink_title: "Unlink protocol template"
-        unlink_message: "Are you sure you want to unlink the task protocol from the templates version? This will stop any tracking of changes."
-        unlink_btn_text: "Unlink"
+        unlink_message: "This will stop tracking changes of protocol templates. We can’t link it back once you unlink it."
+        unlink_warning: "Are you sure?"
+        unlink_btn_text: "Yes, unlink it"
         revert_title: "Revert protocol"
         revert_message: "Are you sure you want to revert the task protocol to the templates version? This will override any local changes you made."
         revert_btn_text: "Revert"

From 0f9dcda99bde58f833b7230ef0f40714dc69ee9c Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 14 Feb 2023 16:26:06 +0100
Subject: [PATCH 2/9] Update the style of the unlink protocol modal [SCI-7909]

---
 .../javascripts/my_modules/protocols.js       |  2 +-
 .../my_modules/protocols/index.scss           | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index bd04b990f..d667caaeb 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -100,7 +100,7 @@ function initLinkUpdate() {
   $("[data-action='unlink'], [data-action='revert'], [data-action='update-parent'], [data-action='update-self']")
     .on('ajax:success', function(e, data) {
       const modalBodyTemplate = (message, warning) => `<p class="message">${message}</p>
-                                                       <p class="message">${warning || ''}</p>`;
+                                                       <p class="warning">${warning || ''}</p>`;
       const {
         title,
         message,
diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss
index f6a4e2079..861fe5f77 100644
--- a/app/assets/stylesheets/my_modules/protocols/index.scss
+++ b/app/assets/stylesheets/my_modules/protocols/index.scss
@@ -6,6 +6,8 @@
 @import "constants";
 @import "mixins";
 
+$modal-spacing: 16px;
+
 .content-pane.my-modules-protocols-index {
   background-color: $color-alto;
   margin: 0 -16px;
@@ -680,3 +682,54 @@
   display: inline-block;
   margin-left: 4px;
 }
+
+#confirm-link-update-modal {
+  .modal-content {
+    .modal-header {
+      border-bottom-color: transparent;
+      position: relative;
+      padding: $modal-spacing;
+
+      &::after {
+        border-bottom: 1px solid $color-concrete;
+        bottom: 0;
+        left: $modal-spacing;
+        position: absolute;
+        width: calc(100% - 2* #{$modal-spacing});
+      }
+
+      .close {
+        color: $color-volcano;
+      }
+    }
+
+    .modal-body {
+      padding: $modal-spacing;
+
+      .message {
+        margin-bottom: $modal-spacing;
+      }
+
+      .warning {
+        font-weight: bold;
+        margin: 0;
+      }
+    }
+
+    .modal-footer {
+      border-top-color: transparent;
+      padding: $modal-spacing;
+      position: relative;
+
+      &::after {
+        border-top: 1px solid $color-concrete;
+        left: $modal-spacing;
+        position: absolute;
+        top: 0;
+        width: calc(100% - 2* #{$modal-spacing});
+      }
+    }
+  }
+
+
+}

From 043cb6f5fbfa5632c9ff4a389fd9a18601de938d Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 14 Feb 2023 16:43:57 +0100
Subject: [PATCH 3/9] Fix hound issues [SCI-7909]

---
 app/assets/stylesheets/my_modules/protocols/index.scss      | 6 ++----
 .../protocols/_confirm_link_update_modal.html.erb           | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss
index 861fe5f77..defcb7ba7 100644
--- a/app/assets/stylesheets/my_modules/protocols/index.scss
+++ b/app/assets/stylesheets/my_modules/protocols/index.scss
@@ -683,12 +683,12 @@ $modal-spacing: 16px;
   margin-left: 4px;
 }
 
-#confirm-link-update-modal {
+.confirm-link-update-modal {
   .modal-content {
     .modal-header {
       border-bottom-color: transparent;
-      position: relative;
       padding: $modal-spacing;
+      position: relative;
 
       &::after {
         border-bottom: 1px solid $color-concrete;
@@ -730,6 +730,4 @@ $modal-spacing: 16px;
       }
     }
   }
-
-
 }
diff --git a/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb b/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
index 350a4d69f..4fd7677ff 100644
--- a/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
+++ b/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
@@ -1,4 +1,4 @@
-<div class="modal" id="confirm-link-update-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-link-update-modal-label">
+<div class="modal confirm-link-update-modal" id="confirm-link-update-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-link-update-modal-label">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">

From 0039edae66a3f319daa3c095daafb867756fddb4 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 15 Feb 2023 09:26:46 +0100
Subject: [PATCH 4/9] Update the style of the revert protocol modal [SCI-7910]

---
 app/controllers/protocols_controller.rb | 1 +
 config/locales/en.yml                   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index c5d461dfd..c2c7f8074 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -895,6 +895,7 @@ class ProtocolsController < ApplicationController
         render json: {
           title: t('my_modules.protocols.confirm_link_update_modal.revert_title'),
           message: t('my_modules.protocols.confirm_link_update_modal.revert_message'),
+          warning: t('my_modules.protocols.confirm_link_update_modal.revert_warning'),
           btn_text: t('my_modules.protocols.confirm_link_update_modal.revert_btn_text'),
           url: revert_protocol_path(@protocol)
         }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f8f0a3084..7e081b0de 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1077,16 +1077,17 @@ en:
         unlink_message: "This will stop tracking changes of protocol templates. We can’t link it back once you unlink it."
         unlink_warning: "Are you sure?"
         unlink_btn_text: "Yes, unlink it"
-        revert_title: "Revert protocol"
-        revert_message: "Are you sure you want to revert the task protocol to the templates version? This will override any local changes you made."
-        revert_btn_text: "Revert"
+        revert_title: "Revert protocol template"
+        revert_message: "This will override any changes you made. We can’t recover them once you revert."
+        revert_warning: "Are you sure?"
+        revert_btn_text: "Yes, revert it"
         update_parent_title: "Update templates version"
         update_parent_message: "Are you sure you want to update the templates protocol with this version? This will override any other changes made in the templates version."
         update_self_title: "Update from templates"
         update_self_message: "Are you sure you want to update this protocol with the version from the templates? This will override any local changes you made."
       unlink_flash: "Protocol was successfully unlinked."
       unlink_error: "Failed to unlink protocol."
-      revert_flash: "Protocol was successfully reverted to protocol version."
+      revert_flash: "Protocol was successfully reverted."
       revert_error: "Failed to revert protocol."
       revert_error_locked: "Failed to revert protocol. One or more files in the protocol are currently being edited."
       update_parent_flash: "Protocol in templates was successfully updated with the version from the task."

From b482f4cfe9a0024e7872e971764375a57985b756 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 11:50:32 +0100
Subject: [PATCH 5/9] Revert Unneded commits

Modal styles are not part of the current ticket
---
 app/assets/stylesheets/my_modules/protocols/index.scss      | 6 ++++--
 .../protocols/_confirm_link_update_modal.html.erb           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss
index defcb7ba7..861fe5f77 100644
--- a/app/assets/stylesheets/my_modules/protocols/index.scss
+++ b/app/assets/stylesheets/my_modules/protocols/index.scss
@@ -683,12 +683,12 @@ $modal-spacing: 16px;
   margin-left: 4px;
 }
 
-.confirm-link-update-modal {
+#confirm-link-update-modal {
   .modal-content {
     .modal-header {
       border-bottom-color: transparent;
-      padding: $modal-spacing;
       position: relative;
+      padding: $modal-spacing;
 
       &::after {
         border-bottom: 1px solid $color-concrete;
@@ -730,4 +730,6 @@ $modal-spacing: 16px;
       }
     }
   }
+
+
 }
diff --git a/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb b/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
index 4fd7677ff..350a4d69f 100644
--- a/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
+++ b/app/views/my_modules/protocols/_confirm_link_update_modal.html.erb
@@ -1,4 +1,4 @@
-<div class="modal confirm-link-update-modal" id="confirm-link-update-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-link-update-modal-label">
+<div class="modal" id="confirm-link-update-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-link-update-modal-label">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">

From b99d9c485cbe36525d92871c6f4777ca32a7de9d Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 11:51:42 +0100
Subject: [PATCH 6/9] Revert "Update the style of the unlink protocol modal
 [SCI-7909]"

This reverts commit 0f9dcda99bde58f833b7230ef0f40714dc69ee9c.
---
 .../javascripts/my_modules/protocols.js       |  2 +-
 .../my_modules/protocols/index.scss           | 53 -------------------
 2 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index d667caaeb..bd04b990f 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -100,7 +100,7 @@ function initLinkUpdate() {
   $("[data-action='unlink'], [data-action='revert'], [data-action='update-parent'], [data-action='update-self']")
     .on('ajax:success', function(e, data) {
       const modalBodyTemplate = (message, warning) => `<p class="message">${message}</p>
-                                                       <p class="warning">${warning || ''}</p>`;
+                                                       <p class="message">${warning || ''}</p>`;
       const {
         title,
         message,
diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss
index 861fe5f77..f6a4e2079 100644
--- a/app/assets/stylesheets/my_modules/protocols/index.scss
+++ b/app/assets/stylesheets/my_modules/protocols/index.scss
@@ -6,8 +6,6 @@
 @import "constants";
 @import "mixins";
 
-$modal-spacing: 16px;
-
 .content-pane.my-modules-protocols-index {
   background-color: $color-alto;
   margin: 0 -16px;
@@ -682,54 +680,3 @@ $modal-spacing: 16px;
   display: inline-block;
   margin-left: 4px;
 }
-
-#confirm-link-update-modal {
-  .modal-content {
-    .modal-header {
-      border-bottom-color: transparent;
-      position: relative;
-      padding: $modal-spacing;
-
-      &::after {
-        border-bottom: 1px solid $color-concrete;
-        bottom: 0;
-        left: $modal-spacing;
-        position: absolute;
-        width: calc(100% - 2* #{$modal-spacing});
-      }
-
-      .close {
-        color: $color-volcano;
-      }
-    }
-
-    .modal-body {
-      padding: $modal-spacing;
-
-      .message {
-        margin-bottom: $modal-spacing;
-      }
-
-      .warning {
-        font-weight: bold;
-        margin: 0;
-      }
-    }
-
-    .modal-footer {
-      border-top-color: transparent;
-      padding: $modal-spacing;
-      position: relative;
-
-      &::after {
-        border-top: 1px solid $color-concrete;
-        left: $modal-spacing;
-        position: absolute;
-        top: 0;
-        width: calc(100% - 2* #{$modal-spacing});
-      }
-    }
-  }
-
-
-}

From 66edffe53ab7d4d327ca19e776881ba76b2d64bd Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 12:03:00 +0100
Subject: [PATCH 7/9] Use I18n [SCI-7910]

---
 app/assets/javascripts/my_modules/protocols.js | 5 +----
 app/controllers/protocols_controller.rb        | 1 -
 config/locales/en.yml                          | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index bd04b990f..29a26bdad 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -99,18 +99,15 @@ function initLinkUpdate() {
   var updateBtn = modal.find(".modal-footer [data-action='submit']");
   $("[data-action='unlink'], [data-action='revert'], [data-action='update-parent'], [data-action='update-self']")
     .on('ajax:success', function(e, data) {
-      const modalBodyTemplate = (message, warning) => `<p class="message">${message}</p>
-                                                       <p class="message">${warning || ''}</p>`;
       const {
         title,
         message,
-        warning,
         btn_text: btnText,
         url
       } = data;
 
       modalTitle.html(title);
-      modalBody.html(modalBodyTemplate(message, warning));
+      modalBody.html(message);
       updateBtn.text(btnText);
       modal.attr('data-url', url);
       modal.modal('show');
diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index c2c7f8074..c5d461dfd 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -895,7 +895,6 @@ class ProtocolsController < ApplicationController
         render json: {
           title: t('my_modules.protocols.confirm_link_update_modal.revert_title'),
           message: t('my_modules.protocols.confirm_link_update_modal.revert_message'),
-          warning: t('my_modules.protocols.confirm_link_update_modal.revert_warning'),
           btn_text: t('my_modules.protocols.confirm_link_update_modal.revert_btn_text'),
           url: revert_protocol_path(@protocol)
         }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e081b0de..4ae4aed27 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1078,8 +1078,7 @@ en:
         unlink_warning: "Are you sure?"
         unlink_btn_text: "Yes, unlink it"
         revert_title: "Revert protocol template"
-        revert_message: "This will override any changes you made. We can’t recover them once you revert."
-        revert_warning: "Are you sure?"
+        revert_message: "This will override any changes you made. We can’t recover them once you revert.<br /><br /><strong>Are you sure?</strong>"
         revert_btn_text: "Yes, revert it"
         update_parent_title: "Update templates version"
         update_parent_message: "Are you sure you want to update the templates protocol with this version? This will override any other changes made in the templates version."

From e29bdcb51f9fb41ef021c2fb7a252c6898003972 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 12:04:29 +0100
Subject: [PATCH 8/9] Revome uneeded I18n config [SCI-7910]

---
 config/locales/en.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4ae4aed27..8cf02c0bc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1075,7 +1075,6 @@ en:
       confirm_link_update_modal:
         unlink_title: "Unlink protocol template"
         unlink_message: "This will stop tracking changes of protocol templates. We can’t link it back once you unlink it."
-        unlink_warning: "Are you sure?"
         unlink_btn_text: "Yes, unlink it"
         revert_title: "Revert protocol template"
         revert_message: "This will override any changes you made. We can’t recover them once you revert.<br /><br /><strong>Are you sure?</strong>"

From 1c9d9d80828a85d8d62bab807f1ee8a3699900a8 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 14:13:18 +0100
Subject: [PATCH 9/9] Add a small refactor [SCI-7910]

---
 app/assets/javascripts/my_modules/protocols.js | 15 ++++-----------
 app/controllers/protocols_controller.rb        |  1 -
 config/locales/en.yml                          |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js
index 29a26bdad..23b3fd603 100644
--- a/app/assets/javascripts/my_modules/protocols.js
+++ b/app/assets/javascripts/my_modules/protocols.js
@@ -99,17 +99,10 @@ function initLinkUpdate() {
   var updateBtn = modal.find(".modal-footer [data-action='submit']");
   $("[data-action='unlink'], [data-action='revert'], [data-action='update-parent'], [data-action='update-self']")
     .on('ajax:success', function(e, data) {
-      const {
-        title,
-        message,
-        btn_text: btnText,
-        url
-      } = data;
-
-      modalTitle.html(title);
-      modalBody.html(message);
-      updateBtn.text(btnText);
-      modal.attr('data-url', url);
+      modalTitle.html(data.title);
+      modalBody.html(data.message);
+      updateBtn.text(data.btn_text);
+      modal.attr('data-url', data.url);
       modal.modal('show');
     });
 
diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index c5d461dfd..72eb25a2e 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -881,7 +881,6 @@ class ProtocolsController < ApplicationController
         render json: {
           title: t('my_modules.protocols.confirm_link_update_modal.unlink_title'),
           message: t('my_modules.protocols.confirm_link_update_modal.unlink_message'),
-          warning: t('my_modules.protocols.confirm_link_update_modal.unlink_warning'),
           btn_text: t('my_modules.protocols.confirm_link_update_modal.unlink_btn_text'),
           url: unlink_protocol_path(@protocol)
         }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8cf02c0bc..ae8ea755f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1074,8 +1074,8 @@ en:
           update_self_title: "Update this protocol with the version stored in the templates"
       confirm_link_update_modal:
         unlink_title: "Unlink protocol template"
-        unlink_message: "This will stop tracking changes of protocol templates. We can’t link it back once you unlink it."
-        unlink_btn_text: "Yes, unlink it"
+        unlink_message: "Are you sure you want to unlink the task protocol from the templates version? This will stop any tracking of changes."
+        unlink_btn_text: "Unlink"
         revert_title: "Revert protocol template"
         revert_message: "This will override any changes you made. We can’t recover them once you revert.<br /><br /><strong>Are you sure?</strong>"
         revert_btn_text: "Yes, revert it"