From 4cc6513f8277439e52af7b1ae3a3501ccb9a0bfb Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 13 Jul 2023 13:55:32 +0200
Subject: [PATCH 01/45] Fix css for protocol checklists [SCI-8788]

---
 app/assets/stylesheets/steps/components/checklist.scss    | 1 +
 app/assets/stylesheets/tailwind/buttons.css               | 8 ++++----
 app/javascript/vue/protocol/step_elements/checklist.vue   | 8 ++++----
 .../vue/protocol/step_elements/checklistItem.vue          | 4 ++--
 app/javascript/vue/shared/inline_edit.vue                 | 4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/assets/stylesheets/steps/components/checklist.scss b/app/assets/stylesheets/steps/components/checklist.scss
index ca6a609f8..8cbbb4018 100644
--- a/app/assets/stylesheets/steps/components/checklist.scss
+++ b/app/assets/stylesheets/steps/components/checklist.scss
@@ -16,6 +16,7 @@
   }
 
   .step-element-header {
+
     .step-element-name {
       align-items: flex-start;
       column-gap: .25em;
diff --git a/app/assets/stylesheets/tailwind/buttons.css b/app/assets/stylesheets/tailwind/buttons.css
index a3e24498f..4177134a7 100644
--- a/app/assets/stylesheets/tailwind/buttons.css
+++ b/app/assets/stylesheets/tailwind/buttons.css
@@ -4,7 +4,7 @@
   }
 
   .btn {
-    @apply relative inline-flex items-center text-sm shrink-0 gap-2 justify-center leading-5 py-2 px-4 rounded border-0 appearance-none whitespace-nowrap cursor-pointer;
+    @apply relative inline-flex items-center text-sm shrink-0 gap-2 justify-center leading-5 py-2 px-4 rounded border-0 appearance-none whitespace-nowrap cursor-pointer max-h-[40px];
   }
 
   .btn.icon-btn {
@@ -12,7 +12,7 @@
   }
 
   .btn.btn-lg {
-    @apply py-2.5 px-[1.125rem] text-base leading-5;
+    @apply py-2.5 px-[1.125rem] text-base leading-5 max-h-[44px];
   }
 
   .btn.btn-lg.icon-btn {
@@ -20,7 +20,7 @@
   }
 
   .btn.btn-sm {
-    @apply py-1.5 px-2.5 text-xs leading-5;
+    @apply py-1.5 px-2.5 text-xs leading-5 max-h-[36px];
   }
 
   .btn.btn-sm.icon-btn {
@@ -28,7 +28,7 @@
   }
 
   .btn.btn-xs {
-    @apply py-0.5 px-2.5 text-xs leading-5;
+    @apply py-0.5 px-2.5 text-xs leading-5 max-h-[30px];
   }
 
   .btn.btn-xs.icon-btn {
diff --git a/app/javascript/vue/protocol/step_elements/checklist.vue b/app/javascript/vue/protocol/step_elements/checklist.vue
index aef366659..52485fa8e 100644
--- a/app/javascript/vue/protocol/step_elements/checklist.vue
+++ b/app/javascript/vue/protocol/step_elements/checklist.vue
@@ -22,13 +22,13 @@
         />
       </div>
       <div class="step-element-controls">
-        <button v-if="element.attributes.orderable.urls.update_url" class="btn icon-btn btn-light" @click="editingName = true" tabindex="0">
+        <button v-if="element.attributes.orderable.urls.update_url" class="btn icon-btn btn-light btn-sm" @click="editingName = true" tabindex="0">
           <i class="sn-icon sn-icon-edit"></i>
         </button>
-        <button v-if="element.attributes.orderable.urls.duplicate_url" class="btn icon-btn btn-light" tabindex="0" @click="duplicateElement">
+        <button v-if="element.attributes.orderable.urls.duplicate_url" class="btn icon-btn btn-light btn-sm" tabindex="0" @click="duplicateElement">
           <i class="sn-icon sn-icon-duplicate"></i>
         </button>
-        <button v-if="element.attributes.orderable.urls.delete_url" class="btn icon-btn btn-light" @click="showDeleteModal" tabindex="0">
+        <button v-if="element.attributes.orderable.urls.delete_url" class="btn icon-btn btn-light btn-sm" @click="showDeleteModal" tabindex="0">
           <i class="sn-icon sn-icon-delete"></i>
         </button>
       </div>
@@ -63,7 +63,7 @@
         />
       </Draggable>
       <div v-if="element.attributes.orderable.urls.create_item_url"
-           class="btn btn-light step-checklist-add-item"
+           class="btn btn-light btn-sm step-checklist-add-item"
            tabindex="0"
            @keyup.enter="addItem"
            @click="addItem">
diff --git a/app/javascript/vue/protocol/step_elements/checklistItem.vue b/app/javascript/vue/protocol/step_elements/checklistItem.vue
index c6c6762e1..0e8f54f27 100644
--- a/app/javascript/vue/protocol/step_elements/checklistItem.vue
+++ b/app/javascript/vue/protocol/step_elements/checklistItem.vue
@@ -39,10 +39,10 @@
         </div>
       </div>
       <div class="step-element-controls">
-        <button v-if="!checklistItem.attributes.urls || updateUrl" class="btn icon-btn btn-light" @click="enableTextEdit" tabindex="0">
+        <button v-if="!checklistItem.attributes.urls || updateUrl" class="btn icon-btn btn-light  btn-sm" @click="enableTextEdit" tabindex="0">
           <i class="sn-icon sn-icon-edit"></i>
         </button>
-        <button v-if="!checklistItem.attributes.urls || deleteUrl" class="btn icon-btn btn-light" @click="showDeleteModal" tabindex="0">
+        <button v-if="!checklistItem.attributes.urls || deleteUrl" class="btn icon-btn btn-light  btn-sm" @click="showDeleteModal" tabindex="0">
           <i class="sn-icon sn-icon-delete"></i>
         </button>
       </div>
diff --git a/app/javascript/vue/shared/inline_edit.vue b/app/javascript/vue/shared/inline_edit.vue
index 33fe2c400..bc884a978 100644
--- a/app/javascript/vue/shared/inline_edit.vue
+++ b/app/javascript/vue/shared/inline_edit.vue
@@ -20,10 +20,10 @@
       </div>
     </div>
     <template v-if="editing">
-      <div :class="{ 'btn-primary': !error, 'btn-disabled': error }" class="sci-inline-edit__control btn icon-btn" @click="update">
+      <div :class="{ 'btn-primary': !error, 'btn-disabled': error }" class="sci-inline-edit__control btn btn-sm icon-btn" @click="update">
         <i class="sn-icon sn-icon-check"></i>
       </div>
-      <div class="sci-inline-edit__control btn btn-light icon-btn" @mousedown="cancelEdit">
+      <div class="sci-inline-edit__control btn btn-light btn-sm icon-btn" @mousedown="cancelEdit">
         <i class="sn-icon sn-icon-close"></i>
       </div>
     </template>

From b623cf8d042e36e642b8127527ca99971b72cfde Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Thu, 13 Jul 2023 14:21:55 +0200
Subject: [PATCH 02/45] Fix canvas styling [SCI-8789]

---
 app/assets/stylesheets/experiment/canvas.scss |  2 +-
 app/assets/stylesheets/projects.scss          | 12 +++++++++---
 app/assets/stylesheets/themes/scinote.scss    |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/experiment/canvas.scss b/app/assets/stylesheets/experiment/canvas.scss
index 18ac2e509..ca034986b 100644
--- a/app/assets/stylesheets/experiment/canvas.scss
+++ b/app/assets/stylesheets/experiment/canvas.scss
@@ -19,7 +19,7 @@
   }
 
   .panel-heading {
-    padding: 10px 15px 4px;
+    padding: 7px 30px 7px 15px;
   }
 
   .panel-body {
diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss
index e4e0b2d39..00bb3c329 100644
--- a/app/assets/stylesheets/projects.scss
+++ b/app/assets/stylesheets/projects.scss
@@ -184,8 +184,14 @@ path, ._jsPlumb_endpoint {
     height: 40px;
 
     .dropdown {
-      bottom: 18px;
-      left: 0;
+      bottom: 22px;
+      left: 22px;
+
+      &:hover {
+        a {
+          text-decoration: none;
+        }
+      }
     }
   }
 
@@ -420,7 +426,7 @@ path, ._jsPlumb_endpoint {
     font-size: $font-size-large;
     text-transform: uppercase;
     display: block;
-    margin-top: 20%;
+    margin-top: 10%;
 
     a {
       color: $color-emperor;
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index d847c2610..3621f393f 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -775,6 +775,7 @@ ul.double-line > li {
 }
 
 .panel-heading .dropdown {
+  background-color: $color-white;
   bottom: 8px;
   left: 8px;
 }

From 973d65ca0078f18bd9612990e3a9838277e2fe21 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 5 Jul 2023 07:30:37 +0100
Subject: [PATCH 03/45] Set blank default date for added_on repository filters
 [SCI-8744]

---
 .../filters/repositoryDateTimeValue.vue           |  2 +-
 app/javascript/vue/shared/date_picker.vue         | 15 ++++++++++-----
 app/javascript/vue/shared/date_time_picker.vue    |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue
index 4947a84ce..4af82b992 100644
--- a/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue
+++ b/app/javascript/vue/repository_filter/filters/repositoryDateTimeValue.vue
@@ -11,7 +11,7 @@
     <template v-if="!isPreset">
       <div class="datetime-filter-attributes">
         <div class="filter-datepicker-input">
-          <DateTimePicker @change="updateDate" :selectorId="`DatePicker${filter.id}`" :defaultValue="date || fallbackDate()" />
+          <DateTimePicker @change="updateDate" :selectorId="`DatePicker${filter.id}`" :defaultValue="null" />
         </div>
         <div class="between-delimiter vertical" v-if="operator == 'between'"></div>
         <div class="filter-datepicker-to-input">
diff --git a/app/javascript/vue/shared/date_picker.vue b/app/javascript/vue/shared/date_picker.vue
index 31338dda5..d7581405b 100644
--- a/app/javascript/vue/shared/date_picker.vue
+++ b/app/javascript/vue/shared/date_picker.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="datepicker sci-input-container right-icon">
-      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder="" />
+      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder="dd/mm/yyyy" />
       <i class="sn-icon sn-icon-calendar"></i>
   </div>
 </template>
@@ -11,7 +11,7 @@
     props: {
       selectorId: { type: String, required: true },
       useCurrent: { type: Boolean, default: true },
-      defaultValue: { type: Date, default: true }
+      defaultValue: { type: Date, default: null }
     },
     mounted() {
       $("#" + this.selectorId).datetimepicker(
@@ -22,14 +22,19 @@
           format: this.dateFormat,
           date: this.defaultValue
         }
-      );
-      this.update($("#" + this.selectorId).data("DateTimePicker").date());
+        );
+      if(this.isValidDate(this.defaultValue)) {
+        this.update($("#" + this.selectorId).data("DateTimePicker").date());
+      }
       $("#" + this.selectorId).on('dp.change', (e) => this.update(e.date))
     },
     methods: {
       update(value) {
         this.$emit('change', (value._isAMomentObject) ? value.toDate() : '');
-      }
+      },
+      isValidDate(date) {
+        return (date instanceof Date) && !isNaN(date.getTime());
+      },
     }
   }
 </script>
diff --git a/app/javascript/vue/shared/date_time_picker.vue b/app/javascript/vue/shared/date_time_picker.vue
index 732e9617d..5f750a2b2 100644
--- a/app/javascript/vue/shared/date_time_picker.vue
+++ b/app/javascript/vue/shared/date_time_picker.vue
@@ -34,6 +34,7 @@
         this.updateDateTime();
       },
       getTime(dateTime) {
+        if(!this.isValidDate(dateTime)) return
         return `${dateTime.getHours().toString().padStart(2, '0')}:${dateTime.getMinutes().toString().padStart(2, '0')}`
       },
       updateTime(value) {

From 20fb1e928557905245544eb319677a0efadcd7ac Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 5 Jul 2023 07:39:14 +0100
Subject: [PATCH 04/45] Set blank default date for added_on repository
 filters(Fix llinter errors) [SCI-8744]

---
 app/javascript/vue/shared/date_picker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/vue/shared/date_picker.vue b/app/javascript/vue/shared/date_picker.vue
index d7581405b..97a62ecaa 100644
--- a/app/javascript/vue/shared/date_picker.vue
+++ b/app/javascript/vue/shared/date_picker.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="datepicker sci-input-container right-icon">
-      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder="dd/mm/yyyy" />
+      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder='dd/mm/yyyy'/>
       <i class="sn-icon sn-icon-calendar"></i>
   </div>
 </template>

From 8bacfa4158951c9c6ba75f994ed35a5cd7413c7c Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 5 Jul 2023 07:45:30 +0100
Subject: [PATCH 05/45] Set blank default date for added_on repository
 filters(Fix llinter errors) [SCI-8744]

---
 app/javascript/vue/shared/date_picker.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/shared/date_picker.vue b/app/javascript/vue/shared/date_picker.vue
index 97a62ecaa..f0b7a8add 100644
--- a/app/javascript/vue/shared/date_picker.vue
+++ b/app/javascript/vue/shared/date_picker.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="datepicker sci-input-container right-icon">
-      <input @change="update" type="datetime" class="form-control calendar-input sci-input-field" :id="this.selectorId" placeholder='dd/mm/yyyy'/>
+      <input
+        @change="update"
+        type="datetime"
+        class="form-control calendar-input sci-input-field"
+        :id="this.selectorId"
+        placeholder='dd/mm/yyyy'
+      />
       <i class="sn-icon sn-icon-calendar"></i>
   </div>
 </template>

From a63e6f20b437a26e6fd3760c035cd3275146f022 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 5 Jul 2023 13:15:28 +0100
Subject: [PATCH 06/45] Remove redundant check [SCI-8744]

---
 app/javascript/vue/shared/date_picker.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/javascript/vue/shared/date_picker.vue b/app/javascript/vue/shared/date_picker.vue
index f0b7a8add..9e57a015a 100644
--- a/app/javascript/vue/shared/date_picker.vue
+++ b/app/javascript/vue/shared/date_picker.vue
@@ -29,9 +29,6 @@
           date: this.defaultValue
         }
         );
-      if(this.isValidDate(this.defaultValue)) {
-        this.update($("#" + this.selectorId).data("DateTimePicker").date());
-      }
       $("#" + this.selectorId).on('dp.change', (e) => this.update(e.date))
     },
     methods: {

From 5266fad02d834c894322829206608359d28e738a Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Fri, 14 Jul 2023 08:37:29 +0200
Subject: [PATCH 07/45] Fix bootstrap input-group style [SCI-8723] (#5770)

---
 app/assets/stylesheets/experiment/canvas.scss | 8 ++++++++
 app/views/search/index.html.erb               | 2 +-
 app/views/search/new.html.erb                 | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/experiment/canvas.scss b/app/assets/stylesheets/experiment/canvas.scss
index ca034986b..8ff80f37e 100644
--- a/app/assets/stylesheets/experiment/canvas.scss
+++ b/app/assets/stylesheets/experiment/canvas.scss
@@ -82,3 +82,11 @@
     background-repeat: no-repeat;
   }
 }
+
+#manage-module-due-date-modal {
+  .input-group {
+    .form-control {
+      height: 2.5rem;
+    }
+  }
+}
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index b94ac610b..202477cab 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -12,7 +12,7 @@
                      role: 'search' do %>
           <div class="form-group">
             <div class="input-group">
-              <input class="form-control"
+              <input class="form-control min-h-[2.5rem]"
                      type="text"
                      name="q"
                      placeholder="<%= t('nav.search') %>"
diff --git a/app/views/search/new.html.erb b/app/views/search/new.html.erb
index deb2f6284..7c130f832 100644
--- a/app/views/search/new.html.erb
+++ b/app/views/search/new.html.erb
@@ -6,7 +6,7 @@
 <%= form_tag search_path, method: :get, id: 'search-bar', class: 'navbar-form navbar-left', role: 'search' do %>
   <div class="form-group">
     <div class="input-group">
-      <input class="form-control" type="text" name="q" placeholder="<%= t('nav.search') %>">
+      <input class="form-control min-h-[2.5rem]" type="text" name="q" placeholder="<%= t('nav.search') %>">
       <span class="input-group-btn">
         <button id="search-button" class="btn btn-secondary" type="submit">
           <span class="sn-icon sn-icon-search"></span>

