refs #5895 doc vuepress install

.dockerignore

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

.eslintignore

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

.eslintrc.js

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

.eslintrc.json

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

.gitignore

@@ -29,10 +29,5 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/test/cypress/videos
+/tests/cypress/videos
-/test/cypress/screenshots
+/tests/cypress/screenshots
-/junit
-
-# VitePress directories and files
-/docs/.vitepress/cache
-/docs/.vuepress

.husky/addReferenceTag.js

@@ -1,33 +0,0 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join, resolve } from 'path';
-
-function getCurrentBranchName(p = process.cwd()) {
-    if (!existsSync(p)) return false;
-
-    const gitHeadPath = join(p, '.git', 'HEAD');
-
-    if (!existsSync(gitHeadPath)) {
-        return getCurrentBranchName(resolve(p, '..'));
-    }
-
-    const headContent = readFileSync(gitHeadPath, 'utf-8');
-    return headContent.trim().split('/')[2];
-}
-
-const branchName = getCurrentBranchName();
-
-if (branchName) {
-    const msgPath = '.git/COMMIT_EDITMSG';
-    const msg = readFileSync(msgPath, 'utf-8');
-    const reference = branchName.match(/^\d+/);
-
-    const referenceTag = `refs #${reference}`;
-    if (!msg.includes(referenceTag) && reference) {
-        const splitedMsg = msg.split(':');
-
-        if (splitedMsg.length > 1) {
-            const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
-            writeFileSync(msgPath, finalMsg);
-        }
-    }
-}

.husky/commit-msg

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-echo "Running husky commit-msg hook"
-npx --no-install commitlint --edit
-echo "Adding reference tag to commit message"
-node .husky/addReferenceTag.js
-

.prettierrc.js

