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

Updating styles is not part of the current ticket.

This reverts commit 0f9dcda99bde58f833b7230ef0f40714dc69ee9c.
---
 .../javascripts/my_modules/protocols.js       |  2 +-
 .../my_modules/protocols/index.scss           | 51 -------------------
 2 files changed, 1 insertion(+), 52 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 defcb7ba7..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,52 +680,3 @@ $modal-spacing: 16px;
   display: inline-block;
   margin-left: 4px;
 }
-
-.confirm-link-update-modal {
-  .modal-content {
-    .modal-header {
-      border-bottom-color: transparent;
-      padding: $modal-spacing;
-      position: relative;
-
-      &::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 95d21ae04b7aeaa977ddcc3af2bd61254ffe9137 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 11:33:56 +0100
Subject: [PATCH 2/4] Refactor using I18n [SCI-7909]

---
 app/assets/javascripts/my_modules/protocols.js               | 5 +----
 app/controllers/protocols_controller.rb                      | 1 -
 .../my_modules/protocols/_confirm_link_update_modal.html.erb | 2 +-
 3 files changed, 2 insertions(+), 6 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 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/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 e8cbc0364f82ff5e91eb450267c7bf59b9592f47 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 11:39:49 +0100
Subject: [PATCH 3/4] Change the tanslation [SCI-7909]

---
 config/locales/en.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f8f0a3084..b91b66e32 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1074,8 +1074,7 @@ 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_warning: "Are you sure?"
+        unlink_message: "This will stop tracking changes of protocol templates. We can’t link it back once you unlink it.<br /><br /><strong>Are you sure?</strong>"
         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."

From a3a5bf62b90b34896e7585f07118d9e592657f40 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 28 Feb 2023 14:08:00 +0100
Subject: [PATCH 4/4] Add a small refactor [SCI-7909]

---
 app/assets/javascripts/my_modules/protocols.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 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');
     });