From c335accffb30731b089023bced8b94f6e762b215 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 25 Mar 2024 12:42:48 +0100
Subject: [PATCH] refs #6905 fix translation and warnings

---
 src/components/FetchData.vue             |  3 +++
 src/components/UserPanel.vue             | 25 +++++-------------------
 src/components/common/VnSelectFilter.vue |  6 +++---
 src/i18n/en/index.js                     |  5 +++++
 src/i18n/es/index.js                     |  5 +++++
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 5b3dcbea7..6d4e79f24 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
     }
 }
 </script>
+<template>
+    <template></template>
+</template>
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 8b3731478..5c143740e 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -173,14 +173,14 @@ function copyUserToken() {
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
                 <VnSelectFilter
-                    :label="t('localWarehouse')"
+                    :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
                 />
                 <VnSelectFilter
-                    :label="t('localBank')"
+                    :label="t('components.userPanel.localBank')"
                     hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
@@ -190,7 +190,7 @@ function copyUserToken() {
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    :label="t('localCompany')"
+                    :label="t('components.userPanel.localCompany')"
                     hide-selected
                     v-model="user.companyFk"
                     :options="companiesData"
@@ -198,7 +198,7 @@ function copyUserToken() {
                     option-value="id"
                 />
                 <VnSelectFilter
-                    :label="t('userWarehouse')"
+                    :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
                     :options="warehousesData"
@@ -208,7 +208,7 @@ function copyUserToken() {
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    :label="t('userCompany')"
+                    :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"
                     :options="companiesData"
@@ -228,18 +228,3 @@ function copyUserToken() {
     }
 }
 </style>
-
-<i18n>
-    en:
-        localWarehouse: Local warehouse
-        localBank: Local bank
-        localCompany: Local company
-        userWarehouse: User warehouse
-        userCompany: User company
-    es:
-        localWarehouse: Almacén local
-        localBank: Banco local
-        localCompany: Empresa local
-        userWarehouse: Almacén del usuario
-        userCompany: Empresa del usuario
-</i18n>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4903a5327..480d36e4f 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -51,8 +51,8 @@ const $props = defineProps({
         default: null,
     },
     limit: {
-        type: Number,
-        default: 30,
+        type: [Number, String],
+        default: '30',
     },
 });
 
@@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
         :limit="limit"
-        :order-by="orderBy"
+        :sort-by="sortBy"
         :fields="fields"
     />
     <QSelect
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a9ce1a6ed..4e959702b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1203,6 +1203,11 @@ export default {
             copyToken: 'Token copied to clipboard',
             settings: 'Settings',
             logOut: 'Log Out',
+            localWarehouse: 'Local warehouse',
+            localBank: 'Local bank',
+            localCompany: 'Local company',
+            userWarehouse: 'User warehouse',
+            userCompany: 'User company',
         },
         smartCard: {
             downloadFile: 'Download file',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0977448fb..54db98f66 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1203,6 +1203,11 @@ export default {
             copyToken: 'Token copiado al portapapeles',
             settings: 'Configuración',
             logOut: 'Cerrar sesión',
+            localWarehouse: 'Almacén local',
+            localBank: 'Banco local',
+            localCompany: 'Empresa local',
+            userWarehouse: 'Almacén del usuario',
+            userCompany: 'Empresa del usuario',
         },
         smartCard: {
             downloadFile: 'Descargar archivo',