From ebe1bd583fdbcf71c6e201051cb99f5220b03a83 Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Fri, 14 Jul 2023 11:30:36 +0100
Subject: [PATCH 08/45] Fix issue json response for creating result table
 [SCI-8853] (#5768)

* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
---
 app/controllers/result_tables_controller.rb | 24 +++++++------------
 app/controllers/result_texts_controller.rb  | 26 ++++++---------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/app/controllers/result_tables_controller.rb b/app/controllers/result_tables_controller.rb
index 9a08a9f0c..4519b5a75 100644
--- a/app/controllers/result_tables_controller.rb
+++ b/app/controllers/result_tables_controller.rb
@@ -18,15 +18,9 @@ class ResultTablesController < ApplicationController
       table: @table
     )
 
-    respond_to do |format|
-      format.json {
-        render json: {
-          html: render_to_string({
-            partial: "new.html.erb"
-          })
-        }, status: :ok
-      }
-    end
+    render json: {
+      html: render_to_string({ partial: 'new', formats: :html })
+    }, status: :ok
   end
 
   def create
@@ -57,9 +51,7 @@ class ResultTablesController < ApplicationController
     respond_to do |format|
       format.json {
         render json: {
-          html: render_to_string({
-            partial: "edit.html.erb"
-          })
+          html: render_to_string({ partial: 'edit', formats: :html })
         }, status: :ok
       }
     end
@@ -98,9 +90,11 @@ class ResultTablesController < ApplicationController
         }
         format.json {
           render json: {
-            html: render_to_string({
-              partial: "my_modules/result.html.erb", locals: {result: @result}
-            })
+            html: render_to_string(
+              partial: 'my_modules/result',
+              locals: { result: @result },
+              formats: :html
+            )
           }, status: :ok
         }
       else
diff --git a/app/controllers/result_texts_controller.rb b/app/controllers/result_texts_controller.rb
index 9ea695025..d2b39b8e5 100644
--- a/app/controllers/result_texts_controller.rb
+++ b/app/controllers/result_texts_controller.rb
@@ -20,15 +20,9 @@ class ResultTextsController < ApplicationController
     )
     @result.build_result_text
 
-    respond_to do |format|
-      format.json {
-        render json: {
-          html: render_to_string({
-            partial: "new.html.erb"
-          })
-        }, status: :ok
-      }
-    end
+    render json: {
+      html: render_to_string({ partial: 'new', formats: :html })
+    }, status: :ok
   end
 
   def create
@@ -55,15 +49,9 @@ class ResultTextsController < ApplicationController
   end
 
   def edit
-    respond_to do |format|
-      format.json {
-        render json: {
-          html: render_to_string({
-            partial: "edit.html.erb"
-          })
-        }, status: :ok
-      }
-    end
+    render json: {
+      html: render_to_string({ partial: 'edit', formats: :html })
+    }, status: :ok
   end
 
   def update
