Merge pull request '#8582 - test: e2e monitorTicket' (!1391) from e2e_monitor into dev

Reviewed-on: #1391
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

.eslintignore

@@ -1,6 +0,0 @@
-/dist
-/src-capacitor
-/src-cordova
-/.quasar
-/node_modules
-.eslintrc.js

.eslintrc.js

@@ -1,75 +0,0 @@
-export default {
-    // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
-    // This option interrupts the configuration hierarchy at this file
-    // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
-    root: true,
-
-    parserOptions: {
-        ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
-    },
-
-    env: {
-        node: true,
-        browser: true,
-        'vue/setup-compiler-macros': true,
-    },
-
-    // Rules order is important, please avoid shuffling them
-    extends: [
-        // Base ESLint recommended rules
-        'eslint:recommended',
-
-        // Uncomment any of the lines below to choose desired strictness,
-        // but leave only one uncommented!
-        // See https://eslint.vuejs.org/rules/#available-rules
-        // 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
-        'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
-        // 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
-
-        // https://github.com/prettier/eslint-config-prettier#installation
-        // usage with Prettier, provided by 'eslint-config-prettier'.
-        'prettier',
-    ],
-
-    plugins: [
-        // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
-        // required to lint *.vue files
-        'vue',
-
-        // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
-        // Prettier has not been included as plugin to avoid performance impact
-        // add it as an extension for your IDE
-    ],
-
-    globals: {
-        ga: 'readonly', // Google Analytics
-        cordova: 'readonly',
-        __statics: 'readonly',
-        __QUASAR_SSR__: 'readonly',
-        __QUASAR_SSR_SERVER__: 'readonly',
-        __QUASAR_SSR_CLIENT__: 'readonly',
-        __QUASAR_SSR_PWA__: 'readonly',
-        process: 'readonly',
-        Capacitor: 'readonly',
-        chrome: 'readonly',
-    },
-
-    // add your custom rules here
-    rules: {
-        'prefer-promise-reject-errors': 'off',
-        'no-unused-vars': 'warn',
-        'vue/no-multiple-template-root': 'off',
-        // allow debugger during development only
-        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    },
-    overrides: [
-        {
-            files: ['test/cypress/**/*.*'],
-            extends: [
-                // Add Cypress-specific lint rules, globals and Cypress plugin
-                // See https://github.com/cypress-io/eslint-plugin-cypress#rules
-                'plugin:cypress/recommended',
-            ],
-        },
-    ],
-};

.eslintrc.json

@@ -0,0 +1,3 @@
+{
+    "extends": ["plugin:cypress/recommended"]
+}

Jenkinsfile

@@ -125,8 +125,10 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
+                            def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
+                            echo "E2E MODULES: ${modules}"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 1'
+                                sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
                             }
                         }
                     }
@@ -183,3 +185,4 @@ pipeline {
         }
     }
 }
+

eslint.config.js

