From f87b42d0429b7ca3621dabc686b58b969e565d70 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Thu, 6 Oct 2022 11:53:12 +0200
Subject: [PATCH] Remove icon from the status repository column at label print
 time [SCI-7267] (#4471)

* Remove icon from the status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]
---
 app/models/repository_status_value.rb          |  4 ++++
 .../label_templates/repository_row_service.rb  | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/models/repository_status_value.rb b/app/models/repository_status_value.rb
index 42b7fa408..386426531 100644
--- a/app/models/repository_status_value.rb
+++ b/app/models/repository_status_value.rb
@@ -19,6 +19,10 @@ class RepositoryStatusValue < ApplicationRecord
     data
   end
 
+  def formatted_status
+    repository_status_item&.status
+  end
+
   def self.add_filter_condition(repository_rows, join_alias, filter_element)
     items_join_alias = "#{join_alias}_status_items"
     repository_rows =
diff --git a/app/services/label_templates/repository_row_service.rb b/app/services/label_templates/repository_row_service.rb
index 3445182cc..1cbd432f0 100644
--- a/app/services/label_templates/repository_row_service.rb
+++ b/app/services/label_templates/repository_row_service.rb
@@ -31,6 +31,19 @@ module LabelTemplates
 
     private
 
+    def fetch_custom_column_value(name)
+      repository_cell = @repository_row.repository_cells.joins(:repository_column).find_by(
+        repository_columns: { name: name }
+      )
+      return '' unless repository_cell
+
+      if repository_cell.value_type == 'RepositoryStatusValue'
+        repository_cell.value.formatted_status
+      else
+        repository_cell.value.formatted
+      end
+    end
+
     def fetch_value(key)
       case key
       when /^c_(.*)/
@@ -41,10 +54,7 @@ module LabelTemplates
 
         return '' unless @print_mode
 
-        repository_cell = @repository_row.repository_cells.joins(:repository_column).find_by(
-          repository_columns: { name: name }
-        )
-        repository_cell ? repository_cell.value.formatted : ''
+        fetch_custom_column_value(name)
       when 'ITEM_ID'
         @repository_row.code
       when 'NAME'