From 31b075ea8c6af7a52cb3e5403bc749753cc7fcb0 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 25 Oct 2022 15:54:05 +0200
Subject: [PATCH] Fix label preview double refresh and unit issues [SCI-7396]

---
 .../vue/label_template/components/label_preview.vue   | 11 ++++++-----
 .../vue/repository_print_modal/container.vue          | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/javascript/vue/label_template/components/label_preview.vue b/app/javascript/vue/label_template/components/label_preview.vue
index 4d6112380..4e51c41d3 100644
--- a/app/javascript/vue/label_template/components/label_preview.vue
+++ b/app/javascript/vue/label_template/components/label_preview.vue
@@ -101,7 +101,7 @@
         DPMM_RESOLUTION_OPTIONS,
         DPI_RESOLUTION_OPTIONS,
         optionsOpen: false,
-        width: this.template.attributes.unit == 'in' ? this.template.attributes.width_mm / 25.4 : this.template.attributes.width_mm ,
+        width: this.template.attributes.unit == 'in' ? this.template.attributes.width_mm / 25.4 : this.template.attributes.width_mm,
         height: this.template.attributes.unit == 'in' ? this.template.attributes.height_mm / 25.4 : this.template.attributes.height_mm,
         unit: this.template.attributes.unit,
         density: this.template.attributes.density,
@@ -125,19 +125,16 @@
     },
     watch: {
       unit() {
-        this.recalculateUnits();
         this.setDefaults();
       },
       zpl() {
         this.refreshPreview();
       },
       template() {
+        this.unit = this.template.attributes.unit
         this.width = this.template.attributes.unit == 'in' ? this.template.attributes.width_mm / 25.4 : this.template.attributes.width_mm
         this.height = this.template.attributes.unit == 'in' ? this.template.attributes.height_mm / 25.4 : this.template.attributes.height_mm
-        this.unit = this.template.attributes.unit
         this.density = this.template.attributes.density
-
-        this.refreshPreview()
       }
     },
     methods: {
@@ -159,6 +156,8 @@
       refreshPreview() {
         if (this.zpl.length === 0) return;
 
+        this.base64Image = null;
+
         $.ajax({
           url: this.previewUrl,
           type: 'GET',
@@ -184,7 +183,9 @@
         });
       },
       updateUnit(unit) {
+        if (this.unit === unit) return;
         this.unit = unit;
+        this.recalculateUnits();
         this.$emit('unit:update', this.unit);
       },
       updateDensity(density) {
diff --git a/app/javascript/vue/repository_print_modal/container.vue b/app/javascript/vue/repository_print_modal/container.vue
index 47d273b85..57dfb279d 100644
--- a/app/javascript/vue/repository_print_modal/container.vue
+++ b/app/javascript/vue/repository_print_modal/container.vue
@@ -2,7 +2,7 @@
   <div ref="modal" class="modal fade" id="modal-print-repository-row-label" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
-        <div v-if="printers_dropdown.length > 0" class="printers-available">
+        <div v-if="availablePrinters.length > 0" class="printers-available">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <p class="modal-title">
@@ -24,7 +24,7 @@
               </label>
               <DropdownSelector
                 :disableSearch="true"
-                :options="printers_dropdown"
+                :options="availablePrinters"
                 :selectorId="`LabelPrinterSelector`"
                 @dropdown:changed="selectPrinter"
               />
@@ -38,7 +38,7 @@
               <DropdownSelector
                 ref="labelTemplateDropdown"
                 :disableSearch="true"
-                :options="templates_dropdown"
+                :options="availableTemplates"
                 :selectorId="`LabelTemplateSelector`"
                 :optionLabel="templateOption"
                 :onOpen="initTooltip"
@@ -138,7 +138,7 @@
       }
     },
     computed: {
-      templates_dropdown() {
+      availableTemplates() {
         let templates = this.templates;
         if (this.selectedPrinter && this.selectedPrinter.attributes.type_of === 'zebra') {
           templates = templates.filter(i => i.attributes.type === 'ZebraLabelTemplate')
@@ -155,7 +155,7 @@
           }
         })
       },
-      printers_dropdown() {
+      availablePrinters() {
         return this.printers.map(i => {
           return {
             value: i.id,