@@ -0,0 +1,87 @@
+import cypress from 'eslint-plugin-cypress';
+import eslint from 'eslint-plugin-import';
+import globals from 'globals';
+import js from '@eslint/js';
+import vue from 'eslint-plugin-vue';
+export default {
+    plugins: { vue, eslint, cypress },
+    languageOptions: {
+        globals: {
+            ...globals.node,
+            ...globals.browser,
+            ...vue.configs['vue3-strongly-recommended'].globals,
+            ...cypress.environments.globals.globals,
+            ga: 'readonly',
+            cordova: 'readonly',
+            __statics: 'readonly',
+            __QUASAR_SSR__: 'readonly',
+            __QUASAR_SSR_SERVER__: 'readonly',
+            __QUASAR_SSR_CLIENT__: 'readonly',
+            __QUASAR_SSR_PWA__: 'readonly',
+            process: 'readonly',
+            Capacitor: 'readonly',
+            chrome: 'readonly',
+        },
+
+        ecmaVersion: 2020,
+        sourceType: 'module',
+
+        parserOptions: {
+            parser: '@babel/eslint-parser',
+        },
+    },
+    rules: {
+        ...vue.rules['flat/strongly-recommended'],
+        ...js.configs.recommended.rules,
+        semi: 'off',
+        'generator-star-spacing': 'warn',
+        'arrow-parens': 'warn',
+        'no-var': 'error',
+        'prefer-const': 'error',
+        'prefer-template': 'warn',
+        'prefer-destructuring': 'off',
+        'prefer-spread': 'warn',
+        'prefer-rest-params': 'warn',
+        'prefer-object-spread': 'warn',
+        'prefer-arrow-callback': 'warn',
+        'prefer-numeric-literals': 'warn',
+        'prefer-exponentiation-operator': 'warn',
+        'prefer-regex-literals': 'warn',
+        'one-var': [
+            'error',
+            {
+                let: 'never',
+                const: 'never',
+            },
+        ],
+        'no-void': 'off',
+        'prefer-promise-reject-errors': 'error',
+        'multiline-ternary': 'warn',
+        'no-restricted-imports': 'warn',
+        'no-import-assign': 'warn',
+        'no-duplicate-imports': 'warn',
+        'no-useless-rename': 'warn',
+        'eslint/no-named-as-default': 'warn',
+        'eslint/no-named-as-default-member': 'warn',
+        'no-unsafe-optional-chaining': 'warn',
+        'no-undef': 'error',
+        'no-unused-vars': 'error',
+        'no-console': 'error',
+        'no-debugger': 'error',
+        'no-useless-escape': 'error',
+        'no-prototype-builtins': 'error',
+        'no-async-promise-executor': 'error',
+        'no-irregular-whitespace': 'error',
+        'no-constant-condition': 'error',
+        'no-unsafe-finally': 'error',
+        'no-extend-native': 'error',
+    },
+    ignores: [
+        '/dist',
+        '/src-capacitor',
+        '/src-cordova',
+        '/.quasar',
+        '/node_modules',
+        '.eslintrc.js',
+    ],
+};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.14.0",
+    "version": "25.18.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -9,7 +9,8 @@
     "type": "module",
     "scripts": {
         "resetDatabase": "cd ../salix && gulp docker",
-        "lint": "eslint --ext .js,.vue ./",
+        "lint": "eslint \"**/*.{vue,js}\" ",
+        "lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
         "test:e2e": "cypress open",
         "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
@@ -17,6 +18,8 @@
         "test:e2e:summary": "bash ./test/cypress/summary.sh",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:front": "vitest",
+        "test:ui": "vitest --ui",
+        "test:coverage": "vitest run --coverage",
         "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
@@ -26,43 +29,53 @@
         "docs:preview": "vitepress preview docs"
     },
     "dependencies": {
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
         "@quasar/cli": "^2.4.1",
         "@quasar/extras": "^1.16.16",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
+        "es-module-lexer": "^1.6.0",
+        "fast-glob": "^3.3.3",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
         "quasar": "^2.17.7",
         "validator": "^13.9.0",
         "vue": "^3.5.13",
-        "vue-i18n": "^9.3.0",
+        "vue-i18n": "^9.4.0",
         "vue-router": "^4.2.5"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
+        "@intlify/unplugin-vue-i18n": "^4.0.0",
         "@pinia/testing": "^0.1.2",
         "@quasar/app-vite": "^2.0.8",
         "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vitest/ui": "3.1.1",
+        "@vue/compiler-sfc": "^3.5.13",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^14.1.0",
         "cypress-mochawesome-reporter": "^3.8.2",
         "eslint": "^9.18.0",
         "eslint-config-prettier": "^10.0.1",
+        "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-vue": "^9.32.0",
+        "globals": "^16.0.0",
         "husky": "^8.0.0",
         "junit-merge": "^2.0.0",
         "mocha": "^11.1.0",
         "postcss": "^8.4.23",
         "prettier": "^3.4.2",
         "sass": "^1.83.4",
-        "vitepress": "^1.6.3",
+        "vitest": "^3.0.3",
-        "vitest": "^0.34.0",
         "xunit-viewer": "^10.6.1"
     },
     "engines": {

quasar.config.js

@@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
         build: {
             target: {
                 browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
-                node: 'node18',
+                node: 'node20',
             },
 
             vueRouterMode: 'hash', // available values: 'hash', 'history'
@@ -92,6 +92,7 @@ export default configure(function (/* ctx */) {
             vitePlugins: [
                 [
                     VueI18nPlugin({
+                        strictMessage: false,
                         runtimeOnly: false,
                         include: [
                             path.resolve(__dirname, './src/i18n/locale/**'),

quasar.config.js.temporary.compiled.1744020058024.mjs

@@ -0,0 +1,227 @@
+/* eslint-disable */
+/**
+ * THIS FILE IS GENERATED AUTOMATICALLY.
+ * 1. DO NOT edit this file directly as it won't do anything.
+ * 2. EDIT the original quasar.config file INSTEAD.
+ * 3. DO NOT git commit this file. It should be ignored.
+ *
+ * This file is still here because there was an error in
+ * the original quasar.config file and this allows you to
+ * investigate the Node.js stack error.
+ *
+ * After you fix the original file, this file will be
+ * deleted automatically.
+ **/
+
+
+// quasar.config.js
+import { configure } from "quasar/wrappers";
+import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
+import path from "path";
+var __quasar_inject_dirname__ = "/home/jsegarra/Projects/salix-front";
+var target = `http://${process.env.CI ? "back" : "localhost"}:3000`;
+var quasar_config_default = configure(function() {
+  return {
+    eslint: {
+      // fix: true,
+      // include = [],
+      // exclude = [],
+      // rawOptions = {},
+      warnings: true,
+      errors: true
+    },
+    // https://v2.quasar.dev/quasar-cli/prefetch-feature
+    // preFetch: true,
+    // app boot file (/src/boot)
+    // --> boot files are part of "main.js"
+    // https://v2.quasar.dev/quasar-cli/boot-files
+    boot: ["i18n", "axios", "vnDate", "validations", "quasar", "quasar.defaults"],
+    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
+    css: ["app.scss"],
+    // https://github.com/quasarframework/quasar/tree/dev/extras
+    extras: [
+      // 'ionicons-v4',
+      // 'mdi-v5',
+      // 'fontawesome-v6',
+      // 'eva-icons',
+      // 'themify',
+      // 'line-awesome',
+      // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
+      "roboto-font",
+      "material-icons-outlined",
+      "material-symbols-outlined"
+    ],
+    // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
+    build: {
+      target: {
+        browser: ["es2022", "edge88", "firefox78", "chrome87", "safari13.1"],
+        node: "node20"
+      },
+      vueRouterMode: "hash",
+      // available values: 'hash', 'history'
+      // vueRouterBase,
+      // vueDevtools,
+      // vueOptionsAPI: false,
+      // rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
+      // publicPath: '/',
+      // analyze: true,
+      // env: {},
+      rawDefine: {
+        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
+      },
+      // ignorePublicFolder: true,
+      // minify: false,
+      // polyfillModulePreload: true,
+      // distDir
+      extendViteConf(viteConf) {
+        delete viteConf.build.polyfillModulePreload;
+        viteConf.build.modulePreload = {
+          polyfill: false
+        };
+      },
+      // viteVuePluginOptions: {},
+      alias: {
+        composables: path.join(__quasar_inject_dirname__, "./src/composables"),
+        filters: path.join(__quasar_inject_dirname__, "./src/filters")
+      },
+      vitePlugins: [
+        [
+          VueI18nPlugin({
+            strictMessage: false,
+            runtimeOnly: false,
+            include: [
+              path.resolve(__quasar_inject_dirname__, "./src/i18n/locale/**"),
+              path.resolve(__quasar_inject_dirname__, "./src/pages/**/locale/**")
+            ]
+          })
+        ]
+      ]
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
+    devServer: {
+      server: {
+        type: "http"
+      },
+      proxy: {
+        "/api": {
+          target,
+          logLevel: "debug",
+          changeOrigin: true,
+          secure: false
+        }
+      },
+      open: false,
+      allowedHosts: [
+        "front",
+        // Agrega este nombre de host
+        "localhost"
+        // Opcional, para pruebas locales
+      ]
+    },
+    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
+    framework: {
+      config: {
+        config: {
+          dark: "auto"
+        }
+      },
+      lang: "en-GB",
+      // iconSet: 'material-icons', // Quasar icon set
+      // lang: 'en-US', // Quasar language pack
+      // For special cases outside of where the auto-import strategy can have an impact
+      // (like functional components as one of the examples),
+      // you can manually specify Quasar components/directives to be available everywhere:
+      //
+      // components: [],
+      // directives: [],
+      // Quasar plugins
+      plugins: ["Notify", "Dialog"],
+      all: "auto",
+      autoImportComponentCase: "pascal"
+    },
+    // animations: 'all', // --- includes all animations
+    // https://v2.quasar.dev/options/animations
+    animations: [],
+    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
+    // sourceFiles: {
+    //   rootComponent: 'src/App.vue',
+    //   router: 'src/router/index',
+    //   store: 'src/store/index',
+    //   registerServiceWorker: 'src-pwa/register-service-worker',
+    //   serviceWorker: 'src-pwa/custom-service-worker',
+    //   pwaManifestFile: 'src-pwa/manifest.json',
+    //   electronMain: 'src-electron/electron-main',
+    //   electronPreload: 'src-electron/electron-preload'
+    // },
+    // https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
+    ssr: {
+      // ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
+      // will mess up SSR
+      // extendSSRWebserverConf (esbuildConf) {},
+      // extendPackageJson (json) {},
+      pwa: false,
+      // manualStoreHydration: true,
+      // manualPostHydrationTrigger: true,
+      prodPort: 3e3,
+      // The default port that the production server should use
+      // (gets superseded if process.env.PORT is specified at runtime)
+      middlewares: [
+        "render"
+        // keep this as last one
+      ]
+    },
+    // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
+    pwa: {
+      workboxMode: "generateSW",
+      // or 'injectManifest'
+      injectPwaMetaTags: true,
+      swFilename: "sw.js",
+      manifestFilename: "manifest.json",
+      useCredentialsForManifestTag: false
+      // useFilenameHashes: true,
+      // extendGenerateSWOptions (cfg) {}
+      // extendInjectManifestOptions (cfg) {},
+      // extendManifestJson (json) {}
+      // extendPWACustomSWConf (esbuildConf) {}
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
+    cordova: {
+      // noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
+    capacitor: {
+      hideSplashscreen: true
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
+    electron: {
+      // extendElectronMainConf (esbuildConf)
+      // extendElectronPreloadConf (esbuildConf)
+      inspectPort: 5858,
+      bundler: "packager",
+      // 'packager' or 'builder'
+      packager: {
+        // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
+        // OS X / Mac App Store
+        // appBundleId: '',
+        // appCategoryType: '',
+        // osxSign: '',
+        // protocol: 'myapp://path',
+        // Windows only
+        // win32metadata: { ... }
+      },
+      builder: {
+        // https://www.electron.build/configuration/configuration
+        appId: "salix-frontend"
+      }
+    },
+    // Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
+    bex: {
+      contentScripts: ["my-content-script"]
+      // extendBexScriptsConf (esbuildConf) {}
+      // extendBexManifestJson (json) {}
+    }
+  };
+});
+export {
+  quasar_config_default as default
+};

src/App.vue

@@ -2,6 +2,7 @@
 import { onMounted } from 'vue';
 import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import VnScroll from './components/common/VnScroll.vue';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
@@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
 
 <template>
     <RouterView />
+    <VnScroll/>
 </template>
 
 <style lang="scss">

src/boot/__tests__/axios.spec.js

@@ -9,6 +9,30 @@ vi.mock('src/composables/useSession', () => ({
     }),
 }));
 
+// Mock axios
+vi.mock('axios', () => ({
+    default: {
+        create: vi.fn(() => ({
+            interceptors: {
+                request: { use: vi.fn() },
+                response: { use: vi.fn() },
+            },
+        })),
+        interceptors: {
+            request: { use: vi.fn() },
+            response: { use: vi.fn() },
+        },
+        defaults: {
+            baseURL: '',
+        },
+    },
+}));
+
+vi.mock('src/router', () => ({
+    Router: {
+        push: vi.fn(),
+    },
+}));
 vi.mock('src/stores/useStateQueryStore', () => ({
     useStateQueryStore: () => ({
         add: () => vi.fn(),
@@ -29,7 +53,7 @@ describe('Axios boot', () => {
                         'Accept-Language': 'en-US',
                         Authorization: 'DEFAULT_TOKEN',
                     },
-                })
+                }),
             );
         });
     });

src/boot/quasar.defaults.js

@@ -1,3 +1,4 @@
+/* eslint-disable eslint/export */
 export * from './defaults/qTable';
 export * from './defaults/qInput';
 export * from './defaults/qSelect';

src/components/CrudModel.vue

@@ -332,6 +332,7 @@ watch(formUrl, async () => {
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
                 v-if="$props.defaultRemove"
+                data-cy="crudModelDefaultRemoveBtn"
             />
             <QBtn
                 :label="tMobile('globals.reset')"

src/components/FormModel.vue

@@ -13,13 +13,12 @@ import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getDifferences, getUpdatedValues } from 'src/filters';
-
 const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { validate } = useValidator();
+const { validate, validations } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
@@ -119,7 +118,7 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: async () => await save(),
+        click: async (evt) => submitForm(evt),
         type: 'submit',
     },
     reset: {
@@ -132,6 +131,13 @@ const defaultButtons = computed(() => ({
     ...$props.defaultButtons,
 }));
 
+const submitForm = async (evt) => {
+    const isFormValid = await myForm.value.validate();
+    if (isFormValid) {
+        await save(evt);
+    }
+};
+
 onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
@@ -227,10 +233,9 @@ async function save() {
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
-        let response;
+        const response = await Promise.resolve(
-
+            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
-        if ($props.saveFn) response = await $props.saveFn(body);
+        );
-        else response = await axios[method](url, body);
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
@@ -307,11 +312,13 @@ async function onKeyup(evt) {
             selectionStart = selectionEnd = selectionStart + 1;
             return;
         }
-        await save();
+        await myForm.value.submit(evt);
     }
 }
 
 defineExpose({
+    submitForm,
+    myForm,
     save,
     isLoading,
     hasChanges,
@@ -325,7 +332,7 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit.prevent
+            @submit.prevent="save"
             @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
@@ -339,6 +346,7 @@ defineExpose({
                     name="form"
                     :data="formData"
                     :validate="validate"
+                    :validations="validations()"
                     :filter="filter"
                 />
                 <SkeletonForm v-else />
@@ -398,6 +406,7 @@ defineExpose({
             </QBtnDropdown>
             <QBtn
                 v-else
+                data-cy="saveDefaultBtn"
                 :label="tMobile('globals.save')"
                 color="primary"
                 icon="save"

src/components/FormModelPopup.vue

@@ -41,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async (saveAndContinue) => {
+const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
+    await formModelRef.value.myForm.validate(true);
     isSaveAndContinue.value = saveAndContinue;
-    await formModelRef.value.save();
+    if (formModelRef.value) {
+        await formModelRef.value.submitForm();
+    }
 };
 
 defineExpose({
@@ -59,16 +62,23 @@ defineExpose({
         ref="formModelRef"
         :observe-form-changes="false"
         :default-actions="false"
+        @submit="onClick"
         v-bind="$attrs"
         @on-data-saved="onDataSaved"
+        :prevent-submit="false"
     >
-        <template #form="{ data, validate }">
+        <template #form="{ data, validate, validations }">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
             <p>{{ subtitle }}</p>
-            <slot name="form-inputs" :data="data" :validate="validate" />
+            <slot
+                name="form-inputs"
+                :data="data"
+                :validate="validate"
+                :validations="validations"
+            />
             <div class="q-mt-lg row justify-end">
                 <QBtn
                     :label="t('globals.cancel')"
@@ -87,12 +97,13 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="onClick(false)"
+                    :type="!showSaveAndContinueBtn ? 'submit' : 'button'"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_save"
+                    @click="showSaveAndContinueBtn ? onClick(false) : null"
                     z-max
                 />
                 <QBtn
@@ -100,12 +111,13 @@ defineExpose({
                     :label="t('globals.isSaveAndContinue')"
                     :title="t('globals.isSaveAndContinue')"
                     color="primary"
+                    :type="showSaveAndContinueBtn ? 'submit' : 'button'"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
+                    @click="showSaveAndContinueBtn ? onClick(true) : null"
                     z-max
-                    @click="onClick(true)"
                 />
             </div>
         </template>

src/components/NavBar.vue

@@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="sm"
-                data-cy="loading-spinner"
+                data-cy="navBar-spinner"
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>

src/components/TicketProblems.vue

@@ -1,12 +1,22 @@
 <script setup>
 import { toCurrency } from 'src/filters';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
-defineProps({ row: { type: Object, required: true } });
+const { row, visibleProblems = null } = defineProps({
+    row: { type: Object, required: true },
+    visibleProblems: { type: Array },
+});
+
+function showProblem(problem) {
+    const val = getValueFromPath(row, problem);
+    if (!visibleProblems) return val;
+    return !!(visibleProblems?.includes(problem) && val);
+}
 </script>
 <template>
     <span class="q-gutter-x-xs">
         <router-link
-            v-if="row.claim?.claimFk"
+            v-if="showProblem('claim.claimFk')"
             :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
             class="link"
         >
@@ -18,18 +28,7 @@ defineProps({ row: { type: Object, required: true } });
             </QIcon>
         </router-link>
         <QIcon
-            v-if="row?.reserved"
+            v-if="showProblem('isDeleted')"
-            color="primary"
-            name="vn:reserva"
-            size="xs"
-            data-cy="ticketSaleReservedIcon"
-        >
-            <QTooltip>
-                {{ t('ticketSale.reserved') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row?.isDeleted"
             color="primary"
             name="vn:deletedTicket"
             size="xs"
@@ -40,7 +39,7 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasRisk"
+            v-if="showProblem('hasRisk')"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -51,51 +50,76 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasComponentLack"
+            v-if="showProblem('hasComponentLack')"
             name="vn:components"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+        <QIcon
+            v-if="showProblem('hasItemDelay')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemDelay"
+        >
             <QTooltip>
                 {{ $t('ticket.summary.hasItemDelay') }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+        <QIcon
+            v-if="showProblem('hasItemLost')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemLost"
+        >
             <QTooltip>
                 {{ $t('salesTicketsTable.hasItemLost') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasItemShortage"
+            v-if="showProblem('hasItemShortage')"
             name="vn:unavailable"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+        <QIcon
+            v-if="showProblem('hasRounding')"
+            color="primary"
+            name="sync_problem"
+            size="xs"
+        >
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasTicketRequest"
+            v-if="showProblem('hasTicketRequest')"
             name="vn:buyrequest"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTaxDataChecked')"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTooLittle')"
+            name="vn:isTooLittle"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/VnTable/VnColumn.vue

@@ -55,6 +55,8 @@ const $props = defineProps({
     },
 });
 
+const label = $props.showLabel && $props.column.label ? $props.column.label : '';
+
 const defaultSelect = {
     attrs: {
         row: $props.row,
@@ -62,7 +64,7 @@ const defaultSelect = {
         class: 'fit',
     },
     forceAttrs: {
-        label: $props.showLabel && $props.column.label,
+        label,
     },
 };
 
@@ -74,7 +76,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label: $props.showLabel && $props.column.label,
+            label,
         },
     },
     number: {
@@ -84,7 +86,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label: $props.showLabel && $props.column.label,
+            label,
         },
     },
     date: {
@@ -96,7 +98,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label: $props.showLabel && $props.column.label,
+            label,
         },
     },
     time: {
@@ -105,7 +107,7 @@ const defaultComponents = {
             disable: !$props.isEditable,
         },
         forceAttrs: {
-            label: $props.showLabel && $props.column.label,
+            label,
         },
     },
     checkbox: {
@@ -125,7 +127,7 @@ const defaultComponents = {
             return defaultAttrs;
         },
         forceAttrs: {
-            label: $props.showLabel && $props.column.label,
+            label,
             autofocus: true,
         },
         events: {

src/components/VnTable/VnOrder.vue

@@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
         :style="textAlignToFlex(align)"
     >
         <span :title="label">{{ label }}</span>
-        <div v-if="name && model?.index">
+        <div v-if="name && (model?.index || vertical)">
             <QChip
                 :label="!vertical ? model?.index : ''"
                 :icon="
@@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
                 :size="vertical ? '' : 'sm'"
                 :class="[
                     model?.index ? 'color-vn-text' : 'bg-transparent',
-                    vertical ? 'q-px-none' : '',
+                    vertical ? 'q-mx-none q-py-lg' : '',
                 ]"
                 class="no-box-shadow"
                 :clickable="true"
                 style="min-width: 40px; max-height: 30px"
             >
                 <div
-                    class="column flex-center"
+                    class="column justify-center text-center"
                     v-if="vertical"
                     :style="!model?.index && 'color: #5d5d5d'"
                 >

src/components/VnTable/VnTable.vue

@@ -19,6 +19,7 @@ import { useQuasar, date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
 import { dashIfEmpty, toDate } from 'src/filters';
+import { useTableHeight } from './filters/useTableHeight';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
@@ -32,6 +33,7 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
+import VnScroll from '../common/VnScroll.vue'
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -117,7 +119,7 @@ const $props = defineProps({
     },
     tableHeight: {
         type: String,
-        default: '90vh',
+        default: undefined,
     },
     footer: {
         type: Boolean,
@@ -166,6 +168,8 @@ const tableRef = ref();
 const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
 const app = inject('app');
+const tableHeight = useTableHeight();
+const vnScrollRef = ref(null);
 
 const editingRow = ref(null);
 const editingField = ref(null);
@@ -187,6 +191,17 @@ const tableModes = [
     },
 ];
 
+const onVirtualScroll = ({ to }) => {
+    handleScroll();
+    const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
+    if (virtualScrollContainer) {
+      virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
+      if (vnScrollRef.value) {
+        vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
+      }
+    }
+};
+
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -227,6 +242,7 @@ watch(
 
 defineExpose({
     create: createForm,
+    showForm,
     reload,
     redirect: redirectFn,
     selected,
@@ -324,16 +340,13 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
-
 function handleScroll() {
-    if ($props.crudModel.disableInfiniteScroll) return;
+    if ($props.crudModel.disableInfiniteScroll) return;		
-
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');		
-    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;		
-    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;		
-    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();		
-    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
-
 function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
@@ -666,9 +679,9 @@ const rowCtrlClickFunction = computed(() => {
                 ref="tableRef"
                 v-bind="table"
                 :class="[
-                    'vnTable',
+                  'vnTable',
-                    table ? 'selection-cell' : '',
+                  table ? 'selection-cell' : '',
-                    $props.footer ? 'last-row-sticky' : '',
+                  $props.footer ? 'last-row-sticky' : '',
                 ]"
                 wrap-cells
                 :columns="splittedColumns.columns"
@@ -678,9 +691,9 @@ const rowCtrlClickFunction = computed(() => {
                 table-header-class="bg-header"
                 card-container-class="grid-three"
                 flat
-                :style="isTableMode && `max-height: ${tableHeight}`"
+                :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="handleScroll"
+                @virtual-scroll="onVirtualScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
@@ -738,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
                                     withFilters
                                 "
                                 :column="col"
+                                :data-cy="`column-filter-${col.name}`"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
                                 v-model="params[columnName(col)]"
@@ -1042,7 +1056,7 @@ const rowCtrlClickFunction = computed(() => {
             :model="$attrs['data-key'] + 'Create'"
             @on-data-saved="(_, res) => createForm.onDataSaved(res)"
         >
-            <template #form-inputs="{ data }">
+            <template #form-inputs="{ data, validations }">
                 <slot name="alter-create" :data="data">
                     <div :style="createComplement?.containerStyle">
                         <div
@@ -1060,6 +1074,7 @@ const rowCtrlClickFunction = computed(() => {
                                 :key="column.name"
                                 :name="`column-create-${column.name}`"
                                 :data="data"
+                                :validations="validations"
                                 :column-name="column.name"
                                 :label="column.label"
                             >
@@ -1083,6 +1098,11 @@ const rowCtrlClickFunction = computed(() => {
             </template>
         </FormModelPopup>
     </QDialog>
+    <VnScroll 
+      ref="vnScrollRef"
+      v-if="isTableMode"
+      :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
+    />
 </template>
 <i18n>
 en:

src/components/VnTable/VnTableFilter.vue

@@ -26,7 +26,12 @@ function columnName(col) {
 }
 </script>
 <template>
-    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
+    <VnFilterPanel
+        v-bind="$attrs"
+        :search-button="true"
+        :disable-submit-event="true"
+        :search-url
+    >
         <template #body="{ params, orders, searchFn }">
             <div
                 class="container"
@@ -34,13 +39,20 @@ function columnName(col) {
                 :key="col.id"
             >
                 <div class="filter">
-                    <VnFilter
+                    <slot
-                        ref="tableFilterRef"
+                        :name="`filter-${col.name}`"
-                        :column="col"
+                        :params="params"
-                        :data-key="$attrs['data-key']"
+                        :column-name="columnName(col)"
-                        v-model="params[columnName(col)]"
+                        :search-fn
-                        :search-url="searchUrl"
+                    >
-                    />
+                        <VnFilter
+                            ref="tableFilterRef"
+                            :column="col"
+                            :data-key="$attrs['data-key']"
+                            v-model="params[columnName(col)]"
+                            :search-url="searchUrl"
+                        />
+                    </slot>
                 </div>
                 <div class="order">
                     <VnTableOrder
@@ -77,13 +89,13 @@ function columnName(col) {
     display: flex;
     justify-content: center;
     align-items: center;
-    height: 45px;
+    min-height: 45px;
     gap: 10px;
 }
 
 .filter {
     width: 70%;
-    height: 40px;
+    min-height: 40px;
     text-align: center;
 }
 .order {

src/components/VnTable/__tests__/VnVisibleColumns.spec.js

@@ -1,8 +1,7 @@
 import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnVisibleColumn from '../VnVisibleColumn.vue';
-import { axios } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
-
 describe('VnVisibleColumns', () => {
     let wrapper;
     let vm;

src/components/VnTable/filters/useTableHeight.js

@@ -0,0 +1,18 @@
+import { onMounted, nextTick, ref } from 'vue';
+
+export function useTableHeight() {
+    const tableHeight = ref('90vh');
+
+    onMounted(async () => {
+        await nextTick();
+        let height = 100;
+        Array.from(document.querySelectorAll('[role="toolbar"]'))
+            .filter((element) => window.getComputedStyle(element).display !== 'none')
+            .forEach(() => {
+                height -= 10;
+            });
+        tableHeight.value = `${height}vh`;
+    });
+
+    return tableHeight;
+}

src/components/__tests__/CrudModel.spec.js

@@ -1,4 +1,6 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 

src/components/__tests__/EditTableCellValueForm.spec.js

@@ -1,56 +0,0 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import EditForm from 'components/EditTableCellValueForm.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
-
-const fieldA = 'fieldA';
-const fieldB = 'fieldB';
-
-describe('EditForm', () => {
-    let vm;
-    const mockRows = [
-        { id: 1, itemFk: 101 },
-        { id: 2, itemFk: 102 },
-    ];
-    const mockFieldsOptions = [
-        { label: 'Field A', field: fieldA, component: 'input', attrs: {} },
-        { label: 'Field B', field: fieldB, component: 'date', attrs: {} },
-    ];
-    const editUrl = '/api/edit';
-
-    beforeAll(() => {
-        vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
-        vm = createWrapper(EditForm, {
-            props: {
-                rows: mockRows,
-                fieldsOptions: mockFieldsOptions,
-                editUrl,
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('onSubmit()', () => {
-        it('should call axios.post with the correct parameters in the payload', async () => {
-            const selectedField = { field: fieldA, component: 'input', attrs: {} };
-            const newValue = 'Test Value';
-
-            vm.selectedField = selectedField;
-            vm.newValue = newValue;
-
-            await vm.onSubmit();
-
-            const payload = axios.post.mock.calls[0][1];
-
-            expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
-            expect(payload.field).toEqual(fieldA);
-            expect(payload.newValue).toEqual(newValue);
-
-            expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
-
-            expect(vm.isLoading).toEqual(false);
-        });
-    });
-});

src/components/__tests__/FilterItemForm.spec.js

@@ -1,4 +1,6 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import FilterItemForm from 'src/components/FilterItemForm.vue';
 import { vi, beforeAll, describe, expect, it } from 'vitest';
 
@@ -38,9 +40,9 @@ describe('FilterItemForm', () => {
                 { relation: 'producer', scope: { fields: ['name'] } },
                 { relation: 'ink', scope: { fields: ['name'] } },
             ],
-            where: {"name":{"like":"%bolas de madera%"}},
+            where: { name: { like: '%bolas de madera%' } },
         };
-        
+
         expect(axios.get).toHaveBeenCalledWith('Items/withName', {
             params: { filter: JSON.stringify(expectedFilter) },
         });
@@ -79,4 +81,4 @@ describe('FilterItemForm', () => {
         vm.selectItem({ id: 12345 });
         expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
     });
-});
+});

src/components/__tests__/FormModel.spec.js

@@ -1,5 +1,7 @@
 import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import FormModel from 'src/components/FormModel.vue';
 
 describe('FormModel', () => {

src/components/__tests__/Leftmenu.spec.js

@@ -1,6 +1,7 @@
-import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
-import Leftmenu from 'components/LeftMenu.vue';
+import { createWrapper } from 'app/test/vitest/helper';
+import LeftMenu from 'components/LeftMenu.vue';
 import * as vueRouter from 'vue-router';
 import { useNavigationStore } from 'src/stores/useNavigationStore';
 
@@ -101,7 +102,7 @@ function mount(source = 'main') {
     vi.spyOn(axios, 'get').mockResolvedValue({
         data: [],
     });
-    const wrapper = createWrapper(Leftmenu, {
+    const wrapper = createWrapper(LeftMenu, {
         propsData: {
             source,
         },
@@ -164,7 +165,7 @@ describe('getRoutes', () => {
     });
 });
 
-describe('Leftmenu as card', () => {
+describe('LeftMenu as card', () => {
     beforeAll(() => {
         vm = mount('card').vm;
     });
@@ -173,7 +174,7 @@ describe('Leftmenu as card', () => {
         vm.getRoutes();
     });
 });
-describe('Leftmenu as main', () => {
+describe('LeftMenu as main', () => {
     beforeEach(() => {
         vm = mount().vm;
     });

src/components/__tests__/UserPanel.spec.js

@@ -1,65 +1,63 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
-vi.mock('src/utils/quasarLang', () => ({
-  default: vi.fn(),
-}));
-
 describe('UserPanel', () => {
-  let wrapper;
+    let wrapper;
-  let vm;
+    let vm;
-  let state;
+    let state;
 
-  beforeEach(() => {
+    beforeEach(() => {
-    wrapper = createWrapper(UserPanel, {});
+        wrapper = createWrapper(UserPanel, {});
-    state = useState();
+        state = useState();
-    state.setUser({
+        state.setUser({
-      id: 115,
+            id: 115,
-      name: 'itmanagement',
+            name: 'itmanagement',
-      nickname: 'itManagementNick',
+            nickname: 'itManagementNick',
-      lang: 'en',
+            lang: 'en',
-      darkMode: false,
+            darkMode: false,
-      companyFk: 442,
+            companyFk: 442,
-      warehouseFk: 1,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm;
-  });
 
-  afterEach(() => {
+    afterEach(() => {
-    vi.clearAllMocks();
+        vi.clearAllMocks();
-  });
+    });
 
-  it('should fetch warehouses data on mounted', async () => {
+    it('should fetch warehouses data on mounted', async () => {
-    const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
-    expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('url')).toBe('Warehouses');
-    expect(fetchData.props('autoLoad')).toBe(true);
+        expect(fetchData.props('autoLoad')).toBe(true);
-  });
+    });
 
-  it('should toggle dark mode correctly and update preferences', async () => {
+    it('should toggle dark mode correctly and update preferences', async () => {
-    await vm.saveDarkMode(true);
+        await vm.saveDarkMode(true);
-    expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
-    expect(vm.user.darkMode).toBe(true);
+        expect(vm.user.darkMode).toBe(true);
-    await vm.updatePreferences();
+        vm.updatePreferences();
-    expect(vm.darkMode).toBe(true);
+        expect(vm.darkMode).toBe(true);
-  });
+    });
 
-  it('should change user language and update preferences', async () => {
+    it('should change user language and update preferences', async () => {
-    const userLanguage = 'es';
+        const userLanguage = 'es';
-    await vm.saveLanguage(userLanguage);
+        await vm.saveLanguage(userLanguage);
-    expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
-    expect(vm.user.lang).toBe(userLanguage);
+        expect(vm.user.lang).toBe(userLanguage);
-    await vm.updatePreferences();
+        vm.updatePreferences();
-    expect(vm.locale).toBe(userLanguage);
+        expect(vm.locale).toBe(userLanguage);
-  });
+    });
 
-  it('should update user data', async () => {
+    it('should update user data', async () => {
-    const key = 'name';
+        const key = 'name';
-    const value = 'itboss';
+        const value = 'itboss';
-    await vm.saveUserData(key, value);
+        await vm.saveUserData(key, value);
-    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
-  });
+            [key]: value,
-});
+        });
+    });
+});

src/components/common/SendEmailDialog.vue

@@ -60,7 +60,7 @@ async function confirm() {
                     v-model="address"
                     is-outlined
                     autofocus
-                    data-cy="SendEmailNotifiactionDialogInput"
+                    data-cy="SendEmailNotificationDialogInput"
                 />
             </QCardSection>
             <QCardActions align="right">

src/components/common/VnAccountNumber.vue

@@ -1,35 +1,14 @@
 <script setup>
-import { nextTick, ref } from 'vue';
 import VnInput from './VnInput.vue';
 import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
-const $props = defineProps({
-    insertable: {
-        type: Boolean,
-        default: false,
-    },
-});
-
-const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
 const model = defineModel({ prop: 'modelValue' });
-const inputRef = ref(false);
-
-function setCursorPosition(pos) {
-    const input = inputRef.value.vnInputRef.$el.querySelector('input');
-    input.focus();
-    input.setSelectionRange(pos, pos);
-}
-
-async function handleUpdateModel(val) {
-    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
-    await nextTick(() => setCursorPosition(0));
-}
 </script>
 <template>
     <VnInput
         v-model="model"
         ref="inputRef"
-        :insertable
+        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
-        @update:model-value="handleUpdateModel"
+        @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>

src/components/common/VnCard.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
+import { onBeforeMount, computed, markRaw } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@@ -26,18 +26,14 @@ const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
 const entityId = computed(() => props.id || route?.params?.id);
-const arrayData = useArrayData(props.dataKey, {
+let arrayData = getArrayData(entityId.value, props.url);
-    url: props.url,
-    userFilter: props.filter,
-    oneRecord: true,
-});
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
 });
 
 onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(props.descriptor);
+    stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
 
     const route = router.currentRoute.value;
     try {
@@ -61,16 +57,31 @@ onBeforeRouteUpdate(async (to, from) => {
 });
 
 async function fetch(id, append = false) {
-    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
+    else {
-    else arrayData.store.url = props.url.replace(regex, `/${id}`);
+        arrayData = getArrayData(id);
+    }
     await arrayData.fetch({ append, updateRouter: false });
     emit('onFetch', arrayData.store.data);
 }
 function hasRouteParam(params, valueToCheck = ':addressId') {
     return Object.values(params).includes(valueToCheck);
 }
+
+function formatUrl(id) {
+    const newId = id || entityId.value;
+    const regex = /\/(\d+)/;
+    if (!regex.test(props.url)) return `${props.url}/${newId}`;
+    return props.url.replace(regex, `/${newId}`);
+}
+
+function getArrayData(id, url) {
+    return useArrayData(props.dataKey, {
+        url: url ?? formatUrl(id),
+        userFilter: props.filter,
+        oneRecord: true,
+    });
+}
 </script>
 <template>
     <template v-if="visual">

src/components/common/VnColor.vue

@@ -1,4 +1,6 @@
 <script setup>
+import { computed } from 'vue';
+
 const $props = defineProps({
     colors: {
         type: String,
@@ -6,9 +8,9 @@ const $props = defineProps({
     },
 });
 
-const colorArray = JSON.parse($props.colors)?.value;
+const colorArray = computed(() => JSON.parse($props.colors)?.value);
 const maxHeight = 30;
-const colorHeight = maxHeight / colorArray?.length;
+const colorHeight = maxHeight / colorArray.value?.length;
 </script>
 <template>
     <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">

src/components/common/VnInputBic.vue

@@ -0,0 +1,44 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const model = defineModel({ type: [Number, String] });
+const emit = defineEmits(['updateBic']);
+
+const getIbanCountry = (bank) => {
+    return bank.substr(0, 2);
+};
+
+const autofillBic = async (iban) => {
+    if (!iban) return;
+
+    const bankEntityId = parseInt(iban.substr(4, 4));
+    const ibanCountry = getIbanCountry(iban);
+
+    if (ibanCountry != 'ES') return;
+
+    const filter = { where: { id: bankEntityId } };
+    const params = { filter: JSON.stringify(filter) };
+
+    const { data } = await axios.get(`BankEntities`, { params });
+
+    emit('updateBic', data[0]?.id);
+};
+</script>
+<template>
+    <VnInput
+        :label="t('IBAN')"
+        clearable
+        v-model="model"
+        @update:model-value="autofillBic($event)"
+    >
+        <template #append>
+            <QIcon name="info" class="cursor-info">
+                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnInput>
+</template>

src/components/common/VnJsonValue.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { watch } from 'vue';
-import { toDateString } from 'src/filters';
+import { toDateHourMinSec } from 'src/filters';
 
 const props = defineProps({
     value: { type: [String, Number, Boolean, Object], default: undefined },
@@ -40,7 +40,7 @@ const updateValue = () => {
                 break;
             case 'object':
                 if (props.value instanceof Date) {
-                    t = toDateString(props.value);
+                    t = toDateHourMinSec(props.value);
                 } else {
                     t = props.value.toString();
                 }

src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onUnmounted, watch } from 'vue';
+import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
@@ -11,11 +11,11 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnLogValue from './VnLogValue.vue';
-import FetchData from '../FetchData.vue';
-import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
+import VnLogFilter from 'src/components/common/VnLogFilter.vue';
 import RightMenu from './RightMenu.vue';
+import { useFilterParams } from 'src/composables/useFilterParams';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -68,43 +68,11 @@ const filter = {
             },
         },
     ],
-    where: { and: [{ originFk: route.params.id }] },
 };
 
 const paginate = ref();
-const actions = ref();
+const dataKey = computed(() => `${props.model}Log`);
-const changeInput = ref();
+const userParams = ref(useFilterParams(dataKey.value).params);
-const searchInput = ref();
-const userRadio = ref();
-const userSelect = ref();
-const dateFrom = ref();
-const dateFromDialog = ref(false);
-const dateTo = ref();
-const dateToDialog = ref(false);
-const selectedFilters = ref({});
-const userTypes = [
-    { label: 'All', value: undefined },
-    { label: 'User', value: { neq: null } },
-    { label: 'System', value: null },
-];
-const checkboxOptions = ref({
-    insert: {
-        label: 'Creates',
-        selected: false,
-    },
-    update: {
-        label: 'Edits',
-        selected: false,
-    },
-    delete: {
-        label: 'Deletes',
-        selected: false,
-    },
-    select: {
-        label: 'Accesses',
-        selected: false,
-    },
-});
 
 let validations = models;
 let pointRecord = ref(null);
@@ -246,169 +214,73 @@ async function setLogTree(data) {
 function filterByRecord(modelLog) {
     byRecord.value = true;
     const { id, model } = modelLog;
-
+    applyFilter({ changedModelId: id, changedModel: model });
-    searchInput.value = id;
-    selectedFilters.value.changedModelId = id;
-    selectedFilters.value.changedModel = model;
-    applyFilter();
 }
 
-async function applyFilter() {
+async function applyFilter(params = {}) {
-    filter.where = { and: [] };
+    paginate.value.arrayData.resetPagination();
-    if (
+    paginate.value.arrayData.applyFilter({
-        !selectedFilters.value.changedModel ||
+        filter: {},
-        (!selectedFilters.value.changedModelValue &&
+        params: { originFk: route.params.id, ...params },
-            !selectedFilters.value.changedModelId)
+    });
-    )
-        byRecord.value = false;
-
-    if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
-
-    if (Object.keys(selectedFilters.value).length) {
-        filter.where.and.push(selectedFilters.value);
-    }
-
-    paginate.value.fetch({ filter });
 }
 
-function setDate(type) {
+function exprBuilder(param, value) {
-    let from = dateFrom.value
+    switch (param) {
-        ? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
+        case 'changedModelValue':
-        : undefined;
+            return { [param]: { like: `%${value}%` } };
-    from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
+        case 'change':
-
+            if (value)
-    let to = dateTo.value
-        ? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-        : date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
-    to = date.adjustDate(
-        to,
-        { hour: 21, minute: 59, second: 59, millisecond: 999 },
-        true,
-    );
-
-    switch (type) {
-        case 'from':
-            return { between: [from, to] };
-        case 'to': {
-            if (dateFrom.value) {
                 return {
-                    between: [from, to],
+                    or: [
+                        { oldJson: { like: `%${value}%` } },
+                        { newJson: { like: `%${value}%` } },
+                        { description: { like: `%${value}%` } },
+                    ],
                 };
-            }
+            break;
-            return { lte: to };
+        case 'action':
-        }
+            if (value?.length) return { [param]: { inq: value } };
+            break;
+        case 'from':
+            return { creationDate: { gte: value } };
+        case 'to':
+            return { creationDate: { lte: value } };
+        case 'userType':
+            if (value === 'User') return { userFk: { neq: null } };
+            if (value === 'System') return { userFk: null };
+            break;
+        default:
+            return { [param]: value };
     }
 }
 
-function selectFilter(type, dateType) {
-    const filter = {};
-    const actions = { inq: [] };
-    let reload = true;
-
-    if (type === 'search') {
-        if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
-            selectedFilters.value.changedModelId = searchInput.value.trim();
-        } else if (!searchInput.value) {
-            selectedFilters.value.changedModelId = undefined;
-            selectedFilters.value.changedModelValue = undefined;
-        } else {
-            selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
-        }
-    }
-    if (type === 'action' && selectedFilters.value.changedModel === null) {
-        selectedFilters.value.changedModel = undefined;
-    }
-    if (type === 'userRadio') {
-        selectedFilters.value.userFk = userRadio.value;
-    }
-    if (type === 'change') {
-        if (changeInput.value)
-            selectedFilters.value.or = [
-                { oldJson: { like: `%${changeInput.value}%` } },
-                { newJson: { like: `%${changeInput.value}%` } },
-                { description: { like: `%${changeInput.value}%` } },
-            ];
-        else selectedFilters.value.or = undefined;
-    }
-    if (type === 'userSelect') {
-        selectedFilters.value.userFk =
-            userSelect.value !== null ? userSelect.value : undefined;
-    }
-    if (type === 'date') {
-        if (!dateFrom.value && !dateTo.value) {
-            selectedFilters.value.creationDate = undefined;
-        } else if (dateType === 'to') {
-            selectedFilters.value.creationDate = setDate('to');
-        } else if (dateType === 'from') {
-            selectedFilters.value.creationDate = setDate('from');
-        }
-    }
-
-    Object.keys(checkboxOptions.value).forEach((key) => {
-        if (checkboxOptions.value[key].selected) actions.inq.push(key);
-    });
-    selectedFilters.value.action = actions.inq.length ? actions : undefined;
-
-    Object.keys(selectedFilters.value).forEach((key) => {
-        if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
-    });
-
-    if (reload) applyFilter(filter);
-}
-
 async function clearFilter() {
-    selectedFilters.value = {};
     byRecord.value = false;
-    userSelect.value = undefined;
-    searchInput.value = undefined;
-    changeInput.value = undefined;
-    dateFrom.value = undefined;
-    dateTo.value = undefined;
-    userRadio.value = undefined;
-    Object.keys(checkboxOptions.value).forEach(
-        (opt) => (checkboxOptions.value[opt].selected = false),
-    );
     await applyFilter();
 }
 
+onMounted(() => {
+    stateStore.rightDrawerChangeValue(true);
+});
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
-
-watch(
-    () => router.currentRoute.value.params.id,
-    () => {
-        applyFilter();
-    },
-);
 </script>
 <template>
-    <FetchData
-        :url="`${props.model}Logs/${route.params.id}/models`"
-        :filter="{ order: ['changedModel'] }"
-        @on-fetch="
-            (data) =>
-                (actions = data.map((item) => {
-                    const changedModel = item.changedModel;
-                    return {
-                        locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel,
-                        ),
-                        value: changedModel,
-                    };
-                }))
-        "
-        auto-load
-    />
     <VnPaginate
         ref="paginate"
-        :data-key="`${model}Log`"
+        :data-key
-        :url="`${model}Logs`"
+        :url="dataKey + 's'"
         :user-filter="filter"
+        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        @on-change="setLogTree"
         search-url="logs"
+        :exprBuilder
+        :order="['creationDate DESC', 'id DESC']"
     >
         <template #body>
             <div
@@ -467,6 +339,7 @@ watch(
                                             backgroundColor: useColor(modelLog.model),
                                         }"
                                         :title="`${modelLog.model} #${modelLog.id}`"
+                                        data-cy="vnLog-model-chip"
                                     >
                                         {{ t(modelLog.modelI18n) }}
                                     </QChip>
@@ -580,6 +453,7 @@ watch(
                                                             }`,
                                                         )
                                                     "
+                                                    data-cy="vnLog-action-icon"
                                                 />
                                             </div>
                                         </QItem>
@@ -697,181 +571,12 @@ watch(
     </VnPaginate>
     <RightMenu>
         <template #right-panel>
-            <QList dense>
+            <VnLogFilter :data-key />
-                <QSeparator />
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.search')"
-                        v-model="searchInput"
-                        class="full-width"
-                        clearable
-                        filled
-                        clear-icon="close"
-                        @keyup.enter="() => selectFilter('search')"
-                        @focusout="() => selectFilter('search')"
-                        @clear="() => selectFilter('search')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem>
-                    <VnSelect
-                        class="full-width"
-                        :label="t('globals.entity')"
-                        v-model="selectedFilters.changedModel"
-                        option-label="locale"
-                        option-value="value"
-                        filled
-                        :options="actions"
-                        @update:model-value="selectFilter('action')"
-                        hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
-                    >
-                        <template #label="{ label }">
-                            {{ t(`Users.${label}`) }}
-                        </template>
-                    </QOptionGroup>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QItemSection v-if="userRadio !== null">
-                        <VnSelect
-                            class="full-width"
-                            :label="t('globals.user')"
-                            v-model="userSelect"
-                            filled
-                            :url="`${model}Logs/${route.params.id}/editors`"
-                            :fields="['id', 'nickname', 'name', 'image']"
-                            sort-by="nickname"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        filled
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
-                >
-                    <QCheckbox
-                        size="sm"
-                        v-model="checkboxOption.selected"
-                        :label="t(`actions.${checkboxOption.label}`)"
-                        @update:model-value="selectFilter"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('globals.date')"
-                        @click="dateFromDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'to')"
-                        v-model="dateFrom"
-                        clearable
-                        filled
-                        clear-icon="close"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('globals.to')"
-                        @click="dateToDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'from')"
-                        v-model="dateTo"
-                        clearable
-                        filled
-                        clear-icon="close"
-                    />
-                </QItem>
-            </QList>
         </template>
     </RightMenu>
-    <QDialog v-model="dateFromDialog">
-        <QDate
-            :years-in-month-view="false"
-            v-model="dateFrom"
-            dense
-            flat
-            minimal
-            filled
-            @update:model-value="
-                (value) => {
-                    dateFromDialog = false;
-                    dateFrom = date.formatDate(value, 'DD-MM-YYYY');
-                    selectFilter('date', 'from');
-                }
-            "
-        />
-    </QDialog>
-    <QDialog v-model="dateToDialog">
-        <QDate
-            v-model="dateTo"
-            dense
-            flat
-            minimal
-            @update:model-value="
-                (value) => {
-                    dateToDialog = false;
-                    dateTo = date.formatDate(value, 'DD-MM-YYYY');
-                    selectFilter('date', 'to');
-                }
-            "
-        />
-    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn
-            v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
+            v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
             color="primary"
             icon="filter_alt_off"
             size="md"

src/components/common/VnLogFilter.vue

@@ -1,77 +1,249 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
+import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from './VnSelect.vue';
+import { useRoute } from 'vue-router';
+import VnInput from './VnInput.vue';
+import { ref, computed, watch } from 'vue';
+import VnInputDate from './VnInputDate.vue';
+import { useFilterParams } from 'src/composables/useFilterParams';
+import FetchData from '../FetchData.vue';
+import { useValidator } from 'src/composables/useValidator';
+import { useCapitalize } from 'src/composables/useCapitalize';
+import VnAvatar from '../ui/VnAvatar.vue';
 
-const { t } = useI18n();
+const $props = defineProps({
-const props = defineProps({
     dataKey: {
         type: String,
-        required: true,
+        default: null,
     },
 });
 
-const workers = ref();
+const { t } = useI18n();
+const route = useRoute();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+const entities = ref([]);
+const editors = ref([]);
+const userParams = ref(useFilterParams($props.dataKey).params);
+let validations = models;
+const userTypes = [
+    { value: 'All', label: t(`Users.All`) },
+    { value: 'User', label: t(`Users.User`) },
+    { value: 'System', label: t(`Users.System`) },
+];
+const checkboxOptions = ref([
+    { name: 'insert', label: 'Creates', selected: false },
+    { name: 'update', label: 'Edits', selected: false },
+    { name: 'delete', label: 'Deletes', selected: false },
+    { name: 'select', label: 'Accesses', selected: false },
+]);
+const columns = computed(() => [
+    { name: 'changedModelValue', orderBy: 'id' },
+    { name: 'changedModel' },
+    { name: 'userType', orderBy: false },
+    { name: 'userFk' },
+    { name: 'change', orderBy: false },
+    { name: 'action' },
+    { name: 'from', orderBy: 'creationDate' },
+    { name: 'to', orderBy: 'creationDate' },
+]);
+
+const userParamsWatcher = watch(
+    () => userParams.value,
+    (params) => {
+        if (params.action) {
+            params.action.forEach((option) => {
+                checkboxOptions.value.find((o) => o.name === option).selected = true;
+            });
+            userParamsWatcher();
+        }
+    },
+);
+
+function getActions() {
+    const actions = checkboxOptions.value
+        .filter((option) => option.selected)
+        ?.map((o) => o.name);
+    return actions.length ? actions : null;
+}
 </script>
 
 <template>
     <FetchData
-        url="Workers/activeWithInheritedRole"
+        :url="`${dataKey}s/${route.params.id}/models`"
-        :filter="{ where: { role: 'salesPerson' } }"
+        :filter="{ order: ['changedModel'] }"
-        @on-fetch="(data) => (workers = data)"
+        @on-fetch="
+            (data) =>
+                (entities = data.map((item) => {
+                    const changedModel = item.changedModel;
+                    return {
+                        locale: useCapitalize(
+                            validations[changedModel]?.locale?.name ?? changedModel,
+                        ),
+                        value: changedModel,
+                    };
+                }))
+        "
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <FetchData
-        <template #tags="{ tag, formatFn }">
+        :url="`${dataKey}s/${route.params.id}/editors`"
-            <div class="q-gutter-x-xs">
+        :filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+        sort-by="nickname"
-                <span>{{ formatFn(tag.value) }}</span>
+        @on-fetch="(data) => (editors = data)"
+        auto-load
+    />
+    <VnTableFilter
+        v-if="dataKey"
+        :data-key
+        :columns="columns"
+        :redirect="false"
+        :hiddenTags="['originFk', 'creationDate']"
+        search-url="logs"
+        :showTagChips="false"
+    >
+        <template #filter-changedModelValue="{ params, columnName, searchFn }">
+            <VnInput
+                :label="t('globals.search')"
+                v-model="params[columnName]"
+                @keyup.enter="searchFn"
+                @blur="searchFn"
+                @remove="searchFn"
+                :info="t('tooltips.search')"
+                dense
+                filled
+                data-cy="vnLog-search"
+            />
+        </template>
+        <template #filter-changedModel="{ params, columnName, searchFn }">
+            <VnSelect
+                :label="t('globals.entity')"
+                v-model="params[columnName]"
+                option-label="locale"
+                option-value="value"
+                :options="entities"
+                @update:model-value="() => searchFn()"
+                dense
+                filled
+                data-cy="vnLog-entity"
+            />
+        </template>
+        <template #filter-userType="{ params, columnName, searchFn }">
+            <QOptionGroup
+                class="text-left"
+                size="sm"
+                v-model="params[columnName]"
+                :options="userTypes"
+                color="primary"
+                @update:model-value="
+                    () => {
+                        params.userFk = null;
+                        searchFn();
+                    }
+                "
+            />
+        </template>
+        <template #filter-userFk="{ params, columnName, searchFn }">
+            <VnSelect
+                :label="t('globals.user')"
+                v-model="params[columnName]"
+                :options="editors"
+                @update:modelValue="() => searchFn()"
+                :disable="params.userType === 'System'"
+                dense
+                filled
+            >
+                <template #option="{ opt, itemProps }">
+                    <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                        <QItemSection class="col-3 items-center">
+                            <VnAvatar :worker-id="opt.id" />
+                        </QItemSection>
+                        <QItemSection class="col-9 justify-center">
+                            <span>{{ opt.name }}</span>
+                            <span class="text-grey">{{ opt.nickname }}</span>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+        </template>
+        <template #filter-change="{ params, columnName, searchFn }">
+            <VnInput
+                :label="t('globals.changes')"
+                v-model="params[columnName]"
+                @keyup.enter="searchFn"
+                @blur="searchFn"
+                @remove="searchFn"
+                :info="t('tooltips.changes')"
+                dense
+                filled
+            />
+        </template>
+        <template #filter-action="{ searchFn }">
+            <div class="column">
+                <QCheckbox
+                    v-for="checkboxOption in checkboxOptions"
+                    :key="checkboxOption"
+                    size="sm"
+                    v-model="checkboxOption.selected"
+                    :label="t(`actions.${checkboxOption.label}`)"
+                    @update:model-value="
+                        () => searchFn(undefined, 'action', getActions())
+                    "
+                    data-cy="vnLog-checkbox"
+                />
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #filter-from="{ params, columnName, searchFn }">
-            <QDate
+            <VnInputDate
-                v-model="params.created"
+                :label="t('globals.from')"
-                @update:model-value="searchFn()"
+                v-model="params[columnName]"
                 dense
-                flat
+                filled
-                minimal
+                @update:modelValue="() => searchFn()"
-            >
+            />
-            </QDate>
-            <QSeparator />
-            <QItem>
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
-                        :label="t('User')"
-                        v-model="params.userFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
         </template>
-    </VnFilterPanel>
+        <template #filter-to="{ params, columnName, searchFn }">
+            <VnInputDate
+                :label="t('globals.to')"
+                v-model="params[columnName]"
+                dense
+                filled
+                @update:modelValue="() => searchFn()"
+            />
+        </template>
+    </VnTableFilter>
 </template>
-
 <i18n>
-en:
-    params:
-        search: Contains
-        userFk: User
-        created: Created
 es:
+    tooltips:
+        search: Buscar por identificador o concepto
+        changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
+    actions:
+        Creates: Crea
+        Edits: Modifica
+        Deletes: Elimina
+        Accesses: Accede
+    Users:
+        User: Usuario
+        All: Todo
+        System: Sistema
     params:
-        search: Contiene
+        changedModel: Entity
-        userFk: Usuario
+
-        created: Creada
+en:
-    User: Usuario
+    tooltips:
+        search: Search by identifier or concept
+        changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
+    actions:
+        Creates: Creates
+        Edits: Edits
+        Deletes: Deletes
+        Accesses: Accesses
+    Users:
+        User: User
+        All: All
+        System: System
+    params:
+        changedModel: Entidad
 </i18n>

src/components/common/VnScroll.vue

@@ -0,0 +1,100 @@
+<script setup>
+import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
+
+const props = defineProps({
+    scrollTarget: { type: [String, Object], default: 'window' }
+});
+
+const scrollPosition = ref(0);
+const showButton = ref(false);
+let scrollContainer = null;
+
+const onScroll = () => {
+    if (!scrollContainer) return;
+    scrollPosition.value = 
+        typeof props.scrollTarget === 'object' 
+            ? scrollContainer.scrollTop 
+            : window.scrollY;
+};
+
+watch(scrollPosition, (newValue) => {
+    showButton.value = newValue > 0;
+});
+
+const scrollToTop = () => {
+    if (scrollContainer) {
+        scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
+    }
+};
+
+const updateScrollContainer = (container) => {
+  if (container) {
+    if (scrollContainer) {
+      scrollContainer.removeEventListener('scroll', onScroll);
+    }
+    scrollContainer = container;
+    scrollContainer.addEventListener('scroll', onScroll);
+    onScroll();
+  }
+};
+
+defineExpose({
+  updateScrollContainer
+});
+
+const initScrollContainer = async () => {
+    await nextTick();
+
+    if (typeof props.scrollTarget === 'object') {
+        scrollContainer = props.scrollTarget;
+    } else {
+        scrollContainer = window;
+    }
+
+    if (!scrollContainer) return
+        scrollContainer.addEventListener('scroll', onScroll);    
+};
+
+
+onMounted(() => {
+    initScrollContainer();
+});
+
+onUnmounted(() => {
+    if (scrollContainer) {
+        scrollContainer.removeEventListener('scroll', onScroll);
+        scrollContainer = null;
+    }
+});
+</script>
+
+<template>
+    <QIcon
+        v-if="showButton"
+        color="primary"
+        name="keyboard_arrow_up"
+        class="scroll-to-top"
+        @click="scrollToTop"
+    >
+        <QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
+    </QIcon>
+</template>
+
+<style scoped>
+.scroll-to-top {
+  position: fixed;
+  top: 70px;
+  font-size: 65px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1000;
+  transition: transform 0.2s ease-in-out;
+}
+
+.scroll-to-top:hover {
+  transform: translateX(-50%) scale(1.2);
+  cursor: pointer;
+  filter: brightness(0.8);
+}
+</style>
+

src/components/common/VnSection.vue

@@ -40,10 +40,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    keepData: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const route = useRoute();
@@ -61,7 +57,6 @@ onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
-            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

src/components/common/__tests__/VnChangePassword.spec.js

@@ -1,4 +1,5 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
 import { Notify } from 'quasar';

src/components/common/__tests__/VnDms.spec.js

@@ -1,4 +1,5 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 import VnDms from 'src/components/common/VnDms.vue';
 
@@ -40,7 +41,10 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
+        files: {
+            name: 'example.txt',
+            content: new Blob(['file content'], { type: 'text/plain' }),
+        },
     };
 
     const expectedBody = {
@@ -59,7 +63,7 @@ describe('VnDms', () => {
                 url: '/test',
                 formInitialData: { id: 1, reference: 'test' },
                 model: 'Worker',
-            }
+            },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
@@ -98,7 +102,7 @@ describe('VnDms', () => {
             expect(vm.getUrl()).toBe('/test');
         });
 
-        it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {            
+        it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {
             await wrapper.setProps({ url: null });
             expect(vm.getUrl()).toBe('dms/1/updateFile');
         });
@@ -113,7 +117,9 @@ describe('VnDms', () => {
     describe('save', () => {
         it('should save data correctly', async () => {
             await vm.save();
-            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
+            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), {
+                params: expectedBody,
+            });
             expect(wrapper.emitted('onDataSaved')).toBeTruthy();
         });
     });
@@ -127,8 +133,8 @@ describe('VnDms', () => {
                 warehouseFk: 2,
                 companyFk: 3,
                 dmsTypeFk: 2,
-                description: 'This is a test description'
+                description: 'This is a test description',
-            }
+            };
             await wrapper.setProps({ formInitialData: testData });
             vm.defaultData();
 
@@ -137,10 +143,10 @@ describe('VnDms', () => {
 
         it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
             await wrapper.setProps({ formInitialData: null });
-            vm.route.params.id= '111';
+            vm.route.params.id = '111';
             vm.defaultData();
 
             expect(vm.dms.reference).toBe('111');
         });
     });
-});
+});

src/components/common/__tests__/VnDmsList.spec.js

@@ -1,4 +1,6 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import VnDmsList from 'src/components/common/VnDmsList.vue';
 import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 

src/components/common/__tests__/VnJsonValue.spec.js

@@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
         const date = new Date('2023-01-01');
         const wrapper = buildComponent({ value: date });
         const span = wrapper.find('span');
-        expect(span.text()).toBe('2023-01-01');
+        expect(span.text()).toBe('01/01/2023, 01:00:00');
         expect(span.classes()).toContain('json-object');
     });
 

src/components/common/__tests__/VnLog.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnLog from 'src/components/common/VnLog.vue';
 
 describe('VnLog', () => {
@@ -108,27 +109,4 @@ describe('VnLog', () => {
         expect(vm.logTree[0].originFk).toEqual(1);
         expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
     });
-
-    it('should correctly set the selectedFilters when filtering', () => {
-        vm.searchInput = '1';
-        vm.userSelect = '21';
-        vm.checkboxOptions.insert.selected = true;
-        vm.checkboxOptions.update.selected = true;
-
-        vm.selectFilter('search');
-        vm.selectFilter('userSelect');
-
-        expect(vm.selectedFilters.changedModelId).toEqual('1');
-        expect(vm.selectedFilters.userFk).toEqual('21');
-        expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
-    });
-
-    it('should correctly set the date from', () => {
-        vm.dateFrom = '18-09-2023';
-        vm.selectFilter('date', 'from');
-        expect(vm.selectedFilters.creationDate.between).toEqual([
-            new Date('2023-09-18T00:00:00.000Z'),
-            new Date('2023-09-18T21:59:59.999Z'),
-        ]);
-    });
 });

src/components/common/__tests__/VnLogFilter.spec.js

@@ -0,0 +1,28 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnLogFilter from 'src/components/common/VnLogFilter.vue';
+
+describe('VnLogFilter', () => {
+    let vm;
+    beforeAll(async () => {
+        vm = createWrapper(VnLogFilter, {
+            props: {
+                dataKey: 'ClaimLog',
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should getActions selected', async () => {
+        vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
+        vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
+
+        const actions = vm.getActions();
+
+        expect(actions.length).toEqual(2);
+        expect(actions).toEqual(['insert', 'update']);
+    });
+});

src/components/common/__tests__/VnNotes.spec.js

@@ -1,5 +1,6 @@
 import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 
 describe('VnNotes', () => {

src/components/ui/CardSummary.vue

@@ -159,6 +159,7 @@ async function fetch() {
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
+                align-items: start;
                 .label {
                     color: var(--vn-label-color);
                     width: 9em;
@@ -169,9 +170,15 @@ async function fetch() {
                     flex-grow: 0;
                     flex-shrink: 0;
                 }
+                &.ellipsis > .value {
+                    text-overflow: ellipsis;
+                    white-space: pre;
+                }
                 .value {
                     color: var(--vn-text-color);
                     overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
                 }
             }
             .header {
@@ -203,27 +210,21 @@ async function fetch() {
 }
 
 .vn-card-group {
-    display: flex;
+    display: grid;
-    flex-direction: column;
+    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+    gap: 16px;
 }
 
 .vn-card-content {
     display: flex;
     flex-direction: column;
+    overflow: hidden;
+    white-space: nowrap;
     text-overflow: ellipsis;
     > div {
         max-height: 70px;
     }
 }
-
-@media (min-width: 1010px) {
-    .vn-card-group {
-        flex-direction: row;
-    }
-    .vn-card-content {
-        flex: 1;
-    }
-}
 </style>
 <style lang="scss" scoped>
 .summaryHeader .vn-label-value {

src/components/ui/VnDescriptor.vue

@@ -6,6 +6,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
 const entity = defineModel({ type: Object, default: null });
 const $props = defineProps({
@@ -30,7 +31,7 @@ const $props = defineProps({
         default: null,
     },
     toModule: {
-        type: String,
+        type: Object,
         default: null,
     },
 });
@@ -56,18 +57,6 @@ const routeName = computed(() => {
     return `${routeName}Summary`;
 });
 
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
 function copyIdText(id) {
     copyText(id, {
         component: {
@@ -170,10 +159,10 @@ const toModule = computed(() => {
                         <div class="title">
                             <span
                                 v-if="title"
-                                :title="getValueFromPath(title)"
+                                :title="getValueFromPath(entity, title)"
                                 :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
                             >
-                                {{ getValueFromPath(title) ?? title }}
+                                {{ getValueFromPath(entity, title) ?? title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span
@@ -189,7 +178,7 @@ const toModule = computed(() => {
                             class="subtitle"
                             :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
                         >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
                         </QItemLabel>
                         <QBtn
                             round
@@ -252,6 +241,10 @@ const toModule = computed(() => {
                 content: ':';
             }
         }
+        &.ellipsis > .value {
+            text-overflow: ellipsis;
+            white-space: pre;
+        }
         .value {
             color: var(--vn-text-color);
             font-size: 14px;

src/components/ui/VnFilterPanel.vue

@@ -61,6 +61,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    showTagChips: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits([
@@ -88,13 +92,14 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
 defineExpose({ search, params: userParams, remove });
 
 const isLoading = ref(false);
-async function search(evt) {
+async function search(evt, name, value) {
     try {
         if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
         const filter = { ...userParams.value, ...$props.modelValue };
+        if (name) filter[name] = value;
         store.userParamsChanged = true;
         await arrayData.addFilter({
             params: filter,
@@ -207,6 +212,7 @@ const getLocale = (label) => {
         color="primary"
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
+        data-cy="vnFilterPanel_search"
         @click="search()"
     >
         <QTooltip bottom anchor="bottom right">
@@ -214,7 +220,7 @@ const getLocale = (label) => {
         </QTooltip>
     </QBtn>
     <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
-        <QList dense>
+        <QList dense v-if="showTagChips">
             <QItem class="q-mt-xs">
                 <QItemSection top>
                     <QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
@@ -224,6 +230,7 @@ const getLocale = (label) => {
                 <QItemSection top side>
                     <QBtn
                         @click="clearFilters"
+                        data-cy="clearFilters"
                         color="primary"
                         dense
                         flat
@@ -287,6 +294,7 @@ const getLocale = (label) => {
         </QList>
     </QForm>
     <QInnerLoading
+        data-cy="filterPanel-spinner"
         :label="t('globals.pleaseWait')"
         :showing="isLoading"
         color="primary"

src/components/ui/VnLinkMail.vue

@@ -1,8 +1,11 @@
 <script setup>
+import { dashIfEmpty } from 'src/filters';
+
 defineProps({ email: { type: [String], default: null } });
 </script>
 <template>
     <QBtn
+        class="q-pr-xs"
         v-if="email"
         flat
         round
@@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
         :href="`mailto:${email}`"
         @click.stop
     />
+    <span>{{ dashIfEmpty(email) }}</span>
 </template>

src/components/ui/VnLinkPhone.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { parsePhone } from 'src/filters';
+import { dashIfEmpty, parsePhone } from 'src/filters';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
@@ -12,50 +12,65 @@ const props = defineProps({
 
 const phone = ref(props.phoneNumber);
 const config = reactive({
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
         url: null,
         channel: props.channel,
     },
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
 });
-const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
+
+const attrs = useAttrs();
+const types = Object.keys(config)
+    .filter((key) => key in attrs)
+    .sort();
+const activeTypes = types.length ? types : ['sip'];
 
 onBeforeMount(async () => {
     if (!phone.value) return;
-    let { channel } = config[type];
 
-    if (type === 'say-simple') {
+    for (const type of activeTypes) {
-        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+        if (type === 'say-simple') {
-            .data;
+            let { channel } = config[type];
-        if (!channel) channel = defaultChannel;
+            const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+                .data;
+            if (!channel) channel = defaultChannel;
 
-        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
+            phone.value = await parsePhone(
-        config[
+                props.phoneNumber,
-            type
+                props.country?.toLowerCase(),
-        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
+            );
+            config[type].url =
+                `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
+        }
     }
 });
 
-function handleClick() {
+function handleClick(type) {
     if (config[type].url) useOpenURL(config[type].url);
     else if (config[type].href) window.location.href = config[type].href;
 }
 </script>
+
 <template>
-    <QBtn
+    <div class="flex items-center gap-2">
-        v-if="phone"
+        <template v-for="type in activeTypes">
-        flat
+            <QBtn
-        round
+                :key="type"
-        :icon="config[type].icon"
+                v-if="phone"
-        size="sm"
+                flat
-        color="primary"
+                round
-        padding="none"
+                :icon="config[type].icon"
-        @click.stop="handleClick"
+                size="sm"
-    >
+                color="primary"
-        <QTooltip>
+                padding="none"
-            {{ capitalize(type).replace('-', '') }}
+                @click.stop="() => handleClick(type)"
-        </QTooltip>
+            >
-    </QBtn>
+                <QTooltip>
-    {{ phoneNumber }}
+                    {{ capitalize(type).replace('-', '') }}
+                </QTooltip>
+            </QBtn></template
+        >
+        <span>{{ dashIfEmpty(phone) }}</span>
+    </div>
 </template>

src/components/ui/VnLv.vue

@@ -6,6 +6,7 @@ import { computed } from 'vue';
 
 const $props = defineProps({
     label: { type: String, default: null },
+    tooltip: { type: String, default: null },
     value: {
         type: [String, Boolean, Number],
         default: null,
@@ -40,7 +41,10 @@ const val = computed(() => $props.value);
         <template v-else>
             <div v-if="label || $slots.label" class="label">
                 <slot name="label">
-                    <span style="color: var(--vn-label-color)">{{ label }}</span>
+                    <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
+                    <span style="color: var(--vn-label-color)">
+                        {{ label }}
+                    </span>
                 </slot>
             </div>
             <div class="value" v-if="value || $slots.value">

src/components/ui/VnPaginate.vue

@@ -115,7 +115,7 @@ onMounted(async () => {
 });
 
 onBeforeUnmount(() => {
-    if (!store.keepData) arrayData.reset(['data']);
+    arrayData.reset(['data']);
     arrayData.resetPagination();
 });
 
@@ -215,6 +215,7 @@ defineExpose({
     paginate,
     userParams: arrayData.store.userParams,
     currentFilter: arrayData.store.currentFilter,
+    arrayData,
 });
 </script>
 

src/components/ui/VnUsesMana.vue

@@ -1,60 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const props = defineProps({
-    usesMana: {
-        type: Boolean,
-        required: true,
-    },
-    manaCode: {
-        type: String,
-        required: true,
-    },
-    manaVal: {
-        type: String,
-        default: 'mana',
-    },
-    manaLabel: {
-        type: String,
-        default: 'Promotion mana',
-    },
-    manaClaimVal: {
-        type: String,
-        default: 'manaClaim',
-    },
-    claimLabel: {
-        type: String,
-        default: 'Claim mana',
-    },
-});
-
-const manaCode = ref(props.manaCode);
-</script>
-
-<template>
-    <div class="column q-gutter-y-sm q-mt-sm">
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaVal"
-            :label="t(manaLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaClaimVal"
-            :label="t(claimLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-    </div>
-</template>
-<i18n>
-    es:
-        Promotion mana: Maná promoción
-        Claim mana: Maná reclamación
-</i18n>

src/components/ui/__tests__/CardSummary.spec.js

@@ -1,5 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+
 import CardSummary from 'src/components/ui/CardSummary.vue';
 import * as vueRouter from 'vue-router';
 

src/components/ui/__tests__/Paginate.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
 describe('VnPaginate', () => {

src/components/ui/__tests__/VnLinkPhone.spec.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeAll, vi } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import axios from 'axios';
 import parsePhone from 'src/filters/parsePhone';
 
 describe('parsePhone filter', () => {

src/components/ui/__tests__/VnSms.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnSms from 'src/components/ui/VnSms.vue';
 
 describe('VnSms', () => {

src/composables/__tests__/downloadFile.spec.js

@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import axios from 'axios';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useSession } from 'src/composables/useSession';
 const session = useSession();

src/composables/__tests__/useAcl.spec.js

@@ -1,5 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import axios from 'axios';
+
+import { flushPromises } from '@vue/test-utils';
 import { useAcl } from 'src/composables/useAcl';
 
 describe('useAcl', () => {

src/composables/__tests__/useArrayData.spec.js

@@ -1,15 +1,39 @@
 import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
+import { setActivePinia, createPinia } from 'pinia';
 
 describe('useArrayData', () => {
     const filter = '{"limit":20,"skip":0}';
     const params = { supplierFk: 2 };
+
     beforeEach(() => {
-        vi.spyOn(useRouter(), 'replace');
+        setActivePinia(createPinia());
-        vi.spyOn(useRouter(), 'push');
+
+        // Mock route
+        vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
+            path: 'mockSection/list',
+            matched: [],
+            query: {},
+            params: {},
+            meta: { moduleName: 'mockName' },
+        });
+
+        // Mock router
+        vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
+            push: vi.fn(),
+            replace: vi.fn(),
+            currentRoute: {
+                value: {
+                    path: 'mockSection/list',
+                    params: { id: 1 },
+                    meta: { moduleName: 'mockName' },
+                    matched: [{ path: 'mockName/:id' }],
+                },
+            },
+        });
     });
 
     afterEach(() => {
@@ -17,103 +41,69 @@ describe('useArrayData', () => {
     });
 
     it('should fetch and replace url with new params', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
 
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
+        const arrayData = useArrayData('ArrayData', {
+            url: 'mockUrl',
+            searchUrl: 'params',
+        });
 
         arrayData.store.userParams = params;
-        arrayData.fetch({});
+        await arrayData.fetch({});
 
-        await flushPromises();
         const routerReplace = useRouter().replace.mock.calls[0][0];
 
-        expect(axios.get.mock.calls[0][1].params).toEqual({
+        expect(axios.get).toHaveBeenCalledWith('mockUrl', {
-            filter,
+            signal: expect.any(Object),
-            supplierFk: 2,
+            params: {
+                filter,
+                supplierFk: 2,
+            },
         });
-        expect(routerReplace.path).toEqual('mockSection/list');
+
+        expect(routerReplace.path).toBe('mockSection/list');
         expect(JSON.parse(routerReplace.query.params)).toEqual(
             expect.objectContaining(params),
         );
     });
 
-    it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
+    it('should redirect to detail when single record is returned with navigation', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({
+            data: [{ id: 1 }],
+        });
 
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
+        const arrayData = useArrayData('ArrayData', {
+            url: 'mockUrl',
+            navigate: {},
+        });
 
         arrayData.store.userParams = params;
-        arrayData.fetch({});
+        await arrayData.fetch({});
 
-        await flushPromises();
         const routerPush = useRouter().push.mock.calls[0][0];
 
-        expect(axios.get.mock.calls[0][1].params).toEqual({
+        expect(routerPush.path).toBe('mockName/1');
-            filter,
-            supplierFk: 2,
-        });
-        expect(routerPush.path).toEqual('mockName/1');
         expect(routerPush.query).toBeUndefined();
     });
 
-    it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
+    it('should return one record when oneRecord is true', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({
-
-        vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
-            matched: [],
-            query: {},
-            params: {},
-            meta: { moduleName: 'mockName' },
-            path: 'mockName/1',
-        });
-        vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
-            push: vi.fn(),
-            replace: vi.fn(),
-            currentRoute: {
-                value: {
-                    params: {
-                        id: 1,
-                    },
-                    meta: { moduleName: 'mockName' },
-                    matched: [{ path: 'mockName/:id' }],
-                },
-            },
-        });
-
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
-
-        arrayData.store.userParams = params;
-        arrayData.fetch({});
-
-        await flushPromises();
-        const routerPush = useRouter().push.mock.calls[0][0];
-
-        expect(axios.get.mock.calls[0][1].params).toEqual({
-            filter,
-            supplierFk: 2,
-        });
-        expect(routerPush.path).toEqual('mockName/');
-        expect(routerPush.query.params).toBeDefined();
-    });
-
-    it('should return one record', async () => {
-        vi.spyOn(axios, 'get').mockReturnValueOnce({
             data: [
                 { id: 1, name: 'Entity 1' },
                 { id: 2, name: 'Entity 2' },
             ],
         });
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
+
+        const arrayData = useArrayData('ArrayData', {
+            url: 'mockUrl',
+            oneRecord: true,
+        });
+
         await arrayData.fetch({});
 
-        expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
+        expect(arrayData.store.data).toEqual({
-    });
+            id: 1,
-
+            name: 'Entity 1',
-    it('should handle empty data gracefully if has to return one record', async () => {
+        });
-        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
-        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
-        await arrayData.fetch({});
-
-        expect(arrayData.store.data).toBeUndefined();
     });
 });

src/composables/__tests__/useRole.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { flushPromises } from '@vue/test-utils';
 import { useRole } from 'composables/useRole';
 const role = useRole();
 
@@ -23,18 +24,19 @@ describe('useRole', () => {
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
+                worker: { department: { departmentFk: 155 } },
             };
             const expectedUser = {
                 id: 999,
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
+                departmentFk: 155,
             };
             const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get')
+            vi.spyOn(axios, 'get').mockResolvedValueOnce({
-            .mockResolvedValueOnce({
                 data: { roles: rolesData, user: fetchedUser },
-            })
+            });
 
             vi.spyOn(role.state, 'setUser');
             vi.spyOn(role.state, 'setRoles');

src/composables/__tests__/useSession.spec.js

@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import axios from 'axios';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 
@@ -75,6 +75,7 @@ describe('session', () => {
                 userConfig: {
                     darkMode: false,
                 },
+                worker: { department: { departmentFk: 155 } },
             };
             const rolesData = [
                 {
@@ -143,7 +144,7 @@ describe('session', () => {
                 await session.destroy(); // this clears token and user for any other test
             });
         },
-        {}
+        {},
     );
 
     describe('RenewToken', () => {
@@ -175,7 +176,7 @@ describe('session', () => {
             await session.checkValidity();
             expect(sessionStorage.getItem('token')).toEqual(expectedToken);
             expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
-                expectedTokenMultimedia
+                expectedTokenMultimedia,
             );
         });
         it('Should renewToken', async () => {
@@ -204,7 +205,7 @@ describe('session', () => {
             await session.checkValidity();
             expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
             expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
-                expectedTokenMultimedia
+                expectedTokenMultimedia,
             );
         });
     });

src/composables/__tests__/useTokenConfig.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { flushPromises } from '@vue/test-utils';
 import { useTokenConfig } from 'composables/useTokenConfig';
 const tokenConfig = useTokenConfig();
 

src/composables/getValueFromPath.js

@@ -0,0 +1,11 @@
+export function getValueFromPath(root, path) {
+    if (!root || !path) return;
+    const keys = path.toString().split('.');
+    let current = root;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}

src/composables/updateMinPriceBeforeSave.js

@@ -0,0 +1,51 @@
+import axios from 'axios';
+
+export async function beforeSave(data, getChanges, modelOrigin) {
+    try {
+        const changes = data.updates;
+        if (!changes) return data;
+        const patchPromises = [];
+
+        for (const change of changes) {
+            let patchData = {};
+
+            if ('hasMinPrice' in change.data) {
+                patchData.hasMinPrice = change.data?.hasMinPrice;
+                delete change.data.hasMinPrice;
+            }
+            if ('minPrice' in change.data) {
+                patchData.minPrice = change.data?.minPrice;
+                delete change.data.minPrice;
+            }
+
+            if (Object.keys(patchData).length > 0) {
+                const promise = axios
+                    .get(`${modelOrigin}/findOne`, {
+                        params: {
+                            filter: {
+                                fields: ['itemFk'],
+                                where: { id: change.where.id },
+                            },
+                        },
+                    })
+                    .then((row) => {
+                        return axios.patch(`Items/${row.data.itemFk}`, patchData);
+                    })
+                    .catch((error) => {
+                        console.error('Error processing change: ', change, error);
+                    });
+
+                patchPromises.push(promise);
+            }
+        }
+
+        await Promise.all(patchPromises);
+
+        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+        return data;
+    } catch (error) {
+        console.error('Error in beforeSave:', error);
+        throw error;
+    }
+}

src/composables/useAcl.js

@@ -30,9 +30,16 @@ export function useAcl() {
         return false;
     }
 
+    function hasAcl(model, prop, accessType) {
+        const modelAcl = state.getAcls().value[model];
+        const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
+        return !!(propAcl?.[accessType] || propAcl?.['*']);
+    }
+
     return {
         fetch,
         hasAny,
         state,
+        hasAcl,
     };
 }

src/composables/useArrayData.js

@@ -5,12 +5,11 @@ import { useArrayDataStore } from 'stores/useArrayDataStore';
 import { buildFilter } from 'filters/filterPanel';
 import { isDialogOpened } from 'src/filters';
 
-const arrayDataStore = useArrayDataStore();
-
 export function useArrayData(key, userOptions) {
     key ??= useRoute().meta.moduleName;
 
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
+    const arrayDataStore = useArrayDataStore(); // Move inside function
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
@@ -56,7 +55,6 @@ export function useArrayData(key, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
-            'keepData',
             'oneRecord',
         ];
         if (typeof userOptions === 'object') {
@@ -108,7 +106,7 @@ export function useArrayData(key, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
+            if (updateStateParams(response.data)?.redirect) return;
         }
         store.isLoading = false;
         canceller = null;
@@ -189,7 +187,7 @@ export function useArrayData(key, userOptions) {
 
         store.order = order;
         resetPagination();
-        fetch({});
+        await fetch({});
         index++;
 
         return { index, order };

src/composables/useFilterParams.js

@@ -14,7 +14,7 @@ export function useFilterParams(key) {
     watch(
         () => arrayData.value.store?.currentFilter,
         (val, oldValue) => (val || oldValue) && setUserParams(val),
-        { immediate: true, deep: true }
+        { immediate: true, deep: true },
     );
 
     function parseOrder(urlOrders) {
@@ -54,7 +54,7 @@ export function useFilterParams(key) {
                     Object.assign(params, item);
                 });
                 delete params[key];
-            } else if (value && typeof value === 'object') {
+            } else if (value && typeof value === 'object' && !Array.isArray(value)) {
                 const param = Object.values(value)[0];
                 if (typeof param == 'string') params[key] = param.replaceAll('%', '');
             }

src/composables/useRole.js

@@ -13,6 +13,7 @@ export function useRole() {
             name: data.user.name,
             nickname: data.user.nickname,
             lang: data.user.lang || 'es',
+            departmentFk: data.user?.worker?.department?.departmentFk,
         };
         state.setUser(userData);
         state.setRoles(roles);

src/composables/useSession.js

@@ -60,7 +60,7 @@ export function useSession() {
                 const { data: isValidToken } = await axios.get('VnUsers/validateToken');
                 if (isValidToken)
                     destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
-                        destroyToken(url, storage, key)
+                        destroyToken(url, storage, key),
                     );
             }
         } finally {

src/composables/useValidator.js

@@ -78,7 +78,8 @@ export function useValidator() {
                 if (min >= 0)
                     if (Math.floor(value) < min) return t('inputMin', { value: min });
             },
-            custom: (value) => validation.bindedFunction(value) || 'Invalid value',
+            custom: (value) =>
+                eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
         };
     };
 

src/css/app.scss

@@ -340,3 +340,6 @@ input::-webkit-inner-spin-button {
 .containerShrinked {
     width: 70%;
 }
+.q-item__section--main ~ .q-item__section--side {
+    padding-inline: 0;
+}

src/css/quasar.variables.scss

@@ -18,6 +18,7 @@ $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
 $warning: #f4b974;
+$neutral: #b0b0b0;
 // Pendiente de cuadrar con la base de datos
 $success: $positive;
 $alert: $negative;
@@ -51,3 +52,6 @@ $width-xl: 1600px;
 .bg-alert {
     background-color: $negative;
 }
+.bg-neutral {
+    background-color: $neutral;
+}

src/i18n/locale/en.yml

@@ -6,6 +6,7 @@ globals:
     quantity: Quantity
     entity: Entity
     preview: Preview
+    scrollToTop: Go up
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
@@ -370,6 +371,11 @@ globals:
         countryCodeFk: Country
         companyFk: Company
         nickname: Alias
+        changedModel: Entity
+        changedModelValue: Search
+        changedModelId: Entity id
+        userFk: User
+        action: Action
     model: Model
     fuel: Fuel
     active: Active
@@ -872,6 +878,11 @@ components:
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
+        name: Nombre
+        rate2: Grouping price
+        rate3: Packing price
+        minPrice: Min. Price
+        itemFk: Item id
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings

src/i18n/locale/es.yml

@@ -6,6 +6,7 @@ globals:
     quantity: Cantidad
     entity: Entidad
     preview: Vista previa
+    scrollToTop: Ir arriba
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
@@ -371,6 +372,11 @@ globals:
         countryCodeFk: País
         companyFk: Empresa
         nickname: Alias
+        changedModel: Entidad
+        changedModelValue: Buscar
+        changedModelId: Id de entidad
+        userFk: Usuario
+        action: Acción
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -956,6 +962,11 @@ components:
         to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
+        name: Nombre
+        rate2: Precio grouping
+        rate3: Precio packing
+        minPrice: Precio mínimo
+        itemFk: Id item
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -100,12 +100,8 @@ const onChangePass = (oldPass) => {
 };
 
 onMounted(() => {
-    hasitManagementAccess.value = useAcl().hasAny([
+    hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
-        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
-    ]);
-    hasSysadminAccess.value = useAcl().hasAny([
-        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
-    ]);
 });
 </script>
 <template>
@@ -227,7 +223,7 @@ onMounted(() => {
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
+        v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
         v-ripple
         clickable
         @click="showSyncDialog = true"

src/pages/Account/Card/AccountDescriptorProxy.vue

@@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
     <QPopupProxy style="max-width: 10px">
         <AccountDescriptor
             v-if="$attrs.id"
-            v-bind="$attrs.id"
+            v-bind="$attrs"
             :summary="AccountSummary"
             :proxy-render="true"
         />

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -28,14 +28,8 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const STATE_COLOR = {
+function stateColor(entity) {
-    pending: 'warning',
+    return entity?.claimState?.classColor;
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-function stateColor(code) {
-    return STATE_COLOR[code];
 }
 
 onMounted(async () => {
@@ -57,9 +51,8 @@ onMounted(async () => {
             <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
-                        :color="stateColor(entity.claimState.code)"
+                        :color="stateColor(entity)"
-                        text-color="black"
+                        style="color: var(--vn-black-text-color)"
-                        dense
                     >
                         {{ entity.claimState.description }}
                     </QBadge>

src/pages/Claim/Card/ClaimLines.vue

@@ -123,8 +123,8 @@ async function fetchMana() {
 
 async function updateDiscount({ saleFk, discount, canceller }) {
     const body = { salesIds: [saleFk], newDiscount: discount };
-    const claimId = claim.value.ticketFk;
+    const ticketFk = claim.value.ticketFk;
-    const query = `Tickets/${claimId}/updateDiscount`;
+    const query = `Tickets/${ticketFk}/updateDiscount`;
 
     await axios.post(query, body, {
         signal: canceller.signal,

src/pages/Claim/Card/ClaimSummary.vue

@@ -108,15 +108,9 @@ const markerLabels = [
     { value: 5, label: t('claim.person') },
 ];
 
-const STATE_COLOR = {
-    pending: 'warning',
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-
 function stateColor(code) {
-    return STATE_COLOR[code];
+    const claimState = claimStates.value.find((state) => state.code === code);
+    return claimState?.classColor;
 }
 
 const developmentColumns = ref([
@@ -188,7 +182,7 @@ function claimUrl(section) {
 <template>
     <FetchData
         url="ClaimStates"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
         @on-fetch="(data) => (claimStates = data)"
         auto-load
     />
@@ -346,17 +340,18 @@ function claimUrl(section) {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
+                                <template v-if="col.name === 'description'">
-                                    t(col.value)
+                                    <span class="link">{{
-                                }}</span>
+                                        dashIfEmpty(col.field(props.row))
-                                <span class="link" v-if="col.name === 'description'">{{
+                                    }}</span>
-                                    t(col.value)
+                                    <ItemDescriptorProxy
-                                }}</span>
+                                        :id="props.row.sale.itemFk"
-                                <ItemDescriptorProxy
+                                        :sale-fk="props.row.saleFk"
-                                    v-if="col.name == 'description'"
+                                    />
-                                    :id="props.row.sale.itemFk"
+                                </template>
-                                    :sale-fk="props.row.saleFk"
+                                <template v-else>
-                                ></ItemDescriptorProxy>
+                                    {{ dashIfEmpty(col.field(props.row)) }}
+                                </template>
                             </QTd>
                         </QTr>
                     </template>

src/pages/Claim/Card/ClaimSummaryAction.vue

@@ -88,13 +88,13 @@ const columns = [
         auto-load
     >
         <template #column-itemFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
         </template>
         <template #column-ticketFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
             </span>

src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 
 describe('ClaimDescriptorMenu', () => {

src/pages/Claim/Card/__tests__/ClaimLines.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimLines from '/src/pages/Claim/Card/ClaimLines.vue';
 
 describe('ClaimLines', () => {

src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js

@@ -1,5 +1,6 @@
 import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimLinesImport from 'pages/Claim/Card/ClaimLinesImport.vue';
 
 describe('ClaimLinesImport', () => {

src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js

@@ -1,7 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import axios from 'axios';
+import { createWrapper } from 'app/test/vitest/helper';
 import ClaimPhoto from 'pages/Claim/Card/ClaimPhoto.vue';
-
 describe('ClaimPhoto', () => {
     let vm;
 
@@ -61,7 +61,7 @@ describe('ClaimPhoto', () => {
                         title: 'This file will be deleted',
                         icon: 'delete',
                         data: { index: 1 },
-                        promise: vm.deleteDms
+                        promise: vm.deleteDms,
                     },
                 })
             );

src/pages/Claim/ClaimFilter.vue

@@ -115,6 +115,7 @@ const props = defineProps({
 <i18n>
 en:
     params:
+        departmentFk: Department
         search: Contains
         clientFk: Customer
         clientName: Customer
@@ -127,6 +128,7 @@ en:
         zoneFk: Zone
 es:
     params:
+        departmentFk: Departamento
         search: Contiene
         clientFk: Cliente
         clientName: Cliente

src/pages/Claim/ClaimList.vue

@@ -101,7 +101,10 @@ const columns = computed(() => [
         name: 'stateCode',
         chip: {
             condition: () => true,
-            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+            color: ({ stateCode }) => {
+                const state = states.value?.find(({ code }) => code === stateCode);
+                return `bg-${state.classColor}`;
+            },
         },
         columnFilter: {
             name: 'claimStateFk',
@@ -131,12 +134,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-const STATE_COLOR = {
-    pending: 'bg-warning',
-    loses: 'bg-negative',
-    resolved: 'bg-positive',
-};
 </script>
 
 <template>

src/pages/Customer/Card/CustomerBalance.vue

@@ -25,7 +25,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
-const { hasAny } = useAcl();
+const { hasAcl } = useAcl();
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -131,6 +131,7 @@ const columns = computed(() => [
         name: 'isConciliate',
         label: t('Conciliated'),
         cardVisible: true,
+        component: 'checkbox',
     },
     {
         align: 'left',
@@ -276,9 +277,7 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="
+                    :disable="!hasAcl('Receipt', '*', 'WRITE')"
-                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
-                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />

src/pages/Customer/Card/CustomerBillingData.vue

@@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnInputBic from 'src/components/common/VnInputBic.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -17,7 +18,7 @@ const bankEntitiesRef = ref(null);
 
 const filter = {
     fields: ['id', 'bic', 'name'],
-    order: 'bic ASC'
+    order: 'bic ASC',
 };
 
 const getBankEntities = (data, formData) => {
@@ -43,13 +44,11 @@ const getBankEntities = (data, formData) => {
             </VnRow>
 
             <VnRow>
-                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
+                <VnInputBic
-                    <template #append>
+                    :label="t('IBAN')"
-                        <QIcon name="info" class="cursor-info">
+                    v-model="data.iban"
-                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                    @update-bic="(bankEntityFk) => (data.bankEntityFk = bankEntityFk)"
-                        </QIcon>
+                />
-                    </template>
-                </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     ref="bankEntitiesRef"

src/pages/Customer/Card/CustomerConsumption.vue

@@ -18,7 +18,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
-const arrayData = useArrayData('Client');
+const arrayData = useArrayData('Customer');
 const { t } = useI18n();
 const route = useRoute();
 const campaignList = ref();
@@ -260,7 +260,7 @@ const updateDateParams = (value, params) => {
                     :label="t('globals.campaign')"
                     :filled="true"
                     class="q-px-sm q-pt-none fit"
-                    :option-label="(opt) => t(opt.code)"
+                    :option-label="(opt) => t(opt.code ?? '')"
                     :fields="['id', 'code', 'dated', 'scopeDays']"
                     @update:model-value="(data) => updateDateParams(data, params)"
                     dense

src/pages/Customer/Card/CustomerDescriptorProxy.vue

@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy>
+    <QPopupProxy data-cy="CustomerDescriptor">
         <CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
     </QPopupProxy>
 </template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -79,7 +79,7 @@ async function acceptPropagate({ isEqualizated }) {
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
-        <template #form="{ data, validate }">
+        <template #form="{ data, validate, validations }">
             <VnRow>
                 <VnInput
                     :label="t('Social name')"
@@ -112,6 +112,7 @@ async function acceptPropagate({ isEqualizated }) {
                     v-model="data.sageTaxTypeFk"
                     data-cy="sageTaxTypeFk"
                     :required="data.isTaxDataChecked"
+                    :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
                 />
                 <VnSelect
                     :label="t('Sage transaction type')"
@@ -122,6 +123,9 @@ async function acceptPropagate({ isEqualizated }) {
                     data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
                     :required="data.isTaxDataChecked"
+                    :rules="[
+                        (val) => validations.required(data.sageTransactionTypeFk, val),
+                    ]"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

src/pages/Customer/Card/CustomerSamples.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
-
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -34,7 +33,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        format: (row) => row.type.description,
+        format: (row) => row?.type?.description,
         label: t('Description'),
         name: 'description',
     },
@@ -74,12 +73,11 @@ const tableRef = ref();
 <template>
     <VnTable
         ref="tableRef"
-        data-key="ClientSamples"
+        data-key="CustomerSamples"
         auto-load
-        :filter="filter"
+        :user-filter="filter"
         url="ClientSamples"
         :columns="columns"
-        :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
         :right-search="false"
         :rows="rows"

src/pages/Customer/Card/CustomerSummary.vue

@@ -84,29 +84,31 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
                 <VnLv :label="t('globals.name')" :value="entity.name" />
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
-                <VnLv :value="entity.phone">
+                <VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
-                    <template #label>
+                    <template #value>
-                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="entity.mobile">
+                <VnLv :label="t('customer.summary.mobile')">
-                    <template #label>
+                    <template #value>
-                        {{ t('customer.summary.mobile') }}
-                        <VnLinkPhone :phone-number="entity.mobile" />
                         <VnLinkPhone
+                            sip
                             say-simple
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
-                            class="q-ml-xs"
                         />
                     </template>
                 </VnLv>
-                <VnLv :value="entity.email" copy
+                <VnLv
-                    ><template #label>
+                    :label="t('globals.params.email')"
-                        {{ t('globals.params.email') }}
+                    :value="entity.email"
-                        <VnLinkMail email="entity.email"></VnLinkMail> </template
+                    class="ellipsis"
-                ></VnLv>
+                    copy
+                >
+                    <template #value>
+                        <VnLinkMail :email="entity.email" />
+                    </template>
+                </VnLv>
                 <VnLv :label="t('globals.department')">
                     <template #value>
                         <span class="link" v-text="entity.department?.name" />
@@ -179,11 +181,11 @@ const sumRisk = ({ clientRisks }) => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
-                    :value="entity.payMethod.name"
+                    :value="entity.payMethod?.name"
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
@@ -206,7 +208,8 @@ const sumRisk = ({ clientRisks }) => {
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv
-                    :label="t('customer.summary.addressName')"
+                    :tooltip="t('customer.summary.addressName')"
+                    :label="t('customer.summary.addressNameAbbr')"
                     :value="entity.defaultAddress.nickname"
                 />
                 <VnLv
@@ -250,7 +253,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.priceIncreasingRate')"
+                    :tooltip="t('customer.summary.priceIncreasingRate')"
+                    :label="t('customer.summary.priceIncreasingRateAbbr')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
                 <VnLv
@@ -259,7 +263,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.claimRate')"
+                    :label="t('customer.summary.claimRateAbbr')"
+                    :tooltip="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
             </QCard>
@@ -287,7 +292,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
-                    :value="toCurrency(entity.creditInsurance)"
+                    :value="`${toCurrency(entity.creditInsurance)} (${entity.classifications[0]?.insurances[0]?.grade || ''})`"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
 
@@ -316,8 +321,9 @@ const sumRisk = ({ clientRisks }) => {
                 />
 
                 <VnLv
-                    :label="t('customer.summary.recommendCredit')"
+                    :label="t('customer.summary.recommendCreditAbbr')"
-                    :value="entity.recommendedCredit"
+                    :tooltip="t('customer.summary.recommendCredit')"
+                    :value="toCurrency(entity.recommendedCredit)"
                 />
             </QCard>
             <QCard class="vn-max">

src/pages/Customer/CustomerFilter.vue

@@ -72,6 +72,7 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
+                        no-one="true"
                     />
                 </QItemSection>
             </QItem>
@@ -154,6 +155,7 @@ en:
         city: City
         phone: Phone
         email: Email
+        departmentFk: Department
         isToBeMailed: Mailed
         isEqualizated: Equailized
         businessTypeFk: Business type
@@ -166,6 +168,7 @@ en:
         postcode: Postcode
 es:
     params:
+        departmentFk: Departamento
         search: Contiene
         fi: NIF
         isActive: Activo

src/pages/Customer/CustomerList.vue

@@ -111,14 +111,11 @@ const columns = computed(() => [
             component: 'number',
         },
         columnField: {
-            component: null,
+            component: markRaw(VnLinkPhone),
-            after: {
+            attrs: ({ model }) => {
-                component: markRaw(VnLinkPhone),
+                return {
-                attrs: ({ model }) => {
+                    'phone-number': model,
-                    return {
+                };
-                        'phone-number': model,
-                    };
-                },
             },
         },
     },

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -192,8 +192,10 @@ en:
         date: L. O. Date
         credit: Credit I.
         defaulterSinced: From
+        departmentFk: Department
 es:
     params:
+        departmentFk: Departamento
         clientFk: Cliente
         countryFk: País
         paymentMethod: F. Pago

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -127,6 +127,7 @@ es:
     Identifier: Identificador
     Social name: Razón social
     Phone: Teléfono
+    Postcode: Código postal
     City: Población
     Email: Email
     Campaign consumption: Consumo campaña