From 5aae35d700cf96bd29f80a22ef88b91e5c465dec Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Thu, 7 Jan 2021 14:58:56 +0100
Subject: [PATCH] Update archived experiments navigation (#3053)

---
 app/views/projects/experiment_archive.html.erb |  2 +-
 .../projects/index/_project_card.html.erb      | 18 +++++++++++++-----
 app/views/shared/sidebar/_experiments.html.erb |  8 +++++---
 .../sidebar/_projects_tree_branch.html.erb     |  6 +++++-
 config/locales/en.yml                          |  2 ++
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/views/projects/experiment_archive.html.erb b/app/views/projects/experiment_archive.html.erb
index d8f321b7b..1d2a00f55 100644
--- a/app/views/projects/experiment_archive.html.erb
+++ b/app/views/projects/experiment_archive.html.erb
@@ -1,5 +1,5 @@
 <% provide(:head_title, t("projects.experiment_archive.head_title", project: h(@project.name)).html_safe) %>
-<% provide(:sidebar_title, t("sidebar.experiments.sidebar_title")) %>
+<% provide(:sidebar_title, t("sidebar.experiments.sidebar_title_archived")) %>
 <% provide(:sidebar_url, project_sidebar_path(@project)) %>
 <% provide(:container_class, 'no-second-nav-container') %>
 <%= content_for :sidebar do %>
diff --git a/app/views/projects/index/_project_card.html.erb b/app/views/projects/index/_project_card.html.erb
index 005c1608c..ffd82b46a 100644
--- a/app/views/projects/index/_project_card.html.erb
+++ b/app/views/projects/index/_project_card.html.erb
@@ -11,11 +11,19 @@
     </div>
   </div>
   <div class="project-name-cell">
-    <a href="<%= project_url(project) %>">
-      <h3 class="name" title="<%= project.name %>">
-        <%= project.name %>
-      </h3>
-    </a>
+    <% if project.archived? %>
+      <%= link_to experiment_archive_project_url(project) do %>
+        <h3 class="name" title="<%= project.name %>">
+          <%= project.name %>
+        </h3>
+      <% end %>
+    <% else %>
+      <%= link_to project_url(project) do %>
+        <h3 class="name" title="<%= project.name %>">
+          <%= project.name %>
+        </h3>
+      <% end %>
+    <% end %>
   </div>
   <div class="actions actions-cell">
     <%= render partial: 'projects/index/project_actions_dropdown.html.erb', locals: { project: project, view: 'cards' } %>
diff --git a/app/views/shared/sidebar/_experiments.html.erb b/app/views/shared/sidebar/_experiments.html.erb
index 97872ba99..05ffc7d23 100644
--- a/app/views/shared/sidebar/_experiments.html.erb
+++ b/app/views/shared/sidebar/_experiments.html.erb
@@ -1,9 +1,11 @@
 <ul class="sidebar-branch">
   <li class="sidebar-leaf">
-    <% unless archived && !@project.archived? %>
-      <%= link_to t('sidebar.experiments.back_button'), projects_path, class: 'sidebar-link back-button' %>
-    <% else %>
+    <% if @project.archived? %>
+      <%= link_to t('sidebar.experiments.back_archived_projects'), projects_path(mode: :archived), class: 'sidebar-link back-button' %>
+    <% elsif archived %>
       <%= link_to t('sidebar.experiments.back_active_experiments'), project_url(@project), class: 'sidebar-link back-button' %>
+    <% else %>
+      <%= link_to t('sidebar.experiments.back_button'), projects_path, class: 'sidebar-link back-button' %>
     <% end %>
   </li>
   <% project.sorted_experiments(@current_sort, archived).each do |experiment| %>
diff --git a/app/views/shared/sidebar/_projects_tree_branch.html.erb b/app/views/shared/sidebar/_projects_tree_branch.html.erb
index a16ae6b08..29fa0c1ef 100644
--- a/app/views/shared/sidebar/_projects_tree_branch.html.erb
+++ b/app/views/shared/sidebar/_projects_tree_branch.html.erb
@@ -1,7 +1,11 @@
 <% records.each do |record| %>
   <% if record[:project] %>
     <li class="sidebar-leaf">
-      <%= link_to record[:project].name, project_url(record[:project]), class: 'sidebar-link' %>
+      <% if record[:project].archived? %>
+        <%= link_to record[:project].name, experiment_archive_project_url(record[:project]), class: 'sidebar-link' %>
+      <% else %>
+        <%= link_to record[:project].name, project_url(record[:project]), class: 'sidebar-link' %>
+      <% end %>
     </li>
   <% else %>
     <li class="sidebar-leaf">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 03576838b..140a95101 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -212,8 +212,10 @@ en:
       sidebar_title: "SETTINGS"
     experiments:
       sidebar_title: "EXPERIMENTS"
+      sidebar_title_archived: "ARCHIVED EXPERIMENTS"
       back_button: "Back to projects"
       back_active_experiments: "Back to active experiments"
+      back_archived_projects: "Back to archived projects"
       archived_experiments: "Archived experiments"
     my_modules:
       sidebar_title: "TASKS"