@@ -110,7 +98,7 @@ class ResultTextsController < ApplicationController
         format.json do
           render json: {
             html: render_to_string(
-              partial: 'my_modules/result.html.erb',
+              partial: 'my_modules/result',
               locals: { result: @result },
               formats: :html
             )

From 51a19a559bfb6e6fd4db69a8ac95857eca8616c6 Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Fri, 14 Jul 2023 14:25:24 +0200
Subject: [PATCH 09/45] Define allowed scripts src-elem for CSP [SCI-8634]
 (#5771)

---
 config/initializers/content_security_policy.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 53707a5b4..087a331d7 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -12,6 +12,7 @@ ActiveSupport::Reloader.to_prepare do
     policy.img_src     :self, :https, :data, :blob
     policy.object_src  :none
     policy.script_src  :self, :unsafe_eval
+    policy.script_src_elem :self, *Extends::EXTERNAL_SERVICES
     policy.style_src   :self, :https, :unsafe_inline, :data
     policy.connect_src :self, :data, *Extends::EXTERNAL_SERVICES
 

From 18f383c543e40c0200d183eaa5e416347cf0df41 Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Fri, 14 Jul 2023 15:38:00 +0200
Subject: [PATCH 10/45] Update CSP script-src-elem [SCI-8634] (#5775)

---
 config/initializers/content_security_policy.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 087a331d7..09e47902d 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -12,7 +12,7 @@ ActiveSupport::Reloader.to_prepare do
     policy.img_src     :self, :https, :data, :blob
     policy.object_src  :none
     policy.script_src  :self, :unsafe_eval
-    policy.script_src_elem :self, *Extends::EXTERNAL_SERVICES
+    policy.script_src_elem :self, :unsafe_eval, *Extends::EXTERNAL_SERVICES
     policy.style_src   :self, :https, :unsafe_inline, :data
     policy.connect_src :self, :data, *Extends::EXTERNAL_SERVICES
 
@@ -32,7 +32,7 @@ Rails.application.config.content_security_policy_nonce_generator = -> (request)
 end
 
 # Set the nonce only to specific directives
-Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+Rails.application.config.content_security_policy_nonce_directives = %w(script-src script-src-elem)
 
 # Report CSP violations to a specified URI
 # For further information see the following documentation:

From 3ee50496541cd0c6560bfc8f47b6a97ff9142209 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Sat, 15 Jul 2023 11:33:44 +0100
Subject: [PATCH 11/45] Fix issue archiving task result tables and when
 downloading archived tables [SCI-8851]

---
 app/controllers/result_tables_controller.rb                  | 4 ++--
 app/views/result_tables/{_download.txt.erb => _download.erb} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/views/result_tables/{_download.txt.erb => _download.erb} (100%)

diff --git a/app/controllers/result_tables_controller.rb b/app/controllers/result_tables_controller.rb
index 4519b5a75..756c29f74 100644
--- a/app/controllers/result_tables_controller.rb
+++ b/app/controllers/result_tables_controller.rb
@@ -63,7 +63,7 @@ class ResultTablesController < ApplicationController
     @result.table.last_modified_by = current_user
     @result.table.team = current_team
     @result.assign_attributes(update_params)
-    @result.table.metadata = JSON.parse(update_params[:table_attributes][:metadata])
+    @result.table.metadata = JSON.parse(update_params[:table_attributes][:metadata]) if update_params[:table_attributes]
     flash_success = t("result_tables.update.success_flash",
       module: @my_module.name)
     if @result.archived_changed?(from: false, to: true)
@@ -108,7 +108,7 @@ class ResultTablesController < ApplicationController
   def download
     _ = JSON.parse @result_table.table.contents
     @table_data = _["data"] || []
-    data = render_to_string partial: 'download.txt.erb'
+    data = render_to_string partial: 'download'
     send_data data, filename: @result_table.result.name + '.txt',
       type: 'plain/text'
   end
diff --git a/app/views/result_tables/_download.txt.erb b/app/views/result_tables/_download.erb
similarity index 100%
rename from app/views/result_tables/_download.txt.erb
rename to app/views/result_tables/_download.erb

From 6bc2efbcdecf9ba187d9a1159ef9982e8a8b8a5b Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Mon, 17 Jul 2023 11:50:52 +0400
Subject: [PATCH 12/45] CSS: Inventories filter input width [SCI-8791]

---
 app/assets/stylesheets/repository/filters.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/repository/filters.scss b/app/assets/stylesheets/repository/filters.scss
index c984c85d0..8f6424c46 100644
--- a/app/assets/stylesheets/repository/filters.scss
+++ b/app/assets/stylesheets/repository/filters.scss
@@ -149,6 +149,7 @@
     }
 
     .filter-container {
+      width: 424px;
       margin-bottom: .5em;
 
       .filter-title {

From 504a0bee625fec3fe207a152ecc166502e9cd2f1 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Mon, 17 Jul 2023 10:55:36 +0200
Subject: [PATCH 13/45] Fix scroll for protocols.io [SCI-8825] (#5774)

---
 app/assets/javascripts/protocols/protocolsio.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/protocols/protocolsio.js b/app/assets/javascripts/protocols/protocolsio.js
index 78610ba0a..0695f7be5 100644
--- a/app/assets/javascripts/protocols/protocolsio.js
+++ b/app/assets/javascripts/protocols/protocolsio.js
@@ -44,7 +44,8 @@ function applyClickCallbackOnProtocolCards() {
           // Set iframe content
           iFrame.contents().find('body').html(data.html);
 
-          scrollbox.scrollTo(0);
+          scrollbox.scrollTop(0);
+
           iFrame.contents().find('body').find('table.htCore')
             .css('width', '100%')
             .css('table-layout', 'auto');
@@ -130,7 +131,7 @@ function applySearchCallback() {
       } else if (data.html) {
         resetPreviewPanel();
         $('.empty-text').hide();
-        listWrapper.show().html(data.html).scrollTo(0);
+        listWrapper.show().html(data.html).scrollTop(0);
       } else {
         setDefaultViewState();
       }

From 5b989042f09f5ccb53d57b6a190dab42bf2dcf66 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 17 Jul 2023 11:00:32 +0200
Subject: [PATCH 14/45] Fix checklist add item button position [SCI-8788]

---
 app/assets/stylesheets/steps/components/checklist.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/steps/components/checklist.scss b/app/assets/stylesheets/steps/components/checklist.scss
index 8cbbb4018..d0088cf08 100644
--- a/app/assets/stylesheets/steps/components/checklist.scss
+++ b/app/assets/stylesheets/steps/components/checklist.scss
@@ -46,7 +46,7 @@
   }
 
   .step-checklist-add-item {
-    margin-left: 12px;
+    margin-left: 2.75rem;
 
     .fas {
       margin-right: .5em;

From 4808f6438c0da1b6f659cbb8ab74b73c294fa46f Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Mon, 17 Jul 2023 11:26:41 +0200
Subject: [PATCH 15/45] Fix CSP script-src [SCI-8634] (#5781)

---
 config/initializers/content_security_policy.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 09e47902d..48ab4e62c 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -11,8 +11,7 @@ ActiveSupport::Reloader.to_prepare do
     policy.font_src    :self, :https, :data
     policy.img_src     :self, :https, :data, :blob
     policy.object_src  :none
-    policy.script_src  :self, :unsafe_eval
-    policy.script_src_elem :self, :unsafe_eval, *Extends::EXTERNAL_SERVICES
+    policy.script_src  :self, :unsafe_eval, *Extends::EXTERNAL_SERVICES
     policy.style_src   :self, :https, :unsafe_inline, :data
     policy.connect_src :self, :data, *Extends::EXTERNAL_SERVICES
 
@@ -32,7 +31,7 @@ Rails.application.config.content_security_policy_nonce_generator = -> (request)
 end
 
 # Set the nonce only to specific directives
-Rails.application.config.content_security_policy_nonce_directives = %w(script-src script-src-elem)
+Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
 
 # Report CSP violations to a specified URI
 # For further information see the following documentation:

From 3167a3ca8f020ea17bb23850ee27f267aca50cf9 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Mon, 17 Jul 2023 12:06:52 +0200
Subject: [PATCH 16/45] Fix smart annotation popover url [SCI-8866][SCI-8867]

---
 app/views/shared/_atwho_user_container.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/_atwho_user_container.erb b/app/views/shared/_atwho_user_container.erb
index 2a53ac78b..ac4a60d8c 100644
--- a/app/views/shared/_atwho_user_container.erb
+++ b/app/views/shared/_atwho_user_container.erb
@@ -21,7 +21,7 @@
     data-full-name="<%= user.full_name %>"
     data-email="<%= user.email %>"
     data-popover-html="<%= popover_html %>"
-    data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, true) %>"
+    data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
   >
     <%= user.full_name %>
   </a>

From 1dfc46e99546431a14a57d21c8c8b936ecb60ede Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Mon, 17 Jul 2023 13:04:56 +0200
Subject: [PATCH 17/45] Fix comments update action [SCI-8873] (#5786)

---
 app/helpers/comment_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/comment_helper.rb b/app/helpers/comment_helper.rb
index b6f653cdb..9f173750a 100644
--- a/app/helpers/comment_helper.rb
+++ b/app/helpers/comment_helper.rb
@@ -108,7 +108,7 @@ module CommentHelper
       if partial
         render json: {
           html: render_to_string(
-            partial: "/shared/comments/#{partial}.html.erb",
+            partial: "/shared/comments/#{partial}",
             locals: {
               comment: comment,
               skip_header: false

From bd1e81f89498014fc0e6544152654def18255a6c Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 17 Jul 2023 12:06:37 +0200
Subject: [PATCH 18/45] Fix preview generation [SCI-8855]

---
 .../active_storage/representations/redirect_controller.rb      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/active_storage/representations/redirect_controller.rb b/app/controllers/active_storage/representations/redirect_controller.rb
index 2cfbe5ea2..b6735f826 100644
--- a/app/controllers/active_storage/representations/redirect_controller.rb
+++ b/app/controllers/active_storage/representations/redirect_controller.rb
@@ -29,7 +29,8 @@ module ActiveStorage
 
         preview_exists =
           if @blob.variable?
-            @blob.service.exist?(@blob.representation(params['variation_key']).key)
+            rep_key = @blob.representation(params['variation_key']).key
+            rep_key && @blob.service.exist?(rep_key)
           else
             @blob.preview(params['variation_key']).image.attached?
           end

From 063c1209ba05c1f292a228e0dc52cdb2a12ce62a Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Mon, 17 Jul 2023 12:15:04 +0100
Subject: [PATCH 19/45] Fix issue when viewing task repository snapshot
 [SCI-8871] (#5785)

---
 app/controllers/my_module_repository_snapshots_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/my_module_repository_snapshots_controller.rb b/app/controllers/my_module_repository_snapshots_controller.rb
index f3b5430e1..8c4d930d2 100644
--- a/app/controllers/my_module_repository_snapshots_controller.rb
+++ b/app/controllers/my_module_repository_snapshots_controller.rb
@@ -26,7 +26,7 @@ class MyModuleRepositorySnapshotsController < ApplicationController
                          .preload(:repository_columns,
                                   :created_by,
                                   repository_cells: { value: @repository_snapshot.cell_preload_includes })
-      rows_view = 'repository_rows/snapshot_index.json'
+      rows_view = 'repository_rows/snapshot_index'
     end
     @repository_rows = repository_rows.page(page).per(per_page)
 

From 377572785717497cbb4cbf67543d4884a1c1ca0d Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Mon, 17 Jul 2023 15:33:02 +0200
Subject: [PATCH 20/45] Fix project export issue [SCI-8827] (#5767)

---
 app/models/team_zip_export.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/team_zip_export.rb b/app/models/team_zip_export.rb
index 470dbd574..6632f3737 100644
--- a/app/models/team_zip_export.rb
+++ b/app/models/team_zip_export.rb
@@ -223,7 +223,7 @@ class TeamZipExport < ZipExport
         file_name = preview.image.filename.to_s
         file_data = preview.image.download
       else
-        file_name = preview.filename.to_s
+        file_name = preview.blob.filename.to_s
 
         begin
           file_data = preview.processed.service.download(preview.key)

From 5736c444f6f6c12a8b5782164b4c9f49b7cb3970 Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Mon, 17 Jul 2023 15:36:22 +0200
Subject: [PATCH 21/45] Remove not used code for global activities [SCI-4851]
 (#5773)

* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
---
 app/assets/javascripts/activities/index.js | 16 ----------
 app/controllers/activities_controller.rb   | 36 ----------------------
 app/controllers/my_modules_controller.rb   | 18 ++++++++---
 app/views/activities/_activity.html.erb    | 32 -------------------
 app/views/activities/_list.html.erb        |  3 --
 app/views/activities/index.html.erb        | 27 ----------------
 config/initializers/assets.rb              |  1 -
 config/routes.rb                           |  2 --
 8 files changed, 13 insertions(+), 122 deletions(-)
 delete mode 100644 app/assets/javascripts/activities/index.js
 delete mode 100644 app/controllers/activities_controller.rb
 delete mode 100644 app/views/activities/_activity.html.erb
 delete mode 100644 app/views/activities/_list.html.erb
 delete mode 100644 app/views/activities/index.html.erb

diff --git a/app/assets/javascripts/activities/index.js b/app/assets/javascripts/activities/index.js
deleted file mode 100644
index 01f333857..000000000
--- a/app/assets/javascripts/activities/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-(function() {
-  function initActivitiesButton() {
-    $('.btn-more-activities')
-      .on('ajax:success', function(e, data) {
-        $(data.html).insertAfter($('#list-activities li').last());
-        if (data.more_url) {
-          $(this).attr('href', data.more_url);
-        } else {
-          $(this).remove();
-        }
-      });
-  }
-  initActivitiesButton();
-}());
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
deleted file mode 100644
index 594dfb76d..000000000
--- a/app/controllers/activities_controller.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class ActivitiesController < ApplicationController
-  include ActivityHelper
-
-  def index
-    @vars = local_vars
-    render json: {
-      more_url: local_vars.fetch(:more_activities_url),
-      html: render_to_string(
-        partial: 'list', locals: @vars, formats: :html
-      )
-    }
-  end
-
-  private
-
-  def local_vars
-    page = (params[:page] || 1).to_i
-    activities = current_user.last_activities
-                             .page(page)
-                             .per(Constants::ACTIVITY_AND_NOTIF_SEARCH_LIMIT)
-    unless activities.blank? || activities.last_page?
-      more_url = url_for(
-        activities_url(
-          format: :json,
-          page: page + 1,
-          last_activity: activities.last.id
-        )
-      )
-    end
-    {
-      activities: activities,
-      more_activities_url: more_url,
-      page: page
-    }
-  end
-end
diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index eb03381ed..c4f7a03ff 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -131,11 +131,19 @@ class MyModulesController < ApplicationController
     @next_page = activities.next_page
     @starting_timestamp = activities.first&.created_at.to_i
 
-    render json: {
-      activities_html: render_to_string(partial: 'global_activities/activity_list'),
-      next_page: @next_page,
-      starting_timestamp: @starting_timestamp
-    }
+    respond_to do |format|
+      format.json do
+        render json: {
+          activities_html: render_to_string(
+            partial: 'global_activities/activity_list',
+            formats: :html
+          ),
+          next_page: @next_page,
+          starting_timestamp: @starting_timestamp
+        }
+      end
+      format.html
+    end
   end
 
   # Different controller for showing activities inside tab
diff --git a/app/views/activities/_activity.html.erb b/app/views/activities/_activity.html.erb
deleted file mode 100644
index e4865539a..000000000
--- a/app/views/activities/_activity.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<li class="activity-item">
-  <span class="activity-item-date">
-    <%= l activity.created_at, format: :full %>
-  </span>
-  <span class="activity-item-text">
-    <%= activity_truncate(activity.message) %>
-    <% if activity.my_module %>
-      [<%=t 'Project' %>:
-      <% if activity.my_module.experiment.project.name.length >
-             Constants::NAME_TRUNCATION_LENGTH %>
-        <div class="modal-tooltip">
-          <%= truncate(activity.my_module.experiment.project.name,
-                       lenght: Constants::NAME_TRUNCATION_LENGTH).strip %>
-          <span class="modal-tooltiptext"><%= activity.my_module.experiment.project.name %></span>
-        </div>
-      <% else %>
-        <%= activity.my_module.experiment.project.name %>
-      <% end %>, <%=t 'Module' %>:
-      <% if activity.my_module.name.length >
-             Constants::NAME_TRUNCATION_LENGTH %>
-        <div class="modal-tooltip"><%= truncate(
-            activity.my_module.name,
-            lenght: Constants::NAME_TRUNCATION_LENGTH) %>
-          <span class="modal-tooltiptext"><%= activity.my_module.name %></span>
-        </div>
-      <% else %>
-        <%= activity.my_module.name %>
-      <% end %>
-      ]
-    <% end %>
-  </span>
-</li>
diff --git a/app/views/activities/_list.html.erb b/app/views/activities/_list.html.erb
deleted file mode 100644
index 9f12727e5..000000000
--- a/app/views/activities/_list.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% activities.each_with_index do |activity, index| %>
-  <%= render 'activity', activity: activity %>
-<% end %>
diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
deleted file mode 100644
index 4c7c5f04e..000000000
--- a/app/views/activities/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<% provide :head_title, t('nav.label.activities') %>
-
-<div class="content-pane">
-  <div class="container" id="global-activity-page">
-    <div>
-      <ul id="list-activities" class="no-style content-activities">
-        <% if @vars[:activities].blank? %>
-          <li><em><%= t'activities.index.no_activities' %></em></li>
-        <% else %>
-          <% @vars[:activities].each do |activity| %>
-            <%= render 'activity', activity: activity %>
-          <% end %>
-        <% end %>
-      </ul>
-      <% if @vars[:more_activities_url].present? && @vars[:page] == 1 %>
-      <div class="text-center">
-        <a class="btn btn-secondary btn-more-activities"
-           href="<%= @vars[:more_activities_url] %>"
-           data-remote="true">
-          <%= t'activities.index.more_activities' %></a>
-      </div>
-      <% end %>
-    </div>
-  </div>
-</div>
-
-<%= javascript_include_tag 'activities/index.js' %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 5c260f003..34fcb9aa8 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -87,7 +87,6 @@ Rails.application.config.assets.precompile += %w(repositories/share_modal.js)
 Rails.application.config.assets.precompile += %w(repositories/edit.js)
 Rails.application.config.assets.precompile += %w(repositories/stock.js)
 Rails.application.config.assets.precompile += %w(repositories/repository_datatable.js)
-Rails.application.config.assets.precompile += %w(activities/index.js)
 Rails.application.config.assets.precompile += %w(global_activities/index.js)
 Rails.application.config.assets.precompile += %w(repositories/show.js)
 Rails.application.config.assets.precompile += %w(sidebar_toggle.js)
diff --git a/config/routes.rb b/config/routes.rb
index c04ec7676..fb51e3322 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,8 +28,6 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :activities, only: [:index]
-
     get '/jobs/:id/status', to: 'active_jobs#status'
 
     get 'forbidden', to: 'application#forbidden', as: 'forbidden'

From 2698681548b3c553bd056d48812010cae06976df Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Mon, 17 Jul 2023 14:38:28 +0100
Subject: [PATCH 22/45] Fix Not correct naming for label in global activity
 filter (#5776)

* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
---
 app/javascript/vue/repository_print_modal/container.vue | 2 +-
 config/initializers/extends.rb                          | 2 +-
 config/locales/global_activities/en.yml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue
index c1fcf4361..80415230d 100644
--- a/app/javascript/vue/repository_print_modal/container.vue
+++ b/app/javascript/vue/repository_print_modal/container.vue
@@ -153,7 +153,7 @@
               description: i.attributes.description || ''
             }
           }
-        })
+        }).sort((temp1, temp2) => (temp1.label?.toLowerCase() > temp2.label?.toLowerCase() ? 1 : -1));
       },
       availablePrinters() {
         return this.printers.map(i => {
diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb
index a81fe3a05..ce4f89aca 100644
--- a/config/initializers/extends.rb
+++ b/config/initializers/extends.rb
@@ -462,7 +462,7 @@ class Extends
                           83, 101, 112, 123, 125, 117, 119, 129, 131, 170, 173, 179, 187, 186,
                           190, 191, *204..215, 220, 221, 223, 227, 228, 229, *230..235, *237..240],
     team: [92, 94, 93, 97, 104],
-    label_repository: [*216..219]
+    label_templates: [*216..219]
   }
 
   TOP_LEVEL_ASSIGNABLES = %w(Project Team Protocol Repository).freeze
diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml
index 1c134f943..5ee2edb64 100644
--- a/config/locales/global_activities/en.yml
+++ b/config/locales/global_activities/en.yml
@@ -502,7 +502,7 @@ en:
       protocol_repository: "Protocol templates"
       team: "Team"
       exports: "Exports"
-      label_repository: "Label repository"
+      label_templates: "Label templates"
     subject_name:
       repository: "Inventory"
       project: "Project"

From d71351fcbc53b075214b4a84cfaf7343bdedda20 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Mon, 17 Jul 2023 15:39:19 +0200
Subject: [PATCH 23/45] Fix scrollTo for inventory filter [SCI-8869] (#5782)

---
 app/javascript/vue/repository_filter/container.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/repository_filter/container.vue b/app/javascript/vue/repository_filter/container.vue
index 9b3fffa66..7944e3b59 100644
--- a/app/javascript/vue/repository_filter/container.vue
+++ b/app/javascript/vue/repository_filter/container.vue
@@ -106,7 +106,7 @@
       },
       toggleColumnsFilters(e) {
         e.stopPropagation();
-        $('.filters-columns-list').scrollTo(0);
+        $('.filters-columns-list').scrollTop(0);
         this.closeSavedFilters();
         $('#filtersColumnsDropdown').toggleClass('open');
       },
@@ -146,7 +146,7 @@
       },
       toggleSavedFilters(e) {
         e.stopPropagation();
-        $('.saved-filters-list').scrollTo(0);
+        $('.saved-filters-list').scrollTop(0);
         if (this.savedFilterScrollbar) {
           this.savedFilterScrollbar.update();
         } else {

From 2f5015e2a25e9ebcad92f25e1fe93916bdfc55e7 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Mon, 17 Jul 2023 15:42:40 +0200
Subject: [PATCH 24/45] Fix error at adding consumption to assigned item to
 task [SCI-8868] (#5789)

---
 .../repositories/_consume_stock_modal_content.html.erb        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb b/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb
index 0152f10c3..dbd5d7f63 100644
--- a/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb
+++ b/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb
@@ -1,4 +1,6 @@
-<%= form_with url: update_consumption_my_module_repository_path(@my_module, @repository, module_row_id: @module_repository_row), method: :post, remote: true do |f| %>
+<%= form_with url: update_consumption_my_module_repository_path(@my_module, @repository, module_row_id: @module_repository_row), 
+              method: :post, 
+              html: { data: { remote: true } } do |f| %>
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-label="<%= t('general.close') %>">
       <span aria-hidden="true">&times;</span>

From 6300c1bef8174803fe31cdc9a4f50d3c405aa80c Mon Sep 17 00:00:00 2001
From: ivanscinote <138504771+ivanscinote@users.noreply.github.com>
Date: Mon, 17 Jul 2023 16:20:49 +0200
Subject: [PATCH 25/45] Fix smart annotations multiline display [SCI-8816]
 (#5790)

---
 app/assets/stylesheets/shared/smart_annotation.scss | 3 +++
 app/services/smart_annotations/html_preview.rb      | 5 ++---
 app/views/shared/_atwho_user_container.erb          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/shared/smart_annotation.scss b/app/assets/stylesheets/shared/smart_annotation.scss
index 4906c375f..2e8915788 100644
--- a/app/assets/stylesheets/shared/smart_annotation.scss
+++ b/app/assets/stylesheets/shared/smart_annotation.scss
@@ -219,6 +219,9 @@
 }
 
 .atwho-user-container {
+  display: inline-block;
+  white-space: nowrap;
+
   .atwho-user-popover {
     cursor: pointer;
     line-height: 1.25rem;
diff --git a/app/services/smart_annotations/html_preview.rb b/app/services/smart_annotations/html_preview.rb
index deae4d344..b741bcbcd 100644
--- a/app/services/smart_annotations/html_preview.rb
+++ b/app/services/smart_annotations/html_preview.rb
@@ -26,9 +26,8 @@ module SmartAnnotations
           return "<span class='sa-type'>Exp</span>#{object.name} #{I18n.t('atwho.res.archived')}"
         end
 
-        "<a class='sa-link' href='#{ROUTES.my_modules_experiment_path(object)}'>
-          <span class='sa-type'>Exp</span>#{object.name}
-        </a>"
+        "<a class='sa-link' href='#{ROUTES.my_modules_experiment_path(object)}'>" \
+          "<span class='sa-type'>Exp</span>#{object.name}</a>"
       end
 
       def generate_tsk_snippet(_, object)
diff --git a/app/views/shared/_atwho_user_container.erb b/app/views/shared/_atwho_user_container.erb
index 2a53ac78b..6052ba3fc 100644
--- a/app/views/shared/_atwho_user_container.erb
+++ b/app/views/shared/_atwho_user_container.erb
@@ -28,4 +28,4 @@
   <% unless skip_user_status || user_still_in_team %>
     <%= I18n.t('atwho.res.removed') %>
   <% end %>
-</span>
+</span>
\ No newline at end of file

From 1982143608351ae6d4f2ea7ddb945a9ed19f259f Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Tue, 18 Jul 2023 01:50:05 +0400
Subject: [PATCH 26/45] Clunky parts: button initialization when P/E/T view is
 changed [SCI-8663]

---
 app/assets/javascripts/application.js.erb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 382e37826..000b7b1de 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -249,9 +249,12 @@ var HelperModule = (function(){
     return exit;
   });
 
-  const RESIZE_OBSERVER = new ResizeObserver(function(entries) {
-    entries.forEach((entry) => {
-      if (entry.target.offsetWidth <= parseInt(entry.target.getAttribute('data-width-breakpoint'))) {
+  const RESIZE_OBSERVER = new ResizeObserver(entries => {
+    entries.forEach(entry => {
+      const { offsetWidth } = entry.target;
+      const breakpoint = parseInt(entry.target.getAttribute('data-width-breakpoint'));
+
+      if (offsetWidth <= breakpoint && offsetWidth !== 0) {
         entry.target.classList.add('narrow');
       } else {
         entry.target.classList.remove('narrow');

From ad4724ba045e1c027b05f9d5da59faf68964752e Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Tue, 18 Jul 2023 09:22:39 +0200
Subject: [PATCH 27/45] Add salt to token JWT token payload [SCI-8854] (#5791)

---
 app/services/api/core_jwt.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/api/core_jwt.rb b/app/services/api/core_jwt.rb
index 14b0b2795..55250aea8 100644
--- a/app/services/api/core_jwt.rb
+++ b/app/services/api/core_jwt.rb
@@ -10,6 +10,7 @@ module Api
         payload[:exp] = Rails.configuration.x.core_api_token_ttl.from_now.to_i
       end
       payload[:iss] = Rails.configuration.x.core_api_token_iss
+      payload[:salt] = SecureRandom.base64(30)
       JWT.encode(payload, KEY_SECRET, Rails.configuration.x.core_api_sign_alg)
     end
 

From d37f335f176b77e49e0c0579cecf1ea85f75e1fa Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Mon, 17 Jul 2023 15:29:12 +0200
Subject: [PATCH 28/45] Fix rtf preview for new images [SCI-8870]

---
 .../concerns/active_storage/check_blob_permissions.rb           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/concerns/active_storage/check_blob_permissions.rb b/app/controllers/concerns/active_storage/check_blob_permissions.rb
index 0d5f6d4c5..8c1ddd970 100644
--- a/app/controllers/concerns/active_storage/check_blob_permissions.rb
+++ b/app/controllers/concerns/active_storage/check_blob_permissions.rb
@@ -58,6 +58,8 @@ module ActiveStorage
 
       current_user.permission_team = asset.team || current_team
 
+      return true if !asset.saved && can_read_team?(asset.team)
+
       case asset.object_type
       when 'MyModule'
         render_403 unless can_read_my_module?(asset.object)

From f0b691769f9a9ab2c51daa47e40728b23d8cc9e1 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 18 Jul 2023 11:25:23 +0200
Subject: [PATCH 29/45] Fix add checklist items position [SCI-8788]

---
 app/assets/stylesheets/steps/components/checklist.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/steps/components/checklist.scss b/app/assets/stylesheets/steps/components/checklist.scss
index d0088cf08..cfc56fa99 100644
--- a/app/assets/stylesheets/steps/components/checklist.scss
+++ b/app/assets/stylesheets/steps/components/checklist.scss
@@ -46,7 +46,7 @@
   }
 
   .step-checklist-add-item {
-    margin-left: 2.75rem;
+    margin-left: 1.925rem;
 
     .fas {
       margin-right: .5em;

From f7106917096477c1ae0a7e52de0aa68072a7707c Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 18 Jul 2023 11:43:55 +0200
Subject: [PATCH 30/45] Fix snapshot table render [SCI-8883]

---
 app/controllers/my_module_repository_snapshots_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/my_module_repository_snapshots_controller.rb b/app/controllers/my_module_repository_snapshots_controller.rb
index 8c4d930d2..a87c2fece 100644
--- a/app/controllers/my_module_repository_snapshots_controller.rb
+++ b/app/controllers/my_module_repository_snapshots_controller.rb
@@ -19,7 +19,7 @@ class MyModuleRepositorySnapshotsController < ApplicationController
     if params[:simple_view]
       repository_rows = datatable_service.repository_rows
       @repository = @repository_snapshot
-      rows_view = 'repository_rows/simple_view_index.json'
+      rows_view = 'repository_rows/simple_view_index'
     else
       repository_rows =
         datatable_service.repository_rows

From 3cf1c5365fd9df9884f56e9d857e7db464fea922 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Tue, 18 Jul 2023 14:18:41 +0400
Subject: [PATCH 31/45] conflict fix

---
 ..._atwho_user_container.erb => _atwho_user_container.html.erb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/views/shared/{_atwho_user_container.erb => _atwho_user_container.html.erb} (90%)

diff --git a/app/views/shared/_atwho_user_container.erb b/app/views/shared/_atwho_user_container.html.erb
similarity index 90%
rename from app/views/shared/_atwho_user_container.erb
rename to app/views/shared/_atwho_user_container.html.erb
index c6d673aae..b9c06e657 100644
--- a/app/views/shared/_atwho_user_container.erb
+++ b/app/views/shared/_atwho_user_container.html.erb
@@ -21,7 +21,7 @@
     data-full-name="<%= user.full_name %>"
     data-email="<%= user.email %>"
     data-popover-html="<%= popover_html %>"
-    data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
+    data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, user.avatar.attached?) %>"
   >
     <%= user.full_name %>
   </a>

From 7dcc774414f6fa5205e15be8e4fd23a1b8f5eacf Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Tue, 18 Jul 2023 12:36:41 +0100
Subject: [PATCH 32/45] Refactor html partial rendering in json responses
 [SCI-8811] (#5763)

* Remove redundant use of respond_to in controlller actions with just one responder format [SCI-8811]

* Remove redundant begin block and replace 303 status code with :see_other [SCI-8811]
---
 .../experiments_controller.rb                 |  18 +-
 .../my_modules_controller.rb                  |  18 +-
 .../access_permissions/projects_controller.rb |  36 +-
 .../protocols_controller.rb                   |  37 +-
 app/controllers/application_controller.rb     |   7 +-
 app/controllers/at_who_controller.rb          |  16 +-
 app/controllers/experiments_controller.rb     |  13 +-
 app/controllers/label_templates_controller.rb |  12 +-
 .../my_module_repositories_controller.rb      |  16 +-
 app/controllers/my_module_tags_controller.rb  |  18 +-
 app/controllers/my_modules_controller.rb      |  76 +-
 .../project_activities_controller.rb          |  12 +-
 app/controllers/projects_controller.rb        |  12 +-
 app/controllers/protocols_controller.rb       | 653 ++++++++----------
 app/controllers/reports_controller.rb         | 193 +++---
 app/controllers/repositories_controller.rb    |  21 +-
 app/controllers/repository_rows_controller.rb |  26 +-
 app/controllers/result_tables_controller.rb   |  10 +-
 app/controllers/steps_controller.rb           |   7 +-
 .../user_notifications_controller.rb          |  12 +-
 .../user_repositories_controller.rb           |  22 +-
 .../account/preferences_controller.rb         |  35 +-
 .../users/settings/teams_controller.rb        |  45 +-
 .../users/settings/user_teams_controller.rb   |  71 +-
 24 files changed, 542 insertions(+), 844 deletions(-)

diff --git a/app/controllers/access_permissions/experiments_controller.rb b/app/controllers/access_permissions/experiments_controller.rb
index 3b902c20b..a2eb3286f 100644
--- a/app/controllers/access_permissions/experiments_controller.rb
+++ b/app/controllers/access_permissions/experiments_controller.rb
@@ -7,17 +7,9 @@ module AccessPermissions
     before_action :check_read_permissions, only: %i(show)
     before_action :check_manage_permissions, only: %i(edit update)
 
-    def show
-      respond_to do |format|
-        format.json
-      end
-    end
+    def show; end
 
-    def edit
-      respond_to do |format|
-        format.json
-      end
-    end
+    def edit; end
 
     def update
       user_id = permitted_update_params[:user_id]
@@ -44,11 +36,7 @@ module AccessPermissions
 
       log_change_activity
 
-      respond_to do |format|
-        format.json do
-          render :experiment_member
-        end
-      end
+      render :experiment_member
     end
 
     private
diff --git a/app/controllers/access_permissions/my_modules_controller.rb b/app/controllers/access_permissions/my_modules_controller.rb
index 1bed4d660..e7bb26cf4 100644
--- a/app/controllers/access_permissions/my_modules_controller.rb
+++ b/app/controllers/access_permissions/my_modules_controller.rb
@@ -8,17 +8,9 @@ module AccessPermissions
     before_action :check_read_permissions, only: %i(show)
     before_action :check_manage_permissions, only: %i(edit update)
 
-    def show
-      respond_to do |format|
-        format.json
-      end
-    end
+    def show; end
 
-    def edit
-      respond_to do |format|
-        format.json
-      end
-    end
+    def edit; end
 
     def update
       user_id = permitted_update_params[:user_id]
@@ -38,11 +30,7 @@ module AccessPermissions
 
       log_change_activity
 
-      respond_to do |format|
-        format.json do
-          render :my_module_member
-        end
-      end
+      render :my_module_member
     end
 
     private
diff --git a/app/controllers/access_permissions/projects_controller.rb b/app/controllers/access_permissions/projects_controller.rb
index 81d44a672..90ca466d6 100644
--- a/app/controllers/access_permissions/projects_controller.rb
+++ b/app/controllers/access_permissions/projects_controller.rb
@@ -14,23 +14,11 @@ module AccessPermissions
         assigned_by: current_user,
         team: current_team
       )
-
-      respond_to do |format|
-        format.json
-      end
     end
 
-    def show
-      respond_to do |format|
-        format.json
-      end
-    end
+    def show; end
 
-    def edit
-      respond_to do |format|
-        format.json
-      end
-    end
+    def edit; end
 
     def update
       @user_assignment = @project.user_assignments.find_by(
@@ -51,11 +39,7 @@ module AccessPermissions
                                                    role: @user_assignment.user_role.name })
       propagate_job(@user_assignment)
 
-      respond_to do |format|
-        format.json do
-          render :project_member
-        end
-      end
+      render :project_member
     rescue ActiveRecord::RecordInvalid
       render json: { flash: t('access_permissions.update.failure') }, status: :unprocessable_entity
     end
@@ -92,14 +76,12 @@ module AccessPermissions
           end
         end
 
-        respond_to do |format|
-          @message = if created_count.zero?
-                       t('access_permissions.create.success', count: t('access_permissions.all_team'))
-                     else
-                       t('access_permissions.create.success', count: created_count)
-                     end
-          format.json { render :edit }
-        end
+        @message = if created_count.zero?
+                     t('access_permissions.create.success', count: t('access_permissions.all_team'))
+                   else
+                     t('access_permissions.create.success', count: created_count)
+                   end
+        render :edit
       rescue ActiveRecord::RecordInvalid => e
         Rails.logger.error e.message
         errors = @project.errors.present? ? @project.errors&.map(&:message)&.join(',') : e.message
diff --git a/app/controllers/access_permissions/protocols_controller.rb b/app/controllers/access_permissions/protocols_controller.rb
index eed6c61e0..30b4dad64 100644
--- a/app/controllers/access_permissions/protocols_controller.rb
+++ b/app/controllers/access_permissions/protocols_controller.rb
@@ -12,23 +12,11 @@ module AccessPermissions
         assigned_by: current_user,
         team: current_team
       )
-
-      respond_to do |format|
-        format.json
-      end
     end
 
-    def show
-      respond_to do |format|
-        format.json
-      end
-    end
+    def show; end
 
-    def edit
-      respond_to do |format|
-        format.json
-      end
-    end
+    def edit; end
 
     def update
       @user_assignment = @protocol.user_assignments.find_by(
@@ -47,11 +35,7 @@ module AccessPermissions
       log_activity(:protocol_template_access_changed, { user_target: @user_assignment.user.id,
                                                         role: @user_assignment.user_role.name })
 
-      respond_to do |format|
-        format.json do
-          render :protocol_member
-        end
-      end
+      render :protocol_member
     rescue ActiveRecord::RecordInvalid
       render json: { flash: t('access_permissions.update.failure') }, status: :unprocessable_entity
     end
@@ -85,15 +69,12 @@ module AccessPermissions
           end
         end
 
-        respond_to do |format|
-          @message = if created_count.zero?
-                       t('access_permissions.create.success', count: t('access_permissions.all_team'))
-                     else
-                       t('access_permissions.create.success', count: created_count)
-                     end
-          format.json { render :edit }
-        end
-
+        @message = if created_count.zero?
+                     t('access_permissions.create.success', count: t('access_permissions.all_team'))
+                   else
+                     t('access_permissions.create.success', count: created_count)
+                   end
+        render :edit
       rescue ActiveRecord::RecordInvalid => e
         Rails.logger.error e.message
         errors = @protocol.errors.present? ? @protocol.errors&.map(&:message)&.join(',') : e.message
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 30f72a157..4b3fda052 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -37,11 +37,8 @@ class ApplicationController < ActionController::Base
   def to_user_date_format
     ts = I18n.l(Time.parse(params[:timestamp]),
                 format: params[:ts_format].to_sym)
-    respond_to do |format|
-      format.json do
-        render json: { ts: ts }, status: :ok
-      end
-    end
+
+    render json: { ts: ts }, status: :ok
   end
 
   protected
diff --git a/app/controllers/at_who_controller.rb b/app/controllers/at_who_controller.rb
index c4c5ae9ef..805d0bc7b 100644
--- a/app/controllers/at_who_controller.rb
+++ b/app/controllers/at_who_controller.rb
@@ -14,16 +14,12 @@ class AtWhoController < ApplicationController
   def menu_items
     res = SmartAnnotation.new(current_user, current_team, @query)
 
-    respond_to do |format|
-      format.json do
-        render json: {
-          prj: res.projects,
-          exp: res.experiments,
-          tsk: res.my_modules,
-          status: :ok
-        }
-      end
-    end
+    render json: {
+      prj: res.projects,
+      exp: res.experiments,
+      tsk: res.my_modules,
+      status: :ok
+    }
   end
 
   def rep_items
diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 57f68a834..662e7f6a5 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -46,17 +46,10 @@ class ExperimentsController < ApplicationController
       log_activity(:create_experiment, @experiment)
       flash[:success] = t('experiments.create.success_flash',
                           experiment: @experiment.name)
-      respond_to do |format|
-        format.json do
-          render json: { path: my_modules_experiment_url(@experiment) }, status: :ok
-        end
-      end
+
+      render json: { path: my_modules_experiment_url(@experiment) }, status: :ok
     else
-      respond_to do |format|
-        format.json do
-          render json: @experiment.errors, status: :unprocessable_entity
-        end
-      end
+      render json: @experiment.errors, status: :unprocessable_entity
     end
   end
 
diff --git a/app/controllers/label_templates_controller.rb b/app/controllers/label_templates_controller.rb
index bc5183b43..5acc7513c 100644
--- a/app/controllers/label_templates_controller.rb
+++ b/app/controllers/label_templates_controller.rb
@@ -29,14 +29,10 @@ class LabelTemplatesController < ApplicationController
   end
 
   def datatable
-    respond_to do |format|
-      format.json do
-        render json: ::LabelTemplateDatatable.new(
-          view_context,
-          @label_templates
-        )
-      end
-    end
+    render json: ::LabelTemplateDatatable.new(
+      view_context,
+      @label_templates
+    )
   end
 
   def show
diff --git a/app/controllers/my_module_repositories_controller.rb b/app/controllers/my_module_repositories_controller.rb
index b7fddcaed..c90a94811 100644
--- a/app/controllers/my_module_repositories_controller.rb
+++ b/app/controllers/my_module_repositories_controller.rb
@@ -82,16 +82,12 @@ class MyModuleRepositoriesController < ApplicationController
       status = :bad_request
     end
 
-    respond_to do |format|
-      format.json do
-        render json: {
-          flash: flash,
-          rows_count: @my_module.repository_rows_count(@repository),
-          assigned_count: service.assigned_rows_count,
-          repository_id: @repository.repository_snapshots.find_by(selected: true)&.id || @repository.id
-        }, status: status
-      end
-    end
+    render json: {
+      flash: flash,
+      rows_count: @my_module.repository_rows_count(@repository),
+      assigned_count: service.assigned_rows_count,
+      repository_id: @repository.repository_snapshots.find_by(selected: true)&.id || @repository.id
+    }, status: status
   end
 
   def update_repository_records_modal
diff --git a/app/controllers/my_module_tags_controller.rb b/app/controllers/my_module_tags_controller.rb
index 03fa281cd..312e38ed4 100644
--- a/app/controllers/my_module_tags_controller.rb
+++ b/app/controllers/my_module_tags_controller.rb
@@ -63,13 +63,8 @@ class MyModuleTagsController < ApplicationController
               my_module: my_module.id,
               tag: @mt.tag.id
             })
-
-    respond_to do |format|
-      format.json do
-        redirect_to my_module_tags_edit_path(format: :json), turbolinks: false,
-                    status: 303
-      end
-    end
+    redirect_to my_module_tags_edit_path(format: :json), turbolinks: false,
+                status: :see_other
   end
 
   def destroy
@@ -89,13 +84,8 @@ class MyModuleTagsController < ApplicationController
             })
 
     @mt.destroy
-
-    respond_to do |format|
-      format.json do
-        redirect_to my_module_tags_edit_path(format: :json), turbolinks: false,
-                    status: 303
-      end
-    end
+    redirect_to my_module_tags_edit_path(format: :json), turbolinks: false,
+                status: :see_other
   end
 
   def search_tags
diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index c4f7a03ff..db653d777 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -94,15 +94,11 @@ class MyModulesController < ApplicationController
   end
 
   def status_state
-    respond_to do |format|
-      format.json do
-        if @my_module.last_transition_error && @my_module.last_transition_error['type'] == 'repository_snapshot'
-          flash[:repository_snapshot_error] = @my_module.last_transition_error
-        end
-
-        render json: { status_changing: @my_module.status_changing? }
-      end
+    if @my_module.last_transition_error && @my_module.last_transition_error['type'] == 'repository_snapshot'
+      flash[:repository_snapshot_error] = @my_module.last_transition_error
     end
+
+    render json: { status_changing: @my_module.status_changing? }
   end
 
   def canvas_dropdown_menu
@@ -247,24 +243,20 @@ class MyModulesController < ApplicationController
     render_403 && return unless can_update_my_module_description?(@my_module)
 
     old_description = @my_module.description
-    respond_to do |format|
-      format.json do
-        if @my_module.update(description: params.require(:my_module)[:description])
-          log_activity(:change_module_description)
-          TinyMceAsset.update_images(@my_module, params[:tiny_mce_images], current_user)
-          my_module_annotation_notification(old_description)
-          render json: {
-            html: custom_auto_link(
-              @my_module.tinymce_render(:description),
-              simple_format: false,
-              tags: %w(img),
-              team: current_team
-            )
-          }
-        else
-          render json: @my_module.errors, status: :unprocessable_entity
-        end
-      end
+    if @my_module.update(description: params.require(:my_module)[:description])
+      log_activity(:change_module_description)
+      TinyMceAsset.update_images(@my_module, params[:tiny_mce_images], current_user)
+      my_module_annotation_notification(old_description)
+      render json: {
+        html: custom_auto_link(
+          @my_module.tinymce_render(:description),
+          simple_format: false,
+          tags: %w(img),
+          team: current_team
+        )
+      }
+    else
+      render json: @my_module.errors, status: :unprocessable_entity
     end
   end
 
@@ -273,24 +265,20 @@ class MyModulesController < ApplicationController
     old_description = protocol.description
     return render_404 unless protocol
 
-    respond_to do |format|
-      format.json do
-        if protocol.update(description: params.require(:protocol)[:description])
-          log_activity(:protocol_description_in_task_edited)
-          TinyMceAsset.update_images(protocol, params[:tiny_mce_images], current_user)
-          protocol_annotation_notification(old_description)
-          render json: {
-            html: custom_auto_link(
-              protocol.tinymce_render(:description),
-              simple_format: false,
-              tags: %w(img),
-              team: current_team
-            )
-          }
-        else
-          render json: protocol.errors, status: :unprocessable_entity
-        end
-      end
+    if protocol.update(description: params.require(:protocol)[:description])
+      log_activity(:protocol_description_in_task_edited)
+      TinyMceAsset.update_images(protocol, params[:tiny_mce_images], current_user)
+      protocol_annotation_notification(old_description)
+      render json: {
+        html: custom_auto_link(
+          protocol.tinymce_render(:description),
+          simple_format: false,
+          tags: %w(img),
+          team: current_team
+        )
+      }
+    else
+      render json: protocol.errors, status: :unprocessable_entity
     end
   end
 
diff --git a/app/controllers/project_activities_controller.rb b/app/controllers/project_activities_controller.rb
index 350c8f598..0d047d354 100644
--- a/app/controllers/project_activities_controller.rb
+++ b/app/controllers/project_activities_controller.rb
@@ -5,15 +5,9 @@ class ProjectActivitiesController < ApplicationController
   def index
     @activities = @project.last_activities
 
-    respond_to do |format|
-      format.json {
-        render :json => {
-          :html => render_to_string({
-            :partial => "index.html.erb"
-          })
-        }
-      }
-    end
+    render json: {
+      html: render_to_string({ partial: 'index', formats: :html })
+    }
   end
 
   private
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 00d4d4340..fc09cfca8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -134,17 +134,9 @@ class ProjectsController < ApplicationController
       log_activity(:create_project)
 
       message = t('projects.create.success_flash', name: escape_input(@project.name))
-      respond_to do |format|
-        format.json do
-          render json: { message: message }, status: :ok
-        end
-      end
+      render json: { message: message }, status: :ok
     else
-      respond_to do |format|
-        format.json do
-          render json: @project.errors, status: :unprocessable_entity
-        end
-      end
+      render json: @project.errors, status: :unprocessable_entity
     end
   end
 
diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index 26768db29..01bdbfffc 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -79,16 +79,12 @@ class ProtocolsController < ApplicationController
   def index; end
 
   def datatable
-    respond_to do |format|
-      format.json do
-        render json: ::ProtocolsDatatable.new(
-          view_context,
-          @current_team,
-          @type,
-          current_user
-        )
-      end
-    end
+    render json: ::ProtocolsDatatable.new(
+      view_context,
+      @current_team,
+      @type,
+      current_user
+    )
   end
 
   def versions_modal
@@ -193,15 +189,11 @@ class ProtocolsController < ApplicationController
   end
 
   def update_keywords
-    respond_to do |format|
-      if @protocol.update_keywords(params[:keywords], current_user)
-        format.json do
-          log_activity(:edit_keywords_in_protocol_repository, nil, protocol: @protocol.id)
-          render json: @protocol, serializer: ProtocolSerializer, user: current_user
-        end
-      else
-        format.json { render json: I18n.t('errors.general'), status: :unprocessable_entity }
-      end
+    if @protocol.update_keywords(params[:keywords], current_user)
+      log_activity(:edit_keywords_in_protocol_repository, nil, protocol: @protocol.id)
+      render json: @protocol, serializer: ProtocolSerializer, user: current_user
+    else
+      render json: I18n.t('errors.general'), status: :unprocessable_entity
     end
   end
 
@@ -225,17 +217,13 @@ class ProtocolsController < ApplicationController
 
   def update_description
     old_description = @protocol.description
-    respond_to do |format|
-      format.json do
-        if @protocol.update(description: params.require(:protocol)[:description], last_modified_by: current_user)
-          log_activity(:edit_description_in_protocol_repository, nil, protocol: @protocol.id)
-          TinyMceAsset.update_images(@protocol, params[:tiny_mce_images], current_user)
-          protocol_annotation_notification(old_description)
-          render json: @protocol, serializer: ProtocolSerializer, user: current_user
-        else
-          render json: @protocol.errors, status: :unprocessable_entity
-        end
-      end
+    if @protocol.update(description: params.require(:protocol)[:description], last_modified_by: current_user)
+      log_activity(:edit_description_in_protocol_repository, nil, protocol: @protocol.id)
+      TinyMceAsset.update_images(@protocol, params[:tiny_mce_images], current_user)
+      protocol_annotation_notification(old_description)
+      render json: @protocol, serializer: ProtocolSerializer, user: current_user
+    else
+      render json: @protocol.errors, status: :unprocessable_entity
     end
   end
 
@@ -297,15 +285,11 @@ class ProtocolsController < ApplicationController
       raise ActiveRecord::Rollback
     end
 
-    respond_to do |format|
-      format.json do
-        if cloned.present?
-          render json: { message: t('protocols.index.clone.success_flash', original: @original.name, new: cloned.name) }
-        else
-          render json: { message: t('protocols.index.clone.error_flash', original: @original.name) },
-                 status: :bad_request
-        end
-      end
+    if cloned.present?
+      render json: { message: t('protocols.index.clone.success_flash', original: @original.name, new: cloned.name) }
+    else
+      render json: { message: t('protocols.index.clone.error_flash', original: @original.name) },
+             status: :bad_request
     end
   end
 
@@ -361,232 +345,199 @@ class ProtocolsController < ApplicationController
   end
 
   def unlink
-    respond_to do |format|
+    transaction_error = false
+    Protocol.transaction do
+      @protocol.unlink
+    rescue StandardError
+      transaction_error = true
+      raise ActiveRecord::Rollback
+    end
+
+    if transaction_error
+      # Bad request error
+      render json: {
+        message: t('my_modules.protocols.unlink_error')
+      }, status: :bad_request
+    else
+      # Everything good, display flash & render 200
+      flash[:success] = t(
+        'my_modules.protocols.unlink_flash'
+      )
+      flash.keep(:success)
+      render json: {}, status: :ok
+    end
+  end
+
+  def revert
+    if @protocol.can_destroy?
       transaction_error = false
       Protocol.transaction do
-        begin
-          @protocol.unlink
-        rescue StandardError
-          transaction_error = true
-          raise ActiveRecord::Rollback
-        end
+        # Revert is basically update from parent
+        @protocol.update_from_parent(current_user, @protocol.parent)
+      rescue StandardError
+        transaction_error = true
+        raise ActiveRecord::Rollback
+      end
+
+      if transaction_error
+        # Bad request error
+        render json: {
+          message: t('my_modules.protocols.revert_error')
+        },
+        status: :bad_request
+      else
+        # Everything good, display flash & render 200
+        log_activity(:update_protocol_in_task_from_repository,
+                     @protocol.my_module.experiment.project,
+                     my_module: @protocol.my_module.id,
+                     protocol_repository: @protocol.parent.id)
+        flash[:success] = t(
+          'my_modules.protocols.revert_flash'
+        )
+        flash.keep(:success)
+        render json: {}, status: :ok
+      end
+    else
+      render json: {
+        message: t('my_modules.protocols.revert_error_locked')
+      }, status: :bad_request
+    end
+  end
+
+  def update_from_parent
+    protocol_can_destroy = @protocol.can_destroy?
+    if protocol_can_destroy
+      transaction_error = false
+      Protocol.transaction do
+        # Find original published protocol template
+        source_parent = if @protocol.parent.in_repository_published_original?
+                          @protocol.parent
+                        else
+                          @protocol.parent.parent
+                        end
+        @protocol.update_from_parent(current_user, source_parent.latest_published_version_or_self)
+      rescue StandardError
+        transaction_error = true
+        raise ActiveRecord::Rollback
+      end
+    end
+
+    if !protocol_can_destroy
+      render json: { message: t('my_modules.protocols.update_from_parent_error_locked') }, status: :bad_request
+    elsif transaction_error
+      render json: { message: t('my_modules.protocols.update_from_parent_error') }, status: :bad_request
+    else
+      log_activity(:update_protocol_in_task_from_repository,
+                   @protocol.my_module.experiment.project,
+                   my_module: @protocol.my_module.id,
+                   protocol_repository: @protocol.parent.id)
+
+      flash[:success] = t('my_modules.protocols.update_from_parent_flash')
+      flash.keep(:success)
+      render json: {}, status: :ok
+    end
+  end
+
+  def load_from_repository
+    if @protocol.can_destroy?
+      transaction_error = false
+      Protocol.transaction do
+        @protocol.load_from_repository(@source, current_user)
+      rescue StandardError
+        transaction_error = true
+        raise ActiveRecord::Rollback
       end
 
       if transaction_error
         # Bad request error
         format.json do
           render json: {
-            message: t('my_modules.protocols.unlink_error')
+            message: t('my_modules.protocols.load_from_repository_error')
           },
           status: :bad_request
         end
       else
-        # Everything good, display flash & render 200
-        flash[:success] = t(
-          'my_modules.protocols.unlink_flash'
-        )
+        # Everything good, record activity, display flash & render 200
+        log_activity(:load_protocol_to_task_from_repository,
+                     @protocol.my_module.experiment.project,
+                     my_module: @protocol.my_module.id,
+                     protocol_repository: @protocol.parent.id)
+        flash[:success] = t('my_modules.protocols.load_from_repository_flash')
         flash.keep(:success)
-        format.json { render json: {}, status: :ok }
-      end
-    end
-  end
-
-  def revert
-    respond_to do |format|
-      if @protocol.can_destroy?
-        transaction_error = false
-        Protocol.transaction do
-          # Revert is basically update from parent
-          @protocol.update_from_parent(current_user, @protocol.parent)
-        rescue StandardError
-          transaction_error = true
-          raise ActiveRecord::Rollback
-        end
-
-        if transaction_error
-          # Bad request error
-          format.json do
-            render json: {
-              message: t('my_modules.protocols.revert_error')
-            },
-            status: :bad_request
-          end
-        else
-          # Everything good, display flash & render 200
-          log_activity(:update_protocol_in_task_from_repository,
-                       @protocol.my_module.experiment.project,
-                       my_module: @protocol.my_module.id,
-                       protocol_repository: @protocol.parent.id)
-          flash[:success] = t(
-            'my_modules.protocols.revert_flash'
-          )
-          flash.keep(:success)
-          format.json { render json: {}, status: :ok }
-        end
-      else
-        format.json do
-          render json: {
-            message: t('my_modules.protocols.revert_error_locked')
-          }, status: :bad_request
-        end
-      end
-    end
-  end
-
-  def update_from_parent
-    protocol_can_destroy = @protocol.can_destroy?
-    respond_to do |format|
-      if protocol_can_destroy
-        transaction_error = false
-        Protocol.transaction do
-          # Find original published protocol template
-          source_parent = if @protocol.parent.in_repository_published_original?
-                            @protocol.parent
-                          else
-                            @protocol.parent.parent
-                          end
-          @protocol.update_from_parent(current_user, source_parent.latest_published_version_or_self)
-        rescue StandardError
-          transaction_error = true
-          raise ActiveRecord::Rollback
-        end
-      end
-
-      format.json do
-        if !protocol_can_destroy
-          render json: { message: t('my_modules.protocols.update_from_parent_error_locked') }, status: :bad_request
-        elsif transaction_error
-          render json: { message: t('my_modules.protocols.update_from_parent_error') }, status: :bad_request
-        else
-          log_activity(:update_protocol_in_task_from_repository,
-                       @protocol.my_module.experiment.project,
-                       my_module: @protocol.my_module.id,
-                       protocol_repository: @protocol.parent.id)
-
-          flash[:success] = t('my_modules.protocols.update_from_parent_flash')
-          flash.keep(:success)
-          render json: {}, status: :ok
-        end
-      end
-    end
-  end
-
-  def load_from_repository
-    respond_to do |format|
-      if @protocol.can_destroy?
-        transaction_error = false
-        Protocol.transaction do
-          @protocol.load_from_repository(@source, current_user)
-        rescue StandardError
-          transaction_error = true
-          raise ActiveRecord::Rollback
-        end
-
-        if transaction_error
-          # Bad request error
-          format.json do
-            render json: {
-              message: t('my_modules.protocols.load_from_repository_error')
-            },
-            status: :bad_request
-          end
-        else
-          # Everything good, record activity, display flash & render 200
-          log_activity(:load_protocol_to_task_from_repository,
-                       @protocol.my_module.experiment.project,
-                       my_module: @protocol.my_module.id,
-                       protocol_repository: @protocol.parent.id)
-          flash[:success] = t('my_modules.protocols.load_from_repository_flash')
-          flash.keep(:success)
-          format.json { render json: {}, status: :ok }
-        end
-      else
-        format.json do
-          render json: {
-            message: t('my_modules.protocols.load_from_repository_error_locked')
-          }, status: :bad_request
-        end
+        render json: {}, status: :ok
       end
+    else
+      render json: {
+        message: t('my_modules.protocols.load_from_repository_error_locked')
+      }, status: :bad_request
     end
   end
 
   def load_from_file
     # This is actually very similar to import
-    respond_to do |format|
-      if @protocol.can_destroy?
-        transaction_error = false
-        Protocol.transaction do
-          @importer.import_into_existing(
-            @protocol, @protocol_json
-          )
-        rescue StandardError => e
-          transaction_error = true
-          Rails.logger.error(e.message)
-          Rails.logger.error(e.backtrace.join("\n"))
-          raise ActiveRecord::Rollback
-        end
-
-        if transaction_error
-          format.json do
-            render json: { status: :error }, status: :bad_request
-          end
-        else
-          # Everything good, record activity, display flash & render 200
-          log_activity(:load_protocol_to_task_from_file,
-                       @protocol.my_module.experiment.project,
-                       my_module: @my_module.id)
-          flash[:success] = t(
-            'my_modules.protocols.load_from_file_flash'
-          )
-          flash.keep(:success)
-          format.json do
-            render json: { status: :ok }, status: :ok
-          end
-        end
-      else
-        format.json do
-          render json: { status: :locked }, status: :bad_request
-        end
-      end
-    end
-  end
-
-  def protocolsio_index
-    render json: {
-      html: render_to_string({ partial: 'protocols/index/protocolsio_modal_body' })
-    }
-  end
-
-  def import
-    protocol = nil
-    respond_to do |format|
+    if @protocol.can_destroy?
       transaction_error = false
       Protocol.transaction do
-        protocol = @importer.import_new_protocol(@protocol_json)
+        @importer.import_into_existing(
+          @protocol, @protocol_json
+        )
       rescue StandardError => e
-        Rails.logger.error e.backtrace.join("\n")
         transaction_error = true
+        Rails.logger.error(e.message)
+        Rails.logger.error(e.backtrace.join("\n"))
         raise ActiveRecord::Rollback
       end
 
       if transaction_error
         format.json do
-          render json: { status: :bad_request }, status: :bad_request
+          render json: { status: :error }, status: :bad_request
         end
       else
-        Activities::CreateActivityService
-          .call(activity_type: :import_protocol_in_repository,
-                owner: current_user,
-                subject: protocol,
-                team: protocol.team,
-                message_items: {
-                  protocol: protocol.id
-                })
-
-        format.json do
-          render json: { status: :ok }, status: :ok
-        end
+        # Everything good, record activity, display flash & render 200
+        log_activity(:load_protocol_to_task_from_file,
+                     @protocol.my_module.experiment.project,
+                     my_module: @my_module.id)
+        flash[:success] = t(
+          'my_modules.protocols.load_from_file_flash'
+        )
+        flash.keep(:success)
+        render json: { status: :ok }, status: :ok
       end
+    else
+      render json: { status: :locked }, status: :bad_request
+    end
+  end
+
+  def protocolsio_index
+    render json: {
+      html: render_to_string({ partial: 'protocols/index/protocolsio_modal_body', formats: :html })
+    }
+  end
+
+  def import
+    protocol = nil
+    transaction_error = false
+    Protocol.transaction do
+      protocol = @importer.import_new_protocol(@protocol_json)
+    rescue StandardError => e
+      Rails.logger.error e.backtrace.join("\n")
+      transaction_error = true
+      raise ActiveRecord::Rollback
+    end
+
+    if transaction_error
+      render json: { status: :bad_request }, status: :bad_request
+    else
+      Activities::CreateActivityService
+        .call(activity_type: :import_protocol_in_repository,
+              owner: current_user,
+              subject: protocol,
+              team: protocol.team,
+              message_items: {
+                protocol: protocol.id
+              })
+
+      render json: { status: :ok }, status: :ok
     end
   end
 
@@ -716,141 +667,125 @@ class ProtocolsController < ApplicationController
 
   def export
     # Make a zip output stream and send it to the client
-    respond_to do |format|
-      format.html do
-        z_output_stream = Zip::OutputStream.write_buffer do |ostream|
-          ostream.put_next_entry('scinote.xml')
-          ostream.print(generate_envelope_xml(@protocols))
-          ostream.put_next_entry('scinote.xsd')
-          ostream.print(generate_envelope_xsd)
-          ostream.put_next_entry('eln.xsd')
-          ostream.print(generate_eln_xsd)
+    # rubocop:disable Metrics/BlockLength
+    z_output_stream = Zip::OutputStream.write_buffer do |ostream|
+      ostream.put_next_entry('scinote.xml')
+      ostream.print(generate_envelope_xml(@protocols))
+      ostream.put_next_entry('scinote.xsd')
+      ostream.print(generate_envelope_xsd)
+      ostream.put_next_entry('eln.xsd')
+      ostream.print(generate_eln_xsd)
 
-          # Create folder and xml file for each protocol and populate it
-          @protocols.each do |protocol|
-            protocol = protocol.latest_published_version_or_self
-            protocol_dir = get_guid(protocol.id).to_s
-            ostream.put_next_entry("#{protocol_dir}/eln.xml")
-            ostream.print(generate_protocol_xml(protocol))
-            ostream = protocol.tiny_mce_assets.save_to_eln(ostream, protocol_dir)
-            # Add assets to protocol folder
-            next if protocol.steps.count <= 0
-            protocol.steps.order(:id).each do |step|
-              step_guid = get_guid(step.id)
-              step_dir = "#{protocol_dir}/#{step_guid}"
-              if step.assets.exists?
-                step.assets.order(:id).each do |asset|
-                  next unless asset.file.attached?
-                  asset_guid = get_guid(asset.id)
-                  asset_file_name = asset_guid.to_s + File.extname(asset.file_name).to_s
-                  ostream.put_next_entry("#{step_dir}/#{asset_file_name}")
-                  ostream.print(asset.file.download)
-                end
-              end
-              ostream = step.tiny_mce_assets.save_to_eln(ostream, step_dir)
+      # Create folder and xml file for each protocol and populate it
+      @protocols.each do |protocol|
+        protocol = protocol.latest_published_version_or_self
+        protocol_dir = get_guid(protocol.id).to_s
+        ostream.put_next_entry("#{protocol_dir}/eln.xml")
+        ostream.print(generate_protocol_xml(protocol))
+        ostream = protocol.tiny_mce_assets.save_to_eln(ostream, protocol_dir)
+        # Add assets to protocol folder
+        next if protocol.steps.count <= 0
 
-              step.step_texts.each do |step_text|
-                ostream = step_text.tiny_mce_assets.save_to_eln(ostream, step_dir)
-              end
+        protocol.steps.order(:id).each do |step|
+          step_guid = get_guid(step.id)
+          step_dir = "#{protocol_dir}/#{step_guid}"
+          if step.assets.exists?
+            step.assets.order(:id).each do |asset|
+              next unless asset.file.attached?
+
+              asset_guid = get_guid(asset.id)
+              asset_file_name = asset_guid.to_s + File.extname(asset.file_name).to_s
+              ostream.put_next_entry("#{step_dir}/#{asset_file_name}")
+              ostream.print(asset.file.download)
             end
           end
-        end
-        z_output_stream.rewind
+          ostream = step.tiny_mce_assets.save_to_eln(ostream, step_dir)
 
-        protocol_name = get_protocol_name(@protocols[0])
-
-        # Now generate filename of the archive and send file to user
-        if @protocols.count == 1
-          # Try to construct an OS-safe file name
-          file_name = 'protocol.eln'
-          unless protocol_name.nil?
-            escaped_name = protocol_name.gsub(/[^0-9a-zA-Z\-.,_]/i, '_')
-                                        .downcase[0..Constants::NAME_MAX_LENGTH]
-            file_name = escaped_name + '.eln' unless escaped_name.blank?
-          end
-        elsif @protocols.length > 1
-          file_name = 'protocols.eln'
-        end
-
-        @protocols.each do |protocol|
-          if params[:my_module_id]
-            my_module = MyModule.find(params[:my_module_id])
-            Activities::CreateActivityService
-              .call(activity_type: :export_protocol_from_task,
-                    owner: current_user,
-                    project: my_module.project,
-                    subject: my_module,
-                    team: my_module.team,
-                    message_items: {
-                      my_module: params[:my_module_id].to_i
-                    })
-          else
-            Activities::CreateActivityService
-              .call(activity_type: :export_protocol_in_repository,
-                    owner: current_user,
-                    subject: protocol,
-                    team: protocol.team,
-                    message_items: {
-                      protocol: protocol.id
-                    })
+          step.step_texts.each do |step_text|
+            ostream = step_text.tiny_mce_assets.save_to_eln(ostream, step_dir)
           end
         end
-
-        send_data(z_output_stream.read, filename: file_name)
       end
     end
+    # rubocop:enable Metrics/BlockLength
+    z_output_stream.rewind
+
+    protocol_name = get_protocol_name(@protocols[0])
+
+    # Now generate filename of the archive and send file to user
+    if @protocols.count == 1
+      # Try to construct an OS-safe file name
+      file_name = 'protocol.eln'
+      unless protocol_name.nil?
+        escaped_name = protocol_name.gsub(/[^0-9a-zA-Z\-.,_]/i, '_')
+                                    .downcase[0..Constants::NAME_MAX_LENGTH]
+        file_name = escaped_name + '.eln' if escaped_name.present?
+      end
+    elsif @protocols.length > 1
+      file_name = 'protocols.eln'
+    end
+
+    @protocols.each do |protocol|
+      if params[:my_module_id]
+        my_module = MyModule.find(params[:my_module_id])
+        Activities::CreateActivityService
+          .call(activity_type: :export_protocol_from_task,
+                owner: current_user,
+                project: my_module.project,
+                subject: my_module,
+                team: my_module.team,
+                message_items: {
+                  my_module: params[:my_module_id].to_i
+                })
+      else
+        Activities::CreateActivityService
+          .call(activity_type: :export_protocol_in_repository,
+                owner: current_user,
+                subject: protocol,
+                team: protocol.team,
+                message_items: {
+                  protocol: protocol.id
+                })
+      end
+    end
+
+    send_data(z_output_stream.read, filename: file_name)
   end
 
   def unlink_modal
-    respond_to do |format|
-      format.json do
-        render json: {
-          title: t('my_modules.protocols.confirm_link_update_modal.unlink_title'),
-          message: t('my_modules.protocols.confirm_link_update_modal.unlink_message'),
-          btn_text: t('my_modules.protocols.confirm_link_update_modal.unlink_btn_text'),
-          url: unlink_protocol_path(@protocol)
-        }
-      end
-    end
+    render json: {
+      title: t('my_modules.protocols.confirm_link_update_modal.unlink_title'),
+      message: t('my_modules.protocols.confirm_link_update_modal.unlink_message'),
+      btn_text: t('my_modules.protocols.confirm_link_update_modal.unlink_btn_text'),
+      url: unlink_protocol_path(@protocol)
+    }
   end
 
   def revert_modal
-    respond_to do |format|
-      format.json do
-        render json: {
-          title: t('my_modules.protocols.confirm_link_update_modal.revert_title'),
-          message: t('my_modules.protocols.confirm_link_update_modal.revert_message'),
-          btn_text: t('my_modules.protocols.confirm_link_update_modal.revert_btn_text'),
-          url: revert_protocol_path(@protocol)
-        }
-      end
-    end
+    render json: {
+      title: t('my_modules.protocols.confirm_link_update_modal.revert_title'),
+      message: t('my_modules.protocols.confirm_link_update_modal.revert_message'),
+      btn_text: t('my_modules.protocols.confirm_link_update_modal.revert_btn_text'),
+      url: revert_protocol_path(@protocol)
+    }
   end
 
   def update_from_parent_modal
-    respond_to do |format|
-      format.json do
-        render json: {
-          title: t('my_modules.protocols.confirm_link_update_modal.update_self_title'),
-          message: t('my_modules.protocols.confirm_link_update_modal.update_self_message'),
-          btn_text: t('my_modules.protocols.confirm_link_update_modal.update_self_btn_text'),
-          url: update_from_parent_protocol_path(@protocol)
-        }
-      end
-    end
+    render json: {
+      title: t('my_modules.protocols.confirm_link_update_modal.update_self_title'),
+      message: t('my_modules.protocols.confirm_link_update_modal.update_self_message'),
+      btn_text: t('my_modules.protocols.confirm_link_update_modal.update_self_btn_text'),
+      url: update_from_parent_protocol_path(@protocol)
+    }
   end
 
   def load_from_repository_datatable
     @protocol = Protocol.find_by_id(params[:id])
-    respond_to do |format|
-      format.json do
-        render json: ::LoadFromRepositoryProtocolsDatatable.new(
-          view_context,
-          @protocol.team,
-          current_user
-        )
-      end
-    end
+    render json: ::LoadFromRepositoryProtocolsDatatable.new(
+      view_context,
+      @protocol.team,
+      current_user
+    )
   end
 
   def load_from_repository_modal
@@ -866,25 +801,17 @@ class ProtocolsController < ApplicationController
   end
 
   def version_comment
-    respond_to do |format|
-      format.json do
-        render json: { version_comment: @protocol.version_comment }
-      end
-    end
+    render json: { version_comment: @protocol.version_comment }
   end
 
   def update_version_comment
-    respond_to do |format|
-      format.json do
-        if @protocol.update(version_comment: params.require(:protocol)[:version_comment])
-          log_activity(:protocol_template_revision_notes_updated,
-                       nil,
-                       protocol: @protocol.id)
-          render json: { version_comment: @protocol.version_comment }
-        else
-          render json: { errors: @protocol.errors }, status: :unprocessable_entity
-        end
-      end
+    if @protocol.update(version_comment: params.require(:protocol)[:version_comment])
+      log_activity(:protocol_template_revision_notes_updated,
+                   nil,
+                   protocol: @protocol.id)
+      render json: { version_comment: @protocol.version_comment }
+    else
+      render json: { errors: @protocol.errors }, status: :unprocessable_entity
     end
   end
 
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 9990bdc85..64f825e04 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -24,15 +24,11 @@ class ReportsController < ApplicationController
   def index; end
 
   def datatable
-    respond_to do |format|
-      format.json do
-        render json: ::ReportDatatable.new(
-          view_context,
-          current_user,
-          Report.viewable_by_user(current_user, current_team)
-        )
-      end
-    end
+    render json: ::ReportDatatable.new(
+      view_context,
+      current_user,
+      Report.viewable_by_user(current_user, current_team)
+    )
   end
 
   # Report grouped by modules
@@ -57,24 +53,20 @@ class ReportsController < ApplicationController
       report = current_team.reports.new(project: @project)
     end
 
-    respond_to do |format|
-      format.json do
-        if lookup_context.template_exists?("reports/templates/#{template}/edit")
-          render json: {
-            html: render_to_string(
-              template: "reports/templates/#{template}/edit",
-              layout: 'reports/template_values_editor',
-              locals: { report: report },
-              formats: :html
-            )
-          }
-        else
-          render json: {
-            html: render_to_string(partial: 'reports/wizard/no_template_values',
-                                   formats: :html)
-          }
-        end
-      end
+    if lookup_context.template_exists?("reports/templates/#{template}/edit")
+      render json: {
+        html: render_to_string(
+          template: "reports/templates/#{template}/edit",
+          layout: 'reports/template_values_editor',
+          locals: { report: report },
+          formats: :html
+        )
+      }
+    else
+      render json: {
+        html: render_to_string(partial: 'reports/wizard/no_template_values',
+                               formats: :html)
+      }
     end
   end
 
@@ -166,58 +158,42 @@ class ReportsController < ApplicationController
     docx = @report.docx_file.attached? ? document_preview_report_path(@report, report_type: :docx) : nil
     pdf = @report.pdf_file.attached? ? document_preview_report_path(@report, report_type: :pdf) : nil
 
-    respond_to do |format|
-      format.json do
-        render json: {
-          docx: {
-            processing: @report.docx_processing?,
-            preview_url: docx,
-            error: @report.docx_error?
-          },
-          pdf: {
-            processing: @report.pdf_processing?,
-            preview_url: pdf,
-            error: @report.pdf_error?
-          }
-        }
-      end
-    end
+    render json: {
+      docx: {
+        processing: @report.docx_processing?,
+        preview_url: docx,
+        error: @report.docx_error?
+      },
+      pdf: {
+        processing: @report.pdf_processing?,
+        preview_url: pdf,
+        error: @report.pdf_error?
+      }
+    }
   end
 
   # Generation actions
   def generate_pdf
-    respond_to do |format|
-      format.json do
-        render json: {
-          message: I18n.t('projects.reports.index.generation.accepted_message')
-        }
-      end
-    end
+    render json: {
+      message: I18n.t('projects.reports.index.generation.accepted_message')
+    }
   end
 
   def generate_docx
-    respond_to do |format|
-      format.json do
-        @report.docx_processing!
-        log_activity(:generate_docx_report)
+    @report.docx_processing!
+    log_activity(:generate_docx_report)
 
-        ensure_report_template!
-        Reports::DocxJob.perform_later(@report.id, current_user, root_url)
-        render json: {
-          message: I18n.t('projects.reports.index.generation.accepted_message')
-        }
-      end
-    end
+    ensure_report_template!
+    Reports::DocxJob.perform_later(@report.id, current_user, root_url)
+    render json: {
+      message: I18n.t('projects.reports.index.generation.accepted_message')
+    }
   end
 
   def save_pdf_to_inventory_modal
-    respond_to do |format|
-      format.json do
-        render json: {
-          html: render_to_string(partial: 'reports/save_PDF_to_inventory_modal', formats: :html)
-        }
-      end
-    end
+    render json: {
+      html: render_to_string(partial: 'reports/save_PDF_to_inventory_modal', formats: :html)
+    }
   end
 
   def save_pdf_to_inventory_item
@@ -247,21 +223,16 @@ class ReportsController < ApplicationController
     my_module = MyModule.find_by_id(params[:my_module_id])
     return render_403 unless my_module.experiment.project == @project
 
-    respond_to do |format|
-      if my_module.blank?
-        format.json do
-          render json: {}, status: :not_found
-        end
-      else
-        format.json do
-          render json: {
-            html: render_to_string(
-              partial: 'reports/new/modal/module_contents',
-              locals: { project: @project, my_module: my_module }
-            )
-          }
-        end
-      end
+    if my_module.blank?
+      render json: {}, status: :not_found
+    else
+      render json: {
+        html: render_to_string(
+          partial: 'reports/new/modal/module_contents',
+          locals: { project: @project, my_module: my_module },
+          formats: :html
+        )
+      }
     end
   end
 
@@ -270,21 +241,16 @@ class ReportsController < ApplicationController
     step = Step.find_by_id(params[:step_id])
     return render_403 unless step.my_module.experiment.project == @project
 
-    respond_to do |format|
-      if step.blank?
-        format.json do
-          render json: {}, status: :not_found
-        end
-      else
-        format.json do
-          render json: {
-            html: render_to_string(
-              partial: 'reports/new/modal/step_contents',
-              locals: { project: @project, step: step }
-            )
-          }
-        end
-      end
+    if step.blank?
+      render json: {}, status: :not_found
+    else
+      render json: {
+        html: render_to_string(
+          partial: 'reports/new/modal/step_contents',
+          locals: { project: @project, step: step },
+          formats: :html
+        )
+      }
     end
   end
 
@@ -293,21 +259,16 @@ class ReportsController < ApplicationController
     result = Result.find_by_id(params[:result_id])
     return render_403 unless result.experiment.project == @project
 
-    respond_to do |format|
-      if result.blank?
-        format.json do
-          render json: {}, status: :not_found
-        end
-      else
-        format.json do
-          render json: {
-            html: render_to_string(
-              partial: 'reports/new/modal/result_contents',
-              locals: { project: @project, result: result }
-            )
-          }
-        end
-      end
+    if result.blank?
+      render json: {}, status: :not_found
+    else
+      render json: {
+        html: render_to_string(
+          partial: 'reports/new/modal/result_contents',
+          locals: { project: @project, result: result },
+          formats: :html
+        )
+      }
     end
   end
 
@@ -315,7 +276,8 @@ class ReportsController < ApplicationController
     render json: {
       html: render_to_string(
         partial: 'reports/wizard/project_contents',
-        locals: { project: @project, report: nil }
+        locals: { project: @project, report: nil },
+        formats: :html
       )
     }
   end
@@ -330,7 +292,8 @@ class ReportsController < ApplicationController
       locals: {
         report: @report,
         report_type: params[:report_type]
-      }
+      },
+      formats: :html
     ) }
   end
 
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 40194ab89..4cbb31fb1 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -120,25 +120,22 @@ class RepositoriesController < ApplicationController
     )
     @repository.assign_attributes(repository_params)
 
-    respond_to do |format|
-      format.json do
-        if @repository.save
-          log_activity(:create_inventory)
+    if @repository.save
+      log_activity(:create_inventory)
 
-          flash[:success] = t('repositories.index.modal_create.success_flash_html', name: @repository.name)
-          render json: { url: repository_path(@repository) }
-        else
-          render json: @repository.errors,
-            status: :unprocessable_entity
-        end
-      end
+      flash[:success] = t('repositories.index.modal_create.success_flash_html', name: @repository.name)
+      render json: { url: repository_path(@repository) }
+    else
+      render json: @repository.errors,
+        status: :unprocessable_entity
     end
   end
 
   def destroy_modal
     render json: {
       html: render_to_string(
-        partial: 'delete_repository_modal'
+        partial: 'delete_repository_modal',
+        formats: :html
       )
     }
   end
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index 6c9370b85..56647e0b4 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -197,18 +197,12 @@ class RepositoryRowsController < ApplicationController
         flash = t('repositories.destroy.success_flash',
                   records_number: deleted_count)
       end
-      respond_to do |format|
-        color = deleted_count.zero? ? 'info' : 'success'
-        format.json { render json: { flash: flash, color: color }, status: :ok }
-      end
+      color = deleted_count.zero? ? 'info' : 'success'
+      render json: { flash: flash, color: color }, status: :ok
     else
-      respond_to do |format|
-        format.json do
-          render json: {
-            flash: t('repositories.destroy.no_records_selected_flash')
-          }, status: :bad_request
-        end
-      end
+      render json: {
+        flash: t('repositories.destroy.no_records_selected_flash')
+      }, status: :bad_request
     end
   end
 
@@ -341,13 +335,9 @@ class RepositoryRowsController < ApplicationController
   def check_snapshotting_status
     return if @repository.repository_snapshots.provisioning.none?
 
-    respond_to do |format|
-      format.json do
-        render json: {
-          flash: t('repositories.index.snapshot_provisioning_in_progress')
-        }, status: :unprocessable_entity
-      end
-    end
+    render json: {
+      flash: t('repositories.index.snapshot_provisioning_in_progress')
+    }, status: :unprocessable_entity
   end
 
   def check_create_permissions
diff --git a/app/controllers/result_tables_controller.rb b/app/controllers/result_tables_controller.rb
index 756c29f74..d30fffcf5 100644
--- a/app/controllers/result_tables_controller.rb
+++ b/app/controllers/result_tables_controller.rb
@@ -48,13 +48,9 @@ class ResultTablesController < ApplicationController
   end
 
   def edit
-    respond_to do |format|
-      format.json {
-        render json: {
-          html: render_to_string({ partial: 'edit', formats: :html })
-        }, status: :ok
-      }
-    end
+    render json: {
+      html: render_to_string({ partial: 'edit', formats: :html })
+    }, status: :ok
   end
 
   def update
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 7cc3d400c..cd4d699de 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -160,11 +160,8 @@ class StepsController < ApplicationController
     view_state = @step.current_view_state(current_user)
     view_state.state['assets']['sort'] = params.require(:assets).require(:order)
     view_state.save! if view_state.changed?
-    respond_to do |format|
-      format.json do
-        render json: {}, status: :ok
-      end
-    end
+
+    render json: {}, status: :ok
   end
 
   def update_asset_view_mode
diff --git a/app/controllers/user_notifications_controller.rb b/app/controllers/user_notifications_controller.rb
index 0eb6405c5..55c9cae81 100644
--- a/app/controllers/user_notifications_controller.rb
+++ b/app/controllers/user_notifications_controller.rb
@@ -5,14 +5,10 @@ class UserNotificationsController < ApplicationController
     page = (params[:page] || 1).to_i
     notifications = load_notifications.page(page).per(Constants::INFINITE_SCROLL_LIMIT).without_count
 
-    respond_to do |format|
-      format.json do
-        render json: {
-          notifications: notification_serializer(notifications),
-          next_page: notifications.next_page
-        }
-      end
-    end
+    render json: {
+      notifications: notification_serializer(notifications),
+      next_page: notifications.next_page
+    }
 
     UserNotification.where(
       notification_id: notifications.except(:select).where.not(type_of: 2).select(:id)
diff --git a/app/controllers/user_repositories_controller.rb b/app/controllers/user_repositories_controller.rb
index 848444616..ac645d968 100644
--- a/app/controllers/user_repositories_controller.rb
+++ b/app/controllers/user_repositories_controller.rb
@@ -4,26 +4,18 @@ class UserRepositoriesController < ApplicationController
   def save_table_state
     service = RepositoryTableStateService.new(current_user, @repository)
     service.update_state(params.require(:state).permit!.to_h)
-    respond_to do |format|
-      format.json do
-        render json: {
-          status: :ok
-        }
-      end
-    end
+    render json: {
+      status: :ok
+    }
   end
 
   def load_table_state
     service = RepositoryTableStateService.new(current_user, @repository)
     state = service.load_state.state
-    respond_to do |format|
-      if state
-        format.json do
-          render json: {
-            state: state
-          }
-        end
-      end
+    if state
+      render json: {
+        state: state
+      }
     end
   end
 
diff --git a/app/controllers/users/settings/account/preferences_controller.rb b/app/controllers/users/settings/account/preferences_controller.rb
index 5c53c1949..bba93cac4 100644
--- a/app/controllers/users/settings/account/preferences_controller.rb
+++ b/app/controllers/users/settings/account/preferences_controller.rb
@@ -13,17 +13,10 @@ module Users
         end
 
         def update
-          respond_to do |format|
-            if @user.update(update_params)
-              format.json do
-                render json: { status: :ok }
-              end
-            else
-              format.json do
-                render json: @user.errors,
-                status: :unprocessable_entity
-              end
-            end
+          if @user.update(update_params)
+            render json: { status: :ok }
+          else
+            render json: @user.errors, status: :unprocessable_entity
           end
         end
 
@@ -44,21 +37,13 @@ module Users
             @user.system_message_email_notification = val
           end
           if @user.save
-            respond_to do |format|
-              format.json do
-                render json: {
-                  status: :ok
-                }
-              end
-            end
+            render json: {
+              status: :ok
+            }
           else
-            respond_to do |format|
-              format.json do
-                render json: {
-                  status: :unprocessable_entity
-                }
-              end
-            end
+            render json: {
+              status: :unprocessable_entity
+            }
           end
         end
 
diff --git a/app/controllers/users/settings/teams_controller.rb b/app/controllers/users/settings/teams_controller.rb
index c798d8cf2..5c72f9c29 100644
--- a/app/controllers/users/settings/teams_controller.rb
+++ b/app/controllers/users/settings/teams_controller.rb
@@ -38,11 +38,7 @@ module Users
       end
 
       def datatable
-        respond_to do |format|
-          format.json do
-            render json: ::TeamsDatatable.new(view_context, @user)
-          end
-        end
+        render json: ::TeamsDatatable.new(view_context, @user)
       end
 
       def new
@@ -66,11 +62,7 @@ module Users
       end
 
       def users_datatable
-        respond_to do |format|
-          format.json do
-            render json: ::TeamUsersDatatable.new(view_context, @team, @user)
-          end
-        end
+        render json: ::TeamUsersDatatable.new(view_context, @team, @user)
       end
 
       def name_html
@@ -94,26 +86,19 @@ module Users
       end
 
       def update
-        respond_to do |format|
-          if @team.update(update_params)
-            @team.update(last_modified_by: current_user)
-            format.json do
-              render json: {
-                status: :ok,
-                html: custom_auto_link(
-                  @team.tinymce_render(:description),
-                  simple_format: false,
-                  tags: %w(img),
-                  team: current_team
-                )
-              }
-            end
-          else
-            format.json do
-              render json: @team.errors,
-              status: :unprocessable_entity
-            end
-          end
+        if @team.update(update_params)
+          @team.update(last_modified_by: current_user)
+          render json: {
+            status: :ok,
+            html: custom_auto_link(
+              @team.tinymce_render(:description),
+              simple_format: false,
+              tags: %w(img),
+              team: current_team
+            )
+          }
+        else
+          render json: @team.errors, status: :unprocessable_entity
         end
       end
 
diff --git a/app/controllers/users/settings/user_teams_controller.rb b/app/controllers/users/settings/user_teams_controller.rb
index 171602c11..9118f81d4 100644
--- a/app/controllers/users/settings/user_teams_controller.rb
+++ b/app/controllers/users/settings/user_teams_controller.rb
@@ -10,29 +10,23 @@ module Users
       before_action :check_destroy_permissions, only: %i(leave_html destroy_html destroy)
 
       def update
-        respond_to do |format|
-          if @user_assignment.update(update_params)
-            Activities::CreateActivityService
-              .call(activity_type: :change_users_role_on_team,
-                    owner: current_user,
-                    subject: @user_assignment.assignable,
-                    team: @user_assignment.assignable,
-                    message_items: {
-                      team: @user_assignment.assignable.id,
-                      user_changed: @user_assignment.user.id,
-                      role: @user_assignment.user_role.name
-                    })
+        if @user_assignment.update(update_params)
+          Activities::CreateActivityService
+            .call(activity_type: :change_users_role_on_team,
+                  owner: current_user,
+                  subject: @user_assignment.assignable,
+                  team: @user_assignment.assignable,
+                  message_items: {
+                    team: @user_assignment.assignable.id,
+                    user_changed: @user_assignment.user.id,
+                    role: @user_assignment.user_role.name
+                  })
 
-            format.json do
-              render json: {
-                status: :ok
-              }
-            end
-          else
-            format.json do
-              render json: @user_assignment.errors, status: :unprocessable_entity
-            end
-          end
+          render json: {
+            status: :ok
+          }
+        else
+          render json: @user_assignment.errors, status: :unprocessable_entity
         end
       end
 
@@ -125,26 +119,21 @@ module Users
           end
         end
 
-        respond_to do |format|
-          if !invalid
-            if params[:leave]
-              flash[:notice] = I18n.t(
-                'users.settings.user_teams.leave_flash',
-                team: @user_assignment.assignable.name
-              )
-              flash.keep(:notice)
-            end
-            generate_notification(current_user,
-                                  @user_assignment.user,
-                                  @user_assignment.assignable,
-                                  false)
-            format.json { render json: { status: :ok } }
-          else
-            format.json do
-              render json: @user_assignment.errors,
-              status: :unprocessable_entity
-            end
+        if !invalid
+          if params[:leave]
+            flash[:notice] = I18n.t(
+              'users.settings.user_teams.leave_flash',
+              team: @user_assignment.assignable.name
+            )
+            flash.keep(:notice)
           end
+          generate_notification(current_user,
+                                @user_assignment.user,
+                                @user_assignment.assignable,
+                                false)
+          render json: { status: :ok }
+        else
+          render json: @user_assignment.errors, status: :unprocessable_entity
         end
       end
 

From aafeb456fa25793875279263d0c228f32634df6f Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Tue, 18 Jul 2023 12:38:50 +0100
Subject: [PATCH 33/45] Fix CSS issues in experiments tasks page and modal
 [SCI-8766] (#5738)

* Fix CSS issues in experiments tasks page and modal [SCI-8766]

* Fix linter errors [SCI-8766]

* Increase spacing for icons in ask display modal and remove html.erb extention from render partial

* Optimize changes [SCI-8766]
---
 app/assets/javascripts/experiments/table.js     |  1 +
 app/assets/stylesheets/experiment/table.scss    | 17 ++++++++++++-----
 .../experiments/_table_display_modal.html.erb   |  2 +-
 app/views/experiments/_table_toolbar.html.erb   |  6 +++---
 config/locales/en.yml                           |  1 +
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js
index 28e9150fc..c7bc43316 100644
--- a/app/assets/javascripts/experiments/table.js
+++ b/app/assets/javascripts/experiments/table.js
@@ -522,6 +522,7 @@ var ExperimnetTable = {
         icon.removeClass('sn-icon-visibility-show').addClass('sn-icon-visibility-hide');
         icon.parent().removeClass('visible');
       } else {
+        if (icon.hasClass('disabled')) return;
         $(`.experiment-table .${icon.data('column')}-column`).removeClass('hidden');
         icon.addClass('sn-icon-visibility-show').removeClass('sn-icon-visibility-hide');
         icon.parent().addClass('visible');
diff --git a/app/assets/stylesheets/experiment/table.scss b/app/assets/stylesheets/experiment/table.scss
index 927f3a430..ed1df18ce 100644
--- a/app/assets/stylesheets/experiment/table.scss
+++ b/app/assets/stylesheets/experiment/table.scss
@@ -536,11 +536,16 @@
 }
 
 .table-display-modal {
+  .modal-description,
+  .column-container {
+    font-size: 14px;
+  }
+
   .column-container {
     align-items: center;
     border-bottom: $border-default;
     display: flex;
-    padding: .5em 1em;
+    padding: .5em 1.4em;
 
     &:not(.visible) {
       color: $color-alto;
@@ -560,13 +565,15 @@
       }
     }
 
-    &.task_name {
-      padding-left: 3em;
+    .sn-icon {
+      cursor: pointer;
+      margin-right: .6em;
 
-      .fas {
-        display: none;
+      &.disabled {
+        cursor: not-allowed;
       }
     }
+
   }
 }
 
diff --git a/app/views/experiments/_table_display_modal.html.erb b/app/views/experiments/_table_display_modal.html.erb
index 53d95704d..bf06dcd45 100644
--- a/app/views/experiments/_table_display_modal.html.erb
+++ b/app/views/experiments/_table_display_modal.html.erb
@@ -8,7 +8,7 @@
         </h4>
       </div>
       <div class="modal-body">
-        <p><%= t("experiments.table.column_display_modal.description") %></p>
+        <p class='modal-description'><%= t("experiments.table.column_display_modal.description") %></p>
         <% Experiments::TableViewService::COLUMNS.each do |col| %>
           <div class="column-container <%= col %> visible">
             <% if col == :archived && params[:view_mode] != 'archived' %>
diff --git a/app/views/experiments/_table_toolbar.html.erb b/app/views/experiments/_table_toolbar.html.erb
index 7878d99e0..eba705f85 100644
--- a/app/views/experiments/_table_toolbar.html.erb
+++ b/app/views/experiments/_table_toolbar.html.erb
@@ -19,9 +19,9 @@
     <div class="header-actions experiment-header">
       <% if action_name == 'table' %>
         <%= render partial: 'table_filters' %>
-      <button id="taskDataDisplay" class="btn btn-light btn-black icon-btn" data-toggle="modal" data-target="#tableDisplayModal">
-        <i class="sn-icon sn-icon sn-icon-reports"></i>
-      </button>
+        <button id="taskDataDisplay" class="btn btn-light btn-black icon-btn" data-toggle="modal" data-target="#tableDisplayModal" title="<%= t('experiments.table.toolbar.manage_columns_tooltip') %>">
+          <i class="sn-icon sn-icon sn-icon-reports"></i>
+        </button>
         <div class="dropdown sort-menu" title="<%= t("general.sort.title") %>">
           <button class="btn btn-light btn-black icon-btn dropdown-toggle" type="button" id="sortMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
             <i class="sn-icon sn-icon-sort-up"></i>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e84ab0600..a359b5a3b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1448,6 +1448,7 @@ en:
         duplicate: 'Duplicate'
         task_access: 'Task access'
         task_data: 'Task data display'
+        manage_columns_tooltip: "Manage columns"
       my_module_actions:
         title: 'TASK ACTIONS'
         edit: 'Edit'

From 59077e5ab6d1c9a1c97a8f4a14a1211900d47332 Mon Sep 17 00:00:00 2001
From: wandji <wbertrand10@gmail.com>
Date: Tue, 18 Jul 2023 12:39:20 +0100
Subject: [PATCH 34/45] Fix css issues for reports wizard steps [SCI-8786]
 (#5724)

* Fix css issues got reports wizard steps [SCI-8786]

* Fix linter errors [SCI-8786]

* Improve caret alignment for report wizard [SCI-8786]
---
 app/assets/stylesheets/reports/new.scss       | 26 ++++++++++++++-----
 .../reports/wizard/_second_step.html.erb      |  2 +-
 app/views/reports/wizard/_third_step.html.erb |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/reports/new.scss b/app/assets/stylesheets/reports/new.scss
index 1fcef6e07..0355c4064 100644
--- a/app/assets/stylesheets/reports/new.scss
+++ b/app/assets/stylesheets/reports/new.scss
@@ -41,9 +41,9 @@
   .reports-new-body {
     background: $color-concrete;
     height: calc(100% - 10em);
-    margin-left: calc(-1em - 15px);
     overflow-y: auto;
-    width: calc(100% + 2em + 30px);
+    padding-left: calc(-1em - 15px);
+    width: 100%;
   }
 
   .reports-new-footer {
@@ -409,7 +409,7 @@
 
     ul {
       list-style-type: none;
-      padding-left: 1em;
+      padding-left: 1.5em;
     }
 
     .sci-checkbox-container {
@@ -438,6 +438,10 @@
     .hide-unchecked {
       align-items: center;
       display: flex;
+
+      .sci-checkbox-container {
+        margin-right: .4em;
+      }
     }
 
     .divider {
@@ -466,7 +470,7 @@
 
       .sn-icon-down {
         cursor: pointer;
-        margin: 0 .5em;
+        margin: 0 0 0 -.1em;
 
         &.collapsed {
           @include rotate(-90deg);
@@ -551,7 +555,7 @@
 
     .sn-icon-down {
       cursor: pointer;
-      margin: 0 .5em;
+      margin: 0 0 0 .5em;
 
       &.collapsed {
         @include rotate(-90deg);
@@ -576,12 +580,17 @@
 
     .repositories-items-description {
       @include font-button;
-      display: inline-block;
+      display: flex;
       margin-top: 1em;
+      padding-left: 1em;
 
       .fas {
         color: $brand-focus;
       }
+
+      .sn-icon-info {
+        margin-right: .1em;
+      }
     }
 
     .all-results-container {
@@ -610,6 +619,11 @@
         .fa-exclamation-triangle {
           color: $brand-warning;
           margin-top: .5em;
+          width: var(--sci-checkbox-size);
+        }
+
+        .sci-checkbox-container {
+          margin-right: .4em;
         }
       }
     }
diff --git a/app/views/reports/wizard/_second_step.html.erb b/app/views/reports/wizard/_second_step.html.erb
index e345e3db6..4b841d4ba 100644
--- a/app/views/reports/wizard/_second_step.html.erb
+++ b/app/views/reports/wizard/_second_step.html.erb
@@ -5,7 +5,7 @@
     </div>
     <div class="collapse-buttons sci-btn-group">
        <button class="btn btn-light collapse-all">
-          <i class="sn-icon sn-icon-open-show"></i>
+          <i class="sn-icon sn-icon-up"></i>
           <%= t("projects.reports.wizard.second_step.collapse_all") %>
        </button>
        <button class="btn btn-light expand-all">
diff --git a/app/views/reports/wizard/_third_step.html.erb b/app/views/reports/wizard/_third_step.html.erb
index ba861cba0..ab6242ec6 100644
--- a/app/views/reports/wizard/_third_step.html.erb
+++ b/app/views/reports/wizard/_third_step.html.erb
@@ -55,7 +55,7 @@
       </span><br>
       <span class="repositories-items-description">
         <i class="sn-icon sn-icon-info"></i>
-        <%= t("projects.reports.wizard.third_step.assigned_items_description") %>
+        <span><%= t("projects.reports.wizard.third_step.assigned_items_description") %></span>
       </span>
       <ul class="collapse in" id="repositoriesContents">
         <li>

From bb7eee9b64674646fde90398b5aca0a0b12cda99 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 18 Jul 2023 14:55:19 +0200
Subject: [PATCH 35/45] Fix smart annotation popover in tasks
 [SCI-8866][SCI-8867]

---
 app/helpers/application_helper.rb               | 2 +-
 app/views/shared/_atwho_user_container.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c9c5dba94..d48e94a2f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -171,7 +171,7 @@ module ApplicationHelper
           user_avatar_popover_absolute_url: user_avatar_absolute_url(
             user,
             :thumb,
-            base64_encoded_imgs
+            base64_encoded_imgs && user.avatar.attached?
           )
         },
         formats: :html
diff --git a/app/views/shared/_atwho_user_container.html.erb b/app/views/shared/_atwho_user_container.html.erb
index b9c06e657..ac4a60d8c 100644
--- a/app/views/shared/_atwho_user_container.html.erb
+++ b/app/views/shared/_atwho_user_container.html.erb
@@ -21,11 +21,11 @@
     data-full-name="<%= user.full_name %>"
     data-email="<%= user.email %>"
     data-popover-html="<%= popover_html %>"
-    data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(user, :thumb, user.avatar.attached?) %>"
+    data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
   >
     <%= user.full_name %>
   </a>
   <% unless skip_user_status || user_still_in_team %>
     <%= I18n.t('atwho.res.removed') %>
   <% end %>
-</span>
\ No newline at end of file
+</span>

From 8b47982ccc2b1cb55032ec950a452b6556271ce0 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Tue, 18 Jul 2023 15:25:04 +0200
Subject: [PATCH 36/45] Fix fetching of WOPI discovery document [SCI-8889]
 (#5803)

---
 app/utilities/wopi_util.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/utilities/wopi_util.rb b/app/utilities/wopi_util.rb
index 1183135b1..e649836ee 100644
--- a/app/utilities/wopi_util.rb
+++ b/app/utilities/wopi_util.rb
@@ -53,7 +53,7 @@ module WopiUtil
   # Currently only saves Excel, Word and PowerPoint view and edit actions
   def initialize_discovery
     Rails.cache.fetch(:wopi_discovery, expires_in: DISCOVERY_TTL) do
-      @doc = Nokogiri::XML(Kernel.open(ENV['WOPI_DISCOVERY_URL']))
+      @doc = Nokogiri::XML(Net::HTTP.get(URI(ENV.fetch('WOPI_DISCOVERY_URL', nil))))
       discovery_json = {}
       key = @doc.xpath('//proof-key')
       discovery_json[:proof_key_mod] = key.xpath('@modulus').first.value

From 12dd66b6a6f73bd0bd069adbdb6b62f1691e1d62 Mon Sep 17 00:00:00 2001
From: Soufiane <soufiane@scinote.net>
Date: Tue, 18 Jul 2023 15:59:47 +0200
Subject: [PATCH 37/45] Fix smart annotation popover in tasks [SCI-8867]
 (#5805)

---
 app/helpers/application_helper.rb               | 14 ++------------
 app/views/shared/_atwho_user_container.html.erb |  6 +++++-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d48e94a2f..9ec06e963 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -154,7 +154,7 @@ module ApplicationHelper
                             skip_avatar = false,
                             base64_encoded_imgs = false)
 
-    (defined?(controller) ? controller : ActionController::Base.new)
+    (defined?(controller) ? controller : ApplicationController.new)
       .render_to_string(
         partial: 'shared/atwho_user_container',
         locals: {
@@ -162,17 +162,7 @@ module ApplicationHelper
           skip_avatar: skip_avatar,
           skip_user_status: skip_user_status,
           team: team,
-          base64_encoded_imgs: base64_encoded_imgs,
-          user_avatar_absolute_url: user_avatar_absolute_url(
-            user,
-            :icon_small,
-            base64_encoded_imgs
-          ),
-          user_avatar_popover_absolute_url: user_avatar_absolute_url(
-            user,
-            :thumb,
-            base64_encoded_imgs && user.avatar.attached?
-          )
+          base64_encoded_imgs: base64_encoded_imgs
         },
         formats: :html
       )
diff --git a/app/views/shared/_atwho_user_container.html.erb b/app/views/shared/_atwho_user_container.html.erb
index ac4a60d8c..b367971b9 100644
--- a/app/views/shared/_atwho_user_container.html.erb
+++ b/app/views/shared/_atwho_user_container.html.erb
@@ -21,7 +21,11 @@
     data-full-name="<%= user.full_name %>"
     data-email="<%= user.email %>"
     data-popover-html="<%= popover_html %>"
-    data-user-avatar-popover-absolute-url="<%= user_avatar_popover_absolute_url %>"
+    data-user-avatar-popover-absolute-url="<%= user_avatar_absolute_url(
+      user,
+      :thumb,
+      base64_encoded_imgs
+    ) %>"
   >
     <%= user.full_name %>
   </a>

From 36ffe3a44408a055ee336fa1da231fc8491c6403 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 19 Jul 2023 09:42:00 +0200
Subject: [PATCH 38/45] Fix asset result edit mode [SCI-8891]

---
 app/controllers/result_assets_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/result_assets_controller.rb b/app/controllers/result_assets_controller.rb
index 03231557e..3ff236a65 100644
--- a/app/controllers/result_assets_controller.rb
+++ b/app/controllers/result_assets_controller.rb
@@ -35,7 +35,7 @@ class ResultAssetsController < ApplicationController
 
   def edit
     render json: {
-      html: render_to_string(partial: 'edit')
+      html: render_to_string(partial: 'edit', formats: :html)
     }
   end
 

From f84de45cfe0293b51786e4debe8b4b06ee63d0a7 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Wed, 19 Jul 2023 09:42:23 +0200
Subject: [PATCH 39/45] Fix opening of activites for archived my_module
 [SCI-8887] (#5804)

---
 app/views/canvas/full_zoom/_my_module.html.erb | 3 ++-
 app/views/my_modules/_header.html.erb          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index d27509810..1bdd3b8c3 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -88,7 +88,8 @@
         </a>
       </li>
       <li role="presentation">
-        <a class="btn btn-light task-card-view-activities" href="<%= activities_my_module_url(id: my_module.id) %>" aria-controls="<%= my_module.id %>_activities" role="tab">
+        <a class="btn btn-light task-card-view-activities" href="<%= activities_my_module_url(id: my_module.id, view_mode: my_module.archived_branch? ? 'archived' : 'active') %>"
+           aria-controls="<%= my_module.id %>_activities" role="tab">
           <span class="sn-icon sn-icon-activities" aria-hidden="true"></span>
         </a>
       </li>
diff --git a/app/views/my_modules/_header.html.erb b/app/views/my_modules/_header.html.erb
index 3d349533e..0e8a15b43 100644
--- a/app/views/my_modules/_header.html.erb
+++ b/app/views/my_modules/_header.html.erb
@@ -37,7 +37,7 @@
             <% end %>
           </a>
           <a class="p-4 border-b-4 border-transparent text-sn-grey hover:no-underline <%= "border-sn-blue" if is_module_activities? %>"
-             href="<%= activities_my_module_url(@my_module) %>"
+             href="<%= activities_my_module_url(@my_module, view_mode: params[:view_mode]) %>"
              title="<%= t("nav2.modules.activities") %>"
           >
             <%= t("nav2.modules.activities") %>

From 699860e730c4828310e60769ec610fe19430b23b Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Wed, 19 Jul 2023 09:42:40 +0200
Subject: [PATCH 40/45] Add position to step elements API [SCI-8834] (#5799)

---
 app/serializers/api/v1/checklist_serializer.rb | 6 +++++-
 app/serializers/api/v1/step_text_serializer.rb | 6 +++++-
 app/serializers/api/v1/table_serializer.rb     | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/serializers/api/v1/checklist_serializer.rb b/app/serializers/api/v1/checklist_serializer.rb
index e46da85fd..46eb36c86 100644
--- a/app/serializers/api/v1/checklist_serializer.rb
+++ b/app/serializers/api/v1/checklist_serializer.rb
@@ -4,9 +4,13 @@ module Api
   module V1
     class ChecklistSerializer < ActiveModel::Serializer
       type :checklists
-      attributes :id, :name
+      attributes :id, :name, :position
       has_many :checklist_items, serializer: ChecklistItemSerializer
 
+      def position
+        object.step_orderable_element.position
+      end
+
       include TimestampableModel
     end
   end
diff --git a/app/serializers/api/v1/step_text_serializer.rb b/app/serializers/api/v1/step_text_serializer.rb
index 924cb9954..4d94cbea5 100644
--- a/app/serializers/api/v1/step_text_serializer.rb
+++ b/app/serializers/api/v1/step_text_serializer.rb
@@ -4,13 +4,17 @@ module Api
   module V1
     class StepTextSerializer < ActiveModel::Serializer
       type :step_texts
-      attributes :id, :text
+      attributes :id, :text, :position
 
       include TimestampableModel
 
       def contents
         object.text&.force_encoding(Encoding::UTF_8)
       end
+
+      def position
+        object.step_orderable_element.position
+      end
     end
   end
 end
diff --git a/app/serializers/api/v1/table_serializer.rb b/app/serializers/api/v1/table_serializer.rb
index b2d4c87d0..85b7c87d6 100644
--- a/app/serializers/api/v1/table_serializer.rb
+++ b/app/serializers/api/v1/table_serializer.rb
@@ -4,13 +4,17 @@ module Api
   module V1
     class TableSerializer < ActiveModel::Serializer
       type :tables
-      attributes :id, :name, :contents, :metadata
+      attributes :id, :name, :contents, :metadata, :position
 
       include TimestampableModel
 
       def contents
         object.contents&.force_encoding(Encoding::UTF_8)
       end
+
+      def position
+        object.step_table&.step_orderable_element&.position
+      end
     end
   end
 end

From 7d36c740702f7e944d88811d051fe3be7093436e Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Tue, 18 Jul 2023 11:53:08 +0100
Subject: [PATCH 41/45] Fix issue when fetching table reults via API [SCI-8884]

---
 app/serializers/api/v1/result_table_serializer.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/serializers/api/v1/result_table_serializer.rb b/app/serializers/api/v1/result_table_serializer.rb
index d5bf79871..3ab7b6ae8 100644
--- a/app/serializers/api/v1/result_table_serializer.rb
+++ b/app/serializers/api/v1/result_table_serializer.rb
@@ -10,6 +10,10 @@ module Api
         object.table&.id
       end
 
+      def metadata
+        object.table&.metadata
+      end
+
       def table_contents
         object.table&.contents&.force_encoding(Encoding::UTF_8)
       end

From 126814aee813ceecd393eefc7945c1bf8cfba0e6 Mon Sep 17 00:00:00 2001
From: wandji20 <wbertrand10@gmail.com>
Date: Wed, 19 Jul 2023 08:49:20 +0100
Subject: [PATCH 42/45] Rename result_table serializer metadata to
 table_metadata [SCI-8884]

---
 app/serializers/api/v1/result_table_serializer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/serializers/api/v1/result_table_serializer.rb b/app/serializers/api/v1/result_table_serializer.rb
index 3ab7b6ae8..fb47172fa 100644
--- a/app/serializers/api/v1/result_table_serializer.rb
+++ b/app/serializers/api/v1/result_table_serializer.rb
@@ -4,13 +4,13 @@ module Api
   module V1
     class ResultTableSerializer < ActiveModel::Serializer
       type :result_tables
-      attributes :table_id, :table_contents, :metadata
+      attributes :table_id, :table_contents, :table_metadata
 
       def table_id
         object.table&.id
       end
 
-      def metadata
+      def table_metadata
         object.table&.metadata
       end
 

From f540b3dc8d6f59163d9ae4d0249c5f771e03c959 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 19 Jul 2023 09:55:27 +0200
Subject: [PATCH 43/45] Fix js error in console log [SCI-8890]

---
 app/assets/javascripts/experiments/table.js                 | 4 +++-
 .../label_templates/label_templates_datatable.js            | 6 ++++--
 app/javascript/vue/navigation/navigator_item.vue            | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/experiments/table.js b/app/assets/javascripts/experiments/table.js
index c7bc43316..716694c7a 100644
--- a/app/assets/javascripts/experiments/table.js
+++ b/app/assets/javascripts/experiments/table.js
@@ -499,7 +499,9 @@ var ExperimnetTable = {
     });
   },
   updateExperimentToolbar: function() {
-    window.actionToolbarComponent.fetchActions({ my_module_ids: this.selectedMyModules });
+    if (window.actionToolbarComponent) {
+      window.actionToolbarComponent.fetchActions({ my_module_ids: this.selectedMyModules });
+    }
   },
   selectDate: function($field) {
     var datePicker = $field.data('DateTimePicker');
diff --git a/app/assets/javascripts/label_templates/label_templates_datatable.js b/app/assets/javascripts/label_templates/label_templates_datatable.js
index 0c153a9d2..4e7e166bd 100644
--- a/app/assets/javascripts/label_templates/label_templates_datatable.js
+++ b/app/assets/javascripts/label_templates/label_templates_datatable.js
@@ -144,8 +144,10 @@
   }
 
   function updateButtons() {
-    window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() });
-    $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`);
+    if (window.actionToolbarComponent) {
+      window.actionToolbarComponent.fetchActions({ label_template_ids: rowsSelectedIDs() });
+      $('.dataTables_scrollBody').css('padding-bottom', `${rowsSelectedIDs().length > 0 ? 68 : 0}px`);
+    }
   }
 
   function reloadTable() {
diff --git a/app/javascript/vue/navigation/navigator_item.vue b/app/javascript/vue/navigation/navigator_item.vue
index 2c29c7632..4b4e1e7c0 100644
--- a/app/javascript/vue/navigation/navigator_item.vue
+++ b/app/javascript/vue/navigation/navigator_item.vue
@@ -114,7 +114,7 @@ export default {
       }
     },
     children: function() {
-      if (this.children.length > 0) {
+      if (this.children && this.children.length > 0) {
         this.childrenExpanded = true;
       } else if (this.childrenLoaded) {
         this.item.has_children = false;

From c1db4529e9f25d857805578d7581830ca8a24f5f Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Wed, 19 Jul 2023 10:32:36 +0200
Subject: [PATCH 44/45] Fix consume modal display on full table view on task
 [SCI-8868] (#5798)

---
 app/views/my_modules/protocols.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index f7d5720c4..881ce7eab 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -119,6 +119,8 @@
           data-repositories-list-url="<%= my_module_repositories_list_html_path(@my_module) %>">
         <%= render partial: "my_modules/repositories/repositories_list" %>
       </div>
+
+      <%= render partial: "my_modules/repositories/full_view_modal" %>
     </div>
     <!-- Protocol -->
     <div class="task-section">
@@ -136,7 +138,6 @@
   </div>
 </div>
 
-<%= render partial: "my_modules/repositories/full_view_modal" %>
 <%= render partial: "my_modules/modals/update_repository_records_modal" %>
 
 

From 4ac0ee3ace5c136f51237237c9b01dd61ef0fc6d Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Wed, 19 Jul 2023 10:32:51 +0200
Subject: [PATCH 45/45] Fix opening of task/tags for archived my_module
 [SCI-8886] (#5801)

---
 app/assets/javascripts/projects/canvas.js.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb
index 1e1335049..102931b1c 100644
--- a/app/assets/javascripts/projects/canvas.js.erb
+++ b/app/assets/javascripts/projects/canvas.js.erb
@@ -138,7 +138,7 @@ var hammertime;
  * Initializes page
  */
 function init() {
-  if ($("#canvas-container").length === 0) return;
+  if ($('#module-archive').length === 0 && $('#canvas-container').length === 0) return;
 
   if($('#module-archive').length) {
     bindFullZoomAjaxTabs();