.eslintrc.cjs

@@ -1,4 +1,4 @@
-export default {
+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)
@@ -58,7 +58,7 @@ export default {
     rules: {
         'prefer-promise-reject-errors': 'off',
         'no-unused-vars': 'warn',
-        'vue/no-multiple-template-root': 'off',
+        "vue/no-multiple-template-root": "off" ,
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },

.gitignore

@@ -29,5 +29,5 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/test/cypress/videos
-/test/cypress/screenshots
+/tests/cypress/videos
+/tests/cypress/screenshots

.husky/addReferenceTag.js

@@ -1,24 +1,23 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { join, resolve } from 'path';
+const fs = require('fs');
+const path = require('path');
 
 function getCurrentBranchName(p = process.cwd()) {
-    if (!existsSync(p)) return false;
+    if (!fs.existsSync(p)) return false;
 
-    const gitHeadPath = join(p, '.git', 'HEAD');
+    const gitHeadPath = path.join(p, '.git', 'HEAD');
 
-    if (!existsSync(gitHeadPath)) {
-        return getCurrentBranchName(resolve(p, '..'));
-    }
+    if (!fs.existsSync(gitHeadPath))
+        return getCurrentBranchName(path.resolve(p, '..'));
 
-    const headContent = readFileSync(gitHeadPath, 'utf-8');
+    const headContent = fs.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 msgPath = `.git/COMMIT_EDITMSG`;
+    const msg = fs.readFileSync(msgPath, 'utf-8');
     const reference = branchName.match(/^\d+/);
 
     const referenceTag = `refs #${reference}`;
@@ -27,7 +26,8 @@ if (branchName) {
 
         if (splitedMsg.length > 1) {
             const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
-            writeFileSync(msgPath, finalMsg);
+            fs.writeFileSync(msgPath, finalMsg);
         }
     }
 }
+

.prettierrc.js

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

CHANGELOG.md

@@ -1,246 +1,3 @@
-# Version 25.00 - 2025-01-14
-
-### Added 🆕
-
--   chore: refs #7056 move test by:jorgep
--   feat: refs #7050 7050 add object check by:Jtubau
--   feat: refs #7050 7050 add test to isEmpty() by:Jtubau
--   feat: refs #7056 add tests in FormModel by:jorgep
--   feat: refs #7056 update route meta information and add FormModel tests by:jorgep
--   feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog() (7074-makeFrontTestToVnDmsList) by:Jtubau
--   feat: refs #7079 created VnLocation front test by:provira
--   feat: refs #7189 add Accept-Language header to axios requests by:jorgep
--   feat: refs #7924 add custom inspection checkbox and localization support by:jgallego
--   feat: refs #7924 update custom inspection label for clarity in English and Spanish locales by:jgallego
--   feat: refs #8004 enhance FetchedTags component with column support and styling updates by:pablone
--   feat: refs #8004 hide rightFilter by:pablone
--   feat: refs #8246 added new field in list by:Jon
--   feat: refs #8266 added descriptor to item name by:jtubau
--   feat: refs #8293 add zone filter by:Jtubau
--   feat: refs #8293 include zone data in each record by:Jtubau
--   fix: refs #8004 more list style issues by:pablone
--   fix: refs #8004 some style issues on all list by:pablone
--   style: refs #8004 update layout and styling in FetchedTags and ItemList components by:pablone
--   style: update CustomerBalance.vue to set label color by:jgallego
-
-### Changed 📦
-
--   perf: order by:alexm
--   perf: redirect transition list to card by:alexm
--   perf: refs #8201 onDataSaved fetch by:Jon
--   perf: revert processData by:alexm
--   perf: simplify if by:alexm
--   perf: simplify if (perf_redirectTransition) by:alexm
--   refactor: item fixedPrice by:Jon
--   refactor: refs #7050 refactorize by:jtubau
--   refactor: refs #7050 removed blank spaces by:jtubau
--   refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage by:jgallego
--   refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests by:jgallego
--   refactor: refs #7074 move dms constant to global scope by:Jtubau
--   refactor: refs #7079 removed useless code by:provira
--   refactor: refs #7924 simplify custom inspection icon rendering in ExtraCommunity.vue by:jgallego
--   refactor: refs #8004 remove console log from CardSummary component on mount by:pablone
--   refactor: refs #8004 remove consoleLogs by:pablone
--   refactor: refs #8004 remove unused stateStore import in InvoiceInList.vue by:pablone
--   refactor: refs #8004 remove unused travelFilterRef and chip definition in TravelList.vue by:pablone
--   refactor: refs #8004 replace VnSelect with VnSelectWorker in CustomerList component by:pablone
--   refactor: refs #8201 added onMounted to stablish the value to show icons by:Jon
--   refactor: refs #8201 deleted condition by:Jon
--   refactor: refs #8201 deleted log by:Jon
--   refactor: refs #8201 deleted logs by:Jon
--   refactor: refs #8266 8266 change expedition item name by:Jtubau
--   refactor: refs #8266 change expedition label by:Jtubau
--   refactor: refs #8293 remove redundant attributes by:Jtubau
--   refactor: refs #8320 changed folder names from "specs" to "**tests**" by:provira
--   refactor: refs #8320 moved front tests to their respective sections by:provira
--   refactor: refs #8813 removed unused class property by:provira
-
-### Fixed 🛠️
-
--   fix: discount class by:PAU ROVIRA ROSALENY
--   fix: duplicate transalation after test to dev by:alexm
--   fix: fix translations by:carlossa
--   fix: redirect to sales when confirming lines by:Jon
--   fix: refs #7050 delete import added by mistake by:Jtubau
--   fix: refs #7133 handleSalesModelValue function to handle empty input by:jorgep
--   fix: refs #7189 update user language on sessionStorage by:jorgep
--   fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component by:jorgep
--   fix: refs #8004 more list style issues by:pablone
--   fix: refs #8004 some style issues on all list by:pablone
--   fix: refs #8004 update label for daysOnward in TravelFilter component and add translations by:pablone
--   fix: refs #8004 vnTable card with and add permanent labels by:pablone
--   fix: refs #8201 added onDataSaved emi to refetch when cahnges are made by:Jon
--   fix: refs #8201 use arrayData to fix the error by:Jon
--   fix: refs #8314 space between label and value by:jtubau
--   fix: refs #8813 fixed ClaimLines format by:provira
--   fix: update button sizes in ExtraCommunity.vue for better visibility by:jgallego
--   perf: revert processData by:alexm
--   refactor: item fixedPrice by:Jon
-
-# Version 24.52 - 2024-01-07
-
-### Added 🆕
-
--   chore: refs #8197 remove console log by:alexm
--   chore: refs #8197 replace name by:alexm
--   chore: refs #8197 unnecessary file by:alexm
--   feat: #8110 apply mixin in quasar components by:Javier Segarra
--   feat(Account & AccountRole): refs #8197 add VnCardMain by:alexm
--   feat: addDptoLink by:Jtubau
--   feat: added restore ticket function in ticket descriptor menu by:Jon
--   feat: add support service wip by:jorgep
--   feat: focus menu searchbar by:jorgep
--   feat: make additional data object by:jorgep
--   feat: message to grant access by:jorgep
--   feat: refs #6583 add default param by:jorgep
--   feat: refs #6583 add destination opt filter by:jorgep
--   feat: refs #6583 add icon by:jorgep
--   feat: refs #6583 add locale by:jorgep
--   feat: refs #7072 added test to computed fn total by:Jtubau
--   feat: refs #7235 update invoice out global form to fetch config based on serial type by:jgallego
--   feat: refs #7301 add exclude inventory supplier from list by:pablone
--   feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component by:pablone
--   feat: refs #7882 Added distribution point by:guillermo
--   feat: refs #7882 Added longitude & latitude by:guillermo
--   feat: refs #7936 add autocomplete on tab fn by:jorgep
--   feat: refs #7936 add company filter by:jorgep
--   feat: refs #7936 add currency check before fetching by:jorgep
--   feat: refs #7936 add dueDated field by:jorgep
--   feat: refs #7936 add number validation to VnInputNumber & new daysAgo filter in InvoiceInFilter by:jorgep
--   feat: refs #7936 add optionCaption by:jorgep
--   feat: refs #7936 add row click navigation to InvoiceInSerial by:jorgep
--   feat: refs #7936 add unit tests by:jorgep
--   feat: refs #7936 add useAccountShortToStandard composable by:jorgep
--   feat: refs #7936 calculate exchange & update taxable base by:jorgep
--   feat: refs #7936 enhance downloadFile function to support opening in a new tab by:jorgep
--   feat: refs #7936 enhance getTotal fn & add unit tests by:jorgep
--   feat: refs #7936 enhance vn-select by:jorgep
--   feat: refs #7936 improve optionLabel logic in InvoiceInVat component for better handling of numeric values by:jorgep
--   feat: refs #7936 limit decimal places by:jorgep
--   feat: refs #7936 make fields required by:jorgep
--   feat: refs #7936 show country code & isVies fields by:jorgep
--   feat: refs #7936 show id & value by:jorgep
--   feat: refs #7936 simplify optionLabel wip by:jorgep
--   feat: refs #7936 update 'isVies' label to use global translation key by:jorgep
--   feat: refs #7936 update option labels in InvoiceIn components for better clarity by:jorgep
--   feat: refs #7936 use default invoice data by:jorgep
--   feat: refs #8001 change request by:robert
--   feat: refs #8001 ticketExpeditionGrafana by:robert
--   feat: refs #8194 created VnSelectWorker component and use it in Lilium by:Jon
--   feat: refs #8197 better leftMenu and VnCardMain improvements by:alexm
--   feat: refs #8197 default leftMenu by:alexm
--   feat: refs #8197 default sectionName by:alexm
--   feat: refs #8197 keepData in VnSection by:alexm
--   feat: refs #8197 vnTableFilter by:alexm
--   feat: refs #8197 working rightMenu by:alexm
--   feat: remove re-fetch when add element by:Javier Segarra
--   feat: remove search after category by:Javier Segarra
--   feat: requested changes in item module by:Jon
--   feat: update quantity by:Javier Segarra
--   feat(VnPaginate): refs #8197 hold data when change to Card by:alexm
-
-### Changed 📦
-
--   perf: #6896 REMOVE COMMENTS by:Javier Segarra
--   perf: qFormMixin by:Javier Segarra
--   perf: qFormMixin improvement by:Javier Segarra
--   perf: refs #8194 select worker component by:Jon
--   perf: refs #8197 perf by:alexm
--   perf: remove comments by:Javier Segarra
--   perf: remove unused variables (origin/warmfix_noUsedVars) by:Javier Segarra
--   refactor: added again search emit by:Jon
--   refactor: add useCau composable by:jorgep
--   refactor: deleted log by:Jon
--   refactor: deleted onUnmounted code by:Jon
--   refactor: deleted useless hidden tag by:Jon
--   refactor: deleted warnings and corrected itemTag by:Jon
--   refactor: drop logic by:jorgep
--   refactor: ignore params when searching by id on searchbar (origin/VnSearchbar-SearchRemoveParams) by:Jon
--   refactor: log error by:Jon
--   refactor: refs #7936 locale by:jorgep
--   refactor: refs #7936 simplify getTotal fn by:jorgep
--   refactor: refs #7936 update label capitalization and replace invoice type options by:jorgep
--   refactor: refs #8194 deleted unnecessary label by:Jon
--   refactor: refs #8194 modified select worker template by:Jon
--   refactor: refs #8194 modified select worker to allow no one filter from monitor ticket by:Jon
--   refactor: refs #8194 moved translation to the correct place by:Jon
--   refactor: refs #8194 requested changes by:Jon
--   refactor: refs #8194 structure changes in component and related files by:Jon
--   refactor: refs #8197 adapt AccountAcls to VnCardMain by:alexm
--   refactor: refs #8197 adapt AccountAlias by:alexm
--   refactor: refs #8197 adapt Ticket to VnCardMain by:alexm
--   refactor: refs #8197 backward compatible (8197-VnCardMain_backwardCompatibility) by:alexm
--   refactor: refs #8197 rename VnSectionMain to VnModule and VnCardMain to VnSection by:alexm
--   refactor: refs #8288 changed invoice out spanish translation by:provira
--   refactor: use locale keys by:jorgep
--   refactor: use teleport to avoid qdrawer overlapping by:Jon
--   refactor: use VnSelectWorker by:Jon
-
-### Fixed 🛠️
-
--   fix: account by:carlossa
--   fix: account create by:carlossa
--   fix: accountList create by:carlossa
--   fix(AccountList): use $refs by:alexm
--   fix: add data-key by:alexm
--   fix: addLocales by:Jtubau
--   fix: dated field by:Jon
--   fix: e2e by:jorgep
--   fix: fix department filter by:carlossa
--   fix: fixed translations by:Javier Segarra
--   fix: fixed translations by:provira
--   fix: get total from api by:Javier Segarra
--   fix: handle non-object options by:jorgep
--   fix: monitorPayMethodFilter by:carlossa
--   fix: orderBy priority by:Javier Segarra
--   fix: prevent null by:jorgep
--   fix: redirection vnTable VnTableFilter by:alexm
--   fix: refs #6389 fix filter trad by:carlossa
--   fix: refs #6389 fix front, filters, itp by:carlossa
--   fix: refs #6389 front add packing filter by:carlossa
--   fix: refs #6389 front by:carlossa
--   fix: refs #6389 front filters by:carlossa
--   fix: refs #6389 ipt by:carlossa
--   fix: refs #6389 packing by:carlossa
--   fix: refs #6583 update checkbox for filtering by destination in TicketAdvanceFilter by:jorgep
--   fix: refs #7031 add test e2e by:carlossa
--   fix: refs #7031 fix zoneTest by:carlossa
--   fix: refs #7301 unnecessary console logs from ItemLastEntries.vue by:pablone
--   fix: refs #7936 changes by:jorgep
--   fix: refs #7936 decimal places & locale by:jorgep
--   fix: refs #7936 descriptor & dueday by:jorgep
--   fix: refs #7936 exclude disabled els on tab by:jorgep
--   fix: refs #7936 format tax calculation to two decimal places by:jorgep
--   fix: refs #7936 improve error handling by:jorgep
--   fix: refs #7936 redirection by:jorgep
--   fix: refs #7936 rollback by:jorgep
--   fix: refs #7936 serial by:jorgep
--   fix: refs #7936 tabulation wip by:jorgep
--   fix: refs #7936 test by:jorgep
--   fix: refs #8114 clean by:carlossa
--   fix: refs #8114 fix agencyList by:carlossa
--   fix: refs #8114 fix lifeCycle hooks by:carlossa
--   fix: refs #8114 fix pr by:carlossa
--   fix: refs #8114 fix removeAddress by:carlossa
--   fix: refs #8114 orderList by:carlossa
--   fix: refs #8114 remove logs by:carlossa
--   fix: refs #8197 mapKey (origin/8197-perf_vnTableInside, 8197-perf_vnTableInside) by:alexm
--   fix: refs #8197 redirection (8197-perf_redirection) by:alexm
--   fix: refs #8197 staticParams and redirect by:alexm
--   fix: refs #8197 vnPaginate onFetch emit by:alexm
--   fix: refs #8197 vnPaginate when change :id by:alexm
--   fix: refs #8197 vnTableFilter in vnTable by:alexm
--   fix: refs #8315 ticketBoxing test by:alexm
--   fix: remove url by:carlossa
--   fix: rollback by:jorgep
--   fix: test by:jorgep
--   fix(VnDmsList): refs #8197 add mapKey by:alexm
--   revert: refs #8197 arrayData changes by:alexm
--   test: refs #8197 fix e2e by:alexm
--   test: refs #8315 fix claimDevelopment fixtures by:alexm
--   test: refs #8315 fix clientList by:alexm
--   test: refs #8315 fix VnSelect in e2e by:alexm
-
 # Version 24.50 - 2024-12-10
 
 ### Added 🆕

commitlint.config.js

@@ -1 +1 @@
-export default { extends: ['@commitlint/config-conventional'] };
+module.exports = { extends: ['@commitlint/config-conventional'] };

cypress.config.js

@@ -1,9 +1,9 @@
-import { defineConfig } from 'cypress';
+const { defineConfig } = require('cypress');
 // https://docs.cypress.io/app/tooling/reporters
 // https://docs.cypress.io/app/references/configuration
 // https://www.npmjs.com/package/cypress-mochawesome-reporter
 
-export default defineConfig({
+module.exports = defineConfig({
     e2e: {
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,
@@ -11,7 +11,6 @@ export default defineConfig({
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
-        downloadsFolder: 'test/cypress/downloads',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
@@ -31,10 +30,8 @@ export default defineConfig({
             supportFile: 'test/cypress/support/unit.js',
         },
         setupNodeEvents(on, config) {
-            import('cypress-mochawesome-reporter/plugin').then((plugin) => plugin.default(on));
+            require('cypress-mochawesome-reporter/plugin')(on);
             // implement node event listeners here
         },
-        viewportWidth: 1280,
-        viewportHeight: 720,
     },
 });

package.json

@@ -1,12 +1,11 @@
 {
     "name": "salix-front",
-    "version": "25.06.0",
+    "version": "24.50.0",
     "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 ./",
@@ -21,40 +20,38 @@
         "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
-        "@quasar/cli": "^2.4.1",
-        "@quasar/extras": "^1.16.16",
+        "@quasar/cli": "^2.3.0",
+        "@quasar/extras": "^1.16.9",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
-        "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.17.7",
+        "quasar": "^2.14.5",
         "validator": "^13.9.0",
-        "vue": "^3.5.13",
-        "vue-i18n": "^9.3.0",
-        "vue-router": "^4.2.5"
+        "vue": "^3.3.4",
+        "vue-i18n": "^9.2.2",
+        "vue-router": "^4.2.1"
     },
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@intlify/unplugin-vue-i18n": "^0.8.1",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^2.0.8",
-        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/app-vite": "^1.7.3",
+        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^13.6.6",
         "cypress-mochawesome-reporter": "^3.8.2",
-        "eslint": "^9.18.0",
-        "eslint-config-prettier": "^10.0.1",
-        "eslint-plugin-cypress": "^4.1.0",
-        "eslint-plugin-vue": "^9.32.0",
+        "eslint": "^8.41.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-cypress": "^2.13.3",
+        "eslint-plugin-vue": "^9.14.1",
         "husky": "^8.0.0",
         "postcss": "^8.4.23",
-        "prettier": "^3.4.2",
-        "sass": "^1.83.4",
-        "vitest": "^0.34.0"
+        "prettier": "^2.8.8",
+        "vitest": "^0.31.1"
     },
     "engines": {
         "node": "^20 || ^18 || ^16",
@@ -63,8 +60,8 @@
         "bun": ">= 1.0.25"
     },
     "overrides": {
-        "@vitejs/plugin-vue": "^5.2.1",
-        "vite": "^6.0.11",
+        "@vitejs/plugin-vue": "^5.0.4",
+        "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}

postcss.config.js

@@ -1,14 +1,10 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 
-import autoprefixer from 'autoprefixer';
-// Uncomment the following line if you want to support RTL CSS
-// import rtlcss from 'postcss-rtlcss';
-
-export default {
+module.exports = {
     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:
-        // rtlcss(),
+        // If you want to support RTL css, then
+        // 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')
     ],
 };

quasar.config.js

@@ -8,11 +8,11 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
-import { configure } from 'quasar/wrappers';
-import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
-import path from 'path';
+const { configure } = require('quasar/wrappers');
+const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+const path = require('path');
 
-export default configure(function (/* ctx */) {
+module.exports = configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,

quasar.extensions.json

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

src/boot/axios.js

@@ -3,20 +3,19 @@ import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
-import { getToken, isLoggedIn } from 'src/utils/session';
-import { i18n } from 'src/boot/i18n';
 
+const session = useSession();
 const { notify } = useNotify();
 const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
+
 axios.defaults.baseURL = baseUrl;
 const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
-    const token = getToken();
+    const token = session.getToken();
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
-        config.headers['Accept-Language'] = i18n.global.locale.value;
     }
     stateQuery.add(config);
     return config;
@@ -37,15 +36,15 @@ const onResponse = (response) => {
     return response;
 };
 
-const onResponseError = async (error) => {
+const onResponseError = (error) => {
     stateQuery.remove(error.config);
 
-    if (isLoggedIn() && error.response?.status === 401) {
-        await useSession().destroy(false);
+    if (session.isLoggedIn() && error.response?.status === 401) {
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
         Router.push(`/login?redirect=${url}`);
-    } else if (!isLoggedIn()) {
+    } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
 

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/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,51 +1,30 @@
-function focusFirstInput(input) {
-    input.focus();
-}
+import { getCurrentInstance } from 'vue';
+
 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 vm = getCurrentInstance();
+        if (vm.type.name === 'QForm') {
+            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
+                // TODO: AUTOFOCUS IS NOT FOCUSING
+                const that = this;
+                this.$el.addEventListener('keyup', function (evt) {
+                    if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
+                        const input = evt.target;
+                        if (input.type == 'textarea' && evt.shiftKey) {
+                            evt.preventDefault();
+                            let { selectionStart, selectionEnd } = input;
+                            input.value =
+                                input.value.substring(0, selectionStart) +
+                                '\n' +
+                                input.value.substring(selectionEnd);
+                            selectionStart = selectionEnd = selectionStart + 1;
+                            return;
+                        }
+                        evt.preventDefault();
+                        that.onSubmit();
+                    }
+                });
             }
-            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);
         }
-        form.addEventListener('keyup', function (evt) {
-            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
-                const input = evt.target;
-                if (input.type == 'textarea' && evt.shiftKey) {
-                    evt.preventDefault();
-                    let { selectionStart, selectionEnd } = input;
-                    input.value =
-                        input.value.substring(0, selectionStart) +
-                        '\n' +
-                        input.value.substring(selectionEnd);
-                    selectionStart = selectionEnd = selectionStart + 1;
-                    return;
-                }
-                evt.preventDefault();
-                that.onSubmit();
-            }
-        });
     },
 };

src/boot/quasar.js

@@ -1,18 +1,15 @@
-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';
+import useNotify from 'src/composables/useNotify.js';
+import { CanceledError } from 'axios';
+
+const { notify } = useNotify();
 
 export default boot(({ app }) => {
-    QForm.mixins = [qFormMixin];
-    QLayout.mixins = [mainShortcutMixin];
-
+    app.mixin(qFormMixin);
     app.directive('shortcut', keyShortcut);
-    app.config.errorHandler = async (error) => {
+    app.config.errorHandler = (error) => {
         let message;
         const response = error.response;
         const responseData = response?.data;
@@ -43,12 +40,12 @@ export default boot(({ app }) => {
         }
 
         console.error(error);
-        if (error instanceof axios.CanceledError) {
+        if (error instanceof CanceledError) {
             const env = process.env.NODE_ENV;
             if (env && env !== 'development') return;
             message = 'Duplicate request';
         }
 
-        await useCau(response, message);
+        notify(message ?? 'globals.error', 'negative', 'error');
     };
 });

src/components/CreateNewPostcodeForm.vue

@@ -55,6 +55,13 @@ async function setCountry(countryFk, data) {
 }
 
 // Province
+
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+    if (postcodeFormData.countryFk) {
+        await fetchTowns();
+    }
+}
 async function setProvince(id, data) {
     if (data.provinceFk === id) return;
     const newProvince = provincesOptions.value.find((province) => province.id == id);
@@ -62,7 +69,6 @@ async function setProvince(id, data) {
     postcodeFormData.provinceFk = id;
     await fetchTowns();
 }
-
 async function onProvinceCreated(data) {
     postcodeFormData.provinceFk = data.id;
 }

src/components/CrudModel.vue

@@ -1,6 +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';
@@ -17,7 +17,6 @@ const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
-const $attrs = useAttrs();
 
 const $props = defineProps({
     model: {
@@ -114,11 +113,9 @@ onBeforeRouteLeave((to, from, next) => {
 });
 
 async function fetch(data) {
-    const keyData = $attrs['key-data'];
-    const rows = keyData ? data[keyData] : data;
-    resetData(rows);
-    emit('onFetch', rows);
-    return rows;
+    resetData(data);
+    emit('onFetch', data);
+    return data;
 }
 
 function resetData(data) {
@@ -130,7 +127,7 @@ function resetData(data) {
     originalData.value = JSON.parse(JSON.stringify(data));
     formData.value = JSON.parse(JSON.stringify(data));
 
-    if (watchChanges.value) watchChanges.value(); //destroy watcher
+    if (watchChanges.value) watchChanges.value(); //destoy watcher
     watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
 }
 
@@ -149,7 +146,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        },
+        }
     );
 }
 
@@ -215,7 +212,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)
@@ -273,8 +270,10 @@ function getChanges() {
 
 function isEmpty(obj) {
     if (obj == null) return true;
-    if (Array.isArray(obj)) return !obj.length;
-    return !Object.keys(obj).length;
+    if (obj === undefined) return true;
+    if (Object.keys(obj).length === 0) return true;
+
+    if (obj.length > 0) return false;
 }
 
 async function reload(params) {

src/components/FormModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
-import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
+import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -12,6 +12,7 @@ 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 { useRoute } from 'vue-router';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -198,7 +199,6 @@ async function fetch() {
     } catch (e) {
         state.set(modelValue, {});
         originalData.value = {};
-        throw e;
     }
 }
 

src/components/LeftMenu.vue

@@ -92,13 +92,13 @@ function findMatches(search, item) {
 }
 
 function addChildren(module, route, parent) {
-    const menus = route?.meta?.menu ?? route?.menus?.[props.source]; //backwards compatible
-    if (!menus) return;
+    if (route.menus) {
+        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);
+        }
     }
 }
 
@@ -122,26 +122,16 @@ function getRoutes() {
     if (props.source === 'card') {
         const currentRoute = route.matched[1];
         const currentModule = toLowerCamel(currentRoute.name);
-        let moduleDef = routes.find(
+        const moduleDef = routes.find(
             (route) => toLowerCamel(route.name) === currentModule
         );
 
         if (!moduleDef) return;
-        if (!moduleDef?.menus) moduleDef = betaGetRoutes();
+
         addChildren(currentModule, moduleDef, items.value);
     }
 }
 
-function betaGetRoutes() {
-    let menuRoute;
-    let index = route.matched.length - 1;
-    while (!menuRoute && index > 0) {
-        if (route.matched[index]?.meta?.menu) menuRoute = route.matched[index];
-        index--;
-    }
-    return menuRoute;
-}
-
 async function togglePinned(item, event) {
     if (event.defaultPrevented) return;
     event.preventDefault();
@@ -187,7 +177,6 @@ function normalize(text) {
                         class="full-width"
                         filled
                         dense
-                        autofocus
                     />
                 </QItem>
                 <QSeparator />

src/components/NavBar.vue

@@ -17,10 +17,12 @@ const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
-const pinnedModulesRef = ref();
 
 onMounted(() => stateStore.setMounted());
+
+const pinnedModulesRef = ref();
 </script>
+
 <template>
     <QHeader color="white" elevated>
         <QToolbar class="q-py-sm q-px-md">
@@ -57,13 +59,22 @@ onMounted(() => stateStore.setMounted());
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="xs"
-                data-cy="loading-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>
+                <QBtn
+                    flat
+                    v-if="!quasar.platform.is.mobile"
+                    @click="pinnedModulesRef.redirect($route.params.id)"
+                    icon="more_up"
+                >
+                    <QTooltip>
+                        {{ t('Go to Salix') }}
+                    </QTooltip>
+                </QBtn>
                 <QBtn
                     :class="{ 'q-pa-none': quasar.platform.is.mobile }"
                     id="pinnedModules"
@@ -95,6 +106,7 @@ onMounted(() => stateStore.setMounted());
         <VnBreadcrumbs v-if="$q.screen.lt.md" class="q-ml-md" />
     </QHeader>
 </template>
+
 <style lang="scss" scoped>
 .searchbar {
     width: max-content;
@@ -103,3 +115,9 @@ onMounted(() => stateStore.setMounted());
     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/RegularizeStockForm.vue

@@ -44,7 +44,7 @@ const onDataSaved = (data) => {
     <FormModelPopup
         url-create="Items/regularize"
         model="Items"
-        :title="t('item.regularizeStock')"
+        :title="t('Regularize stock')"
         :form-initial-data="regularizeFormData"
         @on-data-saved="onDataSaved($event)"
     >
@@ -55,7 +55,6 @@ const onDataSaved = (data) => {
                     v-model.number="data.quantity"
                     type="number"
                     autofocus
-                    data-cy="regularizeStockInput"
                 />
             </VnRow>
             <VnRow>

src/components/UserPanel.vue

@@ -1,9 +1,6 @@
 <script setup>
-import quasarLang from 'src/utils/quasarLang';
-
 import { onMounted, computed, ref } from 'vue';
-
-import { Dark } from 'quasar';
+import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
@@ -34,7 +31,14 @@ const userLocale = computed({
 
         value = localeEquivalence[value] ?? value;
 
-        quasarLang(value);
+        try {
+            /* @vite-ignore */
+            import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
+                Quasar.lang.set(lang.default);
+            });
+        } catch (error) {
+            //
+        }
     },
 });
 
@@ -83,10 +87,10 @@ async function saveDarkMode(value) {
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
     try {
-        await axios.patch(query, { lang: value });
-
+        await axios.patch(query, {
+            lang: value,
+        });
         user.value.lang = value;
-        useState().setUser(user.value);
         onDataSaved();
     } catch (error) {
         onDataError();

src/components/VnTable/VnFilter.vue

@@ -32,10 +32,7 @@ const $props = defineProps({
 defineExpose({ addFilter, props: $props });
 
 const model = defineModel(undefined, { required: true });
-const arrayData = useArrayData(
-    $props.dataKey,
-    $props.searchUrl ? { searchUrl: $props.searchUrl } : null
-);
+const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);
 
 const updateEvent = { 'update:modelValue': addFilter };

src/components/VnTable/VnTable.vue

@@ -1,21 +1,20 @@
 <script setup>
-import { ref, onBeforeMount, onMounted, computed, watch, useAttrs } from 'vue';
+import { ref, onBeforeMount, onMounted, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
-import { useFilterParams } from 'src/composables/useFilterParams';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
-import VnTableFilter from './VnTableFilter.vue';
 
 const $props = defineProps({
     columns: {
@@ -34,10 +33,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    rightSearchIcon: {
-        type: Boolean,
-        default: true,
-    },
     rowClick: {
         type: [Function, Boolean],
         default: null,
@@ -59,8 +54,8 @@ const $props = defineProps({
         default: true,
     },
     bottom: {
-        type: Boolean,
-        default: false,
+        type: Object,
+        default: null,
     },
     cardClass: {
         type: String,
@@ -106,6 +101,10 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    chipLocale: {
+        type: String,
+        default: null,
+    },
     footer: {
         type: Boolean,
         default: false,
@@ -120,21 +119,22 @@ const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
-const $attrs = useAttrs();
 
 const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
 const mode = ref(CARD_MODE);
 const selected = ref([]);
 const hasParams = ref(false);
+const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
+const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
+const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);
 const tableRef = ref();
-const params = ref(useFilterParams($attrs['data-key']).params);
-const orders = ref(useFilterParams($attrs['data-key']).orders);
 
 const tableModes = [
     {
@@ -150,7 +150,6 @@ const tableModes = [
         disable: $props.disableOption?.card,
     },
 ];
-
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -181,11 +180,44 @@ onMounted(() => {
 watch(
     () => $props.columns,
     (value) => splitColumns(value),
-    { immediate: true },
+    { immediate: true }
+);
+
+watch(
+    () => route.query[$props.searchUrl],
+    (val) => setUserParams(val),
+    { immediate: true, deep: true }
 );
 
 const isTableMode = computed(() => mode.value == TABLE_MODE);
-const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
+
+function setUserParams(watchedParams, watchedOrder) {
+    if (!watchedParams) return;
+
+    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    const filter =
+        typeof watchedParams?.filter == 'string'
+            ? JSON.parse(watchedParams?.filter ?? '{}')
+            : watchedParams?.filter;
+    const where = filter?.where;
+    const order = watchedOrder ?? filter?.order;
+
+    watchedParams = { ...watchedParams, ...where };
+    delete watchedParams.filter;
+    delete params.value?.filter;
+    params.value = { ...params.value, ...sanitizer(watchedParams) };
+    orders.value = parseOrder(order);
+}
+
+function sanitizer(params) {
+    for (const [key, value] of Object.entries(params)) {
+        if (value && typeof value == 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
+    }
+    return params;
+}
 
 function splitColumns(columns) {
     splittedColumns.value = {
@@ -212,7 +244,7 @@ function splitColumns(columns) {
     // Status column
     if (splittedColumns.value.chips.length) {
         splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
-            (c) => !c.isId,
+            (c) => !c.isId
         );
         if (splittedColumns.value.columnChips.length)
             splittedColumns.value.columns.unshift({
@@ -266,6 +298,17 @@ function getColAlign(col) {
     return 'text-' + (col.align ?? 'left');
 }
 
+function parseOrder(urlOrders) {
+    const orderObject = {};
+    if (!urlOrders) return orderObject;
+    if (typeof urlOrders == 'string') urlOrders = [urlOrders];
+    for (const [index, orders] of urlOrders.entries()) {
+        const [name, direction] = orders.split(' ');
+        orderObject[name] = { direction, index: index + 1 };
+    }
+    return orderObject;
+}
+
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     create: createForm,
@@ -314,19 +357,61 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter
+            <VnFilterPanel
                 :data-key="$attrs['data-key']"
-                :columns="columns"
-                :redirect="redirect"
+                :search-button="true"
+                v-model="params"
+                :search-url="searchUrl"
+                :redirect="!!redirect"
+                @set-user-params="setUserParams"
+                :disable-submit-event="true"
+                @remove="
+                    (key) =>
+                        tableFilterRef
+                            .find((f) => f.props?.column.name == key)
+                            ?.addFilter()
+                "
             >
-                <template
-                    v-for="(_, slotName) in $slots"
-                    #[slotName]="slotData"
-                    :key="slotName"
-                >
-                    <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+                <template #body>
+                    <div
+                        class="row no-wrap flex-center"
+                        v-for="col of splittedColumns.columns.filter(
+                            (c) => c.columnFilter ?? true
+                        )"
+                        :key="col.id"
+                    >
+                        <VnFilter
+                            ref="tableFilterRef"
+                            :column="col"
+                            :data-key="$attrs['data-key']"
+                            v-model="params[columnName(col)]"
+                            :search-url="searchUrl"
+                        />
+                        <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="false"
+                        />
+                    </div>
+                    <slot
+                        name="moreFilterPanel"
+                        :params="params"
+                        :columns="splittedColumns.columns"
+                    />
                 </template>
-            </VnTableFilter>
+                <template #tags="{ tag, formatFn }" v-if="chipLocale">
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                        <span>{{ formatFn(tag.value) }}</span>
+                    </div>
+                </template>
+            </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
     <CrudModel
@@ -382,7 +467,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         :options="tableModes.filter((mode) => !mode.disable)"
                     />
                     <QBtn
-                        v-if="showRightIcon"
+                        v-if="$props.rightSearch"
                         icon="filter_alt"
                         class="bg-vn-section-color q-ml-sm"
                         dense
@@ -396,7 +481,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         :class="col.headerClass"
                     >
                         <div
-                            class="column ellipsis"
+                            class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
                             :style="$props.columnSearch ? 'height: 75px' : ''"
                         >
@@ -438,7 +523,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                     <!-- Columns -->
                     <QTd
                         auto-width
-                        class="no-margin"
+                        class="no-margin q-px-xs"
                         :class="[getColAlign(col), col.columnClass]"
                         :style="col.style"
                         v-if="col.visible ?? true"
@@ -484,14 +569,35 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                 btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
                             :style="`visibility: ${
-                                ((btn.show && btn.show(row)) ?? true)
-                                    ? 'visible'
-                                    : 'hidden'
+                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                             }`"
                             @click="btn.action(row)"
                         />
                     </QTd>
                 </template>
+                <template #bottom v-if="bottom">
+                    <slot name="bottom-table">
+                        <QBtn
+                            @click="
+                                () =>
+                                    createAsDialog
+                                        ? (showForm = !showForm)
+                                        : handleOnDataSaved(create)
+                            "
+                            class="cursor-pointer fill-icon"
+                            color="primary"
+                            icon="add_circle"
+                            size="md"
+                            round
+                            flat
+                            shortcut="+"
+                            :disabled="!disabledAttr"
+                        />
+                        <QTooltip>
+                            {{ createForm.title }}
+                        </QTooltip>
+                    </slot>
+                </template>
                 <template #item="{ row, colsMap }">
                     <component
                         :is="$props.redirect ? 'router-link' : 'span'"
@@ -506,7 +612,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                     $props.rowClick && $props.rowClick(row);
                                 }
                             "
-                            style="height: 100%"
                         >
                             <QCardSection
                                 vertical
@@ -552,7 +657,13 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                         :key="col.name"
                                         class="fields"
                                     >
-                                        <VnLv :label="col.label + ':'">
+                                        <VnLv
+                                            :label="
+                                                !col.component && col.label
+                                                    ? `${col.label}:`
+                                                    : ''
+                                            "
+                                        >
                                             <template #value>
                                                 <span
                                                     @click="stopEventPropagation($event)"
@@ -616,27 +727,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                     </QTr>
                 </template>
             </QTable>
-            <div class="full-width bottomButton" v-if="bottom">
-                <QBtn
-                    @click="
-                        () =>
-                            createAsDialog
-                                ? (showForm = !showForm)
-                                : handleOnDataSaved(create)
-                    "
-                    class="cursor-pointer fill-icon"
-                    color="primary"
-                    icon="add_circle"
-                    size="md"
-                    round
-                    flat
-                    shortcut="+"
-                    :disabled="!disabledAttr"
-                />
-                <QTooltip>
-                    {{ createForm.title }}
-                </QTooltip>
-            </div>
         </template>
     </CrudModel>
     <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
@@ -714,7 +804,7 @@ es:
 
 .grid-three {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
+    grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
     max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;
@@ -763,6 +853,21 @@ es:
         top: 0;
         padding: 12px 0;
     }
+    tbody {
+        .q-checkbox {
+            display: flex;
+            margin-bottom: 9px;
+            & .q-checkbox__label {
+                margin-left: 31px;
+                color: var(--vn-text-color);
+            }
+            & .q-checkbox__inner {
+                position: absolute;
+                left: 0;
+                color: var(--vn-label-color);
+            }
+        }
+    }
     .sticky {
         position: sticky;
         right: 0;

src/components/VnTable/VnTableFilter.vue

@@ -1,69 +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">
-        <template #body="{ params, orders }">
-            <div
-                class="row no-wrap flex-center"
-                v-for="col of columns.filter((c) => c.columnFilter ?? true)"
-                :key="col.id"
-            >
-                <VnFilter
-                    ref="tableFilterRef"
-                    :column="col"
-                    :data-key="$attrs['data-key']"
-                    v-model="params[columnName(col)]"
-                    :search-url="searchUrl"
-                />
-                <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>
-            <slot
-                name="moreFilterPanel"
-                :params="params"
-                :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>

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

@@ -1,121 +0,0 @@
-import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnVisibleColumn from '../VnVisibleColumn.vue';
-import { axios } from 'app/test/vitest/helper';
-
-describe('VnVisibleColumns', () => {
-    let wrapper;
-    let vm;
-
-    beforeEach(() => {
-        wrapper = createWrapper(VnVisibleColumn, {
-            propsData: {
-                tableCode: 'testTable',
-                skip: ['skippedColumn'],
-            },
-        });
-        vm = wrapper.vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('setUserConfigViewData()', () => {
-        it('should initialize localColumns with visible configuration', () => {
-            vm.columns = [
-                { name: 'columnMockName', label: undefined },
-                { name: 'columnMockAddress', label: undefined },
-                { name: 'columnMockId', label: undefined },
-            ];
-            const configuration = {
-                columnMockName: true,
-                columnMockAddress: false,
-                columnMockId: true,
-            };
-            const expectedColumns = [
-                { name: 'columnMockName', label: undefined, visible: true },
-                { name: 'columnMockAddress', label: undefined, visible: false },
-                { name: 'columnMockId', label: undefined, visible: true },
-            ];
-
-            vm.setUserConfigViewData(configuration, false);
-
-            expect(vm.localColumns).toEqual(expectedColumns);
-        });
-
-        it('should skip columns based on props', () => {
-            vm.columns = [
-                { name: 'columnMockName', label: undefined },
-                { name: 'columnMockId', label: undefined },
-                { name: 'skippedColumn', label: 'Skipped Column' },
-            ];
-            const configuration = {
-                columnMockName: true,
-                skippedColumn: false,
-                columnMockId: true,
-            };
-            const expectedColumns = [
-                { name: 'columnMockName', label: undefined, visible: true },
-                { name: 'columnMockId', label: undefined, visible: true },
-            ];
-
-            vm.setUserConfigViewData(configuration, false);
-
-            expect(vm.localColumns).toEqual(expectedColumns);
-        });
-    });
-
-    describe('toggleMarkAll()', () => {
-        it('should set all localColumns to visible=true', () => {
-            vm.localColumns = [
-                { name: 'columnMockName', visible: false },
-                { name: 'columnMockId', visible: false },
-            ];
-
-            vm.toggleMarkAll(true);
-
-            expect(vm.localColumns.every((col) => col.visible)).toBe(true);
-        });
-
-        it('should set all localColumns to visible=false', () => {
-            vm.localColumns = [
-                { name: 'columnMockName', visible: true },
-                { name: 'columnMockId', visible: true },
-            ];
-
-            vm.toggleMarkAll(false);
-
-            expect(vm.localColumns.every((col) => col.visible)).toBe(false);
-        });
-    });
-
-    describe('saveConfig()', () => {
-        it('should call setUserConfigViewData and axios.post with correct params', async () => {
-            const mockAxiosPost = vi.spyOn(axios, 'post').mockResolvedValue({
-                data: [{ id: 1 }],
-            });
-
-            vm.localColumns = [
-                { name: 'columnMockName', visible: true },
-                { name: 'columnMockId', visible: false },
-            ];
-
-            await vm.saveConfig();
-
-            expect(mockAxiosPost).toHaveBeenCalledWith('UserConfigViews/crud', {
-                creates: [
-                    {
-                        userFk: vm.user.id,
-                        tableCode: vm.tableCode,
-                        tableConfig: vm.tableCode,
-                        configuration: {
-                            columnMockName: true,
-                            columnMockId: false,
-                        },
-                    },
-                ],
-            });
-        });
-    });
-});

src/components/__tests__/CrudModel.spec.js

@@ -1,248 +0,0 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import CrudModel from 'components/CrudModel.vue';
-import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
-
-describe('CrudModel', () => {
-    let wrapper;
-    let vm;
-    let data;
-    beforeAll(() => {
-        wrapper = createWrapper(CrudModel, {
-            global: {
-                stubs: [
-                    'vnPaginate',
-                    'useState',
-                    'arrayData',
-                    'useStateStore',
-                    'vue-i18n',
-                ],
-                mocks: {
-                    validate: vi.fn(),
-                },
-            },
-            propsData: {
-                dataRequired: {
-                    fk: 1,
-                },
-                dataKey: 'crudModelKey',
-                model: 'crudModel',
-                url: 'crudModelUrl',
-                saveFn: '',
-            },
-        });
-        wrapper=wrapper.wrapper;
-        vm=wrapper.vm;
-    });
-
-    beforeEach(() => {
-        vm.fetch([]);
-        vm.watchChanges = null;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('insert()', () => {
-        it('should new element in list with index 0 if formData not has data', () => {
-            vm.insert();
-
-            expect(vm.formData.length).toEqual(1);
-            expect(vm.formData[0].fk).toEqual(1);
-            expect(vm.formData[0].$index).toEqual(0);
-        });
-    });
-
-    describe('getChanges()', () => {
-        it('should return correct updates and creates', async () => {
-            vm.fetch([
-                { id: 1, name: 'New name one' },
-                { id: 2, name: 'New name two' },
-                { id: 3, name: 'Bruce Wayne' },
-            ]);
-
-            vm.originalData = [
-                { id: 1, name: 'Tony Starks' },
-                { id: 2, name: 'Jessica Jones' },
-                { id: 3, name: 'Bruce Wayne' },
-            ];
-
-            vm.insert();
-            const result = vm.getChanges();
-
-            const expected = {
-                creates: [
-                    {
-                        $index: 3,
-                        fk: 1,
-                    },
-                ],
-                updates: [
-                    {
-                        data: {
-                            name: 'New name one',
-                        },
-                        where: {
-                            id: 1,
-                        },
-                    },
-                    {
-                        data: {
-                            name: 'New name two',
-                        },
-                        where: {
-                            id: 2,
-                        },
-                    },
-                ],
-            };
-
-            expect(result).toEqual(expected);
-        });
-    });
-
-    describe('getDifferences()', () => {
-        it('should return the differences between two objects', async () => {
-            const obj1 = {
-                a: 1,
-                b: 2,
-                c: 3,
-            };
-            const obj2 = {
-                a: null,
-                b: 4,
-                d: 5,
-            };
-
-            const result = vm.getDifferences(obj1, obj2);
-
-            expect(result).toEqual({
-                a: null,
-                b: 4,
-                d: 5,
-            });
-        });
-    });
-
-    describe('isEmpty()', () => {
-        let dummyObj;
-        let dummyArray;
-        let result;
-        it('should return true if object si null', async () => {
-            dummyObj = null;
-            result = vm.isEmpty(dummyObj);
-
-            expect(result).toBe(true);
-        });
-
-        it('should return true if object si undefined', async () => {
-            dummyObj = undefined;
-            result = vm.isEmpty(dummyObj);
-
-            expect(result).toBe(true);
-        });
-
-        it('should return true if object is empty', async () => {
-            dummyObj ={};
-            result = vm.isEmpty(dummyObj);    
-
-            expect(result).toBe(true);
-        });
-
-        it('should return false if object is not empty', async () => {
-            dummyObj = {a:1, b:2, c:3};
-            result = vm.isEmpty(dummyObj);
-
-            expect(result).toBe(false);
-        });
-
-        it('should return true if array is empty', async () => {
-            dummyArray = [];
-            result = vm.isEmpty(dummyArray); 
-
-            expect(result).toBe(true);
-        });
-        
-        it('should return false if array is not empty', async () => {
-            dummyArray = [1,2,3];
-            result = vm.isEmpty(dummyArray);
-
-            expect(result).toBe(false);
-        })
-    });
-
-    describe('resetData()', () => {
-        it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
-            data = [{
-                name: 'Tony',
-                lastName: 'Stark',
-                age: 42,
-            }];
-
-            vm.resetData(data);
-            
-            expect(vm.originalData).toEqual(data);
-            expect(vm.originalData[0].$index).toEqual(0);
-            expect(vm.formData).toEqual(data);
-            expect(vm.formData[0].$index).toEqual(0);
-            expect(vm.watchChanges).not.toBeNull();
-        });
-
-        it('should dont do nothing if data is null', async () => {
-            vm.resetData(null);
-
-            expect(vm.watchChanges).toBeNull();
-        });
-
-        it('should set originalData and formatData with data and generate watchChanges', async () => {
-            data = {
-                name: 'Tony',
-                lastName: 'Stark',
-                age: 42,
-            };
-            
-            vm.resetData(data);
-
-            expect(vm.originalData).toEqual(data);
-            expect(vm.formData).toEqual(data);
-            expect(vm.watchChanges).not.toBeNull();
-        });
-    });
-
-    describe('saveChanges()', () => {
-        data = [{
-            name: 'Tony',
-            lastName: 'Stark',
-            age: 42,
-        }];
-
-        it('should call saveFn if exists', async () => {
-            await wrapper.setProps({ saveFn: vi.fn() });
-
-            vm.saveChanges(data);
-            
-            expect(vm.saveFn).toHaveBeenCalledOnce();
-            expect(vm.isLoading).toBe(false);
-            expect(vm.hasChanges).toBe(false);
-
-            await wrapper.setProps({ saveFn: '' });
-        });
-
-        it("should use default url if there's not saveFn", async () => {
-            const postMock =vi.spyOn(axios, 'post');
-            
-            vm.formData = [{
-                name: 'Bruce',
-                lastName: 'Wayne',
-                age: 45,
-            }]
-
-            await vm.saveChanges(data);
-
-            expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
-            expect(vm.isLoading).toBe(false);
-            expect(vm.hasChanges).toBe(false);
-            expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
-        });
-    });
-});

src/components/__tests__/EditTableCellValueForm.spec.js

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

src/components/__tests__/FilterItemForm.spec.js

@@ -1,82 +0,0 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import FilterItemForm from 'src/components/FilterItemForm.vue';
-import { vi, beforeAll, describe, expect, it } from 'vitest';
-
-describe('FilterItemForm', () => {
-    let vm;
-    let wrapper;
-
-    beforeAll(() => {
-        wrapper = createWrapper(FilterItemForm, {
-            props: {
-                url: 'Items/withName',
-            },
-        });
-        vm = wrapper.vm;
-        wrapper = wrapper.wrapper;
-
-        vi.spyOn(axios, 'get').mockResolvedValue({
-            data: [
-                {
-                    id: 999996,
-                    name: 'bolas de madera',
-                    size: 2,
-                    inkFk: null,
-                    producerFk: null,
-                },
-            ],
-        });
-    });
-
-    it('should filter data and populate tableRows for table display', async () => {
-        vm.itemFilterParams.name = 'bolas de madera';
-
-        await vm.onSubmit();
-
-        const expectedFilter = {
-            include: [
-                { relation: 'producer', scope: { fields: ['name'] } },
-                { relation: 'ink', scope: { fields: ['name'] } },
-            ],
-            where: {"name":{"like":"%bolas de madera%"}},
-        };
-        
-        expect(axios.get).toHaveBeenCalledWith('Items/withName', {
-            params: { filter: JSON.stringify(expectedFilter) },
-        });
-
-        expect(vm.tableRows).toEqual([
-            {
-                id: 999996,
-                name: 'bolas de madera',
-                size: 2,
-                inkFk: null,
-                producerFk: null,
-            },
-        ]);
-    });
-
-    it('should handle an empty itemFilterParams correctly', async () => {
-        vm.itemFilterParams.name = null;
-        vm.itemFilterParams = {};
-
-        await vm.onSubmit();
-
-        const expectedFilter = {
-            include: [
-                { relation: 'producer', scope: { fields: ['name'] } },
-                { relation: 'ink', scope: { fields: ['name'] } },
-            ],
-            where: {},
-        };
-
-        expect(axios.get).toHaveBeenCalledWith('Items/withName', {
-            params: { filter: JSON.stringify(expectedFilter) },
-        });
-    });
-
-    it('should emit "itemSelected" with the correct id and close the form', () => {
-        vm.selectItem({ id: 12345 });
-        expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
-    });
-});

src/components/__tests__/FormModel.spec.js

@@ -1,149 +0,0 @@
-import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import FormModel from 'src/components/FormModel.vue';
-
-describe('FormModel', () => {
-    const model = 'mockModel';
-    const url = 'mockUrl';
-    const formInitialData = { mockKey: 'mockVal' };
-
-    describe('modelValue', () => {
-        it('should use the provided model', () => {
-            const { vm } = mount({ propsData: { model } });
-            expect(vm.modelValue).toBe(model);
-        });
-
-        it('should use the route meta title when model is not provided', () => {
-            const { vm } = mount({});
-            expect(vm.modelValue).toBe('formModel_mockTitle');
-        });
-    });
-
-    describe('onMounted()', () => {
-        let mockGet;
-
-        beforeAll(() => {
-            mockGet = vi.spyOn(axios, 'get').mockResolvedValue({ data: {} });
-        });
-
-        afterAll(() => {
-            mockGet.mockRestore();
-        });
-
-        it('should not fetch when has formInitialData', () => {
-            mount({ propsData: { url, model, autoLoad: true, formInitialData } });
-            expect(mockGet).not.toHaveBeenCalled();
-        });
-
-        it('should fetch when there is url and auto-load', () => {
-            mount({ propsData: { url, model, autoLoad: true } });
-            expect(mockGet).toHaveBeenCalled();
-        });
-
-        it('should not observe changes', () => {
-            const { vm } = mount({
-                propsData: { url, model, observeFormChanges: false, formInitialData },
-            });
-
-            expect(vm.hasChanges).toBe(true);
-            vm.reset();
-            expect(vm.hasChanges).toBe(true);
-        });
-
-        it('should observe changes', async () => {
-            const { vm } = mount({
-                propsData: { url, model, formInitialData },
-            });
-            vm.state.set(model, formInitialData);
-            expect(vm.hasChanges).toBe(false);
-
-            vm.formData.mockKey = 'newVal';
-            await vm.$nextTick();
-            expect(vm.hasChanges).toBe(true);
-            vm.formData.mockKey = 'mockVal';
-        });
-    });
-
-    describe('trimData()', () => {
-        let vm;
-        beforeAll(() => {
-            vm = mount({}).vm;
-        });
-
-        it('should trim whitespace from string values', () => {
-            const data = { key1: '  value1  ', key2: '  value2  ' };
-            const trimmedData = vm.trimData(data);
-            expect(trimmedData).toEqual({ key1: 'value1', key2: 'value2' });
-        });
-
-        it('should not modify non-string values', () => {
-            const data = { key1: 123, key2: true, key3: null, key4: undefined };
-            const trimmedData = vm.trimData(data);
-            expect(trimmedData).toEqual(data);
-        });
-    });
-
-    describe('save()', async () => {
-        it('should not call if there are not changes', async () => {
-            const { vm } = mount({ propsData: { url, model } });
-
-            await vm.save();
-            expect(vm.hasChanges).toBe(false);
-        });
-
-        it('should call axios.patch with the right data', async () => {
-            const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-            const { vm } = mount({ propsData: { url, model, formInitialData } });
-            vm.formData.mockKey = 'newVal';
-            await vm.$nextTick();
-            await vm.save();
-            expect(spy).toHaveBeenCalled();
-            vm.formData.mockKey = 'mockVal';
-        });
-
-        it('should call axios.post with the right data', async () => {
-            const spy = vi.spyOn(axios, 'post').mockResolvedValue({ data: {} });
-            const { vm } = mount({
-                propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
-            });
-            vm.formData.mockKey = 'newVal';
-            await vm.$nextTick();
-            await vm.save();
-            expect(spy).toHaveBeenCalled();
-            vm.formData.mockKey = 'mockVal';
-        });
-
-        it('should use the saveFn', async () => {
-            const { vm } = mount({
-                propsData: { url, model, formInitialData, saveFn: () => {} },
-            });
-            const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-            const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
-
-            vm.formData.mockKey = 'newVal';
-            await vm.$nextTick();
-            await vm.save();
-            expect(spyPatch).not.toHaveBeenCalled();
-            expect(spySaveFn).toHaveBeenCalled();
-            vm.formData.mockKey = 'mockVal';
-        });
-
-        it('should reload the data after save', async () => {
-            const { vm } = mount({
-                propsData: { url, model, formInitialData, reload: true },
-            });
-            vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-
-            vm.formData.mockKey = 'newVal';
-            await vm.$nextTick();
-            await vm.save();
-            vm.formData.mockKey = 'mockVal';
-        });
-    });
-});
-
-function mount({ propsData = {} }) {
-    return createWrapper(FormModel, {
-        propsData,
-    });
-}

src/components/common/RightAdvancedMenu.vue

@@ -1,53 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-import { useHasContent } from 'src/composables/useHasContent';
-import { watch } from 'vue';
-
-const { t } = useI18n();
-const stateStore = useStateStore();
-const hasContent = useHasContent('#advanced-menu');
-
-const $props = defineProps({
-    isMainSection: {
-        type: Boolean,
-        default: false,
-    },
-});
-
-watch(
-    () => $props.isMainSection,
-    (val) => {
-        if (stateStore) stateStore.rightAdvancedDrawer = val;
-    },
-    { immediate: true },
-);
-</script>
-<template>
-    <Teleport to="#searchbar-after" v-if="stateStore.isHeaderMounted()">
-        <QBtn
-            v-if="hasContent || $slots['advanced-menu']"
-            flat
-            @click="stateStore.toggleRightAdvancedDrawer()"
-            round
-            icon="tune"
-            color="white"
-        >
-            <QTooltip bottom anchor="bottom right">
-                {{ t('globals.advancedMenu') }}
-            </QTooltip>
-        </QBtn>
-    </Teleport>
-    <QDrawer
-        v-model="stateStore.rightAdvancedDrawer"
-        side="right"
-        :width="256"
-        :overlay="!isMainSection"
-        v-bind="$attrs"
-    >
-        <QScrollArea class="fit">
-            <div id="advanced-menu"></div>
-            <slot v-if="!hasContent" name="advanced-menu" />
-        </QScrollArea>
-    </QDrawer>
-</template>

src/components/common/RightMenu.vue

@@ -1,23 +1,35 @@
 <script setup>
-import { onMounted, useSlots } from 'vue';
+import { ref, onMounted, useSlots } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-import { useQuasar } from 'quasar';
-import { useHasContent } from 'src/composables/useHasContent';
 
-const { t } = useI18n();
-const quasar = useQuasar();
-const stateStore = useStateStore();
 const slots = useSlots();
-const hasContent = useHasContent('#right-panel');
+const hasContent = ref(false);
+const rightPanel = ref(null);
 
 onMounted(() => {
-    if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
-        stateStore.rightDrawer = false;
+    rightPanel.value = document.querySelector('#right-panel');
+    if (!rightPanel.value) return;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(() => {
+        hasContent.value = rightPanel.value.childNodes.length;
+    });
+
+    observer.observe(rightPanel.value, {
+        subtree: true,
+        childList: true,
+        attributes: true,
+    });
+
+    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
 });
+
+const { t } = useI18n();
+const stateStore = useStateStore();
 </script>
 <template>
-    <Teleport to="#actions-prepend" v-if="stateStore.isHeaderMounted()">
+    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"
@@ -33,7 +45,7 @@ onMounted(() => {
             </QBtn>
         </div>
     </Teleport>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256">
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit">
             <div id="right-panel"></div>
             <slot v-if="!hasContent" name="right-panel" />

src/components/common/VnBreadcrumbs.vue

@@ -15,7 +15,7 @@ let root = ref(null);
 
 watchEffect(() => {
     matched.value = currentRoute.value.matched.filter(
-        (matched) => !!matched?.meta?.title || !!matched?.meta?.icon
+        (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
     if (!matched.value[0]) return;

src/components/common/VnBtnSelect.vue

@@ -14,7 +14,6 @@ defineProps({
             hide-dropdown-icon
             focus-on-mount
             @update:model-value="promise"
-            data-cy="vnBtnSelect_select"
         />
     </QBtnDropdown>
 </template>

src/components/common/VnCardBeta.vue

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

src/components/common/VnChangePassword.vue

@@ -2,9 +2,9 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnRow from '../ui/VnRow.vue';
+import VnInput from './VnInput.vue';
 import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
-import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const props = defineProps({
     submitFn: { type: Function, default: () => {} },
@@ -70,19 +70,19 @@ defineExpose({ show: () => changePassDialog.value.show() });
             </QCardSection>
             <QForm ref="form">
                 <QCardSection>
-                    <VnInputPassword
+                    <VnInput
                         v-if="props.askOldPass"
                         :label="t('Old password')"
                         v-model="passwords.oldPassword"
+                        type="password"
                         :required="true"
-                        :toggle-visibility="true"
                         autofocus
                     />
-                    <VnInputPassword
+                    <VnInput
                         :label="t('New password')"
                         v-model="passwords.newPassword"
+                        type="password"
                         :required="true"
-                        :toggle-visibility="true"
                         :info="
                             t('passwordRequirements', {
                                 length: requirements.length,
@@ -95,10 +95,10 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         autofocus
                     />
 
-                    <VnInputPassword
+                    <VnInput
                         :label="t('Repeat password')"
                         v-model="passwords.repeatPassword"
-                        :toggle-visibility="true"
+                        type="password"
                     />
                 </QCardSection>
             </QForm>

src/components/common/VnDateBadge.vue

@@ -1,39 +0,0 @@
-<script setup>
-import { toDateFormat } from 'src/filters/date.js';
-
-defineProps({ date: { type: [Date, String], required: true } });
-
-function getBadgeAttrs(date) {
-    let today = Date.vnNew();
-    today.setHours(0, 0, 0, 0);
-    let timeTicket = new Date(date);
-    timeTicket.setHours(0, 0, 0, 0);
-
-    let timeDiff = today - timeTicket;
-
-    if (timeDiff == 0) return { color: 'warning', class: 'black-text-color' };
-    if (timeDiff < 0) return { color: 'success', class: 'black-text-color' };
-    return { color: 'transparent', class: 'normal-text-color' };
-}
-
-function formatShippedDate(date) {
-    if (!date) return '-';
-    const dateSplit = date.split('T');
-    const [year, month, day] = dateSplit[0].split('-');
-    const newDate = new Date(year, month - 1, day);
-    return toDateFormat(newDate);
-}
-</script>
-<template>
-    <QBadge v-bind="getBadgeAttrs(date)" class="q-pa-sm" style="font-size: 14px">
-        {{ formatShippedDate(date) }}
-    </QBadge>
-</template>
-<style lang="scss">
-.black-text-color {
-    color: var(--vn-black-text-color);
-}
-.normal-text-color {
-    color: var(--vn-text-color);
-}
-</style>

src/components/common/VnDmsList.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
                 storage: 'dms',
                 collection: null,
                 resolution: null,
-                id: Number(prop.row.file.split('.')[0]),
+                id: prop.row.file.split('.')[0],
                 token: token,
                 class: 'rounded',
                 ratio: 1,
@@ -202,7 +202,7 @@ const columns = computed(() => [
                         prop.row.id,
                         $props.downloadModel,
                         undefined,
-                        prop.row.download,
+                        prop.row.download
                     ),
             },
             {
@@ -297,14 +297,13 @@ defineExpose({
         ref="dmsRef"
         :data-key="$props.model"
         :url="$props.model"
-        :user-filter="dmsFilter"
+        :filter="dmsFilter"
         :order="['dmsFk DESC']"
-        auto-load
+        :auto-load="true"
         @on-fetch="setData"
     >
         <template #body>
             <QTable
-                v-if="rows"
                 :columns="columns"
                 :rows="rows"
                 class="full-width q-mt-md"
@@ -374,7 +373,7 @@ defineExpose({
                                                 v-if="
                                                     shouldRenderButton(
                                                         button.name,
-                                                        props.row.isDocuware,
+                                                        props.row.isDocuware
                                                     )
                                                 "
                                                 :is="button.component"

src/components/common/VnInput.vue

@@ -42,10 +42,6 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
-    uppercase: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const vnInputRef = ref(null);
@@ -75,7 +71,6 @@ const focus = () => {
 
 defineExpose({
     focus,
-    vnInputRef,
 });
 
 const mixinRules = [
@@ -121,10 +116,6 @@ const handleInsertMode = (e) => {
         input.setSelectionRange(cursorPos + 1, cursorPos + 1);
     });
 };
-
-const handleUppercase = () => {
-    value.value = value.value?.toUpperCase() || '';
-};
 </script>
 
 <template>
@@ -143,23 +134,20 @@ const handleUppercase = () => {
             hide-bottom-space
             :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
-            <template #prepend>
+            <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
             <template #append>
                 <QIcon
                     name="close"
                     size="xs"
-                    :style="{
-                        visibility:
-                            hover &&
-                            value &&
-                            !$attrs.disabled &&
-                            !$attrs.readonly &&
-                            $props.clearable
-                                ? 'visible'
-                                : 'hidden',
-                    }"
+                    v-if="
+                        hover &&
+                        value &&
+                        !$attrs.disabled &&
+                        !$attrs.readonly &&
+                        $props.clearable
+                    "
                     @click="
                         () => {
                             value = null;
@@ -168,15 +156,6 @@ const handleUppercase = () => {
                         }
                     "
                 ></QIcon>
-                
-                <QIcon
-                    name="match_case"
-                    size="xs"
-                    v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
-                    @click="handleUppercase"
-                    class="uppercase-icon"
-                />
-                
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
@@ -187,7 +166,6 @@ const handleUppercase = () => {
         </QInput>
     </div>
 </template>
-
 <i18n>
     en:
         inputMin: Must be more than {value}
@@ -197,4 +175,9 @@ const handleUppercase = () => {
         inputMin: Debe ser mayor a {value}
         maxLength: El valor excede los {value} carácteres
         inputMax: Debe ser menor a {value}
-</i18n>
+</i18n>
+<style lang="scss">
+.q-field__append {
+    padding-inline: 0;
+}
+</style>

src/components/common/VnInputDate.vue

@@ -1,12 +1,14 @@
 <script setup>
 import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
+import { useI18n } from 'vue-i18n';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
 const model = defineModel({ type: [String, Date] });
+const { t } = useI18n();
 
 const $props = defineProps({
     isOutlined: {
@@ -104,8 +106,7 @@ const manageDate = (date) => {
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
-            @click="isPopupOpen = !isPopupOpen"
-            @keydown="isPopupOpen = false"
+            @click="isPopupOpen = true"
             hide-bottom-space
         >
             <template #append>
@@ -124,6 +125,13 @@ const manageDate = (date) => {
                         isPopupOpen = false;
                     "
                 />
+                <QIcon
+                    v-if="showEvent"
+                    name="event"
+                    class="cursor-pointer"
+                    @click="isPopupOpen = !isPopupOpen"
+                    :title="t('Open date')"
+                />
             </template>
             <QMenu
                 v-if="$q.screen.gt.xs"
@@ -143,6 +151,15 @@ const manageDate = (date) => {
         </QInput>
     </div>
 </template>
+<style lang="scss">
+.vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
+    border-bottom-style: solid;
+}
+
+.vn-input-date.q-field--outlined.q-field--readonly .q-field__control:before {
+    border-style: solid;
+}
+</style>
 <i18n>
     es:
         Open date: Abrir fecha

src/components/common/VnInputNumber.vue

@@ -1,28 +1,13 @@
 <script setup>
 import VnInput from 'src/components/common/VnInput.vue';
-
-defineProps({
-    step: { type: Number, default: 0.01 },
-    decimalPlaces: { type: Number, default: 2 },
-    positive: { type: Boolean, default: true },
-});
+import { ref } from 'vue';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [Number, String] });
+const $attrs = useAttrs();
+const step = ref($attrs.step || 0.01);
 </script>
+
 <template>
-    <VnInput
-        v-bind="$attrs"
-        v-model.number="model"
-        type="number"
-        :step="step"
-        @input="
-            (evt) => {
-                const val = evt.target.value;
-                if (positive && val < 0) return (model = 0);
-                const [, decimal] = val.split('.');
-                if (val && decimal?.length > decimalPlaces)
-                    model = parseFloat(val).toFixed(decimalPlaces);
-            }
-        "
-    />
+    <VnInput v-bind="$attrs" v-model.number="model" type="number" :step="step" />
 </template>

src/components/common/VnInputPassword.vue

@@ -1,31 +0,0 @@
-<script setup>
-import VnInput from 'src/components/common/VnInput.vue';
-import { ref } from 'vue';
-
-const model = defineModel({ type: [Number, String] });
-const $props = defineProps({
-    toggleVisibility: {
-        type: Boolean,
-        default: false,
-    },
-});
-
-const showPassword = ref(false);
-</script>
-<template>
-    <VnInput
-        v-bind="{ ...$attrs }"
-        v-model="model"
-        :type="
-            $props.toggleVisibility ? (showPassword ? 'text' : 'password') : $attrs.type
-        "
-    >
-        <template #append v-if="toggleVisibility">
-            <QIcon
-                :name="showPassword ? 'visibility_off' : 'visibility'"
-                class="cursor-pointer"
-                @click="showPassword = !showPassword"
-            />
-        </template>
-    </VnInput>
-</template>

src/components/common/VnInputTime.vue

@@ -1,11 +1,13 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import VnTime from './VnTime.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
+const { t } = useI18n();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
@@ -78,8 +80,7 @@ function dateToTime(newDate) {
             :class="{ required: isRequired }"
             style="min-width: 100px"
             :rules="mixinRules"
-            @click="isPopupOpen = !isPopupOpen"
-            @keydown="isPopupOpen = false"
+            @click="isPopupOpen = false"
             type="time"
             hide-bottom-space
         >
@@ -99,6 +100,12 @@ function dateToTime(newDate) {
                         isPopupOpen = false;
                     "
                 />
+                <QIcon
+                    name="Schedule"
+                    class="cursor-pointer"
+                    @click="isPopupOpen = !isPopupOpen"
+                    :title="t('Open time')"
+                />
             </template>
             <QMenu
                 v-if="$q.screen.gt.xs"

src/components/common/VnLocation.vue

@@ -2,7 +2,7 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-import { ref, watch } from 'vue';
+import { computed } from 'vue';
 import { useAttrs } from 'vue';
 import { useRequired } from 'src/composables/useRequired';
 const { t } = useI18n();
@@ -16,14 +16,6 @@ const props = defineProps({
     },
 });
 
-watch(
-    () => props.location,
-    (newValue) => {
-        if (!modelValue.value) return;
-        modelValue.value = formatLocation(newValue) ?? null;
-    }
-);
-
 const mixinRules = [requiredFieldRule];
 const locationProperties = [
     'postcode',
@@ -34,7 +26,7 @@ const locationProperties = [
     (obj) => obj.country?.name,
 ];
 
-const formatLocation = (obj, properties = locationProperties) => {
+const formatLocation = (obj, properties) => {
     const parts = properties.map((prop) => {
         if (typeof prop === 'string') {
             return obj[prop];
@@ -51,7 +43,9 @@ const formatLocation = (obj, properties = locationProperties) => {
     return filteredParts.join(', ');
 };
 
-const modelValue = ref(props.location ? formatLocation(props.location) : null);
+const modelValue = computed(() =>
+    props.location ? formatLocation(props.location, locationProperties) : null
+);
 
 function showLabel(data) {
     const dataProperties = [

src/components/common/VnLog.vue

@@ -15,7 +15,6 @@ import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
-import RightMenu from './RightMenu.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -131,7 +130,7 @@ const actionsIcon = {
 };
 const validDate = new RegExp(
     /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source +
-        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source,
+        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
 );
 
 function castJsonValue(value) {
@@ -193,7 +192,7 @@ function getLogTree(data) {
                     user: log.user,
                     userFk: log.userFk,
                     logs: [],
-                }),
+                })
             );
         }
         // Model
@@ -211,7 +210,7 @@ function getLogTree(data) {
                     id: log.changedModelId,
                     showValue: log.changedModelValue,
                     logs: [],
-                }),
+                })
             );
             nLogs = 0;
         }
@@ -239,7 +238,6 @@ async function openPointRecord(id, modelLog) {
     pointRecord.value = parseProps(propNames, locale, data);
 }
 async function setLogTree(data) {
-    if (!data) return;
     logTree.value = getLogTree(data);
 }
 
@@ -283,7 +281,7 @@ function setDate(type) {
     to = date.adjustDate(
         to,
         { hour: 21, minute: 59, second: 59, millisecond: 999 },
-        true,
+        true
     );
 
     switch (type) {
@@ -366,7 +364,7 @@ async function clearFilter() {
     dateTo.value = undefined;
     userRadio.value = undefined;
     Object.keys(checkboxOptions.value).forEach(
-        (opt) => (checkboxOptions.value[opt].selected = false),
+        (opt) => (checkboxOptions.value[opt].selected = false)
     );
     await applyFilter();
 }
@@ -379,7 +377,7 @@ watch(
     () => router.currentRoute.value.params.id,
     () => {
         applyFilter();
-    },
+    }
 );
 </script>
 <template>
@@ -392,7 +390,7 @@ watch(
                     const changedModel = item.changedModel;
                     return {
                         locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel,
+                            validations[changedModel]?.locale?.name ?? changedModel
                         ),
                         value: changedModel,
                     };
@@ -508,7 +506,7 @@ watch(
                                                 :title="
                                                     date.formatDate(
                                                         log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss',
+                                                        'DD/MM/YYYY hh:mm:ss'
                                                     ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
                                                 "
                                             >
@@ -578,7 +576,7 @@ watch(
                                                         t(
                                                             `actions.${
                                                                 actionsText[log.action]
-                                                            }`,
+                                                            }`
                                                         )
                                                     "
                                                 />
@@ -678,144 +676,139 @@ watch(
             </div>
         </template>
     </VnPaginate>
-    <RightMenu>
-        <template #right-panel>
-            <QList dense>
-                <QSeparator />
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.search')"
-                        v-model="searchInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="() => selectFilter('search')"
-                        @focusout="() => selectFilter('search')"
-                        @clear="() => selectFilter('search')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem>
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+        <QList dense>
+            <QSeparator />
+            <QItem class="q-mt-sm">
+                <QInput
+                    :label="t('globals.search')"
+                    v-model="searchInput"
+                    class="full-width"
+                    clearable
+                    clear-icon="close"
+                    @keyup.enter="() => selectFilter('search')"
+                    @focusout="() => selectFilter('search')"
+                    @clear="() => selectFilter('search')"
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </QItem>
+            <QItem>
+                <VnSelect
+                    class="full-width"
+                    :label="t('globals.entity')"
+                    v-model="selectedFilters.changedModel"
+                    option-label="locale"
+                    option-value="value"
+                    :options="actions"
+                    @update:model-value="selectFilter('action')"
+                    hide-selected
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QOptionGroup
+                    size="sm"
+                    v-model="userRadio"
+                    :options="userTypes"
+                    color="primary"
+                    @update:model-value="selectFilter('userRadio')"
+                    right-label
+                >
+                    <template #label="{ label }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.entity')"
-                        v-model="selectedFilters.changedModel"
-                        option-label="locale"
-                        option-value="value"
-                        :options="actions"
-                        @update:model-value="selectFilter('action')"
+                        :label="t('globals.user')"
+                        v-model="userSelect"
+                        option-label="name"
+                        option-value="id"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :fields="['id', 'nickname', 'name', 'image']"
+                        sort-by="nickname"
+                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
                     >
-                        <template #label="{ label }">
-                            {{ t(`Users.${label}`) }}
+                        <template #option="{ opt, itemProps }">
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItemSection class="col-3 items-center">
+                                    <VnAvatar :worker-id="opt.id" />
+                                </QItemSection>
+                                <QItemSection class="col-9 justify-center">
+                                    <span>{{ opt.name }}</span>
+                                    <span class="text-grey">{{ opt.nickname }}</span>
+                                </QItemSection>
+                            </QItem>
                         </template>
-                    </QOptionGroup>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QItemSection v-if="userRadio !== null">
-                        <VnSelect
-                            class="full-width"
-                            :label="t('globals.user')"
-                            v-model="userSelect"
-                            option-label="name"
-                            option-value="id"
-                            :url="`${model}Logs/${route.params.id}/editors`"
-                            :fields="['id', 'nickname', 'name', 'image']"
-                            sort-by="nickname"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    :label="t('globals.changes')"
+                    v-model="changeInput"
+                    class="full-width"
+                    clearable
+                    clear-icon="close"
+                    @keyup.enter="selectFilter('change')"
+                    @focusout="selectFilter('change')"
+                    @clear="selectFilter('change')"
                 >
-                    <QCheckbox
-                        size="sm"
-                        v-model="checkboxOption.selected"
-                        :label="t(`actions.${checkboxOption.label}`)"
-                        @update:model-value="selectFilter"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('globals.date')"
-                        @click="dateFromDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'to')"
-                        v-model="dateFrom"
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        class="full-width"
-                        :label="t('globals.to')"
-                        @click="dateToDialog = true"
-                        @focus="(evt) => evt.target.blur()"
-                        @clear="selectFilter('date', 'from')"
-                        v-model="dateTo"
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-            </QList>
-        </template>
-    </RightMenu>
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip max-width="250px">{{
+                                t('tooltips.changes')
+                            }}</QTooltip>
+                        </QIcon>
+                    </template>
+                </QInput>
+            </QItem>
+            <QItem
+                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                v-for="(checkboxOption, index) in checkboxOptions"
+                :key="index"
+            >
+                <QCheckbox
+                    size="sm"
+                    v-model="checkboxOption.selected"
+                    :label="t(`actions.${checkboxOption.label}`)"
+                    @update:model-value="selectFilter"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('globals.date')"
+                    @click="dateFromDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'to')"
+                    v-model="dateFrom"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('to')"
+                    @click="dateToDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'from')"
+                    v-model="dateTo"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+        </QList>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"
@@ -1059,9 +1052,9 @@ en:
         Deletes: Deletes
         Accesses: Accesses
     Users:
-        User: User
-        All: All
-        System: System
+        User: Usuario
+        All: Todo
+        System: Sistema
     properties:
         id: ID
         claimFk: Claim ID

src/components/common/VnSection.vue

@@ -1,115 +0,0 @@
-<script setup>
-import RightAdvancedMenu from './RightAdvancedMenu.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
-import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute, useRouter } from 'vue-router';
-import { useHasContent } from 'src/composables/useHasContent';
-
-const $props = defineProps({
-    section: {
-        type: String,
-        default: null,
-    },
-    dataKey: {
-        type: String,
-        default: null,
-    },
-    searchBar: {
-        type: Boolean,
-        default: true,
-    },
-    prefix: {
-        type: String,
-        default: null,
-    },
-    rightFilter: {
-        type: Boolean,
-        default: true,
-    },
-    columns: {
-        type: Array,
-        default: null,
-    },
-    arrayDataProps: {
-        type: Object,
-        default: null,
-    },
-    redirect: {
-        type: Boolean,
-        default: true,
-    },
-    keepData: {
-        type: Boolean,
-        default: true,
-    },
-});
-
-const route = useRoute();
-const router = useRouter();
-
-let arrayData;
-const sectionValue = computed(() => $props.section ?? $props.dataKey);
-const isMainSection = ref(false);
-
-const searchbarId = 'section-searchbar';
-const advancedMenuSlot = 'advanced-menu';
-const hasContent = useHasContent(`#${searchbarId}`);
-
-onBeforeMount(() => {
-    if ($props.dataKey)
-        arrayData = useArrayData($props.dataKey, {
-            searchUrl: 'table',
-            keepData: $props.keepData,
-            ...$props.arrayDataProps,
-            navigate: $props.redirect,
-        });
-    checkIsMain();
-});
-
-onMounted(() => {
-    const unsubscribe = router.afterEach(() => {
-        checkIsMain();
-    });
-    onUnmounted(unsubscribe);
-});
-
-onUnmounted(() => {
-    if (arrayData) arrayData.destroy();
-});
-
-function checkIsMain() {
-    isMainSection.value = sectionValue.value == route.name;
-    if (!isMainSection.value && arrayData) {
-        arrayData.reset(['userParams', 'filter']);
-        arrayData.setCurrentFilter();
-    }
-}
-</script>
-<template>
-    <slot name="searchbar">
-        <VnSearchbar
-            v-if="searchBar && !hasContent"
-            v-bind="arrayDataProps"
-            :data-key="dataKey"
-            :label="$t(`${prefix}.search`)"
-            :info="$t(`${prefix}.searchInfo`)"
-        />
-        <div :id="searchbarId"></div>
-    </slot>
-    <RightAdvancedMenu :is-main-section="isMainSection && rightFilter">
-        <template #advanced-menu v-if="$slots[advancedMenuSlot]">
-            <slot :name="advancedMenuSlot">
-                <VnTableFilter
-                    v-if="rightFilter && columns"
-                    :data-key="dataKey"
-                    :array-data="arrayData"
-                    :columns="columns"
-                />
-            </slot>
-        </template>
-    </RightAdvancedMenu>
-    <slot name="body" v-if="isMainSection" />
-    <RouterView v-else />
-</template>

src/components/common/VnSectionMain.vue

@@ -1,8 +1,8 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
-import { onMounted, ref } from 'vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import { onMounted } from 'vue';
 import { useQuasar } from 'quasar';
-import LeftMenu from '../LeftMenu.vue';
 
 const stateStore = useStateStore();
 const $props = defineProps({
@@ -14,29 +14,12 @@ const $props = defineProps({
 onMounted(
     () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
 );
-
-const teleportRef = ref({});
-const hasContent = ref();
-let observer;
-
-onMounted(() => {
-    if (!teleportRef.value) return;
-    const checkContent = () => {
-        hasContent.value = teleportRef.value?.innerHTML?.trim() !== '';
-    };
-
-    observer = new MutationObserver(checkContent);
-    observer.observe(teleportRef.value, { childList: true, subtree: true });
-
-    checkContent();
-});
 </script>
 
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
-            <div id="left-panel" ref="teleportRef"></div>
-            <LeftMenu v-if="!hasContent" />
+            <LeftMenu />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>

src/components/common/VnSelect.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
 import dataByOrder from 'src/utils/dataByOrder';
-import { QItemLabel } from 'quasar';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
@@ -27,17 +26,13 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String, Function],
+        type: [String],
         default: 'name',
     },
     optionValue: {
         type: String,
         default: 'id',
     },
-    optionCaption: {
-        type: String,
-        default: null,
-    },
     optionFilter: {
         type: String,
         default: null,
@@ -106,22 +101,11 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    isOutlined: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-const {
-    optionLabel,
-    optionValue,
-    optionCaption,
-    optionFilter,
-    optionFilterValue,
-    options,
-    modelValue,
-} = toRefs($props);
+const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
+    toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -131,15 +115,6 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
 const isLoading = ref(false);
 const useURL = computed(() => $props.url);
 const value = computed({
@@ -173,11 +148,7 @@ onMounted(() => {
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 
-const arrayData = useArrayData(arrayDataKey, {
-    url: $props.url,
-    searchUrl: false,
-    mapKey: $attrs['map-key'],
-});
+const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
 
 function findKeyInOptions() {
     if (!$props.options) return;
@@ -205,10 +176,10 @@ function filter(val, options) {
         }
 
         if (!row) return;
-        const id = String(row[$props.optionValue]);
+        const id = row[$props.optionValue];
         const optionLabel = String(row[$props.optionLabel]).toLowerCase();
 
-        return id.includes(search) || optionLabel.includes(search);
+        return id == search || optionLabel.includes(search);
     });
 }
 
@@ -232,15 +203,12 @@ async function fetchFilter(val) {
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
     $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
-    const filterOptions = { where, include, limit };
-    if (fields) filterOptions.fields = fields;
-    if (sortBy) filterOptions.order = sortBy;
-    arrayData.resetPagination();
+    const fetchOptions = { where, include, limit };
+    if (fields) fetchOptions.fields = fields;
+    if (sortBy) fetchOptions.order = sortBy;
+    arrayData.reset(['skip', 'filter.skip', 'page']);
 
-    const { data } = await arrayData.applyFilter(
-        { filter: filterOptions },
-        { updateRouter: false }
-    );
+    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
     setOptions(data);
     return data;
 }
@@ -297,7 +265,7 @@ async function onScroll({ to, direction, from, index }) {
     }
 }
 
-defineExpose({ opts: myOptions, vnSelectRef });
+defineExpose({ opts: myOptions });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {
@@ -320,7 +288,7 @@ function handleKeyDown(event) {
         }
 
         const focusableElements = document.querySelectorAll(
-            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
+            'a, button, input, textarea, select, details, [tabindex]:not([tabindex="-1"])'
         );
         const currentIndex = Array.prototype.indexOf.call(
             focusableElements,
@@ -331,11 +299,6 @@ function handleKeyDown(event) {
         }
     }
 }
-
-function getCaption(opt) {
-    if (optionCaption.value === false) return;
-    return opt[optionCaption.value] || opt[optionValue.value];
-}
 </script>
 
 <template>
@@ -344,8 +307,9 @@ function getCaption(opt) {
         :options="myOptions"
         :option-label="optionLabel"
         :option-value="optionValue"
-        v-bind="{ ...$attrs, ...styleAttrs }"
+        v-bind="$attrs"
         @filter="filterHandler"
+        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
@@ -360,15 +324,13 @@ function getCaption(opt) {
         :input-debounce="useURL ? '300' : '0'"
         :loading="isLoading"
         @virtual-scroll="onScroll"
-        @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
-        :data-url="url"
     >
         <template #append>
             <QIcon
                 v-show="isClearable && value"
                 name="close"
-                @click="
+                @click.stop="
                     () => {
                         value = null;
                         emit('remove');
@@ -396,22 +358,6 @@ function getCaption(opt) {
             </div>
             <slot v-else :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
-        <template #option="{ opt, itemProps }">
-            <QItem v-bind="itemProps">
-                <QItemSection v-if="typeof opt !== 'object'"> {{ opt }}</QItemSection>
-                <QItemSection v-else-if="opt[optionValue] == opt[optionLabel]">
-                    <QItemLabel>{{ opt[optionLabel] }}</QItemLabel>
-                </QItemSection>
-                <QItemSection v-else>
-                    <QItemLabel>
-                        {{ opt[optionLabel] }}
-                    </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt)">
-                        {{ `#${getCaption(opt)}` }}
-                    </QItemLabel>
-                </QItemSection>
-            </QItem>
-        </template>
     </QSelect>
 </template>
 

src/components/common/VnSelectDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -7,7 +7,6 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
 
 const value = defineModel({ type: [String, Number, Object] });
-const select = ref(null);
 const $props = defineProps({
     rolesAllowedToCreate: {
         type: Array,
@@ -34,13 +33,10 @@ const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
     return role.hasAny($props.rolesAllowedToCreate);
 });
-
-defineExpose({ vnSelectDialogRef: select });
 </script>
 
 <template>
     <VnSelect
-        ref="select"
         v-model="value"
         v-bind="$attrs"
         @update:model-value="(...args) => emit('update:modelValue', ...args)"

src/components/common/VnSelectWorker.vue

@@ -1,87 +0,0 @@
-<script setup>
-import { computed, useAttrs } from 'vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
-
-const emit = defineEmits(['update:modelValue']);
-const $props = defineProps({
-    hasAvatar: {
-        type: Boolean,
-        default: false,
-    },
-    info: {
-        type: String,
-        default: undefined,
-    },
-    modelValue: {
-        type: [String, Number, Object],
-        default: null,
-    },
-});
-
-const $attrs = useAttrs();
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(val) {
-        emit('update:modelValue', val);
-    },
-});
-
-const url = computed(() => {
-    let url = 'Workers/search';
-    const { departmentCodes } = $attrs.params ?? {};
-    if (!departmentCodes) return url;
-    const params = new URLSearchParams({
-        departmentCodes: JSON.stringify(departmentCodes),
-    });
-
-    return url.concat(`?${params.toString()}`);
-});
-</script>
-
-<template>
-    <VnSelect
-        :label="$t('globals.worker')"
-        v-bind="$attrs"
-        v-model="value"
-        :url="url"
-        option-value="id"
-        option-label="nickname"
-        :fields="['id', 'name', 'nickname', 'code']"
-        :filter-options="['id', 'name', 'nickname', 'code']"
-        sort-by="nickname ASC"
-    >
-        <template #prepend v-if="$props.hasAvatar">
-            <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
-        </template>
-        <template #append v-if="$props.info">
-            <QIcon name="info" class="cursor-pointer">
-                <QTooltip>{{ $t($props.info) }}</QTooltip>
-            </QIcon>
-        </template>
-        <template #option="scope">
-            <QItem v-bind="scope.itemProps">
-                <QItemSection>
-                    <QItemLabel>
-                        {{ scope.opt.name }}
-                    </QItemLabel>
-                    <QItemLabel v-if="!scope.opt.id">
-                        {{ scope.opt.nickname }}
-                    </QItemLabel>
-                    <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
-                        {{ scope.opt.code }}
-                    </QItemLabel>
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnSelect>
-</template>
-
-<i18n>
-es:
-    Responsible for approving invoices: Responsable de aprobar las facturas
-</i18n>

src/components/common/VnSummaryDialog.vue

@@ -10,10 +10,6 @@ defineProps({
         type: Object,
         required: true,
     },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
 });
 
 defineEmits([...useDialogPluginComponent.emits]);
@@ -21,19 +17,7 @@ defineEmits([...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogHide } = useDialogPluginComponent();
 </script>
 <template>
-    <QDialog ref="dialogRef" @hide="onDialogHide">
-        <component :is="summary" :id="id" :class="width" />
+    <QDialog ref="dialogRef" @hide="onDialogHide" full-width>
+        <component :is="summary" :id="id" />
     </QDialog>
 </template>
-
-<style lang="scss" scoped>
-.md-width {
-    max-width: $width-md;
-}
-.lg-width {
-    max-width: $width-lg;
-}
-.xlg-width {
-    max-width: $width-xl;
-}
-</style>

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

@@ -1,28 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnDiscount from 'components/common/vnDiscount.vue';
-
-describe('VnDiscount', () => {
-    let vm;
-    
-    beforeAll(() => {
-        vm = createWrapper(VnDiscount, {
-            props: {
-                data: {},
-                price: 100,
-                quantity: 2,
-                discount: 10,
-            }
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('total', () => {
-        it('should calculate total correctly', () => {            
-            expect(vm.total).toBe(180);
-        });
-    });
-});

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

@@ -1,146 +0,0 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
-import VnDms from 'src/components/common/VnDms.vue';
-
-class MockFormData {
-    constructor() {
-        this.entries = {};
-    }
-
-    append(key, value) {
-        if (!key) {
-            throw new Error('Key is required for FormData.append');
-        }
-        this.entries[key] = value;
-    }
-
-    get(key) {
-        return this.entries[key] || null;
-    }
-
-    getAll() {
-        return this.entries;
-    }
-}
-
-global.FormData = MockFormData;
-
-describe('VnDms', () => {
-    let wrapper;
-    let vm;
-    let postMock;
-
-    const postResponseMock = { data: { success: true } };
-
-    const data = {
-        hasFile: true,
-        hasFileAttached: true,
-        reference: 'DMS-test',
-        warehouseFk: 1,
-        companyFk: 2,
-        dmsTypeFk: 3,
-        description: 'This is a test description',
-        files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
-    };
-
-    const expectedBody = {
-        hasFile: true,
-        hasFileAttached: true,
-        reference: 'DMS-test',
-        warehouseId: 1,
-        companyId: 2,
-        dmsTypeId: 3,
-        description: 'This is a test description',
-    };
-
-    beforeAll(() => {
-        wrapper = createWrapper(VnDms, {
-            propsData: {
-                url: '/test',
-                formInitialData: { id: 1, reference: 'test' },
-                model: 'Worker',
-            }
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-        vi.spyOn(vm, '$emit');
-    });
-
-    beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post').mockResolvedValue(postResponseMock);
-        vm.dms = data;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('mapperDms', () => {
-        it('should map DMS data correctly and add file to FormData', () => {
-            const [formData, params] = vm.mapperDms(data);
-
-            expect(formData.get('example.txt')).toBe(data.files);
-            expect(expectedBody).toEqual(params.params);
-        });
-
-        it('should map DMS data correctly without file', () => {
-            delete data.files;
-
-            const [formData, params] = vm.mapperDms(data);
-
-            expect(formData.getAll()).toEqual({});
-            expect(expectedBody).toEqual(params.params);
-        });
-    });
-
-    describe('getUrl', () => {
-        it('should returns prop url when is set', async () => {
-            expect(vm.getUrl()).toBe('/test');
-        });
-
-        it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {            
-            await wrapper.setProps({ url: null });
-            expect(vm.getUrl()).toBe('dms/1/updateFile');
-        });
-
-        it('should returns url "props.model"/"route.params.id"/uploadFile when formInitialData is null', async () => {
-            await wrapper.setProps({ formInitialData: null });
-            vm.route.params.id = '123';
-            expect(vm.getUrl()).toBe('Worker/123/uploadFile');
-        });
-    });
-
-    describe('save', () => {
-        it('should save data correctly', async () => {
-            await vm.save();
-            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
-            expect(wrapper.emitted('onDataSaved')).toBeTruthy();
-        });
-    });
-
-    describe('defaultData', () => {
-        it('should set dms with formInitialData', async () => {
-            const testData = {
-                hasFile: false,
-                hasFileAttached: false,
-                reference: 'defaultData-test',
-                warehouseFk: 2,
-                companyFk: 3,
-                dmsTypeFk: 2,
-                description: 'This is a test description'
-            }
-            await wrapper.setProps({ formInitialData: testData });
-            vm.defaultData();
-
-            expect(vm.dms).toEqual(testData);
-        });
-
-        it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
-            await wrapper.setProps({ formInitialData: null });
-            vm.route.params.id= '111';
-            vm.defaultData();
-
-            expect(vm.dms.reference).toBe('111');
-        });
-    });
-});

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

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

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

@@ -1,91 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper';
-import { vi, describe, expect, it } from 'vitest';
-import VnInput from 'src/components/common/VnInput.vue';
-
-
-describe('VnInput', () => {
-    let vm;
-    let wrapper;
-    let input;
-
-    function generateWrapper(value, isOutlined, emptyToNull, insertable) {
-        wrapper = createWrapper(VnInput, {
-            props: {
-                modelValue: value,                
-                isOutlined,  emptyToNull,  insertable,
-                maxlength: 101
-            },
-            attrs: {
-                label: 'test',
-                required: true,
-                maxlength: 101,
-                maxLength: 10,
-                'max-length':20
-            },
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-        input = wrapper.find('[data-cy="test_input"]');
-    };
-
-    describe('value', () => {
-        it('should emit update:modelValue when value changes', async () => {
-            generateWrapper('12345', false, false, true)
-            await input.setValue('123');
-            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
-        });
-
-        it('should emit update:modelValue with null when input is empty', async () => {
-            generateWrapper('12345', false, true, true);
-            await input.setValue('');
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
-        });
-    });
-
-    describe('styleAttrs', () => {
-        it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('123', false, false, false);
-            expect(vm.styleAttrs).toEqual({}); 
-        });
-
-        it('should set styleAttrs when isOutlined is true', async () => {        
-            generateWrapper('123', true, false, false);
-            expect(vm.styleAttrs.outlined).toBe(true);
-        });
-    });
-
-    describe('handleKeydown', () => { 
-        it('should do nothing when "Backspace" key is pressed', async () => {
-            generateWrapper('12345', false, false, true);
-            await input.trigger('keydown', { key: 'Backspace' });
-            expect(wrapper.emitted('update:modelValue')).toBeUndefined();
-            const spyhandler = vi.spyOn(vm, 'handleInsertMode');
-            expect(spyhandler).not.toHaveBeenCalled();
-            
-        });
-        
-        /*
-        TODO: #8399 REDMINE
-        */
-        it.skip('handleKeydown respects insertable behavior', async () => {
-            const expectedValue = '12345';
-            generateWrapper('1234', false, false, true);
-            vm.focus()
-            await input.trigger('keydown', { key: '5' });
-            await vm.$nextTick();
-            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
-            expect(vm.value).toBe( expectedValue);
-        });
-    });
-
-    describe('focus', () => {
-        it('should call focus method when input is focused', async () => {
-            generateWrapper('123', false, false, true);
-            const focusSpy = vi.spyOn(input.element, 'focus');
-            vm.focus();
-            expect(focusSpy).toHaveBeenCalled();
-        }); 
-    });
-});

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

@@ -1,72 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper.js';
-import { describe, it, expect } from 'vitest';
-import VnInputDate from 'components/common/VnInputDate.vue';
-
-let vm;
-let wrapper;
-
-function generateWrapper(date, outlined, required) {
-    wrapper = createWrapper(VnInputDate, {
-        props: {
-            modelValue: date,
-        },
-        attrs: {
-            isOutlined: outlined,
-            required: required
-        },
-    });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm;
-};
-
-describe('VnInputDate', () => {
-
-    describe('formattedDate', () => {     
-        it('formats a valid date correctly', async () => {
-            generateWrapper('2023-12-25', false, false);
-            await vm.$nextTick();
-            expect(vm.formattedDate).toBe('25/12/2023');
-        });
-
-        it('updates the model value when a new date is set', async () => {
-            const input = wrapper.find('input');
-            await input.setValue('31/12/2023');
-            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-        });
-
-        it('should not update the model value when an invalid date is set', async () => {
-            const input = wrapper.find('input');
-            await input.setValue('invalid-date');
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-        }); 
-    });
-
-    describe('styleAttrs', () => {
-        it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('2023-12-25', false, false);
-            await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({}); 
-        });
-
-        it('should set styleAttrs when isOutlined is true', async () => {        
-            generateWrapper('2023-12-25', true, false);
-            await vm.$nextTick();
-            expect(vm.styleAttrs.outlined).toBe(true);
-        });
-    });
-
-    describe('required', () => {
-        it('should not applies required class when isRequired is false', async () => {
-            generateWrapper('2023-12-25', false, false);
-            await vm.$nextTick();
-            expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
-        });
-        
-        it('should applies required class when isRequired is true', async () => {
-            generateWrapper('2023-12-25', false, true);
-            await vm.$nextTick();
-            expect(wrapper.find('.vn-input-date').classes()).toContain('required');
-        });
-    });
-});

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

@@ -1,63 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnInputTime from 'components/common/VnInputTime.vue';
-
-describe('VnInputTime', () => {
-    let wrapper;
-    let vm;
-
-    beforeAll(() => {
-        wrapper = createWrapper(VnInputTime, {
-            props: {
-                isOutlined: true,
-                timeOnly: false,
-            },
-        });
-        vm = wrapper.vm;
-        wrapper = wrapper.wrapper;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should return the correct data if isOutlined is true', () => {
-        expect(vm.isOutlined).toBe(true);
-        expect(vm.styleAttrs).toEqual({ dense: true, outlined: true, rounded: true });
-    });
-
-    it('should return the formatted data', () => {
-        expect(vm.dateToTime('2022-01-01T03:23:43')).toBe('03:23');
-    });
-
-    describe('formattedTime', () => {
-        it('should return the formatted time for a valid ISO date', () => {
-            vm.model = '2025-01-02T15:45:00';
-            expect(vm.formattedTime).toBe('15:45');
-        });
-
-        it('should handle null model value gracefully', () => {
-            vm.model = null;
-            expect(vm.formattedTime).toBe(null);
-        });
-
-        it('should handle time-only input correctly', async () => {
-            await wrapper.setProps({ timeOnly: true });
-            vm.formattedTime = '14:30';
-            expect(vm.model).toBe('14:30');
-        });
-
-        it('should pad short time values correctly', async () => {
-            await wrapper.setProps({ timeOnly: true });
-            vm.formattedTime = '9';
-            expect(vm.model).toBe('09:00');
-        });
-
-        it('should not update the model if the value is unchanged', () => {
-            vm.model = '14:30';
-            const previousModel = vm.model;
-            vm.formattedTime = '14:30';
-            expect(vm.model).toBe(previousModel);
-        });
-    });
-});

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

@@ -1,95 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import VnJsonValue from 'src/components/common/VnJsonValue.vue';
-import { createWrapper } from 'app/test/vitest/helper';
-
-const buildComponent = (props) => {
-    return createWrapper(VnJsonValue, {
-        props,
-    }).wrapper;
-};
-
-describe('VnJsonValue', () => {
-    it('renders null value correctly', async () => {
-        const wrapper = buildComponent({ value: null });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('∅');
-        expect(span.classes()).toContain('json-null');
-    });
-
-    it('renders boolean true correctly', async () => {
-        const wrapper = buildComponent({ value: true });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('✓');
-        expect(span.classes()).toContain('json-true');
-    });
-
-    it('renders boolean false correctly', async () => {
-        const wrapper = buildComponent({ value: false });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('✗');
-        expect(span.classes()).toContain('json-false');
-    });
-
-    it('renders a short string correctly', async () => {
-        const wrapper = buildComponent({ value: 'Hello' });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('Hello');
-        expect(span.classes()).toContain('json-string');
-    });
-
-    it('renders a long string correctly with ellipsis', async () => {
-        const longString = 'a'.repeat(600);
-        const wrapper = buildComponent({ value: longString });
-        const span = wrapper.find('span');
-        expect(span.text()).toContain('...');
-        expect(span.text().length).toBeLessThanOrEqual(515);
-        expect(span.attributes('title')).toBe(longString);
-        expect(span.classes()).toContain('json-string');
-    });
-
-    it('renders a number correctly', async () => {
-        const wrapper = buildComponent({ value: 123.4567 });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('123.457');
-        expect(span.classes()).toContain('json-number');
-    });
-
-    it('renders an integer correctly', async () => {
-        const wrapper = buildComponent({ value: 42 });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('42');
-        expect(span.classes()).toContain('json-number');
-    });
-
-    it('renders a date correctly', async () => {
-        const date = new Date('2023-01-01');
-        const wrapper = buildComponent({ value: date });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('2023-01-01');
-        expect(span.classes()).toContain('json-object');
-    });
-
-    it('renders an object correctly', async () => {
-        const obj = { key: 'value' };
-        const wrapper = buildComponent({ value: obj });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe(obj.toString());
-        expect(span.classes()).toContain('json-object');
-    });
-
-    it('renders an array correctly', async () => {
-        const arr = [1, 2, 3];
-        const wrapper = buildComponent({ value: arr });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe(arr.toString());
-        expect(span.classes()).toContain('json-object');
-    });
-
-    it('updates value when prop changes', async () => {
-        const wrapper = buildComponent({ value: true });
-        await wrapper.setProps({ value: 123 });
-        const span = wrapper.find('span');
-        expect(span.text()).toBe('123');
-        expect(span.classes()).toContain('json-number');
-    });
-});

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

@@ -1,91 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper';
-import VnLocation from 'components/common/VnLocation.vue';
-import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
-
-function buildComponent(data) {
-    return createWrapper(VnLocation, {
-        global: {
-            props: {
-                location: data
-            }
-        },
-    }).vm;
-}
-
-afterEach(() => {
-    vi.clearAllMocks();
-});
-
-describe('formatLocation', () => {
-    let locationBase;
-
-    beforeEach(() => {
-        locationBase = {
-            postcode: '46680',
-            city: 'Algemesi',
-            province: { name: 'Valencia' },
-            country: { name: 'Spain' }
-        };
-    });
-
-    it('should return the postcode, city, province and country', () => {
-        const location = { ...locationBase };
-        const vm = buildComponent(location);
-        expect(vm.formatLocation(location)).toEqual('46680, Algemesi(Valencia), Spain');
-    });
-
-    it('should return the postcode and country', () => {
-        const location = { ...locationBase, city: undefined };
-        const vm = buildComponent(location);
-        expect(vm.formatLocation(location)).toEqual('46680, Spain');
-    });
-
-    it('should return the city, province and country', () => {
-        const location = { ...locationBase, postcode: undefined };
-        const vm = buildComponent(location);
-        expect(vm.formatLocation(location)).toEqual('Algemesi(Valencia), Spain');
-    });
-
-    it('should return the country', () => {
-        const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
-        const vm = buildComponent(location);
-        expect(vm.formatLocation(location)).toEqual('Spain');
-    });
-});
-
-describe('showLabel', () => {
-    let locationBase;
-
-    beforeEach(() => {
-        locationBase = {
-            code: '46680',
-            town: 'Algemesi',
-            province: 'Valencia',
-            country: 'Spain'
-        };
-    });
-
-    it('should show the label with postcode, city, province and country', () => {
-        const location = { ...locationBase };
-        const vm = buildComponent(location);
-        expect(vm.showLabel(location)).toEqual('46680, Algemesi(Valencia), Spain');
-    });
-
-    it('should show the label with postcode and country', () => {
-        const location = { ...locationBase, town: undefined };
-        const vm = buildComponent(location);
-        expect(vm.showLabel(location)).toEqual('46680, Spain');
-    });
-
-    it('should show the label with city, province and country', () => {
-        const location = { ...locationBase, code: undefined };
-        const vm = buildComponent(location);
-        expect(vm.showLabel(location)).toEqual('Algemesi(Valencia), Spain');
-    });
-
-    it('should show the label with country', () => {
-        const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
-        const vm = buildComponent(location);
-        expect(vm.showLabel(location)).toEqual('Spain');
-    });
-});

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

@@ -1,107 +0,0 @@
-import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import VnNotes from 'src/components/ui/VnNotes.vue';
-
-describe('VnNotes', () => {
-    let vm;
-    let wrapper;
-    let spyFetch;
-    let postMock;
-    let expectedBody;
-    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
-
-    function generateExpectedBody() {
-        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
-    }
-
-    async function setTestParams(text, observationType, type){
-        vm.newNote.text = text;
-        vm.newNote.observationTypeFk = observationType;
-        wrapper.setProps({ selectType: type });
-    }
-
-    beforeAll(async () => {        
-        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
-
-        wrapper = createWrapper(VnNotes, {
-            propsData: {
-                url: '/test',
-                body: { name: 'Tony', lastName: 'Stark' },
-            }
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-    });
-
-    beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
-        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-        expectedBody = {};
-    });
-
-    describe('insert', () => {
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
-            await setTestParams( null, null, true );
-
-            await vm.insert();
-
-            expect(postMock).not.toHaveBeenCalled();
-            expect(spyFetch).not.toHaveBeenCalled();
-        });
-
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
-            await setTestParams( "", null, false );
-
-            await vm.insert();
-
-            expect(postMock).not.toHaveBeenCalled();
-            expect(spyFetch).not.toHaveBeenCalled();
-        });
-
-        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
-            await setTestParams( "Test Note", null, true );
-
-            await vm.insert();
-
-            expect(postMock).not.toHaveBeenCalled();
-            expect(spyFetch).not.toHaveBeenCalled();
-        });
-
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
-            await setTestParams( "Test Note", null, false );
-
-            generateExpectedBody();
-
-            await vm.insert();
-
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
-            await setTestParams( "Test Note", 1, false );
-
-            generateExpectedBody();
-
-            await vm.insert();
-
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-
-        it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            await setTestParams( "Test Note", 1, true );
-
-            generateExpectedBody();
-            
-            await vm.insert();
-
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-    });
-});

src/components/ui/CardDescriptor.vue

@@ -6,7 +6,6 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute } from 'vue-router';
-import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
     url: {
@@ -37,10 +36,6 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
 });
 
 const state = useState();
@@ -52,6 +47,7 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -132,8 +128,9 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn></slot
                 >
+
                 <QBtn
-                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
+                    @click.stop="viewSummary(entity.id, $props.summary)"
                     round
                     flat
                     dense
@@ -162,11 +159,25 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
-                <VnMoreOptions v-if="$slots.menu">
-                    <template #menu="{ menuRef }">
-                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                    </template>
-                </VnMoreOptions>
+                <QBtn
+                    v-if="$slots.menu"
+                    color="white"
+                    dense
+                    flat
+                    icon="more_vert"
+                    round
+                    size="md"
+                    data-cy="descriptor-more-opts"
+                >
+                    <QTooltip>
+                        {{ t('components.cardDescriptor.moreOptions') }}
+                    </QTooltip>
+                    <QMenu :ref="menuRef">
+                        <QList>
+                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                        </QList>
+                    </QMenu>
+                </QBtn>
             </div>
             <slot name="before" />
             <div class="body q-py-sm">

src/components/ui/CardSummary.vue

@@ -2,9 +2,9 @@
 import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { isDialogOpened } from 'src/filters';
-import VnMoreOptions from './VnMoreOptions.vue';
 
 const props = defineProps({
     url: {
@@ -81,16 +81,11 @@ async function fetch() {
                         <span v-else></span>
                     </slot>
                     <slot name="header" :entity="entity" dense>
-                        {{ entity.id + ' - ' + entity.name }}
+                        <VnLv :label="`${entity.id} -`" :value="entity.name" />
+                    </slot>
+                    <slot name="header-right" :entity="entity">
+                        <span></span>
                     </slot>
-                    <span class="row no-wrap">
-                        <slot name="header-right" :entity="entity" />
-                        <VnMoreOptions v-if="$slots.menu && isDialogOpened()">
-                            <template #menu="{ menuRef }">
-                                <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                            </template>
-                        </VnMoreOptions>
-                    </span>
                 </div>
                 <div class="summaryBody row q-mb-md">
                     <slot name="body" :entity="entity" />
@@ -175,7 +170,7 @@ async function fetch() {
                 display: inline-block;
             }
             .header.link:hover {
-                color: rgba(var(--q-primary), 0.8);
+                color: lighten($primary, 20%);
             }
             .q-checkbox {
                 & .q-checkbox__label {

src/components/ui/CatalogItem.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRef } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnLv from 'components/ui/VnLv.vue';
@@ -13,7 +13,7 @@ const DEFAULT_PRICE_KG = 0;
 
 const { t } = useI18n();
 
-const props = defineProps({
+defineProps({
     item: {
         type: Object,
         required: true,
@@ -25,63 +25,57 @@ const props = defineProps({
 });
 
 const dialog = ref(null);
-const card = toRef(props, 'item');
 </script>
 
 <template>
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="card.id" class="image" zoom-resolution="1600x900" />
-                <div v-if="card.hex && isCatalog" class="item-color-container">
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
+                <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
-                        :style="{ backgroundColor: `#${card.hex}` }"
+                        :style="{ backgroundColor: `#${item.hex}` }"
                     ></div>
                 </div>
             </div>
             <div class="content">
-                <span class="link" @click.stop>
-                    {{ card.name }}
-                    <ItemDescriptorProxy :id="card.id" />
+                <span class="link">
+                    {{ item.name }}
+                    <ItemDescriptorProxy :id="item.id" />
                 </span>
-                <p class="subName">{{ card.subName }}</p>
+                <p class="subName">{{ item.subName }}</p>
                 <template v-for="index in 4" :key="`tag-${index}`">
                     <VnLv
-                        v-if="card?.[`tag${index + 4}`]"
-                        :label="card?.[`tag${index + 4}`] + ':'"
-                        :value="card?.[`value${index + 4}`]"
+                        v-if="item?.[`tag${index + 4}`]"
+                        :label="item?.[`tag${index + 4}`] + ':'"
+                        :value="item?.[`value${index + 4}`]"
                     />
                 </template>
-                <div v-if="card.minQuantity" class="min-quantity">
+                <div v-if="item.minQuantity" class="min-quantity">
                     <QIcon name="production_quantity_limits" size="xs" />
-                    {{ card.minQuantity }}
+                    {{ item.minQuantity }}
                 </div>
                 <div class="footer">
                     <div class="price">
                         <p v-if="isCatalog">
-                            {{ card.available }} {{ t('to') }}
-                            {{ toCurrency(card.price) }}
+                            {{ item.available }} {{ t('to') }}
+                            {{ toCurrency(item.price) }}
                         </p>
                         <slot name="price" />
                         <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
-                                    :item="card"
-                                    @added="
-                                        (quantityAdded) => {
-                                            card.available += quantityAdded;
-                                            dialog.hide();
-                                        }
-                                    "
+                                    :item="item"
+                                    @added="() => dialog.hide()"
                                 />
                             </QPopupProxy>
                         </QIcon>
                     </div>
-                    <p v-if="card.priceKg" class="price-kg">
+                    <p v-if="item.priceKg" class="price-kg">
                         {{ t('price-kg') }}
-                        {{ toCurrency(card.priceKg) || DEFAULT_PRICE_KG }}
+                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>

src/components/ui/FetchedTags.vue

@@ -16,12 +16,7 @@ const $props = defineProps({
         required: false,
         default: 'value',
     },
-    columns: {
-        type: Number,
-        default: 3,
-    },
 });
-
 const tags = computed(() => {
     return Object.keys($props.item)
         .filter((i) => i.startsWith(`${$props.tag}`))
@@ -33,21 +28,10 @@ const tags = computed(() => {
             return acc;
         }, {});
 });
-
-const columnStyle = computed(() => {
-    if ($props.columns) {
-        return {
-            'grid-template-columns': `repeat(${$props.columns}, 1fr)`,
-            'max-width': `${$props.columns * 4}rem`,
-        };
-    }
-    return {};
-});
 </script>
-
 <template>
     <div class="fetchedTags">
-        <div class="wrap" :style="columnStyle">
+        <div class="wrap">
             <div
                 v-for="(val, key) in tags"
                 :key="key"
@@ -55,43 +39,37 @@ const columnStyle = computed(() => {
                 :title="`${key}: ${val}`"
                 :class="{ empty: !val }"
             >
-                <span class="text">{{ val }} </span>
+                {{ val }}
             </div>
         </div>
     </div>
 </template>
+
 <style lang="scss" scoped>
 .fetchedTags {
     align-items: center;
     .wrap {
-        display: grid;
+        width: 100%;
+        flex-wrap: wrap;
+        display: flex;
     }
 
     .inline-tag {
-        display: flex;
-        align-items: center;
-        justify-content: center;
         height: 1rem;
         margin: 0.05rem;
-        color: var(--vn-label-color);
+        color: $color-font-secondary;
         text-align: center;
         font-size: smaller;
         padding: 1px;
-        border: 1px solid var(--vn-label-color);
+        flex: 1;
+        border: 1px solid $color-spacer;
         text-overflow: ellipsis;
         overflow: hidden;
         min-width: 4rem;
         max-width: 4rem;
     }
-
-    .text {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        font-size: smaller;
-    }
     .empty {
-        border: 1px solid var(--vn-empty-tag);
+        border: 1px solid #2b2b2b;
     }
 }
 </style>

src/components/ui/QCalendarMonthWrapper.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useQuasar } from 'quasar';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
 
 const $props = defineProps({
     bordered: {

src/components/ui/SkeletonSummary.vue

@@ -1,49 +1,38 @@
 <template>
     <div class="header bg-primary q-pa-sm q-mb-md">
         <QSkeleton type="rect" square />
-        <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
-        <div class="col">
-            <QSkeleton type="rect" class="q-mb-md" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-            <QSkeleton type="text" square />
-        </div>
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="rect" class="q-mb-md" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
+        <QSkeleton type="text" square />
     </div>
 </template>
 

src/components/ui/VnConfirm.vue

@@ -98,7 +98,6 @@ function cancel() {
                 />
                 <QBtn
                     :label="t('globals.confirm')"
-                    :title="t('globals.confirm')"
                     color="primary"
                     :loading="isLoading"
                     @click="confirm()"

src/components/ui/VnFilterPanel.vue

@@ -1,14 +1,12 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
+import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
-import { useFilterParams } from 'src/composables/useFilterParams';
-import { useRoute } from 'vue-router';
 
-const { t, te } = useI18n();
-const route = useRoute();
+const { t } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
@@ -57,35 +55,63 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    arrayData: {
-        type: Object,
-        default: null,
-    },
 });
 
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
-    'search',
     'init',
     'remove',
     'setUserParams',
 ]);
 
-const arrayData =
-    $props.arrayData ??
-    useArrayData($props.dataKey, {
-        exprBuilder: $props.exprBuilder,
-        searchUrl: $props.searchUrl,
-        navigate: $props.redirect ? {} : null,
-    });
-
+const arrayData = useArrayData($props.dataKey, {
+    exprBuilder: $props.exprBuilder,
+    searchUrl: $props.searchUrl,
+    navigate: $props.redirect ? {} : null,
+});
+const route = useRoute();
 const store = arrayData.store;
-const userParams = ref(useFilterParams($props.dataKey).params);
-const userOrders = ref(useFilterParams($props.dataKey).orders);
+const userParams = ref({});
 
-defineExpose({ search, params: userParams, remove });
+defineExpose({ search, sanitizer, params: userParams });
+
+onMounted(() => {
+    if (!userParams.value) userParams.value = $props.modelValue ?? {};
+    emit('init', { params: userParams.value });
+});
+
+function setUserParams(watchedParams) {
+    if (!watchedParams || Object.keys(watchedParams).length == 0) return;
+
+    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    if (typeof watchedParams?.filter == 'string')
+        watchedParams.filter = JSON.parse(watchedParams.filter);
+
+    watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
+    const order = watchedParams.filter?.order;
+
+    delete watchedParams.filter;
+    userParams.value = sanitizer(watchedParams);
+    emit('setUserParams', userParams.value, order);
+}
+
+watch(
+    () => route.query[$props.searchUrl],
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
+);
+
+watch(
+    () => arrayData.store.userParams,
+    (val, oldValue) => (val || oldValue) && setUserParams(val),
+    { immediate: true }
+);
+
+watch(
+    () => $props.modelValue,
+    (val) => (userParams.value = val ?? {})
+);
 
 const isLoading = ref(false);
 async function search(evt) {
@@ -96,9 +122,10 @@ async function search(evt) {
         isLoading.value = true;
         const filter = { ...userParams.value, ...$props.modelValue };
         store.userParamsChanged = true;
-        await arrayData.addFilter({
+        const { params: newParams } = await arrayData.addFilter({
             params: filter,
         });
+        userParams.value = newParams;
 
         if (!$props.showAll && !Object.values(filter).length) store.data = [];
         emit('search');
@@ -111,7 +138,7 @@ async function clearFilters() {
     try {
         isLoading.value = true;
         store.userParamsChanged = true;
-        arrayData.resetPagination();
+        arrayData.reset(['skip', 'filter.skip', 'page']);
         // Filtrar los params no removibles
         const removableFilters = Object.keys(userParams.value).filter((param) =>
             $props.unremovableParams.includes(param)
@@ -121,8 +148,9 @@ async function clearFilters() {
         for (const key of removableFilters) {
             newParams[key] = userParams.value[key];
         }
-
-        await arrayData.applyFilter({ params: { ...newParams } });
+        userParams.value = {};
+        userParams.value = { ...newParams }; // Actualizar los params con los removibles
+        await arrayData.applyFilter({ params: userParams.value });
 
         if (!$props.showAll) {
             store.data = [];
@@ -185,16 +213,20 @@ function formatValue(value) {
     return `"${value}"`;
 }
 
-const getLocale = (label) => {
-    const param = label.split('.').at(-1);
-    const globalLocale = `globals.params.${param}`;
-    if (te(globalLocale)) return t(globalLocale);
-    else if (te(t(`params.${param}`)));
-    else {
-        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
-        return t(`${camelCaseModuleName}.params.${param}`);
+function sanitizer(params) {
+    for (const [key, value] of Object.entries(params)) {
+        if (key === 'and' && Array.isArray(value)) {
+            value.forEach((item) => {
+                Object.assign(params, item);
+            });
+            delete params[key];
+        } else if (value && typeof value === 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
     }
-};
+    return params;
+}
 </script>
 
 <template>
@@ -205,11 +237,7 @@ const getLocale = (label) => {
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
         @click="search()"
-    >
-        <QTooltip bottom anchor="bottom right">
-            {{ t('globals.search') }}
-        </QTooltip>
-    </QBtn>
+    ></QBtn>
     <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
@@ -248,12 +276,7 @@ const getLocale = (label) => {
                         @remove="remove(chip.label)"
                         data-cy="vnFilterPanelChip"
                     >
-                        <slot
-                            name="tags"
-                            :tag="chip"
-                            :format-fn="formatValue"
-                            :get-locale="getLocale"
-                        >
+                        <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
@@ -266,7 +289,6 @@ const getLocale = (label) => {
                         :params="userParams"
                         :tags="customTags"
                         :format-fn="formatValue"
-                        :get-locale="getLocale"
                         :search-fn="search"
                     />
                 </div>
@@ -274,13 +296,7 @@ const getLocale = (label) => {
             <QSeparator />
         </QList>
         <QList dense class="list q-gutter-y-sm q-mt-sm">
-            <slot
-                name="body"
-                :get-locale="getLocale"
-                :params="userParams"
-                :orders="userOrders"
-                :search-fn="search"
-            ></slot>
+            <slot name="body" :params="sanitizer(userParams)" :search-fn="search"></slot>
         </QList>
     </QForm>
     <QInnerLoading

src/components/ui/VnLinkPhone.vue

@@ -30,7 +30,7 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
+        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
         config[
             type
         ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;

src/components/ui/VnLv.vue

@@ -39,7 +39,7 @@ const val = computed(() => $props.value);
         <template v-else>
             <div v-if="label || $slots.label" class="label">
                 <slot name="label">
-                    <span style="color: var(--vn-label-color)">{{ label }}</span>
+                    <span>{{ label }}</span>
                 </slot>
             </div>
             <div class="value">

src/components/ui/VnMoreOptions.vue

@@ -1,20 +0,0 @@
-<template>
-    <QBtn
-        color="white"
-        dense
-        flat
-        icon="more_vert"
-        round
-        size="md"
-        data-cy="descriptor-more-opts"
-    >
-        <QTooltip>
-            {{ $t('components.cardDescriptor.moreOptions') }}
-        </QTooltip>
-        <QMenu ref="menuRef">
-            <QList>
-                <slot name="menu" :menu-ref="$refs.menuRef" />
-            </QList>
-        </QMenu>
-    </QBtn>
-</template>

src/components/ui/VnNotes.vue

@@ -110,7 +110,7 @@ onBeforeRouteLeave((to, from, next) => {
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :user-filter="$props.filter"
+        :filter="$props.filter"
         auto-load
         ref="vnPaginateRef"
         class="show"

src/components/ui/VnPaginate.vue

@@ -78,10 +78,6 @@ const props = defineProps({
         type: String,
         default: '',
     },
-    keyData: {
-        type: String,
-        default: undefined,
-    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@@ -110,14 +106,10 @@ const store = arrayData.store;
 
 onMounted(async () => {
     if (props.autoLoad && !store.data?.length) await fetch();
-    else emit('onFetch', store.data);
     mounted.value = true;
 });
 
-onBeforeUnmount(() => {
-    if (!store.keepData) arrayData.reset(['data']);
-    arrayData.resetPagination();
-});
+onBeforeUnmount(() => arrayData.reset());
 
 watch(
     () => props.data,
@@ -145,8 +137,8 @@ const addFilter = async (filter, params) => {
 
 async function fetch(params) {
     useArrayData(props.dataKey, params);
-    arrayData.resetPagination();
-    await arrayData.fetch({ append: false });
+    arrayData.reset(['filter.skip', 'skip', 'page']);
+    await arrayData.fetch({ append: false, updateRouter: mounted.value });
     return emitStoreData();
 }
 
@@ -208,20 +200,13 @@ async function onLoad(index, done) {
     done(isDone);
 }
 
-defineExpose({
-    fetch,
-    update,
-    addFilter,
-    paginate,
-    userParams: arrayData.store.userParams,
-    currentFilter: arrayData.store.currentFilter,
-});
+defineExpose({ fetch, update, addFilter, paginate });
 </script>
 
 <template>
     <div class="full-width">
         <div
-            v-if="!store.data && !store.data?.length && !isLoading"
+            v-if="!props.autoLoad && !store.data && !isLoading"
             class="info-row q-pa-md text-center"
         >
             <h5>
@@ -259,7 +244,7 @@ defineExpose({
         :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
-        <slot name="body" :rows="keyData ? store.data[keyData] : store.data"></slot>
+        <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>

src/components/ui/VnSearchbar.vue

@@ -1,16 +1,14 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'src/stores/useStateStore';
-import { useRoute } from 'vue-router';
 
 const quasar = useQuasar();
 const { t } = useI18n();
 const state = useStateStore();
-const route = useRoute();
 
 const props = defineProps({
     dataKey: {
@@ -65,10 +63,6 @@ const props = defineProps({
         type: Function,
         default: undefined,
     },
-    searchRemoveParams: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const searchText = ref();
@@ -85,24 +79,13 @@ if (props.redirect)
     };
 let arrayData = useArrayData(props.dataKey, arrayDataProps);
 let store = arrayData.store;
-const to = computed(() => {
-    const url = { path: route.path, query: { ...(route.query ?? {}) } };
-    const searchUrl = arrayData.store.searchUrl;
-    const currentFilter = {
-        ...arrayData.store.currentFilter,
-        search: searchText.value || undefined,
-    };
-
-    if (searchUrl) url.query[searchUrl] = JSON.stringify(currentFilter);
-    return url;
-});
 
 watch(
     () => props.dataKey,
     (val) => {
         arrayData = useArrayData(val, { ...props });
         store = arrayData.store;
-    },
+    }
 );
 
 onMounted(() => {
@@ -113,21 +96,16 @@ onMounted(() => {
 });
 
 async function search() {
-    arrayData.resetPagination();
+    const staticParams = Object.entries(store.userParams);
+    arrayData.reset(['skip', 'page']);
 
-    let filter = { params: { search: searchText.value } };
-
-    if (!props.searchRemoveParams || !searchText.value) {
-        filter = {
-            params: {
-                ...store.userParams,
-                search: searchText.value,
-            },
-            filter: store.filter,
-        };
-    } else {
-        arrayData.reset(['currentFilter', 'userParams']);
-    }
+    const filter = {
+        params: {
+            ...Object.fromEntries(staticParams),
+            search: searchText.value,
+        },
+        ...{ filter: props.filter },
+    };
 
     if (props.whereFilter) {
         filter.filter = {
@@ -136,38 +114,28 @@ async function search() {
         delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
-    searchText.value = undefined;
 }
 </script>
 <template>
     <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
         <QForm @submit="search" id="searchbarForm">
-            <RouterLink
-                :to="to"
-                @click="
-                    !$event.shiftKey && !$event.ctrlKey && search();
-                    $refs.input.focus();
-                "
-            >
-                <QIcon
-                    v-if="!quasar.platform.is.mobile"
-                    class="cursor-pointer"
-                    name="search"
-                    size="sm"
-                >
-                    <QTooltip>{{ t('link') }}</QTooltip>
-                </QIcon>
-            </RouterLink>
             <VnInput
                 id="searchbar"
-                ref="input"
                 v-model.trim="searchText"
                 :placeholder="t(props.label)"
                 dense
+                standout
                 autofocus
-                data-cy="vn-searchbar"
-                borderless
+                data-cy="vnSearchBar"
             >
+                <template #prepend>
+                    <QIcon
+                        v-if="!quasar.platform.is.mobile"
+                        class="cursor-pointer"
+                        name="search"
+                        @click="search"
+                    />
+                </template>
                 <template #append>
                     <QIcon
                         v-if="props.info && $q.screen.gt.xs"
@@ -176,7 +144,6 @@ async function search() {
                     >
                         <QTooltip>{{ t(props.info) }}</QTooltip>
                     </QIcon>
-                    <div id="searchbar-after"></div>
                 </template>
             </VnInput>
         </QForm>
@@ -193,52 +160,20 @@ async function search() {
 .q-field {
     transition: width 0.36s;
 }
+</style>
 
-:deep(.q-field__native) {
-    padding-top: 10px;
-    padding-left: 5px;
-}
-
-:deep(.q-field--dark .q-field__native:focus) {
-    color: black;
-}
-
-:deep(.q-field--focused) {
-    .q-icon {
-        color: black;
-    }
-}
-
+<style lang="scss">
 .cursor-info {
     cursor: help;
 }
-
-.q-form {
-    display: flex;
-    align-items: center;
-    border-radius: 4px;
-    padding: 0 5px;
-    background-color: var(--vn-search-color);
-
-    &:hover {
-        background-color: var(--vn-search-color-hover);
-    }
-    &:focus-within {
+#searchbar {
+    .q-field--standout.q-field--highlighted .q-field__control {
         background-color: white;
-
+        color: black;
+        .q-field__native,
         .q-icon {
-            color: black;
+            color: black !important;
         }
     }
 }
-
-.q-icon {
-    color: var(--vn-label-color);
-}
 </style>
-<i18n>
-en:
-    link: click to search, ctrl + click to open in a new tab, shift + click to open in a new window
-es:
-    link: clic para buscar, ctrl + clic para abrir en una nueva pestaña, shift + clic para abrir en una nueva ventana
-</i18n>

src/components/ui/VnSms.vue

@@ -54,7 +54,6 @@ function formatNumber(number) {
                 :offset="100"
                 :limit="5"
                 auto-load
-                map-key="smsFk"
             >
                 <template #body="{ rows }">
                     <QCard

src/components/ui/VnUsesMana.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { defineProps, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();

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

@@ -1,78 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import CardSummary from 'src/components/ui/CardSummary.vue';
-import * as vueRouter from 'vue-router';
-
-describe('CardSummary', () => {
-    let vm;
-    let wrapper;
-
-    beforeAll(() => {
-        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
-    });
-
-    vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
-        query: {},
-        params: {},
-        meta: { moduleName: 'mockName' },
-        path: 'mockName/1/summary',
-        name: 'CardSummary',
-    });
-
-    beforeEach(() => {
-        wrapper = createWrapper(CardSummary, {
-            propsData: {
-                dataKey: 'cardSummaryKey',
-                url: 'cardSummaryUrl',
-                filter: 'cardFilter',
-            },
-        });
-        vm = wrapper.vm;
-        wrapper = wrapper.wrapper;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should fetch data correctly', async () => {
-        const fetchSpy = vi
-            .spyOn(vm.arrayData, 'fetch')
-            .mockResolvedValue({ data: [{ id: 1, name: 'Test Entity' }] });
-        await vm.fetch();
-
-        expect(fetchSpy).toHaveBeenCalledWith({ append: false, updateRouter: false });
-        expect(wrapper.emitted('onFetch')).toBeTruthy();
-        expect(vm.isLoading).toBe(false);
-    });
-
-    it('should set correct props to the store', () => {
-        expect(vm.store.url).toEqual('cardSummaryUrl');
-        expect(vm.store.filter).toEqual('cardFilter');
-    });
-
-    it('should compute entity correctly from store data', () => {
-        vm.store.data = [{ id: 1, name: 'Entity 1' }];
-        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
-    });
-
-    it('should handle empty data gracefully', () => {
-        vm.store.data = [];
-        expect(vm.entity).toBeUndefined();
-    });
-
-    it('should respond to prop changes and refetch data', async () => {
-        const newUrl = 'CardSummary/35';
-        const newKey = 'cardSummaryKey/35';
-        const fetchSpy = vi.spyOn(vm.arrayData, 'fetch');
-        await wrapper.setProps({ url: newUrl, filter: { key: newKey } });
-
-        expect(fetchSpy).toHaveBeenCalled();
-        expect(vm.store.url).toBe(newUrl);
-        expect(vm.store.filter).toEqual({ key: newKey });
-    });
-
-    it('should return true if route path ends with /summary' , () => {
-        expect(vm.isSummary).toBe(true);
-    });
-});

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

@@ -1,81 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import FetchedTags from 'src/components/ui/FetchedTags.vue';
-
-describe('tags computed property', () => {
-    it('returns an object with the correct keys and values', () => {
-        const vm = createWrapper(FetchedTags, {
-            props: {
-                item: {
-                    tag1: 'JavaScript',
-                    value1: 'Programming Language',
-                    tag2: 'Vue',
-                    value2: 'Framework',
-                    tag3: 'EmptyTag',
-                },
-                tag: 'tag',
-                value: 'value',
-                columns: 2,
-            },
-        }).vm;
-        expect(vm.tags).toEqual({
-            JavaScript: 'Programming Language',
-            Vue: 'Framework',
-            EmptyTag: '',
-        });
-    });
-
-    it('returns an empty object if the item prop is an empty object', () => {
-        const vm = createWrapper(FetchedTags, {
-            props: {
-                item: {},
-                tag: 'tag',
-                value: 'value',
-            },
-        }).vm;
-        expect(vm.tags).toEqual({});
-    });
-
-    it('should calculate the correct columnStyle when columns prop is defined', () => {
-        const vm = createWrapper(FetchedTags, {
-            props: {
-                item: {
-                    tag1: 'JavaScript',
-                    value1: 'Programming Language',
-                    tag2: 'Vue',
-                    value2: 'Framework',
-                    tag3: 'EmptyTag',
-                },
-                tag: 'tag',
-                value: 'value',
-                columns: 2,
-            },
-        }).vm;
-
-        const expectedStyle = {
-            'grid-template-columns': 'repeat(2, 1fr)',
-            'max-width': '8rem', 
-        };
-
-        expect(vm.columnStyle).toEqual(expectedStyle);
-    });
-
-    it('should return an empty object for columnStyle when columns prop is not defined', () => {
-        const vm = createWrapper(FetchedTags, {
-            props: {
-                item: {
-                    tag1: 'JavaScript',
-                    value1: 'Programming Language',
-                    tag2: 'Vue',
-                    value2: 'Framework',
-                    tag3: 'EmptyTag',
-                },
-                tag: 'tag',
-                value: 'value',
-                columns: null,
-            },
-        }).vm;
-
-        expect(vm.columnStyle).toEqual({});
-    });
-});

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

@@ -1,89 +0,0 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnImg from 'src/components/ui/VnImg.vue';
-
-let wrapper;
-let vm;
-const isEmployeeMock = vi.fn();
-
-function generateWrapper(storage = 'images') {
-    wrapper = createWrapper(VnImg, {
-        props: {
-            id: 123, 
-            zoomResolution: '400x400',
-            storage, 
-        }
-    });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm; 
-    vm.timeStamp = 'timestamp';   
-};
-
-vi.mock('src/composables/useSession', () => ({
-    useSession: () => ({
-      getTokenMultimedia: () => 'token',
-    }),
-}));
-  
-vi.mock('src/composables/useRole', () => ({
-    useRole: () => ({
-        isEmployee: isEmployeeMock,
-    }),
-}));
-
-
-describe('VnImg', () => {    
-    beforeEach(() => {
-        isEmployeeMock.mockReset();
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('getUrl', () => {
-        it('should return /api/{storage}/{id}/downloadFile?access_token={token} when storage is dms', async () => {
-            isEmployeeMock.mockReturnValue(false);
-            generateWrapper('dms');
-            await vm.$nextTick();
-            const url = vm.getUrl();
-            expect(url).toBe('/api/dms/123/downloadFile?access_token=token');    
-        });
-
-        it('should return /no-user.png when role is not employee and storage is not dms', async () => {
-            isEmployeeMock.mockReturnValue(false);
-            generateWrapper();
-            await vm.$nextTick();   
-            const url = vm.getUrl();
-            expect(url).toBe('/no-user.png');
-        });
-
-        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is false and role is employee and storage is not dms', async () => {
-            isEmployeeMock.mockReturnValue(true);
-            generateWrapper();
-            await vm.$nextTick();
-            const url = vm.getUrl();
-            expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
-        });
-
-        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
-            isEmployeeMock.mockReturnValue(true);
-            generateWrapper();
-            await vm.$nextTick();
-            const url = vm.getUrl(true);
-            expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
-        });
-    });
-
-    describe('reload', () => {
-        it('should update the timestamp', async () => {
-            generateWrapper();
-            const initialTimestamp = wrapper.vm.timeStamp;
-
-            wrapper.vm.reload();
-            const newTimestamp = wrapper.vm.timeStamp;
-       
-            expect(initialTimestamp).not.toEqual(newTimestamp);
-        });
-    });
-});

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

@@ -1,71 +0,0 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
-describe('VnSearchbar', () => {
-    let vm;
-    let wrapper;
-    let applyFilterSpy;
-    const searchText = 'Bolas de madera';
-    const userParams = {staticKey: 'staticValue'};
-
-    beforeEach(async () => {
-        wrapper = createWrapper(VnSearchbar, {
-            propsData: {
-                dataKey: 'testKey',
-                filter: null,
-                whereFilter: null,
-                searchRemoveParams: true,
-            },
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-
-        vm.searchText = searchText;
-        vm.arrayData.store.userParams = userParams;
-        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
-        
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('search resets pagination and applies filter', async () => {
-        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
-        await vm.search();
-
-        expect(resetPaginationSpy).toHaveBeenCalled();
-        expect(applyFilterSpy).toHaveBeenCalledWith({
-            params: { search: searchText },
-        });
-    });
-
-    it('search includes static params if searchRemoveParams is false', async () => {
-        wrapper.setProps({ searchRemoveParams: false });
-        await vm.$nextTick();
-        await vm.search();
-
-        expect(applyFilterSpy).toHaveBeenCalledWith({
-            params: { staticKey: 'staticValue', search: searchText },
-            filter: {skip: 0},
-        });
-    });
-
-    it('updates store when dataKey changes', async () => {
-        expect(vm.store.userParams).toEqual(userParams);
-        wrapper.setProps({ dataKey: 'newTestKey' });
-        await vm.$nextTick();
-        expect(vm.store.userParams).toEqual({});
-    });
-
-    it('computes the "to" property correctly for redirection', () => {
-        vm.arrayData.store.searchUrl = 'searchParam';
-        vm.arrayData.store.currentFilter = { category: 'plants' };
-        const expectedQuery = JSON.stringify({
-            ...vm.arrayData.store.currentFilter,
-            search: searchText,
-        });
-        expect(vm.to.query.searchParam).toBe(expectedQuery);
-    });
-});

src/composables/__tests__/getExchange.spec.js

@@ -1,45 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import axios from 'axios';
-import { getExchange } from 'src/composables/getExchange';
-
-vi.mock('axios');
-
-describe('getExchange()', () => {
-    it('should return the correct exchange rate', async () => {
-        axios.get.mockResolvedValue({
-            data: { value: 1.2 },
-        });
-
-        const amount = 100;
-        const currencyFk = 1;
-        const dated = '2023-01-01';
-        const result = await getExchange(amount, currencyFk, dated);
-
-        expect(result).toBe('83.33');
-    });
-
-    it('should return the correct exchange rate with custom decimal places', async () => {
-        axios.get.mockResolvedValue({
-            data: { value: 1.2 },
-        });
-
-        const amount = 100;
-        const currencyFk = 1;
-        const dated = '2023-01-01';
-        const decimalPlaces = 3;
-        const result = await getExchange(amount, currencyFk, dated, decimalPlaces);
-
-        expect(result).toBe('83.333');
-    });
-
-    it('should return null if the API call fails', async () => {
-        axios.get.mockRejectedValue(new Error('Network error'));
-
-        const amount = 100;
-        const currencyFk = 1;
-        const dated = '2023-01-01';
-        const result = await getExchange(amount, currencyFk, dated);
-
-        expect(result).toBeNull();
-    });
-});

src/composables/__tests__/getTotal.spec.js

@@ -1,55 +0,0 @@
-import { vi, describe, expect, it } from 'vitest';
-import { getTotal } from 'src/composables/getTotal';
-
-vi.mock('src/filters', () => ({
-    toCurrency: vi.fn((value, currency) => `${currency} ${value.toFixed(2)}`),
-}));
-
-describe('getTotal()', () => {
-    const rows = [
-        { amount: 10.5, tax: 2.1 },
-        { amount: 20.75, tax: 3.25 },
-        { amount: 30.25, tax: 4.75 },
-    ];
-
-    it('should calculate the total for a given key', () => {
-        const total = getTotal(rows, 'amount');
-        expect(total).toBe('61.50');
-    });
-
-    it('should calculate the total with a callback function', () => {
-        const total = getTotal(rows, null, { cb: (row) => row.amount + row.tax });
-        expect(total).toBe('71.60');
-    });
-
-    it('should format the total as currency', () => {
-        const total = getTotal(rows, 'amount', { currency: 'USD' });
-        expect(total).toBe('USD 61.50');
-    });
-
-    it('should format the total as currency with default currency', () => {
-        const total = getTotal(rows, 'amount', { currency: 'default' });
-        expect(total).toBe('undefined 61.50');
-    });
-
-    it('should calculate the total with integer formatting', () => {
-        const total = getTotal(rows, 'amount', { decimalPlaces: 0 });
-        expect(total).toBe('62');
-    });
-
-    it('should calculate the total with custom decimal places', () => {
-        const total = getTotal(rows, 'amount', { decimalPlaces: 1 });
-        expect(total).toBe('61.5');
-    });
-
-    it('should handle rows with missing keys', () => {
-        const rowsWithMissingKeys = [{ amount: 10.5 }, { amount: 20.75 }, {}];
-        const total = getTotal(rowsWithMissingKeys, 'amount');
-        expect(total).toBe('31.25');
-    });
-
-    it('should handle empty rows', () => {
-        const total = getTotal([], 'amount');
-        expect(total).toBe('0.00');
-    });
-});

src/composables/__tests__/useAccountShortToStandard.spec.js

@@ -1,9 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
-
-describe('useAccountShortToStandard()', () => {
-    it('should pad the decimal part with zeros for short numbers', () => {
-        expect(useAccountShortToStandard('123.45')).toBe('1230000045');
-        expect(useAccountShortToStandard('123.')).toBe('1230000000');
-    });
-});

src/composables/getExchange.js

@@ -1,16 +0,0 @@
-import axios from 'axios';
-export async function getExchange(amount, currencyFk, dated, decimalPlaces = 2) {
-    try {
-        const { data } = await axios.get('ReferenceRates/findOne', {
-            params: {
-                filter: {
-                    fields: ['value'],
-                    where: { currencyFk, dated },
-                },
-            },
-        });
-        return (amount / data.value).toFixed(decimalPlaces);
-    } catch (e) {
-        return null;
-    }
-}

src/composables/getTotal.js

@@ -1,10 +1,10 @@
 import { toCurrency } from 'src/filters';
 
 export function getTotal(rows, key, opts = {}) {
-    const { currency, cb, decimalPlaces } = opts;
+    const { currency, cb } = opts;
     const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
 
     return currency
         ? toCurrency(total, currency == 'default' ? undefined : currency)
-        : parseFloat(total).toFixed(decimalPlaces ?? 2);
+        : total;
 }

src/composables/useAccountShortToStandard.js

@@ -1,4 +0,0 @@
-export function useAccountShortToStandard(val) {
-    if (!val || !/^\d+(\.\d*)$/.test(val)) return;
-    return val?.replace('.', '0'.repeat(11 - val.length));
-}

src/composables/useArrayData.js

@@ -7,9 +7,7 @@ import { isDialogOpened } from 'src/filters';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key, userOptions) {
-    key ??= useRoute().meta.moduleName;
-
+export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@@ -27,17 +25,13 @@ export function useArrayData(key, userOptions) {
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
             const params = JSON.parse(query[searchUrl]);
-            const filter =
-                params?.filter && typeof params?.filter == 'object'
-                    ? params?.filter
-                    : JSON.parse(params?.filter ?? '{}');
+            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
 
-            store.userParams = params;
-            store.filter = { ...filter, ...store.userFilter };
+            store.userParams = { ...store.userParams, ...params };
+            store.userFilter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
-        setCurrentFilter();
     });
 
     if (key && userOptions) setOptions();
@@ -56,7 +50,6 @@ export function useArrayData(key, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
-            'keepData',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
@@ -68,7 +61,6 @@ export function useArrayData(key, userOptions) {
                     store[option] = userOptions.keepOpts?.includes(option)
                         ? Object.assign(defaultOpts, store[option])
                         : defaultOpts;
-                    if (option === 'userParams') store.defaultParams = store[option];
                 }
             }
         }
@@ -79,7 +71,31 @@ export function useArrayData(key, userOptions) {
 
         cancelRequest();
         canceller = new AbortController();
-        const { params, limit } = setCurrentFilter();
+
+        const filter = {
+            limit: store.limit,
+        };
+
+        let userParams = { ...store.userParams };
+
+        Object.assign(filter, store.userFilter);
+
+        let where;
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        Object.assign(filter, store.filter);
+        filter.where = where;
+        const params = { filter };
+
+        Object.assign(params, userParams);
+        if (params.filter) params.filter.skip = store.skip;
+        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order?.length) params.filter.order = [...store.order];
+        else delete params.filter.order;
+
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
 
         let exprFilter;
         if (store?.exprBuilder) {
@@ -101,16 +117,15 @@ export function useArrayData(key, userOptions) {
             params,
         });
 
+        const { limit } = filter;
         store.hasMoreData = limit && response.data.length >= limit;
 
-        if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
-        }
+        processData(response.data, { map: !!store.mapKey, append });
+        if (!append && !isDialogOpened()) updateRouter && updateStateParams();
+
         store.isLoading = false;
         canceller = null;
 
-        processData(response.data, { map: !!store.mapKey, append });
-
         return response;
     }
 
@@ -128,10 +143,6 @@ export function useArrayData(key, userOptions) {
         if (arrayDataStore.get(key)) arrayDataStore.reset(key, opts);
     }
 
-    function resetPagination() {
-        if (arrayDataStore.get(key)) arrayDataStore.resetPagination(key);
-    }
-
     function cancelRequest() {
         if (canceller) {
             canceller.abort();
@@ -139,12 +150,12 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function applyFilter({ filter, params }, fetchOptions = {}) {
+    async function applyFilter({ filter, params }) {
         if (filter) store.userFilter = filter;
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch(fetchOptions);
+        const response = await fetch({});
         return response;
     }
 
@@ -155,7 +166,7 @@ export function useArrayData(key, userOptions) {
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-        resetPagination();
+        reset(['skip', 'filter.skip', 'page']);
 
         await fetch({});
         return { filter, params };
@@ -170,9 +181,10 @@ export function useArrayData(key, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        const order = toArray(store.order);
+        let order = store.order || [];
+        if (typeof order == 'string') order = [order];
 
-        let index = getOrderIndex(order, field);
+        let index = order.findIndex((o) => o.split(' ')[0] === field);
         if (index > -1) {
             order[index] = newOrder;
         } else {
@@ -181,7 +193,7 @@ export function useArrayData(key, userOptions) {
         }
 
         store.order = order;
-        resetPagination();
+        reset(['skip', 'filter.skip', 'page']);
         fetch({});
         index++;
 
@@ -189,24 +201,16 @@ export function useArrayData(key, userOptions) {
     }
 
     async function deleteOrder(field) {
-        const order = toArray(store.order);
-        const index = getOrderIndex(order, field);
+        let order = store.order ?? [];
+        if (typeof order == 'string') order = [order];
+
+        const index = order.findIndex((o) => o.split(' ')[0] === field);
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
         fetch({});
     }
 
-    function getOrderIndex(order, field) {
-        return order.findIndex((o) => o.split(' ')[0] === field);
-    }
-
-    function toArray(str = []) {
-        if (!str) return [];
-        if (Array.isArray(str)) return str;
-        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
-    }
-
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -247,7 +251,7 @@ export function useArrayData(key, userOptions) {
         if (Object.values(store.userParams).length) await fetch({});
     }
 
-    function updateStateParams(data) {
+    function updateStateParams() {
         if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         if (store?.searchUrl)
@@ -264,53 +268,22 @@ export function useArrayData(key, userOptions) {
             const { path } = matches.at(-1);
 
             const to =
-                data?.length === 1
-                    ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
+                store?.data?.length === 1
+                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
                     : path.replace(/:id.*/, '');
 
             if (route.path != to) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                return router.push(pushUrl) && { redirect: true };
+                else destroy();
+                return router.push(pushUrl);
             }
         }
 
         router.replace(newUrl);
     }
 
-    function getCurrentFilter() {
-        if (!Object.keys(store.userParams).length)
-            store.userParams = store.defaultParams ?? {};
-
-        const filter = {
-            limit: store.limit,
-            ...store.userFilter,
-        };
-
-        let where;
-        if (filter?.where || store.filter?.where)
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
-        Object.assign(filter, store.filter);
-        filter.where = where;
-        const params = { filter };
-
-        Object.assign(params, store.userParams);
-        if (params.filter) params.filter.skip = store.skip;
-        if (store.order) params.filter.order = toArray(store.order);
-        else delete params.filter.order;
-
-        return { filter, params, limit: filter.limit };
-    }
-
-    function setCurrentFilter() {
-        const { params, limit } = getCurrentFilter();
-        store.currentFilter = JSON.parse(JSON.stringify(params));
-        delete store.currentFilter.filter.include;
-        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
-        return { params, limit };
-    }
-
     function processData(data, { map = true, append = true }) {
         if (!append) {
             store.data = [];
@@ -323,7 +296,7 @@ export function useArrayData(key, userOptions) {
             for (const row of data) {
                 const key = row[store.mapKey];
                 const val = { ...row, key };
-                if (key && store.map.has(key)) {
+                if (store.map.has(key)) {
                     const { position } = store.map.get(key);
                     val.position = position;
                     store.map.set(key, val);
@@ -343,8 +316,6 @@ export function useArrayData(key, userOptions) {
         fetch,
         applyFilter,
         addFilter,
-        getCurrentFilter,
-        setCurrentFilter,
         addFilterWhere,
         addOrder,
         deleteOrder,
@@ -357,6 +328,5 @@ export function useArrayData(key, userOptions) {
         isLoading,
         deleteOption,
         reset,
-        resetPagination,
     };
 }

src/composables/useCau.js

@@ -1,73 +0,0 @@
-import VnInput from 'src/components/common/VnInput.vue';
-import { useVnConfirm } from 'src/composables/useVnConfirm';
-import axios from 'axios';
-import { ref } from 'vue';
-import { i18n } from 'src/boot/i18n';
-import useNotify from 'src/composables/useNotify.js';
-
-export async function useCau(res, message) {
-    const { notify } = useNotify();
-    const { openConfirmationModal } = useVnConfirm();
-    const { config, headers, request, status, statusText, data } = res || {};
-    const { params, url, method, signal, headers: confHeaders } = config || {};
-    const { message: resMessage, code, name } = data?.error || {};
-
-    const additionalData = {
-        path: location.hash,
-        message: resMessage,
-        code,
-        request: request?.responseURL,
-        status,
-        name,
-        statusText: statusText,
-        config: {
-            url,
-            method,
-            params,
-            headers: confHeaders,
-            aborted: signal?.aborted,
-            version: headers?.['salix-version'],
-        },
-    };
-    const opts = {
-        actions: [
-            {
-                icon: 'support_agent',
-                color: 'primary',
-                dense: true,
-                flat: false,
-                round: true,
-                handler: async () => {
-                    const locale = i18n.global.t;
-                    const reason = ref(
-                        code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : ''
-                    );
-                    openConfirmationModal(
-                        locale('cau.title'),
-                        locale('cau.subtitle'),
-                        async () => {
-                            await axios.post('OsTickets/send-to-support', {
-                                reason: reason.value,
-                                additionalData,
-                            });
-                        },
-                        null,
-                        {
-                            component: VnInput,
-                            props: {
-                                modelValue: reason,
-                                'onUpdate:modelValue': (val) => (reason.value = val),
-                                label: locale('cau.inputLabel'),
-                                class: 'full-width',
-                                required: true,
-                                autofocus: true,
-                            },
-                        }
-                    );
-                },
-            },
-        ],
-    };
-
-    notify(message ?? 'globals.error', 'negative', 'error', opts);
-}

src/composables/useFilterParams.js

@@ -1,69 +0,0 @@
-import { useArrayData } from 'src/composables/useArrayData';
-import { onBeforeMount, ref, watch } from 'vue';
-
-export function useFilterParams(key) {
-    if (!key) throw new Error('ArrayData: A key is required to use this composable');
-    const params = ref({});
-    const orders = ref({});
-    const arrayData = ref({});
-
-    onBeforeMount(() => {
-        arrayData.value = useArrayData(key);
-    });
-
-    watch(
-        () => arrayData.value.store?.currentFilter,
-        (val, oldValue) => (val || oldValue) && setUserParams(val),
-        { immediate: true, deep: true }
-    );
-
-    function parseOrder(urlOrders) {
-        const orderObject = {};
-        if (urlOrders) {
-            if (typeof urlOrders == 'string') urlOrders = [urlOrders];
-            for (const [index, orders] of urlOrders.entries()) {
-                const [name, direction] = orders.split(' ');
-                orderObject[name] = { direction, index: index + 1 };
-            }
-        }
-        orders.value = orderObject;
-    }
-
-    function setUserParams(watchedParams = {}) {
-        if (Object.keys(watchedParams).length == 0) {
-            params.value = {};
-            orders.value = {};
-            return;
-        }
-
-        if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-        if (typeof watchedParams?.filter == 'string')
-            watchedParams.filter = JSON.parse(watchedParams.filter);
-
-        watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
-        parseOrder(watchedParams.filter?.order);
-
-        delete watchedParams.filter;
-        params.value = sanitizer(watchedParams);
-    }
-
-    function sanitizer(params) {
-        for (const [key, value] of Object.entries(params)) {
-            if (key === 'and' && Array.isArray(value)) {
-                value.forEach((item) => {
-                    Object.assign(params, item);
-                });
-                delete params[key];
-            } else if (value && typeof value === 'object') {
-                const param = Object.values(value)[0];
-                if (typeof param == 'string') params[key] = param.replaceAll('%', '');
-            }
-        }
-        return params;
-    }
-
-    return {
-        params,
-        orders,
-    };
-}

src/composables/useHasAccount.js

@@ -1,6 +0,0 @@
-import axios from 'axios';
-
-export default async (id) => {
-    const { data } = await axios.get(`Accounts/${id}/exists`);
-    return data.exists;
-};

src/composables/useHasContent.js

@@ -1,24 +0,0 @@
-import { onMounted, ref } from 'vue';
-
-export function useHasContent(selector) {
-    const container = ref({});
-    const hasContent = ref();
-
-    onMounted(() => {
-        container.value = document?.querySelector(selector);
-        if (!container.value) return;
-
-        const observer = new MutationObserver(() => {
-            if (document.querySelector(selector))
-                hasContent.value = !!container.value.childNodes.length;
-        });
-
-        observer.observe(container.value, {
-            subtree: true,
-            childList: true,
-            attributes: true,
-        });
-    });
-
-    return hasContent;
-}

src/composables/useNotify.js

@@ -2,7 +2,7 @@ import { Notify } from 'quasar';
 import { i18n } from 'src/boot/i18n';
 
 export default function useNotify() {
-    const notify = (message, type, icon, opts = {}) => {
+    const notify = (message, type, icon) => {
         const defaultIcons = {
             warning: 'warning',
             negative: 'error',
@@ -13,7 +13,6 @@ export default function useNotify() {
             message: i18n.global.t(message),
             type: type,
             icon: icon ? icon : defaultIcons[type],
-            ...opts,
         });
     };
 

src/composables/useSession.js

@@ -6,7 +6,6 @@ import axios from 'axios';
 import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
-import { getToken, getTokenMultimedia } from 'src/utils/session';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
@@ -16,6 +15,19 @@ export function useSession() {
     let isCheckingToken = false;
     let intervalId = null;
 
+    function getToken() {
+        const localToken = localStorage.getItem(TOKEN);
+        const sessionToken = sessionStorage.getItem(TOKEN);
+
+        return localToken || sessionToken || '';
+    }
+    function getTokenMultimedia() {
+        const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
+        const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
+
+        return localTokenMultimedia || sessionTokenMultimedia || '';
+    }
+
     function setSession(data) {
         let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;

src/composables/useSummaryDialog.js

@@ -4,10 +4,10 @@ import { useQuasar } from 'quasar';
 export function useSummaryDialog() {
     const quasar = useQuasar();
 
-    function viewSummary(id, summary, width) {
+    function viewSummary(id, summary) {
         quasar.dialog({
             component: VnSummaryDialog,
-            componentProps: { id, summary, width },
+            componentProps: { id, summary },
         });
     }
 

src/composables/useVnConfirm.js

@@ -1,29 +1,22 @@
-import { h } from 'vue';
-import { Dialog } from 'quasar';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import { useQuasar } from 'quasar';
 
 export function useVnConfirm() {
-    const openConfirmationModal = (
-        title,
-        message,
-        promise,
-        successFn,
-        customHTML = {}
-    ) => {
-        const { component, props } = customHTML;
-        Dialog.create({
-            component: h(
-                VnConfirm,
-                {
+    const quasar = useQuasar();
+
+    const openConfirmationModal = (title, message, promise, successFn) => {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
                     title: title,
                     message: message,
                     promise: promise,
                 },
-                { customHTML: () => h(component, props) }
-            ),
-        }).onOk(async () => {
-            if (successFn) successFn();
-        });
+            })
+            .onOk(async () => {
+                if (successFn) successFn();
+            });
     };
 
     return { openConfirmationModal };

src/css/app.scss

@@ -1,25 +1,21 @@
 // app global css in SCSS form
 @import './icons.scss';
-@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.scss';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
 
 body.body--light {
+    --font-color: black;
     --vn-header-color: #cecece;
     --vn-page-color: #ffffff;
     --vn-section-color: #e0e0e0;
     --vn-section-hover-color: #b9b9b9;
-    --vn-text-color: black;
+    --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
-    --vn-search-color: #d4d4d4;
-    --vn-search-color-hover: #cfcfcf;
-    --vn-empty-tag: #acacac;
-    --vn-black-text-color: black;
-    --vn-text-color-contrast: white;
 
     background-color: var(--vn-page-color);
 
     .q-header .q-toolbar {
-        color: var(--vn-text-color);
+        color: var(--font-color);
     }
 }
 body.body--dark {
@@ -30,11 +26,6 @@ body.body--dark {
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
-    --vn-search-color: #4b4b4b;
-    --vn-search-color-hover: #5b5b5b;
-    --vn-empty-tag: #2d2d2d;
-    --vn-black-text-color: black;
-    --vn-text-color-contrast: black;
 
     background-color: var(--vn-page-color);
 }
@@ -93,10 +84,6 @@ select:-webkit-autofill {
     background-color: var(--vn-section-hover-color);
 }
 
-.bg-vn-page {
-    background-color: var(--vn-page-color);
-}
-
 .color-vn-label {
     color: var(--vn-label-color);
 }
@@ -162,8 +149,7 @@ select:-webkit-autofill {
 .q-card,
 .q-table,
 .q-table__bottom,
-.q-drawer,
-.bottomButton {
+.q-drawer {
     background-color: var(--vn-section-color);
 }
 
@@ -200,7 +186,7 @@ select:-webkit-autofill {
 
 .q-tooltip {
     background-color: var(--vn-page-color);
-    color: var(--vn-text-color);
+    color: var(--font-color);
     font-size: medium;
 }
 
@@ -254,7 +240,7 @@ input::-webkit-inner-spin-button {
 .q-table {
     th,
     td {
-        padding: 1px 3px 1px 3px;
+        padding: 1px 10px 1px 10px;
         max-width: 130px;
         div span {
             overflow: hidden;
@@ -310,28 +296,3 @@ input::-webkit-inner-spin-button {
 .no-visible {
     visibility: hidden;
 }
-
-.q-item > .q-item__section:has(.q-checkbox) {
-    max-width: fit-content;
-}
-
-.row > .column:has(.q-checkbox) {
-    max-width: fit-content;
-}
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-        display: flex;
-        align-items: flex-end;
-        padding-bottom: 2px;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}
-
-.q-date__header-today {
-    border-radius: 12px;
-    border: 1px solid;
-    box-shadow: 0 4px 6px #00000000;
-}