From 5512db18f0a0b5dacabcf0f29c0b076bd1ef01cc Mon Sep 17 00:00:00 2001
From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
Date: Mon, 3 Jan 2022 12:34:06 +0100
Subject: [PATCH] Fix state for bmt repository [SCI-6089] (#3758)

Co-authored-by: Anton <anton@scinote.net>
---
 app/models/bmt_repository.rb                                | 4 ++--
 app/views/my_modules/repositories/_full_view_table.html.erb | 3 +++
 app/views/repositories/_repository_table.html.erb           | 6 ++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models/bmt_repository.rb b/app/models/bmt_repository.rb
index 2bdbaa5cf..e9389b2c0 100644
--- a/app/models/bmt_repository.rb
+++ b/app/models/bmt_repository.rb
@@ -5,9 +5,9 @@ class BmtRepository < LinkedRepository
 
   def default_table_state
     state = Constants::REPOSITORY_TABLE_DEFAULT_STATE.deep_dup
-    state['order'] = [[3, 'asc']]
     state['ColReorder'] << state['ColReorder'].length
-    state['columns'].pop(1)
+    state['columns'].insert(1, Constants::REPOSITORY_TABLE_STATE_CUSTOM_COLUMN_TEMPLATE)
+    state['order'] = [[3, 'asc']]
     state
   end
 
diff --git a/app/views/my_modules/repositories/_full_view_table.html.erb b/app/views/my_modules/repositories/_full_view_table.html.erb
index bd999ff37..b8e1a5108 100644
--- a/app/views/my_modules/repositories/_full_view_table.html.erb
+++ b/app/views/my_modules/repositories/_full_view_table.html.erb
@@ -19,6 +19,9 @@
         </div>
       </th>
       <th id="assigned"><%= t("repositories.table.assigned") %></th>
+      <% if @repository.is_a?(LinkedRepository) %>
+        <th id="row-external-id"><%= t('repositories.table.external_id') %></th>
+      <% end %>
       <th id="row-id"><%= t("repositories.table.id") %></th>
       <th id="row-name"><%= t("repositories.table.row_name") %></th>
       <th id="added-on"><%= t("repositories.table.added_on") %></th>
diff --git a/app/views/repositories/_repository_table.html.erb b/app/views/repositories/_repository_table.html.erb
index 0185e7041..f4b3f3ee5 100644
--- a/app/views/repositories/_repository_table.html.erb
+++ b/app/views/repositories/_repository_table.html.erb
@@ -40,10 +40,8 @@
         <th id="row-name"><%= t("repositories.table.row_name") %></th>
         <th id="added-on" ><%= t("repositories.table.added_on") %></th>
         <th id="added-by" ><%= t("repositories.table.added_by") %></th>
-        <% unless @repository.is_a?(BmtRepository) %>
-          <th id="archived-on"><%= t("repositories.table.archived_on") %></th>
-          <th id="archived-by"><%= t("repositories.table.archived_by") %></th>
-        <% end %>
+        <th id="archived-on"><%= t("repositories.table.archived_on") %></th>
+        <th id="archived-by"><%= t("repositories.table.archived_by") %></th>
         <% repository.repository_columns.order(:id).each do |column| %>
           <th
             class="repository-column"