From 361278060645417380f0bcc6491947414178761b Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 7 Mar 2023 07:07:51 +0100
Subject: [PATCH 01/12] Fix wrong icon [SCI-8007]

---
 app/views/protocols/index/_general_toolbar.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/protocols/index/_general_toolbar.html.erb b/app/views/protocols/index/_general_toolbar.html.erb
index 6fada076b..8612e84b5 100644
--- a/app/views/protocols/index/_general_toolbar.html.erb
+++ b/app/views/protocols/index/_general_toolbar.html.erb
@@ -14,7 +14,7 @@
         data-toggle="dropdown"
         aria-haspopup="true"
         aria-expanded="false">
-        <span class="fas fa-download"></span><span class="hidden-xs"><%= t("protocols.index.import") %></span>
+        <span class="fas fa-upload"></span><span class="hidden-xs"><%= t("protocols.index.import") %></span>
       </button>
       <% if can_create_protocols_in_repository?(@current_team) %>
         <ul class="dropdown-menu">

From 6a885d4023dbb29056b173ad51f0bfa143aa1c1b Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Tue, 7 Mar 2023 11:02:03 +0100
Subject: [PATCH 02/12] Fix avatars and tooltip in access column [SCI-8007]

---
 app/views/protocols/index/_users_list.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/protocols/index/_users_list.html.erb b/app/views/protocols/index/_users_list.html.erb
index 395fb0ca5..fe4465956 100644
--- a/app/views/protocols/index/_users_list.html.erb
+++ b/app/views/protocols/index/_users_list.html.erb
@@ -1,12 +1,12 @@
-<% protocol.user_assignments[0..3].each_with_index do |user_assigment, i| %>
+<% protocol.user_assignments[0..2].each_with_index do |user_assigment, i| %>
   <span class="global-avatar-container" style="z-index: <%= 5 - i %>">
     <%= image_tag(avatar_path(user_assigment.user, :icon_small), title: user_name_with_role(user_assigment)) %>
   </span>
 <% end %>
 
-<% more_users = protocol.user_assignments[4..-1].to_a %>
+<% more_users = protocol.user_assignments[3..-1].to_a %>
 <% if more_users.any? %>
-  <span class="more-users" title="<%= user_names_with_roles(more_users) %>">
+  <span class="more-users" title="<%== user_names_with_roles(more_users) %>">
      +<%= more_users.size %>
   </span>
 <% end %>

From 4ec15ede61261aed89d64cb34d8d6b2f16831e72 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 8 Mar 2023 15:15:41 +0100
Subject: [PATCH 03/12] Implement the linked_children dropdown and update the
 modal [SCI-8007]

