refactor(Barcode scanner): new prop to allow hiding the scan tab. Use…

… in CA & PV Assistants. ref #1044 & #1137
openfoodfacts · Dec 25, 2024 · 3b7d9f9 · 3b7d9f9
1 parent 5ccaad4
commit 3b7d9f9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/components/BarcodeScannerDialog.vue b/src/components/BarcodeScannerDialog.vue
@@ -85,6 +85,10 @@ export default {
     ProductCard: defineAsyncComponent(() => import('../components/ProductCard.vue')),
   },
   props: {
+    hideBarcodeScannerTab: {
+      type: Boolean,
+      default: false
+    },
     barcodeManualInputMode: {
       type: String,
       default: 'search'  // 'add'
@@ -104,14 +108,19 @@ export default {
       barcodeManualFormValid: false,
       product: null,
       // config
-      displayItems: constants.PRODUCT_SELECTOR_DISPLAY_LIST,
       currentDisplay: null,  // see mounted
       HTML5_QRCODE_URL: 'https://github.com/mebjas/html5-qrcode',
       HTML5_QRCODE_NAME: 'html5-qrcode'
     }
   },
   computed: {
     ...mapStores(useAppStore),
+    displayItems() {
+      if (this.hideBarcodeScannerTab) {
+        return constants.PRODUCT_SELECTOR_DISPLAY_LIST.filter(item => item.key !== constants.PRODUCT_SELECTOR_DISPLAY_LIST[0].key)
+      }
+      return constants.PRODUCT_SELECTOR_DISPLAY_LIST
+    },
     barcodeManualInputRules() {
       return [
         (v) => !!v || '',
@@ -121,7 +130,11 @@ export default {
   watch: {
     currentDisplay(value) {
       if (value === constants.PRODUCT_SELECTOR_DISPLAY_LIST[0].key) {
-        window.setTimeout(() => this.createQrcodeScanner(), 200)
+        if (this.hideBarcodeScannerTab) {
+          this.currentDisplay = constants.PRODUCT_SELECTOR_DISPLAY_LIST[1].key
+        } else {
+          window.setTimeout(() => this.createQrcodeScanner(), 200)
+        }
       } else {  // type
         window.setTimeout(() => this.$refs.barcodeManualInput.focus(), 200)
         if (this.scanner && this.scanner.getState() > 1) {

diff --git a/src/components/ContributionAssistantPriceFormCard.vue b/src/components/ContributionAssistantPriceFormCard.vue
@@ -13,7 +13,7 @@
           />
         </v-col>
       </v-row>
-      <ProductInputRow :productForm="productPriceForm" :disableInitWhenSwitchingType="true" @filled="productFormFilled = $event" />
+      <ProductInputRow :productForm="productPriceForm" :disableInitWhenSwitchingType="true" :hideBarcodeScannerTab="true" @filled="productFormFilled = $event" />
       <PriceInputRow class="mt-0" :priceForm="productPriceForm" :hideCurrencyChoice="true" @filled="pricePriceFormFilled = $event" />
     </v-card-text>
     <v-divider v-if="mode === 'Validation'" />

diff --git a/src/components/ProductInputRow.vue b/src/components/ProductInputRow.vue
@@ -61,6 +61,7 @@
   <BarcodeScannerDialog
     v-if="barcodeScannerDialog"
     v-model="barcodeScannerDialog"
+    :hideBarcodeScannerTab="hideBarcodeScannerTab"
     :barcodeManualInputPrefillValue="productForm.product_code"
     @barcode="setProductCode($event)"
     @close="barcodeScannerDialog = false"
@@ -96,6 +97,10 @@ export default {
     disableInitWhenSwitchingType: {
       type: Boolean,
       default: () => false
+    },
+    hideBarcodeScannerTab: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ['filled'],