From 6011bb36b69aa893b43a84a000399fd4b9195074 Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Fri, 15 Jan 2021 15:08:27 +0100
Subject: [PATCH] Fix archived experiment dropdown and archived view for
 projects page [SCI-5392]

---
 app/assets/javascripts/projects/index.js     | 2 +-
 app/permissions/experiment.rb                | 6 ++++--
 app/views/projects/index/_header.html.erb    | 4 ++--
 app/views/projects/show/_experiment.html.erb | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/projects/index.js b/app/assets/javascripts/projects/index.js
index dc60737d1..6a4389e7e 100644
--- a/app/assets/javascripts/projects/index.js
+++ b/app/assets/javascripts/projects/index.js
@@ -328,7 +328,7 @@
     loadCardsView();
     Sidebar.reload({
       sort: projectsCurrentSort,
-      view_mode: $('.projects-index').data('mode')
+      view_mode: $('.projects-index').data('view-mode')
     });
   }
 
diff --git a/app/permissions/experiment.rb b/app/permissions/experiment.rb
index f9897a15d..9cf01cf12 100644
--- a/app/permissions/experiment.rb
+++ b/app/permissions/experiment.rb
@@ -46,8 +46,10 @@ Canaid::Permissions.register_for(Experiment) do
   # active
   # experiment: restore
   can :restore_experiment do |user, experiment|
-    user.is_user_or_higher_of_project?(experiment.project) &&
-      experiment.archived?
+    project = experiment.project
+    user.is_user_or_higher_of_project?(project) &&
+      experiment.archived? &&
+      project.active?
   end
 
   # experiment: copy
diff --git a/app/views/projects/index/_header.html.erb b/app/views/projects/index/_header.html.erb
index 84fc75058..d3405e60b 100644
--- a/app/views/projects/index/_header.html.erb
+++ b/app/views/projects/index/_header.html.erb
@@ -16,7 +16,7 @@
         <i class="fas fa-rocket button-icon"></i> <%= t('projects.index.header.active_projects') %>
       </li>
 
-      <li class="view-switch-archived archive-switch" data-view-mode="active" data-url="<%= projects_path(mode: 'archived') %>">
+      <li class="view-switch-archived archive-switch" data-view-mode="active" data-url="<%= projects_path(view_mode: 'archived') %>">
         <i class="fas fa-archive button-icon"></i> <%= t('projects.index.header.archived_projects') %>
       </li>
     <% end %>
@@ -150,7 +150,7 @@
         <span><i class="fas fa-sort-amount-down"></i></span>
         <span class="caret"></span>
       </button>
-      <ul id="sortMenuDropdown" class="dropdown-menu sort-projects-menu" aria-labelledby="sortMenu">
+      <ul id="sortMenuDropdown" class="dropdown-menu sort-projects-menu dropdown-menu-right" aria-labelledby="sortMenu">
         <% %w(new old atoz ztoa archived_new archived_old).each_with_index do |sort, i| %>
           <% if i.even? && i.positive? %>
             <li class="divider" <%= i > 3 ? 'data-view-mode=archived' : '' %>></li>
diff --git a/app/views/projects/show/_experiment.html.erb b/app/views/projects/show/_experiment.html.erb
index ad3c18031..91e72429b 100644
--- a/app/views/projects/show/_experiment.html.erb
+++ b/app/views/projects/show/_experiment.html.erb
@@ -4,7 +4,7 @@
        data-canvas-link="<%= canvas_experiment_url(experiment) %>"
        >
     <div class="panel-heading">
-        <% if can_manage_experiment?(experiment) %>
+        <% if can_manage_experiment?(experiment) || can_restore_experiment?(experiment) %>
           <div class="dropdown pull-right">
             <button class="btn btn-link dropdown-toggle"
                     type="button"