From 443ee4350c9788d7dd97fed1ec4e73b25b1d2d60 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Fri, 3 Mar 2023 14:11:40 +0100
Subject: [PATCH 1/2] Fix protocol repository sidebar on archived view
 [SCI-8030]

---
 app/helpers/protocols_helper.rb               |  5 +++
 app/views/protocols/index.html.erb            |  2 +-
 .../sidebar/_templates_sidebar.html.erb       | 42 +++++++++++--------
 config/locales/en.yml                         |  1 +
 4 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 app/helpers/protocols_helper.rb

diff --git a/app/helpers/protocols_helper.rb b/app/helpers/protocols_helper.rb
new file mode 100644
index 000000000..2c55df16d
--- /dev/null
+++ b/app/helpers/protocols_helper.rb
@@ -0,0 +1,5 @@
+module ProtocolsHelper
+  def templates_view_mode_archived?
+    @type == :archived || @protocol&.archived?
+  end
+end
diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb
index f0443456b..b0b51450c 100644
--- a/app/views/protocols/index.html.erb
+++ b/app/views/protocols/index.html.erb
@@ -14,7 +14,7 @@
   <div class="content-pane flexible protocols-index <%= @type %>">
     <div class="content-header sticky-header">
       <div class="title-row">
-        <% if @type == :archived %>
+        <% if templates_view_mode_archived? %>
           <h1>
             <i class="fas fa-archive"></i>
             <%= t('protocols.index.head_title_archived') %>
diff --git a/app/views/shared/sidebar/_templates_sidebar.html.erb b/app/views/shared/sidebar/_templates_sidebar.html.erb
index fc06e1764..a7189a8e2 100644
--- a/app/views/shared/sidebar/_templates_sidebar.html.erb
+++ b/app/views/shared/sidebar/_templates_sidebar.html.erb
@@ -1,22 +1,30 @@
 <ul class="sidebar-branch">
-  <li class="sidebar-leaf">
-    <i class="fas fa-caret-right toggle-branch collapsed"></i>
-    <%= link_to t('sidebar.templates.protocol_templates'),
-                protocols_path,
-                class: "sidebar-link #{'selected' if active == :protocol && params[:type] != 'archived'}" %>
-    <ul class="sidebar-branch">
-      <li class="sidebar-leaf">
-      <%= link_to protocols_path(type: :archived), class: "sidebar-link #{'selected' if active == :protocol && params[:type] == 'archived'}" do %>
-        <i class="fas fa-archive"></i>
-        <%= t("protocols.index.navigation.archive") %>
-      <% end %>
-    </ul>
-  </li>
-  <% if can_view_label_templates?(current_team) %>
+  <% if templates_view_mode_archived? %>
     <li class="sidebar-leaf">
-      <%= link_to t('sidebar.templates.label_templates'),
-                  label_templates_path,
-                  class: "sidebar-link #{'selected' if active == :label}" %>
+      <%= link_to protocols_path, class: "sidebar-link back-button" do %>
+        <%= t("protocols.index.back_to_active_protocols") %>
+      <% end %>
     </li>
+  <% else %>
+    <li class="sidebar-leaf">
+      <i class="fas fa-caret-right toggle-branch collapsed"></i>
+      <%= link_to t('sidebar.templates.protocol_templates'),
+                  protocols_path,
+                  class: "sidebar-link #{'selected' if active == :protocol && params[:type] != 'archived'}" %>
+      <ul class="sidebar-branch">
+        <li class="sidebar-leaf">
+        <%= link_to protocols_path(type: :archived), class: "sidebar-link #{'selected' if active == :protocol && params[:type] == 'archived'}" do %>
+          <i class="fas fa-archive"></i>
+          <%= t("protocols.index.navigation.archive") %>
+        <% end %>
+      </ul>
+    </li>
+    <% if can_view_label_templates?(current_team) %>
+      <li class="sidebar-leaf">
+        <%= link_to t('sidebar.templates.label_templates'),
+                    label_templates_path,
+                    class: "sidebar-link #{'selected' if active == :label}" %>
+      </li>
+    <% end %>
   <% end %>
 </ul>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e59d8464b..c7962aba8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2705,6 +2705,7 @@ en:
       head_title: "Protocol templates"
       head_title_archived: "Archived protocol templates"
       default_name: 'New protocol'
+      back_to_active_protocols: 'Back to active protocols'
       navigation:
         public: "Team protocols"
         private: "My protocols"

From 248b13aa72e589cad05d2c73d56c03db16b68579 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Fri, 3 Mar 2023 14:32:08 +0100
Subject: [PATCH 2/2] Fix hound [SCI-8030]

---
 app/helpers/protocols_helper.rb                      | 6 ++++--
 app/views/shared/sidebar/_templates_sidebar.html.erb | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/helpers/protocols_helper.rb b/app/helpers/protocols_helper.rb
index 2c55df16d..703428cc4 100644
--- a/app/helpers/protocols_helper.rb
+++ b/app/helpers/protocols_helper.rb
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ProtocolsHelper
-  def templates_view_mode_archived?
-    @type == :archived || @protocol&.archived?
+  def templates_view_mode_archived?(type: nil, protocol: nil)
+    type == :archived || protocol&.archived?
   end
 end
diff --git a/app/views/shared/sidebar/_templates_sidebar.html.erb b/app/views/shared/sidebar/_templates_sidebar.html.erb
index a7189a8e2..c20222e33 100644
--- a/app/views/shared/sidebar/_templates_sidebar.html.erb
+++ b/app/views/shared/sidebar/_templates_sidebar.html.erb
@@ -1,5 +1,5 @@
 <ul class="sidebar-branch">
-  <% if templates_view_mode_archived? %>
+  <% if templates_view_mode_archived?(type: @type, protocol: @protocol) %>
     <li class="sidebar-leaf">
       <%= link_to protocols_path, class: "sidebar-link back-button" do %>
         <%= t("protocols.index.back_to_active_protocols") %>