From 9d48cbbb8619972d36fa78827ea57abf51a5b282 Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Wed, 31 Jan 2024 11:10:11 +0100
Subject: [PATCH] Improve error handling for label printing [SCI-10039] (#6997)

---
 app/assets/javascripts/sitewide/zebra_print.js     |  4 +++-
 .../vue/repository_print_modal/container.vue       | 14 ++++++++++++--
 .../label_templates/repository_row_service.rb      |  2 +-
 config/locales/en.yml                              |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/sitewide/zebra_print.js b/app/assets/javascripts/sitewide/zebra_print.js
index 25d94b5d1..b5dc1d20b 100644
--- a/app/assets/javascripts/sitewide/zebra_print.js
+++ b/app/assets/javascripts/sitewide/zebra_print.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 /* eslint-disable no-undef */
-/* global I18n */
+/* global HelperModule I18n */
 /* eslint-disable no-unused-vars, no-use-before-define */
 
 /* config = {
@@ -218,6 +218,8 @@ var zebraPrint = (function() {
             updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
           }
         });
+      }).fail(() => {
+        HelperModule.flashAlertMsg(I18n.t('repository_row.modal_print_label.general_error'), 'danger');
       });
     }
   };
diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue
index bcd560ffb..4b437b0ab 100644
--- a/app/javascript/vue/repository_print_modal/container.vue
+++ b/app/javascript/vue/repository_print_modal/container.vue
@@ -91,6 +91,8 @@
 </template>
 
 <script>
+/* global HelperModule */
+
 import DropdownSelector from '../shared/dropdown_selector.vue';
 import LabelPreview from '../label_template/components/label_preview.vue';
 
@@ -203,8 +205,14 @@ export default {
         this.labelTemplateError = null;
         this.labelTemplateCode = result.label_code;
       }).fail((result) => {
-        this.labelTemplateError = result.responseJSON.error;
-        this.labelTemplateCode = result.responseJSON.label_code;
+        if (result.responseJSON) {
+          this.labelTemplateError = result.responseJSON.error;
+          this.labelTemplateCode = result.responseJSON.label_code;
+        } else {
+          this.labelTemplateError = null;
+          this.labelTemplateCode = null;
+          HelperModule.flashAlertMsg(this.i18n.t('repository_row.modal_print_label.general_error'), 'danger');
+        }
       });
     },
     submitPrint() {
@@ -233,6 +241,8 @@ export default {
             $(this.$refs.modal).modal('hide');
             this.$emit('close');
             PrintProgressModal.init(data);
+          }).fail(() => {
+            HelperModule.flashAlertMsg(this.i18n.t('repository_row.modal_print_label.general_error'), 'danger');
           });
         }
       });
diff --git a/app/services/label_templates/repository_row_service.rb b/app/services/label_templates/repository_row_service.rb
index 912386e0e..ea0282478 100644
--- a/app/services/label_templates/repository_row_service.rb
+++ b/app/services/label_templates/repository_row_service.rb
@@ -17,7 +17,7 @@ module LabelTemplates
       errors = []
       keys = @label_template.content.scan(/(?<=\{\{).*?(?=\}\})/).uniq
       label = keys.reduce(@label_template.content.dup) do |rendered_content, key|
-        rendered_content.gsub!(/\{\{#{key}\}\}/, fetch_value(key))
+        rendered_content.gsub!(Regexp.new(Regexp.escape("{{#{key}}}")), fetch_value(key))
       rescue LabelTemplates::ColumnNotFoundError,
              LabelTemplates::LogoNotFoundError,
              LabelTemplates::LogoParamsError => e
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 692312ca3..38750522d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2584,6 +2584,7 @@ en:
         title: "There seems to be no printer available"
         description: "To learn more about printing labels and label printers please visit our blog."
         visit_blog: "Visit blog"
+      general_error: "Something went wrong"
     reminder:
       clear: "Clear"
       low_stock_title: "Item running low"