From 9d9b454dc41977d102ec8f0b14dc3124c5cd62de Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Thu, 25 May 2023 11:18:47 +0400
Subject: [PATCH 1/2] CSS: inventory items top toolbar issues [SCI-8464]

---
 .../repositories/repository_datatable.js      |  1 -
 .../javascripts/repository_columns/index.js   | 31 +++++++++----------
 .../repository/repository_toolbar.scss        |  1 -
 .../repositories/_toolbar_buttons.html.erb    |  7 +++++
 app/views/repositories/show.html.erb          |  7 -----
 config/locales/en.yml                         |  2 +-
 6 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index c0b44e72f..a0311fb63 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -81,7 +81,6 @@ var RepositoryDatatable = (function(global) {
 
       if (rowsSelected.length !== 0) {
         $('#editRepositoryRecord').prop('disabled', !allSelectedRowsAreOnPage());
-        $('#importRecordsButton').hide();
 
         if (rowsSelected.some(r=> rowsLocked.indexOf(r) >= 0)) { // Some selected rows is rowsLocked
           $('#editRepositoryRecord').prop('disabled', true);
diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index 0fe71a2d0..cd50db758 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -386,7 +386,8 @@ var RepositoryColumns = (function() {
   }
 
   function initColumnsButton() {
-    $('.repo-datatables-buttons').on('click', '.manage-repo-column-index', function() {
+    $(document).on('click', '.manage-repo-column-index', function() {
+      console.log('aaa')
       var button = $(this);
       initManageColumnModal(button);
     });
@@ -394,21 +395,19 @@ var RepositoryColumns = (function() {
 
   return {
     init: () => {
-      if ($('.repo-datatables-buttons').length > 0) {
-        initColumnTypeSelector();
-        initCreateSubmitAction();
-        initEditSubmitAction();
-        initDeleteSubmitAction();
-        initBackToManageColumns();
-        initColumnsButton();
-        initManageColumnAction();
-        RepositoryListColumnType.init();
-        RepositoryStatusColumnType.init();
-        RepositoryStockColumnType.init();
-        RepositoryChecklistColumnType.init();
-        RepositoryDateTimeColumnType.init();
-        RepositoryDateColumnType.init();
-      }
+      initColumnTypeSelector();
+      initCreateSubmitAction();
+      initEditSubmitAction();
+      initDeleteSubmitAction();
+      initBackToManageColumns();
+      initColumnsButton();
+      initManageColumnAction();
+      RepositoryListColumnType.init();
+      RepositoryStatusColumnType.init();
+      RepositoryStockColumnType.init();
+      RepositoryChecklistColumnType.init();
+      RepositoryDateTimeColumnType.init();
+      RepositoryDateColumnType.init();
     }
   };
 }());
diff --git a/app/assets/stylesheets/repository/repository_toolbar.scss b/app/assets/stylesheets/repository/repository_toolbar.scss
index 7f02d847f..f6dc3ae19 100644
--- a/app/assets/stylesheets/repository/repository_toolbar.scss
+++ b/app/assets/stylesheets/repository/repository_toolbar.scss
@@ -3,7 +3,6 @@
 
 .repository-show {
   .repository-toolbar {
-    align-items: center;
     background-color: $color-white;
     display: flex;
     flex-grow: 1;
diff --git a/app/views/repositories/_toolbar_buttons.html.erb b/app/views/repositories/_toolbar_buttons.html.erb
index 357f306fd..df15eb5b0 100644
--- a/app/views/repositories/_toolbar_buttons.html.erb
+++ b/app/views/repositories/_toolbar_buttons.html.erb
@@ -76,5 +76,12 @@
         <%= render partial: 'repositories/toolbar/bmt' %>
       </div>
     <% end %>
+    <div class="repo-datatables-buttons">
+      <button class="btn btn-light manage-repo-column-index"
+              data-modal-url="<%= repository_repository_columns_path(@repository) %>"
+              data-action="new">
+        <span class="fas fa-columns">
+      </button>
+    </div>
   </div>
 </template>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index a8936d576..78db918e4 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -44,13 +44,6 @@
           <%= t('repositories.show.archived_inventory_items', repository_name: @repository.name) %>
         <% end %>
       </div>
-      <div class="repo-datatables-buttons">
-        <button class="btn btn-light manage-repo-column-index"
-                data-modal-url="<%= repository_repository_columns_path(@repository) %>"
-                data-action="new">
-          <span class="fas fa-columns">
-        </button>
-      </div>
       <div class="toolbar-delimiter"></div>
     </div>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 01fcc91e6..1bda8e9f9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1744,7 +1744,7 @@ en:
         active: "These are individually archived items from the %{repository_name} inventory. The inventory itself is active."
         archived_on: "Inventory archived on"
         archived_by: "by"
-      filter_inventory_items: "Filter items"
+      filter_inventory_items: "Search items"
       filter_inventory_items_with_ean: "Search with EAN code"
       no_items: "No items here"
       no_items_matched: "No items here"

From 038226fa19de5b8ec0e528c4b7bb63c73345a63c Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Fri, 26 May 2023 13:44:11 +0400
Subject: [PATCH 2/2] removed test code

---
 app/assets/javascripts/repository_columns/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js
index cd50db758..f89585a05 100644
--- a/app/assets/javascripts/repository_columns/index.js
+++ b/app/assets/javascripts/repository_columns/index.js
@@ -387,7 +387,6 @@ var RepositoryColumns = (function() {
 
   function initColumnsButton() {
     $(document).on('click', '.manage-repo-column-index', function() {
-      console.log('aaa')
       var button = $(this);
       initManageColumnModal(button);
     });