@@ -1,4 +1,4 @@
-export default {
+module.exports = {
     singleQuote: true,
     printWidth: 90,
     tabWidth: 4,

.vscode/settings.json

@@ -14,5 +14,5 @@
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "cSpell.words": ["axios", "composables"]
+    "cSpell.words": ["axios"]
 }

Dockerfile

@@ -1,6 +1,5 @@
 FROM node:stretch-slim
-RUN corepack enable pnpm
+RUN npm install -g @quasar/cli
-RUN pnpm install -g @quasar/cli
 WORKDIR /app
 COPY dist/spa ./
 CMD ["quasar", "serve", "./", "--history", "--hostname", "0.0.0.0"]	

Jenkinsfile

@@ -1,78 +1,29 @@
 #!/usr/bin/env groovy
-
-def PROTECTED_BRANCH
-def IS_LATEST
-
-def BRANCH_ENV = [
-    test: 'test',
-    master: 'production',
-    beta: 'production'
-]
-
-node {
-    stage('Setup') {
-        env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
-        PROTECTED_BRANCH = [
-            'dev',
-            'test',
-            'master',
-            'main',
-            'beta'
-        ]
-
-        IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
-        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',
-            variable: 'PROPS_FILE')
-        ]) {
-            def props = readProperties file: PROPS_FILE
-            props.each {key, value -> env."${key}" = value }
-            props.each {key, value -> echo "${key}: ${value}" }
-        }
-
-        if (IS_PROTECTED_BRANCH) {
-            configFileProvider([
-                configFile(fileId: "salix-front.branch.${env.BRANCH_NAME}",
-                variable: 'BRANCH_PROPS_FILE')
-            ]) {
-                def props = readProperties file: BRANCH_PROPS_FILE
-                props.each {key, value -> env."${key}" = value }
-                props.each {key, value -> echo "${key}: ${value}" }
-            }
-        }
-    }
-}
-
 pipeline {
     agent any
     options {
         disableConcurrentBuilds()
     }
-    tools {
-        nodejs 'node-v18'
-    }
     environment {
         PROJECT_NAME = 'lilium'
+        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
-        stage('Version') {
+        stage('Checkout') {
-            when {
-                expression { IS_PROTECTED_BRANCH }
-            }
             steps {
                 script {
-                    def packageJson = readJSON file: 'package.json'
+                    switch (env.BRANCH_NAME) {
-                    def version = "${packageJson.version}-build${env.BUILD_ID}"
+                        case 'master':
-                    writeFile(file: 'VERSION.txt', text: version)
+                            env.NODE_ENV = 'production'
-                    echo "VERSION: ${version}"
+                            env.FRONT_REPLICAS = 2
+                            break
+                        case 'test':
+                            env.NODE_ENV = 'test'
+                            env.FRONT_REPLICAS = 1
+                            break
+                    }
                 }
+                setEnv()
             }
         }
         stage('Install') {
@@ -80,109 +31,69 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                sh 'pnpm install --prefer-offline'
+                nodejs('node-v18') {
+                    sh 'npm install --no-audit --prefer-offline'
+                }
             }
         }
         stage('Test') {
-            when {
+            when { not { anyOf {
-                expression { !IS_PROTECTED_BRANCH }
+                branch 'test'
-            }
+                branch 'master'
+            }}}
             environment {
-                NODE_ENV = ''
+                NODE_ENV = ""
-                CI = 'true'
-                TZ = 'Europe/Madrid'
             }
             parallel {
-                stage('Unit') {
+                stage('Frontend') {
                     steps {
-                        sh 'pnpm run test:front:ci'
+                        nodejs('node-v18') {
-                    }
+                            sh 'npm run test:unit:ci'
-                    post {
-                        always {
-                            junit(
-                                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"
-
-                            def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
-                            echo "E2E MODULES: ${modules}"
-                            image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
-                            }
-                        }
-                    }
-                    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 {
+            when { anyOf {
-                expression { IS_PROTECTED_BRANCH }
+                branch 'test'
-            }
+                branch 'master'
+            }}
             environment {
-                VERSION = readFile 'VERSION.txt'
+                CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                script {
+                nodejs('node-v18') {
                     sh 'quasar build'
-
-                    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 {
+            when { anyOf {
-                expression { IS_PROTECTED_BRANCH }
+                branch 'test'
-            }
+                branch 'master'
+            }}
             environment {
-                VERSION = readFile 'VERSION.txt'
+                DOCKER_HOST = "${env.SWARM_HOST}"
             }
             steps {
-                withKubeConfig([
+                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
-                    serverUrl: "$KUBERNETES_API",
+            }
-                    credentialsId: 'kubernetes',
+        }
-                    namespace: 'lilium'
+    }
-                ]) {
+    post {
-                    sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
+        always {
+            script {
+                if (!['master', 'test'].contains(env.BRANCH_NAME)) {
+                    try {
+                        junit 'junitresults.xml'
+                        junit 'junit.xml'
+                    } catch (e) {
+                        echo e.toString()
+                    }
                 }
             }
         }
     }
 }
-

README.md

@@ -5,7 +5,7 @@ Lilium frontend
 ## Install the dependencies
 
 ```bash
-pnpm install
+npm install
 ```
 
 ### Install quasar cli
@@ -23,25 +23,13 @@ quasar dev
 ### Run unit tests
 
 ```bash
-pnpm run test:front
+npm run test:unit
 ```
 
 ### Run e2e tests
 
 ```bash
-pnpm run test:e2e
+npm 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
@@ -49,9 +37,3 @@ pnpm run test:e2e:summary
 ```bash
 quasar build
 ```
-
-### Serve the app for production
-
-```bash
-quasar build quasar serve dist/spa --host 0.0.0.0 --proxy=./proxy-serve.js
-```

changelog.sh

@@ -1,34 +0,0 @@
-features_types=(chore feat style)
-changes_types=(refactor perf)
-fix_types=(fix revert)
-file="CHANGELOG.md"
-file_tmp="temp_log.txt"
-file_current_tmp="temp_current_log.txt"
-
-setType(){
-    echo "### $1" >> $file_tmp
-    arr=("$@")
-    echo "" > $file_current_tmp
-    for i in "${arr[@]}"
-    do
-        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
-    done
-    # remove duplicates
-    sort -o $file_current_tmp -u $file_current_tmp
-    cat $file_current_tmp >> $file_tmp
-    echo "" >> $file_tmp
-    # remove tmp current file
-    [ -e $file_current_tmp ] && rm $file_current_tmp
-}
-
-echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
-echo "" >> $file_tmp
-
-setType "Added 🆕" "${features_types[@]}"
-setType "Changed 📦" "${changes_types[@]}"
-setType "Fixed 🛠️" "${fix_types[@]}"
-
-cat $file >> $file_tmp
-mv $file_tmp $file
-
-

commitlint.config.js

@@ -1 +0,0 @@
-export default { extends: ['@commitlint/config-conventional'] };

cypress.config.js

@@ -1,65 +1,22 @@
-import { defineConfig } from 'cypress';
+const { defineConfig } = require('cypress');
 
-let urlHost, reporter, reporterOptions, timeouts;
+module.exports = defineConfig({
-
-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,
-        trashAssetsBeforeRuns: false,
-        defaultBrowser: 'chromium',
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
-        downloadsFolder: 'test/cypress/downloads',
-        tmpUploadFolder: 'test/cypress/storage/tmp/dms',
         video: false,
-        specPattern: 'test/cypress/integration/**/*.spec.js',
+        specPattern: 'test/cypress/integration/*.spec.js',
         experimentalRunAllSpecs: true,
-        watchForFileChanges: true,
-        reporter,
-        reporterOptions,
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',
             supportFile: 'test/cypress/support/unit.js',
         },
-        viewportWidth: 1280,
+        setupNodeEvents(on, config) {
-        viewportHeight: 720,
+            // implement node event listeners here
-        ...timeouts,
+        },
-        includeShadowDom: true,
-        waitForAnimations: true,
     },
 });

docker-compose.yml

@@ -0,0 +1,17 @@
+version: '3.7'
+services:
+  main:
+    image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    ports:
+      - 4000
+    deploy:
+      replicas: ${FRONT_REPLICAS:?}
+      placement:
+        constraints:
+          - node.role == worker
+      resources:
+        limits:
+          memory: 1G

docs/.npmignore

@@ -0,0 +1,12 @@
+pids
+logs
+node_modules
+npm-debug.log
+coverage/
+run
+dist
+.DS_Store
+.nyc_output
+.basement
+config.local.js
+basement_dist

docs/.vitepress/config.js

@@ -1,38 +0,0 @@
-import { defineConfig } from 'vitepress';
-
-// https://vitepress.dev/reference/site-config
-export default defineConfig({
-    title: 'Lilium',
-    description: 'Lilium docs',
-    themeConfig: {
-        // https://vitepress.dev/reference/default-theme-config
-        nav: [
-            { text: 'Home', link: '/' },
-            { text: 'Components', link: '/components/vnInput' },
-            { text: 'Composables', link: '/composables/useArrayData' },
-        ],
-
-        sidebar: [
-            {
-                items: [
-                    {
-                        text: 'Components',
-                        collapsible: true,
-                        collapsed: true,
-                        items: [{ text: 'VnInput', link: '/components/vnInput' }],
-                    },
-                    {
-                        text: 'Composables',
-                        collapsible: true,
-                        collapsed: true,
-                        items: [
-                            { text: 'useArrayData', link: '/composables/useArrayData' },
-                        ],
-                    },
-                ],
-            },
-        ],
-
-        socialLinks: [{ icon: 'github', link: 'https://github.com/vuejs/vitepress' }],
-    },
-});

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

docs/README.md

@@ -0,0 +1 @@
+# Hello VuePress

docs/components/vnInput.md

@@ -1,136 +0,0 @@
-# VnInput
-
-`VnInput` is a custom input component that provides various useful features such as validation, input clearing, and more.
-
-## Props
-
-### `modelValue`
-
-- **Type:** `String | Number`
-- **Default:** `null`
-- **Description:** The value of the model bound to the component.
-
-### `isOutlined`
-
-- **Type:** `Boolean`
-- **Default:** `false`
-- **Description:** If `true`, the component is rendered with an outlined style.
-
-### `info`
-
-- **Type:** `String`
-- **Default:** `''`
-- **Description:** Additional information displayed alongside the component.
-
-### `clearable`
-
-- **Type:** `Boolean`
-- **Default:** `true`
-- **Description:** If `true`, the component shows a button to clear the input.
-
-### `emptyToNull`
-
-- **Type:** `Boolean`
-- **Default:** `true`
-- **Description:** If `true`, converts empty inputs to `null`.
-
-### `insertable`
-
-- **Type:** `Boolean`
-- **Default:** `false`
-- **Description:** If `true`, allows the insertion of new values.
-
-### `maxlength`
-
-- **Type:** `Number`
-- **Default:** `null`
-- **Description:** The maximum number of characters allowed in the input.
-
-### `uppercase`
-
-- **Type:** `Boolean`
-- **Default:** `false`
-- **Description:** If `true`, converts the input text to uppercase.
-
-## Emits
-
-### `update:modelValue`
-
-- **Description:** Emits the updated model value.
-- **Behavior:** This event is emitted whenever the input value changes. It is used to update the model value bound to the component.
-
-### `update:options`
-
-- **Description:** Emits the updated options.
-- **Behavior:** This event is emitted when the component's options change. It is useful for components with dynamic options.
-
-### `keyup.enter`
-
-- **Description:** Emits an event when the Enter key is pressed.
-- **Behavior:** This event is emitted whenever the Enter key is pressed while the input is focused. It can be used to handle specific actions when the input is confirmed.
-
-### `remove`
-
-- **Description:** Emits an event to remove the current value.
-- **Behavior:** This event is emitted when the clear button (close icon) is clicked. It is used to handle the removal of the current input value.
-
-## Functions
-
-### `focus`
-
-- **Description:** Focuses the input.
-- **Behavior:** This function is exposed so it can be called from outside the component. It uses `vnInputRef.value.focus()` to focus the input.
-
-### `handleKeydown`
-
-- **Description:** Handles the `keydown` event of the input.
-- **Behavior:** This function is called whenever a key is pressed while the input is focused. If the pressed key is `Backspace`, it does nothing. If `insertable` is `true` and the pressed key is a number, it calls `handleInsertMode`.
-
-### `handleInsertMode`
-
-- **Description:** Handles the insertion mode of values.
-- **Behavior:** This function is called when `insertable` is `true` and a numeric key is pressed. It inserts the value at the cursor position and updates the input value. Then, it moves the cursor to the correct position.
-
-### `handleUppercase`
-
-- **Description:** Converts the input value to uppercase.
-- **Behavior:** This function is called when the uppercase icon is clicked. It converts the current input value to uppercase.
-
-## Usage
-
-```vue
-<template>
-    <VnInput
-        v-model="inputValue"
-        :isOutlined="true"
-        info="Additional information"
-        :clearable="true"
-        :emptyToNull="true"
-        :insertable="false"
-        :maxlength="50"
-        :uppercase="true"
-        @update:modelValue="handleUpdate"
-        @keyup.enter="handleEnter"
-        @remove="handleRemove"
-    />
-</template>
-
-<script setup>
-import { ref } from 'vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-const inputValue = ref('');
-
-const handleUpdate = (value) => {
-    console.log('Updated value:', value);
-};
-
-const handleEnter = () => {
-    console.log('Enter pressed');
-};
-
-const handleRemove = () => {
-    console.log('Value removed');
-};
-</script>
-```

docs/composables/useArrayData.md

@@ -1,215 +0,0 @@
-# useArrayData
-
-`useArrayData` is a composable function that provides a set of utilities for managing array data in a Vue component. It leverages Pinia for state management and provides various methods for fetching, filtering, and manipulating data.
-
-## Usage
-
-```javascript
-import { useArrayData } from 'src/composables/useArrayData';
-
-const {
-    fetch,
-    applyFilter,
-    addFilter,
-    getCurrentFilter,
-    setCurrentFilter,
-    addFilterWhere,
-    addOrder,
-    deleteOrder,
-    refresh,
-    destroy,
-    loadMore,
-    store,
-    totalRows,
-    updateStateParams,
-    isLoading,
-    deleteOption,
-    reset,
-    resetPagination,
-} = useArrayData('myKey', userOptions);
-```
-
-## Parameters
-
-### `key`
-
-- **Type:** `String`
-- **Description:** A unique key to identify the data store.
-
-### `userOptions`
-
-- **Type:** `Object`
-- **Description:** An object containing user-defined options for configuring the data store.
-
-## Methods
-
-### `fetch`
-
-Fetches data from the server.
-
-#### Parameters
-
-- **`options`** : An object with the following properties:
-- `append` (Boolean): Whether to append the fetched data to the existing data.
-- `updateRouter` (Boolean): Whether to update the router with the current filter.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves with the fetched data.
-
-### `applyFilter`
-
-Applies a filter to the data.
-
-#### Parameters
-
-- **`filter`** : An object containing the filter criteria.
-- **`params`** : Additional parameters for the filter.
-- **`fetchOptions`** : Options for the fetch method.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves with the filtered data.
-
-### `addFilter`
-
-Adds a filter to the existing filters.
-
-#### Parameters
-
-- **`filter`** : An object containing the filter criteria.
-- **`params`** : Additional parameters for the filter.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves with the updated filter and parameters.
-
-### `getCurrentFilter`
-
-Gets the current filter applied to the data.
-
-#### Returns
-
-- **`Object`** : The current filter and parameters.
-
-### `setCurrentFilter`
-
-Sets the current filter for the data.
-
-#### Returns
-
-- **`Object`** : The current filter and parameters.
-
-### `addFilterWhere`
-
-Adds a `where` clause to the existing filters.
-
-#### Parameters
-
-- **`where`** : An object containing the `where` clause.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves when the filter is applied.
-
-### `addOrder`
-
-Adds an order to the existing orders.
-
-#### Parameters
-
-- **`field`** : The field to order by.
-- **`direction`** : The direction of the order (`ASC` or `DESC`).
-
-#### Returns
-
-- **`Promise`** : A promise that resolves with the updated order.
-
-### `deleteOrder`
-
-Deletes an order from the existing orders.
-
-#### Parameters
-
-- **`field`** : The field to delete the order for.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves when the order is deleted.
-
-### `refresh`
-
-Refreshes the data by re-fetching it from the server.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves with the refreshed data.
-
-### `destroy`
-
-Destroys the data store for the given key.
-
-### `loadMore`
-
-Loads more data by incrementing the pagination.
-
-#### Returns
-
-- **`Promise`** : A promise that resolves with the additional data.
-
-### `updateStateParams`
-
-Updates the state parameters with the given data.
-
-#### Parameters
-
-- **`data`** : The data to update the state parameters with.
-
-### `deleteOption`
-
-Deletes an option from the store.
-
-#### Parameters
-
-- **`option`** : The option to delete.
-
-### `reset`
-
-Resets the store to its default state.
-
-#### Parameters
-
-- **`opts`** : An array of options to reset.
-
-### `resetPagination`
-
-Resets the pagination for the store.
-
-## Computed Properties
-
-### `totalRows`
-
-- **Description:** The total number of rows in the data.
-- **Type:** `Number`
-
-### `isLoading`
-
-- **Description:** Whether the data is currently being loaded.
-- **Type:** `Boolean`
-
-```vue
-<script setup>
-import { useArrayData } from 'src/composables/useArrayData';
-
-const userOptions = {
-    url: '/api/data',
-    limit: 10,
-};
-
-const arrayData = useArrayData('myKey', userOptions);
-</script>
-```
-
-```
-
-```

docs/index.md

@@ -1,13 +0,0 @@
----
-# https://vitepress.dev/reference/default-theme-home-page
-layout: home
-
-hero:
-    name: 'Lilium'
-    text: 'Lilium docs'
-    tagline: Powered by Verdnatura
-    actions:
-        - theme: brand
-          text: Docs
-          link: /components/vnInput
----

docs/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "Lilium",
+  "version": "0.0.1",
+  "description": "Lilium",
+  "main": "index.js",
+  "authors": {
+    "name": "Lilium ",
+    "email": "informatica@verdnatura.es"
+  },
+  "repository": "https://gitea.verdnatura.es/verdnatura/salix-front/Lilium",
+  "scripts": {
+    "dev": "vuepress dev src",
+    "build": "vuepress build src"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "vuepress": "^1.5.3"
+  }
+}

docs/src/.vuepress/components/Foo/Bar.vue

@@ -0,0 +1,15 @@
+<template>
+  <p class="demo">
+    {{ msg }}
+  </p>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        msg: 'Hello this is <Foo-Bar>'
+      }
+    }
+  }
+</script>

docs/src/.vuepress/components/OtherComponent.vue

@@ -0,0 +1,3 @@
+<template>
+  <p class="demo">This is another component</p>
+</template>

docs/src/.vuepress/components/demo-component.vue

@@ -0,0 +1,15 @@
+<template>
+  <p class="demo">
+    {{ msg }}
+  </p>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        msg: 'Hello this is <demo-component>'
+      }
+    }
+  }
+</script>

docs/src/.vuepress/config.js

@@ -0,0 +1,70 @@
+const { description } = require('../../package')
+
+module.exports = {
+  /**
+   * Ref：https://v1.vuepress.vuejs.org/config/#title
+   */
+  title: 'Vuepress Docs Boilerplate',
+  /**
+   * Ref：https://v1.vuepress.vuejs.org/config/#description
+   */
+  description: description,
+
+  /**
+   * Extra tags to be injected to the page HTML `<head>`
+   *
+   * ref：https://v1.vuepress.vuejs.org/config/#head
+   */
+  head: [
+    ['meta', { name: 'theme-color', content: '#3eaf7c' }],
+    ['meta', { name: 'apple-mobile-web-app-capable', content: 'yes' }],
+    ['meta', { name: 'apple-mobile-web-app-status-bar-style', content: 'black' }]
+  ],
+
+  /**
+   * Theme configuration, here is the default theme configuration for VuePress.
+   *
+   * ref：https://v1.vuepress.vuejs.org/theme/default-theme-config.html
+   */
+  themeConfig: {
+    repo: '',
+    editLinks: false,
+    docsDir: '',
+    editLinkText: '',
+    lastUpdated: false,
+    nav: [
+      {
+        text: 'Guide',
+        link: '/guide/',
+      },
+      {
+        text: 'Config',
+        link: '/config/'
+      },
+      {
+        text: 'VuePress',
+        link: 'https://v1.vuepress.vuejs.org'
+      }
+    ],
+    sidebar: {
+      '/guide/': [
+        {
+          title: 'Guide',
+          collapsable: false,
+          children: [
+            '',
+            'using-vue',
+          ]
+        }
+      ],
+    }
+  },
+
+  /**
+   * Apply plugins，ref：https://v1.vuepress.vuejs.org/zh/plugin/
+   */
+  plugins: [
+    '@vuepress/plugin-back-to-top',
+    '@vuepress/plugin-medium-zoom',
+  ]
+}

docs/src/.vuepress/enhanceApp.js

@@ -0,0 +1,14 @@
+/**
+ * Client app enhancement file.
+ *
+ * https://v1.vuepress.vuejs.org/guide/basic-config.html#app-level-enhancements
+ */
+
+export default ({
+  Vue, // the version of Vue being used in the VuePress app
+  options, // the options for the root Vue instance
+  router, // the router instance for the app
+  siteData // site metadata
+}) => {
+  // ...apply enhancements for the site.
+}

docs/src/.vuepress/styles/index.styl

@@ -0,0 +1,8 @@
+/**
+ * Custom Styles here.
+ *
+ * ref：https://v1.vuepress.vuejs.org/config/#index-styl
+ */
+
+.home .hero img
+  max-width 450px!important

docs/src/.vuepress/styles/palette.styl

@@ -0,0 +1,10 @@
+/**
+ * Custom palette here.
+ *
+ * ref：https://v1.vuepress.vuejs.org/zh/config/#palette-styl
+ */
+
+$accentColor = #3eaf7c
+$textColor = #2c3e50
+$borderColor = #eaecef
+$codeBgColor = #282c34

docs/src/config/README.md

@@ -0,0 +1,15 @@
+---
+sidebar: auto
+---
+
+# Config
+
+## foo
+
+- Type: `string`
+- Default: `/`
+
+## bar
+
+- Type: `string`
+- Default: `/`

docs/src/guide/README.md

@@ -0,0 +1,5 @@
+# Introduction
+
+VuePress is composed of two parts: a [minimalistic static site generator](https://github.com/vuejs/vuepress/tree/master/packages/%40vuepress/core) with a Vue-powered [theming system](https://v1.vuepress.vuejs.org/theme/) and [Plugin API](https://v1.vuepress.vuejs.org/plugin/), and a [default theme](https://v1.vuepress.vuejs.org/theme/default-theme-config.html) optimized for writing technical documentation. It was created to support the documentation needs of Vue's own sub projects.
+
+Each page generated by VuePress has its own pre-rendered static HTML, providing great loading performance and is SEO-friendly. Once the page is loaded, however, Vue takes over the static content and turns it into a full Single-Page Application (SPA). Additional pages are fetched on demand as the user navigates around the site.

docs/src/guide/using-vue.md

@@ -0,0 +1,9 @@
+# Using Vue in Markdown
+
+## Browser API Access Restrictions
+
+Because VuePress applications are server-rendered in Node.js when generating static builds, any Vue usage must conform to the [universal code requirements](https://ssr.vuejs.org/en/universal.html). In short, make sure to only access Browser / DOM APIs in `beforeMount` or `mounted` hooks.
+
+If you are using or demoing components that are not SSR friendly (for example containing custom directives), you can wrap them inside the built-in `<ClientOnly>` component:
+
+##

docs/src/index.md

@@ -0,0 +1,15 @@
+---
+home: true
+heroImage: https://v1.vuepress.vuejs.org/hero.png
+tagline: Lilium
+actionText: Quick Start →
+actionLink: /guide/
+features:
+- title: Feature 1 Title
+  details: Feature 1 Description
+- title: Feature 2 Title
+  details: Feature 2 Description
+- title: Feature 3 Title
+  details: Feature 3 Description
+footer: Made by Lilium  with ❤️
+---

eslint.config.js

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

package.json

@@ -1,92 +1,66 @@
 {
     "name": "salix-front",
-    "version": "25.18.0",
+    "version": "23.48.1",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
     "private": true,
-    "packageManager": "pnpm@8.15.1",
-    "type": "module",
     "scripts": {
-        "resetDatabase": "cd ../salix && gulp docker",
+        "lint": "eslint --ext .js,.vue ./",
-        "lint": "eslint \"**/*.{vue,js}\" ",
-        "lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
         "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
         "test:e2e": "cypress open",
-        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test:e2e:ci": "cd ../salix && gulp docker && cd ../salix-front && cypress run --browser chromium",
-        "test:e2e:parallel": "bash ./test/cypress/run.sh",
-        "test:e2e:summary": "bash ./test/cypress/summary.sh",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:front": "vitest",
+        "test:unit": "vitest",
-        "test:ui": "vitest --ui",
+        "test:unit:ci": "vitest run",
-        "test:coverage": "vitest run --coverage",
+        "docs:dev": "vuepress dev docs",
-        "test:front:ci": "vitest run",
+        "docs:build": "vuepress build docs"
-        "commitlint": "commitlint --edit",
-        "prepare": "npx husky install",
-        "addReferenceTag": "node .husky/addReferenceTag.js",
-        "docs:dev": "vitepress dev docs",
-        "docs:build": "vitepress build docs",
-        "docs:preview": "vitepress preview docs"
     },
     "dependencies": {
-        "@eslint/eslintrc": "^3.2.0",
+        "@quasar/cli": "^2.3.0",
-        "@eslint/js": "^9.20.0",
+        "@quasar/extras": "^1.16.4",
-        "@quasar/cli": "^2.4.1",
-        "@quasar/extras": "^1.16.16",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
-        "croppie": "^2.6.5",
-        "es-module-lexer": "^1.6.0",
-        "fast-glob": "^3.3.3",
-        "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.17.7",
+        "quasar": "^2.12.0",
         "validator": "^13.9.0",
-        "vue": "^3.5.13",
+        "vue": "^3.3.9",
-        "vue-i18n": "^9.4.0",
+        "vue-i18n": "^9.2.2",
-        "vue-router": "^4.2.5"
+        "vue-loader": "^17.3.1",
+        "vue-router": "^4.2.1",
+        "vue-router-mock": "^0.2.0",
+        "vuepress": "^1.9.10"
     },
     "devDependencies": {
-        "@commitlint/cli": "^19.2.1",
+        "@intlify/unplugin-vue-i18n": "^0.8.1",
-        "@commitlint/config-conventional": "^19.1.0",
-        "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "^9.20.0",
-        "@intlify/unplugin-vue-i18n": "^4.0.0",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^2.0.8",
+        "@quasar/app-vite": "^1.4.3",
-        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.3.0",
-        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vue/test-utils": "^2.3.2",
-        "@vitest/ui": "3.1.1",
-        "@vue/compiler-sfc": "^3.5.13",
-        "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
-        "cypress": "^14.1.0",
+        "cypress": "^12.13.0",
-        "cypress-mochawesome-reporter": "^3.8.2",
+        "eslint": "^8.41.0",
-        "eslint": "^9.18.0",
+        "eslint-config-prettier": "^8.8.0",
-        "eslint-config-prettier": "^10.0.1",
+        "eslint-plugin-cypress": "^2.13.3",
-        "eslint-import-resolver-alias": "^1.1.2",
+        "eslint-plugin-vue": "^9.14.1",
-        "eslint-plugin-cypress": "^4.1.0",
-        "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-vue": "^9.32.0",
-        "globals": "^16.0.0",
-        "husky": "^8.0.0",
-        "junit-merge": "^2.0.0",
-        "mocha": "^11.1.0",
         "postcss": "^8.4.23",
-        "prettier": "^3.4.2",
+        "prettier": "^2.8.8",
-        "sass": "^1.83.4",
+        "vitest": "^0.31.1"
-        "vitest": "^3.0.3",
-        "xunit-viewer": "^10.6.1"
     },
     "engines": {
         "node": "^20 || ^18 || ^16",
         "npm": ">= 8.1.2",
-        "yarn": ">= 1.21.1",
+        "yarn": ">= 1.21.1"
-        "bun": ">= 1.0.25"
     },
     "overrides": {
-        "@vitejs/plugin-vue": "^5.2.1",
+        "@vitejs/plugin-vue": "^4.0.0",
-        "vite": "^6.0.11",
+        "vite": "^4.3.5",
         "vitest": "^0.31.1"
-    }
+    },
+    "main": ".eslintrc.js",
+    "directories": {
+        "doc": "docs",
+        "test": "test"
+    },
+    "license": "ISC"
 }

postcss.config.js

@@ -1,14 +1,10 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 
-import autoprefixer from 'autoprefixer';
+module.exports = {
-// Uncomment the following line if you want to support RTL CSS
-// import rtlcss from 'postcss-rtlcss';
-
-export default {
     plugins: [
         // https://github.com/postcss/autoprefixer
-        autoprefixer({
+        require('autoprefixer')({
             overrideBrowserslist: [
                 'last 4 Chrome versions',
                 'last 4 Firefox versions',
@@ -22,7 +18,10 @@ export default {
         }),
 
         // https://github.com/elchininet/postcss-rtlcss
-        // If you want to support RTL CSS, uncomment the following line:
+        // If you want to support RTL css, then
-        // rtlcss(),
+        // 1. yarn/npm install postcss-rtlcss
+        // 2. optionally set quasar.config.js > framework > lang to an RTL language
+        // 3. uncomment the following line:
+        // require('postcss-rtlcss')
     ],
 };

proxy-serve.js

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

quasar.config.js

@@ -8,12 +8,11 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
-import { configure } from 'quasar/wrappers';
+const { configure } = require('quasar/wrappers');
-import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
+const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
-import path from 'path';
+const path = require('path');
-const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
 
-export default configure(function (/* ctx */) {
+module.exports = configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,
@@ -30,7 +29,8 @@ export default configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
+        boot: ['i18n', 'axios', 'vnDate'],
+
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
 
@@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
         build: {
             target: {
                 browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
-                node: 'node20',
+                node: 'node18',
             },
 
             vueRouterMode: 'hash', // available values: 'hash', 'history'
@@ -66,9 +66,7 @@ export default configure(function (/* ctx */) {
             // publicPath: '/',
             // analyze: true,
             // env: {},
-            rawDefine: {
+            // rawDefine: {}
-                'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
-            },
             // ignorePublicFolder: true,
             // minify: false,
             // polyfillModulePreload: true,
@@ -91,14 +89,14 @@ export default configure(function (/* ctx */) {
 
             vitePlugins: [
                 [
-                    VueI18nPlugin({
+                    VueI18nPlugin,
-                        strictMessage: false,
+                    {
-                        runtimeOnly: false,
+                        // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false`
-                        include: [
+                        // compositionOnly: false,
-                            path.resolve(__dirname, './src/i18n/locale/**'),
+
-                            path.resolve(__dirname, './src/pages/**/locale/**'),
+                        // you need to set i18n resource including paths !
-                        ],
+                        include: path.resolve(__dirname, './src/i18n/**'),
-                    }),
+                    },
                 ],
             ],
         },
@@ -110,23 +108,21 @@ 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
         framework: {
             config: {
                 config: {
+                    brand: {
+                        primary: 'orange',
+                    },
                     dark: 'auto',
                 },
             },
@@ -184,6 +180,7 @@ export default configure(function (/* ctx */) {
                 'render', // keep this as last one
             ],
         },
+
         // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
         pwa: {
             workboxMode: 'generateSW', // or 'injectManifest'

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

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

quasar.extensions.json

@@ -1,8 +1,7 @@
 {
-    "@quasar/testing-unit-vitest": {
+  "@quasar/testing-unit-vitest": {
-        "options": [
+    "options": [
-            "scripts"
+      "scripts"
-        ]
+    ]
-    },
+  }
-    "@quasar/qcalendar": {}
 }

src/App.vue

@@ -1,12 +1,10 @@
 <script setup>
 import { onMounted } from 'vue';
-import { useQuasar, Dark } from 'quasar';
+import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import VnScroll from './components/common/VnScroll.vue';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
-Dark.set(true);
 
 onMounted(() => {
     let userLang = window.navigator.language;
@@ -17,7 +15,7 @@ onMounted(() => {
     if (availableLocales.includes(userLang)) {
         locale.value = userLang;
     } else {
-        locale.value = fallbackLocale.value;
+        locale.value = fallbackLocale;
     }
 });
 
@@ -39,7 +37,6 @@ quasar.iconMapFn = (iconName) => {
 
 <template>
     <RouterView />
-    <VnScroll/>
 </template>
 
 <style lang="scss">

src/boot/__tests__/axios.spec.js

@@ -1,89 +0,0 @@
-import { onRequest, onResponseError } from 'src/boot/axios';
-import { describe, expect, it, vi } from 'vitest';
-
-vi.mock('src/composables/useSession', () => ({
-    useSession: () => ({
-        getToken: () => 'DEFAULT_TOKEN',
-        isLoggedIn: () => vi.fn(),
-        destroy: () => vi.fn(),
-    }),
-}));
-
-// Mock axios
-vi.mock('axios', () => ({
-    default: {
-        create: vi.fn(() => ({
-            interceptors: {
-                request: { use: vi.fn() },
-                response: { use: vi.fn() },
-            },
-        })),
-        interceptors: {
-            request: { use: vi.fn() },
-            response: { use: vi.fn() },
-        },
-        defaults: {
-            baseURL: '',
-        },
-    },
-}));
-
-vi.mock('src/router', () => ({
-    Router: {
-        push: vi.fn(),
-    },
-}));
-vi.mock('src/stores/useStateQueryStore', () => ({
-    useStateQueryStore: () => ({
-        add: () => vi.fn(),
-        remove: () => vi.fn(),
-    }),
-}));
-
-describe('Axios boot', () => {
-    describe('onRequest()', async () => {
-        it('should set the "Authorization" property on the headers', async () => {
-            const config = { headers: {} };
-            localStorage.setItem('token', 'DEFAULT_TOKEN');
-            const resultConfig = onRequest(config);
-
-            expect(resultConfig).toEqual(
-                expect.objectContaining({
-                    headers: {
-                        'Accept-Language': 'en-US',
-                        Authorization: 'DEFAULT_TOKEN',
-                    },
-                }),
-            );
-        });
-    });
-
-    describe('onResponseError()', async () => {
-        it('should call to the Notify plugin with a message error for an status code "500"', async () => {
-            const error = {
-                response: {
-                    status: 500,
-                },
-            };
-
-            const result = onResponseError(error);
-            await expect(result).rejects.toEqual(expect.objectContaining(error));
-        });
-
-        it('should call to the Notify plugin with a message from the response property', async () => {
-            const error = {
-                response: {
-                    status: 401,
-                    data: {
-                        error: {
-                            message: 'Invalid user or password',
-                        },
-                    },
-                },
-            };
-
-            const result = onResponseError(error);
-            await expect(result).rejects.toEqual(expect.objectContaining(error));
-        });
-    });
-});

src/boot/axios.js

@@ -1,24 +1,20 @@
 import axios from 'axios';
+import { Notify } from 'quasar';
 import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
-import useNotify from 'src/composables/useNotify.js';
+import { i18n } from './i18n';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
-import { getToken, isLoggedIn } from 'src/utils/session';
-import { i18n } from 'src/boot/i18n';
 
-const { notify } = useNotify();
+const session = useSession();
-const stateQuery = useStateQueryStore();
+const { t } = i18n.global;
-const baseUrl = '/api/';
+
-axios.defaults.baseURL = baseUrl;
+axios.defaults.baseURL = '/api/';
-const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
-    const token = getToken();
+    const token = session.getToken();
-    if (token.length && !config.headers.Authorization) {
+    if (token.length && config.headers) {
         config.headers.Authorization = token;
-        config.headers['Accept-Language'] = i18n.global.locale.value;
     }
-    stateQuery.add(config);
+
     return config;
 };
 
@@ -27,34 +23,59 @@ const onRequestError = (error) => {
 };
 
 const onResponse = (response) => {
-    const config = response.config;
+    const { method } = response.config;
-    stateQuery.remove(config);
 
-    if (config.method === 'patch') {
+    const isSaveRequest = method === 'patch';
-        notify('globals.dataSaved', 'positive');
+    if (isSaveRequest) {
+        Notify.create({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
     }
 
     return response;
 };
 
-const onResponseError = async (error) => {
+const onResponseError = (error) => {
-    stateQuery.remove(error.config);
+    let message = '';
 
-    if (isLoggedIn() && error.response?.status === 401) {
+    const response = error.response;
-        await useSession().destroy(false);
+    const responseData = response && response.data;
+    const responseError = responseData && response.data.error;
+    if (responseError) {
+        message = responseError.message;
+    }
+
+    switch (response?.status) {
+        case 500:
+            message = 'errors.statusInternalServerError';
+            break;
+        case 502:
+            message = 'errors.statusBadGateway';
+            break;
+        case 504:
+            message = 'errors.statusGatewayTimeout';
+            break;
+    }
+
+    if (session.isLoggedIn() && response?.status === 401) {
+        session.destroy();
         const hash = window.location.hash;
         const url = hash.slice(1);
-        Router.push(`/login?redirect=${url}`);
+        Router.push({ path: url });
-    } else if (!isLoggedIn()) {
+    } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
 
+    Notify.create({
+        message: t(message),
+        type: 'negative',
+    });
+
     return Promise.reject(error);
 };
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
-axiosNoError.interceptors.request.use(onRequest);
-axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError, axiosNoError };
+export { onRequest, onResponseError };

src/boot/defaults/constants.js

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

src/boot/defaults/qInput.js

@@ -1,4 +0,0 @@
-import { QInput } from 'quasar';
-import setDefault from './setDefault';
-
-setDefault(QInput, 'dense', true);

src/boot/defaults/qSelect.js

@@ -1,4 +0,0 @@
-import { QSelect } from 'quasar';
-import setDefault from './setDefault';
-
-setDefault(QSelect, 'dense', true);

src/boot/defaults/qTable.js

@@ -1,5 +0,0 @@
-import { QTable } from 'quasar';
-import setDefault from './setDefault';
-
-setDefault(QTable, 'pagination', { rowsPerPage: 0 });
-setDefault(QTable, 'hidePagination', true);

src/boot/defaults/setDefault.js

@@ -1,18 +0,0 @@
-export default function (component, key, value) {
-    const prop = component.props[key];
-    switch (typeof prop) {
-        case 'object':
-            prop.default = value;
-            break;
-        case 'function':
-            component.props[key] = {
-                type: prop,
-                default: value,
-            };
-            break;
-        case 'undefined':
-            throw new Error('unknown prop: ' + key);
-        default:
-            throw new Error('unhandled type: ' + typeof prop);
-    }
-}

src/boot/i18n.js

@@ -1,11 +1,9 @@
 import { boot } from 'quasar/wrappers';
 import { createI18n } from 'vue-i18n';
 import messages from 'src/i18n';
-import { useState } from 'src/composables/useState';
-const user = useState().getUser();
 
 const i18n = createI18n({
-    locale: user.value.lang || navigator.language || navigator.userLanguage,
+    locale: navigator.language || navigator.userLanguage,
     fallbackLocale: 'en',
     globalInjection: true,
     messages,

src/boot/keyShortcut.js

@@ -1,33 +0,0 @@
-export default {
-    mounted(el, binding) {
-        const shortcut = binding.value || '+';
-
-        const { key, ctrl, alt, callback } =
-            typeof shortcut === 'string'
-                ? {
-                      key: shortcut,
-                      ctrl: true,
-                      alt: true,
-                      callback: () => el?.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();
-            }
-        };
-
-        window.addEventListener('keydown', handleKeydown);
-        el._handleKeydown = handleKeydown;
-    },
-    unmounted(el) {
-        if (el._handleKeydown) {
-            window.removeEventListener('keydown', el._handleKeydown);
-        }
-    },
-};

src/boot/mainShortcutMixin.js

@@ -1,36 +0,0 @@
-import routes from 'src/router/modules';
-import { useRouter } from 'vue-router';
-
-let isNotified = false;
-
-export default {
-    created: function () {
-        const router = useRouter();
-        const keyBindingMap = routes
-            .filter((route) => route.meta.keyBinding)
-            .reduce((map, route) => {
-                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
-                return map;
-            }, {});
-
-        const handleKeyDown = (event) => {
-            const { ctrlKey, altKey, code } = event;
-
-            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
-                event.preventDefault();
-                router.push(keyBindingMap[code]);
-                isNotified = true;
-            }
-        };
-
-        const handleKeyUp = (event) => {
-            const { ctrlKey, altKey } = event;
-            if (!ctrlKey || !altKey) {
-                isNotified = false;
-            }
-        };
-
-        window.addEventListener('keydown', handleKeyDown);
-        window.addEventListener('keyup', handleKeyUp);
-    },
-};

src/boot/qformMixin.js

@@ -1,34 +0,0 @@
-function focusFirstInput(input) {
-    input.focus();
-}
-export default {
-    mounted: function () {
-        const that = this;
-
-        const form = document.querySelector('.q-form#formModel');
-        if (!form) return;
-        try {
-            const inputsFormCard = form.querySelectorAll(
-                `input:not([disabled]):not([type="checkbox"])`,
-            );
-            if (inputsFormCard.length) {
-                focusFirstInput(inputsFormCard[0]);
-            }
-            const textareas = document.querySelectorAll(
-                '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"])',
-            );
-            const input = inputs[0];
-            if (!input) return;
-
-            focusFirstInput(input);
-        } catch (error) {
-            console.error(error);
-        }
-    },
-};

src/boot/quasar.defaults.js

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

src/boot/quasar.js

@@ -1,55 +0,0 @@
-import axios from 'axios';
-import { boot } from 'quasar/wrappers';
-import qFormMixin from './qformMixin';
-import keyShortcut from './keyShortcut';
-import { QForm } from 'quasar';
-import { QLayout } from 'quasar';
-import mainShortcutMixin from './mainShortcutMixin';
-import { useCau } from 'src/composables/useCau';
-
-export default boot(({ app }) => {
-    QForm.mixins = [qFormMixin];
-    QLayout.mixins = [mainShortcutMixin];
-
-    app.directive('shortcut', keyShortcut);
-    app.config.errorHandler = async (error) => {
-        let message;
-        const response = error.response;
-        const responseData = response?.data;
-        const responseError = responseData && response.data.error;
-        if (responseError) {
-            message = responseError.message;
-        }
-
-        switch (response?.status) {
-            case 422:
-                if (error.name == 'ValidationError')
-                    message +=
-                        ' "' +
-                        responseError.details.context +
-                        '.' +
-                        Object.keys(responseError.details.codes).join(',') +
-                        '"';
-                break;
-            case 500:
-                message = 'errors.statusInternalServerError';
-                break;
-            case 502:
-                message = 'errors.statusBadGateway';
-                break;
-            case 504:
-                message = 'errors.statusGatewayTimeout';
-                break;
-        }
-
-        console.error(error);
-        if (error instanceof axios.CanceledError) {
-            const env = process.env.NODE_ENV;
-            if (env && env !== 'development') return;
-            message = 'Duplicate request';
-        }
-
-        await useCau(response, message);
-    };
-    app.provide('app', app);
-});

src/boot/validations.js

@@ -1,6 +0,0 @@
-import { boot } from 'quasar/wrappers';
-import { useValidationsStore } from 'src/stores/useValidationsStore';
-
-export default boot(async ({ store }) => {
-    await useValidationsStore(store).fetchModels();
-});

src/boot/vnDate.js

@@ -1,6 +1,4 @@
 import { boot } from 'quasar/wrappers';
-import { date as quasarDate } from 'quasar';
-const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -17,44 +15,4 @@ export default boot(() => {
     Date.vnNow = () => {
         return new Date(Date.vnUTC()).getTime();
     };
-
-    Date.vnFirstDayOfMonth = () => {
-        const date = new Date(Date.vnUTC());
-        return new Date(date.getFullYear(), date.getMonth(), 1);
-    };
-
-    Date.vnLastDayOfMonth = () => {
-        const date = new Date(Date.vnUTC());
-        return new Date(date.getFullYear(), date.getMonth() + 1, 0);
-    };
-
-    Date.getCurrentDateTimeFormatted = (
-        options = {
-            startOfDay: false,
-            endOfDay: true,
-            iso: true,
-            mask: 'DD-MM-YYYY HH:mm',
-        },
-    ) => {
-        const date = Date.vnUTC();
-        if (options.startOfDay) {
-            date.setHours(0, 0, 0);
-        }
-        if (options.endOfDay) {
-            date.setHours(23, 59, 0);
-        }
-        if (options.iso) {
-            return date.toISOString();
-        }
-        return formatDate(date, options.mask);
-    };
-
-    Date.convertToISODateTime = (dateTimeStr) => {
-        const [datePart, timePart] = dateTimeStr.split(' ');
-        const [day, month, year] = datePart.split('-');
-        const [hours, minutes] = timePart.split(':');
-
-        const isoDate = new Date(year, month - 1, day, hours, minutes);
-        return isoDate.toISOString();
-    };
 });

src/components/CreateBankEntityForm.vue

@@ -1,119 +0,0 @@
-<script setup>
-import { reactive, ref, onMounted, nextTick, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import FormModelPopup from './FormModelPopup.vue';
-import { useState } from 'src/composables/useState';
-
-const emit = defineEmits(['onDataSaved']);
-const { t } = useI18n();
-const bicInputRef = ref(null);
-const state = useState();
-
-const customer = computed(() => state.get('Customer'));
-
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
-const bankEntityFormData = reactive({
-    name: null,
-    bic: null,
-    countryFk: customer.value?.countryFk,
-});
-
-const countriesOptions = ref([]);
-
-const onDataSaved = (...args) => {
-    emit('onDataSaved', ...args);
-};
-
-onMounted(async () => {
-    await nextTick();
-    bicInputRef.value.focus();
-});
-</script>
-
-<template>
-    <FetchData
-        url="Countries"
-        auto-load
-        @on-fetch="(data) => (countriesOptions = data)"
-    />
-    <FormModelPopup
-        url-create="bankEntities"
-        model="bankEntity"
-        :title="t('title')"
-        :subtitle="t('subtitle')"
-        :form-initial-data="bankEntityFormData"
-        :filter="countriesFilter"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="t('name')"
-                    v-model="data.name"
-                    :required="true"
-                    :rules="validate('bankEntity.name')"
-                />
-                <VnInput
-                    ref="bicInputRef"
-                    :label="t('swift')"
-                    v-model="data.bic"
-                    :required="true"
-                    :rules="validate('bankEntity.bic')"
-                />
-            </VnRow>
-            <VnRow>
-                <div class="col">
-                    <VnSelect
-                        :label="t('country')"
-                        v-model="data.countryFk"
-                        :options="countriesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        :required="true"
-                        :rules="validate('bankEntity.countryFk')"
-                    />
-                </div>
-                <div
-                    v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
-                        'ES'
-                    "
-                    class="col"
-                >
-                    <VnInput
-                        :label="t('id')"
-                        v-model="data.id"
-                        :required="true"
-                        :rules="validate('city.name')"
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-en:
-    title: New bank entity
-    subtitle: Please, ensure you put the correct data!
-    name: Name
-    swift: Swift
-    country: Country
-    id: Entity code
-es:
-    title: Nueva entidad bancaria
-    subtitle: ¡Por favor, asegúrate de poner los datos correctos!
-    name: Nombre
-    swift: Swift
-    country: País
-    id: Código de la entidad
-</i18n>

src/components/CreateNewCityForm.vue

@@ -1,72 +0,0 @@
-<script setup>
-import { onMounted, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelectProvince from 'components/VnSelectProvince.vue';
-import VnInput from 'components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-const $props = defineProps({
-    countryFk: {
-        type: Number,
-        default: null,
-    },
-    provinceSelected: {
-        type: Number,
-        default: null,
-    },
-});
-const { t } = useI18n();
-
-const cityFormData = ref({
-    name: null,
-    provinceFk: null,
-});
-onMounted(() => {
-    cityFormData.value.provinceFk = $props.provinceSelected;
-});
-const onDataSaved = (...args) => {
-    emit('onDataSaved', ...args);
-};
-</script>
-
-<template>
-    <FormModelPopup
-        :title="t('New city')"
-        :subtitle="t('Please, ensure you put the correct data!')"
-        :form-initial-data="cityFormData"
-        url-create="towns"
-        model="city"
-        @on-data-saved="onDataSaved"
-        data-cy="newCityForm"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="t('Name')"
-                    v-model="data.name"
-                    :rules="validate('city.name')"
-                    required
-                    data-cy="cityName"
-                />
-                <VnSelectProvince
-                    :province-selected="$props.provinceSelected"
-                    :country-fk="$props.countryFk"
-                    v-model="data.provinceFk"
-                    required
-                    data-cy="provinceCity"
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    New city: Nueva ciudad
-    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
-    Name: Nombre
-    Province: Provincia
-</i18n>

src/components/CreateNewExpenseForm.vue

@@ -1,50 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-const { t } = useI18n();
-</script>
-<template>
-    <FormModelPopup
-        url-create="Expenses"
-        model="Expense"
-        :title="t('New expense')"
-        :form-initial-data="{ id: null, isWithheld: false, name: null }"
-        @on-data-saved="emit('onDataSaved', $event)"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="`${t('globals.code')}`"
-                    v-model="data.id"
-                    :required="true"
-                    :rules="validate('expense.code')"
-                />
-                <QCheckbox
-                    dense
-                    size="sm"
-                    :label="`${t('It\'s a withholding')}`"
-                    v-model="data.isWithheld"
-                    :rules="validate('expense.isWithheld')"
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="`${t('globals.description')}`"
-                    v-model="data.name"
-                    :required="true"
-                    :rules="validate('expense.description')"
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    New expense: Nuevo gasto
-    It's a withholding: Es una retención
-</i18n>

src/components/CreateNewPostcodeForm.vue

@@ -1,173 +0,0 @@
-<script setup>
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectProvince from 'src/components/VnSelectProvince.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import CreateNewCityForm from './CreateNewCityForm.vue';
-import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-
-const postcodeFormData = reactive({
-    code: null,
-    countryFk: null,
-    provinceFk: null,
-    townFk: null,
-});
-
-const countriesRef = ref(false);
-const provincesOptions = ref([]);
-const town = ref({});
-
-function onDataSaved(formData) {
-    const newPostcode = {
-        ...formData,
-    };
-    newPostcode.town = town.value.name;
-    newPostcode.townFk = town.value.id;
-    const provinceObject = provincesOptions.value.find(
-        ({ id }) => id === formData.provinceFk,
-    );
-    newPostcode.province = provinceObject?.name;
-    const countryObject = countriesRef.value.opts.find(
-        ({ id }) => id === formData.countryFk,
-    );
-    newPostcode.country = countryObject?.name;
-    emit('onDataSaved', newPostcode);
-}
-
-async function setCountry(countryFk, data) {
-    data.townFk = null;
-    data.provinceFk = null;
-    data.countryFk = countryFk;
-}
-
-// Province
-async function setProvince(id, data) {
-    if (data.provinceFk === id) return;
-    const newProvince = provincesOptions.value.find((province) => province.id == id);
-    if (newProvince) data.countryFk = newProvince.countryFk;
-    postcodeFormData.provinceFk = id;
-}
-
-async function onProvinceCreated(data) {
-    postcodeFormData.provinceFk = data.id;
-}
-function setTown(newTown, data) {
-    town.value = newTown;
-    data.provinceFk = newTown?.provinceFk ?? newTown;
-    data.countryFk = newTown?.province?.countryFk ?? newTown;
-}
-async function onCityCreated(newTown, formData) {
-    newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk,
-    );
-    formData.townFk = newTown;
-    setTown(newTown, formData);
-}
-</script>
-
-<template>
-    <FormModelPopup
-        url-create="postcodes"
-        model="postcode"
-        :title="t('New postcode')"
-        :subtitle="t('Please, ensure you put the correct data!')"
-        :form-initial-data="postcodeFormData"
-        :mapper="(data) => (data.townFk = data.townFk.id) && data"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="t('Postcode')"
-                    v-model="data.code"
-                    :rules="validate('postcode.code')"
-                    clearable
-                    required
-                    data-cy="locationPostcode"
-                />
-                <VnSelectDialog
-                    :label="t('City')"
-                    @update:model-value="(value) => setTown(value, data)"
-                    :tooltip="t('Create city')"
-                    v-model="data.townFk"
-                    url="Towns/location"
-                    :rules="validate('postcode.city')"
-                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
-                    :emit-value="false"
-                    required
-                    data-cy="locationTown"
-                    sort-by="name ASC"
-                >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ opt.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ opt.province.name }},
-                                    {{ opt.province.country.name }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                    <template #form>
-                        <CreateNewCityForm
-                            :country-fk="data.countryFk"
-                            :province-selected="data.provinceFk"
-                            @on-data-saved="
-                                (_, requestResponse) =>
-                                    onCityCreated(requestResponse, data)
-                            "
-                        />
-                    </template>
-                </VnSelectDialog>
-            </VnRow>
-            <VnRow>
-                <VnSelectProvince
-                    :country-fk="data.countryFk"
-                    :province-selected="data.provinceFk"
-                    @update:model-value="(value) => setProvince(value, data)"
-                    @update:options="
-                        (data) => {
-                            provincesOptions = data;
-                        }
-                    "
-                    v-model="data.provinceFk"
-                    @on-province-created="onProvinceCreated"
-                    required
-                />
-                <VnSelect
-                    ref="countriesRef"
-                    :sort-by="['name ASC']"
-                    auto-load
-                    url="Countries"
-                    required
-                    :label="t('Country')"
-                    hide-selected
-                    v-model="data.countryFk"
-                    :rules="validate('postcode.countryFk')"
-                    @update:model-value="(value) => setCountry(value, data)"
-                    data-cy="locationCountry"
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    New postcode: Nuevo código postal
-    Create city: Crear población
-    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
-    City: Población
-    Province: Provincia
-    Country: País
-    Postcode: Código postal
-</i18n>

src/components/CreateNewProvinceForm.vue

@@ -1,91 +0,0 @@
-<script setup>
-import { computed, reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-
-const provinceFormData = reactive({
-    name: null,
-    autonomyFk: null,
-});
-const $props = defineProps({
-    countryFk: {
-        type: Number,
-        default: null,
-    },
-});
-const autonomiesRef = ref([]);
-
-const onDataSaved = (dataSaved, requestResponse) => {
-    requestResponse.autonomy = autonomiesRef.value.opts.find(
-        (autonomy) => autonomy.id == requestResponse.autonomyFk
-    );
-    emit('onDataSaved', dataSaved, requestResponse);
-};
-const where = computed(() => {
-    if (!$props.countryFk) {
-        return {};
-    }
-    return { countryFk: $props.countryFk };
-});
-</script>
-
-<template>
-    <FormModelPopup
-        :title="t('New province')"
-        :subtitle="t('Please, ensure you put the correct data!')"
-        url-create="provinces"
-        model="province"
-        :form-initial-data="provinceFormData"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="t('Name')"
-                    v-model="data.name"
-                    :rules="validate('province.name')"
-                    required
-                    data-cy="provinceName"
-                />
-                <VnSelect
-                    data-cy="autonomyProvince"
-                    required
-                    ref="autonomiesRef"
-                    auto-load
-                    :where="where"
-                    url="Autonomies/location"
-                    sort-by="name ASC"
-                    :label="t('Autonomy')"
-                    hide-selected
-                    v-model="data.autonomyFk"
-                    :rules="validate('province.autonomyFk')"
-                >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ opt.name }}</QItemLabel>
-                                <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    New province: Nueva provincia
-    Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
-    Name: Nombre
-    Autonomy: Autonomía
-</i18n>

src/components/CreateThermographForm.vue

@@ -1,105 +0,0 @@
-<script setup>
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-
-const thermographFormData = reactive({
-    thermographId: null,
-    model: 'DISPOSABLE',
-    warehouseId: null,
-    temperatureFk: 'cool',
-});
-
-const thermographsModels = ref(null);
-const warehousesOptions = ref([]);
-const temperaturesOptions = ref([]);
-
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
-};
-</script>
-
-<template>
-    <FetchData
-        @on-fetch="(data) => (thermographsModels = data)"
-        auto-load
-        url="Thermographs/getThermographModels"
-    />
-    <FetchData
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-    />
-    <FetchData
-        @on-fetch="(data) => (temperaturesOptions = data)"
-        auto-load
-        url="Temperatures"
-    />
-    <FormModelPopup
-        url-create="Thermographs/createThermograph"
-        model="thermograph"
-        :title="t('New thermograph')"
-        :form-initial-data="thermographFormData"
-        @on-data-saved="(_, response) => onDataSaved(response)"
-    >
-        <template #form-inputs="{ data, validate }">
-            <VnRow>
-                <VnInput
-                    :label="t('Identifier')"
-                    v-model="data.thermographId"
-                    :required="true"
-                    :rules="validate('thermograph.id')"
-                />
-                <VnSelect
-                    :label="t('Model')"
-                    :options="thermographsModels"
-                    hide-selected
-                    option-label="value"
-                    option-value="value"
-                    v-model="data.model"
-                    :required="true"
-                    :rules="validate('thermograph.model')"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-xl">
-                <VnSelect
-                    :label="t('Warehouse')"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="data.warehouseId"
-                    :required="true"
-                />
-                <VnSelect
-                    :label="t('Temperature')"
-                    :options="temperaturesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="code"
-                    v-model="data.temperatureFk"
-                    :required="true"
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    Identifier: Identificador
-    Model: Modelo
-    Warehouse: Almacén
-    Temperature: Temperatura
-    New thermograph: Nuevo termógrafo
-</i18n>

src/components/CrudModel.vue

@@ -1,7 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, useAttrs, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
-import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -10,14 +9,11 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
-import getDifferences from 'src/filters/getDifferences';
 
-const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
-const $attrs = useAttrs();
 
 const $props = defineProps({
     model: {
@@ -28,10 +24,6 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    limit: {
-        type: Number,
-        default: 20,
-    },
     saveUrl: {
         type: String,
         default: null,
@@ -64,19 +56,6 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
-    beforeSaveFn: {
-        type: [String, Function],
-        default: null,
-    },
-    goTo: {
-        type: String,
-        default: '',
-        description: 'It is used for redirect on click "save and continue"',
-    },
-    hasSubToolbar: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const isLoading = ref(false);
@@ -85,7 +64,6 @@ const originalData = ref();
 const vnPaginateRef = ref();
 const formData = ref();
 const saveButtonRef = ref(null);
-const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@@ -98,51 +76,27 @@ defineExpose({
     reset,
     hasChanges,
     saveChanges,
-    getChanges,
-    formData,
-    originalData,
-    vnPaginateRef,
-});
-
-onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.unsavedPopup.title'),
-                message: t('globals.unsavedPopup.subtitle'),
-                promise: () => next(),
-            },
-        });
-    else next();
 });
 
 async function fetch(data) {
-    const keyData = $attrs['key-data'];
-    const rows = keyData ? data[keyData] : data;
-    resetData(rows);
-    emit('onFetch', rows);
-    return rows;
-}
-
-function resetData(data) {
-    if (!data) return;
     if (data && Array.isArray(data)) {
         let $index = 0;
         data.map((d) => (d.$index = $index++));
     }
-    originalData.value = JSON.parse(JSON.stringify(data));
-    formData.value = JSON.parse(JSON.stringify(data));
 
-    if (watchChanges.value) watchChanges.value(); //destroy watcher
+    originalData.value = data && JSON.parse(JSON.stringify(data));
-    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
+    formData.value = data && JSON.parse(JSON.stringify(data));
+    watch(formData, () => (hasChanges.value = true), { deep: true });
+
+    emit('onFetch', data);
+    return data;
 }
 
 async function reset() {
     await fetch(originalData.value);
     hasChanges.value = false;
 }
-
+// eslint-disable-next-line vue/no-dupe-keys
 function filter(value, update, filterOptions) {
     update(
         () => {
@@ -153,7 +107,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        },
+        }
     );
 }
 
@@ -165,49 +119,30 @@ async function onSubmit() {
         });
     }
     isLoading.value = true;
-    await saveChanges($props.saveFn ? formData.value : null);
+    await saveChanges();
-}
-
-async function onSubmitAndGo() {
-    await onSubmit();
-    push({ path: $props.goTo });
 }
 
 async function saveChanges(data) {
-    if ($props.saveFn) {
+    if ($props.saveFn) return $props.saveFn(data, getChanges);
-        $props.saveFn(data, getChanges);
+    const changes = data || getChanges();
-        isLoading.value = false;
-        hasChanges.value = false;
-        return;
-    }
-    let 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 {
+    } catch (e) {
-        isLoading.value = false;
+        return (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;
+    isLoading.value = false;
     emit('saveChanges', data);
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.dataSaved'),
-    });
 }
 
-async function insert(pushData = $props.dataRequired) {
+async function insert() {
     const $index = formData.value.length
         ? formData.value[formData.value.length - 1].$index + 1
         : 0;
-    formData.value.push(Object.assign({ $index }, pushData));
+    formData.value.push(Object.assign({ $index }, $props.dataRequired));
     hasChanges.value = true;
 }
 
@@ -225,7 +160,7 @@ async function remove(data) {
 
     if (preRemove.length) {
         newData = newData.filter(
-            (form) => !preRemove.some((index) => index == form.$index),
+            (form) => !preRemove.some((index) => index == form.$index)
         );
         const changes = getChanges();
         if (!changes.creates?.length && !changes.updates?.length)
@@ -237,19 +172,17 @@ async function remove(data) {
             .dialog({
                 component: VnConfirm,
                 componentProps: {
-                    title: t('globals.confirmDeletion'),
+                    title: t('confirmDeletion'),
-                    message: t('globals.confirmDeletionMessage'),
+                    message: t('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);
             });
-    } else {
-        reset();
     }
     emit('update:selected', []);
 }
@@ -259,10 +192,11 @@ function getChanges() {
     const creates = [];
 
     const pk = $props.primaryKey;
+
     for (const [i, row] of formData.value.entries()) {
         if (!row[pk]) {
             creates.push(row);
-        } else if (originalData.value[i]) {
+        } else if (originalData.value) {
             const data = getDifferences(originalData.value[i], row);
             if (!isEmpty(data)) {
                 updates.push({
@@ -281,15 +215,34 @@ function getChanges() {
     return changes;
 }
 
-function isEmpty(obj) {
+function getDifferences(obj1, obj2) {
-    if (obj == null) return true;
+    let diff = {};
-    if (Array.isArray(obj)) return !obj.length;
+    delete obj1.$index;
-    return !Object.keys(obj).length;
+    delete obj2.$index;
+
+    for (let key in obj1) {
+        if (obj2[key] && obj1[key] !== obj2[key]) {
+            diff[key] = obj2[key];
+        }
+    }
+    for (let key in obj2) {
+        if (obj1[key] === undefined || obj1[key] !== obj2[key]) {
+            diff[key] = obj2[key];
+        }
+    }
+    return diff;
 }
 
-async function reload(params) {
+function isEmpty(obj) {
-    const data = await vnPaginateRef.value.fetch(params);
+    if (obj == null) return true;
-    fetch(data);
+    if (obj === undefined) return true;
+    if (Object.keys(obj).length === 0) return true;
+
+    if (obj.length > 0) return false;
+}
+
+async function reload() {
+    vnPaginateRef.value.fetch();
 }
 
 watch(formUrl, async () => {
@@ -298,18 +251,12 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <SkeletonTable
-        v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
-        :columns="$attrs.columns?.length"
-    />
     <VnPaginate
         :url="url"
-        :limit="limit"
+        v-bind="$attrs"
         @on-fetch="fetch"
-        @on-change="fetch"
         :skeleton="false"
         ref="vnPaginateRef"
-        v-bind="$attrs"
     >
         <template #body v-if="formData">
             <slot
@@ -320,8 +267,9 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
+    <SkeletonTable v-if="!formData" />
-        <QBtnGroup push style="column-gap: 10px">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+        <QBtnGroup push class="q-gutter-x-sm">
             <slot name="moreBeforeActions" />
             <QBtn
                 :label="tMobile('globals.remove')"
@@ -332,7 +280,6 @@ watch(formUrl, async () => {
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
                 v-if="$props.defaultRemove"
-                data-cy="crudModelDefaultRemoveBtn"
             />
             <QBtn
                 :label="tMobile('globals.reset')"
@@ -344,40 +291,7 @@ watch(formUrl, async () => {
                 :title="t('globals.reset')"
                 v-if="$props.defaultReset"
             />
-            <QBtnDropdown
-                v-if="$props.goTo && $props.defaultSave"
-                @click="onSubmitAndGo"
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
-                :disable="!hasChanges"
-                color="primary"
-                icon="save"
-                split
-            >
-                <QList>
-                    <QItem
-                        color="primary"
-                        clickable
-                        v-close-popup
-                        @click="onSubmit"
-                        :title="t('globals.save')"
-                    >
-                        <QItemSection>
-                            <QItemLabel>
-                                <QIcon
-                                    name="save"
-                                    color="white"
-                                    class="q-mr-sm"
-                                    size="sm"
-                                />
-                                {{ t('globals.save').toUpperCase() }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-            </QBtnDropdown>
             <QBtn
-                v-else-if="!$props.goTo && $props.defaultSave"
                 :label="tMobile('globals.save')"
                 ref="saveButtonRef"
                 color="primary"
@@ -385,9 +299,7 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                v-shortcut="'s'"
+                v-if="$props.defaultSave"
-                shortcut="s"
-                data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>
@@ -398,3 +310,16 @@ watch(formUrl, async () => {
         color="primary"
     />
 </template>
+
+<i18n>
+    {
+        "en": {
+            "confirmDeletion": "Confirm deletion",
+            "confirmDeletionMessage": "Are you sure you want to delete this?"
+        },
+        "es": {
+            "confirmDeletion": "Confirmar eliminación",
+            "confirmDeletionMessage": "Seguro que quieres eliminar?"
+        }
+    }
+</i18n>

src/components/EditPictureForm.vue

@@ -1,340 +0,0 @@
-<script setup>
-import { reactive, computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import Croppie from 'croppie/croppie';
-import 'croppie/croppie.css';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-
-const emit = defineEmits(['closeForm', 'onPhotoUploaded']);
-
-const props = defineProps({
-    id: {
-        type: String,
-        default: '',
-    },
-    collection: {
-        type: String,
-        default: '',
-    },
-});
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const uploadMethodsOptions = [
-    { label: t('Select from computer'), value: 'computer' },
-    { label: t('Import from external URL'), value: 'URL' },
-];
-
-const viewportTypes = [
-    {
-        code: 'normal',
-        description: t('Normal'),
-        viewport: {
-            width: 400,
-            height: 400,
-        },
-        output: {
-            width: 1200,
-            height: 1200,
-        },
-    },
-    {
-        code: 'panoramic',
-        description: t('Panoramic'),
-        viewport: {
-            width: 675,
-            height: 450,
-        },
-        output: {
-            width: 1350,
-            height: 900,
-        },
-    },
-    {
-        code: 'vertical',
-        description: t('Vertical'),
-        viewport: {
-            width: 306.66,
-            height: 533.33,
-        },
-        output: {
-            width: 460,
-            height: 800,
-        },
-    },
-];
-
-const uploadMethodSelected = ref('computer');
-const viewPortTypeSelected = ref(viewportTypes[0]);
-const inputFileRef = ref(null);
-const allowedContentTypes = ref('');
-const photoContainerRef = ref(null);
-const editor = ref(null);
-const newPhoto = reactive({
-    id: props.id,
-    collection: props.collection,
-    file: null,
-    url: null,
-    blob: null,
-});
-
-const openInputFile = () => {
-    inputFileRef.value.pickFiles();
-};
-
-const displayEditor = () => {
-    const viewportType = viewPortTypeSelected.value;
-    const viewport = viewportType.viewport;
-    const boundaryWidth = viewport.width + 200;
-    const boundaryHeight = viewport.height + 200;
-
-    if (editor.value) editor.value.destroy();
-    editor.value = new Croppie(photoContainerRef.value, {
-        viewport: { width: viewport.width, height: viewport.height },
-        boundary: { width: boundaryWidth, height: boundaryHeight },
-        enableOrientation: true,
-        showZoomer: true,
-    });
-};
-
-const viewportSelection = computed({
-    get() {
-        return viewPortTypeSelected.value;
-    },
-    set(val) {
-        viewPortTypeSelected.value = val;
-
-        const hasFile = newPhoto.files || newPhoto.url;
-        if (!val || !hasFile) return;
-
-        let file;
-        if (uploadMethodSelected.value == 'computer') file = newPhoto.files;
-        else if (uploadMethodSelected.value == 'URL') file = newPhoto.url;
-
-        updatePhotoPreview(file);
-    },
-});
-
-const updatePhotoPreview = (value) => {
-    if (value) {
-        displayEditor();
-        if (uploadMethodSelected.value == 'computer') {
-            newPhoto.files = value;
-            const reader = new FileReader();
-            reader.onload = (e) => editor.value.bind({ url: e.target.result });
-            reader.readAsDataURL(value);
-        } else if (uploadMethodSelected.value == 'URL') {
-            newPhoto.url = value;
-            const img = new Image();
-            img.crossOrigin = 'Anonymous';
-            img.src = value;
-            img.onload = () => editor.value.bind({ url: value });
-            img.onerror = () => {
-                notify(
-                    t("This photo provider doesn't allow remote downloads"),
-                    'negative',
-                );
-            };
-        }
-    }
-};
-
-const rotateLeft = () => {
-    editor.value.rotate(90);
-};
-
-const rotateRight = () => {
-    editor.value.rotate(-90);
-};
-
-const onSubmit = () => {
-    if (!newPhoto.files && !newPhoto.url) {
-        notify(t('Select an image'), 'negative');
-        return;
-    }
-
-    const options = {
-        type: 'blob',
-    };
-
-    editor.value
-        .result(options)
-        .then((result) => {
-            const file = new File([result], newPhoto.files?.name || '');
-            newPhoto.blob = file;
-        })
-        .then(() => makeRequest());
-};
-
-const makeRequest = async () => {
-    const formData = new FormData();
-    const now = Date.vnNew();
-    const timestamp = now.getTime();
-    const fileName = `${newPhoto.files?.name}_${timestamp}`;
-    formData.append('blob', newPhoto.blob, fileName);
-
-    await axios.post('Images/upload', formData, {
-        params: newPhoto,
-        headers: {
-            'Content-Type': 'multipart/form-data',
-        },
-    });
-
-    emit('closeForm');
-    emit('onPhotoUploaded');
-
-    notify(t('globals.dataSaved'), 'positive');
-};
-</script>
-
-<template>
-    <FetchData
-        ref="allowTypesRef"
-        url="ImageContainers/allowedContentTypes"
-        @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
-        auto-load
-    />
-    <QForm @submit="onSubmit()" class="all-pointer-events">
-        <QCard class="q-pa-lg">
-            <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="title">{{ t('Edit photo') }}</h1>
-            <div class="row q-gutter-lg">
-                <div
-                    v-show="newPhoto.files || newPhoto.url"
-                    class="row q-gutter-lg items-center"
-                >
-                    <QIcon
-                        name="rotate_left"
-                        size="sm"
-                        color="primary"
-                        class="cursor-pointer"
-                        @click="rotateLeft()"
-                    />
-                    <div>
-                        <div ref="photoContainerRef" />
-                    </div>
-                    <QIcon
-                        name="rotate_right"
-                        size="sm"
-                        color="primary"
-                        class="cursor-pointer"
-                        @click="rotateRight()"
-                    />
-                </div>
-
-                <div class="column">
-                    <VnRow>
-                        <QOptionGroup
-                            :options="uploadMethodsOptions"
-                            type="radio"
-                            v-model="uploadMethodSelected"
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <QFile
-                            v-if="uploadMethodSelected === 'computer'"
-                            ref="inputFileRef"
-                            :label="t('File')"
-                            :multiple="false"
-                            v-model="newPhoto.files"
-                            @update:model-value="updatePhotoPreview($event)"
-                            :accept="allowedContentTypes"
-                            class="required cursor-pointer"
-                        >
-                            <template #append>
-                                <QIcon
-                                    name="vn:attach"
-                                    class="cursor-pointer q-mr-sm"
-                                    @click="openInputFile()"
-                                >
-                                </QIcon>
-                                <QIcon name="info" class="cursor-pointer">
-                                    <QTooltip>{{
-                                        t('globals.allowedFilesText', {
-                                            allowedContentTypes: allowedContentTypes,
-                                        })
-                                    }}</QTooltip>
-                                </QIcon>
-                            </template>
-                        </QFile>
-                        <VnInput
-                            v-if="uploadMethodSelected === 'URL'"
-                            v-model="newPhoto.url"
-                            @update:model-value="updatePhotoPreview($event)"
-                            placeholder="https://"
-                        />
-                    </VnRow>
-                    <VnRow>
-                        <VnSelect
-                            :label="t('Orientation')"
-                            :options="viewportTypes"
-                            hide-selected
-                            option-label="description"
-                            v-model="viewportSelection"
-                        />
-                    </VnRow>
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :label="t('globals.save')"
-                            type="submit"
-                            color="primary"
-                            :disabled="isLoading"
-                            :loading="isLoading"
-                        />
-                        <QBtn
-                            :label="t('globals.cancel')"
-                            type="reset"
-                            color="primary"
-                            flat
-                            class="q-ml-sm"
-                            :disabled="isLoading"
-                            :loading="isLoading"
-                            v-close-popup
-                        />
-                    </div>
-                </div>
-            </div>
-        </QCard>
-    </QForm>
-</template>
-
-<style lang="scss" scoped>
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-</style>
-
-<i18n>
-es:
-    Edit photo: Editar foto
-    Select from computer: Seleccionar desde ordenador
-    Import from external URL: Importar desde URL externa
-    Vertical: Vertical
-    Normal: Normal
-    Panoramic: Panorámica
-    Orientation: Orientación
-    File: Fichero
-    This photo provider doesn't allow remote downloads: Este proveedor de fotos no permite descargas remotas
-    Rotate left: Girar a la izquierda
-    Rotate right: Girar a la derecha
-    Select an image: Selecciona una imagen
-</i18n>

src/components/EntityCalendar.vue

@@ -1,152 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { date } from 'quasar';
-import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
-import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-import useWeekdaysOrder from 'src/composables/getWeekdays';
-
-const formatDate = (dateToFormat, format = 'YYYY-MM-DD') => (
-  date.formatDate(dateToFormat, format)
-);
-
-
-const props = defineProps({
-    year: {
-        type: Number,
-        required: true,
-    },
-    month: {
-        type: Number,
-        required: true,
-    },
-    monthDate: {
-        type: Object,
-        default: null,
-    },
-    daysMap: {
-        type: Object,
-        default: null,
-    },
-});
-
-const emit = defineEmits(['onDateSelected']);
-
-const { locale } = useI18n();
-const weekdayStore = useWeekdayStore();
-const weekDays = useWeekdaysOrder();
-const calendarRef = ref(null);
-const today = ref(formatDate(Date.vnNew()));
-const todayTimestamp = computed(() => {
-    const date = Date.vnNew();
-    date.setHours(0, 0, 0, 0);
-    return date.getTime();
-});
-const _monthDate = computed(() => formatDate(props.monthDate));
-
-const calendarHeaderTitle = computed(() => {
-    return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
-});
-
-const isToday = (timestamp) => {
-    const { year, month, day } = timestamp;
-    return todayTimestamp.value === new Date(year, month - 1, day).getTime();
-};
-
-const getEventByTimestamp = ({ year, month, day }) => {
-    const stamp = new Date(year, month - 1, day).getTime();
-    return props.daysMap?.[stamp] || null;
-};
-
-const handleDateClick = (timestamp) => {
-    const event = getEventByTimestamp(timestamp);
-    const { year, month, day } = timestamp;
-    const date = new Date(year, month - 1, day);
-    emit('onDateSelected', { 
-        date, 
-        isNewMode: !event,
-        event: event?.[0] || null 
-    });
-};
-
-const getEventAttrs = (timestamp) => {
-    return {
-        class: '--event',
-        label: timestamp.day,
-    };
-};
-
-defineExpose({ getEventByTimestamp, handleDateClick });
-</script>
-
-<template>
-    <QCalendarMonthWrapper
-        style="height: 290px; width: 290px"
-        transparent-background
-        view-customization="workerCalendar"
-    >
-        <template #header>
-            <span class="full-width text-center text-body1 q-py-sm">{{
-                calendarHeaderTitle
-            }}</span>
-        </template>
-        <template #calendar>
-            <QCalendarMonth
-                ref="calendarRef"
-                :model-value="_monthDate"
-                show-work-weeks
-                no-outside-days
-                no-active-date
-                :weekdays="weekDays"
-                short-weekday-label
-                :locale="locale"
-                :now="today"
-                @click-date="handleDateClick($event.scope.timestamp)"
-                mini-mode
-            >
-                <template #day="{ scope: { timestamp } }">
-                    <slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
-                        <QBtn
-                            v-if="getEventByTimestamp(timestamp)"
-                            v-bind="{ ...getEventAttrs(timestamp) }"
-                            @click="handleDateClick(timestamp)"
-                            rounded
-                            dense
-                            flat
-                            class="calendar-event"
-                            :class="{ '--today': isToday(timestamp) }"
-                        />
-                    </slot>
-                </template>
-            </QCalendarMonth>
-        </template>
-    </QCalendarMonthWrapper>
-</template>
-
-<style lang="scss">
-.calendar-event {
-    display: flex;
-    justify-content: center;
-    width: 32px;
-    height: 32px;
-    font-size: 13px;
-    line-height: 1.715em;
-    cursor: pointer;
-    color: white;
-
-    &.--today {
-        border: 2px solid $info;
-    }
-
-    &.--event {
-        background-color: $positive;
-        color: black;
-    }
-
-    &:hover {
-        opacity: 0.8;
-    }
-}
-</style>

src/components/EntityCalendarGrid.vue

@@ -1,126 +0,0 @@
-<script setup>
-import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-import { useArrayData } from 'src/composables/useArrayData';
-
-const props = defineProps({
-  dataKey: {
-    type: String,
-    required: true,
-  },
-  calendarComponent: {
-    type: Object,
-    required: true,
-  },
-  additionalProps: {
-    type: Object,
-    default: () => ({}),
-  }
-});
-
-const stateStore = useStateStore();
-const weekdayStore = useWeekdayStore();
-const nMonths = ref(4);
-const _date = ref(Date.vnNew());
-const firstDay = ref(Date.vnNew());
-const lastDay = ref(Date.vnNew());
-const months = ref([]);
-const arrayData = useArrayData(props.dataKey);
-onMounted(async () => {
-  const initialDate = Date.vnNew();
-  initialDate.setDate(1);
-  initialDate.setHours(0, 0, 0, 0);
-  date.value = initialDate;
-  await nextTick();
-  stateStore.rightDrawer = true;
-});
-
-onUnmounted(() => arrayData.destroy());
-
-const emit = defineEmits([
-  'update:firstDay',
-  'update:lastDay',
-  'update:events',
-  'onDateSelected',
-]);
-
-const date = computed({
-  get: () => _date.value,
-  set: (value) => {
-    if (!(value instanceof Date)) return;
-    _date.value = value;
-    const stamp = value.getTime();
-
-    firstDay.value = new Date(stamp);
-    firstDay.value.setDate(1);
-
-    lastDay.value = new Date(stamp);
-    lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
-    lastDay.value.setDate(0);
-
-    months.value = [];
-    for (let i = 0; i < nMonths.value; i++) {
-      const monthDate = new Date(stamp);
-      monthDate.setMonth(value.getMonth() + i);
-      months.value.push(monthDate);
-    }
-
-    emit('update:firstDay', firstDay.value);
-    emit('update:lastDay', lastDay.value);
-    emit('refresh-events');
-  },
-});
-
-const headerTitle = computed(() => {
-  if (!months.value?.length) return '';
-  const getMonthName = date => 
-    `${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
-  return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
-});
-
-const step = (direction) => {
-  const newDate = new Date(date.value);
-  newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
-  date.value = newDate;
-};
-
-defineExpose({
-    firstDay,
-    lastDay
-});
-</script>
-
-<template>
-  <QCard style="height: max-content">
-    <div class="calendars-header">
-      <QBtn
-        icon="arrow_left"
-        size="sm"
-        flat
-        class="full-height"
-        @click="step(-1)"
-      />
-      <span>{{ headerTitle }}</span>
-      <QBtn
-        icon="arrow_right"
-        size="sm"
-        flat
-        class="full-height"
-        @click="step(1)"
-      />
-    </div>
-    <div class="calendars-container">
-      <component
-        :is="calendarComponent"
-        v-for="(month, index) in months"
-        :key="index"
-        :month="month.getMonth() + 1"
-        :year="month.getFullYear()"
-        :month-date="month"
-        v-bind="additionalProps"
-        @on-date-selected="data => emit('onDateSelected', data)"
-      />
-    </div>
-  </QCard>
-</template>

src/components/FetchData.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted } from 'vue';
+import { h, onMounted } from 'vue';
 import axios from 'axios';
 
 const $props = defineProps({
@@ -24,13 +24,9 @@ const $props = defineProps({
         default: '',
     },
     limit: {
-        type: [String, Number],
+        type: String,
         default: '',
     },
-    params: {
-        type: Object,
-        default: null,
-    },
 });
 
 const emit = defineEmits(['onFetch']);
@@ -42,24 +38,27 @@ onMounted(async () => {
     }
 });
 
-async function fetch(fetchFilter = {}) {
+async function fetch() {
     try {
-        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
+        const filter = Object.assign({}, $props.filter); // eslint-disable-line vue/no-dupe-keys
-        if ($props.where && !fetchFilter.where) filter.where = $props.where;
+        if ($props.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
 
         const { data } = await axios.get($props.url, {
-            params: { filter: JSON.stringify(filter), ...$props.params },
+            params: { filter },
         });
 
         emit('onFetch', data);
-        return data;
     } catch (e) {
         //
     }
 }
+
+const render = () => {
+    return h('div', []);
+};
 </script>
 <template>
-    <template></template>
+    <render />
 </template>

src/components/FilterItemForm.vue

@@ -1,219 +0,0 @@
-<script setup>
-import { ref, reactive, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-
-import axios from 'axios';
-import { dashIfEmpty } from 'src/filters';
-
-const props = defineProps({
-    url: {
-        type: String,
-        required: true,
-    },
-});
-
-const emit = defineEmits(['itemSelected']);
-
-const { t } = useI18n();
-
-const itemFilter = {
-    include: [
-        {
-            relation: 'producer',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'ink',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
-
-const itemFilterParams = reactive({});
-const closeButton = ref(null);
-const isLoading = ref(false);
-const ItemTypesOptions = ref([]);
-const InksOptions = ref([]);
-const tableRows = ref([]);
-const loading = ref(false);
-
-const tableColumns = computed(() => [
-    {
-        label: t('globals.id'),
-        name: 'id',
-        field: 'id',
-        align: 'left',
-    },
-    {
-        label: t('globals.name'),
-        name: 'name',
-        field: 'name',
-        align: 'left',
-    },
-    {
-        label: t('globals.size'),
-        name: 'size',
-        field: 'size',
-        align: 'left',
-    },
-    {
-        label: t('globals.producer'),
-        name: 'producerName',
-        field: 'producer',
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
-    },
-
-    {
-        label: t('entry.buys.color'),
-        name: 'ink',
-        field: (row) => row?.ink?.name,
-        align: 'left',
-    },
-]);
-
-const onSubmit = async () => {
-    let filter = itemFilter;
-    const params = itemFilterParams;
-    const where = {};
-    for (let key in params) {
-        const value = params[key];
-        if (!value) continue;
-
-        switch (key) {
-            case 'name':
-                where[key] = { like: `%${value}%` };
-                break;
-            case 'producerFk':
-            case 'typeFk':
-            case 'size':
-            case 'inkFk':
-                where[key] = value;
-        }
-    }
-    filter.where = where;
-
-    const { data } = await axios.get(props.url, {
-        params: { filter: JSON.stringify(filter) },
-    });
-    tableRows.value = data;
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
-const selectItem = ({ id }) => {
-    emit('itemSelected', id);
-    closeForm();
-};
-</script>
-
-<template>
-    <FetchData
-        url="ItemTypes"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        order="name ASC"
-        @on-fetch="(data) => (ItemTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Inks"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        order="name ASC"
-        @on-fetch="(data) => (InksOptions = data)"
-        auto-load
-    />
-    <QForm @submit="onSubmit()" class="all-pointer-events">
-        <QCard class="column" style="padding: 32px; z-index: 100">
-            <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="title">{{ t('Filter item') }}</h1>
-            <VnRow>
-                <VnInput :label="t('globals.name')" v-model="itemFilterParams.name" />
-                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
-                <VnSelect
-                    :label="t('globals.producer')"
-                    hide-selected
-                    v-model="itemFilterParams.producerFk"
-                    url="Producers"
-                    :fields="['id', 'name']"
-                    sort-by="name ASC"
-                />
-                <VnSelect
-                    :label="t('globals.type')"
-                    :options="ItemTypesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="itemFilterParams.typeFk"
-                />
-                <VnSelect
-                    :label="t('entry.buys.color')"
-                    :options="InksOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="itemFilterParams.inkFk"
-                />
-            </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.search')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-            </div>
-            <QTable
-                :columns="tableColumns"
-                :rows="tableRows"
-                :loading="loading"
-                :hide-header="!tableRows || !tableRows.length > 0"
-                :no-data-label="t('Enter a new search')"
-                class="q-mt-lg"
-                @row-click="(_, row) => selectItem(row)"
-            >
-                <template #body-cell-id="{ row }">
-                    <QTd auto-width @click.stop>
-                        <QBtn flat class="link">{{ row.id }}</QBtn>
-                        <ItemDescriptorProxy :id="row.id" />
-                    </QTd>
-                </template>
-            </QTable>
-        </QCard>
-    </QForm>
-</template>
-
-<i18n>
-es:
-    Filter item: Filtrar artículo
-    Enter a new search: Introduce una nueva búsqueda
-</i18n>
-
-<style lang="scss" scoped>
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-</style>

src/components/FilterTravelForm.vue

@@ -1,227 +0,0 @@
-<script setup>
-import { ref, reactive, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-
-import axios from 'axios';
-import { toDate } from 'src/filters';
-
-const emit = defineEmits(['travelSelected']);
-
-const { t } = useI18n();
-
-const travelFilter = {
-    include: [
-        {
-            relation: 'agency',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
-
-const travelFilterParams = reactive({});
-const closeButton = ref(null);
-const isLoading = ref(false);
-const agenciesOptions = ref([]);
-const warehousesOptions = ref([]);
-const tableRows = ref([]);
-const loading = ref(false);
-
-const tableColumns = computed(() => [
-    {
-        label: t('globals.id'),
-        name: 'id',
-        field: 'id',
-        align: 'left',
-    },
-    {
-        label: t('globals.warehouseOut'),
-        name: 'warehouseOutFk',
-        field: 'warehouseOutFk',
-        align: 'left',
-        format: (val) =>
-            warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
-    },
-    {
-        label: t('globals.warehouseIn'),
-        name: 'warehouseInFk',
-        field: 'warehouseInFk',
-        align: 'left',
-        format: (val) =>
-            warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
-    },
-    {
-        label: t('globals.shipped'),
-        name: 'shipped',
-        field: 'shipped',
-        align: 'left',
-        format: (val) => toDate(val),
-    },
-    {
-        label: t('globals.landed'),
-        name: 'landed',
-        field: 'landed',
-        align: 'left',
-        format: (val) => toDate(val),
-    },
-]);
-
-const onSubmit = async () => {
-    let filter = travelFilter;
-    const params = travelFilterParams;
-    const where = {};
-    for (let key in params) {
-        const value = params[key];
-        if (!value) continue;
-
-        switch (key) {
-            case 'agencyModeFk':
-            case 'warehouseInFk':
-            case 'warehouseOutFk':
-            case 'shipped':
-            case 'landed':
-                where[key] = value;
-        }
-    }
-
-    filter.where = where;
-    const { data } = await axios.get('Travels', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    tableRows.value = data;
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
-const selectTravel = ({ id }) => {
-    emit('travelSelected', id);
-    closeForm();
-};
-</script>
-
-<template>
-    <FetchData
-        url="AgencyModes"
-        @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
-        auto-load
-    />
-    <FetchData
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'] }"
-        order="name"
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-    />
-    <QForm @submit="onSubmit()" class="all-pointer-events">
-        <QCard class="column" style="padding: 32px; z-index: 100">
-            <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="title">{{ t('Filter travels') }}</h1>
-            <VnRow>
-                <VnSelect
-                    :label="t('globals.agency')"
-                    :options="agenciesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="travelFilterParams.agencyModeFk"
-                />
-                <VnSelect
-                    :label="t('globals.warehouseOut')"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="travelFilterParams.warehouseOutFk"
-                />
-                <VnSelect
-                    :label="t('globals.warehouseIn')"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="travelFilterParams.warehouseInFk"
-                />
-                <VnInputDate
-                    :label="t('globals.shipped')"
-                    v-model="travelFilterParams.shipped"
-                />
-                <VnInputDate
-                    :label="t('globals.landed')"
-                    v-model="travelFilterParams.landed"
-                />
-            </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.search')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    data-cy="save-filter-travel-form"
-                />
-            </div>
-            <QTable
-                :columns="tableColumns"
-                :rows="tableRows"
-                :loading="loading"
-                :hide-header="!tableRows || !tableRows.length > 0"
-                :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">
-                        <QBtn flat class="link">{{ row.id }}</QBtn>
-                        <TravelDescriptorProxy :id="row.id" />
-                    </QTd>
-                </template>
-            </QTable>
-        </QCard>
-    </QForm>
-</template>
-
-<i18n>
-es:
-    Filter travels: Filtro envíos
-    Enter a new search: Introduce una nueva búsqueda
-</i18n>
-
-<style lang="scss" scoped>
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-</style>

src/components/FormModel.vue

@@ -1,27 +1,19 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch, nextTick, useAttrs } from 'vue';
+import { onMounted, onUnmounted, computed, ref, watch } from 'vue';
-import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
-import useNotify from 'src/composables/useNotify.js';
 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();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { validate, validations } = useValidator();
+const { validate } = useValidator();
-const { notify } = useNotify();
+
-const route = useRoute();
-const myForm = ref(null);
 const $props = defineProps({
     url: {
         type: String,
@@ -29,7 +21,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: null,
+        default: '',
     },
     filter: {
         type: Object,
@@ -39,235 +31,71 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    urlCreate: {
-        type: String,
-        default: null,
-    },
     defaultActions: {
         type: Boolean,
         default: true,
     },
-    defaultButtons: {
-        type: Object,
-        default: () => {},
-    },
-    autoLoad: {
-        type: Boolean,
-        default: false,
-    },
-    formInitialData: {
-        type: Object,
-        default: () => {},
-    },
-    observeFormChanges: {
-        type: Boolean,
-        default: true,
-        description:
-            'Esto se usa principalmente para permitir guardar sin hacer cambios (Útil para la feature de clonar ya que en este caso queremos poder guardar de primeras)',
-    },
-    mapper: {
-        type: Function,
-        default: null,
-    },
-    clearStoreOnUnmount: {
-        type: Boolean,
-        default: true,
-    },
-    saveFn: {
-        type: Function,
-        default: null,
-    },
-    goTo: {
-        type: String,
-        default: '',
-        description: 'It is used for redirect on click "save and continue"',
-    },
-    reload: {
-        type: Boolean,
-        default: true,
-    },
-    defaultTrim: {
-        type: Boolean,
-        default: true,
-    },
-    maxWidth: {
-        type: [String, Boolean],
-        default: '800px',
-    },
-    onDataSaved: {
-        type: Function,
-        default: () => {},
-    },
-    preventSubmit: {
-        type: Boolean,
-        default: true,
-    },
-});
-const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
-const modelValue = computed(
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
-).value;
-const componentIsRendered = ref(false);
-const arrayData = useArrayData(modelValue);
-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 formData = ref();
-const defaultButtons = computed(() => ({
-    save: {
-        dataCy: 'saveDefaultBtn',
-        color: 'primary',
-        icon: 'save',
-        label: 'globals.save',
-        click: async (evt) => submitForm(evt),
-        type: 'submit',
-    },
-    reset: {
-        dataCy: 'resetDefaultBtn',
-        color: 'primary',
-        icon: 'restart_alt',
-        label: 'globals.reset',
-        click: () => reset(),
-    },
-    ...$props.defaultButtons,
-}));
-
-const submitForm = async (evt) => {
-    const isFormValid = await myForm.value.validate();
-    if (isFormValid) {
-        await save(evt);
-    }
-};
-
-onMounted(async () => {
-    nextTick(() => (componentIsRendered.value = true));
-
-    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set(modelValue, $props.formInitialData);
-
-    if (!$props.formInitialData) {
-        if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data)
-            updateAndEmit('onFetch', { val: arrayData.store.data });
-    }
-    if ($props.observeFormChanges) {
-        watch(
-            () => formData.value,
-            (newVal, oldVal) => {
-                if (!oldVal) return;
-                hasChanges.value =
-                    !isResetting.value &&
-                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);
-                isResetting.value = false;
-            },
-            { deep: true },
-        );
-    }
 });
 
-if (!$props.url)
+const emit = defineEmits(['onFetch']);
-    watch(
-        () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', { val }),
-    );
 
-watch(
+defineExpose({
-    originalData,
+    save,
-    (val) => {
-        if (val) formData.value = JSON.parse(JSON.stringify(val));
-    },
-    { immediate: true },
-);
-
-watch(
-    () => [$props.url, $props.filter],
-    async () => {
-        state.set(modelValue, null);
-        reset();
-        await fetch();
-    },
-);
-
-onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value && $props.observeFormChanges)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('globals.unsavedPopup.title'),
-                message: t('globals.unsavedPopup.subtitle'),
-                promise: () => next(),
-            },
-        });
-    else next();
 });
 
+onMounted(async () => await fetch());
+
 onUnmounted(() => {
-    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    state.unset($props.model);
-    if (hasChanges.value) return state.set(modelValue, originalData.value);
-    if ($props.clearStoreOnUnmount) state.unset(modelValue);
 });
 
-async function fetch() {
+const isLoading = ref(false);
-    try {
+const hasChanges = ref(false);
-        let { data } = await axios.get($props.url, {
+const originalData = ref();
-            params: { filter: JSON.stringify($props.filter) },
+const formData = computed(() => state.get($props.model));
-        });
+const formUrl = computed(() => $props.url);
-        if (Array.isArray(data)) data = data[0] ?? {};
 
-        updateAndEmit('onFetch', { val: data });
+function tMobile(...args) {
-    } catch (e) {
+    if (!quasar.platform.is.mobile) return t(...args);
-        state.set(modelValue, {});
+}
-        throw e;
+
-    }
+async function fetch() {
+    const { data } = await axios.get($props.url, {
+        params: { filter: $props.filter },
+    });
+
+    state.set($props.model, data);
+    originalData.value = data && JSON.parse(JSON.stringify(data));
+
+    watch(formData.value, () => (hasChanges.value = true));
+
+    emit('onFetch', state.get($props.model));
 }
 
 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value)
+    if (!hasChanges.value) {
-        return notify('globals.noChanges', 'negative');
+        return quasar.notify({
-
+            type: 'negative',
-    isLoading.value = true;
+            message: t('globals.noChanges'),
-    try {
-        formData.value = trimData(formData.value);
-        const body = $props.mapper
-            ? $props.mapper(formData.value, originalData.value)
-            : formData.value;
-        const method = $props.urlCreate ? 'post' : 'patch';
-        const url =
-            $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
-        const response = await Promise.resolve(
-            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
-        );
-
-        if ($props.urlCreate) notify('globals.dataCreated', 'positive');
-
-        updateAndEmit('onDataSaved', {
-            val: formData.value,
-            res: response?.data,
-            old: originalData.value,
         });
-        if ($props.reload) await arrayData.fetch({});
-        hasChanges.value = false;
-    } finally {
-        isLoading.value = false;
     }
-}
+    isLoading.value = true;
+    await axios.patch($props.urlUpdate || $props.url, formData.value);
 
-async function saveAndGo() {
+    originalData.value = JSON.parse(JSON.stringify(formData.value));
-    await save();
+    hasChanges.value = false;
-    push({ path: $props.goTo });
+    isLoading.value = false;
 }
 
 function reset() {
-    formData.value = JSON.parse(JSON.stringify(originalData.value));
+    state.set($props.model, originalData.value);
-    updateAndEmit('onFetch', { val: originalData.value });
+    originalData.value = JSON.parse(JSON.stringify(originalData.value));
-    if ($props.observeFormChanges) {
-        hasChanges.value = false;
-        isResetting.value = true;
-    }
-}
 
+    watch(formData.value, () => (hasChanges.value = true));
+
+    emit('onFetch', state.get($props.model));
+    hasChanges.value = false;
+}
 // eslint-disable-next-line vue/no-dupe-keys
 function filter(value, update, filterOptions) {
     update(
@@ -279,163 +107,75 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        },
-    );
-}
-
-function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: null }) {
-    state.set(modelValue, val);
-    if (!$props.url) arrayData.store.data = val;
-
-    emit(evt, state.get(modelValue), res, old);
-}
-
-function trimData(data) {
-    if (!$props.defaultTrim) return data;
-    for (const key in data) {
-        if (typeof data[key] == 'string') data[key] = data[key].trim();
-    }
-    return data;
-}
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
-async function onKeyup(evt) {
-    if (evt.key === 'Enter' && !$props.preventSubmit) {
-        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 myForm.value.submit(evt);
+    );
-    }
 }
 
-defineExpose({
+watch(formUrl, async () => {
-    submitForm,
+    originalData.value = null;
-    myForm,
+    reset();
-    save,
+    fetch();
-    isLoading,
-    hasChanges,
-    reset,
-    fetch,
-    formData,
 });
 </script>
 <template>
-    <div class="column items-center full-width">
+    <QBanner v-if="hasChanges" class="text-white bg-warning">
+        <QIcon name="warning" size="md" class="q-mr-md" />
+        <span>{{ t('globals.changesToSave') }}</span>
+    </QBanner>
+    <div class="column items-center">
         <QForm
-            v-on="$attrs"
-            ref="myForm"
             v-if="formData"
-            @submit.prevent="save"
+            @submit="save"
-            @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
-            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
-            :mapper="onBeforeSave"
         >
             <QCard>
                 <slot
-                    v-if="formData"
                     name="form"
                     :data="formData"
                     :validate="validate"
-                    :validations="validations()"
                     :filter="filter"
                 />
-                <SkeletonForm v-else />
             </QCard>
         </QForm>
     </div>
-    <Teleport
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-        to="#st-actions"
+        <div v-if="$props.defaultActions">
-        v-if="
+            <QBtnGroup push class="q-gutter-x-sm">
-            $props.defaultActions &&
+                <slot name="moreActions" />
-            stateStore?.isSubToolbarShown() &&
+                <QBtn
-            componentIsRendered
+                    :label="tMobile('globals.reset')"
-        "
+                    color="primary"
-    >
+                    icon="restart_alt"
-        <QBtnGroup push class="q-gutter-x-sm">
+                    flat
-            <slot name="moreActions" />
+                    @click="reset"
-            <QBtn
+                    :disable="!hasChanges"
-                :label="tMobile(defaultButtons.reset.label)"
+                    :title="t('globals.reset')"
-                :color="defaultButtons.reset.color"
+                />
-                :icon="defaultButtons.reset.icon"
+                <QBtn
-                flat
+                    :label="tMobile('globals.save')"
-                @click="defaultButtons.reset.click"
+                    color="primary"
-                :disable="!hasChanges"
+                    icon="save"
-                :title="t(defaultButtons.reset.label)"
+                    @click="save"
-            />
+                    :disable="!hasChanges"
-            <QBtnDropdown
+                    :title="t('globals.save')"
-                data-cy="saveAndContinueDefaultBtn"
+                />
-                v-if="$props.goTo"
+            </QBtnGroup>
-                @click="saveAndGo"
+        </div>
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
-                :disable="!hasChanges"
-                color="primary"
-                icon="save"
-                split
-            >
-                <QList>
-                    <QItem
-                        clickable
-                        v-close-popup
-                        @click="save"
-                        :title="t('globals.save')"
-                    >
-                        <QItemSection>
-                            <QItemLabel>
-                                <QIcon
-                                    name="save"
-                                    color="white"
-                                    class="q-mr-sm"
-                                    size="sm"
-                                />
-                                {{ t('globals.save').toUpperCase() }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-            </QBtnDropdown>
-            <QBtn
-                v-else
-                data-cy="saveDefaultBtn"
-                :label="tMobile('globals.save')"
-                color="primary"
-                icon="save"
-                @click="defaultButtons.save.click"
-                :disable="!hasChanges"
-                :title="t(defaultButtons.save.label)"
-            />
-        </QBtnGroup>
     </Teleport>
-
+    <SkeletonForm v-if="!formData" />
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
         color="primary"
-        style="min-width: 100%"
     />
 </template>
 <style lang="scss" scoped>
-.q-notifications {
-    color: black;
-}
 #formModel {
+    max-width: 800px;
     width: 100%;
 }
-
 .q-card {
     padding: 32px;
 }

src/components/FormModelPopup.vue

@@ -1,140 +0,0 @@
-<script setup>
-import { ref, computed, useAttrs, nextTick } 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({
-    title: {
-        type: String,
-        default: '',
-    },
-    subtitle: {
-        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) => {
-    if (!isSaveAndContinue.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 = showSaveAndContinueBtn) => {
-    await formModelRef.value.myForm.validate(true);
-    isSaveAndContinue.value = saveAndContinue;
-    if (formModelRef.value) {
-        await formModelRef.value.submitForm();
-    }
-};
-
-defineExpose({
-    isLoading,
-    onDataSaved,
-    isSaveAndContinue,
-    reset,
-});
-</script>
-
-<template>
-    <FormModel
-        ref="formModelRef"
-        :observe-form-changes="false"
-        :default-actions="false"
-        @submit="onClick"
-        v-bind="$attrs"
-        @on-data-saved="onDataSaved"
-        :prevent-submit="false"
-    >
-        <template #form="{ data, validate, validations }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="title">{{ title }}</h1>
-            <p>{{ subtitle }}</p>
-            <slot
-                name="form-inputs"
-                :data="data"
-                :validate="validate"
-                :validations="validations"
-            />
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.cancel')"
-                    :title="t('globals.cancel')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    data-cy="FormModelPopup_cancel"
-                    v-close-popup
-                    z-max
-                    @click="emit('onDataCanceled')"
-                />
-                <QBtn
-                    :flat="showSaveAndContinueBtn"
-                    :label="t('globals.save')"
-                    :title="t('globals.save')"
-                    :type="!showSaveAndContinueBtn ? 'submit' : 'button'"
-                    color="primary"
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    data-cy="FormModelPopup_save"
-                    @click="showSaveAndContinueBtn ? onClick(false) : null"
-                    z-max
-                />
-                <QBtn
-                    v-if="showSaveAndContinueBtn"
-                    :label="t('globals.isSaveAndContinue')"
-                    :title="t('globals.isSaveAndContinue')"
-                    color="primary"
-                    :type="showSaveAndContinueBtn ? 'submit' : 'button'"
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    data-cy="FormModelPopup_isSaveAndContinue"
-                    @click="showSaveAndContinueBtn ? onClick(true) : null"
-                    z-max
-                />
-            </div>
-        </template>
-    </FormModel>
-</template>
-
-<style lang="scss" scoped>
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-</style>

src/components/FormPopup.vue

@@ -1,101 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const emit = defineEmits(['onSubmit']);
-
-const $props = defineProps({
-    title: {
-        type: String,
-        default: '',
-    },
-    subtitle: {
-        type: String,
-        default: '',
-    },
-    defaultSubmitButton: {
-        type: Boolean,
-        default: true,
-    },
-    defaultCancelButton: {
-        type: Boolean,
-        default: true,
-    },
-    customSubmitButtonLabel: {
-        type: String,
-        default: '',
-    },
-    submitOnEnter: {
-        type: Boolean,
-        default: true,
-    },
-});
-
-const { t } = useI18n();
-const closeButton = ref(null);
-const isLoading = ref(false);
-
-const onSubmit = () => {
-    if ($props.submitOnEnter) {
-        emit('onSubmit');
-        closeForm();
-    }
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
-};
-</script>
-
-<template>
-    <QForm
-        @submit="onSubmit($event)"
-        class="all-pointer-events full-width"
-        style="max-width: 800px"
-    >
-        <QCard class="q-pa-lg">
-            <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="title">{{ title }}</h1>
-            <p>{{ subtitle }}</p>
-            <slot name="form-inputs" />
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    v-if="defaultCancelButton"
-                    :label="t('globals.cancel')"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    v-close-popup
-                />
-                <QBtn
-                    v-if="defaultSubmitButton"
-                    :label="customSubmitButtonLabel || t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-                <slot name="custom-buttons" />
-            </div>
-        </QCard>
-    </QForm>
-</template>
-
-<style lang="scss" scoped>
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-</style>

src/components/ItemsFilterPanel.vue

@@ -1,344 +0,0 @@
-<script setup>
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnInput from 'components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
-
-import axios from 'axios';
-import { getParamWhere } from 'src/filters';
-import { useRoute } from 'vue-router';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    customTags: {
-        type: Array,
-        default: () => [],
-    },
-    exprBuilder: {
-        type: Function,
-        default: null,
-    },
-});
-
-const route = useRoute();
-
-const itemTypesOptions = ref([]);
-const tagOptions = ref([]);
-const tagValues = ref([]);
-const categoryList = ref(null);
-const selectedCategoryFk = ref(getParamWhere(route.query.table, 'categoryFk', false));
-const selectedTypeFk = ref(getParamWhere(route.query.table, 'typeFk', false));
-
-const selectedCategory = computed(() => {
-    return (categoryList.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value,
-    );
-});
-
-const selectedType = computed(() => {
-    return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value,
-    );
-});
-
-const selectCategory = async (params, categoryId, search) => {
-    if (params.categoryFk === categoryId) {
-        resetCategory(params);
-        search();
-        return;
-    }
-    selectedCategoryFk.value = categoryId;
-    params.categoryFk = categoryId;
-    await fetchItemTypes(categoryId);
-    search();
-};
-
-const resetCategory = (params) => {
-    selectedCategoryFk.value = null;
-    itemTypesOptions.value = null;
-    if (params) {
-        params.categoryFk = null;
-        params.typeFk = null;
-    }
-};
-
-const applyTags = (params, search) => {
-    params.tags = tagValues.value
-        .filter((tag) => tag.selectedTag && tag.value)
-        .map((tag) => ({
-            tagFk: tag.selectedTag.id,
-            tagName: tag.selectedTag.name,
-            value: tag.value,
-        }));
-    search();
-};
-
-const fetchItemTypes = async (id = selectedCategoryFk.value) => {
-    const filter = {
-        fields: ['id', 'name', 'categoryFk'],
-        where: { categoryFk: id },
-        include: 'category',
-        order: 'name ASC',
-    };
-    const { data } = await axios.get('ItemTypes', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    itemTypesOptions.value = data;
-};
-
-const getCategoryClass = (category, params) => {
-    if (category.id === params?.categoryFk) {
-        return 'active';
-    }
-};
-
-const getSelectedTagValues = async (tag) => {
-    if (!tag?.selectedTag?.id) return;
-    tag.value = null;
-    const filter = {
-        fields: ['value'],
-        order: 'value ASC',
-        limit: 30,
-    };
-
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
-        params,
-    });
-    tag.valueOptions = data;
-};
-
-const removeTag = (index, params, search) => {
-    (tagValues.value || []).splice(index, 1);
-    applyTags(params, search);
-};
-const setCategoryList = (data) => {
-    categoryList.value = (data || []).map((category) => ({
-        ...category,
-        icon: `vn:${(category.icon || '').split('-')[1]}`,
-    }));
-    fetchItemTypes();
-};
-</script>
-
-<template>
-    <FetchData
-        url="ItemCategories"
-        auto-load
-        @on-fetch="setCategoryList"
-        :where="{ display: { neq: 0 } }"
-    />
-    <FetchData
-        url="Tags"
-        :filter="{ fields: ['id', 'name', 'isFree'] }"
-        auto-load
-        @on-fetch="(data) => (tagOptions = data)"
-    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :expr-builder="props.exprBuilder"
-        :custom-tags="props.customTags"
-    >
-        <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
-                {{ t(selectedType?.name || '') }}
-            </strong>
-            <div v-else class="q-gutter-x-xs">
-                <strong>{{ t(`components.itemsFilterPanel.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #customTags="{ tags, params }">
-            <template v-for="tag in tags" :key="tag.label">
-                <VnFilterPanelChip
-                    v-for="chip in tag.value"
-                    :key="chip"
-                    removable
-                    @remove="removeTagChip(chip, params, searchFn)"
-                >
-                    <div class="q-gutter-x-xs">
-                        <strong>{{ chip.tagName }}: </strong>
-                        <span>"{{ chip.value }}"</span>
-                    </div>
-                </VnFilterPanelChip>
-            </template>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem class="category-filter q-mt-md">
-                <QBtn
-                    dense
-                    flat
-                    round
-                    v-for="category in categoryList"
-                    :key="category.name"
-                    :class="['category', getCategoryClass(category, params)]"
-                    :icon="category.icon"
-                    @click="selectCategory(params, category.id, searchFn)"
-                >
-                    <QTooltip>
-                        {{ t(category.name) }}
-                    </QTooltip>
-                </QBtn>
-            </QItem>
-            <QItem class="q-my-md">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('components.itemsFilterPanel.typeFk')"
-                        v-model="params.typeFk"
-                        :options="itemTypesOptions"
-                        dense
-                        filled
-                        use-input
-                        :disable="!selectedCategoryFk"
-                        @update:model-value="
-                            (value) => {
-                                selectedTypeFk = value;
-                                searchFn();
-                            }
-                        "
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.categoryName }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <slot name="body" :params="params" :search-fn="searchFn" />
-            <QItem
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="q-mt-md filter-value"
-            >
-                <QItemSection class="col">
-                    <VnSelect
-                        :label="t('globals.tag')"
-                        v-model="value.selectedTag"
-                        :options="tagOptions"
-                        dense
-                        filled
-                        :emit-value="false"
-                        use-input
-                        :is-clearable="false"
-                        @update:model-value="getSelectedTagValues(value)"
-                    />
-                </QItemSection>
-                <QItemSection class="col">
-                    <VnSelect
-                        v-if="!value?.selectedTag?.isFree && value.valueOptions"
-                        :label="t('components.itemsFilterPanel.value')"
-                        v-model="value.value"
-                        :options="value.valueOptions || []"
-                        option-value="value"
-                        option-label="value"
-                        dense
-                        filled
-                        emit-value
-                        use-input
-                        :disable="!value"
-                        :is-clearable="false"
-                        @update:model-value="applyTags(params, searchFn)"
-                    />
-                    <VnInput
-                        v-else
-                        v-model="value.value"
-                        :label="t('components.itemsFilterPanel.value')"
-                        :disable="!value"
-                        :is-clearable="false"
-                        @keyup.enter="applyTags(params, searchFn)"
-                    />
-                </QItemSection>
-                <QIcon
-                    name="delete"
-                    class="fill-icon-on-hover q-px-xs"
-                    color="primary"
-                    size="sm"
-                    @click="removeTag(index, params, searchFn)"
-                />
-            </QItem>
-            <QItem class="q-mt-lg">
-                <QBtn
-                    icon="add_circle"
-                    v-shortcut="'+'"
-                    flat
-                    class="fill-icon-on-hover q-px-xs"
-                    color="primary"
-                    @click="tagValues.push({})"
-                />
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<style lang="scss" scoped>
-.category-filter {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 12px;
-
-    .category {
-        padding: 8px;
-        width: 60px;
-        height: 60px;
-        font-size: 1.4rem;
-        background-color: var(--vn-accent-color);
-
-        &.active {
-            background-color: $primary;
-        }
-    }
-}
-
-.filter-value {
-    display: flex;
-    align-items: center;
-}
-</style>
-
-<i18n>
-en:
-    params:
-        supplier: Supplier
-        from: From
-        to: To
-        active: Is active
-        visible: Is visible
-        floramondo: Is floramondo
-        categoryFk: Category
-
-es:
-    params:
-        supplier: Proveedor
-        from: Desde
-        to: Hasta
-        active: Activo
-        visible: Visible
-        floramondo: Floramondo
-        categoryFk: Categoría
-    Plant: Planta natural
-    Flower: Flor fresca
-    Handmade: Hecho a mano
-    Artificial: Artificial
-    Green: Verdes frescos
-    Accessories: Complementos florales
-    Fruit: Fruta
-</i18n>

src/components/LeftMenu.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, watch, ref, reactive, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -9,75 +9,27 @@ import { toLowerCamel } from 'src/filters';
 import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
-import VnInput from './common/VnInput.vue';
-import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const route = useRoute();
 const quasar = useQuasar();
 const navigation = useNavigationStore();
-const router = useRouter();
+
 const props = defineProps({
     source: {
         type: String,
         default: 'main',
     },
 });
-const initialized = ref(false);
-const items = ref([]);
-const expansionItemElements = reactive({});
-const pinnedModules = computed(() => {
-    const map = new Map();
-    items.value.forEach((item) => item.isPinned && map.set(item.name, item));
-    return map;
-});
-const search = ref(null);
-
-const filteredItems = computed(() => {
-    if (!search.value) return items.value;
-    const normalizedSearch = normalize(search.value);
-    return items.value.filter((item) => {
-        const locale = normalize(t(item.title));
-        return locale.includes(normalizedSearch);
-    });
-});
-const filteredPinnedModules = computed(() => {
-    if (!search.value) return pinnedModules.value;
-    const normalizedSearch = search.value
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-    const map = new Map();
-    for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title)
-            .normalize('NFD')
-            .replace(/[\u0300-\u036f]/g, '')
-            .toLowerCase();
-        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
-    }
-    return map;
-});
 
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
-    initialized.value = true;
 });
 
-watch(
-    () => route.matched,
-    () => {
-        if (!initialized.value) return;
-        items.value = [];
-        getRoutes();
-    },
-    { 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,51 +45,46 @@ function findMatches(search, item) {
 }
 
 function addChildren(module, route, parent) {
-    const menus = route?.meta?.menu;
+    if (route.menus) {
-    if (!menus) return;
+        const mainMenus = route.menus[props.source];
+        const matches = findMatches(mainMenus, route);
 
-    const matches = findMatches(menus, route);
+        for (const child of matches) {
-
+            navigation.addMenuItem(module, child, parent);
-    for (const child of matches) {
+        }
-        navigation.addMenuItem(module, child, parent);
     }
 }
 
+const items = ref([]);
 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(
+                (route) => toLowerCamel(route.name) === item.module
+            );
+            item.children = [];
+
+            if (!moduleDef) continue;
+
+            addChildren(item.module, moduleDef, item.children);
+        }
+
+        items.value = modules;
+    }
+
+    if (props.source === 'card') {
+        const currentRoute = route.matched[1];
+        const currentModule = toLowerCamel(currentRoute.name);
         const moduleDef = routes.find(
-            (route) => toLowerCamel(route.name) === item.module,
+            (route) => toLowerCamel(route.name) === currentModule
         );
-        if (!moduleDef) continue;
+
-        item.children = [];
+        if (!moduleDef) return;
-        addChildren(item.module, moduleDef, item.children);
+
+        addChildren(currentModule, moduleDef, items.value);
     }
-
-    items.value = modules;
-}
-
-function getCardRoutes() {
-    const currentRoute = route.matched[1];
-    const currentModule = toLowerCamel(currentRoute.name);
-    let moduleDef;
-
-    let index = route.matched.length - 1;
-    while (!moduleDef && index > 0) {
-        if (route.matched[index]?.meta?.menu) moduleDef = route.matched[index];
-        index--;
-    }
-
-    if (!moduleDef) return;
-    addChildren(currentModule, moduleDef, items.value);
 }
 
 async function togglePinned(item, event) {
@@ -161,75 +108,22 @@ async function togglePinned(item, event) {
         type: 'positive',
     });
 }
-
-const handleItemExpansion = (itemName) => {
-    expansionItemElements[itemName].scrollToLastElement();
-};
-
-function normalize(text) {
-    return text
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-}
-const searchModule = () => {
-    const [item] = filteredItems.value;
-    if (item) router.push({ name: item.name });
-};
 </script>
 
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <template v-if="route?.matched[1]?.name === 'Dashboard'">
+            <template v-if="$route?.matched[1]?.name === 'Dashboard'">
-                <QItem class="q-pb-md">
+                <QItem class="header">
-                    <VnInput
+                    <QItemSection avatar>
-                        v-model="search"
+                        <QIcon name="view_module" />
-                        :label="t('Search modules')"
+                    </QItemSection>
-                        class="full-width"
+                    <QItemSection> {{ t('globals.modules') }}</QItemSection>
-                        filled
-                        dense
-                        autofocus
-                        @keyup.enter.stop="searchModule()"
-                    />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size && !search">
+                <template v-for="item in items" :key="item.name">
-                    <LeftMenuItem
+                    <template v-if="item.children">
-                        v-for="[key, pinnedModule] of filteredPinnedModules"
+                        <LeftMenuItem :item="item" group="modules">
-                        :key="key"
-                        :item="pinnedModule"
-                        group="modules"
-                    >
-                        <template #side>
-                            <QBtn
-                                v-if="pinnedModule.isPinned === true"
-                                @click="togglePinned(pinnedModule, $event)"
-                                icon="remove_circle"
-                                size="xs"
-                                flat
-                                round
-                            >
-                                <QTooltip>
-                                    {{ t('components.leftMenu.removeFromPinned') }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </LeftMenuItem>
-                    <QSeparator />
-                </template>
-                <template v-for="(item, index) in filteredItems" :key="item.name">
-                    <template
-                        v-if="
-                            search ||
-                            (item.children && !filteredPinnedModules.has(item.name))
-                        "
-                    >
-                        <LeftMenuItem
-                            :item="item"
-                            group="modules"
-                            :class="search && index === 0 ? 'searched' : ''"
-                        >
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -262,7 +156,7 @@ const searchModule = () => {
             </template>
 
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === route?.matched[1]?.name">
+                <template v-if="item.name === $route?.matched[1]?.name">
                     <QItem class="header">
                         <QItemSection avatar v-if="item.icon">
                             <QIcon :name="item.icon" />
@@ -312,21 +206,6 @@ const searchModule = () => {
         <template v-if="$props.source === 'card'">
             <template v-for="item in items" :key="item.name">
                 <LeftMenuItem v-if="!item.children" :item="item" />
-                <QList v-else>
-                    <QExpansionItem
-                        v-ripple
-                        clickable
-                        :icon="item.icon"
-                        :label="t(item.title)"
-                        :content-inset-level="0.5"
-                        @after-show="handleItemExpansion(item.name)"
-                    >
-                        <LeftMenuItemGroup
-                            :ref="(el) => (expansionItemElements[item.name] = el)"
-                            :item="item"
-                        />
-                    </QExpansionItem>
-                </QList>
             </template>
         </template>
     </QList>
@@ -344,13 +223,6 @@ const searchModule = () => {
     max-width: 256px;
 }
 .header {
-    color: var(--vn-label-color);
+    color: #999999;
-}
-.searched {
-    background-color: var(--vn-section-hover-color);
 }
 </style>
-<i18n>
-    es:
-        Search modules: Buscar módulos
-</i18n>

src/components/LeftMenuItem.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const { t, te } = useI18n();
+const { t } = useI18n();
 
 const props = defineProps({
     item: {
@@ -11,42 +11,19 @@ const props = defineProps({
     },
 });
 
-const itemComputed = computed(() => {
+const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
-    const item = JSON.parse(JSON.stringify(props.item));
-    const [, , section] = item.title.split('.');
-
-    if (!te(item.title)) item.title = t(`globals.pageTitles.${section}`);
-    return item;
-});
 </script>
 <template>
-    <QItem
+    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
-        active-class="bg-vn-hover"
+        <QItemSection avatar v-if="item.icon">
-        class="min-height"
+            <QIcon :name="item.icon" />
-        :to="{ name: itemComputed.name }"
-        clickable
-        v-ripple
-        :data-cy="`${itemComputed.name}-menu-item`"
-    >
-        <QItemSection avatar v-if="itemComputed.icon">
-            <QIcon :name="itemComputed.icon" />
         </QItemSection>
-        <QItemSection avatar v-if="!itemComputed.icon">
+        <QItemSection avatar v-if="!item.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>
+        <QItemSection>{{ t(item.title) }}</QItemSection>
-            {{ t(itemComputed.title) }}
-            <QTooltip v-if="item.keyBinding">
-                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
-            </QTooltip>
-        </QItemSection>
         <QItemSection side>
-            <slot name="side" :item="itemComputed" />
+            <slot name="side" :item="item" />
         </QItemSection>
     </QItem>
 </template>
-<style lang="scss" scoped>
-.q-item {
-    min-height: 5vh;
-}
-</style>

src/components/LeftMenuItemGroup.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import LeftMenuItem from './LeftMenuItem.vue';
-import { elementIsVisibleInViewport } from 'src/composables/elementIsVisibleInViewport';
 
 const props = defineProps({
     item: {
@@ -14,27 +13,10 @@ const props = defineProps({
     },
 });
 
-const groupEnd = ref(null);
-
-const scrollToLastElement = () => {
-    if (groupEnd.value && !elementIsVisibleInViewport(groupEnd.value)) {
-        groupEnd.value.scrollIntoView({
-            behavior: 'smooth',
-            block: 'end',
-        });
-    }
-};
-
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
-
-defineExpose({
-    scrollToLastElement,
-});
 </script>
-
 <template>
     <template v-for="section in item.children" :key="section.name">
         <LeftMenuItem :item="section" />
     </template>
-    <div ref="groupEnd" />
 </template>

src/components/NavBar.vue

@@ -1,41 +1,35 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useSession } from 'src/composables/useSession';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
-import VnAvatar from './ui/VnAvatar.vue';
 
 const { t } = useI18n();
+const session = useSession();
 const stateStore = useStateStore();
 const quasar = useQuasar();
-const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
+const token = session.getToken();
 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();
+
+const pinnedModulesRef = ref();
 </script>
+
 <template>
-    <QHeader color="white" elevated>
+    <QHeader class="bg-dark" color="white" elevated>
         <QToolbar class="q-py-sm q-px-md">
             <QBtn
                 @click="stateStore.toggleLeftDrawer()"
-                icon="dock_to_right"
+                icon="menu"
+                class="q-mr-sm"
                 round
                 dense
                 flat
@@ -45,7 +39,13 @@ const refresh = () => window.location.reload();
                 </QTooltip>
             </QBtn>
             <RouterLink to="/">
-                <QBtn color="primary" flat round v-if="!quasar.platform.is.mobile">
+                <QBtn
+                    class="q-ml-xs"
+                    color="primary"
+                    flat
+                    round
+                    v-if="!quasar.platform.is.mobile"
+                >
                     <QAvatar square size="md">
                         <QImg
                             src="~/assets/salix_icon.svg"
@@ -57,32 +57,23 @@ 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
-                color="primary"
-                class="q-ml-md"
-                :class="{
-                    'no-visible': !stateQuery.isLoading().value,
-                }"
-                size="sm"
-                data-cy="navBar-spinner"
-            />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
-                <QIcon
+                <QBtn
-                    name="refresh"
+                    flat
-                    size="md"
+                    v-if="!quasar.platform.is.mobile"
-                    color="red"
+                    @click="pinnedModulesRef.redirect($route.params.id)"
-                    v-if="state.get('error')"
+                    icon="more_up"
-                    @click="refresh"
+                >
-                />
+                    <QTooltip>
+                        {{ t('Go to Salix') }}
+                    </QTooltip>
+                </QBtn>
                 <QBtn
                     :class="{ 'q-pa-none': quasar.platform.is.mobile }"
                     id="pinnedModules"
@@ -97,20 +88,20 @@ const refresh = () => window.location.reload();
                     <PinnedModules ref="pinnedModulesRef" />
                 </QBtn>
                 <QBtn
-                    class="q-pa-none"
+                    :class="{ 'q-pa-none': quasar.platform.is.mobile }"
                     rounded
                     dense
                     flat
                     no-wrap
                     id="user"
-                    data-cy="userPanel_btn"
                 >
-                    <VnAvatar
+                    <QAvatar size="lg">
-                        :worker-id="user.id"
+                        <QImg
-                        :title="user.name"
+                            :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                        size="lg"
+                            spinner-color="primary"
-                        color="transparent"
+                        >
-                    />
+                        </QImg>
+                    </QAvatar>
                     <QTooltip bottom>
                         {{ t('globals.userPanel') }}
                     </QTooltip>
@@ -122,11 +113,15 @@ const refresh = () => window.location.reload();
         <VnBreadcrumbs v-if="$q.screen.lt.md" class="q-ml-md" />
     </QHeader>
 </template>
+
 <style lang="scss" scoped>
 .searchbar {
     width: max-content;
 }
-.q-header {
-    background-color: var(--vn-section-color);
-}
 </style>
+<i18n>
+en:
+    Go to Salix: Go to Salix
+es:
+    Go to Salix: Ir a Salix
+</i18n>

src/components/RefundInvoiceForm.vue

@@ -1,167 +0,0 @@
-<script setup>
-import { ref, reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useDialogPluginComponent } from 'quasar';
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-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: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const { dialogRef } = useDialogPluginComponent();
-const { t } = useI18n();
-const router = useRouter();
-const { notify } = useNotify();
-
-const rectificativeTypeOptions = ref([]);
-const siiTypeInvoiceOutsOptions = ref([]);
-const invoiceParams = reactive({
-    id: $props.invoiceOutData?.id,
-    inheritWarehouse: true,
-});
-const invoiceCorrectionTypesOptions = ref([]);
-
-const refund = async () => {
-    const params = {
-        id: invoiceParams.id,
-        withWarehouse: invoiceParams.inheritWarehouse,
-        cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
-        siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
-        invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
-    };
-
-    const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
-    notify(t('Refunded invoice'), 'positive');
-    const [id] = data?.refundId || [];
-    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="CplusRectificationTypes"
-        :filter="{ order: 'description' }"
-        @on-fetch="
-            (data) => (
-                (rectificativeTypeOptions = data),
-                (invoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias'
-                )[0].id)
-            )
-        "
-        auto-load
-    />
-    <FetchData
-        url="SiiTypeInvoiceOuts"
-        :filter="{ where: { code: { like: 'R%' } } }"
-        @on-fetch="
-            (data) => (
-                (siiTypeInvoiceOutsOptions = data),
-                (invoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4'
-                )[0].id)
-            )
-        "
-        auto-load
-    />
-    <FetchData
-        url="InvoiceCorrectionTypes"
-        @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
-        auto-load
-    />
-
-    <QDialog ref="dialogRef">
-        <FormPopup
-            @on-submit="refund()"
-            :custom-submit-button-label="t('Accept')"
-            :default-cancel-button="false"
-        >
-            <template #form-inputs>
-                <VnRow>
-                    <VnSelect
-                        :label="t('Rectificative type')"
-                        :options="rectificativeTypeOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="invoiceParams.cplusRectificationTypeFk"
-                        :required="true"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('Class')"
-                        :options="siiTypeInvoiceOutsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="invoiceParams.siiTypeInvoiceOutFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.code }} -
-                                        {{ scope.opt?.description }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </VnRow>
-
-                <VnRow>
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="invoiceCorrectionTypesOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="invoiceParams.invoiceCorrectionTypeFk"
-                        :required="true"
-                    /> </VnRow
-                ><VnRow>
-                    <VnCheckbox
-                        v-model="invoiceParams.inheritWarehouse"
-                        :label="t('Inherit warehouse')"
-                        :info="t('Inherit warehouse tooltip')"
-                    />
-                </VnRow>
-            </template>
-        </FormPopup>
-    </QDialog>
-</template>
-
-<i18n>
-en:
-    Refund invoice: Refund invoice
-    Rectificative type: Rectificative type
-    Class: Class
-    Type: Type
-    Refunded invoice: Refunded invoice
-    Inherit warehouse: Inherit the warehouse
-    Inherit warehouse tooltip: Select this option to inherit the warehouse when refunding the invoice
-    Accept: Accept
-    Error refunding invoice: Error refunding invoice
-es:
-    Refund invoice: Abonar factura
-    Rectificative type: Tipo rectificativa
-    Class: Clase
-    Type: Tipo
-    Refunded invoice: Factura abonada
-    Inherit warehouse: Heredar el almacén
-    Inherit warehouse tooltip: Seleccione esta opción para heredar el almacén al abonar la factura.
-    Accept: Aceptar
-    Error refunding invoice: Error abonando factura
-</i18n>

src/components/RegularizeStockForm.vue

@@ -1,82 +0,0 @@
-<script setup>
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import FormModelPopup from './FormModelPopup.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const props = defineProps({
-    itemFk: {
-        type: Number,
-        default: null,
-    },
-    warehouseFk: {
-        type: Number,
-        default: null,
-    },
-});
-
-const { t } = useI18n();
-
-const regularizeFormData = reactive({
-    itemFk: Number(props.itemFk),
-    warehouseFk: props.warehouseFk,
-    quantity: null,
-});
-
-const warehousesOptions = ref([]);
-
-const onDataSaved = (data) => {
-    emit('onDataSaved', data);
-};
-</script>
-
-<template>
-    <FetchData
-        url="Warehouses"
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-    />
-    <FormModelPopup
-        url-create="Items/regularize"
-        model="Items"
-        :title="t('item.regularizeStock')"
-        :form-initial-data="regularizeFormData"
-        @on-data-saved="onDataSaved($event)"
-    >
-        <template #form-inputs="{ data }">
-            <VnRow>
-                <QInput
-                    :label="t('Type the visible quantity')"
-                    v-model.number="data.quantity"
-                    type="number"
-                    autofocus
-                    data-cy="regularizeStockInput"
-                />
-            </VnRow>
-            <VnRow>
-                <div class="col">
-                    <VnSelect
-                        :label="t('Warehouse')"
-                        v-model.number="data.warehouseFk"
-                        :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-es:
-    Warehouse: Almacén
-    Type the visible quantity: Introduce la cantidad visible
-    Regularize stock: Regularizar stock
-</i18n>

src/components/TicketProblems.vue

@@ -1,126 +0,0 @@
-<script setup>
-import { toCurrency } from 'src/filters';
-import { getValueFromPath } from 'src/composables/getValueFromPath';
-
-const { row, visibleProblems = null } = defineProps({
-    row: { type: Object, required: true },
-    visibleProblems: { type: Array },
-});
-
-function showProblem(problem) {
-    const val = getValueFromPath(row, problem);
-    if (!visibleProblems) return val;
-    return !!(visibleProblems?.includes(problem) && val);
-}
-</script>
-<template>
-    <span class="q-gutter-x-xs">
-        <router-link
-            v-if="showProblem('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="showProblem('isDeleted')"
-            color="primary"
-            name="vn:deletedTicket"
-            size="xs"
-            data-cy="ticketDeletedIcon"
-        >
-            <QTooltip>
-                {{ t('Ticket deleted') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasRisk')"
-            name="vn:risk"
-            :color="row.hasHighRisk ? 'negative' : 'primary'"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}:
-                {{ toCurrency(row.risk - (row.credit ?? 0)) }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasComponentLack')"
-            name="vn:components"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasItemDelay')"
-            color="primary"
-            size="xs"
-            name="vn:hasItemDelay"
-        >
-            <QTooltip>
-                {{ $t('ticket.summary.hasItemDelay') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasItemLost')"
-            color="primary"
-            size="xs"
-            name="vn:hasItemLost"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.hasItemLost') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasItemShortage')"
-            name="vn:unavailable"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasRounding')"
-            color="primary"
-            name="sync_problem"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('ticketList.rounding') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('hasTicketRequest')"
-            name="vn:buyrequest"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('isTaxDataChecked')"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="showProblem('isTooLittle')"
-            name="vn:isTooLittle"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-        </QIcon>
-    </span>
-</template>

src/components/TransferInvoiceForm.vue

@@ -1,216 +0,0 @@
-<script setup>
-import { ref, reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useQuasar, useDialogPluginComponent } from 'quasar';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-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: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const { dialogRef } = useDialogPluginComponent();
-const quasar = useQuasar();
-const { t } = useI18n();
-const router = useRouter();
-const { notify } = useNotify();
-
-const rectificativeTypeOptions = ref([]);
-const siiTypeInvoiceOutsOptions = ref([]);
-const checked = ref(true);
-const transferInvoiceParams = reactive({
-    id: $props.invoiceOutData?.id,
-});
-const invoiceCorrectionTypesOptions = ref([]);
-
-const selectedClient = (client) => {
-    transferInvoiceParams.selectedClientData = client;
-};
-
-const makeInvoice = async () => {
-    const hasToInvoiceByAddress =
-        transferInvoiceParams.selectedClientData.hasToInvoiceByAddress;
-
-    const params = {
-        id: transferInvoiceParams.id,
-        cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
-        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
-        invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
-        newClientFk: transferInvoiceParams.newClientFk,
-        makeInvoice: checked.value,
-    };
-
-    if (checked.value && hasToInvoiceByAddress) {
-        const response = await new Promise((resolve) => {
-            quasar
-                .dialog({
-                    component: VnConfirm,
-                    componentProps: {
-                        title: t('Bill destination client'),
-                        message: t('transferInvoiceInfo'),
-                    },
-                })
-                .onOk(() => {
-                    resolve(true);
-                })
-                .onCancel(() => {
-                    resolve(false);
-                });
-        });
-        if (!response) {
-            return;
-        }
-    }
-
-    const { data } = await axios.post('InvoiceOuts/transfer', params);
-    notify(t('Transferred invoice'), 'positive');
-    const id = data?.[0];
-    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="CplusRectificationTypes"
-        :filter="{ order: 'description' }"
-        @on-fetch="
-            (data) => (
-                (rectificativeTypeOptions = data),
-                (transferInvoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias',
-                )[0].id)
-            )
-        "
-        auto-load
-    />
-    <FetchData
-        url="SiiTypeInvoiceOuts"
-        :filter="{ where: { code: { like: 'R%' } } }"
-        @on-fetch="
-            (data) => (
-                (siiTypeInvoiceOutsOptions = data),
-                (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4',
-                )[0].id)
-            )
-        "
-        auto-load
-    />
-    <FetchData
-        url="InvoiceCorrectionTypes"
-        @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
-        auto-load
-    />
-    <QDialog ref="dialogRef">
-        <FormPopup
-            @on-submit="makeInvoice()"
-            :title="t('Transfer invoice')"
-            :custom-submit-button-label="t('Transfer client')"
-            :default-cancel-button="false"
-        >
-            <template #form-inputs>
-                <VnRow>
-                    <VnSelect
-                        :label="t('Client')"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="transferInvoiceParams.newClientFk"
-                        :required="true"
-                        url="Clients"
-                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                        auto-load
-                    >
-                        <template #option="scope">
-                            <QItem
-                                v-bind="scope.itemProps"
-                                @click="selectedClient(scope.opt)"
-                            >
-                                <QItemSection>
-                                    <QItemLabel>
-                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                    <VnSelect
-                        :label="t('Rectificative type')"
-                        :options="rectificativeTypeOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                        :required="true"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('Class')"
-                        :options="siiTypeInvoiceOutsOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                        :required="true"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ scope.opt?.code }} -
-                                        {{ scope.opt?.description }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                    <VnSelect
-                        :label="t('Type')"
-                        :options="invoiceCorrectionTypesOptions"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                        :required="true"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnCheckbox
-                        v-model="checked"
-                        :label="t('Bill destination client')"
-                        :info="t('transferInvoiceInfo')"
-                    />
-                </VnRow>
-            </template>
-        </FormPopup>
-    </QDialog>
-</template>
-
-<i18n>
-en:
-    checkInfo: New tickets from the destination customer will be generated in the consignee by default.
-    transferInvoiceInfo: Destination customer is marked to bill in the consignee
-    confirmTransferInvoice: The destination customer has selected to bill in the consignee, do you want to continue?
-es:
-    Transfer invoice: Transferir factura
-    Transfer client: Transferir cliente
-    Client: Cliente
-    Rectificative type: Tipo rectificativa
-    Class: Clase
-    Type: Tipo
-    Transferred invoice: Factura transferida
-    Bill destination client: Facturar cliente destino
-    transferInvoiceInfo: Los nuevos tickets del cliente destino, serán generados en el consignatario por defecto.
-    confirmTransferInvoice: El cliente destino tiene marcado facturar por consignatario, desea continuar?
-</i18n>

src/components/UserPanel.vue

@@ -1,29 +1,17 @@
 <script setup>
-import quasarLang from 'src/utils/quasarLang';
+import { onMounted, computed } from 'vue';
-
+import { Dark, Quasar } from 'quasar';
-import { onMounted, computed, ref } from 'vue';
-
-import { Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
+
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
-import { localeEquivalence } from 'src/i18n/index';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import FetchData from 'components/FetchData.vue';
-import { useClipboard } from 'src/composables/useClipboard';
-import { useRole } from 'src/composables/useRole';
-import VnAvatar from './ui/VnAvatar.vue';
-import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-const { copyText } = useClipboard();
-const { notify } = useNotify();
 
 const userLocale = computed({
     get() {
@@ -32,9 +20,18 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        value = localeEquivalence[value] ?? value;
+        if (value === 'en') value = 'en-GB';
 
-        quasarLang(value);
+        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
+        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
+        try {
+            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
+            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
     },
 });
 
@@ -48,10 +45,7 @@ const darkMode = computed({
 });
 
 const user = state.getUser();
-const warehousesData = ref();
+const token = session.getToken();
-const companiesData = ref();
-const accountBankData = ref();
-const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -69,87 +63,31 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    try {
+    await axios.patch(query, {
-        await axios.patch(query, {
+        darkMode: value,
-            darkMode: value,
+    });
-        });
+    user.value.darkMode = value;
-        user.value.darkMode = value;
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    try {
+    await axios.patch(query, {
-        await axios.patch(query, { lang: value });
+        lang: value,
-
+    });
-        user.value.lang = value;
+    user.value.lang = value;
-        useState().setUser(user.value);
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
 }
 
 function logout() {
     session.destroy();
     router.push('/login');
 }
-
-function copyUserToken() {
-    copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
-}
-
-function localUserData() {
-    state.setUser(user.value);
-}
-
-async function saveUserData(param, value) {
-    try {
-        await axios.post('UserConfigs/setUserConfig', { [param]: value });
-        localUserData();
-        onDataSaved();
-    } catch (error) {
-        onDataError();
-    }
-}
-
-const onDataSaved = () => {
-    notify('globals.dataSaved', 'positive');
-};
-
-const onDataError = () => {
-    notify('errors.updateUserConfig', 'negative');
-};
 </script>
 
 <template>
-    <FetchData
+    <QMenu anchor="bottom left">
-        url="Warehouses"
-        order="name"
-        @on-fetch="(data) => (warehousesData = data)"
-        auto-load
-    />
-    <FetchData
-        v-if="isEmployee"
-        url="Companies"
-        order="name"
-        @on-fetch="(data) => (companiesData = data)"
-        auto-load
-    />
-    <FetchData
-        v-if="isEmployee"
-        url="Accountings"
-        order="name"
-        @on-fetch="(data) => (accountBankData = data)"
-        auto-load
-    />
-    <QMenu anchor="bottom left" class="bg-vn-section-color">
         <div class="row no-wrap q-pa-md">
-            <div class="col column">
+            <div class="column panel">
-                <div class="text-h6 q-ma-sm q-mb-none">
+                <div class="text-h6 q-mb-md">
                     {{ t('components.userPanel.settings') }}
                 </div>
                 <QToggle
@@ -157,7 +95,7 @@ const onDataError = () => {
                     @update:model-value="saveLanguage"
                     :label="t(`globals.lang['${userLocale}']`)"
                     icon="public"
-                    color="primary"
+                    color="orange"
                     false-value="es"
                     true-value="en"
                 />
@@ -166,128 +104,43 @@ const onDataError = () => {
                     @update:model-value="saveDarkMode"
                     :label="t(`globals.darkMode`)"
                     checked-icon="dark_mode"
-                    color="primary"
+                    color="orange"
                     unchecked-icon="light_mode"
                 />
             </div>
 
             <QSeparator vertical inset class="q-mx-lg" />
 
-            <div class="col column items-center q-mb-sm">
+            <div class="column items-center panel">
-                <VnAvatar
+                <QAvatar size="80px">
-                    :worker-id="user.id"
+                    <QImg
-                    :title="user.name"
+                        :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                    size="xxl"
+                        spinner-color="white"
-                    color="transparent"
+                    />
-                />
+                </QAvatar>
-                <QBtn
+
-                    v-if="isEmployee"
-                    class="q-mt-sm q-px-md"
-                    :to="`/worker/${user.id}`"
-                    color="primary"
-                    :label="t('globals.myAccount')"
-                    dense
-                />
                 <div class="text-subtitle1 q-mt-md">
                     <strong>{{ user.nickname }}</strong>
                 </div>
-                <div
+                <div class="text-subtitle3 text-grey-7 q-mb-xs">@{{ user.name }}</div>
-                    class="text-subtitle3 text-grey-7 q-mb-xs copyText"
+
-                    @click="copyUserToken()"
-                >
-                    @{{ user.name }}
-                </div>
                 <QBtn
                     id="logout"
-                    color="primary"
+                    color="orange"
                     flat
                     :label="t('globals.logOut')"
                     size="sm"
                     icon="logout"
                     @click="logout()"
                     v-close-popup
-                    dense
                 />
             </div>
         </div>
-        <QSeparator inset class="q-mx-lg" />
-        <div class="col q-gutter-xs q-pa-md">
-            <VnRow>
-                <VnSelect
-                    :label="t('components.userPanel.localWarehouse')"
-                    v-model="user.localWarehouseFk"
-                    :options="warehousesData"
-                    option-label="name"
-                    option-value="id"
-                    input-debounce="0"
-                    hide-selected
-                    @update:model-value="localUserData"
-                />
-                <VnSelect
-                    :label="t('components.userPanel.localBank')"
-                    v-model="user.localBankFk"
-                    :options="accountBankData"
-                    option-label="bank"
-                    option-value="id"
-                    input-debounce="0"
-                    hide-selected
-                    @update:model-value="localUserData"
-                >
-                    <template #option="{ itemProps, opt }">
-                        <QItem v-bind="itemProps">
-                            <QItemSection>
-                                <QItemLabel>
-                                    {{ `${opt.id}: ${opt.bank}` }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('components.userPanel.localCompany')"
-                    hide-selected
-                    v-model="user.localCompanyFk"
-                    :options="companiesData"
-                    option-label="code"
-                    option-value="id"
-                    input-debounce="0"
-                    @update:model-value="localUserData"
-                />
-                <VnSelect
-                    :label="t('components.userPanel.userWarehouse')"
-                    hide-selected
-                    v-model="user.warehouseFk"
-                    :options="warehousesData"
-                    option-label="name"
-                    option-value="id"
-                    input-debounce="0"
-                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
-                />
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('components.userPanel.userCompany')"
-                    hide-selected
-                    v-model="user.companyFk"
-                    :options="companiesData"
-                    option-label="code"
-                    option-value="id"
-                    style="flex: 0"
-                    dense
-                    input-debounce="0"
-                    @update:model-value="(v) => saveUserData('companyFk', v)"
-                />
-            </VnRow>
-        </div>
     </QMenu>
 </template>
 
 <style lang="scss" scoped>
-.copyText {
+.panel {
-    &:hover {
+    width: 150px;
-        cursor: alias;
-    }
 }
 </style>

src/components/VnSelectProvince.vue

@@ -1,97 +0,0 @@
-<script setup>
-import { ref, watch } from 'vue';
-import { useValidator } from 'src/composables/useValidator';
-import { useI18n } from 'vue-i18n';
-
-import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
-
-const emit = defineEmits(['onProvinceCreated', 'onProvinceFetched', 'update:options']);
-const $props = defineProps({
-    countryFk: {
-        type: Number,
-        default: null,
-    },
-    provinceSelected: {
-        type: Number,
-        default: null,
-    },
-});
-const provinceFk = defineModel({ type: Number, default: null });
-
-const { validate } = useValidator();
-const { t } = useI18n();
-const filter = ref({
-    include: { relation: 'country' },
-    where: {
-        countryFk: $props.countryFk,
-    },
-});
-const provincesOptions = ref($props.provinces);
-const provincesFetchDataRef = ref();
-provinceFk.value = $props.provinceSelected;
-if (!$props.countryFk) {
-    filter.value.where = {};
-}
-async function onProvinceCreated(_, data) {
-    await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
-    provinceFk.value = data.id;
-    emit('onProvinceCreated', data);
-}
-async function handleProvinces(data) {
-    provincesOptions.value = data;
-    emit('update:options', data);
-}
-
-watch(
-    () => $props.countryFk,
-    async () => {
-        if ($props.countryFk) {
-            filter.value.where.countryFk = $props.countryFk;
-        } else filter.value.where = {};
-        await provincesFetchDataRef.value.fetch({});
-        emit('onProvinceFetched', provincesOptions.value);
-    }
-);
-</script>
-
-<template>
-    <FetchData
-        ref="provincesFetchDataRef"
-        :filter="filter"
-        @on-fetch="handleProvinces"
-        url="Provinces"
-        auto-load
-    />
-    <VnSelectDialog
-        data-cy="locationProvince"
-        :label="t('Province')"
-        :options="provincesOptions"
-        :tooltip="t('Create province')"
-        hide-selected
-        v-model="provinceFk"
-        :rules="validate && validate('postcode.provinceFk')"
-        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
-    >
-        <template #option="{ itemProps, opt }">
-            <QItem v-bind="itemProps">
-                <QItemSection>
-                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                    <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
-                </QItemSection>
-            </QItem>
-        </template>
-        <template #form>
-            <CreateNewProvinceForm
-                :country-fk="$props.countryFk"
-                @on-data-saved="onProvinceCreated"
-            />
-        </template>
-    </VnSelectDialog>
-</template>
-<i18n>
-    es:
-        Province: Provincia
-        Create province: Crear provincia
-</i18n>

src/components/VnTable/VnChip.vue

@@ -1,57 +0,0 @@
-<script setup>
-defineProps({
-    columns: {
-        type: Array,
-        required: true,
-    },
-    row: {
-        type: Object,
-        default: null,
-    },
-});
-
-function stopEventPropagation(event) {
-    event.preventDefault();
-    event.stopPropagation();
-}
-</script>
-<template>
-    <slot name="beforeChip" :row="row"></slot>
-    <span
-        v-for="col of columns"
-        :key="col.name"
-        @click="stopEventPropagation"
-        class="cursor-text"
-    >
-        <QChip
-            v-if="col.chip.condition(row[col.name], row)"
-            :title="col.label"
-            :class="[
-                col.chip.color
-                    ? col.chip.color(row)
-                    : !col.chip.icon && 'bg-chip-secondary',
-                col.chip.icon && 'q-px-none',
-            ]"
-            dense
-            square
-        >
-            <span v-if="!col.chip.icon">
-                {{ col.format ? col.format(row) : row[col.name] }}
-            </span>
-            <QIcon v-else :name="col.chip.icon" color="primary-light" />
-        </QChip>
-    </span>
-    <slot name="afterChip" :row="row"></slot>
-</template>
-<style lang="scss">
-.bg-chip-secondary {
-    background-color: var(--vn-page-color);
-    color: var(--vn-text-color);
-}
-
-.cursor-text {
-    pointer-events: all;
-    cursor: text;
-    user-select: all;
-}
-</style>

src/components/VnTable/VnColumn.vue

@@ -1,235 +0,0 @@
-<script setup>
-import { markRaw, computed } from 'vue';
-import { QIcon, QToggle } from 'quasar';
-import { dashIfEmpty } from 'src/filters';
-
-import VnSelect from 'components/common/VnSelect.vue';
-import VnSelectCache from 'components/common/VnSelectCache.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputNumber from 'components/common/VnInputNumber.vue';
-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,
-        required: true,
-    },
-    row: {
-        type: Object,
-        default: () => {},
-    },
-    default: {
-        type: [Object, String],
-        default: null,
-    },
-    componentProp: {
-        type: String,
-        default: null,
-    },
-    isEditable: {
-        type: Boolean,
-        default: true,
-    },
-    components: {
-        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,
-        disable: !$props.isEditable,
-        class: 'fit',
-    },
-    forceAttrs: {
-        label,
-    },
-};
-
-const defaultComponents = {
-    input: {
-        component: markRaw(VnInput),
-        attrs: {
-            disable: !$props.isEditable,
-            class: 'fit',
-        },
-        forceAttrs: {
-            label,
-        },
-    },
-    number: {
-        component: markRaw(VnInputNumber),
-        attrs: {
-            disable: !$props.isEditable,
-            class: 'fit',
-        },
-        forceAttrs: {
-            label,
-        },
-    },
-    date: {
-        component: markRaw(VnInputDate),
-        attrs: {
-            readonly: !$props.isEditable,
-            disable: !$props.isEditable,
-            style: 'min-width: 125px',
-            class: 'fit',
-        },
-        forceAttrs: {
-            label,
-        },
-    },
-    time: {
-        component: markRaw(VnInputTime),
-        attrs: {
-            disable: !$props.isEditable,
-        },
-        forceAttrs: {
-            label,
-        },
-    },
-    checkbox: {
-        ref: 'checkbox',
-        component: markRaw(VnCheckbox),
-        attrs: ({ model }) => {
-            const defaultAttrs = {
-                disable: !$props.isEditable,
-                'model-value': Boolean(model),
-                class: 'no-padding fit',
-            };
-
-            if (typeof model == 'number') {
-                defaultAttrs['true-value'] = 1;
-                defaultAttrs['false-value'] = 0;
-            }
-            return defaultAttrs;
-        },
-        forceAttrs: {
-            label,
-            autofocus: true,
-        },
-        events: {
-            blur: () => emit('blur'),
-        },
-    },
-    select: {
-        component: markRaw(VnSelectCache),
-        ...defaultSelect,
-    },
-    rawSelect: {
-        component: markRaw(VnSelect),
-        ...defaultSelect,
-    },
-    selectEnum: {
-        component: markRaw(VnSelectEnum),
-        ...defaultSelect,
-    },
-    icon: {
-        component: markRaw(QIcon),
-    },
-    userLink: {
-        component: markRaw(VnUserLink),
-    },
-    toggle: {
-        component: markRaw(QToggle),
-    },
-};
-
-const value = computed(() => {
-    return $props.column.format
-        ? $props.column.format($props.row, dashIfEmpty)
-        : dashIfEmpty($props.row[$props.column.name]);
-});
-
-const col = computed(() => {
-    let newColumn = { ...$props.column };
-    const specific = newColumn[$props.componentProp];
-    if (specific) {
-        newColumn = {
-            ...newColumn,
-            ...specific,
-            ...specific.attrs,
-            ...specific.forceAttrs,
-        };
-    }
-    if (
-        (/^is[A-Z]/.test(newColumn.name) || /^has[A-Z]/.test(newColumn.name)) &&
-        newColumn.component == null
-    )
-        newColumn.component = 'checkbox';
-    if ($props.default && !newColumn.component) newColumn.component = $props.default;
-
-    return newColumn;
-});
-
-const components = computed(() => {
-    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">
-        <VnComponent
-            v-if="col.before"
-            :prop="col.before"
-            :components="components"
-            :value="{ row, model }"
-            v-model="model"
-        />
-        <VnComponent
-            v-if="col.component"
-            :prop="col"
-            :components="components"
-            :value="{ row, model }"
-            v-model="model"
-        />
-        <span :title="value" v-else>{{ value }}</span>
-        <VnComponent
-            v-if="col.after"
-            :prop="col.after"
-            :components="components"
-            :value="{ row, model }"
-            v-model="model"
-        />
-    </div>
-</template>

src/components/VnTable/VnFilter.vue

@@ -1,180 +0,0 @@
-<script setup>
-import { markRaw, computed, onBeforeMount } from 'vue';
-import { QToggle } from 'quasar';
-import { useArrayData } from 'composables/useArrayData';
-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 VnColumn from 'components/VnTable/VnColumn.vue';
-
-const $props = defineProps({
-    column: {
-        type: Object,
-        required: true,
-    },
-    showTitle: {
-        type: Boolean,
-        default: false,
-    },
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    searchUrl: {
-        type: String,
-        default: 'table',
-    },
-    customClass: {
-        type: String,
-        default: '',
-    },
-});
-
-defineExpose({ addFilter, props: $props });
-
-const model = defineModel(undefined, { required: true });
-const arrayData = useArrayData(
-    $props.dataKey,
-    $props.searchUrl ? { searchUrl: $props.searchUrl } : null,
-);
-const columnFilter = computed(() => $props.column?.columnFilter);
-
-const updateEvent = { 'update:modelValue': addFilter };
-const enterEvent = {
-    'keyup.enter': () => addFilter(model.value),
-    remove: () => addFilter(null),
-};
-
-const defaultAttrs = {
-    filled: !$props.showTitle,
-    dense: true,
-};
-
-const forceAttrs = {
-    label: $props.showTitle ? '' : (columnFilter.value?.label ?? $props.column.label),
-};
-
-const selectComponent = {
-    component: markRaw(VnSelect),
-    event: updateEvent,
-    attrs: {
-        class: `q-pt-none fit ${$props.customClass}`,
-        dense: true,
-        filled: !$props.showTitle,
-    },
-    forceAttrs,
-};
-
-const components = {
-    input: {
-        component: markRaw(VnInput),
-        event: enterEvent,
-        attrs: {
-            ...defaultAttrs,
-            clearable: true,
-        },
-        forceAttrs,
-    },
-    number: {
-        component: markRaw(VnInput),
-        event: enterEvent,
-        attrs: {
-            ...defaultAttrs,
-            clearable: true,
-            type: 'number',
-        },
-        forceAttrs,
-    },
-    date: {
-        component: markRaw(VnInputDate),
-        event: updateEvent,
-        attrs: {
-            ...defaultAttrs,
-        },
-        forceAttrs,
-    },
-    time: {
-        component: markRaw(VnInputTime),
-        event: updateEvent,
-        attrs: {
-            ...defaultAttrs,
-            disable: !$props.isEditable,
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
-    },
-    checkbox: {
-        component: markRaw(VnCheckbox),
-        event: updateEvent,
-        attrs: {
-            class: $props.showTitle ? 'q-py-sm' : '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) {
-    value ??= undefined;
-    if (value && typeof value === 'object') value = model.value;
-    value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name ?? name;
-
-    if (columnFilter.value?.inWhere) {
-        if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
-        return await arrayData.addFilterWhere({ [field]: value });
-    }
-    await arrayData.addFilter({ params: { [field]: value } });
-}
-
-const showFilter = computed(
-    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions',
-);
-
-const onTabPressed = async () => {
-    if (model.value) enterEvent['keyup.enter']();
-};
-
-onBeforeMount(() => {
-    const columnFilter = $props.column?.columnFilter;
-    const component = columnFilter?.component;
-    const defaultComponent = components[component];
-    const events = { update: updateEvent, enter: enterEvent };
-
-    if (!columnFilter || defaultComponent) return;
-    $props.column.columnFilter.event = events[columnFilter.event];
-});
-</script>
-<template>
-    <div v-if="showFilter" class="full-width" style="overflow: hidden">
-        <VnColumn
-            :column="$props.column"
-            default="input"
-            v-model="model"
-            :components="components"
-            component-prop="columnFilter"
-            @keydown.tab="onTabPressed"
-        />
-    </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

@@ -1,122 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object });
-const $props = defineProps({
-    name: {
-        type: [String, Boolean],
-        default: '',
-    },
-    label: {
-        type: String,
-        default: undefined,
-    },
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    searchUrl: {
-        type: [String, Boolean],
-        default: 'table',
-    },
-    vertical: {
-        type: Boolean,
-        default: false,
-    },
-    align: {
-        type: String,
-        default: 'end',
-    },
-});
-const hover = ref();
-const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
-
-async function orderBy(name, direction) {
-    if (!name) return;
-    switch (direction) {
-        case 'DESC':
-            direction = undefined;
-            break;
-        case undefined:
-            direction = 'ASC';
-            break;
-        case 'ASC':
-            direction = 'DESC';
-            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"
-        :style="textAlignToFlex(align)"
-    >
-        <span :title="label">{{ label }}</span>
-        <div v-if="name && (model?.index || vertical)">
-            <QChip
-                :label="!vertical ? model?.index : ''"
-                :icon="
-                    (model?.index || hover) && !vertical
-                        ? model?.direction == 'DESC'
-                            ? 'arrow_downward'
-                            : 'arrow_upward'
-                        : undefined
-                "
-                :size="vertical ? '' : 'sm'"
-                :class="[
-                    model?.index ? 'color-vn-text' : 'bg-transparent',
-                    vertical ? 'q-mx-none q-py-lg' : '',
-                ]"
-                class="no-box-shadow"
-                :clickable="true"
-                style="min-width: 40px; max-height: 30px"
-            >
-                <div
-                    class="column justify-center text-center"
-                    v-if="vertical"
-                    :style="!model?.index && 'color: #5d5d5d'"
-                >
-                    {{ model?.index }}
-                    <QIcon
-                        :name="
-                            model?.index
-                                ? model?.direction == 'DESC'
-                                    ? 'arrow_downward'
-                                    : 'arrow_upward'
-                                : 'swap_vert'
-                        "
-                        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/VnTableFilter.vue

@@ -1,105 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
-import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
-
-defineProps({
-    columns: {
-        type: Array,
-        required: true,
-    },
-    searchUrl: {
-        type: [String, Boolean],
-        default: 'table',
-    },
-});
-
-const tableFilterRef = ref([]);
-
-function columnName(col) {
-    const column = { ...col, ...col.columnFilter };
-    let name = column.name;
-    if (column.alias) name = column.alias + '.' + name;
-    return name;
-}
-</script>
-<template>
-    <VnFilterPanel
-        v-bind="$attrs"
-        :search-button="true"
-        :disable-submit-event="true"
-        :data-key="$attrs['data-key']"
-        :search-url
-    >
-        <template #body="{ params, orders, searchFn }">
-            <div
-                class="container"
-                v-for="col of columns.filter((c) => c.columnFilter ?? true)"
-                :key="col.id"
-            >
-                <div class="filter">
-                    <slot
-                        :name="`filter-${col.name}`"
-                        :params="params"
-                        :column-name="columnName(col)"
-                        :search-fn
-                    >
-                        <VnFilter
-                            ref="tableFilterRef"
-                            :column="col"
-                            :data-key="$attrs['data-key']"
-                            v-model="params[columnName(col)]"
-                            :search-url="searchUrl"
-                        />
-                    </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"
-            />
-        </template>
-        <template #tags="{ tag, formatFn, getLocale }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ getLocale(`${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-        </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

@@ -1,198 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { ref, computed, onMounted } from 'vue';
-
-import { useState } from 'src/composables/useState';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const columns = defineModel({ type: Object, default: [] });
-const $props = defineProps({
-    tableCode: {
-        type: String,
-        default: '',
-    },
-    skip: {
-        type: Array,
-        default: () => [],
-    },
-});
-
-const { notify } = useNotify();
-const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
-const popupProxyRef = ref();
-const initialUserConfigViewData = ref();
-const localColumns = ref([]);
-
-const areAllChecksMarked = computed(() => {
-    return localColumns.value.every((col) => col.visible);
-});
-
-function setUserConfigViewData(data, isLocal) {
-    if (!data) return;
-    if (!isLocal) localColumns.value = [];
-
-    const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});
-
-    for (let column of columns.value) {
-        const { label, name, labelAbbreviation } = column;
-        if (skippeds[name]) continue;
-        column.visible = data[name] ?? true;
-        if (!isLocal)
-            localColumns.value.push({
-                name,
-                label,
-                labelAbbreviation,
-                visible: column.visible,
-            });
-    }
-}
-
-function toggleMarkAll(val) {
-    localColumns.value.forEach((col) => (col.visible = val));
-}
-
-async function getConfig(url, filter) {
-    const response = await axios.get(url, {
-        params: { filter: filter },
-    });
-    return response?.data && response?.data?.length > 0 ? response.data[0] : null;
-}
-
-async function fetchViewConfigData() {
-    try {
-        const defaultFilter = {
-            where: { tableCode: $props.tableCode },
-        };
-
-        const userConfig = await getConfig('UserConfigViews', {
-            where: {
-                ...defaultFilter.where,
-                ...{ userFk: user.value.id },
-            },
-        });
-
-        if (userConfig) {
-            initialUserConfigViewData.value = userConfig;
-            setUserConfigViewData(userConfig.configuration);
-            return;
-        }
-
-        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
-        if (defaultConfig) {
-            setUserConfigViewData(defaultConfig.columns);
-            return;
-        }
-    } catch (err) {
-        console.error('Error fetching config view data', err);
-    }
-}
-
-async function saveConfig() {
-    const configuration = {};
-    for (const { name, visible } of localColumns.value)
-        configuration[name] = visible ?? true;
-    setUserConfigViewData(configuration, true);
-    if (!$props.tableCode) return popupProxyRef.value.hide();
-
-    try {
-        const params = {};
-        // Si existe una view config del usuario hacemos un update si no la creamos
-        if (initialUserConfigViewData.value) {
-            params.updates = [
-                {
-                    data: {
-                        configuration,
-                    },
-                    where: {
-                        id: initialUserConfigViewData.value.id,
-                    },
-                },
-            ];
-        } else {
-            params.creates = [
-                {
-                    userFk: user.value.id,
-                    tableCode: $props.tableCode,
-                    tableConfig: $props.tableCode,
-                    configuration,
-                },
-            ];
-        }
-
-        const response = await axios.post('UserConfigViews/crud', params);
-        if (response.data && response.data[0]) {
-            initialUserConfigViewData.value = response.data[0];
-        }
-        notify('globals.dataSaved', 'positive');
-        popupProxyRef.value.hide();
-    } catch (err) {
-        console.error('Error saving user view config', err);
-        notify('errors.writeRequest', 'negative');
-    }
-}
-
-onMounted(async () => {
-    setUserConfigViewData({});
-    await fetchViewConfigData();
-});
-</script>
-<template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
-        <QPopupProxy ref="popupProxyRef">
-            <QCard class="column q-pa-md">
-                <QIcon name="info" size="sm" class="info-icon">
-                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
-                </QIcon>
-                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
-                <QCheckbox
-                    :label="t('Tick all')"
-                    :model-value="areAllChecksMarked"
-                    @update:model-value="toggleMarkAll($event)"
-                    class="q-mb-sm"
-                />
-                <div v-if="columns.length > 0" class="checks-layout">
-                    <QCheckbox
-                        v-for="col in localColumns"
-                        :key="col.name"
-                        :label="
-                            col?.labelAbbreviation
-                                ? col.labelAbbreviation + ` (${col.label ?? col.name})`
-                                : (col.label ?? col.name)
-                        "
-                        v-model="col.visible"
-                    />
-                </div>
-                <QBtn
-                    class="full-width q-mt-md"
-                    color="primary"
-                    @click="saveConfig()"
-                    :label="t('globals.save')"
-                />
-            </QCard>
-        </QPopupProxy>
-        <QTooltip>{{ t('Visible columns') }}</QTooltip>
-    </QBtn>
-</template>
-
-<style lang="scss" scoped>
-.info-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-}
-
-.checks-layout {
-    display: grid;
-    grid-template-columns: repeat(3, 200px);
-}
-</style>
-
-<i18n>
-    es:
-        Check the columns you want to see: Marca las columnas que quieres ver
-        Visible columns: Columnas visibles
-        Tick all: Marcar todas
-</i18n>