.dockerignore

@@ -1 +0,0 @@
-node_modules

.gitignore

@@ -31,7 +31,6 @@ yarn-error.log*
 # Cypress directories and files
 /test/cypress/videos
 /test/cypress/screenshots
-/junit
 
 # VitePress directories and files
 /docs/.vitepress/cache

Jenkinsfile

@@ -1,7 +1,6 @@
 #!/usr/bin/env groovy
 
 def PROTECTED_BRANCH
-def IS_LATEST
 
 def BRANCH_ENV = [
     test: 'test',
@@ -11,22 +10,19 @@ def BRANCH_ENV = [
 
 node {
     stage('Setup') {
+        env.FRONT_REPLICAS = 1
         env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
+
         PROTECTED_BRANCH = [
             'dev',
             'test',
             'master',
-            'main',
             'beta'
-        ]
+        ].contains(env.BRANCH_NAME)
 
-        IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
+        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
-        IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
-
-       // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
-        echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
 
         configFileProvider([
             configFile(fileId: 'salix-front.properties',
@@ -37,7 +33,7 @@ node {
             props.each {key, value -> echo "${key}: ${value}" }
         }
 
-        if (IS_PROTECTED_BRANCH) {
+        if (PROTECTED_BRANCH) {
             configFileProvider([
                 configFile(fileId: "salix-front.branch.${env.BRANCH_NAME}",
                 variable: 'BRANCH_PROPS_FILE')
@@ -62,19 +58,6 @@ pipeline {
         PROJECT_NAME = 'lilium'
     }
     stages {
-        stage('Version') {
-            when {
-                expression { IS_PROTECTED_BRANCH }
-            }
-            steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    def version = "${packageJson.version}-build${env.BUILD_ID}"
-                    writeFile(file: 'VERSION.txt', text: version)
-                    echo "VERSION: ${version}"
-                }
-            }
-        }
         stage('Install') {
             environment {
                 NODE_ENV = ""
@@ -85,93 +68,48 @@ pipeline {
         }
         stage('Test') {
             when {
-                expression { !IS_PROTECTED_BRANCH }
+                expression { !PROTECTED_BRANCH }
             }
             environment {
-                NODE_ENV = ''
+                NODE_ENV = ""
-                CI = 'true'
-                TZ = 'Europe/Madrid'
             }
-            parallel {
+            steps {
-                stage('Unit') {
+                sh 'pnpm run test:unit:ci'
-                    steps {
+            }
-                        sh 'pnpm run test:front:ci'
+              post {
-                    }
+                always {
-                    post {
+                    junit(
-                        always {
+                        testResults: 'junitresults.xml',
-                            junit(
+                        allowEmptyResults: true
-                                testResults: 'junit/vitest.xml',
+                    )
-                                allowEmptyResults: true
-                            )
-                        }
-                    }
-                }
-                stage('E2E') {
-                    environment {
-                        CREDS = credentials('docker-registry')
-                        COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
-                        COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
-                    }
-                    steps {
-                        script {
-                            sh 'rm -f junit/e2e-*.xml'
-                            sh 'rm -rf test/cypress/screenshots'
-                            env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
-
-                            def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
-
-                            sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
-                            sh "docker-compose ${env.COMPOSE_PARAMS} pull back"
-                            sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
-                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
-
-                            image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 2'
-                            }
-                        }
-                    }
-                    post {
-                        always {
-                            sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
-                            archiveArtifacts artifacts: 'test/cypress/screenshots/**/*', allowEmptyArchive: true
-                            junit(
-                                testResults: 'junit/e2e-*.xml',
-                                allowEmptyResults: true
-                            )
-                        }
-                    }
                 }
             }
         }
         stage('Build') {
             when {
-                expression { IS_PROTECTED_BRANCH }
+                expression { PROTECTED_BRANCH }
             }
             environment {
-                VERSION = readFile 'VERSION.txt'
+                CREDENTIALS = credentials('docker-registry')
             }
             steps {
+                sh 'quasar build'
                 script {
-                    sh 'quasar build'
+                    def packageJson = readJSON file: 'package.json'
-
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
-                    def baseImage = "salix-frontend:${env.VERSION}"
-                    def image = docker.build(baseImage, ".")
-                    docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
-                        image.push()
-                        image.push(env.BRANCH_NAME)
-                        if (IS_LATEST) image.push('latest')
-                    }
                 }
+                dockerBuild()
             }
         }
         stage('Deploy') {
             when {
-                expression { IS_PROTECTED_BRANCH }
+                expression { PROTECTED_BRANCH }
-            }
-            environment {
-                VERSION = readFile 'VERSION.txt'
             }
             steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                }
                 withKubeConfig([
                     serverUrl: "$KUBERNETES_API",
                     credentialsId: 'kubernetes',

README.md

@@ -23,7 +23,7 @@ quasar dev
 ### Run unit tests
 
 ```bash
-pnpm run test:front
+pnpm run test:unit
 ```
 
 ### Run e2e tests
@@ -32,26 +32,8 @@ pnpm run test:front
 pnpm run test:e2e
 ```
 
-### Run e2e parallel
-
-```bash
-pnpm run test:e2e:parallel
-```
-
-### View e2e parallel report
-
-```bash
-pnpm run test:e2e:summary
-```
-
 ### Build the app for production
 
 ```bash
 quasar build
 ```
-
-### Serve the app for production
-
-```bash
-quasar build quasar serve dist/spa --host 0.0.0.0 --proxy=./proxy-serve.js
-```

cypress.config.js

@@ -1,44 +1,12 @@
 import { defineConfig } from 'cypress';
-
+// https://docs.cypress.io/app/tooling/reporters
-let urlHost, reporter, reporterOptions, timeouts;
+// https://docs.cypress.io/app/references/configuration
-
+// https://www.npmjs.com/package/cypress-mochawesome-reporter
-if (process.env.CI) {
-    urlHost = 'front';
-    reporter = 'junit';
-    reporterOptions = {
-        mochaFile: 'junit/e2e-[hash].xml',
-    };
-    timeouts = {
-        defaultCommandTimeout: 30000,
-        requestTimeout: 30000,
-        responseTimeout: 60000,
-        pageLoadTimeout: 60000,
-    };
-} else {
-    urlHost = 'localhost';
-    reporter = 'cypress-mochawesome-reporter';
-    reporterOptions = {
-        charts: true,
-        reportPageTitle: 'Cypress Inline Reporter',
-        reportFilename: '[status]_[datetime]-report',
-        embeddedScreenshots: true,
-        reportDir: 'test/cypress/reports',
-        inlineAssets: true,
-    };
-    timeouts = {
-        defaultCommandTimeout: 10000,
-        requestTimeout: 10000,
-        responseTimeout: 30000,
-        pageLoadTimeout: 60000,
-    };
-}
 
 export default defineConfig({
     e2e: {
-        baseUrl: `http://${urlHost}:9000`,
+        baseUrl: 'http://localhost:9000/',
-        experimentalStudio: false,
+        experimentalStudio: true,
-        trashAssetsBeforeRuns: false,
-        defaultBrowser: 'chromium',
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
@@ -48,17 +16,27 @@ export default defineConfig({
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
         watchForFileChanges: true,
-        reporter,
+        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions,
+        reporterOptions: {
+            charts: true,
+            reportPageTitle: 'Cypress Inline Reporter',
+            reportFilename: '[status]_[datetime]-report',
+            embeddedScreenshots: true,
+            reportDir: 'test/cypress/reports',
+            inlineAssets: true,
+        },
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',
             supportFile: 'test/cypress/support/unit.js',
         },
+        setupNodeEvents: async (on, config) => {
+            const plugin = await import('cypress-mochawesome-reporter/plugin');
+            plugin.default(on);
+
+            return config;
+        },
         viewportWidth: 1280,
         viewportHeight: 720,
-        ...timeouts,
-        includeShadowDom: true,
-        waitForAnimations: true,
     },
 });

docker-compose.yml

@@ -0,0 +1,7 @@
+version: '3.7'
+services:
+  main:
+    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
+    build:
+      context: .
+      dockerfile: ./Dockerfile

docs/Dockerfile.dev

@@ -1,47 +0,0 @@
-FROM debian:12.9-slim
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        ca-certificates \
-        curl \
-        gnupg2 \
-    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g corepack@0.31.0 \
-    && corepack enable pnpm \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update \
-    && apt-get -y --no-install-recommends install \
-        apt-utils \
-        chromium \
-        libasound2 \
-        libgbm-dev \
-        libgtk-3-0 \
-        libgtk2.0-0 \
-        libnotify-dev \
-        libnss3 \
-        libxss1 \
-        libxtst6 \
-        mesa-vulkan-drivers \
-        vulkan-tools \
-        xauth \
-        xvfb \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN groupadd -r -g 1000 app \
-    && useradd -r -u 1000 -g app -m -d /home/app app
-USER app
-
-ENV SHELL=bash
-ENV PNPM_HOME="/home/app/.local/share/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-
-RUN pnpm setup \
-    && pnpm install --global cypress@14.1.0 \
-    && cypress install
-
-WORKDIR /app

package.json

@@ -1,79 +1,74 @@
 {
-    "name": "salix-front",
+  "name": "salix-front",
-    "version": "25.16.0",
+  "version": "25.06.0",
-    "description": "Salix frontend",
+  "description": "Salix frontend",
-    "productName": "Salix",
+  "productName": "Salix",
-    "author": "Verdnatura",
+  "author": "Verdnatura",
-    "private": true,
+  "private": true,
-    "packageManager": "pnpm@8.15.1",
+  "packageManager": "pnpm@8.15.1",
-    "type": "module",
+  "type": "module",
-    "scripts": {
+  "scripts": {
-        "resetDatabase": "cd ../salix && gulp docker",
+    "resetDatabase": "cd ../salix && gulp docker",
-        "lint": "eslint --ext .js,.vue ./",
+    "lint": "eslint --ext .js,.vue ./",
-        "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
+    "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-        "test:e2e": "cypress open",
+    "test:e2e": "cypress open",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+    "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-        "test:e2e:parallel": "bash ./test/cypress/run.sh",
+    "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:e2e:summary": "bash ./test/cypress/summary.sh",
+    "test:unit": "vitest",
-        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
+    "test:unit:ci": "vitest run",
-        "test:front": "vitest",
+    "commitlint": "commitlint --edit",
-        "test:front:ci": "vitest run",
+    "prepare": "npx husky install",
-        "commitlint": "commitlint --edit",
+    "addReferenceTag": "node .husky/addReferenceTag.js",
-        "prepare": "npx husky install",
+    "docs:dev": "vitepress dev docs",
-        "addReferenceTag": "node .husky/addReferenceTag.js",
+    "docs:build": "vitepress build docs",
-        "docs:dev": "vitepress dev docs",
+    "docs:preview": "vitepress preview docs"
-        "docs:build": "vitepress build docs",
+  },
-        "docs:preview": "vitepress preview docs"
+  "dependencies": {
-    },
+    "@quasar/cli": "^2.4.1",
-    "dependencies": {
+    "@quasar/extras": "^1.16.16",
-        "@quasar/cli": "^2.4.1",
+    "axios": "^1.4.0",
-        "@quasar/extras": "^1.16.16",
+    "chromium": "^3.0.3",
-        "axios": "^1.4.0",
+    "croppie": "^2.6.5",
-        "chromium": "^3.0.3",
+    "moment": "^2.30.1",
-        "croppie": "^2.6.5",
+    "pinia": "^2.1.3",
-        "moment": "^2.30.1",
+    "quasar": "^2.17.7",
-        "pinia": "^2.1.3",
+    "validator": "^13.9.0",
-        "quasar": "^2.17.7",
+    "vue": "^3.5.13",
-        "validator": "^13.9.0",
+    "vue-i18n": "^9.3.0",
-        "vue": "^3.5.13",
+    "vue-router": "^4.2.5"
-        "vue-i18n": "^9.3.0",
+  },
-        "vue-router": "^4.2.5"
+  "devDependencies": {
-    },
+    "@commitlint/cli": "^19.2.1",
-    "devDependencies": {
+    "@commitlint/config-conventional": "^19.1.0",
-        "@commitlint/cli": "^19.2.1",
+    "@intlify/unplugin-vue-i18n": "^0.8.2",
-        "@commitlint/config-conventional": "^19.1.0",
+    "@pinia/testing": "^0.1.2",
-        "@intlify/unplugin-vue-i18n": "^0.8.2",
+    "@quasar/app-vite": "^2.0.8",
-        "@pinia/testing": "^0.1.2",
+    "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
-        "@quasar/app-vite": "^2.0.8",
+    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+    "@vue/test-utils": "^2.4.4",
-        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+    "autoprefixer": "^10.4.14",
-        "@vue/test-utils": "^2.4.4",
+    "cypress": "^13.6.6",
-        "autoprefixer": "^10.4.14",
+    "cypress-mochawesome-reporter": "^3.8.2",
-        "cypress": "^14.1.0",
+    "eslint": "^9.18.0",
-        "cypress-mochawesome-reporter": "^3.8.2",
+    "eslint-config-prettier": "^10.0.1",
-        "eslint": "^9.18.0",
+    "eslint-plugin-cypress": "^4.1.0",
-        "eslint-config-prettier": "^10.0.1",
+    "eslint-plugin-vue": "^9.32.0",
-        "eslint-plugin-cypress": "^4.1.0",
+    "husky": "^8.0.0",
-        "eslint-plugin-vue": "^9.32.0",
+    "postcss": "^8.4.23",
-        "husky": "^8.0.0",
+    "prettier": "^3.4.2",
-        "junit-merge": "^2.0.0",
+    "sass": "^1.83.4",
-        "mocha": "^11.1.0",
+    "vitepress": "^1.6.3",
-        "postcss": "^8.4.23",
+    "vitest": "^0.34.0"
-        "prettier": "^3.4.2",
+  },
-        "sass": "^1.83.4",
+  "engines": {
-        "vitepress": "^1.6.3",
+    "node": "^20 || ^18 || ^16",
-        "vitest": "^0.34.0",
+    "npm": ">= 8.1.2",
-        "xunit-viewer": "^10.6.1"
+    "yarn": ">= 1.21.1",
-    },
+    "bun": ">= 1.0.25"
-    "engines": {
+  },
-        "node": "^20 || ^18 || ^16",
+  "overrides": {
-        "npm": ">= 8.1.2",
+    "@vitejs/plugin-vue": "^5.2.1",
-        "yarn": ">= 1.21.1",
+    "vite": "^6.0.11",
-        "bun": ">= 1.0.25"
+    "vitest": "^0.31.1"
-    },
+  }
-    "overrides": {
+}
-        "@vitejs/plugin-vue": "^5.2.1",
-        "vite": "^6.0.11",
-        "vitest": "^0.31.1"
-    }
-}

proxy-serve.js

@@ -1,6 +1,6 @@
 export default [
     {
         path: '/api',
-        rule: { target: 'http://127.0.0.1:3000' },
+        rule: { target: 'http://0.0.0.0:3000' },
     },
 ];

quasar.config.js

@@ -11,7 +11,6 @@
 import { configure } from 'quasar/wrappers';
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
 import path from 'path';
-const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
 
 export default configure(function (/* ctx */) {
     return {
@@ -31,6 +30,7 @@ export default configure(function (/* ctx */) {
         // --> 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'],
 
@@ -109,17 +109,13 @@ export default configure(function (/* ctx */) {
             },
             proxy: {
                 '/api': {
-                    target: target,
+                    target: 'http://0.0.0.0:3000',
                     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

src/boot/defaults/constants.js

@@ -1,2 +0,0 @@
-export const langs = ['en', 'es'];
-export const decimalPlaces = 2;

src/boot/keyShortcut.js

@@ -1,6 +1,6 @@
 export default {
-    mounted(el, binding) {
+    mounted: function (el, binding) {
-        const shortcut = binding.value || '+';
+        const shortcut = binding.value ?? '+';
 
         const { key, ctrl, alt, callback } =
             typeof shortcut === 'string'
@@ -8,24 +8,25 @@ export default {
                       key: shortcut,
                       ctrl: true,
                       alt: true,
-                      callback: () => el?.click(),
+                      callback: () =>
+                          document
+                              .querySelector(`button[shortcut="${shortcut}"]`)
+                              ?.click(),
                   }
                 : binding.value;
 
-        if (!el.hasAttribute('shortcut')) {
-            el.setAttribute('shortcut', key);
-        }
-
         const handleKeydown = (event) => {
             if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
                 callback();
             }
         };
 
+        // Attach the event listener to the window
         window.addEventListener('keydown', handleKeydown);
+
         el._handleKeydown = handleKeydown;
     },
-    unmounted(el) {
+    unmounted: function (el) {
         if (el._handleKeydown) {
             window.removeEventListener('keydown', el._handleKeydown);
         }

src/boot/qformMixin.js

@@ -9,19 +9,19 @@ export default {
         if (!form) return;
         try {
             const inputsFormCard = form.querySelectorAll(
-                `input:not([disabled]):not([type="checkbox"])`,
+                `input:not([disabled]):not([type="checkbox"])`
             );
             if (inputsFormCard.length) {
                 focusFirstInput(inputsFormCard[0]);
             }
             const textareas = document.querySelectorAll(
-                'textarea:not([disabled]), [contenteditable]:not([disabled])',
+                'textarea:not([disabled]), [contenteditable]:not([disabled])'
             );
             if (textareas.length) {
                 focusFirstInput(textareas[textareas.length - 1]);
             }
             const inputs = document.querySelectorAll(
-                'form#formModel input:not([disabled]):not([type="checkbox"])',
+                'form#formModel input:not([disabled]):not([type="checkbox"])'
             );
             const input = inputs[0];
             if (!input) return;
@@ -30,5 +30,22 @@ export default {
         } catch (error) {
             console.error(error);
         }
+        form.addEventListener('keyup', function (evt) {
+            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
+                const input = evt.target;
+                if (input.type == 'textarea' && evt.shiftKey) {
+                    evt.preventDefault();
+                    let { selectionStart, selectionEnd } = input;
+                    input.value =
+                        input.value.substring(0, selectionStart) +
+                        '\n' +
+                        input.value.substring(selectionEnd);
+                    selectionStart = selectionEnd = selectionStart + 1;
+                    return;
+                }
+                evt.preventDefault();
+                that.onSubmit();
+            }
+        });
     },
 };

src/boot/quasar.js

@@ -51,5 +51,4 @@ export default boot(({ app }) => {
 
         await useCau(response, message);
     };
-    app.provide('app', app);
 });

src/components/CreateBankEntityForm.vue

@@ -14,7 +14,7 @@ const { t } = useI18n();
 const bicInputRef = ref(null);
 const state = useState();
 
-const customer = computed(() => state.get('Customer'));
+const customer = computed(() => state.get('customer'));
 
 const countriesFilter = {
     fields: ['id', 'name', 'code'],

src/components/CrudModel.vue

@@ -64,10 +64,6 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
-    beforeSaveFn: {
-        type: Function,
-        default: null,
-    },
     goTo: {
         type: String,
         default: '',
@@ -180,20 +176,14 @@ async function saveChanges(data) {
         hasChanges.value = false;
         return;
     }
-    let changes = data || getChanges();
+    const changes = data || getChanges();
-    if ($props.beforeSaveFn) changes = await $props.beforeSaveFn(changes, getChanges);
-
     try {
-        if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
-            return;
-        }
-
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } finally {
         isLoading.value = false;
     }
     originalData.value = JSON.parse(JSON.stringify(formData.value));
-    if (changes?.creates?.length) await vnPaginateRef.value.fetch();
+    if (changes.creates?.length) await vnPaginateRef.value.fetch();
 
     hasChanges.value = false;
     emit('saveChanges', data);
@@ -239,12 +229,12 @@ async function remove(data) {
                 componentProps: {
                     title: t('globals.confirmDeletion'),
                     message: t('globals.confirmDeletionMessage'),
-                    data: { deletes: ids },
+                    newData,
                     ids,
-                    promise: saveChanges,
                 },
             })
             .onOk(async () => {
+                await saveChanges({ deletes: ids });
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
@@ -384,8 +374,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                v-shortcut="'s'"
-                shortcut="s"
                 data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />

src/components/FilterItemForm.vue

@@ -188,7 +188,7 @@ const selectItem = ({ id }) => {
             >
                 <template #body-cell-id="{ row }">
                     <QTd auto-width @click.stop>
-                        <QBtn flat class="link">{{ row.id }}</QBtn>
+                        <QBtn flat color="blue">{{ row.id }}</QBtn>
                         <ItemDescriptorProxy :id="row.id" />
                     </QTd>
                 </template>

src/components/FilterTravelForm.vue

@@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
     <FetchData
         url="AgencyModes"
         @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
         auto-load
     />
     <FetchData
@@ -181,7 +181,6 @@ const selectTravel = ({ id }) => {
                     color="primary"
                     :disabled="isLoading"
                     :loading="isLoading"
-                    data-cy="save-filter-travel-form"
                 />
             </div>
             <QTable
@@ -192,11 +191,10 @@ const selectTravel = ({ id }) => {
                 :no-data-label="t('Enter a new search')"
                 class="q-mt-lg"
                 @row-click="(_, row) => selectTravel(row)"
-                data-cy="table-filter-travel-form"
             >
                 <template #body-cell-id="{ row }">
-                    <QTd auto-width @click.stop data-cy="travelFk-travel-form">
+                    <QTd auto-width @click.stop>
-                        <QBtn flat class="link">{{ row.id }}</QBtn>
+                        <QBtn flat color="blue">{{ row.id }}</QBtn>
                         <TravelDescriptorProxy :id="row.id" />
                     </QTd>
                 </template>

src/components/FormModel.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch, nextTick, useAttrs } from 'vue';
+import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
 import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -12,7 +12,6 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 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();
@@ -23,7 +22,6 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
-const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -86,7 +84,7 @@ const $props = defineProps({
     },
     reload: {
         type: Boolean,
-        default: true,
+        default: false,
     },
     defaultTrim: {
         type: Boolean,
@@ -96,10 +94,6 @@ const $props = defineProps({
         type: [String, Boolean],
         default: '800px',
     },
-    onDataSaved: {
-        type: Function,
-        default: () => {},
-    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
@@ -111,15 +105,15 @@ const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
-const originalData = computed(() => state.get(modelValue));
+const originalData = ref({});
-const formData = ref();
+const formData = computed(() => state.get(modelValue));
 const defaultButtons = computed(() => ({
     save: {
         dataCy: 'saveDefaultBtn',
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: async () => await save(),
+        click: () => myForm.value.submit(),
         type: 'submit',
     },
     reset: {
@@ -133,6 +127,8 @@ const defaultButtons = computed(() => ({
 }));
 
 onMounted(async () => {
+    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
+
     nextTick(() => (componentIsRendered.value = true));
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
@@ -164,18 +160,10 @@ if (!$props.url)
         (val) => updateAndEmit('onFetch', { val }),
     );
 
-watch(
-    originalData,
-    (val) => {
-        if (val) formData.value = JSON.parse(JSON.stringify(val));
-    },
-    { immediate: true },
-);
-
 watch(
     () => [$props.url, $props.filter],
     async () => {
-        state.set(modelValue, null);
+        originalData.value = null;
         reset();
         await fetch();
     },
@@ -210,6 +198,7 @@ async function fetch() {
         updateAndEmit('onFetch', { val: data });
     } catch (e) {
         state.set(modelValue, {});
+        originalData.value = {};
         throw e;
     }
 }
@@ -252,7 +241,6 @@ async function saveAndGo() {
 }
 
 function reset() {
-    formData.value = JSON.parse(JSON.stringify(originalData.value));
     updateAndEmit('onFetch', { val: originalData.value });
     if ($props.observeFormChanges) {
         hasChanges.value = false;
@@ -277,6 +265,7 @@ function filter(value, update, filterOptions) {
 
 function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: null }) {
     state.set(modelValue, val);
+    originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;
 
     emit(evt, state.get(modelValue), res, old);
@@ -289,27 +278,6 @@ function trimData(data) {
     }
     return data;
 }
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
-async function onKeyup(evt) {
-    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
-        const input = evt.target;
-        if (input.type == 'textarea' && evt.shiftKey) {
-            let { selectionStart, selectionEnd } = input;
-            input.value =
-                input.value.substring(0, selectionStart) +
-                '\n' +
-                input.value.substring(selectionEnd);
-            selectionStart = selectionEnd = selectionStart + 1;
-            return;
-        }
-        await save();
-    }
-}
 
 defineExpose({
     save,
@@ -325,13 +293,12 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit.prevent
+            @submit="save"
-            @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
-            :mapper="onBeforeSave"
+            :prevent-submit="$attrs['prevent-submit']"
         >
             <QCard>
                 <slot

src/components/FormModelPopup.vue

@@ -1,13 +1,12 @@
 <script setup>
-import { ref, computed, useAttrs, nextTick } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
 
 import FormModel from 'components/FormModel.vue';
 
 const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
 
-const props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',
@@ -16,41 +15,23 @@ const props = defineProps({
         type: String,
         default: '',
     },
-    showSaveAndContinueBtn: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const { t } = useI18n();
-const attrs = useAttrs();
+
-const state = useState();
 const formModelRef = ref(null);
 const closeButton = ref(null);
-const isSaveAndContinue = ref(props.showSaveAndContinueBtn);
-const isLoading = computed(() => formModelRef.value?.isLoading);
-const reset = computed(() => formModelRef.value?.reset);
 
-const onDataSaved = async (formData, requestResponse) => {
+const onDataSaved = (formData, requestResponse) => {
-    if (!isSaveAndContinue.value) closeButton.value?.click();
+    if (closeButton.value) closeButton.value.click();
-    if (isSaveAndContinue.value) {
-        await nextTick();
-        state.set(attrs.model, attrs.formInitialData);
-    }
-    isSaveAndContinue.value = props.showSaveAndContinueBtn;
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async (saveAndContinue) => {
+const isLoading = computed(() => formModelRef.value?.isLoading);
-    isSaveAndContinue.value = saveAndContinue;
-    await formModelRef.value.save();
-};
 
 defineExpose({
     isLoading,
     onDataSaved,
-    isSaveAndContinue,
-    reset,
 });
 </script>
 
@@ -78,16 +59,15 @@ defineExpose({
                     flat
                     :disabled="isLoading"
                     :loading="isLoading"
-                    data-cy="FormModelPopup_cancel"
-                    v-close-popup
-                    z-max
                     @click="emit('onDataCanceled')"
+                    v-close-popup
+                    data-cy="FormModelPopup_cancel"
+                    z-max
                 />
                 <QBtn
-                    :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="onClick(false)"
+                    type="submit"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
@@ -95,18 +75,6 @@ defineExpose({
                     data-cy="FormModelPopup_save"
                     z-max
                 />
-                <QBtn
-                    v-if="showSaveAndContinueBtn"
-                    :label="t('globals.isSaveAndContinue')"
-                    :title="t('globals.isSaveAndContinue')"
-                    color="primary"
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    data-cy="FormModelPopup_isSaveAndContinue"
-                    z-max
-                    @click="onClick(true)"
-                />
             </div>
         </template>
     </FormModel>

src/components/ItemsFilterPanel.vue

@@ -198,7 +198,8 @@ const setCategoryList = (data) => {
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
                         dense
-                        filled
+                        outlined
+                        rounded
                         use-input
                         :disable="!selectedCategoryFk"
                         @update:model-value="
@@ -234,7 +235,8 @@ const setCategoryList = (data) => {
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         dense
-                        filled
+                        outlined
+                        rounded
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -250,7 +252,8 @@ const setCategoryList = (data) => {
                         option-value="value"
                         option-label="value"
                         dense
-                        filled
+                        outlined
+                        rounded
                         emit-value
                         use-input
                         :disable="!value"
@@ -262,6 +265,7 @@ const setCategoryList = (data) => {
                         v-model="value.value"
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
+                        is-outlined
                         :is-clearable="false"
                         @keyup.enter="applyTags(params, searchFn)"
                     />
@@ -277,7 +281,7 @@ const setCategoryList = (data) => {
             <QItem class="q-mt-lg">
                 <QBtn
                     icon="add_circle"
-                    v-shortcut="'+'"
+                    shortcut="+"
                     flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"
@@ -323,6 +327,7 @@ en:
         active: Is active
         visible: Is visible
         floramondo: Is floramondo
+        salesPersonFk: Buyer
         categoryFk: Category
 
 es:
@@ -333,6 +338,7 @@ es:
         active: Activo
         visible: Visible
         floramondo: Floramondo
+        salesPersonFk: Comprador
         categoryFk: Categoría
     Plant: Planta natural
     Flower: Flor fresca

src/components/LeftMenu.vue

@@ -41,6 +41,7 @@ const filteredItems = computed(() => {
         return locale.includes(normalizedSearch);
     });
 });
+
 const filteredPinnedModules = computed(() => {
     if (!search.value) return pinnedModules.value;
     const normalizedSearch = search.value
@@ -71,13 +72,12 @@ watch(
         items.value = [];
         getRoutes();
     },
-    { deep: true },
+    { deep: true }
 );
 
 function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
-        if (!item?.children) return;
         for (const child of item.children) {
             if (search?.indexOf(child.name) > -1) {
                 matches.push(child);
@@ -93,7 +93,7 @@ function findMatches(search, item) {
 }
 
 function addChildren(module, route, parent) {
-    const menus = route?.meta?.menu;
+    const menus = route?.meta?.menu ?? route?.menus?.[props.source]; //backwards compatible
     if (!menus) return;
 
     const matches = findMatches(menus, route);
@@ -104,40 +104,43 @@ function addChildren(module, route, parent) {
 }
 
 function getRoutes() {
-    const handleRoutes = {
+    if (props.source === 'main') {
-        main: getMainRoutes,
+        const modules = Object.assign([], navigation.getModules().value);
-        card: getCardRoutes,
-    };
-    handleRoutes[props.source]();
-}
-function getMainRoutes() {
-    const modules = Object.assign([], navigation.getModules().value);
 
-    for (const item of modules) {
+        for (const item of modules) {
-        const moduleDef = routes.find(
+            const moduleDef = routes.find(
-            (route) => toLowerCamel(route.name) === item.module,
+                (route) => toLowerCamel(route.name) === item.module
-        );
+            );
-        if (!moduleDef) continue;
+            if (!moduleDef) continue;
-        item.children = [];
+            item.children = [];
-        addChildren(item.module, moduleDef, item.children);
+
+            addChildren(item.module, moduleDef, item.children);
+        }
+
+        items.value = modules;
     }
 
-    items.value = modules;
+    if (props.source === 'card') {
+        const currentRoute = route.matched[1];
+        const currentModule = toLowerCamel(currentRoute.name);
+        let moduleDef = routes.find(
+            (route) => toLowerCamel(route.name) === currentModule
+        );
+
+        if (!moduleDef) return;
+        if (!moduleDef?.menus) moduleDef = betaGetRoutes();
+        addChildren(currentModule, moduleDef, items.value);
+    }
 }
 
-function getCardRoutes() {
+function betaGetRoutes() {
-    const currentRoute = route.matched[1];
+    let menuRoute;
-    const currentModule = toLowerCamel(currentRoute.name);
-    let moduleDef;
-
     let index = route.matched.length - 1;
-    while (!moduleDef && index > 0) {
+    while (!menuRoute && index > 0) {
-        if (route.matched[index]?.meta?.menu) moduleDef = route.matched[index];
+        if (route.matched[index]?.meta?.menu) menuRoute = route.matched[index];
         index--;
     }
-
+    return menuRoute;
-    if (!moduleDef) return;
-    addChildren(currentModule, moduleDef, items.value);
 }
 
 async function togglePinned(item, event) {
@@ -220,16 +223,9 @@ const searchModule = () => {
                 </template>
                 <template v-for="(item, index) in filteredItems" :key="item.name">
                     <template
-                        v-if="
+                        v-if="search ||item.children && !filteredPinnedModules.has(item.name)"
-                            search ||
-                            (item.children && !filteredPinnedModules.has(item.name))
-                        "
                     >
-                        <LeftMenuItem
+                        <LeftMenuItem :item="item" group="modules" :class="search && index === 0 ? 'searched' : ''">
-                            :item="item"
-                            group="modules"
-                            :class="search && index === 0 ? 'searched' : ''"
-                        >
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -346,7 +342,7 @@ const searchModule = () => {
 .header {
     color: var(--vn-label-color);
 }
-.searched {
+.searched{
     background-color: var(--vn-section-hover-color);
 }
 </style>

src/components/LeftMenuItem.vue

@@ -26,7 +26,6 @@ const itemComputed = computed(() => {
         :to="{ name: itemComputed.name }"
         clickable
         v-ripple
-        :data-cy="`${itemComputed.name}-menu-item`"
     >
         <QItemSection avatar v-if="itemComputed.icon">
             <QIcon :name="itemComputed.icon" />

src/components/NavBar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
@@ -18,14 +18,6 @@ const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
 const pinnedModulesRef = ref();
-const hostname = window.location.hostname;
-const env = ref();
-
-const getEnvironment = computed(() => {
-    env.value = hostname.split('-');
-    if (env.value.length <= 1) return;
-    return env.value[0];
-});
 
 onMounted(() => stateStore.setMounted());
 const refresh = () => window.location.reload();
@@ -57,9 +49,6 @@ const refresh = () => window.location.reload();
                         {{ t('globals.backToDashboard') }}
                     </QTooltip>
                 </QBtn>
-                <QBadge v-if="getEnvironment" color="primary" align="top">
-                    {{ getEnvironment }}
-                </QBadge>
             </RouterLink>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
             <QSpinner
@@ -68,7 +57,7 @@ const refresh = () => window.location.reload();
                 :class="{
                     'no-visible': !stateQuery.isLoading().value,
                 }"
-                size="sm"
+                size="xs"
                 data-cy="loading-spinner"
             />
             <QSpace />
@@ -96,15 +85,7 @@ const refresh = () => window.location.reload();
                     </QTooltip>
                     <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
-                <QBtn
+                <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
-                    class="q-pa-none"
-                    rounded
-                    dense
-                    flat
-                    no-wrap
-                    id="user"
-                    data-cy="userPanel_btn"
-                >
                     <VnAvatar
                         :worker-id="user.id"
                         :title="user.name"

src/components/RefundInvoiceForm.vue

@@ -9,7 +9,6 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 const $props = defineProps({
     invoiceOutData: {
@@ -132,11 +131,15 @@ const refund = async () => {
                         :required="true"
                     /> </VnRow
                 ><VnRow>
-                    <VnCheckbox
+                    <div>
-                        v-model="invoiceParams.inheritWarehouse"
+                        <QCheckbox
-                        :label="t('Inherit warehouse')"
+                            :label="t('Inherit warehouse')"
-                        :info="t('Inherit warehouse tooltip')"
+                            v-model="invoiceParams.inheritWarehouse"
-                    />
+                        />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>
+                        </QIcon>
+                    </div>
                 </VnRow>
             </template>
         </FormPopup>

src/components/TicketProblems.vue

@@ -4,87 +4,39 @@ import { toCurrency } from 'src/filters';
 defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
-    <span class="q-gutter-x-xs">
+    <span>
-        <router-link
-            v-if="row.claim?.claimFk"
-            :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
-            class="link"
-        >
-            <QIcon name="vn:claims" size="xs">
-                <QTooltip>
-                    {{ $t('ticketSale.claim') }}:
-                    {{ row.claim?.claimFk }}
-                </QTooltip>
-            </QIcon>
-        </router-link>
         <QIcon
-            v-if="row?.isDeleted"
+            v-if="row.isTaxDataChecked === 0"
+            name="vn:no036"
             color="primary"
-            name="vn:deletedTicket"
             size="xs"
-            data-cy="ticketDeletedIcon"
         >
-            <QTooltip>
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-                {{ t('Ticket deleted') }}
+        </QIcon>
-            </QTooltip>
+        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasRisk"
+            v-if="row.risk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
         >
             <QTooltip>
                 {{ $t('salesTicketsTable.risk') }}:
-                {{ toCurrency(row.risk - (row.credit ?? 0)) }}
+                {{ toCurrency(row.risk - row.credit) }}
             </QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
-            v-if="row?.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="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
-            <QTooltip>
-                {{ $t('ticket.summary.hasItemDelay') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
-            <QTooltip>
-                {{ $t('salesTicketsTable.hasItemLost') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row?.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">
-            <QTooltip>
-                {{ $t('ticketList.rounding') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row?.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">
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row?.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">
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/TransferInvoiceForm.vue

@@ -10,7 +10,6 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import VnCheckbox from './common/VnCheckbox.vue';
 
 const $props = defineProps({
     invoiceOutData: {
@@ -87,7 +86,7 @@ const makeInvoice = async () => {
             (data) => (
                 (rectificativeTypeOptions = data),
                 (transferInvoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias',
+                    (type) => type.description == 'I – Por diferencias'
                 )[0].id)
             )
         "
@@ -100,7 +99,7 @@ const makeInvoice = async () => {
             (data) => (
                 (siiTypeInvoiceOutsOptions = data),
                 (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4',
+                    (type) => type.code == 'R4'
                 )[0].id)
             )
         "
@@ -122,6 +121,7 @@ const makeInvoice = async () => {
                 <VnRow>
                     <VnSelect
                         :label="t('Client')"
+                        :options="clientsOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"
@@ -186,11 +186,15 @@ const makeInvoice = async () => {
                     />
                 </VnRow>
                 <VnRow>
-                    <VnCheckbox
+                    <div>
-                        v-model="checked"
+                        <QCheckbox
-                        :label="t('Bill destination client')"
+                            :label="t('Bill destination client')"
-                        :info="t('transferInvoiceInfo')"
+                            v-model="checked"
-                    />
+                        />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
+                        </QIcon>
+                    </div>
                 </VnRow>
             </template>
         </FormPopup>

src/components/VnTable/VnColumn.vue

@@ -1,8 +1,9 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QIcon, QToggle } from 'quasar';
+import { QIcon, QCheckbox } from 'quasar';
 import { dashIfEmpty } from 'src/filters';
 
+/* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
 import VnSelectCache from 'components/common/VnSelectCache.vue';
 import VnInput from 'components/common/VnInput.vue';
@@ -11,11 +12,8 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnComponent from 'components/common/VnComponent.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
-import VnSelectEnum from '../common/VnSelectEnum.vue';
-import VnCheckbox from '../common/VnCheckbox.vue';
 
 const model = defineModel(undefined, { required: true });
-const emit = defineEmits(['blur']);
 const $props = defineProps({
     column: {
         type: Object,
@@ -41,22 +39,12 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    autofocus: {
-        type: Boolean,
-        default: false,
-    },
     showLabel: {
         type: Boolean,
         default: null,
     },
-    eventHandlers: {
-        type: Object,
-        default: null,
-    },
 });
 
-const label = $props.showLabel && $props.column.label ? $props.column.label : '';
-
 const defaultSelect = {
     attrs: {
         row: $props.row,
@@ -64,7 +52,7 @@ const defaultSelect = {
         class: 'fit',
     },
     forceAttrs: {
-        label,
+        label: $props.showLabel && $props.column.label,
     },
 };
 
@@ -76,7 +64,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     number: {
@@ -86,7 +74,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     date: {
@@ -98,7 +86,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     time: {
@@ -107,12 +95,11 @@ const defaultComponents = {
             disable: !$props.isEditable,
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     checkbox: {
-        ref: 'checkbox',
+        component: markRaw(QCheckbox),
-        component: markRaw(VnCheckbox),
         attrs: ({ model }) => {
             const defaultAttrs = {
                 disable: !$props.isEditable,
@@ -127,11 +114,7 @@ const defaultComponents = {
             return defaultAttrs;
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
-            autofocus: true,
-        },
-        events: {
-            blur: () => emit('blur'),
         },
     },
     select: {
@@ -142,19 +125,12 @@ const defaultComponents = {
         component: markRaw(VnSelect),
         ...defaultSelect,
     },
-    selectEnum: {
-        component: markRaw(VnSelectEnum),
-        ...defaultSelect,
-    },
     icon: {
         component: markRaw(QIcon),
     },
     userLink: {
         component: markRaw(VnUserLink),
     },
-    toggle: {
-        component: markRaw(QToggle),
-    },
 };
 
 const value = computed(() => {
@@ -184,28 +160,7 @@ const col = computed(() => {
     return newColumn;
 });
 
-const components = computed(() => {
+const components = computed(() => $props.components ?? defaultComponents);
-    const sourceComponents = $props.components ?? defaultComponents;
-
-    return Object.keys(sourceComponents).reduce((acc, key) => {
-        const component = sourceComponents[key];
-
-        if (!component || typeof component !== 'object') {
-            acc[key] = component;
-            return acc;
-        }
-
-        acc[key] = {
-            ...component,
-            attrs: {
-                ...(component.attrs || {}),
-                autofocus: $props.autofocus,
-            },
-            event: { ...component?.event, ...$props?.eventHandlers },
-        };
-        return acc;
-    }, {});
-});
 </script>
 <template>
     <div class="row no-wrap">

src/components/VnTable/VnFilter.vue

@@ -1,13 +1,14 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QCheckbox, QToggle } from 'quasar';
+import { QCheckbox } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
+
+/* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import VnCheckbox from 'components/common/VnCheckbox.vue';
+import VnTableColumn from 'components/VnTable/VnColumn.vue';
-import VnColumn from 'components/VnTable/VnColumn.vue';
 
 const $props = defineProps({
     column: {
@@ -26,10 +27,6 @@ const $props = defineProps({
         type: String,
         default: 'table',
     },
-    customClass: {
-        type: String,
-        default: '',
-    },
 });
 
 defineExpose({ addFilter, props: $props });
@@ -37,7 +34,7 @@ defineExpose({ addFilter, props: $props });
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData(
     $props.dataKey,
-    $props.searchUrl ? { searchUrl: $props.searchUrl } : null,
+    $props.searchUrl ? { searchUrl: $props.searchUrl } : null
 );
 const columnFilter = computed(() => $props.column?.columnFilter);
 
@@ -49,18 +46,19 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
+    class: 'q-px-xs q-pb-xs q-pt-none fit',
     dense: true,
 };
 
 const forceAttrs = {
-    label: $props.showTitle ? '' : (columnFilter.value?.label ?? $props.column.label),
+    label: $props.showTitle ? '' : columnFilter.value?.label ?? $props.column.label,
 };
 
 const selectComponent = {
     component: markRaw(VnSelect),
     event: updateEvent,
     attrs: {
-        class: `q-pt-none fit ${$props.customClass}`,
+        class: 'q-px-sm q-pb-xs q-pt-none fit',
         dense: true,
         filled: !$props.showTitle,
     },
@@ -92,6 +90,7 @@ const components = {
         event: updateEvent,
         attrs: {
             ...defaultAttrs,
+            style: 'min-width: 150px',
         },
         forceAttrs,
     },
@@ -107,27 +106,17 @@ const components = {
         },
     },
     checkbox: {
-        component: markRaw(VnCheckbox),
+        component: markRaw(QCheckbox),
         event: updateEvent,
         attrs: {
-            class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
+            dense: true,
+            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs fit',
             'toggle-indeterminate': true,
-            size: 'sm',
         },
         forceAttrs,
     },
     select: selectComponent,
     rawSelect: selectComponent,
-    toggle: {
-        component: markRaw(QToggle),
-        event: updateEvent,
-        attrs: {
-            class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
-            'toggle-indeterminate': true,
-            size: 'sm',
-        },
-        forceAttrs,
-    },
 };
 
 async function addFilter(value, name) {
@@ -143,8 +132,19 @@ async function addFilter(value, name) {
     await arrayData.addFilter({ params: { [field]: value } });
 }
 
+function alignRow() {
+    switch ($props.column.align) {
+        case 'left':
+            return 'justify-start items-start';
+        case 'right':
+            return 'justify-end items-end';
+        default:
+            return 'flex-center';
+    }
+}
+
 const showFilter = computed(
-    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions',
+    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
 );
 
 const onTabPressed = async () => {
@@ -152,8 +152,13 @@ const onTabPressed = async () => {
 };
 </script>
 <template>
-    <div v-if="showFilter" class="full-width" style="overflow: hidden">
+    <div
-        <VnColumn
+        v-if="showFilter"
+        class="full-width"
+        :class="alignRow()"
+        style="max-height: 45px; overflow: hidden"
+    >
+        <VnTableColumn
             :column="$props.column"
             default="input"
             v-model="model"
@@ -163,8 +168,3 @@ const onTabPressed = async () => {
         />
     </div>
 </template>
-<style lang="scss" scoped>
-label.vn-label-padding > .q-field__inner > .q-field__control {
-    padding: inherit !important;
-}
-</style>

src/components/VnTable/VnOrder.vue

@@ -23,10 +23,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    align: {
-        type: String,
-        default: 'end',
-    },
 });
 const hover = ref();
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
@@ -45,78 +41,55 @@ async function orderBy(name, direction) {
             break;
     }
     if (!direction) return await arrayData.deleteOrder(name);
-
     await arrayData.addOrder(name, direction);
 }
 
 defineExpose({ orderBy });
-
-function textAlignToFlex(textAlign) {
-    return `justify-content: ${
-        {
-            'text-center': 'center',
-            'text-left': 'start',
-            'text-right': 'end',
-        }[textAlign] || 'start'
-    };`;
-}
 </script>
 <template>
     <div
         @mouseenter="hover = true"
         @mouseleave="hover = false"
         @click="orderBy(name, model?.direction)"
-        class="items-center no-wrap cursor-pointer title"
+        class="row items-center no-wrap cursor-pointer"
-        :style="textAlignToFlex(align)"
     >
         <span :title="label">{{ label }}</span>
-        <div v-if="name && (model?.index || vertical)">
+        <QChip
-            <QChip
+            v-if="name"
-                :label="!vertical ? model?.index : ''"
+            :label="!vertical ? model?.index : ''"
-                :icon="
+            :icon="
-                    (model?.index || hover) && !vertical
+                (model?.index || hover) && !vertical
-                        ? model?.direction == 'DESC'
+                    ? model?.direction == 'DESC'
-                            ? 'arrow_downward'
+                        ? 'arrow_downward'
-                            : 'arrow_upward'
+                        : 'arrow_upward'
-                        : undefined
+                    : undefined
-                "
+            "
-                :size="vertical ? '' : 'sm'"
+            :size="vertical ? '' : 'sm'"
-                :class="[
+            :class="[
-                    model?.index ? 'color-vn-text' : 'bg-transparent',
+                model?.index ? 'color-vn-text' : 'bg-transparent',
-                    vertical ? 'q-mx-none q-py-lg' : '',
+                vertical ? 'q-px-none' : '',
-                ]"
+            ]"
-                class="no-box-shadow"
+            class="no-box-shadow"
-                :clickable="true"
+            :clickable="true"
-                style="min-width: 40px; max-height: 30px"
+            style="min-width: 40px"
+        >
+            <div
+                class="column flex-center"
+                v-if="vertical"
+                :style="!model?.index && 'color: #5d5d5d'"
             >
-                <div
+                {{ model?.index }}
-                    class="column justify-center text-center"
+                <QIcon
-                    v-if="vertical"
+                    :name="
-                    :style="!model?.index && 'color: #5d5d5d'"
+                        model?.index
-                >
+                            ? model?.direction == 'DESC'
-                    {{ model?.index }}
+                                ? 'arrow_downward'
-                    <QIcon
+                                : 'arrow_upward'
-                        :name="
+                            : 'swap_vert'
-                            model?.index
+                    "
-                                ? model?.direction == 'DESC'
+                    size="xs"
-                                    ? 'arrow_downward'
+                />
-                                    : 'arrow_upward'
+            </div>
-                                : 'swap_vert'
+        </QChip>
-                        "
-                        size="xs"
-                    />
-                </div>
-            </QChip>
-        </div>
     </div>
 </template>
-<style lang="scss" scoped>
-.title {
-    display: flex;
-    align-items: center;
-    height: 30px;
-    width: 100%;
-    color: var(--vn-label-color);
-    white-space: nowrap;
-}
-</style>

src/components/VnTable/VnTable.vue

@@ -1,39 +1,22 @@
 <script setup>
-import {
+import { ref, onBeforeMount, onMounted, computed, watch, useAttrs } from 'vue';
-    ref,
-    onBeforeMount,
-    onMounted,
-    onUnmounted,
-    computed,
-    watch,
-    h,
-    render,
-    inject,
-    useAttrs,
-    nextTick,
-} from 'vue';
-import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-import { useQuasar, date } from 'quasar';
+import { useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
-import { dashIfEmpty, toDate } from 'src/filters';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
-import VnColumn from 'components/VnTable/VnColumn.vue';
+import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 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';
 
-const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
     columns: {
         type: Array,
@@ -51,6 +34,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    rightSearchIcon: {
+        type: Boolean,
+        default: true,
+    },
     rowClick: {
         type: [Function, Boolean],
         default: null,
@@ -127,23 +114,7 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    withFilters: {
-        type: Boolean,
-        default: true,
-    },
-    overlay: {
-        type: Boolean,
-        default: false,
-    },
-    createComplement: {
-        type: Object,
-    },
-    dataCy: {
-        type: String,
-        default: 'vnTable',
-    },
 });
-
 const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
@@ -161,17 +132,10 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
-const createRef = ref(null);
 const tableRef = ref();
 const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
-const app = inject('app');
 
-const editingRow = ref(null);
-const editingField = ref(null);
-const isTableMode = computed(() => mode.value == TABLE_MODE);
-const selectRegex = /select/;
-const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 const tableModes = [
     {
         icon: 'view_column',
@@ -192,8 +156,7 @@ onBeforeMount(() => {
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
 });
 
-onMounted(async () => {
+onMounted(() => {
-    if ($props.isEditable) document.addEventListener('click', clickHandler);
     mode.value =
         quasar.platform.is.mobile && !$props.disableOption?.card
             ? CARD_MODE
@@ -215,25 +178,14 @@ onMounted(async () => {
     }
 });
 
-onUnmounted(async () => {
-    if ($props.isEditable) document.removeEventListener('click', clickHandler);
-});
-
 watch(
     () => $props.columns,
     (value) => splitColumns(value),
     { immediate: true },
 );
 
-defineExpose({
+const isTableMode = computed(() => mode.value == TABLE_MODE);
-    create: createForm,
+const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
-    reload,
-    redirect: redirectFn,
-    selected,
-    CrudModelRef,
-    params,
-    tableRef,
-});
 
 function splitColumns(columns) {
     splittedColumns.value = {
@@ -257,9 +209,7 @@ function splitColumns(columns) {
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
-
+    // Status column
-    splittedColumns.value.create = createOrderSort(splittedColumns.value.create);
-
     if (splittedColumns.value.chips.length) {
         splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
             (c) => !c.isId,
@@ -275,30 +225,22 @@ function splitColumns(columns) {
     }
 }
 
-function createOrderSort(columns) {
-    const orderedColumn = columns
-        .map((column, index) =>
-            column.createOrder !== undefined ? { ...column, originalIndex: index } : null,
-        )
-        .filter((item) => item !== null);
-
-    orderedColumn.sort((a, b) => a.createOrder - b.createOrder);
-
-    const filteredColumns = columns.filter((col) => col.createOrder === undefined);
-
-    orderedColumn.forEach((col) => {
-        filteredColumns.splice(col.createOrder, 0, col);
-    });
-
-    return filteredColumns;
-}
-
 const rowClickFunction = computed(() => {
     if ($props.rowClick != undefined) return $props.rowClick;
     if ($props.redirect) return ({ id }) => redirectFn(id);
     return () => {};
 });
 
+const rowCtrlClickFunction = computed(() => {
+    if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick;
+    if ($props.redirect)
+        return (evt, { id }) => {
+            stopEventPropagation(evt);
+            window.open(`/#/${$props.redirect}/${id}`, '_blank');
+        };
+    return () => {};
+});
+
 function redirectFn(id) {
     router.push({ path: `/${$props.redirect}/${id}` });
 }
@@ -320,6 +262,21 @@ function columnName(col) {
     return name;
 }
 
+function getColAlign(col) {
+    return 'text-' + (col.align ?? 'left');
+}
+
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
+defineExpose({
+    create: createForm,
+    reload,
+    redirect: redirectFn,
+    selected,
+    CrudModelRef,
+    params,
+    tableRef,
+});
+
 function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
@@ -338,14 +295,8 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
         const selectedIndexes = new Set(selected.value.map((row) => row.$index));
-        const minIndex = selectedIndexes.size
+        for (const row of rows) {
-            ? Math.min(...selectedIndexes, rowIndex)
+            if (row.$index == rowIndex) break;
-            : 0;
-        const maxIndex = Math.max(...selectedIndexes, rowIndex);
-
-        for (let i = minIndex; i <= maxIndex; i++) {
-            const row = rows[i];
-            if (row.$index == rowIndex) continue;
             if (!selectedIndexes.has(row.$index)) {
                 selected.value.push(row);
                 selectedIndexes.add(row.$index);
@@ -354,286 +305,23 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
     }
 }
 
-function isEditableColumn(column) {
-    const isEditableCol = column?.isEditable ?? true;
-    const isVisible = column?.visible ?? true;
-    const hasComponent = column?.component;
-
-    return $props.isEditable && isVisible && hasComponent && isEditableCol;
-}
-
-function hasEditableFormat(column) {
-    if (isEditableColumn(column)) return 'editable-text';
-}
-
-const clickHandler = async (event) => {
-    const clickedElement = event.target.closest('td');
-    const isDateElement = event.target.closest('.q-date');
-    const isTimeElement = event.target.closest('.q-time');
-    const isQSelectDropDown = event.target.closest('.q-select__dropdown-icon');
-
-    if (isDateElement || isTimeElement || isQSelectDropDown) return;
-
-    if (clickedElement === null) {
-        await destroyInput(editingRow.value, editingField.value);
-        return;
-    }
-    const rowIndex = clickedElement.getAttribute('data-row-index');
-    const colField = clickedElement.getAttribute('data-col-field');
-    const column = $props.columns.find((col) => col.name === colField);
-
-    if (editingRow.value !== null && editingField.value !== null) {
-        if (editingRow.value == rowIndex && editingField.value == colField) return;
-
-        await destroyInput(editingRow.value, editingField.value);
-    }
-
-    if (isEditableColumn(column)) {
-        await renderInput(Number(rowIndex), colField, clickedElement);
-    }
-};
-
-async function handleTabKey(event, rowIndex, colField) {
-    if (editingRow.value == rowIndex && editingField.value == colField)
-        await destroyInput(editingRow.value, editingField.value);
-
-    const direction = event.shiftKey ? -1 : 1;
-    const { nextRowIndex, nextColumnName } = await handleTabNavigation(
-        rowIndex,
-        colField,
-        direction,
-    );
-
-    if (nextRowIndex < 0 || nextRowIndex >= arrayData.store.data.length) return;
-
-    event.preventDefault();
-    await renderInput(nextRowIndex, nextColumnName, null);
-}
-
-async function renderInput(rowId, field, clickedElement) {
-    editingField.value = field;
-    editingRow.value = rowId;
-
-    const originalColumn = $props.columns.find((col) => col.name === field);
-    const column = { ...originalColumn, ...{ label: '' } };
-    const row = CrudModelRef.value.formData[rowId];
-    const oldValue = CrudModelRef.value.formData[rowId][column?.name];
-
-    if (!clickedElement)
-        clickedElement = document.querySelector(
-            `[data-row-index="${rowId}"][data-col-field="${field}"]`,
-        );
-
-    Array.from(clickedElement.childNodes).forEach((child) => {
-        child.style.visibility = 'hidden';
-        child.style.position = 'relative';
-    });
-
-    const isSelect = selectRegex.test(column?.component);
-    if (isSelect) column.attrs = { ...column.attrs, 'emit-value': false };
-
-    const node = h(VnColumn, {
-        row: row,
-        class: 'temp-input',
-        column: column,
-        modelValue: row[column.name],
-        componentProp: 'columnField',
-        autofocus: true,
-        focusOnMount: true,
-        eventHandlers: {
-            'update:modelValue': async (value) => {
-                if (isSelect && value) {
-                    await updateSelectValue(value, column, row, oldValue);
-                } else row[column.name] = value;
-                await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
-            },
-            keyup: async (event) => {
-                if (event.key === 'Enter')
-                    await destroyInput(rowId, field, clickedElement);
-            },
-            keydown: async (event) => {
-                switch (event.key) {
-                    case 'Tab':
-                        await handleTabKey(event, rowId, field);
-                        event.stopPropagation();
-                        break;
-                    case 'Escape':
-                        await destroyInput(rowId, field, clickedElement);
-                        break;
-                    default:
-                        break;
-                }
-            },
-            click: (event) => {
-                column?.cellEvent?.['click']?.(event, row);
-            },
-        },
-    });
-
-    node.appContext = app._context;
-    render(node, clickedElement);
-
-    if (['toggle'].includes(column?.component))
-        node.el?.querySelector('span > div').focus();
-
-    if (['checkbox', undefined].includes(column?.component))
-        node.el?.querySelector('span > div > div').focus();
-}
-
-async function updateSelectValue(value, column, row, oldValue) {
-    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
-
-    row[column?.name + 'VnTableTextValue'] = value[column.attrs?.optionLabel ?? 'name'];
-
-    if (column?.attrs?.find?.label)
-        row[column?.attrs?.find?.label] = value[column.attrs?.optionLabel ?? 'name'];
-
-    await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
-}
-
-async function destroyInput(rowIndex, field, clickedElement) {
-    if (!clickedElement)
-        clickedElement = document.querySelector(
-            `[data-row-index="${rowIndex}"][data-col-field="${field}"]`,
-        );
-    if (clickedElement) {
-        await nextTick();
-        render(null, clickedElement);
-        Array.from(clickedElement.childNodes).forEach((child) => {
-            child.style.visibility = 'visible';
-            child.style.position = '';
-        });
-    }
-    if (editingRow.value !== rowIndex || editingField.value !== field) return;
-    editingRow.value = null;
-    editingField.value = null;
-}
-
-async function handleTabNavigation(rowIndex, colName, direction) {
-    const columns = $props.columns;
-    const totalColumns = columns.length;
-    let currentColumnIndex = columns.findIndex((col) => col.name === colName);
-
-    let iterations = 0;
-    let newColumnIndex = currentColumnIndex;
-
-    do {
-        iterations++;
-        newColumnIndex = (newColumnIndex + direction + totalColumns) % totalColumns;
-
-        if (isEditableColumn(columns[newColumnIndex])) break;
-    } while (iterations < totalColumns);
-
-    if (iterations >= totalColumns + 1) return;
-
-    if (direction === 1 && newColumnIndex <= currentColumnIndex) {
-        rowIndex++;
-    } else if (direction === -1 && newColumnIndex >= currentColumnIndex) {
-        rowIndex--;
-    }
-    return { nextRowIndex: rowIndex, nextColumnName: columns[newColumnIndex].name };
-}
-
-function getCheckboxIcon(value) {
-    switch (typeof value) {
-        case 'boolean':
-            return value ? 'check' : 'close';
-        case 'number':
-            return value === 0 ? 'close' : 'check';
-        case 'undefined':
-            return 'indeterminate_check_box';
-        default:
-            return 'indeterminate_check_box';
-    }
-}
-
-function getToggleIcon(value) {
-    if (value === null) return 'help_outline';
-    return value ? 'toggle_on' : 'toggle_off';
-}
-
-function formatColumnValue(col, row, dashIfEmpty) {
-    if (col?.format || row[col?.name + 'VnTableTextValue']) {
-        if (selectRegex.test(col?.component) && row[col?.name + 'VnTableTextValue']) {
-            return dashIfEmpty(row[col?.name + 'VnTableTextValue']);
-        } else {
-            return col.format(row, dashIfEmpty);
-        }
-    }
-
-    if (col?.component === 'date') return dashIfEmpty(toDate(row[col?.name]));
-
-    if (col?.component === 'time')
-        return row[col?.name] >= 5
-            ? dashIfEmpty(date.formatDate(new Date(row[col?.name]), 'HH:mm'))
-            : row[col?.name];
-
-    if (selectRegex.test(col?.component) && $props.isEditable) {
-        const { find, url } = col.attrs;
-        const urlRelation = url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
-
-        if (col?.attrs.options) {
-            const find = col?.attrs.options.find((option) => option.id === row[col.name]);
-            if (!col.attrs?.optionLabel || !find) return dashIfEmpty(row[col?.name]);
-            return dashIfEmpty(find[col.attrs?.optionLabel ?? 'name']);
-        }
-
-        if (typeof row[urlRelation] == 'object') {
-            if (typeof find == 'object')
-                return dashIfEmpty(row[urlRelation][find?.label ?? 'name']);
-
-            return dashIfEmpty(row[urlRelation][col?.attrs.optionLabel ?? 'name']);
-        }
-        if (typeof row[urlRelation] == 'string') return dashIfEmpty(row[urlRelation]);
-    }
-    return dashIfEmpty(row[col?.name]);
-}
-
 function cardClick(_, row) {
     if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
 }
-
-function removeTextValue(data, getChanges) {
-    let changes = data.updates;
-    if (changes) {
-        for (const change of changes) {
-            for (const key in change.data) {
-                if (key.endsWith('VnTableTextValue')) {
-                    delete change.data[key];
-                }
-            }
-        }
-
-        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
-    }
-    if ($attrs?.beforeSaveFn) data = $attrs.beforeSaveFn(data, getChanges);
-
-    return data;
-}
-
-function handleRowClick(event, row) {
-    if (event.ctrlKey) return rowCtrlClickFunction.value(event, row);
-    if (rowClickFunction.value) rowClickFunction.value(row);
-}
-
-const rowCtrlClickFunction = computed(() => {
-    if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick;
-    if ($props.redirect)
-        return (evt, { id }) => {
-            stopEventPropagation(evt);
-            window.open(`/#/${$props.redirect}/${id}`, '_blank');
-        };
-    return () => {};
-});
 </script>
 <template>
-    <RightMenu v-if="$props.rightSearch" :overlay="overlay">
+    <QDrawer
-        <template #right-panel>
+        v-if="$props.rightSearch"
+        v-model="stateStore.rightDrawer"
+        side="right"
+        :width="256"
+        show-if-above
+    >
+        <QScrollArea class="fit">
             <VnTableFilter
                 :data-key="$attrs['data-key']"
                 :columns="columns"
                 :redirect="redirect"
-                v-bind="$attrs?.['table-filter']"
             >
                 <template
                     v-for="(_, slotName) in $slots"
@@ -643,17 +331,16 @@ const rowCtrlClickFunction = computed(() => {
                     <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
                 </template>
             </VnTableFilter>
-        </template>
+        </QScrollArea>
-    </RightMenu>
+    </QDrawer>
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="$attrs['limit'] ?? 100"
+        :limit="$attrs['limit'] ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
-        :before-save-fn="removeTextValue"
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -665,12 +352,8 @@ const rowCtrlClickFunction = computed(() => {
             <QTable
                 ref="tableRef"
                 v-bind="table"
-                :class="[
+                class="vnTable"
-                    'vnTable',
+                :class="{ 'last-row-sticky': $props.footer }"
-                    table ? 'selection-cell' : '',
-                    $props.footer ? 'last-row-sticky' : '',
-                ]"
-                wrap-cells
                 :columns="splittedColumns.columns"
                 :rows="rows"
                 v-model:selected="selected"
@@ -681,17 +364,14 @@ const rowCtrlClickFunction = computed(() => {
                 :style="isTableMode && `max-height: ${tableHeight}`"
                 :virtual-scroll="isTableMode"
                 @virtual-scroll="handleScroll"
-                @row-click="(event, row) => handleRowClick(event, row)"
+                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
-                :hide-selected-banner="true"
-                :data-cy
             >
                 <template #top-left v-if="!$props.withoutHeader">
-                    <slot name="top-left"> </slot>
+                    <slot name="top-left"></slot>
                 </template>
                 <template #top-right v-if="!$props.withoutHeader">
-                    <slot name="top-right"></slot>
                     <VnVisibleColumn
                         v-if="isTableMode"
                         v-model="splittedColumns.columns"
@@ -699,50 +379,49 @@ const rowCtrlClickFunction = computed(() => {
                         :skip="columnsVisibilitySkipped"
                     />
                     <QBtnToggle
-                        v-if="!tableModes.some((mode) => mode.disable)"
                         v-model="mode"
                         toggle-color="primary"
                         class="bg-vn-section-color"
                         dense
                         :options="tableModes.filter((mode) => !mode.disable)"
                     />
+                    <QBtn
+                        v-if="showRightIcon"
+                        icon="filter_alt"
+                        class="bg-vn-section-color q-ml-sm"
+                        dense
+                        @click="stateStore.toggleRightDrawer()"
+                    />
                 </template>
                 <template #header-cell="{ col }">
                     <QTh
                         v-if="col.visible ?? true"
-                        v-bind:class="col.headerClass"
+                        :style="col.headerStyle"
-                        class="body-cell"
+                        :class="col.headerClass"
-                        :style="col?.width ? `max-width: ${col?.width}` : ''"
                     >
                         <div
-                            class="no-padding"
+                            class="column ellipsis"
-                            :style="[
+                            :class="`text-${col?.align ?? 'left'}`"
-                                withFilters && $props.columnSearch ? 'height: 75px' : '',
+                            :style="$props.columnSearch ? 'height: 75px' : ''"
-                            ]"
                         >
-                            <div style="height: 30px">
+                            <div class="row items-center no-wrap" style="height: 30px">
                                 <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
                                 <VnTableOrder
                                     v-model="orders[col.orderBy ?? col.name]"
                                     :name="col.orderBy ?? col.name"
-                                    :label="col?.labelAbbreviation ?? col?.label"
+                                    :label="col?.label"
                                     :data-key="$attrs['data-key']"
                                     :search-url="searchUrl"
-                                    :align="getColAlign(col)"
                                 />
                             </div>
                             <VnFilter
-                                v-if="
+                                v-if="$props.columnSearch"
-                                    $props.columnSearch &&
-                                    col.columnSearch !== false &&
-                                    withFilters
-                                "
                                 :column="col"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
                                 v-model="params[columnName(col)]"
                                 :search-url="searchUrl"
-                                customClass="header-filter"
+                                class="full-width"
                             />
                         </div>
                     </QTh>
@@ -760,68 +439,32 @@ const rowCtrlClickFunction = computed(() => {
                     </QTd>
                 </template>
                 <template #body-cell="{ col, row, rowIndex }">
+                    <!-- Columns -->
                     <QTd
-                        class="no-margin q-px-xs"
+                        auto-width
+                        class="no-margin"
+                        :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                         v-if="col.visible ?? true"
-                        :style="{
+                        @click.ctrl="
-                            'max-width': col?.width ?? false,
+                            ($event) =>
-                            position: 'relative',
+                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
-                        }"
+                        "
-                        :class="[
-                            col.columnClass,
-                            'body-cell no-margin no-padding',
-                            getColAlign(col),
-                        ]"
-                        :data-row-index="rowIndex"
-                        :data-col-field="col?.name"
                     >
-                        <div
+                        <slot
-                            class="no-padding no-margin"
+                            :name="`column-${col.name}`"
-                            style="
+                            :col="col"
-                                overflow: hidden;
+                            :row="row"
-                                text-overflow: ellipsis;
+                            :row-index="rowIndex"
-                                white-space: nowrap;
-                            "
-                            :data-cy="`vnTableCell_${col.name}`"
                         >
-                            <slot
+                            <VnTableColumn
-                                :name="`column-${col.name}`"
+                                :column="col"
-                                :col="col"
                                 :row="row"
-                                :row-index="rowIndex"
+                                :is-editable="col.isEditable ?? isEditable"
-                            >
+                                v-model="row[col.name]"
-                                <QIcon
+                                component-prop="columnField"
-                                    v-if="col?.component === 'toggle'"
+                            />
-                                    :name="
+                        </slot>
-                                        col?.getIcon
-                                            ? col.getIcon(row[col?.name])
-                                            : getToggleIcon(row[col?.name])
-                                    "
-                                    style="color: var(--vn-text-color)"
-                                    :class="hasEditableFormat(col)"
-                                    size="14px"
-                                />
-                                <QIcon
-                                    v-else-if="col?.component === 'checkbox'"
-                                    :name="getCheckboxIcon(row[col?.name])"
-                                    style="color: var(--vn-text-color)"
-                                    :class="hasEditableFormat(col)"
-                                    size="14px"
-                                />
-                                <span
-                                    v-else
-                                    :class="hasEditableFormat(col)"
-                                    :style="
-                                        typeof col?.style == 'function'
-                                            ? col.style(row)
-                                            : col?.style
-                                    "
-                                    style="bottom: 0"
-                                >
-                                    {{ formatColumnValue(col, row, dashIfEmpty) }}
-                                </span>
-                            </slot>
-                        </div>
                     </QTd>
                 </template>
                 <template #body-cell-tableActions="{ col, row }">
@@ -842,7 +485,7 @@ const rowCtrlClickFunction = computed(() => {
                             flat
                             dense
                             :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-label'
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
                             :style="`visibility: ${
                                 ((btn.show && btn.show(row)) ?? true)
@@ -850,7 +493,6 @@ const rowCtrlClickFunction = computed(() => {
                                     : 'hidden'
                             }`"
                             @click="btn.action(row)"
-                            :data-cy="btn?.name ?? `tableAction-${index}`"
                         />
                     </QTd>
                 </template>
@@ -897,9 +539,9 @@ const rowCtrlClickFunction = computed(() => {
                                         {{ row[splittedColumns.title.name] }}
                                     </span>
                                 </QCardSection>
-                                <!-- Fields  -->
+                                <!-- Fields -->
                                 <QCardSection
-                                    class="q-pl-sm q-py-xs"
+                                    class="q-pl-sm q-pr-lg q-py-xs"
                                     :class="$props.cardClass"
                                 >
                                     <div
@@ -920,25 +562,13 @@ const rowCtrlClickFunction = computed(() => {
                                                         :row="row"
                                                         :row-index="index"
                                                     >
-                                                        <VnColumn
+                                                        <VnTableColumn
-                                                            :column="{
+                                                            :column="col"
-                                                                ...col,
-                                                                disable:
-                                                                    col?.component ===
-                                                                    'checkbox'
-                                                                        ? true
-                                                                        : false,
-                                                            }"
                                                             :row="row"
                                                             :is-editable="false"
                                                             v-model="row[col.name]"
                                                             component-prop="columnField"
-                                                            :show-label="
+                                                            :show-label="true"
-                                                                col?.component ===
-                                                                'checkbox'
-                                                                    ? false
-                                                                    : true
-                                                            "
                                                         />
                                                     </slot>
                                                 </span>
@@ -958,14 +588,13 @@ const rowCtrlClickFunction = computed(() => {
                                     :key="index"
                                     :title="btn.title"
                                     :icon="btn.icon"
-                                    data-cy="cardBtn"
                                     class="q-pa-xs"
+                                    flat
                                     :class="
                                         btn.isPrimary
                                             ? 'text-primary-light'
-                                            : 'color-vn-label'
+                                            : 'color-vn-text '
                                     "
-                                    flat
                                     @click="btn.action(row)"
                                 />
                             </QCardSection>
@@ -973,19 +602,14 @@ const rowCtrlClickFunction = computed(() => {
                     </component>
                 </template>
                 <template #bottom-row="{ cols }" v-if="$props.footer">
-                    <QTr v-if="rows.length" style="height: 45px">
+                    <QTr v-if="rows.length" style="height: 30px">
-                        <QTh v-if="table.selection" />
                         <QTh
                             v-for="col of cols.filter((cols) => cols.visible ?? true)"
                             :key="col?.id"
+                            class="text-center"
                             :class="getColAlign(col)"
-                            :style="col?.width ? `max-width: ${col?.width}` : ''"
-                            style="font-size: small"
                         >
-                            <slot
+                            <slot :name="`column-footer-${col.name}`" />
-                                :name="`column-footer-${col.name}`"
-                                :isEditableColumn="isEditableColumn(col)"
-                            />
                         </QTh>
                     </QTr>
                 </template>
@@ -1004,7 +628,7 @@ const rowCtrlClickFunction = computed(() => {
                     size="md"
                     round
                     flat
-                    v-shortcut="'+'"
+                    shortcut="+"
                     :disabled="!disabledAttr"
                 />
                 <QTooltip>
@@ -1022,64 +646,40 @@ const rowCtrlClickFunction = computed(() => {
             color="primary"
             fab
             icon="add"
-            v-shortcut="'+'"
+            shortcut="+"
             data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
-    <QDialog
+    <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
-        v-model="showForm"
-        transition-show="scale"
-        transition-hide="scale"
-        :full-width="createComplement?.isFullWidth ?? false"
-        data-cy="vn-table-create-dialog"
-    >
         <FormModelPopup
-            ref="createRef"
             v-bind="createForm"
             :model="$attrs['data-key'] + 'Create'"
             @on-data-saved="(_, res) => createForm.onDataSaved(res)"
         >
             <template #form-inputs="{ data }">
-                <slot name="alter-create" :data="data">
+                <div class="grid-create">
-                    <div :style="createComplement?.containerStyle">
+                    <slot
-                        <div
+                        v-for="column of splittedColumns.create"
-                            :style="createComplement?.previousStyle"
+                        :key="column.name"
-                            v-if="!quasar.screen.xs"
+                        :name="`column-create-${column.name}`"
-                        >
+                        :data="data"
-                            <slot name="previous-create-dialog" :data="data" />
+                        :column-name="column.name"
-                        </div>
+                        :label="column.label"
-                        <div
+                    >
-                            class="grid-create"
+                        <VnTableColumn
-                            :style="createComplement?.columnGridStyle"
+                            :column="column"
-                        >
+                            :row="{}"
-                            <slot
+                            default="input"
-                                v-for="column of splittedColumns.create"
+                            v-model="data[column.name]"
-                                :key="column.name"
+                            :show-label="true"
-                                :name="`column-create-${column.name}`"
+                            component-prop="columnCreate"
-                                :data="data"
+                        />
-                                :column-name="column.name"
+                    </slot>
-                                :label="column.label"
+                    <slot name="more-create-dialog" :data="data" />
-                            >
+                </div>
-                                <VnColumn
-                                    :column="{
-                                        ...column,
-                                        ...column?.createAttrs,
-                                    }"
-                                    :row="{}"
-                                    default="input"
-                                    v-model="data[column.name]"
-                                    :show-label="true"
-                                    component-prop="columnCreate"
-                                    :data-cy="`${column.name}-create-popup`"
-                                />
-                            </slot>
-                            <slot name="more-create-dialog" :data="data" />
-                        </div>
-                    </div>
-                </slot>
             </template>
         </FormModelPopup>
     </QDialog>
@@ -1096,42 +696,6 @@ es:
 </i18n>
 
 <style lang="scss">
-.selection-cell {
-    table td:first-child {
-        padding: 0px;
-    }
-}
-.side-padding {
-    padding-left: 1px;
-    padding-right: 1px;
-}
-.editable-text:hover {
-    border-bottom: 1px dashed var(--q-primary);
-    @extend .side-padding;
-}
-.editable-text {
-    border-bottom: 1px dashed var(--vn-label-color);
-    @extend .side-padding;
-}
-.cell-input {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    padding-top: 0px !important;
-}
-.q-field--labeled .q-field__native,
-.q-field--labeled .q-field__prefix,
-.q-field--labeled .q-field__suffix {
-    padding-top: 20px;
-}
-
-.body-cell {
-    padding-left: 4px !important;
-    padding-right: 4px !important;
-    position: relative;
-}
 .bg-chip-secondary {
     background-color: var(--vn-page-color);
     color: var(--vn-text-color);
@@ -1148,8 +712,8 @@ es:
 
 .grid-three {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(300px, max-content));
+    grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
-    width: 100%;
+    max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;
 }
@@ -1160,9 +724,6 @@ es:
     max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;
-    .col-span-2 {
-        grid-column: span 2;
-    }
 }
 
 .flex-one {
@@ -1176,9 +737,7 @@ es:
         }
     }
 }
-.q-table tbody tr td {
+
-    position: relative;
-}
 .q-table {
     th {
         padding: 0;
@@ -1227,7 +786,6 @@ es:
 .vn-label-value {
     display: flex;
     flex-direction: row;
-    align-items: center;
     color: var(--vn-text-color);
     .value {
         overflow: hidden;
@@ -1279,15 +837,4 @@ es:
 .q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
     background-color: var(--vn-section-color);
 }
-.temp-input {
-    top: 0;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    display: flex;
-}
-
-label.header-filter > .q-field__inner > .q-field__control {
-    padding: inherit;
-}
 </style>

src/components/VnTable/VnTableFilter.vue

@@ -26,49 +26,32 @@ function columnName(col) {
 }
 </script>
 <template>
-    <VnFilterPanel
+    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
-        v-bind="$attrs"
+        <template #body="{ params, orders }">
-        :search-button="true"
-        :disable-submit-event="true"
-        :search-url
-    >
-        <template #body="{ params, orders, searchFn }">
             <div
-                class="container"
+                class="row no-wrap flex-center"
                 v-for="col of columns.filter((c) => c.columnFilter ?? true)"
                 :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
+                <VnTableOrder
-                            ref="tableFilterRef"
+                    v-if="col?.columnFilter !== false && col?.name !== 'tableActions'"
-                            :column="col"
+                    v-model="orders[col.orderBy ?? col.name]"
-                            :data-key="$attrs['data-key']"
+                    :name="col.orderBy ?? col.name"
-                            v-model="params[columnName(col)]"
+                    :data-key="$attrs['data-key']"
-                            :search-url="searchUrl"
+                    :search-url="searchUrl"
-                        />
+                    :vertical="true"
-                    </slot>
+                />
-                </div>
-                <div class="order">
-                    <VnTableOrder
-                        v-if="col?.columnFilter !== false && col?.name !== 'tableActions'"
-                        v-model="orders[col.orderBy ?? col.name]"
-                        :name="col.orderBy ?? col.name"
-                        :data-key="$attrs['data-key']"
-                        :search-url="searchUrl"
-                        :vertical="true"
-                    />
-                </div>
             </div>
             <slot
                 name="moreFilterPanel"
                 :params="params"
-                :search-fn="searchFn"
                 :orders="orders"
                 :columns="columns"
             />
@@ -84,21 +67,3 @@ function columnName(col) {
         </template>
     </VnFilterPanel>
 </template>
-<style lang="scss" scoped>
-.container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    min-height: 45px;
-    gap: 10px;
-}
-
-.filter {
-    width: 70%;
-    min-height: 40px;
-    text-align: center;
-}
-.order {
-    width: 10%;
-}
-</style>

src/components/VnTable/VnVisibleColumn.vue

@@ -32,21 +32,16 @@ const areAllChecksMarked = computed(() => {
 
 function setUserConfigViewData(data, isLocal) {
     if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
     if (!isLocal) localColumns.value = [];
-
+    // Array to Object
     const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});
 
     for (let column of columns.value) {
-        const { label, name, labelAbbreviation } = column;
+        const { label, name } = column;
         if (skippeds[name]) continue;
         column.visible = data[name] ?? true;
-        if (!isLocal)
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
-            localColumns.value.push({
-                name,
-                label,
-                labelAbbreviation,
-                visible: column.visible,
-            });
     }
 }
 
@@ -157,11 +152,7 @@ onMounted(async () => {
                     <QCheckbox
                         v-for="col in localColumns"
                         :key="col.name"
-                        :label="
+                        :label="col.label ?? col.name"
-                            col?.labelAbbreviation
-                                ? col.labelAbbreviation + ` (${col.label ?? col.name})`
-                                : (col.label ?? col.name)
-                        "
                         v-model="col.visible"
                     />
                 </div>

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

@@ -27,58 +27,30 @@ describe('VnTable', () => {
     beforeEach(() => (vm.selected = []));
 
     describe('handleSelection()', () => {
-        const rows = [
+        const rows = [{ $index: 0 }, { $index: 1 }, { $index: 2 }];
-            { $index: 0 },
+        const selectedRows = [{ $index: 1 }];
-            { $index: 1 },
+        it('should add rows to selected when shift key is pressed and rows are added except last one', () => {
-            { $index: 2 },
-            { $index: 3 },
-            { $index: 4 },
-        ];
-
-        it('should add rows to selected when shift key is pressed and rows are added in ascending order', () => {
-            const selectedRows = [{ $index: 1 }];
             vm.handleSelection(
                 { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows,
+                rows
             );
             expect(vm.selected).toEqual([{ $index: 0 }]);
         });
 
-        it('should add rows to selected when shift key is pressed and rows are added in descending order', () => {
-            const selectedRows = [{ $index: 3 }];
-            vm.handleSelection(
-                { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows,
-            );
-            expect(vm.selected).toEqual([{ $index: 0 }, { $index: 1 }, { $index: 2 }]);
-        });
-
         it('should not add rows to selected when shift key is not pressed', () => {
-            const selectedRows = [{ $index: 1 }];
             vm.handleSelection(
                 { evt: { shiftKey: false }, added: true, rows: selectedRows },
-                rows,
+                rows
             );
             expect(vm.selected).toEqual([]);
         });
 
         it('should not add rows to selected when rows are not added', () => {
-            const selectedRows = [{ $index: 1 }];
             vm.handleSelection(
                 { evt: { shiftKey: true }, added: false, rows: selectedRows },
-                rows,
+                rows
             );
             expect(vm.selected).toEqual([]);
         });
-
-        it('should add all rows between the smallest and largest selected indexes', () => {
-            vm.selected = [{ $index: 1 }, { $index: 3 }];
-            const selectedRows = [{ $index: 4 }];
-            vm.handleSelection(
-                { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows,
-            );
-            expect(vm.selected).toEqual([{ $index: 1 }, { $index: 3 }, { $index: 2 }]);
-        });
     });
 });

src/components/__tests__/CrudModel.spec.js

@@ -30,8 +30,8 @@ describe('CrudModel', () => {
                 saveFn: '',
             },
         });
-        wrapper = wrapper.wrapper;
+        wrapper=wrapper.wrapper;
-        vm = wrapper.vm;
+        vm=wrapper.vm;
     });
 
     beforeEach(() => {
@@ -143,14 +143,14 @@ describe('CrudModel', () => {
         });
 
         it('should return true if object is empty', async () => {
-            dummyObj = {};
+            dummyObj ={};
-            result = vm.isEmpty(dummyObj);
+            result = vm.isEmpty(dummyObj);    
 
             expect(result).toBe(true);
         });
 
         it('should return false if object is not empty', async () => {
-            dummyObj = { a: 1, b: 2, c: 3 };
+            dummyObj = {a:1, b:2, c:3};
             result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(false);
@@ -158,31 +158,29 @@ describe('CrudModel', () => {
 
         it('should return true if array is empty', async () => {
             dummyArray = [];
-            result = vm.isEmpty(dummyArray);
+            result = vm.isEmpty(dummyArray); 
 
             expect(result).toBe(true);
         });
-
+        
         it('should return false if array is not empty', async () => {
-            dummyArray = [1, 2, 3];
+            dummyArray = [1,2,3];
             result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(false);
-        });
+        })
     });
 
     describe('resetData()', () => {
         it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
-            data = [
+            data = [{
-                {
+                name: 'Tony',
-                    name: 'Tony',
+                lastName: 'Stark',
-                    lastName: 'Stark',
+                age: 42,
-                    age: 42,
+            }];
-                },
-            ];
 
             vm.resetData(data);
-
+            
             expect(vm.originalData).toEqual(data);
             expect(vm.originalData[0].$index).toEqual(0);
             expect(vm.formData).toEqual(data);
@@ -202,7 +200,7 @@ describe('CrudModel', () => {
                 lastName: 'Stark',
                 age: 42,
             };
-
+            
             vm.resetData(data);
 
             expect(vm.originalData).toEqual(data);
@@ -212,19 +210,17 @@ describe('CrudModel', () => {
     });
 
     describe('saveChanges()', () => {
-        data = [
+        data = [{
-            {
+            name: 'Tony',
-                name: 'Tony',
+            lastName: 'Stark',
-                lastName: 'Stark',
+            age: 42,
-                age: 42,
+        }];
-            },
-        ];
 
         it('should call saveFn if exists', async () => {
             await wrapper.setProps({ saveFn: vi.fn() });
 
             vm.saveChanges(data);
-
+            
             expect(vm.saveFn).toHaveBeenCalledOnce();
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
@@ -233,15 +229,13 @@ describe('CrudModel', () => {
         });
 
         it("should use default url if there's not saveFn", async () => {
-            const postMock = vi.spyOn(axios, 'post');
+            const postMock =vi.spyOn(axios, 'post');
-
+            
-            vm.formData = [
+            vm.formData = [{
-                {
+                name: 'Bruce',
-                    name: 'Bruce',
+                lastName: 'Wayne',
-                    lastName: 'Wayne',
+                age: 45,
-                    age: 45,
+            }]
-                },
-            ];
 
             await vm.saveChanges(data);
 

src/components/__tests__/FormModel.spec.js

@@ -57,7 +57,6 @@ describe('FormModel', () => {
             vm.state.set(model, formInitialData);
             expect(vm.hasChanges).toBe(false);
 
-            await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             expect(vm.hasChanges).toBe(true);
@@ -94,13 +93,9 @@ describe('FormModel', () => {
 
         it('should call axios.patch with the right data', async () => {
             const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-            const { vm } = mount({ propsData: { url, model } });
+            const { vm } = mount({ propsData: { url, model, formInitialData } });
-
+            vm.formData.mockKey = 'newVal';
-            vm.formData = {};
             await vm.$nextTick();
-            vm.formData = { mockKey: 'newVal' };
-            await vm.$nextTick();
-
             await vm.save();
             expect(spy).toHaveBeenCalled();
             vm.formData.mockKey = 'mockVal';
@@ -111,7 +106,6 @@ describe('FormModel', () => {
             const { vm } = mount({
                 propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
             });
-            await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
@@ -125,7 +119,7 @@ describe('FormModel', () => {
             });
             const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
             const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
-            await vm.$nextTick();
+
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();

src/components/__tests__/Leftmenu.spec.js

@@ -1,11 +1,8 @@
-import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeAll } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import Leftmenu from 'components/LeftMenu.vue';
-import * as vueRouter from 'vue-router';
-import { useNavigationStore } from 'src/stores/useNavigationStore';
 
-let vm;
+import { useNavigationStore } from 'src/stores/useNavigationStore';
-let navigation;
 
 vi.mock('src/router/modules', () => ({
     default: [
@@ -15,22 +12,15 @@ vi.mock('src/router/modules', () => ({
             meta: {
                 title: 'customers',
                 icon: 'vn:client',
-                menu: ['CustomerList', 'CustomerCreate'],
+            },
+            menus: {
+                main: ['CustomerList', 'CustomerCreate'],
+                card: ['CustomerBasicData'],
             },
             children: [
                 {
                     path: '',
                     name: 'CustomerMain',
-                    meta: {
-                        menu: 'Customer',
-                        menuChildren: [
-                            {
-                                name: 'CustomerCreditContracts',
-                                title: 'creditContracts',
-                                icon: 'vn:solunion',
-                            },
-                        ],
-                    },
                     children: [
                         {
                             path: 'list',
@@ -38,13 +28,14 @@ vi.mock('src/router/modules', () => ({
                             meta: {
                                 title: 'list',
                                 icon: 'view_list',
-                                menuChildren: [
+                            },
-                                    {
+                        },
-                                        name: 'CustomerCreditContracts',
+                        {
-                                        title: 'creditContracts',
+                            path: 'create',
-                                        icon: 'vn:solunion',
+                            name: 'CustomerCreate',
-                                    },
+                            meta: {
-                                ],
+                                title: 'createCustomer',
+                                icon: 'vn:addperson',
                             },
                         },
                     ],
@@ -53,317 +44,51 @@ vi.mock('src/router/modules', () => ({
         },
     ],
 }));
-vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
+
-    matched: [
+describe('Leftmenu', () => {
-        {
+    let vm;
-            path: '/',
+    let navigation;
-            redirect: {
+    beforeAll(() => {
-                name: 'Dashboard',
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [],
+        });
+
+        vm = createWrapper(Leftmenu, {
+            propsData: {
+                source: 'main',
             },
-            name: 'Main',
+        }).vm;
-            meta: {},
+
-            props: {
+        navigation = useNavigationStore();
-                default: false,
+        navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
-            },
+        navigation.getModules = vi.fn().mockReturnValue({
-            children: [
+            value: [
                 {
-                    path: '/dashboard',
+                    name: 'customer',
-                    name: 'Dashboard',
+                    title: 'customer.pageTitles.customers',
-                    meta: {
+                    icon: 'vn:customer',
-                        title: 'dashboard',
+                    module: 'customer',
-                        icon: 'dashboard',
-                    },
                 },
             ],
-        },
-        {
-            path: '/customer',
-            redirect: {
-                name: 'CustomerMain',
-            },
-            name: 'Customer',
-            meta: {
-                title: 'customers',
-                icon: 'vn:client',
-                moduleName: 'Customer',
-                keyBinding: 'c',
-                menu: ['customer'],
-            },
-        },
-    ],
-    query: {},
-    params: {},
-    meta: { moduleName: 'mockName' },
-    path: 'mockName/1',
-    name: 'Customer',
-});
-function mount(source = 'main') {
-    vi.spyOn(axios, 'get').mockResolvedValue({
-        data: [],
-    });
-    const wrapper = createWrapper(Leftmenu, {
-        propsData: {
-            source,
-        },
-    });
-
-    navigation = useNavigationStore();
-    navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
-    navigation.getModules = vi.fn().mockReturnValue({
-        value: [
-            {
-                name: 'customer',
-                title: 'customer.pageTitles.customers',
-                icon: 'vn:customer',
-                module: 'customer',
-            },
-        ],
-    });
-    return wrapper;
-}
-
-describe('getRoutes', () => {
-    afterEach(() => vi.clearAllMocks());
-    const getRoutes = vi.fn().mockImplementation((props, getMethodA, getMethodB) => {
-        const handleRoutes = {
-            methodA: getMethodA,
-            methodB: getMethodB,
-        };
-        try {
-            handleRoutes[props.source]();
-        } catch (error) {
-            throw Error('Method not defined');
-        }
-    });
-
-    const getMethodA = vi.fn();
-    const getMethodB = vi.fn();
-    const fn = (props) => getRoutes(props, getMethodA, getMethodB);
-
-    it('should call getMethodB when source is card', () => {
-        let props = { source: 'methodB' };
-        fn(props);
-
-        expect(getMethodB).toHaveBeenCalled();
-        expect(getMethodA).not.toHaveBeenCalled();
-    });
-    it('should call getMethodA when source is main', () => {
-        let props = { source: 'methodA' };
-        fn(props);
-
-        expect(getMethodA).toHaveBeenCalled();
-        expect(getMethodB).not.toHaveBeenCalled();
-    });
-
-    it('should call getMethodA when source is not exists or undefined', () => {
-        let props = { source: 'methodC' };
-        expect(() => fn(props)).toThrowError('Method not defined');
-
-        expect(getMethodA).not.toHaveBeenCalled();
-        expect(getMethodB).not.toHaveBeenCalled();
-    });
-});
-
-describe('Leftmenu as card', () => {
-    beforeAll(() => {
-        vm = mount('card').vm;
-    });
-
-    it('should get routes for card source', async () => {
-        vm.getRoutes();
-    });
-});
-describe('Leftmenu as main', () => {
-    beforeEach(() => {
-        vm = mount().vm;
-    });
-
-    it('should initialize with default props', () => {
-        expect(vm.source).toBe('main');
-    });
-
-    it('should filter items based on search input', async () => {
-        vm.search = 'cust';
-        await vm.$nextTick();
-        expect(vm.filteredItems[0].name).toEqual('customer');
-        expect(vm.filteredItems[0].module).toEqual('customer');
-    });
-    it('should filter items based on search input', async () => {
-        vm.search = 'Rou';
-        await vm.$nextTick();
-        expect(vm.filteredItems).toEqual([]);
-    });
-
-    it('should return pinned items', () => {
-        vm.items = [
-            { name: 'Item 1', isPinned: false },
-            { name: 'Item 2', isPinned: true },
-        ];
-        expect(vm.pinnedModules).toEqual(
-            new Map([['Item 2', { name: 'Item 2', isPinned: true }]]),
-        );
-    });
-
-    it('should find matches in routes', () => {
-        const search = 'child1';
-        const item = {
-            children: [
-                { name: 'child1', children: [] },
-                { name: 'child2', children: [] },
-            ],
-        };
-        const matches = vm.findMatches(search, item);
-        expect(matches).toEqual([{ name: 'child1', children: [] }]);
-    });
-    it('should not proceed if event is already prevented', async () => {
-        const item = { module: 'testModule', isPinned: false };
-        const event = {
-            preventDefault: vi.fn(),
-            stopPropagation: vi.fn(),
-            defaultPrevented: true,
-        };
-
-        await vm.togglePinned(item, event);
-
-        expect(event.preventDefault).not.toHaveBeenCalled();
-        expect(event.stopPropagation).not.toHaveBeenCalled();
-    });
-
-    it('should call quasar.notify with success message', async () => {
-        const item = { module: 'testModule', isPinned: false };
-        const event = {
-            preventDefault: vi.fn(),
-            stopPropagation: vi.fn(),
-            defaultPrevented: false,
-        };
-        const response = { data: { id: 1 } };
-
-        vi.spyOn(axios, 'post').mockResolvedValue(response);
-        vi.spyOn(vm.quasar, 'notify');
-
-        await vm.togglePinned(item, event);
-
-        expect(vm.quasar.notify).toHaveBeenCalledWith({
-            message: 'Data saved',
-            type: 'positive',
         });
     });
 
-    it('should get routes for main source', () => {
+    it('should return a proper formated object with two child items', async () => {
-        vm.props.source = 'main';
+        const expectedMenuItem = [
-        vm.getRoutes();
+            {
-        expect(navigation.getModules).toHaveBeenCalled();
+                children: null,
-    });
+                name: 'CustomerList',
-
+                title: 'globals.pageTitles.list',
-    it('should find direct child matches', () => {
+                icon: 'view_list',
-        const search = 'child1';
+            },
-        const item = {
+            {
-            children: [{ name: 'child1' }, { name: 'child2' }],
+                children: null,
-        };
+                name: 'CustomerCreate',
-        const result = vm.findMatches(search, item);
+                title: 'globals.pageTitles.createCustomer',
-        expect(result).toEqual([{ name: 'child1' }]);
+                icon: 'vn:addperson',
-    });
+            },
-
+        ];
-    it('should find nested child matches', () => {
+        const firstMenuItem = vm.items[0];
-        const search = 'child3';
+        expect(firstMenuItem.children).toEqual(expect.arrayContaining(expectedMenuItem));
-        const item = {
-            children: [
-                { name: 'child1' },
-                {
-                    name: 'child2',
-                    children: [{ name: 'child3' }],
-                },
-            ],
-        };
-        const result = vm.findMatches(search, item);
-        expect(result).toEqual([{ name: 'child3' }]);
-    });
-});
-
-describe('normalize', () => {
-    beforeAll(() => {
-        vm = mount('card').vm;
-    });
-    it('should normalize and lowercase text', () => {
-        const input = 'ÁÉÍÓÚáéíóú';
-        const expected = 'aeiouaeiou';
-        expect(vm.normalize(input)).toBe(expected);
-    });
-
-    it('should handle empty string', () => {
-        const input = '';
-        const expected = '';
-        expect(vm.normalize(input)).toBe(expected);
-    });
-
-    it('should handle text without diacritics', () => {
-        const input = 'hello';
-        const expected = 'hello';
-        expect(vm.normalize(input)).toBe(expected);
-    });
-
-    it('should handle mixed text', () => {
-        const input = 'Héllo Wórld!';
-        const expected = 'hello world!';
-        expect(vm.normalize(input)).toBe(expected);
-    });
-});
-
-describe('addChildren', () => {
-    const module = 'testModule';
-    beforeEach(() => {
-        vm = mount().vm;
-        vi.clearAllMocks();
-    });
-
-    it('should add menu items to parent if matches are found', () => {
-        const parent = 'testParent';
-        const route = {
-            meta: {
-                menu: 'testMenu',
-            },
-            children: [{ name: 'child1' }, { name: 'child2' }],
-        };
-        vm.addChildren(module, route, parent);
-
-        expect(navigation.addMenuItem).toHaveBeenCalled();
-    });
-
-    it('should handle routes with no meta menu', () => {
-        const route = {
-            meta: {
-                menu: [],
-            },
-        };
-
-        const parent = [];
-
-        vm.addChildren(module, route, parent);
-        expect(navigation.addMenuItem).toHaveBeenCalled();
-    });
-
-    it('should handle empty parent array', () => {
-        const parent = [];
-        const route = {
-            meta: {
-                menu: 'child11',
-            },
-            children: [
-                {
-                    name: 'child1',
-                    meta: {
-                        menuChildren: [
-                            {
-                                name: 'CustomerCreditContracts',
-                                title: 'creditContracts',
-                                icon: 'vn:solunion',
-                            },
-                        ],
-                    },
-                },
-            ],
-        };
-        vm.addChildren(module, route, parent);
-        expect(navigation.addMenuItem).toHaveBeenCalled();
     });
 });

src/components/__tests__/UserPanel.spec.js

@@ -1,65 +1,61 @@
-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/RightMenu.vue

@@ -11,13 +11,6 @@ const stateStore = useStateStore();
 const slots = useSlots();
 const hasContent = useHasContent('#right-panel');
 
-defineProps({
-    overlay: {
-        type: Boolean,
-        default: false,
-    },
-});
-
 onMounted(() => {
     if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
         stateStore.rightDrawer = false;
@@ -41,12 +34,7 @@ onMounted(() => {
             </QBtn>
         </div>
     </Teleport>
-    <QDrawer
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256">
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        :overlay="overlay"
-    >
         <QScrollArea class="fit">
             <div id="right-panel"></div>
             <slot v-if="!hasContent" name="right-panel" />

src/components/common/SendEmailDialog.vue

@@ -56,12 +56,7 @@ async function confirm() {
                 {{ t('The notification will be sent to the following address') }}
             </QCardSection>
             <QCardSection class="q-pt-none">
-                <VnInput
+                <VnInput v-model="address" is-outlined autofocus />
-                    v-model="address"
-                    is-outlined
-                    autofocus
-                    data-cy="SendEmailNotificationDialogInput"
-                />
             </QCardSection>
             <QCardActions align="right">
                 <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />

src/components/common/SendSmsDialog.vue

@@ -1,15 +1,15 @@
 <script setup>
-import { useDialogPluginComponent } from 'quasar';
+import {useDialogPluginComponent} from 'quasar';
-import { useI18n } from 'vue-i18n';
+import {useI18n} from 'vue-i18n';
-import { computed, ref } from 'vue';
+import {computed, ref} from 'vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
-import useNotify from 'composables/useNotify';
+import useNotify from "composables/useNotify";
 
 const MESSAGE_MAX_LENGTH = 160;
 
-const { t } = useI18n();
+const {t} = useI18n();
-const { notify } = useNotify();
+const {notify} = useNotify();
 const props = defineProps({
     title: {
         type: String,
@@ -34,7 +34,7 @@ const props = defineProps({
 });
 
 const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']);
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
+const {dialogRef, onDialogHide} = useDialogPluginComponent();
 
 const smsRules = [
     (val) => (val && val.length > 0) || t("The message can't be empty"),
@@ -43,10 +43,10 @@ const smsRules = [
         t("The message it's too long"),
 ];
 
-const message = ref(t('routeDelay'));
+const message = ref('');
 
 const charactersRemaining = computed(
-    () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size,
+    () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size
 );
 
 const charactersChipColor = computed(() => {
@@ -114,7 +114,7 @@ const onSubmit = async () => {
                                 <QTooltip>
                                     {{
                                         t(
-                                            'Special characters like accents counts as a multiple',
+                                            'Special characters like accents counts as a multiple'
                                         )
                                     }}
                                 </QTooltip>
@@ -144,10 +144,7 @@ const onSubmit = async () => {
     max-width: 450px;
 }
 </style>
-
 <i18n>
-en:
-    routeDelay: "Your order has been delayed in transit.\nDelivery will take place throughout the day.\nWe apologize for the inconvenience and appreciate your patience."
 es:
     Message: Mensaje
     Send: Enviar
@@ -156,5 +153,4 @@ es:
     The destination can't be empty: El destinatario no puede estar vacio
     The message can't be empty: El mensaje no puede estar vacio
     The message it's too long: El mensaje es demasiado largo
-    routeDelay: "Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias."
+</i18n>
-    </i18n>

src/components/common/VnAccountNumber.vue

@@ -1,14 +1,83 @@
 <script setup>
-import VnInput from './VnInput.vue';
+import { nextTick, ref, watch } from 'vue';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import { QInput } from 'quasar';
 
-const model = defineModel({ prop: 'modelValue' });
+const $props = defineProps({
+    modelValue: {
+        type: String,
+        default: '',
+    },
+    insertable: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
+
+let internalValue = ref($props.modelValue);
+
+watch(
+    () => $props.modelValue,
+    (newVal) => {
+        internalValue.value = newVal;
+    }
+);
+
+watch(
+    () => internalValue.value,
+    (newVal) => {
+        emit('update:modelValue', newVal);
+        accountShortToStandard();
+    }
+);
+
+const handleKeydown = (e) => {
+    if (e.key === 'Backspace') return;
+    if (e.key === '.') {
+        accountShortToStandard();
+        // TODO: Fix this setTimeout, with nextTick doesn't work
+        setTimeout(() => {
+            setCursorPosition(0, e.target);
+        }, 1);
+        return;
+    }
+
+    if ($props.insertable && e.key.match(/[0-9]/)) {
+        handleInsertMode(e);
+    }
+};
+function setCursorPosition(pos, el = vnInputRef.value) {
+    el.focus();
+    el.setSelectionRange(pos, pos);
+}
+const vnInputRef = ref(false);
+const handleInsertMode = (e) => {
+    e.preventDefault();
+    const input = e.target;
+    const cursorPos = input.selectionStart;
+    const { maxlength } = vnInputRef.value;
+    let currentValue = internalValue.value;
+    if (!currentValue) currentValue = e.key;
+    const newValue = e.key;
+    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
+        internalValue.value =
+            currentValue.substring(0, cursorPos) +
+            newValue +
+            currentValue.substring(cursorPos + 1);
+    }
+    nextTick(() => {
+        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
+    });
+};
+function accountShortToStandard() {
+    internalValue.value = internalValue.value?.replace(
+        '.',
+        '0'.repeat(11 - internalValue.value.length)
+    );
+}
 </script>
+
 <template>
-    <VnInput
+    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
-        v-model="model"
-        ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
-        @input="model = $event.target.value.replace(/[^\d.]/g, '')"
-    />
 </template>

src/components/common/VnCard.vue

@@ -1,93 +1,90 @@
 <script setup>
-import { onBeforeMount, computed, markRaw } from 'vue';
+import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
-
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
-const emit = defineEmits(['onFetch']);
+import LeftMenu from 'components/LeftMenu.vue';
-
+import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
-    id: { type: Number, required: false, default: null },
     dataKey: { type: String, required: true },
-    url: { type: String, default: undefined },
+    baseUrl: { type: String, default: undefined },
-    idInWhere: { type: Boolean, default: false },
+    customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
-    visual: { type: Boolean, default: true },
 });
 
-const route = useRoute();
 const stateStore = useStateStore();
+const route = useRoute();
 const router = useRouter();
-const entityId = computed(() => props.id || route?.params?.id);
+const url = computed(() => {
-let arrayData = getArrayData(entityId.value, props.url);
+    if (props.baseUrl) {
-
+        return `${props.baseUrl}/${route.params.id}`;
-onBeforeRouteLeave(() => {
+    }
-    stateStore.cardDescriptorChangeValue(null);
+    return props.customUrl;
+});
+const searchRightDataKey = computed(() => {
+    if (!props.searchDataKey) return route.name;
+    return props.searchDataKey;
+});
+const arrayData = useArrayData(props.dataKey, {
+    url: url.value,
+    filter: props.filter,
 });
 
 onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
-
-    const route = router.currentRoute.value;
     try {
-        await fetch(entityId.value);
+        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
-        const { matched: matches } = route;
+        const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
         router.push({ path: path.replace(/:id.*/, '') });
     }
 });
 
-onBeforeRouteUpdate(async (to, from) => {
+if (props.baseUrl) {
-    if (hasRouteParam(to.params)) {
+    onBeforeRouteUpdate(async (to, from) => {
-        const { matched } = router.currentRoute.value;
+        if (to.params.id !== from.params.id) {
-        const { name } = matched.at(-3);
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-        if (name) {
+            await arrayData.fetch({ append: false, updateRouter: false });
-            router.push({ name, params: to.params });
         }
-    }
-    if (entityId.value !== to.params.id) await fetch(to.params.id, true);
-});
-
-async function fetch(id, append = false) {
-    if (props.idInWhere) arrayData.store.filter.where = { id };
-    else {
-        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">
+    <QDrawer
-        <VnSubToolbar />
+        v-model="stateStore.leftDrawer"
-        <div :class="[useCardSize(), $attrs.class]">
+        show-if-above
-            <RouterView :key="$route.path" />
+        :width="256"
-        </div>
+        v-if="stateStore.isHeaderMounted()"
-    </template>
+    >
+        <QScrollArea class="fit">
+            <component :is="descriptor" />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <slot name="searchbar" v-if="props.searchDataKey">
+        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
+    </slot>
+    <RightMenu>
+        <template #right-panel v-if="props.filterPanel">
+            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
+        </template>
+    </RightMenu>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="[useCardSize(), $attrs.class]">
+                <RouterView :key="route.path" />
+            </div>
+        </QPage>
+    </QPageContainer>
 </template>

src/components/common/VnCardBeta.vue

@@ -0,0 +1,79 @@
+<script setup>
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import useCardSize from 'src/composables/useCardSize';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from '../ui/VnSubToolbar.vue';
+
+const props = defineProps({
+    dataKey: { type: String, required: true },
+    baseUrl: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
+    filter: { type: Object, default: () => {} },
+    userFilter: { type: Object, default: () => {} },
+    descriptor: { type: Object, required: true },
+    filterPanel: { type: Object, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchbarProps: { type: Object, default: undefined },
+    redirectOnError: { type: Boolean, default: false },
+});
+
+const stateStore = useStateStore();
+const route = useRoute();
+const router = useRouter();
+const url = computed(() => {
+    if (props.baseUrl) {
+        return `${props.baseUrl}/${route.params.id}`;
+    }
+    return props.customUrl;
+});
+
+const arrayData = useArrayData(props.dataKey, {
+    url: url.value,
+    filter: props.filter,
+    userFilter: props.userFilter,
+});
+
+onBeforeMount(async () => {
+    try {
+        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await arrayData.fetch({ append: false, updateRouter: false });
+    } catch {
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+        router.push({ path: path.replace(/:id.*/, '') });
+    }
+});
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (hasRouteParam(to.params)) {
+            const { matched } = router.currentRoute.value;
+            const { name } = matched.at(-3);
+            if (name) {
+                router.push({ name, params: to.params });
+            }
+        }
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+            await arrayData.fetch({ append: false, updateRouter: false });
+        }
+    });
+}
+function hasRouteParam(params, valueToCheck = ':addressId') {
+    return Object.values(params).includes(valueToCheck);
+}
+</script>
+<template>
+    <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
+        <component :is="descriptor" />
+        <QSeparator />
+        <LeftMenu source="card" />
+    </Teleport>
+    <VnSubToolbar />
+    <div :class="[useCardSize(), $attrs.class]">
+        <RouterView :key="route.path" />
+    </div>
+</template>

src/components/common/VnCheckbox.vue

@@ -1,47 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-
-const model = defineModel({ type: [Number, Boolean] });
-const $props = defineProps({
-    info: {
-        type: String,
-        default: null,
-    },
-});
-
-const checkboxModel = computed({
-    get() {
-        if (typeof model.value === 'number') {
-            return model.value !== 0;
-        }
-        return model.value;
-    },
-    set(value) {
-        if (typeof model.value === 'number') {
-            model.value = value ? 1 : 0;
-        } else {
-            model.value = value;
-        }
-    },
-});
-</script>
-<template>
-    <div>
-        <QCheckbox
-            v-bind="$attrs"
-            v-model="checkboxModel"
-            :data-cy="$attrs['data-cy'] ?? `vnCheckbox${$attrs['label'] ?? ''}`"
-        />
-        <QIcon
-            v-if="info"
-            v-bind="$attrs"
-            class="cursor-info q-ml-sm"
-            name="info"
-            size="sm"
-        >
-            <QTooltip>
-                {{ info }}
-            </QTooltip>
-        </QIcon>
-    </div>
-</template>

src/components/common/VnColor.vue

@@ -1,32 +0,0 @@
-<script setup>
-const $props = defineProps({
-    colors: {
-        type: String,
-        default: '{"value": []}',
-    },
-});
-
-const colorArray = JSON.parse($props.colors)?.value;
-const maxHeight = 30;
-const colorHeight = maxHeight / colorArray?.length;
-</script>
-<template>
-    <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
-        <div
-            v-for="(color, index) in colorArray"
-            :key="index"
-            :style="{
-                backgroundColor: `#${color}`,
-                height: `${colorHeight}px`,
-            }"
-        >
-            &nbsp;
-        </div>
-    </div>
-</template>
-<style scoped>
-.color-div {
-    display: flex;
-    flex-direction: column;
-}
-</style>

src/components/common/VnComponent.vue

@@ -17,8 +17,6 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['blur']);
-
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
@@ -48,8 +46,7 @@ function toValueAttrs(attrs) {
     <span
         v-for="toComponent of componentArray"
         :key="toComponent.name"
-        class="column fit"
+        class="column flex-center fit"
-        :class="toComponent?.component == 'checkbox' ? 'flex-center' : ''"
     >
         <component
             v-if="toComponent?.component"
@@ -57,7 +54,6 @@ function toValueAttrs(attrs) {
             v-bind="mix(toComponent).attrs"
             v-on="mix(toComponent).event ?? {}"
             v-model="model"
-            @blur="emit('blur')"
         />
     </span>
 </template>

src/components/common/VnDms.vue

@@ -35,10 +35,6 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    hasFile: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const warehouses = ref();
@@ -94,7 +90,6 @@ function defaultData() {
     if ($props.formInitialData) return (dms.value = $props.formInitialData);
     return addDefaultData({
         reference: route.params.id,
-        hasFile: $props.hasFile,
     });
 }
 
@@ -182,7 +177,6 @@ function addDefaultData(data) {
                             name="vn:attach"
                             class="cursor-pointer"
                             @click="inputFileRef.pickFiles()"
-                            data-cy="attachFile"
                         >
                             <QTooltip>{{ t('globals.selectFile') }}</QTooltip>
                         </QIcon>

src/components/common/VnDmsInput.vue

@@ -1,166 +0,0 @@
-<script setup>
-import VnConfirm from '../ui/VnConfirm.vue';
-import VnInput from './VnInput.vue';
-import VnDms from './VnDms.vue';
-import axios from 'axios';
-import { useQuasar } from 'quasar';
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { downloadFile } from 'src/composables/downloadFile';
-
-const { t } = useI18n();
-const quasar = useQuasar();
-const documentDialogRef = ref({});
-const editDownloadDisabled = ref(false);
-const $props = defineProps({
-    defaultDmsCode: {
-        type: String,
-        default: 'invoiceIn',
-    },
-    disable: {
-        type: Boolean,
-        default: true,
-    },
-    data: {
-        type: Object,
-        default: null,
-    },
-    formRef: {
-        type: Object,
-        default: null,
-    },
-});
-
-function deleteFile(dmsFk) {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.confirmDeletion'),
-                message: t('globals.confirmDeletionMessage'),
-            },
-        })
-        .onOk(async () => {
-            await axios.post(`dms/${dmsFk}/removeFile`);
-            $props.formRef.formData.dmsFk = null;
-            $props.formRef.formData.dms = undefined;
-            $props.formRef.hasChanges = true;
-            $props.formRef.save();
-        });
-}
-</script>
-<template>
-    <div class="row no-wrap">
-        <VnInput
-            :label="t('Document')"
-            v-model="data.dmsFk"
-            clearable
-            clear-icon="close"
-            class="full-width"
-            :disable="disable"
-        />
-        <div
-            v-if="data.dmsFk"
-            class="row no-wrap q-pa-xs q-gutter-x-xs"
-            data-cy="dms-buttons"
-        >
-            <QBtn
-                :disable="editDownloadDisabled"
-                @click="downloadFile(data.dmsFk)"
-                icon="cloud_download"
-                color="primary"
-                flat
-                :class="{
-                    'no-pointer-events': editDownloadDisabled,
-                }"
-                padding="xs"
-                round
-            >
-                <QTooltip>{{ t('Download file') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                :disable="editDownloadDisabled"
-                @click="
-                    () => {
-                        documentDialogRef.show = true;
-                        documentDialogRef.dms = data.dms;
-                    }
-                "
-                icon="edit"
-                color="primary"
-                flat
-                :class="{
-                    'no-pointer-events': editDownloadDisabled,
-                }"
-                padding="xs"
-                round
-            >
-                <QTooltip>{{ t('Edit document') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                :disable="editDownloadDisabled"
-                @click="deleteFile(data.dmsFk)"
-                icon="delete"
-                color="primary"
-                flat
-                round
-                :class="{
-                    'no-pointer-events': editDownloadDisabled,
-                }"
-                padding="xs"
-            >
-                <QTooltip>{{ t('Delete file') }}</QTooltip>
-            </QBtn>
-        </div>
-        <QBtn
-            v-else
-            icon="add_circle"
-            color="primary"
-            flat
-            round
-            v-shortcut="'+'"
-            padding="xs"
-            @click="
-                () => {
-                    documentDialogRef.show = true;
-                    delete documentDialogRef.dms;
-                }
-            "
-            data-cy="dms-create"
-        >
-            <QTooltip>{{ t('Create document') }}</QTooltip>
-        </QBtn>
-    </div>
-    <QDialog v-model="documentDialogRef.show">
-        <VnDms
-            model="dms"
-            :default-dms-code="defaultDmsCode"
-            :form-initial-data="documentDialogRef.dms"
-            :url="
-                documentDialogRef.dms
-                    ? `Dms/${documentDialogRef.dms.id}/updateFile`
-                    : 'Dms/uploadFile'
-            "
-            :description="documentDialogRef.supplierName"
-            @on-data-saved="
-                (_, { data }) => {
-                    let dmsData = data;
-                    if (Array.isArray(data)) dmsData = data[0];
-                    formRef.formData.dmsFk = dmsData.id;
-                    formRef.formData.dms = dmsData;
-                    formRef.hasChanges = true;
-                    formRef.save();
-                }
-            "
-        />
-    </QDialog>
-</template>
-<i18n>
-es:
-    Document: Documento
-    Download file: Descargar archivo
-    Edit document: Editar documento
-    Delete file: Eliminar archivo
-    Create document: Crear documento
-
-</i18n>

src/components/common/VnDmsList.vue

@@ -17,7 +17,7 @@ import { useSession } from 'src/composables/useSession';
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
-const rows = ref([]);
+const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
 const token = useSession().getTokenMultimedia();
@@ -389,11 +389,6 @@ defineExpose({
                     </div>
                 </template>
             </QTable>
-            <div v-else class="info-row q-pa-md text-center">
-                <h5>
-                    {{ t('No data to display') }}
-                </h5>
-            </div>
         </template>
     </VnPaginate>
     <QDialog v-model="formDialog.show">
@@ -410,10 +405,9 @@ defineExpose({
             fab
             color="primary"
             icon="add"
-            v-shortcut
+            shortcut="+"
             @click="showFormDialog()"
             class="fill-icon"
-            data-cy="addButton"
         >
             <QTooltip>
                 {{ t('Upload file') }}

src/components/common/VnDropdown.vue

@@ -1,53 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import VnSelect from './VnSelect.vue';
-
-const stateBtnDropdownRef = ref();
-
-const emit = defineEmits(['changeState']);
-
-const $props = defineProps({
-    disable: {
-        type: Boolean,
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: null,
-    },
-    optionLabel: {
-        type: String,
-        default: 'name',
-    },
-    optionValue: {
-        type: String,
-        default: 'id',
-    },
-});
-
-async function changeState(value) {
-    stateBtnDropdownRef.value?.hide();
-    emit('changeState', value);
-}
-</script>
-
-<template>
-    <QBtnDropdown
-        ref="stateBtnDropdownRef"
-        color="black"
-        text-color="white"
-        :label="$t('globals.changeState')"
-        :disable="$props.disable"
-    >
-        <VnSelect
-            :options="$props.options"
-            :option-label="$props.optionLabel"
-            :option-value="$props.optionValue"
-            hide-selected
-            hide-dropdown-icon
-            focus-on-mount
-            @update:model-value="changeState"
-        >
-        </VnSelect>
-    </QBtnDropdown>
-</template>

src/components/common/VnInput.vue

@@ -11,7 +11,6 @@ const emit = defineEmits([
     'update:options',
     'keyup.enter',
     'remove',
-    'blur',
 ]);
 
 const $props = defineProps({
@@ -83,8 +82,8 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const maxlength = $props.maxlength;
+        const { maxlength } = vnInputRef.value;
-        if (maxlength && +val?.length > maxlength)
+        if (maxlength && +val.length > maxlength)
             return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
@@ -108,7 +107,7 @@ const handleInsertMode = (e) => {
     e.preventDefault();
     const input = e.target;
     const cursorPos = input.selectionStart;
-    const maxlength = $props.maxlength;
+    const { maxlength } = vnInputRef.value;
     let currentValue = value.value;
     if (!currentValue) currentValue = e.key;
     const newValue = e.key;
@@ -137,15 +136,14 @@ const handleUppercase = () => {
             :type="$attrs.type"
             :class="{ required: isRequired }"
             @keyup.enter="emit('keyup.enter')"
-            @blur="emit('blur')"
             @keydown="handleKeydown"
             :clearable="false"
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_input'"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
-            <template #prepend v-if="$slots.prepend">
+            <template #prepend>
                 <slot name="prepend" />
             </template>
             <template #append>
@@ -170,11 +168,11 @@ const handleUppercase = () => {
                         }
                     "
                 ></QIcon>
-
+                
                 <QIcon
                     name="match_case"
                     size="xs"
-                    v-if="!$attrs.disabled && !$attrs.readonly && $props.uppercase"
+                    v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
                     @click="handleUppercase"
                     class="uppercase-icon"
                 >
@@ -182,7 +180,7 @@ const handleUppercase = () => {
                         {{ t('Convert to uppercase') }}
                     </QTooltip>
                 </QIcon>
-
+                
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
@@ -196,15 +194,13 @@ const handleUppercase = () => {
 
 <style>
 .uppercase-icon {
-    transition:
+  transition: color 0.3s, transform 0.2s;
-        color 0.3s,
+  cursor: pointer;
-        transform 0.2s;
-    cursor: pointer;
 }
 
 .uppercase-icon:hover {
-    color: #ed9937;
+  color: #ed9937;
-    transform: scale(1.2);
+  transform: scale(1.2);
 }
 </style>
 <i18n>
@@ -218,4 +214,4 @@ const handleUppercase = () => {
         maxLength: El valor excede los {value} carácteres
         inputMax: Debe ser menor a {value}
         Convert to uppercase: Convertir a mayúsculas
-</i18n>
+</i18n>

src/components/common/VnInputDate.vue

@@ -42,7 +42,7 @@ const formattedDate = computed({
                 if (value.at(2) == '/') value = value.split('/').reverse().join('/');
                 value = date.formatDate(
                     new Date(value).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
                 );
             }
             const [year, month, day] = value.split('-').map((e) => parseInt(e));
@@ -55,7 +55,7 @@ const formattedDate = computed({
                     orgDate.getHours(),
                     orgDate.getMinutes(),
                     orgDate.getSeconds(),
-                    orgDate.getMilliseconds(),
+                    orgDate.getMilliseconds()
                 );
             }
         }
@@ -64,7 +64,7 @@ const formattedDate = computed({
 });
 
 const popupDate = computed(() =>
-    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
 );
 onMounted(() => {
     // fix quasar bug
@@ -73,7 +73,7 @@ onMounted(() => {
 watch(
     () => model.value,
     (val) => (formattedDate.value = val),
-    { immediate: true },
+    { immediate: true }
 );
 
 const styleAttrs = computed(() => {
@@ -107,7 +107,6 @@ const manageDate = (date) => {
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
             hide-bottom-space
-            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
         >
             <template #append>
                 <QIcon

src/components/common/VnInputNumber.vue

@@ -8,7 +8,6 @@ defineProps({
 });
 
 const model = defineModel({ type: [Number, String] });
-const emit = defineEmits(['blur']);
 </script>
 <template>
     <VnInput
@@ -25,6 +24,5 @@ const emit = defineEmits(['blur']);
                     model = parseFloat(val).toFixed(decimalPlaces);
             }
         "
-        @blur="emit('blur')"
     />
 </template>

src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
@@ -10,12 +10,12 @@ import { useColor } from 'src/composables/useColor';
 import { useCapitalize } from 'src/composables/useCapitalize';
 import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
-import VnLogValue from './VnLogValue.vue';
+import VnJsonValue from '../common/VnJsonValue.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();
@@ -72,8 +72,39 @@ const filter = {
 };
 
 const paginate = ref();
-const dataKey = computed(() => `${props.model}Log`);
+const actions = ref();
-const userParams = ref(useFilterParams(dataKey.value).params);
+const changeInput = ref();
+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);
@@ -215,55 +246,131 @@ 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(params = {}) {
+async function applyFilter() {
-    paginate.value.arrayData.resetPagination();
+    filter.where = { and: [] };
-    paginate.value.arrayData.applyFilter({
+    if (
-        filter: {},
+        !selectedFilters.value.changedModel ||
-        params: { originFk: route.params.id, ...params },
+        (!selectedFilters.value.changedModelValue &&
-    });
+            !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 exprBuilder(param, value) {
+function setDate(type) {
-    switch (param) {
+    let from = dateFrom.value
-        case 'changedModelValue':
+        ? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-            return { [param]: { like: `%${value}%` } };
+        : undefined;
-        case 'change':
+    from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
-            if (value)
+
-                return {
+    let to = dateTo.value
-                    or: [
+        ? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-                        { oldJson: { like: `%${value}%` } },
+        : date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
-                        { newJson: { like: `%${value}%` } },
+    to = date.adjustDate(
-                        { description: { like: `%${value}%` } },
+        to,
-                    ],
+        { hour: 21, minute: 59, second: 59, millisecond: 999 },
-                };
+        true,
-            break;
+    );
-        case 'action':
+
-            if (value?.length) return { [param]: { inq: value } };
+    switch (type) {
-            break;
         case 'from':
-            return { creationDate: { gte: value } };
+            return { between: [from, to] };
-        case 'to':
+        case 'to': {
-            return { creationDate: { lte: value } };
+            if (dateFrom.value) {
-        case 'userType':
+                return {
-            if (value === 'User') return { userFk: { neq: null } };
+                    between: [from, to],
-            if (value === 'System') return { userFk: null };
+                };
-            break;
+            }
-        default:
+            return { lte: to };
-            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;
 });
@@ -276,18 +383,32 @@ watch(
 );
 </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
+        :data-key="`${model}Log`"
-        :url="dataKey + 's'"
+        :url="`${model}Logs`"
         :user-filter="filter"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
-        @on-change="setLogTree"
         search-url="logs"
-        :exprBuilder
-        :order="['creationDate DESC', 'id DESC']"
     >
         <template #body>
             <div
@@ -346,7 +467,6 @@ watch(
                                             backgroundColor: useColor(modelLog.model),
                                         }"
                                         :title="`${modelLog.model} #${modelLog.id}`"
-                                        data-cy="vnLog-model-chip"
                                     >
                                         {{ t(modelLog.modelI18n) }}
                                     </QChip>
@@ -440,9 +560,10 @@ watch(
                                                                             value.nameI18n
                                                                         }}:
                                                                     </span>
-                                                                    <VnLogValue
+                                                                    <VnJsonValue
-                                                                        :value="value.val"
+                                                                        :value="
-                                                                        :name="value.name"
+                                                                            value.val.val
+                                                                        "
                                                                     />
                                                                 </QItem>
                                                             </QCardSection>
@@ -460,7 +581,6 @@ watch(
                                                             }`,
                                                         )
                                                     "
-                                                    data-cy="vnLog-action-icon"
                                                 />
                                             </div>
                                         </QItem>
@@ -494,10 +614,7 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnLogValue
+                                                    <VnJsonValue :value="prop.val.val" />
-                                                        :value="prop.val"
-                                                        :name="prop.name"
-                                                    />
                                                     <span
                                                         v-if="
                                                             propIndex <
@@ -524,10 +641,17 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="prop.val.id"
+                                                        class="id-value"
+                                                    >
+                                                        #{{ prop.val.id }}
+                                                    </span>
                                                     <span v-if="log.action == 'update'">
-                                                        <VnLogValue
+                                                        ←
-                                                            :value="prop.old"
+                                                        <VnJsonValue
-                                                            :name="prop.name"
+                                                            :value="prop.old.val"
                                                         />
                                                         <span
                                                             v-if="prop.old.id"
@@ -535,28 +659,6 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
-                                                        →
-                                                        <VnLogValue
-                                                            :value="prop.val"
-                                                            :name="prop.name"
-                                                        />
-                                                        <span
-                                                            v-if="prop.val.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.val.id }}
-                                                        </span>
-                                                    </span>
-                                                    <span v-else="prop.old.val">
-                                                        <VnLogValue
-                                                            :value="prop.val"
-                                                            :name="prop.name"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                            >#{{ prop.old.id }}</span
-                                                        >
                                                     </span>
                                                 </div>
                                             </span>
@@ -578,12 +680,176 @@ watch(
     </VnPaginate>
     <RightMenu>
         <template #right-panel>
-            <VnLogFilter :data-key />
+            <QList dense>
+                <QSeparator />
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.search')"
+                        v-model="searchInput"
+                        class="full-width"
+                        clearable
+                        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"
+                        :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"
+                            option-label="name"
+                            option-value="id"
+                            :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"
+                        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
+                        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
+                        clear-icon="close"
+                    />
+                </QItem>
+            </QList>
         </template>
     </RightMenu>
+    <QDialog v-model="dateFromDialog">
+        <QDate
+            :years-in-month-view="false"
+            v-model="dateFrom"
+            dense
+            flat
+            minimal
+            @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.keys(userParams).some((filter) => filter !== 'originFk')"
+            v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
             color="primary"
             icon="filter_alt_off"
             size="md"

src/components/common/VnLogFilter.vue

@@ -1,249 +1,77 @@
 <script setup>
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnTableFilter from '../VnTable/VnTableFilter.vue';
+import FetchData from 'components/FetchData.vue';
-import VnSelect from './VnSelect.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.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 $props = defineProps({
+const { t } = useI18n();
+const props = defineProps({
     dataKey: {
         type: String,
-        default: null,
+        required: true,
     },
 });
 
-const { t } = useI18n();
+const workers = ref();
-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' },
-    { 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="`${dataKey}s/${route.params.id}/models`"
+        url="Workers/activeWithInheritedRole"
-        :filter="{ order: ['changedModel'] }"
+        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="
+        @on-fetch="(data) => (workers = data)"
-            (data) =>
-                (entities = data.map((item) => {
-                    const changedModel = item.changedModel;
-                    return {
-                        locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel,
-                        ),
-                        value: changedModel,
-                    };
-                }))
-        "
         auto-load
     />
-    <FetchData
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        :url="`${dataKey}s/${route.params.id}/editors`"
+        <template #tags="{ tag, formatFn }">
-        :filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
+            <div class="q-gutter-x-xs">
-        sort-by="nickname"
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-        @on-fetch="(data) => (editors = data)"
+                <span>{{ formatFn(tag.value) }}</span>
-        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 #filter-from="{ params, columnName, searchFn }">
+        <template #body="{ params, searchFn }">
-            <VnInputDate
+            <QDate
-                :label="t('globals.from')"
+                v-model="params.created"
-                v-model="params[columnName]"
+                @update:model-value="searchFn()"
                 dense
-                filled
+                flat
-                @update:modelValue="() => searchFn()"
+                minimal
-            />
+            >
+            </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>
-        <template #filter-to="{ params, columnName, searchFn }">
+    </VnFilterPanel>
-            <VnInputDate
-                :label="t('globals.to')"
-                v-model="params[columnName]"
-                dense
-                filled
-                @update:modelValue="() => searchFn()"
-            />
-        </template>
-    </VnTableFilter>
 </template>
-<i18n>
-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:
-        changedModel: Entity
 
+<i18n>
 en:
-    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
+        search: Contains
+        userFk: User
+        created: Created
+es:
+    params:
+        search: Contiene
+        userFk: Usuario
+        created: Creada
+    User: Usuario
 </i18n>

src/components/common/VnLogValue.vue

@@ -1,28 +0,0 @@
-<script setup>
-import { useDescriptorStore } from 'src/stores/useDescriptorStore';
-import VnJsonValue from './VnJsonValue.vue';
-import { computed } from 'vue';
-const descriptorStore = useDescriptorStore();
-
-const $props = defineProps({
-    value: { type: Object, default: () => {} },
-    name: { type: String, default: undefined },
-});
-
-const descriptor = computed(() => descriptorStore.has($props.name));
-</script>
-<template>
-    <VnJsonValue :value="value.val" />
-    <span
-        v-if="(value.id || typeof value.val == 'number') && descriptor"
-        style="margin-left: 2px"
-    >
-        <QIcon
-            name="launch"
-            class="link"
-            :data-cy="'iconLaunch-' + $props.name"
-            style="padding-bottom: 2px"
-        />
-        <component :is="descriptor" :id="value.id ?? value.val" />
-    </span>
-</template>

src/components/common/VnModule.vue

@@ -12,7 +12,7 @@ const $props = defineProps({
     },
 });
 onMounted(
-    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false),
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
 );
 
 const teleportRef = ref({});
@@ -35,14 +35,8 @@ onMounted(() => {
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
-            <div id="left-panel" ref="teleportRef">
+            <div id="left-panel" ref="teleportRef"></div>
-                <template v-if="stateStore.cardDescriptor">
+            <LeftMenu v-if="!hasContent" />
-                    <component :is="stateStore.cardDescriptor" />
-                    <QSeparator />
-                    <LeftMenu source="card" />
-                </template>
-                <template v-else> <LeftMenu /></template>
-            </div>
         </QScrollArea>
     </QDrawer>
     <QPageContainer>

src/components/common/VnPopupProxy.vue

@@ -1,38 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-
-defineProps({
-    label: {
-        type: String,
-        default: '',
-    },
-    icon: {
-        type: String,
-        required: true,
-        default: null,
-    },
-    color: {
-        type: String,
-        default: 'primary',
-    },
-    tooltip: {
-        type: String,
-        default: null,
-    },
-});
-const popupProxyRef = ref(null);
-</script>
-
-<template>
-    <QBtn :color="$props.color" :icon="$props.icon" :label="$t($props.label)">
-        <template #default>
-            <slot name="extraIcon"></slot>
-            <QPopupProxy ref="popupProxyRef" style="max-width: none">
-                <QCard>
-                    <slot :popup="popupProxyRef"></slot>
-                </QCard>
-            </QPopupProxy>
-            <QTooltip>{{ $t($props.tooltip) }}</QTooltip>
-        </template>
-    </QBtn>
-</template>

src/components/common/VnSection.vue

@@ -40,6 +40,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    keepData: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const route = useRoute();
@@ -57,6 +61,7 @@ onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
+            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });
@@ -101,14 +106,7 @@ function checkIsMain() {
                     :data-key="dataKey"
                     :array-data="arrayData"
                     :columns="columns"
-                >
+                />
-                    <template #moreFilterPanel="{ params, orders, searchFn }">
-                        <slot
-                            name="moreFilterPanel"
-                            v-bind="{ params, orders, searchFn }"
-                        />
-                    </template>
-                </VnTableFilter>
             </slot>
         </template>
     </RightAdvancedMenu>

src/components/common/VnSelect.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs, nextTick } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
@@ -10,12 +10,7 @@ const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
 const { t } = useI18n();
 
-const isRequired = computed(() => {
+const { isRequired, requiredFieldRule } = useRequired($attrs);
-    return useRequired($attrs).isRequired;
-});
-const requiredFieldRule = computed(() => {
-    return useRequired($attrs).requiredFieldRule;
-});
 
 const $props = defineProps({
     modelValue: {
@@ -152,10 +147,6 @@ const value = computed({
     },
 });
 
-const computedSortBy = computed(() => {
-    return $props.sortBy || $props.optionLabel + ' ASC';
-});
-
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -175,8 +166,7 @@ onMounted(() => {
 });
 
 const arrayDataKey =
-    $props.dataKey ??
+    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
-    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
 
 const arrayData = useArrayData(arrayDataKey, {
     url: $props.url,
@@ -190,7 +180,7 @@ function findKeyInOptions() {
 }
 
 function setOptions(data) {
-    data = dataByOrder(data, computedSortBy.value);
+    data = dataByOrder(data, $props.sortBy);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
     emit('update:options', data);
@@ -220,13 +210,12 @@ function filter(val, options) {
 async function fetchFilter(val) {
     if (!$props.url) return;
 
-    const { fields, include, limit } = $props;
+    const { fields, include, sortBy, limit } = $props;
-    const sortBy = computedSortBy.value;
     const key =
         optionFilterValue.value ??
         (new RegExp(/\d/g).test(val)
             ? optionValue.value
-            : (optionFilter.value ?? optionLabel.value));
+            : optionFilter.value ?? optionLabel.value);
 
     let defaultWhere = {};
     if ($props.filterOptions.length) {
@@ -245,14 +234,13 @@ async function fetchFilter(val) {
 
     const { data } = await arrayData.applyFilter(
         { filter: filterOptions },
-        { updateRouter: false },
+        { updateRouter: false }
     );
     setOptions(data);
     return data;
 }
 
 async function filterHandler(val, update) {
-    if (isLoading.value) return update();
     if (!val && lastVal.value === val) {
         lastVal.value = val;
         return update();
@@ -279,7 +267,7 @@ async function filterHandler(val, update) {
                 ref.setOptionIndex(-1);
                 ref.moveOptionSelection(1, true);
             }
-        },
+        }
     );
 }
 
@@ -300,7 +288,6 @@ async function onScroll({ to, direction, from, index }) {
         await arrayData.loadMore();
         setOptions(arrayData.store.data);
         vnSelectRef.value.scrollTo(lastIndex);
-        await nextTick();
         isLoading.value = false;
     }
 }
@@ -316,7 +303,7 @@ function handleKeyDown(event) {
         if (inputValue) {
             const matchingOption = myOptions.value.find(
                 (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase(),
+                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
             );
 
             if (matchingOption) {
@@ -328,11 +315,11 @@ function handleKeyDown(event) {
         }
 
         const focusableElements = document.querySelectorAll(
-            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])',
+            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
         );
         const currentIndex = Array.prototype.indexOf.call(
             focusableElements,
-            event.target,
+            event.target
         );
         if (currentIndex >= 0 && currentIndex < focusableElements.length - 1) {
             focusableElements[currentIndex + 1].focus();

src/components/common/VnSelectCache.vue

@@ -14,7 +14,7 @@ const $props = defineProps({
     },
 });
 const options = ref([]);
-const emit = defineEmits(['blur']);
+
 onBeforeMount(async () => {
     const { url, optionValue, optionLabel } = useAttrs();
     const findBy = $props.find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
@@ -35,5 +35,5 @@ onBeforeMount(async () => {
 });
 </script>
 <template>
-    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" @blur="emit('blur')" />
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
 </template>

src/components/common/VnSelectDialog.vue

@@ -37,6 +37,7 @@ const isAllowedToCreate = computed(() => {
 
 defineExpose({ vnSelectDialogRef: select });
 </script>
+
 <template>
     <VnSelect
         ref="select"
@@ -66,6 +67,7 @@ defineExpose({ vnSelectDialogRef: select });
         </template>
     </VnSelect>
 </template>
+
 <style lang="scss" scoped>
 .default-icon {
     cursor: pointer;

src/components/common/VnSelectSupplier.vue

@@ -1,7 +1,9 @@
 <script setup>
+import { computed } from 'vue';
 import VnSelect from 'components/common/VnSelect.vue';
 
 const model = defineModel({ type: [String, Number, Object] });
+const url = 'Suppliers';
 </script>
 
 <template>
@@ -9,13 +11,11 @@ const model = defineModel({ type: [String, Number, Object] });
         :label="$t('globals.supplier')"
         v-bind="$attrs"
         v-model="model"
-        url="Suppliers"
+        :url="url"
         option-value="id"
         option-label="nickname"
         :fields="['id', 'name', 'nickname', 'nif']"
-        :filter-options="['id', 'name', 'nickname', 'nif']"
         sort-by="name ASC"
-        data-cy="vnSupplierSelect"
     >
         <template #option="scope">
             <QItem v-bind="scope.itemProps">

src/components/common/VnSelectTravelExtended.vue

@@ -1,50 +0,0 @@
-<script setup>
-import VnSelectDialog from './VnSelectDialog.vue';
-import FilterTravelForm from 'src/components/FilterTravelForm.vue';
-import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
-const { t } = useI18n();
-
-const $props = defineProps({
-    data: {
-        type: Object,
-        required: true,
-    },
-    onFilterTravelSelected: {
-        type: Function,
-        required: true,
-    },
-});
-</script>
-<template>
-    <VnSelectDialog
-        :label="t('entry.basicData.travel')"
-        v-bind="$attrs"
-        url="Travels/filter"
-        :fields="['id', 'warehouseInName']"
-        option-value="id"
-        option-label="warehouseInName"
-        map-options
-        hide-selected
-        :required="true"
-        action-icon="filter_alt"
-        :roles-allowed-to-create="['buyer']"
-    >
-        <template #form>
-            <FilterTravelForm @travel-selected="onFilterTravelSelected(data, $event)" />
-        </template>
-        <template #option="scope">
-            <QItem v-bind="scope.itemProps">
-                <QItemSection>
-                    <QItemLabel>
-                        {{ scope.opt?.agencyModeName }} -
-                        {{ scope.opt?.warehouseInName }}
-                        ({{ toDate(scope.opt?.shipped) }}) →
-                        {{ scope.opt?.warehouseOutName }}
-                        ({{ toDate(scope.opt?.landed) }})
-                    </QItemLabel>
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnSelectDialog>
-</template>

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

@@ -4,15 +4,12 @@ import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('VnDmsList', () => {
     let vm;
-    const dms = {
+    const dms = { 
-        userFk: 1,
+        userFk: 1, 
-        name: 'DMS 1',
+        name: 'DMS 1' 
     };
-
+    
     beforeAll(() => {
-        vi.mock('src/composables/getUrl', () => ({
-            getUrl: vi.fn().mockResolvedValue(''),
-        }));
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         vm = createWrapper(VnDmsList, {
             props: {
@@ -21,8 +18,8 @@ describe('VnDmsList', () => {
                 filter: 'wd.workerFk',
                 updateModel: 'Workers',
                 deleteModel: 'WorkerDms',
-                downloadModel: 'WorkerDms',
+                downloadModel: 'WorkerDms' 
-            },
+            }
         }).vm;
     });
 
@@ -32,45 +29,46 @@ describe('VnDmsList', () => {
 
     describe('setData()', () => {
         const data = [
-            {
+            { 
-                userFk: 1,
+                userFk: 1, 
                 name: 'Jessica',
                 lastName: 'Jones',
                 file: '4.jpg',
-                created: '2021-07-28 21:00:00',
+                created: '2021-07-28 21:00:00'
             },
-            {
+            { 
-                userFk: 2,
+                userFk: 2, 
                 name: 'Bruce',
                 lastName: 'Banner',
                 created: '2022-07-28 21:00:00',
                 dms: {
-                    userFk: 2,
+                    userFk: 2, 
                     name: 'Bruce',
                     lastName: 'BannerDMS',
                     created: '2022-07-28 21:00:00',
                     file: '4.jpg',
-                },
+                } 
             },
             {
                 userFk: 3,
                 name: 'Natasha',
                 lastName: 'Romanoff',
                 file: '4.jpg',
-                created: '2021-10-28 21:00:00',
+                created: '2021-10-28 21:00:00'
-            },
+            }  
-        ];
+        ]
 
         it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
             vm.setData(data);
             expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
             expect([vm.rows][0][1].lastName).toEqual('Romanoff');
+
         });
     });
 
     describe('parseDms()', () => {
-        const resultDms = { ...dms, userId: 1 };
+        const resultDms = { ...dms, userId:1};
-
+        
         it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
             const parsedDms = vm.parseDms(dms);
             expect(parsedDms).toEqual(resultDms);
@@ -78,12 +76,12 @@ describe('VnDmsList', () => {
     });
 
     describe('showFormDialog()', () => {
-        const resultDms = { ...dms, userId: 1 };
+        const resultDms = { ...dms, userId:1};
-
+        
         it('should call fn parseDms() and set show true if dms is defined', () => {
             vm.showFormDialog(dms);
             expect(vm.formDialog.show).toEqual(true);
             expect(vm.formDialog.dms).toEqual(resultDms);
         });
     });
-});
+});	

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

@@ -108,4 +108,27 @@ 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

@@ -1,28 +0,0 @@
-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__/VnLogValue.spec.js

@@ -1,26 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import VnLogValue from 'src/components/common/VnLogValue.vue';
-import { createWrapper } from 'app/test/vitest/helper';
-
-const buildComponent = (props) => {
-    return createWrapper(VnLogValue, {
-        props,
-        global: {},
-    }).wrapper;
-};
-
-describe('VnLogValue', () => {
-    const id = 1;
-    it('renders without descriptor', async () => {
-        expect(getIcon('inventFk').exists()).toBe(false);
-    });
-
-    it('renders with descriptor', async () => {
-        expect(getIcon('claimFk').text()).toBe('launch');
-    });
-
-    function getIcon(name) {
-        const wrapper = buildComponent({ value: { val: id }, name });
-        return wrapper.find('.q-icon');
-    }
-});

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

@@ -1,4 +1,4 @@
-import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
+import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 
@@ -7,64 +7,45 @@ describe('VnNotes', () => {
     let wrapper;
     let spyFetch;
     let postMock;
-    let patchMock;
+    let expectedBody;
-    let deleteMock;
+    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
-    let expectedInsertBody;
+
-    let expectedUpdateBody;
+    function generateExpectedBody() {
-    const defaultOptions = {
+        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
-        url: '/test',
+    }
-        body: { name: 'Tony', lastName: 'Stark' },
+
-        selectType: false,
+    async function setTestParams(text, observationType, type){
-        saveUrl: null,
+        vm.newNote.text = text;
-        justInput: false,
+        vm.newNote.observationTypeFk = observationType;
-    };
+        wrapper.setProps({ selectType: type });
-    function generateWrapper(
+    }
-        options = defaultOptions,
+
-        text = null,
+    beforeAll(async () => {        
-        observationType = null,
+        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
-    ) {
+
-        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: options,
+            propsData: {
+                url: '/test',
+                body: { name: 'Tony', lastName: 'Stark' },
+            }
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
-        vm.newNote.text = text;
+    });
-        vm.newNote.observationTypeFk = observationType;
-    }
-
-    function createSpyFetch() {
-        spyFetch = vi.spyOn(vm.$refs.vnPaginateRef, 'fetch');
-    }
-
-    function generateExpectedBody() {
-        expectedInsertBody = {
-            ...vm.$props.body,
-            ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk },
-        };
-        expectedUpdateBody = { ...vm.$props.body, ...{ notes: vm.newNote.text } };
-    }
 
     beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post');
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
-        patchMock = vi.spyOn(axios, 'patch');
+        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
-        deleteMock = vi.spyOn(axios, 'delete');
     });
 
     afterEach(() => {
         vi.clearAllMocks();
-        expectedInsertBody = {};
+        expectedBody = {};
-        expectedUpdateBody = {};
-    });
-
-    afterAll(() => {
-        vi.restoreAllMocks();
     });
 
     describe('insert', () => {
-        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is null', async () => {
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
-            generateWrapper({ selectType: true });
+            await setTestParams( null, null, true );
-            createSpyFetch();
 
             await vm.insert();
 
@@ -72,9 +53,8 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is empty', async () => {
+        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
-            generateWrapper(null, '');
+            await setTestParams( "", null, false );
-            createSpyFetch();
 
             await vm.insert();
 
@@ -82,9 +62,8 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post and vnPaginateRef.fetch when observationTypeFk is null and selectType is true', async () => {
+        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
-            generateWrapper({ selectType: true }, 'Test Note');
+            await setTestParams( "Test Note", null, true );
-            createSpyFetch();
 
             await vm.insert();
 
@@ -92,69 +71,37 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should call axios.post and vnPaginateRef.fetch when observationTypeFk is missing and selectType is false', async () => {
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
-            generateWrapper(null, 'Test Note');
+            await setTestParams( "Test Note", null, false );
-            createSpyFetch();
+
             generateExpectedBody();
 
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(spyFetch).toHaveBeenCalled();
+        });
+
+        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
+            await setTestParams( "Test Note", 1, false );
+
+            generateExpectedBody();
+
+            await vm.insert();
+
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
             expect(spyFetch).toHaveBeenCalled();
         });
 
         it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            generateWrapper({ selectType: true }, 'Test Note', 1);
+            await setTestParams( "Test Note", 1, true );
-            createSpyFetch();
-            generateExpectedBody();
 
+            generateExpectedBody();
+            
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
             expect(spyFetch).toHaveBeenCalled();
         });
     });
-
+});
-    describe('update', () => {
-        it('should call axios.patch with saveUrl when saveUrl is set and justInput is true', async () => {
-            generateWrapper({
-                url: '/business',
-                justInput: true,
-                saveUrl: '/saveUrlTest',
-            });
-            generateExpectedBody();
-
-            await vm.update();
-
-            expect(patchMock).toHaveBeenCalledWith(vm.$props.saveUrl, expectedUpdateBody);
-        });
-
-        it('should call axios.patch with url when saveUrl is not set and justInput is true', async () => {
-            generateWrapper({
-                url: '/business',
-                body: { workerFk: 1110 },
-                justInput: true,
-            });
-            generateExpectedBody();
-
-            await vm.update();
-
-            expect(patchMock).toHaveBeenCalledWith(
-                `${vm.$props.url}/${vm.$props.body.workerFk}`,
-                expectedUpdateBody,
-            );
-        });
-    });
-
-    describe('delete', () => {
-        it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
-            generateWrapper();
-            createSpyFetch();
-
-            await vm.deleteNote({ id: 1 });
-
-            expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-    });
-});

src/components/ui/CardDescriptor.vue

@@ -1,38 +1,295 @@
 <script setup>
-import { ref } from 'vue';
+import { onBeforeMount, watch, computed, ref } from 'vue';
-import VnDescriptor from './VnDescriptor.vue';
+import { useI18n } from 'vue-i18n';
+import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
+import { useArrayData } from 'composables/useArrayData';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
-    id: {
+    url: {
-        type: Number,
+        type: String,
-        default: false,
+        default: '',
     },
-    card: {
+    filter: {
         type: Object,
         default: null,
     },
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: Number,
+        default: null,
+    },
+    dataKey: {
+        type: String,
+        default: null,
+    },
+    module: {
+        type: String,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
 });
 
+const state = useState();
+const route = useRoute();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+let arrayData;
+let store;
+let entity;
+const isLoading = ref(false);
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+defineExpose({ getData });
+
+onBeforeMount(async () => {
+    arrayData = useArrayData($props.dataKey, {
+        url: $props.url,
+        filter: $props.filter,
+        skip: 0,
+    });
+    store = arrayData.store;
+    entity = computed(() => {
+        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        if (data) emit('onFetch', data);
+        return data;
+    });
+
+    // It enables to load data only once if the module is the same as the dataKey
+    if (!isSameDataKey.value || !route.params.id) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => {
+            if (!isSameDataKey.value) await getData();
+        }
+    );
+});
+
+async function getData() {
+    store.url = $props.url;
+    store.filter = $props.filter ?? {};
+    isLoading.value = true;
+    try {
+        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
+        emit('onFetch', Array.isArray(data) ? data[0] : data);
+    } finally {
+        isLoading.value = false;
+    }
+}
+
+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;
+}
+
 const emit = defineEmits(['onFetch']);
-const entity = ref();
+
+const iconModule = computed(() => route.matched[1].meta.icon);
+const toModule = computed(() =>
+    route.matched[1].path.split('/').length > 2
+        ? route.matched[1].redirect
+        : route.matched[1].children[0].redirect
+);
 </script>
 
 <template>
-    <component
+    <div class="descriptor">
-        :is="card"
+        <template v-if="entity && !isLoading">
-        :id
+            <div class="header bg-primary q-pa-sm justify-between">
-        :visual="false"
+                <slot name="header-extra-action"
-        v-bind="$attrs"
+                    ><QBtn
-        @on-fetch="
+                        round
-            (data) => {
+                        flat
-                entity = data;
+                        dense
-                emit('onFetch', data);
+                        size="md"
-            }
+                        :icon="iconModule"
-        "
+                        color="white"
-    />
+                        class="link"
-    <VnDescriptor v-model="entity" v-bind="$attrs">
+                        :to="$attrs['to-module'] ?? toModule"
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+                    >
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+                        <QTooltip>
+                            {{ t('globals.goToModuleIndex') }}
+                        </QTooltip>
+                    </QBtn></slot
+                >
+                <QBtn
+                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
+                    round
+                    flat
+                    dense
+                    size="md"
+                    icon="preview"
+                    color="white"
+                    class="link"
+                    v-if="summary"
+                >
+                    <QTooltip>
+                        {{ t('components.smartCard.openSummary') }}
+                    </QTooltip>
+                </QBtn>
+                <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
+                    <QBtn
+                        class="link"
+                        color="white"
+                        dense
+                        flat
+                        icon="launch"
+                        round
+                        size="md"
+                    >
+                        <QTooltip>
+                            {{ t('components.cardDescriptor.summary') }}
+                        </QTooltip>
+                    </QBtn>
+                </RouterLink>
+                <VnMoreOptions v-if="$slots.menu">
+                    <template #menu="{ menuRef }">
+                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                    </template>
+                </VnMoreOptions>
+            </div>
+            <slot name="before" />
+            <div class="body q-py-sm">
+                <QList dense>
+                    <QItemLabel header class="ellipsis text-h5" :lines="1">
+                        <div class="title">
+                            <span v-if="$props.title" :title="getValueFromPath(title)">
+                                {{ getValueFromPath(title) ?? $props.title }}
+                            </span>
+                            <slot v-else name="description" :entity="entity">
+                                <span :title="entity.name">
+                                    {{ entity.name }}
+                                </span>
+                            </slot>
+                        </div>
+                    </QItemLabel>
+                    <QItem dense>
+                        <QItemLabel class="subtitle" caption>
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                        </QItemLabel>
+                    </QItem>
+                </QList>
+                <div class="list-box q-mt-xs">
+                    <slot name="body" :entity="entity" />
+                </div>
+            </div>
+            <div class="icons">
+                <slot name="icons" :entity="entity" />
+            </div>
+            <div class="actions justify-center">
+                <slot name="actions" :entity="entity" />
+            </div>
+            <slot name="after" />
         </template>
-    </VnDescriptor>
+        <!-- Skeleton -->
+        <SkeletonDescriptor v-if="!entity || isLoading" />
+    </div>
+    <QInnerLoading
+        :label="t('globals.pleaseWait')"
+        :showing="isLoading"
+        color="primary"
+    />
 </template>
+
+<style lang="scss">
+.body {
+    background-color: var(--vn-section-color);
+    .text-h5 {
+        font-size: 20px;
+        padding-top: 5px;
+        padding-bottom: 0px;
+    }
+    .q-item {
+        min-height: 20px;
+
+        .link {
+            margin-left: 10px;
+        }
+    }
+    .vn-label-value {
+        display: flex;
+        padding: 0px 16px;
+        .label {
+            color: var(--vn-label-color);
+            font-size: 14px;
+
+            &:not(:has(a))::after {
+                content: ':';
+            }
+        }
+        .value {
+            color: var(--vn-text-color);
+            font-size: 14px;
+            margin-left: 4px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            text-align: left;
+        }
+        .info {
+            margin-left: 5px;
+        }
+    }
+}
+</style>
+
+<style lang="scss" scoped>
+.title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    span {
+        color: var(--vn-text-color);
+        font-weight: bold;
+    }
+}
+.subtitle {
+    color: var(--vn-text-color);
+    font-size: 16px;
+    margin-bottom: 2px;
+}
+.list-box {
+    .q-item__label {
+        color: var(--vn-label-color);
+        padding-bottom: 0%;
+    }
+}
+.descriptor {
+    width: 256px;
+    .header {
+        display: flex;
+        align-items: center;
+    }
+    .icons {
+        margin: 0 10px;
+        display: flex;
+        justify-content: center;
+        .q-icon {
+            margin-right: 5px;
+        }
+    }
+    .actions {
+        margin: 0 5px;
+        justify-content: center !important;
+    }
+}
+</style>

src/components/ui/CardSummary.vue

@@ -40,10 +40,9 @@ const arrayData = useArrayData(props.dataKey, {
     filter: props.filter,
     userFilter: props.userFilter,
     skip: 0,
-    oneRecord: true,
 });
 const { store } = arrayData;
-const entity = computed(() => store.data);
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
 defineExpose({
@@ -62,7 +61,7 @@ async function fetch() {
     store.filter = props.filter ?? {};
     isLoading.value = true;
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', data);
+    emit('onFetch', Array.isArray(data) ? data[0] : data);
     isLoading.value = false;
 }
 </script>
@@ -81,7 +80,6 @@ async function fetch() {
                                 name: `${moduleName ?? route.meta.moduleName}Summary`,
                                 params: { id: entityId || entity.id },
                             }"
-                            data-cy="goToSummaryBtn"
                         >
                             <QIcon name="open_in_new" color="white" size="sm" />
                         </router-link>
@@ -159,7 +157,6 @@ async function fetch() {
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
-                align-items: start;
                 .label {
                     color: var(--vn-label-color);
                     width: 9em;
@@ -170,15 +167,9 @@ 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 {
@@ -208,23 +199,6 @@ async function fetch() {
         }
     }
 }
-
-.vn-card-group {
-    display: grid;
-    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;
-    }
-}
 </style>
 <style lang="scss" scoped>
 .summaryHeader .vn-label-value {
@@ -234,13 +208,4 @@ async function fetch() {
 .summaryHeader {
     color: $white;
 }
-
-.cardSummary :deep(.q-card__section[content]) {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0;
-    > * {
-        flex: 1;
-    }
-}
 </style>

src/components/ui/CatalogItem.vue

@@ -132,8 +132,7 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-    white-space: nowrap;
+
-    width: 192px;
     p {
         margin-bottom: 0;
     }

src/components/ui/EntityDescriptor.vue

@@ -1,78 +0,0 @@
-<script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
-import { useArrayData } from 'composables/useArrayData';
-import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
-import VnDescriptor from './VnDescriptor.vue';
-
-const $props = defineProps({
-    url: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    dataKey: {
-        type: String,
-        default: null,
-    },
-});
-
-const state = useState();
-const route = useRoute();
-let arrayData;
-let store;
-let entity;
-const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-defineExpose({ getData });
-
-onBeforeMount(async () => {
-    arrayData = useArrayData($props.dataKey, {
-        url: $props.url,
-        userFilter: $props.filter,
-        skip: 0,
-        oneRecord: true,
-    });
-    store = arrayData.store;
-    entity = computed(() => {
-        const data = store.data ?? {};
-        if (data) emit('onFetch', data);
-        return data;
-    });
-
-    // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
-    watch(
-        () => [$props.url, $props.filter],
-        async () => {
-            if (!isSameDataKey.value) await getData();
-        },
-    );
-});
-
-async function getData() {
-    store.url = $props.url;
-    store.filter = $props.filter ?? {};
-    isLoading.value = true;
-    try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-        state.set($props.dataKey, data);
-        emit('onFetch', data);
-    } finally {
-        isLoading.value = false;
-    }
-}
-
-const emit = defineEmits(['onFetch']);
-</script>
-
-<template>
-    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-        </template>
-    </VnDescriptor>
-</template>

src/components/ui/SkeletonDescriptor.vue

@@ -1,32 +1,53 @@
-<script setup>
-defineProps({
-    hasImage: {
-        type: Boolean,
-        default: false,
-    },
-});
-</script>
 <template>
-    <div id="descriptor-skeleton" class="bg-vn-page">
+    <div id="descriptor-skeleton">
         <div class="row justify-between q-pa-sm">
-            <QSkeleton square size="30px" v-for="i in 3" :key="i" />
+            <QSkeleton square size="40px" />
+            <QSkeleton square size="40px" />
+            <QSkeleton square height="40px" width="20px" />
         </div>
-        <div class="q-pa-xs" v-if="hasImage">
+        <div class="col justify-between q-pa-sm q-gutter-y-xs">
-            <QSkeleton square height="200px" width="100%" />
+            <QSkeleton square height="40px" width="150px" />
+            <QSkeleton square height="30px" width="70px" />
         </div>
-        <div class="col justify-between q-pa-md q-gutter-y-xs">
+        <div class="col q-pl-sm q-pa-sm q-mb-md">
-            <QSkeleton square height="25px" width="150px" />
+            <div class="row justify-between">
-            <QSkeleton square height="15px" width="70px" />
+                <QSkeleton type="text" square height="30px" width="20%" />
-        </div>
+                <QSkeleton type="text" square height="30px" width="60%" />
-        <div class="q-pl-sm q-pa-sm q-mb-md">
+            </div>
-            <div class="row q-gutter-x-sm q-pa-none q-ma-none" v-for="i in 5" :key="i">
+            <div class="row justify-between">
-                <QSkeleton type="text" square height="20px" width="30%" />
+                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="20px" width="60%" />
+                <QSkeleton type="text" square height="30px" width="60%" />
+            </div>
+            <div class="row justify-between">
+                <QSkeleton type="text" square height="30px" width="20%" />
+                <QSkeleton type="text" square height="30px" width="60%" />
+            </div>
+            <div class="row justify-between">
+                <QSkeleton type="text" square height="30px" width="20%" />
+                <QSkeleton type="text" square height="30px" width="60%" />
+            </div>
+            <div class="row justify-between">
+                <QSkeleton type="text" square height="30px" width="20%" />
+                <QSkeleton type="text" square height="30px" width="60%" />
+            </div>
+            <div class="row justify-between">
+                <QSkeleton type="text" square height="30px" width="20%" />
+                <QSkeleton type="text" square height="30px" width="60%" />
             </div>
         </div>
 
-        <QCardActions class="q-gutter-x-sm justify-between">
+        <QCardActions>
-            <QSkeleton size="40px" v-for="i in 5" :key="i" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
         </QCardActions>
     </div>
 </template>
+
+<style lang="scss" scoped>
+#descriptor-skeleton .q-card__actions {
+    justify-content: space-between;
+}
+</style>

src/components/ui/VnConfirm.vue

@@ -82,7 +82,7 @@ function cancel() {
                     @click="cancel()"
                 />
             </QCardSection>
-            <QCardSection class="q-pb-none" data-cy="VnConfirm_message">
+            <QCardSection class="q-pb-none">
                 <span v-if="message !== false" v-html="message" />
             </QCardSection>
             <QCardSection class="row items-center q-pt-none">
@@ -95,7 +95,6 @@ function cancel() {
                     :disable="isLoading"
                     flat
                     @click="cancel()"
-                    data-cy="VnConfirm_cancel"
                 />
                 <QBtn
                     :label="t('globals.confirm')"

src/components/ui/VnDescriptor.vue

@@ -1,322 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useRoute, useRouter } from 'vue-router';
-import { useClipboard } from 'src/composables/useClipboard';
-import VnMoreOptions from './VnMoreOptions.vue';
-
-const entity = defineModel({ type: Object, default: null });
-const $props = defineProps({
-    title: {
-        type: String,
-        default: '',
-    },
-    subtitle: {
-        type: Number,
-        default: null,
-    },
-    summary: {
-        type: Object,
-        default: null,
-    },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
-    module: {
-        type: String,
-        default: null,
-    },
-    toModule: {
-        type: Object,
-        default: null,
-    },
-});
-
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
-const { copyText } = useClipboard();
-const { viewSummary } = useSummaryDialog();
-const DESCRIPTOR_PROXY = 'DescriptorProxy';
-const moduleName = ref();
-const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
-
-function getName() {
-    let name = $props.module;
-    if ($props.module.includes(DESCRIPTOR_PROXY)) {
-        name = name.split(DESCRIPTOR_PROXY)[0];
-    }
-    return name;
-}
-const routeName = computed(() => {
-    let routeName = getName();
-    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: {
-            copyValue: id,
-        },
-    });
-}
-
-const emit = defineEmits(['onFetch']);
-
-const iconModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) {
-        return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
-    }
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.meta?.icon;
-    } else {
-        return route.matched[1].meta.icon;
-    }
-});
-
-const toModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) return $props.toModule;
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.redirect;
-    } else {
-        return route.matched[1].path.split('/').length > 2
-            ? route.matched[1].redirect
-            : route.matched[1].children[0].redirect;
-    }
-});
-</script>
-
-<template>
-    <div class="descriptor" data-cy="vnDescriptor">
-        <template v-if="entity && entity?.id">
-            <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action">
-                    <QBtn
-                        round
-                        flat
-                        dense
-                        size="md"
-                        :icon="iconModule"
-                        color="white"
-                        class="link"
-                        :to="toModule"
-                    >
-                        <QTooltip>
-                            {{ t('globals.goToModuleIndex') }}
-                        </QTooltip>
-                    </QBtn>
-                </slot>
-                <QBtn
-                    @click.stop="viewSummary(entity.id, summary, width)"
-                    round
-                    flat
-                    dense
-                    size="md"
-                    icon="preview"
-                    color="white"
-                    class="link"
-                    v-if="summary"
-                    data-cy="openSummaryBtn"
-                >
-                    <QTooltip>
-                        {{ t('components.smartCard.openSummary') }}
-                    </QTooltip>
-                </QBtn>
-                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
-                    <QBtn
-                        class="link"
-                        color="white"
-                        dense
-                        flat
-                        icon="launch"
-                        round
-                        size="md"
-                        data-cy="goToSummaryBtn"
-                    >
-                        <QTooltip>
-                            {{ t('components.vnDescriptor.summary') }}
-                        </QTooltip>
-                    </QBtn>
-                </RouterLink>
-                <VnMoreOptions v-if="$slots.menu">
-                    <template #menu="{ menuRef }">
-                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                    </template>
-                </VnMoreOptions>
-            </div>
-            <slot name="before" />
-            <div class="body q-py-sm">
-                <QList dense>
-                    <QItemLabel header class="ellipsis text-h5" :lines="1">
-                        <div class="title">
-                            <span
-                                v-if="title"
-                                :title="getValueFromPath(title)"
-                                :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
-                            >
-                                {{ getValueFromPath(title) ?? title }}
-                            </span>
-                            <slot v-else name="description" :entity="entity">
-                                <span
-                                    :title="entity.name"
-                                    :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_description`"
-                                    v-text="entity.name"
-                                />
-                            </slot>
-                        </div>
-                    </QItemLabel>
-                    <QItem>
-                        <QItemLabel
-                            class="subtitle"
-                            :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
-                        >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
-                        </QItemLabel>
-                        <QBtn
-                            round
-                            flat
-                            dense
-                            size="sm"
-                            icon="content_copy"
-                            color="primary"
-                            @click.stop="copyIdText(entity.id)"
-                        >
-                            <QTooltip>
-                                {{ t('globals.copyId') }}
-                            </QTooltip>
-                        </QBtn>
-                    </QItem>
-                </QList>
-                <div
-                    class="list-box q-mt-xs"
-                    :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_listbox`"
-                >
-                    <slot name="body" :entity="entity" />
-                </div>
-            </div>
-            <div class="icons">
-                <slot name="icons" :entity="entity" />
-            </div>
-            <div class="actions justify-center" data-cy="descriptor_actions">
-                <slot name="actions" :entity="entity" />
-            </div>
-            <slot name="after" />
-        </template>
-        <SkeletonDescriptor v-if="!entity" />
-    </div>
-    <QInnerLoading :label="t('globals.pleaseWait')" :showing="!entity" color="primary" />
-</template>
-
-<style lang="scss">
-.body {
-    background-color: var(--vn-section-color);
-    .text-h5 {
-        font-size: 20px;
-        padding-top: 5px;
-        padding-bottom: 0px;
-    }
-    .q-item {
-        min-height: 20px;
-
-        .link {
-            margin-left: 10px;
-        }
-    }
-    .vn-label-value {
-        display: flex;
-        padding: 0px 16px;
-        .label {
-            color: var(--vn-label-color);
-            font-size: 14px;
-
-            &:not(:has(a))::after {
-                content: ':';
-            }
-        }
-        &.ellipsis > .value {
-            text-overflow: ellipsis;
-            white-space: pre;
-        }
-        .value {
-            color: var(--vn-text-color);
-            font-size: 14px;
-            margin-left: 4px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            text-align: left;
-        }
-        .info {
-            margin-left: 5px;
-        }
-    }
-}
-</style>
-
-<style lang="scss" scoped>
-.title {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    span {
-        color: var(--vn-text-color);
-        font-weight: bold;
-    }
-}
-.subtitle {
-    color: var(--vn-text-color);
-    font-size: 16px;
-    margin-bottom: 2px;
-}
-.list-box {
-    .q-item__label {
-        color: var(--vn-label-color);
-        padding-bottom: 0%;
-    }
-}
-.descriptor {
-    width: 256px;
-    .header {
-        display: flex;
-        align-items: center;
-    }
-    .icons {
-        margin: 0 10px;
-        display: flex;
-        justify-content: center;
-        .q-icon {
-            margin-right: 5px;
-        }
-    }
-    .actions {
-        margin: 0 5px;
-        justify-content: center !important;
-    }
-}
-</style>
-<i18n>
-    en:
-        globals:
-            copyId: Copy ID
-    es:
-        globals:
-            copyId: Copiar ID
-</i18n>

src/components/ui/VnFilterPanel.vue

@@ -54,17 +54,13 @@ const $props = defineProps({
         default: 'table',
     },
     redirect: {
-        type: [String, Boolean],
+        type: Boolean,
         default: true,
     },
     arrayData: {
         type: Object,
         default: null,
     },
-    showTagChips: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const emit = defineEmits([
@@ -92,14 +88,13 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
 defineExpose({ search, params: userParams, remove });
 
 const isLoading = ref(false);
-async function search(evt, name, value) {
+async function search(evt) {
     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,
@@ -119,7 +114,7 @@ async function clearFilters() {
         arrayData.resetPagination();
         // Filtrar los params no removibles
         const removableFilters = Object.keys(userParams.value).filter((param) =>
-            $props.unremovableParams.includes(param),
+            $props.unremovableParams.includes(param)
         );
         const newParams = {};
         // Conservar solo los params que no son removibles
@@ -167,13 +162,13 @@ const formatTags = (tags) => {
 
 const tags = computed(() => {
     const filteredTags = tagsList.value.filter(
-        (tag) => !($props.customTags || []).includes(tag.label),
+        (tag) => !($props.customTags || []).includes(tag.label)
     );
     return formatTags(filteredTags);
 });
 
 const customTags = computed(() =>
-    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label)),
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
 );
 
 async function remove(key) {
@@ -193,13 +188,10 @@ function formatValue(value) {
 const getLocale = (label) => {
     const param = label.split('.').at(-1);
     const globalLocale = `globals.params.${param}`;
-    const moduleName = route.meta.moduleName;
-    const moduleLocale = `${moduleName.toLowerCase()}.${param}`;
     if (te(globalLocale)) return t(globalLocale);
-    else if (te(moduleLocale)) return t(moduleLocale);
+    else if (te(t(`params.${param}`)));
     else {
-        const camelCaseModuleName =
+        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
-            moduleName.charAt(0).toLowerCase() + moduleName.slice(1);
         return t(`${camelCaseModuleName}.params.${param}`);
     }
 };
@@ -219,7 +211,7 @@ const getLocale = (label) => {
         </QTooltip>
     </QBtn>
     <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
-        <QList dense v-if="showTagChips">
+        <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
                     <QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
@@ -254,7 +246,7 @@ const getLocale = (label) => {
                         :key="chip.label"
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
-                        :data-cy="`vnFilterPanelChip_${chip.label}`"
+                        data-cy="vnFilterPanelChip"
                     >
                         <slot
                             name="tags"
@@ -298,9 +290,6 @@ const getLocale = (label) => {
     />
 </template>
 <style scoped lang="scss">
-.q-field__label.no-pointer-events.absolute.ellipsis {
-    margin-left: 6px !important;
-}
 .list {
     width: 256px;
 }

src/components/ui/VnLinkMail.vue

@@ -1,11 +1,8 @@
 <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
@@ -16,5 +13,4 @@ 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 { dashIfEmpty, parsePhone } from 'src/filters';
+import { parsePhone } from 'src/filters';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
@@ -12,65 +12,49 @@ 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];
 
-    for (const type of activeTypes) {
+    if (type === 'say-simple') {
-        if (type === 'say-simple') {
+        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
-            let { channel } = config[type];
+            .data;
-            const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+        if (!channel) channel = defaultChannel;
-                .data;
-            if (!channel) channel = defaultChannel;
 
-            phone.value = await parsePhone(
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
-                props.phoneNumber,
+        config[
-                props.country?.toLowerCase(),
+            type
-            );
+        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-            config[type].url =
-                `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-        }
     }
 });
 
-function handleClick(type) {
+function handleClick() {
     if (config[type].url) useOpenURL(config[type].url);
     else if (config[type].href) window.location.href = config[type].href;
 }
 </script>
-
 <template>
-    <div class="flex items-center gap-2">
+    <QBtn
-        <template v-for="type in activeTypes">
+        v-if="phone"
-            <QBtn
+        flat
-                :key="type"
+        round
-                v-if="phone"
+        :icon="config[type].icon"
-                flat
+        size="sm"
-                round
+        color="primary"
-                :icon="config[type].icon"
+        padding="none"
-                size="sm"
+        @click.stop="handleClick"
-                color="primary"
+    >
-                padding="none"
+        <QTooltip>
-                @click.stop="() => handleClick(type)"
+            {{ capitalize(type).replace('-', '') }}
-            >
+        </QTooltip>
-                <QTooltip>
+    </QBtn>
-                    {{ capitalize(type).replace('-', '') }}
-                </QTooltip>
-            </QBtn></template
-        >
-        <span>{{ dashIfEmpty(phone) }}</span>
-    </div>
 </template>

src/components/ui/VnLv.vue

@@ -28,14 +28,13 @@ function copyValueText() {
 const val = computed(() => $props.value);
 </script>
 <template>
-    <div class="vn-label-value" :data-cy="`${$attrs['data-cy'] ?? 'vnLv'}${label ?? ''}`">
+    <div class="vn-label-value">
         <QCheckbox
             v-if="typeof value === 'boolean'"
             v-model="val"
             :label="label"
             disable
             dense
-            size="sm"
         />
         <template v-else>
             <div v-if="label || $slots.label" class="label">
@@ -43,9 +42,9 @@ const val = computed(() => $props.value);
                     <span style="color: var(--vn-label-color)">{{ label }}</span>
                 </slot>
             </div>
-            <div class="value" v-if="value || $slots.value">
+            <div class="value">
                 <slot name="value">
-                    <span :title="value" style="text-overflow: ellipsis">
+                    <span :title="value">
                         {{ dash ? dashIfEmpty(value) : value }}
                     </span>
                 </slot>

src/components/ui/VnMoreOptions.vue

@@ -9,10 +9,10 @@
         data-cy="descriptor-more-opts"
     >
         <QTooltip>
-            {{ $t('components.vnDescriptor.moreOptions') }}
+            {{ $t('components.cardDescriptor.moreOptions') }}
         </QTooltip>
-        <QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
+        <QMenu ref="menuRef">
-            <QList data-cy="descriptor-more-opts_list">
+            <QList>
                 <slot name="menu" :menu-ref="$refs.menuRef" />
             </QList>
         </QMenu>

src/components/ui/VnNotes.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive, useAttrs, computed } from 'vue';
+import { ref, reactive } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -16,23 +16,12 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'components/common/VnInput.vue';
 
-const emit = defineEmits(['onFetch']);
-
-const originalAttrs = useAttrs();
-const $attrs = computed(() => {
-    const { required, deletable, ...rest } = originalAttrs;
-    return rest;
-});
-
 const $props = defineProps({
     url: { type: String, default: null },
-    saveUrl: { type: String, default: null },
-    userFilter: { type: Object, default: () => {} },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
     selectType: { type: Boolean, default: false },
-    justInput: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
@@ -41,23 +30,6 @@ const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
-const defaultObservationType = computed(() => 
-    observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
-);
-
-let originalText;
-
-function handleClick(e) {
-    if (e.shiftKey && e.key === 'Enter') return;
-    if ($props.justInput) confirmAndUpdate();
-    else insert();
-}
-
-async function deleteNote(e) {
-    await axios.delete(`${$props.url}/${e.id}`);
-    await vnPaginateRef.value.fetch();
-}
-
 async function insert() {
     if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
 
@@ -69,42 +41,8 @@ async function insert() {
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
 }
-
-function confirmAndUpdate() {
-    if (!newNote.text && originalText)
-        quasar
-            .dialog({
-                component: VnConfirm,
-                componentProps: {
-                    title: t('New note is empty'),
-                    message: t('Are you sure remove this note?'),
-                },
-            })
-            .onOk(update)
-            .onCancel(() => {
-                newNote.text = originalText;
-            });
-    else update();
-}
-
-async function update() {
-    originalText = newNote.text;
-    const body = $props.body;
-    const newBody = {
-        ...body,
-        ...{ notes: newNote.text },
-    };
-    await axios.patch(
-        `${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`,
-        newBody,
-    );
-}
-
 onBeforeRouteLeave((to, from, next) => {
-    if (
+    if (newNote.text)
-        (newNote.text && !$props.justInput) ||
-        (newNote.text !== originalText && $props.justInput)
-    )
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -115,42 +53,17 @@ onBeforeRouteLeave((to, from, next) => {
         });
     else next();
 });
-
-function fetchData([data]) {
-    newNote.text = data?.notes;
-    originalText = data?.notes;
-    emit('onFetch', data);
-}
-
-const handleObservationTypes = (data) => {
-    observationTypes.value = data;
-    if(defaultObservationType.value) {
-        newNote.observationTypeFk = defaultObservationType.value;
-    }
-};
-
 </script>
 <template>
     <FetchData
         v-if="selectType"
         url="ObservationTypes"
-        :filter="{ fields: ['id', 'description', 'code'] }"
+        :filter="{ fields: ['id', 'description'] }"
         auto-load
-        @on-fetch="handleObservationTypes"
+        @on-fetch="(data) => (observationTypes = data)"
     />
-    <FetchData
+    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
-        v-if="justInput"
+        <QCardSection horizontal>
-        :url="url"
-        :filter="filter"
-        @on-fetch="fetchData"
-        auto-load
-    />
-    <QCard
-        class="q-pa-xs q-mb-lg full-width"
-        :class="{ 'just-input': $props.justInput }"
-        v-if="$props.addNote || $props.justInput"
-    >
-        <QCardSection horizontal v-if="!$props.justInput">
             {{ t('New note') }}
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
@@ -162,19 +75,19 @@ const handleObservationTypes = (data) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="'required' in originalAttrs"
+                    :required="true"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
                     v-model.trim="newNote.text"
                     type="textarea"
-                    :label="$props.justInput && newNote.text ? '' : t('Add note here...')"
+                    :label="t('Add note here...')"
                     filled
+                    size="lg"
                     autogrow
-                    autofocus
+                    @keyup.enter.stop="insert"
-                    @keyup.enter.stop="handleClick"
-                    :required="'required' in originalAttrs"
                     clearable
+                    :required="true"
                 >
                     <template #append>
                         <QBtn
@@ -182,7 +95,7 @@ const handleObservationTypes = (data) => {
                             icon="save"
                             color="primary"
                             flat
-                            @click="handleClick"
+                            @click="insert"
                             class="q-mb-xs"
                             dense
                             data-cy="saveNote"
@@ -193,20 +106,19 @@ const handleObservationTypes = (data) => {
         </QCardSection>
     </QCard>
     <VnPaginate
-        v-if="!$props.justInput"
         :data-key="$props.url"
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :user-filter="userFilter"
+        :user-filter="$props.filter"
-        :filter="filter"
         auto-load
         ref="vnPaginateRef"
         class="show"
         v-bind="$attrs"
-        :search-url="false"
+        search-url="notes"
         @on-fetch="
             newNote.text = '';
+            newNote.observationTypeFk = null;
         "
     >
         <template #body="{ rows }">
@@ -237,27 +149,12 @@ const handleObservationTypes = (data) => {
                                 >
                                     {{
                                         observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk,
+                                            (ot) => ot.id === note.observationTypeFk
                                         )?.description
                                     }}
                                 </QBadge>
                             </div>
                             <span v-text="toDateHourMin(note.created)" />
-                            <div>
-                                <QIcon
-                                    v-if="'deletable' in originalAttrs"
-                                    name="delete"
-                                    size="sm"
-                                    class="cursor-pointer"
-                                    color="primary"
-                                    @click="deleteNote(note)"
-                                    data-cy="notesRemoveNoteBtn"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticketNotes.removeNote') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </div>
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
@@ -301,11 +198,6 @@ const handleObservationTypes = (data) => {
         }
     }
 }
-.just-input {
-    padding-right: 18px;
-    margin-bottom: 2px;
-    box-shadow: none;
-}
 </style>
 <i18n>
     es:
@@ -313,6 +205,4 @@ const handleObservationTypes = (data) => {
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
         Observation type: Tipo de observación
-        New note is empty: La nueva nota esta vacia
-        Are you sure remove this note?: Estas seguro de quitar esta nota?
 </i18n>

src/components/ui/VnPaginate.vue

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

src/components/ui/VnSearchbar.vue

@@ -33,10 +33,6 @@ const props = defineProps({
         type: String,
         default: '',
     },
-    userFilter: {
-        type: Object,
-        default: null,
-    },
     filter: {
         type: Object,
         default: null,
@@ -208,9 +204,8 @@ async function search() {
 }
 
 :deep(.q-field--focused) {
-    .q-icon,
+    .q-icon {
-    .q-placeholder {
+        color: black;
-        color: var(--vn-black-text-color);
     }
 }
 

src/components/ui/VnStockValueDisplay.vue

@@ -1,41 +0,0 @@
-<script setup>
-import { toPercentage } from 'filters/index';
-
-import { computed } from 'vue';
-
-const props = defineProps({
-    value: {
-        type: Number,
-        required: true,
-    },
-});
-
-const valueClass = computed(() =>
-    props.value === 0 ? 'neutral' : props.value > 0 ? 'positive' : 'negative',
-);
-const iconName = computed(() =>
-    props.value === 0 ? 'equal' : props.value > 0 ? 'arrow_upward' : 'arrow_downward',
-);
-const formattedValue = computed(() => props.value);
-</script>
-<template>
-    <span :class="valueClass">
-        <QIcon :name="iconName" size="sm" class="value-icon" />
-        {{ toPercentage(formattedValue) }}
-    </span>
-</template>
-
-<style lang="scss" scoped>
-.positive {
-    color: $secondary;
-}
-.negative {
-    color: $negative;
-}
-.neutral {
-    color: $primary;
-}
-.value-icon {
-    margin-right: 4px;
-}
-</style>

src/components/ui/VnSubToolbar.vue

@@ -19,26 +19,23 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value?.childNodes?.length + data.value?.childNodes?.length),
+                actions.value?.childNodes?.length + data.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);
 });
 
-const actionsChildCount = () => !!actions.value?.childNodes?.length;
+onBeforeUnmount(() => stateStore.toggleSubToolbar());
-
-onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>
 
 <template>
     <QToolbar
         id="subToolbar"
-        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
         class="justify-end sticky"
+        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
     >
         <slot name="st-data">
-            <div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
+            <div id="st-data"></div>
-            </div>
         </slot>
         <QSpace />
         <slot name="st-actions">

src/components/ui/VnToSummary.vue

@@ -26,7 +26,6 @@ const id = props.entityId;
         :to="{ name: routeName, params: { id: id } }"
         class="header link"
         :href="url"
-        data-cy="goToSummaryBtn"
     >
         <QIcon name="open_in_new" color="white" size="sm" />
     </router-link>

src/components/ui/VnUsesMana.vue

@@ -53,8 +53,3 @@ const manaCode = ref(props.manaCode);
         />
     </div>
 </template>
-<i18n>
-    es:
-        Promotion mana: Maná promoción
-        Claim mana: Maná reclamación
-</i18n>

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

@@ -51,6 +51,16 @@ describe('CardSummary', () => {
         expect(vm.store.filter).toEqual('cardFilter');
     });
 
+    it('should compute entity correctly from store data', () => {
+        vm.store.data = [{ id: 1, name: 'Entity 1' }];
+        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
+    });
+
+    it('should handle empty data gracefully', () => {
+        vm.store.data = [];
+        expect(vm.entity).toBeUndefined();
+    });
+
     it('should respond to prop changes and refetch data', async () => {
         const newUrl = 'CardSummary/35';
         const newKey = 'cardSummaryKey/35';
@@ -62,7 +72,7 @@ describe('CardSummary', () => {
         expect(vm.store.filter).toEqual({ key: newKey });
     });
 
-    it('should return true if route path ends with /summary', () => {
+    it('should return true if route path ends with /summary' , () => {
         expect(vm.isSummary).toBe(true);
     });
-});
+});

src/composables/__tests__/downloadFile.spec.js

@@ -6,12 +6,10 @@ const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
+    const baseUrl = 'http://localhost:9000';
     let defaulCreateObjectURL;
 
     beforeAll(() => {
-        vi.mock('src/composables/getUrl', () => ({
-            getUrl: vi.fn().mockResolvedValue(''),
-        }));
         defaulCreateObjectURL = window.URL.createObjectURL;
         window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
     });
@@ -24,14 +22,15 @@ describe('downloadFile', () => {
             headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
         };
         vi.spyOn(axios, 'get').mockImplementation((url) => {
-            if (url.includes('downloadFile')) return Promise.resolve(res);
+            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
+            else if (url.includes('downloadFile')) return Promise.resolve(res);
         });
 
         await downloadFile(1);
 
         expect(axios.get).toHaveBeenCalledWith(
-            `/api/dms/1/downloadFile?access_token=${token}`,
+            `${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
-            { responseType: 'blob' },
+            { responseType: 'blob' }
         );
     });
 });

src/composables/__tests__/useArrayData.spec.js

@@ -16,7 +16,7 @@ describe('useArrayData', () => {
         vi.clearAllMocks();
     });
 
-    it('should fetch and replace url with new params', async () => {
+    it('should fetch and repalce url with new params', async () => {
         vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
 
         const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
@@ -33,11 +33,11 @@ describe('useArrayData', () => {
         });
         expect(routerReplace.path).toEqual('mockSection/list');
         expect(JSON.parse(routerReplace.query.params)).toEqual(
-            expect.objectContaining(params),
+            expect.objectContaining(params)
         );
     });
 
-    it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
+    it('Should get data and send new URL without keeping parameters, if there is only one record', async () => {
         vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
 
         const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
@@ -56,7 +56,7 @@ describe('useArrayData', () => {
         expect(routerPush.query).toBeUndefined();
     });
 
-    it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
+    it('Should get data and send new URL keeping parameters, if you have more than one record', async () => {
         vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
 
         vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
@@ -95,25 +95,4 @@ describe('useArrayData', () => {
         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 });
-        await arrayData.fetch({});
-
-        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

@@ -23,19 +23,18 @@ 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').mockResolvedValueOnce({
+            vi.spyOn(axios, 'get')
+            .mockResolvedValueOnce({
                 data: { roles: rolesData, user: fetchedUser },
-            });
+            })
 
             vi.spyOn(role.state, 'setUser');
             vi.spyOn(role.state, 'setRoles');

src/composables/__tests__/useSession.spec.js

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

src/composables/checkEntryLock.js

@@ -1,64 +0,0 @@
-import { useQuasar } from 'quasar';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import axios from 'axios';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-
-export async function checkEntryLock(entryFk, userFk) {
-    const { t } = useI18n();
-    const quasar = useQuasar();
-    const { push } = useRouter();
-    const { data } = await axios.get(`Entries/${entryFk}`, {
-        params: {
-            filter: JSON.stringify({
-                fields: ['id', 'locked', 'lockerUserFk'],
-                include: { relation: 'user', scope: { fields: ['id', 'nickname'] } },
-            }),
-        },
-    });
-    const entryConfig = await axios.get('EntryConfigs/findOne');
-
-    if (data?.lockerUserFk && data?.locked) {
-        const now = new Date(Date.vnNow()).getTime();
-        const lockedTime = new Date(data.locked).getTime();
-        const timeDiff = (now - lockedTime) / 1000;
-        const isMaxTimeLockExceeded = entryConfig.data.maxLockTime > timeDiff;
-
-        if (data?.lockerUserFk !== userFk && isMaxTimeLockExceeded) {
-            quasar
-                .dialog({
-                    component: VnConfirm,
-                    componentProps: {
-                        title: t('entry.lock.title'),
-                        message: t('entry.lock.message', {
-                            userName: data?.user?.nickname,
-                            time: timeDiff / 60,
-                        }),
-                    },
-                })
-                .onOk(
-                    async () =>
-                        await axios.patch(`Entries/${entryFk}`, {
-                            locked: Date.vnNow(),
-                            lockerUserFk: userFk,
-                        }),
-                )
-                .onCancel(() => {
-                    push({ path: `summary` });
-                });
-        }
-    } else {
-        await axios
-            .patch(`Entries/${entryFk}`, {
-                locked: Date.vnNow(),
-                lockerUserFk: userFk,
-            })
-            .then(
-                quasar.notify({
-                    message: t('entry.lock.success'),
-                    color: 'positive',
-                    group: false,
-                }),
-            );
-    }
-}

src/composables/downloadFile.js

@@ -7,33 +7,18 @@ const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = await getAppUrl();
+    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
     const response = await axios.get(
         url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
-        { responseType: 'blob' },
+        { responseType: 'blob' }
     );
 
-    download(response);
-}
-
-export async function downloadDocuware(url, params) {
-    const appUrl = await getAppUrl();
-    const response = await axios.get(`${appUrl}/api/` + url, {
-        responseType: 'blob',
-        params,
-    });
-
-    download(response);
-}
-
-function download(response) {
     const contentDisposition = response.headers['content-disposition'];
     const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
+    const filename =
+        matches != null && matches[1]
+            ? matches[1].replace(/['"]/g, '')
+            : 'downloaded-file';
 
     exportFile(filename, response.data);
 }
-
-async function getAppUrl() {
-    return (await getUrl('', 'lilium')).replace('/#/', '');
-}

src/composables/getColAlign.js

@@ -1,24 +0,0 @@
-export function getColAlign(col) {
-    let align;
-    switch (col.component) {
-        case 'time':
-        case 'date':
-        case 'select':
-            align = 'left';
-            break;
-        case 'number':
-            align = 'right';
-            break;
-        case 'time':
-        case 'date':
-        case 'checkbox':
-            align = 'center';
-            break;
-        default:
-            align = col?.align;
-    }
-
-    if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
-
-    return 'text-' + (align ?? 'center');
-}

src/composables/useAcl.js

@@ -30,16 +30,9 @@ 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,
     };
 }