From 9886e67ce365b61a61ac738aa02f70b4595431c1 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 26 Dec 2022 16:25:18 +0100
Subject: [PATCH] barcode: fix all the issues from PR review

---
 packages/nc-gui/components.d.ts                       |  1 -
 .../components/smartsheet/column/BarcodeOptions.vue   |  2 --
 .../components/virtual-cell/barcode/Barcode.vue       | 11 ++++++++---
 .../virtual-cell/barcode/JsBarcodeWrapper.vue         |  5 +++--
 packages/nc-gui/plugins/ant.ts                        |  2 --
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index d277e86503..d48defb626 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -201,7 +201,6 @@ declare module '@vue/runtime-core' {
     MdiLogin: typeof import('~icons/mdi/login')['default']
     MdiLogout: typeof import('~icons/mdi/logout')['default']
     MdiMagnify: typeof import('~icons/mdi/magnify')['default']
-    MdiMapMarker: typeof import('~icons/mdi/map-marker')['default']
     MdiMenu: typeof import('~icons/mdi/menu')['default']
     MdiMenuDown: typeof import('~icons/mdi/menu-down')['default']
     MdiMenuIcon: typeof import('~icons/mdi/menu-icon')['default']
diff --git a/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue b/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue
index 89b46b0b0c..1ef0bcc5c3 100644
--- a/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/BarcodeOptions.vue
@@ -72,8 +72,6 @@ setAdditionalValidations({
 })
 
 const showBarcodeValueColumnInfoIcon = computed(() => !columnsAllowedAsBarcodeValue.value?.length)
-
-// set default meta value
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
index 4c94447b8b..7b0b17b67a 100644
--- a/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
+++ b/packages/nc-gui/components/virtual-cell/barcode/Barcode.vue
@@ -7,9 +7,14 @@ const cellValue = inject(CellValueInj)
 
 const column = inject(ColumnInj)
 
-const barcodeValue = computed(() => String(cellValue?.value))
+const barcodeValue = computed(() => {
+  if (cellValue?.value === undefined) {
+    return undefined
+  }
+  return String(cellValue.value)
+})
 
-const tooManyCharsForBarcode = computed(() => barcodeValue?.value.length > maxNumberOfAllowedCharsForBarcodeValue)
+const tooManyCharsForBarcode = computed(() => barcodeValue?.value?.length > maxNumberOfAllowedCharsForBarcodeValue)
 
 const modalVisible = ref(false)
 
@@ -27,7 +32,7 @@ const barcodeMeta = $computed(() => {
 const handleModalOkClick = () => (modalVisible.value = false)
 
 const showBarcode = computed(() => {
-  return cellValue?.value?.length > 0 && !tooManyCharsForBarcode.value
+  return barcodeValue && barcodeValue?.value?.length > 0 && !tooManyCharsForBarcode.value
 })
 
 const { showEditNonEditableFieldWarning, showClearNonEditableFieldWarning } = useShowNotEditableWarning()
diff --git a/packages/nc-gui/components/virtual-cell/barcode/JsBarcodeWrapper.vue b/packages/nc-gui/components/virtual-cell/barcode/JsBarcodeWrapper.vue
index f52df105e8..94c1c48939 100644
--- a/packages/nc-gui/components/virtual-cell/barcode/JsBarcodeWrapper.vue
+++ b/packages/nc-gui/components/virtual-cell/barcode/JsBarcodeWrapper.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import JsBarcode from 'jsbarcode'
+import { onMounted } from '#imports'
 
 const props = defineProps({
   barcodeValue: { type: String, required: true },
@@ -7,6 +8,7 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['onClickBarcode'])
+
 const barcodeSvgRef = ref(null)
 const errorForCurrentInput = ref(false)
 
@@ -27,8 +29,7 @@ const onBarcodeClick = (ev: MouseEvent) => {
   emit('onClickBarcode')
 }
 
-watch(() => props.barcodeValue, generate)
-watch(() => props.barcodeFormat, generate)
+watch([() => props.barcodeValue, () => props.barcodeFormat], generate)
 onMounted(generate)
 </script>
 
diff --git a/packages/nc-gui/plugins/ant.ts b/packages/nc-gui/plugins/ant.ts
index b1b5b403ff..9c8a4e4e05 100644
--- a/packages/nc-gui/plugins/ant.ts
+++ b/packages/nc-gui/plugins/ant.ts
@@ -1,9 +1,7 @@
 import { Menu as AntMenu, Modal as AntModal, message } from 'ant-design-vue'
-// import VueBarcode from '@chenfengyuan/vue-barcode'
 import { defineNuxtPlugin } from '#imports'
 
 export default defineNuxtPlugin((nuxtApp) => {
-  // nuxtApp.vueApp.component(VueBarcode.name, VueBarcode)
   nuxtApp.vueApp.component(AntMenu.name, AntMenu)
   nuxtApp.vueApp.component(AntModal.name, AntModal)
   message.config({