---
 app/assets/javascripts/protocols/index.js     | 34 ++++++++++++++++++-
 app/assets/stylesheets/protocols/index.scss   | 26 ++++++++++++++
 .../protocol_linked_children_datatable.rb     |  8 +++--
 .../_linked_children_modal_body.html.erb      | 19 ++++++++---
 4 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index 540193f1d..2271cd5c8 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -550,7 +550,7 @@ var ProtocolsIndex = (function() {
               // Only initialize table if it's present
               childrenTableEl.DataTable({
                 autoWidth: false,
-                dom: 'RBltpi',
+                dom: 'RBtpl',
                 stateSave: false,
                 buttons: [],
                 processing: true,
@@ -570,6 +570,38 @@ var ProtocolsIndex = (function() {
                 columns: [
                   { data: '1' }
                 ],
+                lengthMenu: [[10, 25, 50], ['Show 10 per page', 'Show 25 per page', 'Show 50 per page']],
+                language: {
+                  lengthMenu: '_MENU_'
+                },
+                initComplete: function(settings, json) {
+                  const versionSelector = $('#version-selector');
+                  const table = childrenTableEl.DataTable();
+                  dropdownSelector.init(versionSelector, {
+                    noEmptyOption: true,
+                    singleSelect: true,
+                    selectAppearance: 'simple',
+                    closeOnSelect: true,
+                    onSelect: function() {
+                      const selectedValue = dropdownSelector.getValues(versionSelector);
+                      if (selectedValue === 'All') {
+                        table.rows().eq(0).each(index => {
+                          const row = table.row(index);
+                          row.nodes().to$().show();
+                        });
+                      } else {
+                        table.rows().eq(0).each(index => {
+                          const row = table.row(index);
+                          if (Number(row.data().version) === Number(selectedValue)) {
+                            row.nodes().to$().show();
+                          } else {
+                            row.nodes().to$().hide();
+                          }
+                        });
+                      }
+                    }
+                  });
+                },
                 fnDrawCallback: function() {
                   animateSpinner(this, false);
                 },
diff --git a/app/assets/stylesheets/protocols/index.scss b/app/assets/stylesheets/protocols/index.scss
index 157c68fa2..889f6afd2 100644
--- a/app/assets/stylesheets/protocols/index.scss
+++ b/app/assets/stylesheets/protocols/index.scss
@@ -283,3 +283,29 @@
     }
   }
 }
+
+#linked-children-modal {
+  .dataTables_length .form-control {
+    width: 160px;
+  }
+
+  .version-dropdown {
+    display: flex;
+    align-items: center;
+    margin-top: 16px;
+    column-gap: 8px;
+
+    label {
+      font-size: 14px;
+      font-weight: 400;
+    }
+
+    .dropdown-selector-container {
+      width: 86px;
+    }
+  }
+
+  .linked-children-datatable {
+    margin-bottom: 16px;
+  }
+}
diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index 5db42dee5..333f7c8f4 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -32,6 +32,7 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
     records.map do |record|
       {
         'DT_RowId' => record.id,
+        'version' => record.parent.version_number,
         '1' => record_html(record)
       }
     end
@@ -40,13 +41,16 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
   # Query database for records (this will be later paginated and filtered)
   # after that "data" function will return json
   def get_raw_records
-    records =
-      Protocol
+    linked_protocols = Protocol
       .joins(my_module: { experiment: :project })
       .includes(my_module: { experiment: :project })
       .references(my_module: { experiment: :project })
       .where(protocol_type: Protocol.protocol_types[:linked])
+    records = linked_protocols
       .where(parent: @protocol)
+      .or(
+        linked_protocols.where(parent: Protocol.where(parent: @protocol))
+      )
     records.distinct
   end
 
diff --git a/app/views/protocols/index/_linked_children_modal_body.html.erb b/app/views/protocols/index/_linked_children_modal_body.html.erb
index 9cbaadbf7..ea6d2c73d 100644
--- a/app/views/protocols/index/_linked_children_modal_body.html.erb
+++ b/app/views/protocols/index/_linked_children_modal_body.html.erb
@@ -1,10 +1,21 @@
 <% linked_children = protocol.linked_children %>
+<% published_versions = protocol.published_versions_with_original.order(version_number: :desc)%>
 
 <% if protocol.nr_of_linked_children > 0 %>
-  <div>
-    <%= t("protocols.index.linked_children.used_in", nr: protocol.nr_of_linked_children) %>
+  <div class="version-dropdown">
+    <%= label_tag "version-selector".to_sym, "Show version" %>
+    <%= select_tag "version",
+      options_for_select(
+        ['All'].concat(
+        published_versions.map { |p|
+          [
+            p.version_number
+          ]
+        })),
+      {
+        id: 'version-selector'
+      } %>
   </div>
-
   <div class="linked-children-datatable">
     <table id="linked-children-table" class="table" data-source="<%= linked_children_datatable_protocol_path(protocol: protocol) %>">
       <tbody></tbody>
@@ -14,4 +25,4 @@
   <div>
     <em><%= t("protocols.index.linked_children.no_linked_children") %></em>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>

From b3f7c41548b403cdd25e2d9e92355f241f08096b Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 8 Mar 2023 16:25:10 +0100
Subject: [PATCH 04/12] Update the filter dropDown globaly [SCI-8007]

---
 app/assets/javascripts/sitewide/filter_dropdown.js   |  7 +++++++
 app/assets/stylesheets/shared/filter_dropdown.scss   |  4 ++--
 app/views/protocols/index/_protocol_filters.html.erb |  1 -
 app/views/shared/_filter_dropdown.html.erb           | 12 +++++++++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/sitewide/filter_dropdown.js b/app/assets/javascripts/sitewide/filter_dropdown.js
index 994b62d8f..36780fc13 100644
--- a/app/assets/javascripts/sitewide/filter_dropdown.js
+++ b/app/assets/javascripts/sitewide/filter_dropdown.js
@@ -97,12 +97,19 @@ var filterDropdown = (function() {
     });
   }
 
+  function initCloseButton() {
+    $('.close', $filterContainer).click(function() {
+      $(this).closest('.dropdown').removeClass('open');
+    });
+  }
+
   return {
     init: function() {
       $filterContainer = $('.filter-container');
       initClearButton();
       preventDropdownClose();
       initApplyButton();
+      initCloseButton();
       initSearchField();
       return $filterContainer;
     },
diff --git a/app/assets/stylesheets/shared/filter_dropdown.scss b/app/assets/stylesheets/shared/filter_dropdown.scss
index 6840c6f9c..a95cf7be5 100644
--- a/app/assets/stylesheets/shared/filter_dropdown.scss
+++ b/app/assets/stylesheets/shared/filter_dropdown.scss
@@ -13,7 +13,7 @@
       display: flex;
       height: 2.75em;
       margin-bottom: 1em;
-      padding: 0  .3em 0 1em;
+      padding: 1em;
 
       .title {
         @include font-h2;
@@ -117,7 +117,7 @@
     }
 
     .footer:not(.center) {
-      .btn:last-child {
+      :last-child {
         margin-left: auto;
       }
     }
diff --git a/app/views/protocols/index/_protocol_filters.html.erb b/app/views/protocols/index/_protocol_filters.html.erb
index 038798781..749ab539b 100644
--- a/app/views/protocols/index/_protocol_filters.html.erb
+++ b/app/views/protocols/index/_protocol_filters.html.erb
@@ -7,7 +7,6 @@
     <%= render partial: 'shared/filter_dropdown/text_search', locals: {container_class: '', label_text: t('filters_modal.text.label_name_and_keywords')} %>
     <%= render partial: 'shared/filter_dropdown/datetime_search', locals: {container_class: 'published-on-filter', label: 'Published on', view_mode: nil } %>
     <%= render partial: 'shared/filter_dropdown/datetime_search', locals: {container_class: 'modified-on-filter', label: 'Modified on', view_mode: nil } %>
-    <%= render partial: 'shared/filter_dropdown/datetime_search', locals: {container_class: 'archived-on-filter', label: 'Archived on', view_mode: 'archived' } %>
     <div class="select-block">
       <label>Published by</label>
       <select class="published-by-filter"
diff --git a/app/views/shared/_filter_dropdown.html.erb b/app/views/shared/_filter_dropdown.html.erb
index d83a45fc1..a42b40090 100644
--- a/app/views/shared/_filter_dropdown.html.erb
+++ b/app/views/shared/_filter_dropdown.html.erb
@@ -3,14 +3,20 @@
       <div class="dropdown-menu dropdown-menu-right filter-dropdown <%= container_class %>" role="menu" data-team-id="<%= current_team.id %>" data-search-field-history-key="<%= search_field_history_key %>">
         <div class="header">
           <div class="title"><%= dropdown_title %></div>
-          <div class="btn btn-light clear-button">
-            <i class="fas fa-times-circle"></i><%= t("filters_modal.clear_btn") %></div>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         </div>
         <div class="body">
           <%= yield %>
         </div>
         <div class="footer">
-          <div class="btn btn-primary apply-filters"><%= t("filters_modal.show_btn.one") %></div>
+          <div class="buttons">
+            <div class="btn btn-light clear-button">
+              <%= t("filters_modal.clear_btn") %>
+            </div>
+            <div class="btn btn-primary apply-filters">
+              <%= t("filters_modal.show_btn.one") %>
+            </div>
+          </div>
         </div>
       </div>
     </div>

From 45f3d05fdc7807382135f870a795db9fb363387e Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 8 Mar 2023 16:31:24 +0100
Subject: [PATCH 05/12] Fix hound [SCI-8007]

---
 app/assets/javascripts/protocols/index.js   | 2 +-
 app/assets/stylesheets/protocols/index.scss | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index 2271cd5c8..60781438a 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -574,7 +574,7 @@ var ProtocolsIndex = (function() {
                 language: {
                   lengthMenu: '_MENU_'
                 },
-                initComplete: function(settings, json) {
+                initComplete: function() {
                   const versionSelector = $('#version-selector');
                   const table = childrenTableEl.DataTable();
                   dropdownSelector.init(versionSelector, {
diff --git a/app/assets/stylesheets/protocols/index.scss b/app/assets/stylesheets/protocols/index.scss
index 889f6afd2..4e798ecda 100644
--- a/app/assets/stylesheets/protocols/index.scss
+++ b/app/assets/stylesheets/protocols/index.scss
@@ -290,10 +290,10 @@
   }
 
   .version-dropdown {
-    display: flex;
     align-items: center;
-    margin-top: 16px;
     column-gap: 8px;
+    display: flex;
+    margin-top: 16px;
 
     label {
       font-size: 14px;

From 506c750eeea69083ee8ea22dea7c3e9355ddc82a Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 9 Mar 2023 21:59:14 +0100
Subject: [PATCH 06/12] Use datatable ajax to send version param [SCI-8007]

---
 app/assets/javascripts/protocols/index.js     | 59 +++++++++----------
 .../protocol_linked_children_datatable.rb     | 15 ++++-
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index 65a96f6ed..86c2690f9 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -5,6 +5,7 @@
 
 // Global variables
 var ProtocolsIndex = (function() {
+  const ALL_VERSIONS_VALUE = 'All';
   var PERMISSIONS = ['archivable', 'restorable', 'copyable'];
   var rowsSelected = [];
   var protocolsTableEl = null;
@@ -566,10 +567,27 @@ var ProtocolsIndex = (function() {
             modal.modal('show');
 
             let childrenTableEl = modalBody.find('#linked-children-table');
+            let versionFromDropdown = ALL_VERSIONS_VALUE;
+
+            const initVersionsDropdown = (childrenDatatable) => {
+              const versionSelector = $('#version-selector');
+              dropdownSelector.init(versionSelector, {
+                noEmptyOption: true,
+                singleSelect: true,
+                selectAppearance: 'simple',
+                closeOnSelect: true,
+                onSelect: function() {
+                  versionFromDropdown = dropdownSelector.getValues(versionSelector);
+                  childrenDatatable.ajax.reload();
+                }
+              });
+            };
+
+            let childrenDatatable;
 
             if (childrenTableEl) {
               // Only initialize table if it's present
-              childrenTableEl.DataTable({
+              childrenDatatable = childrenTableEl.DataTable({
                 autoWidth: false,
                 dom: 'RBtpl',
                 stateSave: false,
@@ -578,7 +596,14 @@ var ProtocolsIndex = (function() {
                 serverSide: true,
                 ajax: {
                   url: childrenTableEl.data('source'),
-                  type: 'POST'
+                  type: 'POST',
+                  data: function(d) {
+                    if (versionFromDropdown !== ALL_VERSIONS_VALUE) {
+                      d.version = versionFromDropdown;
+                    }
+
+                    return d;
+                  }
                 },
                 colReorder: {
                   fixedColumnsLeft: 1000000 // Disable reordering
@@ -595,34 +620,6 @@ var ProtocolsIndex = (function() {
                 language: {
                   lengthMenu: '_MENU_'
                 },
-                initComplete: function() {
-                  const versionSelector = $('#version-selector');
-                  const table = childrenTableEl.DataTable();
-                  dropdownSelector.init(versionSelector, {
-                    noEmptyOption: true,
-                    singleSelect: true,
-                    selectAppearance: 'simple',
-                    closeOnSelect: true,
-                    onSelect: function() {
-                      const selectedValue = dropdownSelector.getValues(versionSelector);
-                      if (selectedValue === 'All') {
-                        table.rows().eq(0).each(index => {
-                          const row = table.row(index);
-                          row.nodes().to$().show();
-                        });
-                      } else {
-                        table.rows().eq(0).each(index => {
-                          const row = table.row(index);
-                          if (Number(row.data().version) === Number(selectedValue)) {
-                            row.nodes().to$().show();
-                          } else {
-                            row.nodes().to$().hide();
-                          }
-                        });
-                      }
-                    }
-                  });
-                },
                 fnDrawCallback: function() {
                   animateSpinner(this, false);
                 },
@@ -631,6 +628,8 @@ var ProtocolsIndex = (function() {
                 }
               });
             }
+
+            initVersionsDropdown(childrenDatatable);
           },
           error: function() {
             // TODO
diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index 333f7c8f4..9b3c01e10 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -32,7 +32,6 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
     records.map do |record|
       {
         'DT_RowId' => record.id,
-        'version' => record.parent.version_number,
         '1' => record_html(record)
       }
     end
@@ -46,11 +45,15 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
       .includes(my_module: { experiment: :project })
       .references(my_module: { experiment: :project })
       .where(protocol_type: Protocol.protocol_types[:linked])
+
     records = linked_protocols
       .where(parent: @protocol)
       .or(
         linked_protocols.where(parent: Protocol.where(parent: @protocol))
       )
+
+    records = filter_child_records(records)
+
     records.distinct
   end
 
@@ -80,4 +83,14 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
     res += '</ol>'
     res
   end
+
+  def filter_child_records(records)
+    if params[:version].present?
+      version = params[:version]
+      records = records.joins("LEFT JOIN protocols protocol_parents " \
+                "ON protocols.parent_id = protocol_parents.id ")
+                .where("protocol_parents.version_number = #{version}")
+    end
+    records
+  end
 end

From 36782611b496f3d6265873af5944337249dd278a Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 9 Mar 2023 22:13:52 +0100
Subject: [PATCH 07/12] Fix hound [SCI-8007]

---
 app/assets/javascripts/protocols/index.js            | 9 ++++++++-
 app/datatables/protocol_linked_children_datatable.rb | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index 86c2690f9..aa26be05c 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -616,7 +616,14 @@ var ProtocolsIndex = (function() {
                 columns: [
                   { data: '1' }
                 ],
-                lengthMenu: [[10, 25, 50], ['Show 10 per page', 'Show 25 per page', 'Show 50 per page']],
+                lengthMenu: [
+                  [10, 25, 50],
+                  [
+                    I18n.t('protocols.index.linked_children.length_menu', { number: 10 }),
+                    I18n.t('protocols.index.linked_children.length_menu', { number: 25 }),
+                    I18n.t('protocols.index.linked_children.length_menu', { number: 50 })
+                  ]
+                ],
                 language: {
                   lengthMenu: '_MENU_'
                 },
diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index 9b3c01e10..0963befda 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -87,9 +87,9 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
   def filter_child_records(records)
     if params[:version].present?
       version = params[:version]
-      records = records.joins("LEFT JOIN protocols protocol_parents " \
-                "ON protocols.parent_id = protocol_parents.id ")
-                .where("protocol_parents.version_number = #{version}")
+      records = records.joins('LEFT JOIN protocols protocol_parents ' \
+                       'ON protocols.parent_id = protocol_parents.id ')
+                       .where('protocol_parents.version_number = #{version}')
     end
     records
   end

From 55ebb4817e655b03617bdcb86a5bdc049b900368 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 9 Mar 2023 22:13:52 +0100
Subject: [PATCH 08/12] Fix hound [SCI-8007]

---
 app/assets/javascripts/protocols/index.js            | 9 ++++++++-
 app/datatables/protocol_linked_children_datatable.rb | 6 +++---
 config/locales/en.yml                                | 1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index 86c2690f9..aa26be05c 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -616,7 +616,14 @@ var ProtocolsIndex = (function() {
                 columns: [
                   { data: '1' }
                 ],
-                lengthMenu: [[10, 25, 50], ['Show 10 per page', 'Show 25 per page', 'Show 50 per page']],
+                lengthMenu: [
+                  [10, 25, 50],
+                  [
+                    I18n.t('protocols.index.linked_children.length_menu', { number: 10 }),
+                    I18n.t('protocols.index.linked_children.length_menu', { number: 25 }),
+                    I18n.t('protocols.index.linked_children.length_menu', { number: 50 })
+                  ]
+                ],
                 language: {
                   lengthMenu: '_MENU_'
                 },
diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index 9b3c01e10..0963befda 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -87,9 +87,9 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
   def filter_child_records(records)
     if params[:version].present?
       version = params[:version]
-      records = records.joins("LEFT JOIN protocols protocol_parents " \
-                "ON protocols.parent_id = protocol_parents.id ")
-                .where("protocol_parents.version_number = #{version}")
+      records = records.joins('LEFT JOIN protocols protocol_parents ' \
+                       'ON protocols.parent_id = protocol_parents.id ')
+                       .where('protocol_parents.version_number = #{version}')
     end
     records
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 61196108c..979ef7fda 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2759,6 +2759,7 @@ en:
         title: "Tasks linked to protocol %{protocol}"
         used_in: "Number of tasks linked to this protocol: %{nr}"
         no_linked_children: "This protocol is not linked to any task."
+        length_menu: "Show %{number} per page"
       archive:
         description: "Archived protocols can only be seen by you. Restoring protocols will return them to their previous location (team/my protocols)."
       restore: "Restore"

From e9bdd218fa2da218487b7171428241fa559e9c28 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Fri, 10 Mar 2023 09:46:45 +0100
Subject: [PATCH 09/12] Sanitize te user_names_with_roles [SCI-8007]

---
 app/helpers/projects_helper.rb                 | 3 ++-
 app/views/protocols/index/_users_list.html.erb | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 1fb5f6432..2d5ca1ba7 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -14,7 +14,8 @@ module ProjectsHelper
   end
 
   def user_names_with_roles(user_assignments)
-    user_assignments.map { |up| user_name_with_role(up) }.join('&#013;')
+    names_with_roles = user_assignments.map { |up| user_name_with_role(up) }.join('&#013;')
+    sanitize_input(names_with_roles)
   end
 
   def user_name_with_role(user_assignment)
diff --git a/app/views/protocols/index/_users_list.html.erb b/app/views/protocols/index/_users_list.html.erb
index fe4465956..5db1d1544 100644
--- a/app/views/protocols/index/_users_list.html.erb
+++ b/app/views/protocols/index/_users_list.html.erb
@@ -6,7 +6,7 @@
 
 <% more_users = protocol.user_assignments[3..-1].to_a %>
 <% if more_users.any? %>
-  <span class="more-users" title="<%== user_names_with_roles(more_users) %>">
+  <span class="more-users" title="<%= user_names_with_roles(more_users) %>">
      +<%= more_users.size %>
   </span>
 <% end %>

From ce3fbfe4eb639737387a9b944cecd271e63d5412 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Fri, 10 Mar 2023 11:13:00 +0100
Subject: [PATCH 10/12] Sanitize datatable params [SCI-8007]

---
 app/datatables/protocol_linked_children_datatable.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index 0963befda..8b913102f 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -86,10 +86,7 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
 
   def filter_child_records(records)
     if params[:version].present?
-      version = params[:version]
-      records = records.joins('LEFT JOIN protocols protocol_parents ' \
-                       'ON protocols.parent_id = protocol_parents.id ')
-                       .where('protocol_parents.version_number = #{version}')
+      records = records.left_outer_joins(:parent).where(parent: { version_number: params[:version] })
     end
     records
   end

From d2ceeb96626dd85548406925efee1a860e8550c8 Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Sun, 12 Mar 2023 14:10:07 +0100
Subject: [PATCH 11/12] Use I18n [SCI-8007]

---
 app/views/protocols/index/_linked_children_modal_body.html.erb | 2 +-
 config/locales/en.yml                                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/protocols/index/_linked_children_modal_body.html.erb b/app/views/protocols/index/_linked_children_modal_body.html.erb
index ea6d2c73d..a66d64114 100644
--- a/app/views/protocols/index/_linked_children_modal_body.html.erb
+++ b/app/views/protocols/index/_linked_children_modal_body.html.erb
@@ -3,7 +3,7 @@
 
 <% if protocol.nr_of_linked_children > 0 %>
   <div class="version-dropdown">
-    <%= label_tag "version-selector".to_sym, "Show version" %>
+    <%= label_tag "version-selector".to_sym, t("protocols.index.linked_children.show_version") %>
     <%= select_tag "version",
       options_for_select(
         ['All'].concat(
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 979ef7fda..a8b0c4bfc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2760,6 +2760,7 @@ en:
         used_in: "Number of tasks linked to this protocol: %{nr}"
         no_linked_children: "This protocol is not linked to any task."
         length_menu: "Show %{number} per page"
+        show_version: "Show version"
       archive:
         description: "Archived protocols can only be seen by you. Restoring protocols will return them to their previous location (team/my protocols)."
       restore: "Restore"

From dcbe1615cfcba10ba3a4bc50d9295e70f7f26d8c Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Wed, 15 Mar 2023 09:14:01 +0100
Subject: [PATCH 12/12] Refactor the records generation method [8007]

Co-Authored-By: okriuchykhin <oleksii@scinote.net>
---
 .../protocol_linked_children_datatable.rb     | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/datatables/protocol_linked_children_datatable.rb b/app/datatables/protocol_linked_children_datatable.rb
index 8b913102f..17ccd5d3c 100644
--- a/app/datatables/protocol_linked_children_datatable.rb
+++ b/app/datatables/protocol_linked_children_datatable.rb
@@ -40,21 +40,16 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
   # Query database for records (this will be later paginated and filtered)
   # after that "data" function will return json
   def get_raw_records
-    linked_protocols = Protocol
-      .joins(my_module: { experiment: :project })
-      .includes(my_module: { experiment: :project })
-      .references(my_module: { experiment: :project })
-      .where(protocol_type: Protocol.protocol_types[:linked])
-
-    records = linked_protocols
-      .where(parent: @protocol)
-      .or(
-        linked_protocols.where(parent: Protocol.where(parent: @protocol))
-      )
-
-    records = filter_child_records(records)
-
-    records.distinct
+    if params[:version].present?
+      records = @protocol.published_versions_with_original
+                         .find_by!(version_number: params[:version])
+                         .linked_children
+    else
+      records = Protocol.where(protocol_type: Protocol.protocol_types[:linked])
+      records = records.where(parent_id: @protocol.published_versions)
+                       .or(records.where(parent_id: @protocol.id))
+    end
+    records.preload(my_module: { experiment: :project }).distinct
   end
 
   # Helper methods
@@ -83,11 +78,4 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
     res += '</ol>'
     res
   end
-
-  def filter_child_records(records)
-    if params[:version].present?
-      records = records.left_outer_joins(:parent).where(parent: { version_number: params[:version] })
-    end
-    records
-  end
 end