From 8d2187815b96642ec28d894f8f47b99cf020481a Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 15 Nov 2023 11:02:50 +0100
Subject: [PATCH] Fix turbolinks cache settings [SCI-9700][SCI-9701]

---
 app/assets/stylesheets/experiment/table.scss       | 8 +++++---
 app/assets/stylesheets/shared/datetime_picker.scss | 1 -
 app/views/label_templates/index.html.erb           | 5 -----
 app/views/protocols/index.html.erb                 | 6 +-----
 app/views/reports/index.html.erb                   | 4 ----
 app/views/repositories/show.html.erb               | 4 ----
 app/views/users/settings/teams/index.html.erb      | 3 ---
 app/views/users/settings/teams/show.html.erb       | 4 ----
 8 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/app/assets/stylesheets/experiment/table.scss b/app/assets/stylesheets/experiment/table.scss
index 197dc66e8..b1ad753ac 100644
--- a/app/assets/stylesheets/experiment/table.scss
+++ b/app/assets/stylesheets/experiment/table.scss
@@ -467,12 +467,14 @@
     .clear-date {
       cursor: pointer;
       left: calc(100% - 16px);
+      margin-left: auto;
+      opacity: 0;
       text-align: center;
       width: 24px;
+    }
 
-      &.open {
-        visibility: visible;
-      }
+    &:hover .clear-date {
+      opacity: 1;
     }
 
     .date-text {
diff --git a/app/assets/stylesheets/shared/datetime_picker.scss b/app/assets/stylesheets/shared/datetime_picker.scss
index f72562316..188e66532 100644
--- a/app/assets/stylesheets/shared/datetime_picker.scss
+++ b/app/assets/stylesheets/shared/datetime_picker.scss
@@ -125,7 +125,6 @@
   }
 }
 
-
 .dp__theme_light {
   --dp-background-color: var(--sn-white);
   --dp-text-color: var(--sn-black);
diff --git a/app/views/label_templates/index.html.erb b/app/views/label_templates/index.html.erb
index ee499e6c6..9f2ac4c16 100644
--- a/app/views/label_templates/index.html.erb
+++ b/app/views/label_templates/index.html.erb
@@ -4,11 +4,6 @@
   <%= content_for :sidebar do %>
    <%= render partial: "/shared/sidebar/templates_sidebar", locals: {active: :label} %>
   <% end %>
-
-  <% content_for :head do %>
-    <meta name="turbolinks-cache-control" content="no-cache">
-  <% end %>
-
   <%= stylesheet_link_tag 'datatables' %>
 
 
diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb
index ea1ab4778..d25bc80b2 100644
--- a/app/views/protocols/index.html.erb
+++ b/app/views/protocols/index.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
-<% end %>
-
 <% provide(:head_title, t("protocols.index.head_title")) %>
 
 <% if current_team %>
@@ -35,7 +31,7 @@
 <% end %>
 
 <div id="protocolFileImportModal">
-  <protocol-file-import-modal 
+  <protocol-file-import-modal
     import-url="<%= import_docx_protocols_path %>"
     protocol-template-table-url="<%= protocols_path %>"
   />
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index 95ea28429..c602a4766 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
-<% end %>
-
 <%= stylesheet_link_tag 'datatables' %>
 
 <% if params[:preview_report_id] %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index bcbe4d9ed..9947200fd 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
-<% end %>
-
 <% provide(:head_title, t("libraries.show.head_title", library: @repository.name)) %>
 <%= stylesheet_link_tag 'datatables' %>
 <% provide(:container_class, "no-second-nav-container") %>
diff --git a/app/views/users/settings/teams/index.html.erb b/app/views/users/settings/teams/index.html.erb
index 79fe325f0..b332bac4f 100644
--- a/app/views/users/settings/teams/index.html.erb
+++ b/app/views/users/settings/teams/index.html.erb
@@ -1,6 +1,3 @@
-<% content_for :head do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
-<% end %>
 
 <% provide(:head_title, t("users.settings.teams.head_title")) %>
 <% provide(:container_class, "no-second-nav-container") %>
diff --git a/app/views/users/settings/teams/show.html.erb b/app/views/users/settings/teams/show.html.erb
index 40bdd4f80..0831af7f0 100644
--- a/app/views/users/settings/teams/show.html.erb
+++ b/app/views/users/settings/teams/show.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <meta name="turbolinks-cache-control" content="no-cache">
-<% end %>
-
 <% provide(:head_title, t("users.settings.teams.head_title")) %>
 <% provide(:container_class, "no-second-nav-container") %>