Compare commits
No commits in common. "dev" and "7995-CreateHasAcl" have entirely different histories.
dev
...
7995-Creat
|
@ -0,0 +1,6 @@
|
||||||
|
/dist
|
||||||
|
/src-capacitor
|
||||||
|
/src-cordova
|
||||||
|
/.quasar
|
||||||
|
/node_modules
|
||||||
|
.eslintrc.js
|
|
@ -0,0 +1,75 @@
|
||||||
|
export default {
|
||||||
|
// https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
|
||||||
|
// This option interrupts the configuration hierarchy at this file
|
||||||
|
// Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
|
||||||
|
root: true,
|
||||||
|
|
||||||
|
parserOptions: {
|
||||||
|
ecmaVersion: '2021', // Allows for the parsing of modern ECMAScript features
|
||||||
|
},
|
||||||
|
|
||||||
|
env: {
|
||||||
|
node: true,
|
||||||
|
browser: true,
|
||||||
|
'vue/setup-compiler-macros': true,
|
||||||
|
},
|
||||||
|
|
||||||
|
// Rules order is important, please avoid shuffling them
|
||||||
|
extends: [
|
||||||
|
// Base ESLint recommended rules
|
||||||
|
'eslint:recommended',
|
||||||
|
|
||||||
|
// Uncomment any of the lines below to choose desired strictness,
|
||||||
|
// but leave only one uncommented!
|
||||||
|
// See https://eslint.vuejs.org/rules/#available-rules
|
||||||
|
// 'plugin:vue/vue3-essential', // Priority A: Essential (Error Prevention)
|
||||||
|
'plugin:vue/vue3-strongly-recommended', // Priority B: Strongly Recommended (Improving Readability)
|
||||||
|
// 'plugin:vue/vue3-recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
|
||||||
|
|
||||||
|
// https://github.com/prettier/eslint-config-prettier#installation
|
||||||
|
// usage with Prettier, provided by 'eslint-config-prettier'.
|
||||||
|
'prettier',
|
||||||
|
],
|
||||||
|
|
||||||
|
plugins: [
|
||||||
|
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-files
|
||||||
|
// required to lint *.vue files
|
||||||
|
'vue',
|
||||||
|
|
||||||
|
// https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674
|
||||||
|
// Prettier has not been included as plugin to avoid performance impact
|
||||||
|
// add it as an extension for your IDE
|
||||||
|
],
|
||||||
|
|
||||||
|
globals: {
|
||||||
|
ga: 'readonly', // Google Analytics
|
||||||
|
cordova: 'readonly',
|
||||||
|
__statics: 'readonly',
|
||||||
|
__QUASAR_SSR__: 'readonly',
|
||||||
|
__QUASAR_SSR_SERVER__: 'readonly',
|
||||||
|
__QUASAR_SSR_CLIENT__: 'readonly',
|
||||||
|
__QUASAR_SSR_PWA__: 'readonly',
|
||||||
|
process: 'readonly',
|
||||||
|
Capacitor: 'readonly',
|
||||||
|
chrome: 'readonly',
|
||||||
|
},
|
||||||
|
|
||||||
|
// add your custom rules here
|
||||||
|
rules: {
|
||||||
|
'prefer-promise-reject-errors': 'off',
|
||||||
|
'no-unused-vars': 'warn',
|
||||||
|
'vue/no-multiple-template-root': 'off',
|
||||||
|
// allow debugger during development only
|
||||||
|
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
|
||||||
|
},
|
||||||
|
overrides: [
|
||||||
|
{
|
||||||
|
files: ['test/cypress/**/*.*'],
|
||||||
|
extends: [
|
||||||
|
// Add Cypress-specific lint rules, globals and Cypress plugin
|
||||||
|
// See https://github.com/cypress-io/eslint-plugin-cypress#rules
|
||||||
|
'plugin:cypress/recommended',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"extends": ["plugin:cypress/recommended"]
|
|
||||||
}
|
|
|
@ -125,10 +125,8 @@ pipeline {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
||||||
|
|
||||||
def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
|
|
||||||
echo "E2E MODULES: ${modules}"
|
|
||||||
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
||||||
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
|
sh 'sh test/cypress/cypressParallel.sh 1'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -185,4 +183,3 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,6 @@ export default defineConfig({
|
||||||
supportFile: 'test/cypress/support/index.js',
|
supportFile: 'test/cypress/support/index.js',
|
||||||
videosFolder: 'test/cypress/videos',
|
videosFolder: 'test/cypress/videos',
|
||||||
downloadsFolder: 'test/cypress/downloads',
|
downloadsFolder: 'test/cypress/downloads',
|
||||||
tmpUploadFolder: 'test/cypress/storage/tmp/dms',
|
|
||||||
video: false,
|
video: false,
|
||||||
specPattern: 'test/cypress/integration/**/*.spec.js',
|
specPattern: 'test/cypress/integration/**/*.spec.js',
|
||||||
experimentalRunAllSpecs: true,
|
experimentalRunAllSpecs: true,
|
||||||
|
|
|
@ -1,87 +0,0 @@
|
||||||
import cypress from 'eslint-plugin-cypress';
|
|
||||||
import eslint from 'eslint-plugin-import';
|
|
||||||
import globals from 'globals';
|
|
||||||
import js from '@eslint/js';
|
|
||||||
import vue from 'eslint-plugin-vue';
|
|
||||||
export default {
|
|
||||||
plugins: { vue, eslint, cypress },
|
|
||||||
languageOptions: {
|
|
||||||
globals: {
|
|
||||||
...globals.node,
|
|
||||||
...globals.browser,
|
|
||||||
...vue.configs['vue3-strongly-recommended'].globals,
|
|
||||||
...cypress.environments.globals.globals,
|
|
||||||
ga: 'readonly',
|
|
||||||
cordova: 'readonly',
|
|
||||||
__statics: 'readonly',
|
|
||||||
__QUASAR_SSR__: 'readonly',
|
|
||||||
__QUASAR_SSR_SERVER__: 'readonly',
|
|
||||||
__QUASAR_SSR_CLIENT__: 'readonly',
|
|
||||||
__QUASAR_SSR_PWA__: 'readonly',
|
|
||||||
process: 'readonly',
|
|
||||||
Capacitor: 'readonly',
|
|
||||||
chrome: 'readonly',
|
|
||||||
},
|
|
||||||
|
|
||||||
ecmaVersion: 2020,
|
|
||||||
sourceType: 'module',
|
|
||||||
|
|
||||||
parserOptions: {
|
|
||||||
parser: '@babel/eslint-parser',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
...vue.rules['flat/strongly-recommended'],
|
|
||||||
...js.configs.recommended.rules,
|
|
||||||
semi: 'off',
|
|
||||||
'generator-star-spacing': 'warn',
|
|
||||||
'arrow-parens': 'warn',
|
|
||||||
'no-var': 'error',
|
|
||||||
'prefer-const': 'error',
|
|
||||||
'prefer-template': 'warn',
|
|
||||||
'prefer-destructuring': 'off',
|
|
||||||
'prefer-spread': 'warn',
|
|
||||||
'prefer-rest-params': 'warn',
|
|
||||||
'prefer-object-spread': 'warn',
|
|
||||||
'prefer-arrow-callback': 'warn',
|
|
||||||
'prefer-numeric-literals': 'warn',
|
|
||||||
'prefer-exponentiation-operator': 'warn',
|
|
||||||
'prefer-regex-literals': 'warn',
|
|
||||||
'one-var': [
|
|
||||||
'error',
|
|
||||||
{
|
|
||||||
let: 'never',
|
|
||||||
const: 'never',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
'no-void': 'off',
|
|
||||||
'prefer-promise-reject-errors': 'error',
|
|
||||||
'multiline-ternary': 'warn',
|
|
||||||
'no-restricted-imports': 'warn',
|
|
||||||
'no-import-assign': 'warn',
|
|
||||||
'no-duplicate-imports': 'warn',
|
|
||||||
'no-useless-rename': 'warn',
|
|
||||||
'eslint/no-named-as-default': 'warn',
|
|
||||||
'eslint/no-named-as-default-member': 'warn',
|
|
||||||
'no-unsafe-optional-chaining': 'warn',
|
|
||||||
'no-undef': 'error',
|
|
||||||
'no-unused-vars': 'error',
|
|
||||||
'no-console': 'error',
|
|
||||||
'no-debugger': 'error',
|
|
||||||
'no-useless-escape': 'error',
|
|
||||||
'no-prototype-builtins': 'error',
|
|
||||||
'no-async-promise-executor': 'error',
|
|
||||||
'no-irregular-whitespace': 'error',
|
|
||||||
'no-constant-condition': 'error',
|
|
||||||
'no-unsafe-finally': 'error',
|
|
||||||
'no-extend-native': 'error',
|
|
||||||
},
|
|
||||||
ignores: [
|
|
||||||
'/dist',
|
|
||||||
'/src-capacitor',
|
|
||||||
'/src-cordova',
|
|
||||||
'/.quasar',
|
|
||||||
'/node_modules',
|
|
||||||
'.eslintrc.js',
|
|
||||||
],
|
|
||||||
};
|
|
27
package.json
27
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.18.0",
|
"version": "25.16.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
@ -9,8 +9,7 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"resetDatabase": "cd ../salix && gulp docker",
|
"resetDatabase": "cd ../salix && gulp docker",
|
||||||
"lint": "eslint \"**/*.{vue,js}\" ",
|
"lint": "eslint --ext .js,.vue ./",
|
||||||
"lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
|
|
||||||
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
||||||
"test:e2e": "cypress open",
|
"test:e2e": "cypress open",
|
||||||
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
"test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
|
||||||
|
@ -18,8 +17,6 @@
|
||||||
"test:e2e:summary": "bash ./test/cypress/summary.sh",
|
"test:e2e:summary": "bash ./test/cypress/summary.sh",
|
||||||
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
"test": "echo \"See package.json => scripts for available tests.\" && exit 0",
|
||||||
"test:front": "vitest",
|
"test:front": "vitest",
|
||||||
"test:ui": "vitest --ui",
|
|
||||||
"test:coverage": "vitest run --coverage",
|
|
||||||
"test:front:ci": "vitest run",
|
"test:front:ci": "vitest run",
|
||||||
"commitlint": "commitlint --edit",
|
"commitlint": "commitlint --edit",
|
||||||
"prepare": "npx husky install",
|
"prepare": "npx husky install",
|
||||||
|
@ -29,53 +26,43 @@
|
||||||
"docs:preview": "vitepress preview docs"
|
"docs:preview": "vitepress preview docs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint/eslintrc": "^3.2.0",
|
|
||||||
"@eslint/js": "^9.20.0",
|
|
||||||
"@quasar/cli": "^2.4.1",
|
"@quasar/cli": "^2.4.1",
|
||||||
"@quasar/extras": "^1.16.16",
|
"@quasar/extras": "^1.16.16",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"chromium": "^3.0.3",
|
"chromium": "^3.0.3",
|
||||||
"croppie": "^2.6.5",
|
"croppie": "^2.6.5",
|
||||||
"es-module-lexer": "^1.6.0",
|
|
||||||
"fast-glob": "^3.3.3",
|
|
||||||
"moment": "^2.30.1",
|
"moment": "^2.30.1",
|
||||||
"pinia": "^2.1.3",
|
"pinia": "^2.1.3",
|
||||||
"quasar": "^2.17.7",
|
"quasar": "^2.17.7",
|
||||||
"validator": "^13.9.0",
|
"validator": "^13.9.0",
|
||||||
"vue": "^3.5.13",
|
"vue": "^3.5.13",
|
||||||
"vue-i18n": "^9.4.0",
|
"vue-i18n": "^9.3.0",
|
||||||
"vue-router": "^4.2.5"
|
"vue-router": "^4.2.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/cli": "^19.2.1",
|
"@commitlint/cli": "^19.2.1",
|
||||||
"@commitlint/config-conventional": "^19.1.0",
|
"@commitlint/config-conventional": "^19.1.0",
|
||||||
"@eslint/eslintrc": "^3.2.0",
|
"@intlify/unplugin-vue-i18n": "^0.8.2",
|
||||||
"@eslint/js": "^9.20.0",
|
|
||||||
"@intlify/unplugin-vue-i18n": "^4.0.0",
|
|
||||||
"@pinia/testing": "^0.1.2",
|
"@pinia/testing": "^0.1.2",
|
||||||
"@quasar/app-vite": "^2.0.8",
|
"@quasar/app-vite": "^2.0.8",
|
||||||
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
"@quasar/quasar-app-extension-qcalendar": "^4.0.2",
|
||||||
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
"@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
|
||||||
"@vitest/ui": "3.1.1",
|
|
||||||
"@vue/compiler-sfc": "^3.5.13",
|
|
||||||
"@vue/test-utils": "^2.4.4",
|
"@vue/test-utils": "^2.4.4",
|
||||||
"autoprefixer": "^10.4.14",
|
"autoprefixer": "^10.4.14",
|
||||||
"cypress": "^14.1.0",
|
"cypress": "^14.1.0",
|
||||||
"cypress-mochawesome-reporter": "^3.8.2",
|
"cypress-mochawesome-reporter": "^3.8.2",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.18.0",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
"eslint-import-resolver-alias": "^1.1.2",
|
|
||||||
"eslint-plugin-cypress": "^4.1.0",
|
"eslint-plugin-cypress": "^4.1.0",
|
||||||
"eslint-plugin-import": "^2.31.0",
|
|
||||||
"eslint-plugin-vue": "^9.32.0",
|
"eslint-plugin-vue": "^9.32.0",
|
||||||
"globals": "^16.0.0",
|
|
||||||
"husky": "^8.0.0",
|
"husky": "^8.0.0",
|
||||||
"junit-merge": "^2.0.0",
|
"junit-merge": "^2.0.0",
|
||||||
"mocha": "^11.1.0",
|
"mocha": "^11.1.0",
|
||||||
"postcss": "^8.4.23",
|
"postcss": "^8.4.23",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.4.2",
|
||||||
"sass": "^1.83.4",
|
"sass": "^1.83.4",
|
||||||
"vitest": "^3.0.3",
|
"vitepress": "^1.6.3",
|
||||||
|
"vitest": "^0.34.0",
|
||||||
"xunit-viewer": "^10.6.1"
|
"xunit-viewer": "^10.6.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
@ -89,4 +76,4 @@
|
||||||
"vite": "^6.0.11",
|
"vite": "^6.0.11",
|
||||||
"vitest": "^0.31.1"
|
"vitest": "^0.31.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
4012
pnpm-lock.yaml
4012
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
|
||||||
build: {
|
build: {
|
||||||
target: {
|
target: {
|
||||||
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
||||||
node: 'node20',
|
node: 'node18',
|
||||||
},
|
},
|
||||||
|
|
||||||
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
||||||
|
@ -92,7 +92,6 @@ export default configure(function (/* ctx */) {
|
||||||
vitePlugins: [
|
vitePlugins: [
|
||||||
[
|
[
|
||||||
VueI18nPlugin({
|
VueI18nPlugin({
|
||||||
strictMessage: false,
|
|
||||||
runtimeOnly: false,
|
runtimeOnly: false,
|
||||||
include: [
|
include: [
|
||||||
path.resolve(__dirname, './src/i18n/locale/**'),
|
path.resolve(__dirname, './src/i18n/locale/**'),
|
||||||
|
|
|
@ -1,227 +0,0 @@
|
||||||
/* eslint-disable */
|
|
||||||
/**
|
|
||||||
* THIS FILE IS GENERATED AUTOMATICALLY.
|
|
||||||
* 1. DO NOT edit this file directly as it won't do anything.
|
|
||||||
* 2. EDIT the original quasar.config file INSTEAD.
|
|
||||||
* 3. DO NOT git commit this file. It should be ignored.
|
|
||||||
*
|
|
||||||
* This file is still here because there was an error in
|
|
||||||
* the original quasar.config file and this allows you to
|
|
||||||
* investigate the Node.js stack error.
|
|
||||||
*
|
|
||||||
* After you fix the original file, this file will be
|
|
||||||
* deleted automatically.
|
|
||||||
**/
|
|
||||||
|
|
||||||
|
|
||||||
// quasar.config.js
|
|
||||||
import { configure } from "quasar/wrappers";
|
|
||||||
import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
|
|
||||||
import path from "path";
|
|
||||||
var __quasar_inject_dirname__ = "/home/jsegarra/Projects/salix-front";
|
|
||||||
var target = `http://${process.env.CI ? "back" : "localhost"}:3000`;
|
|
||||||
var quasar_config_default = configure(function() {
|
|
||||||
return {
|
|
||||||
eslint: {
|
|
||||||
// fix: true,
|
|
||||||
// include = [],
|
|
||||||
// exclude = [],
|
|
||||||
// rawOptions = {},
|
|
||||||
warnings: true,
|
|
||||||
errors: true
|
|
||||||
},
|
|
||||||
// https://v2.quasar.dev/quasar-cli/prefetch-feature
|
|
||||||
// preFetch: true,
|
|
||||||
// app boot file (/src/boot)
|
|
||||||
// --> boot files are part of "main.js"
|
|
||||||
// https://v2.quasar.dev/quasar-cli/boot-files
|
|
||||||
boot: ["i18n", "axios", "vnDate", "validations", "quasar", "quasar.defaults"],
|
|
||||||
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
|
|
||||||
css: ["app.scss"],
|
|
||||||
// https://github.com/quasarframework/quasar/tree/dev/extras
|
|
||||||
extras: [
|
|
||||||
// 'ionicons-v4',
|
|
||||||
// 'mdi-v5',
|
|
||||||
// 'fontawesome-v6',
|
|
||||||
// 'eva-icons',
|
|
||||||
// 'themify',
|
|
||||||
// 'line-awesome',
|
|
||||||
// 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
|
|
||||||
"roboto-font",
|
|
||||||
"material-icons-outlined",
|
|
||||||
"material-symbols-outlined"
|
|
||||||
],
|
|
||||||
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
|
|
||||||
build: {
|
|
||||||
target: {
|
|
||||||
browser: ["es2022", "edge88", "firefox78", "chrome87", "safari13.1"],
|
|
||||||
node: "node20"
|
|
||||||
},
|
|
||||||
vueRouterMode: "hash",
|
|
||||||
// available values: 'hash', 'history'
|
|
||||||
// vueRouterBase,
|
|
||||||
// vueDevtools,
|
|
||||||
// vueOptionsAPI: false,
|
|
||||||
// rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
|
|
||||||
// publicPath: '/',
|
|
||||||
// analyze: true,
|
|
||||||
// env: {},
|
|
||||||
rawDefine: {
|
|
||||||
"process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
|
|
||||||
},
|
|
||||||
// ignorePublicFolder: true,
|
|
||||||
// minify: false,
|
|
||||||
// polyfillModulePreload: true,
|
|
||||||
// distDir
|
|
||||||
extendViteConf(viteConf) {
|
|
||||||
delete viteConf.build.polyfillModulePreload;
|
|
||||||
viteConf.build.modulePreload = {
|
|
||||||
polyfill: false
|
|
||||||
};
|
|
||||||
},
|
|
||||||
// viteVuePluginOptions: {},
|
|
||||||
alias: {
|
|
||||||
composables: path.join(__quasar_inject_dirname__, "./src/composables"),
|
|
||||||
filters: path.join(__quasar_inject_dirname__, "./src/filters")
|
|
||||||
},
|
|
||||||
vitePlugins: [
|
|
||||||
[
|
|
||||||
VueI18nPlugin({
|
|
||||||
strictMessage: false,
|
|
||||||
runtimeOnly: false,
|
|
||||||
include: [
|
|
||||||
path.resolve(__quasar_inject_dirname__, "./src/i18n/locale/**"),
|
|
||||||
path.resolve(__quasar_inject_dirname__, "./src/pages/**/locale/**")
|
|
||||||
]
|
|
||||||
})
|
|
||||||
]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
|
|
||||||
devServer: {
|
|
||||||
server: {
|
|
||||||
type: "http"
|
|
||||||
},
|
|
||||||
proxy: {
|
|
||||||
"/api": {
|
|
||||||
target,
|
|
||||||
logLevel: "debug",
|
|
||||||
changeOrigin: true,
|
|
||||||
secure: false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
open: false,
|
|
||||||
allowedHosts: [
|
|
||||||
"front",
|
|
||||||
// Agrega este nombre de host
|
|
||||||
"localhost"
|
|
||||||
// Opcional, para pruebas locales
|
|
||||||
]
|
|
||||||
},
|
|
||||||
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
|
|
||||||
framework: {
|
|
||||||
config: {
|
|
||||||
config: {
|
|
||||||
dark: "auto"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
lang: "en-GB",
|
|
||||||
// iconSet: 'material-icons', // Quasar icon set
|
|
||||||
// lang: 'en-US', // Quasar language pack
|
|
||||||
// For special cases outside of where the auto-import strategy can have an impact
|
|
||||||
// (like functional components as one of the examples),
|
|
||||||
// you can manually specify Quasar components/directives to be available everywhere:
|
|
||||||
//
|
|
||||||
// components: [],
|
|
||||||
// directives: [],
|
|
||||||
// Quasar plugins
|
|
||||||
plugins: ["Notify", "Dialog"],
|
|
||||||
all: "auto",
|
|
||||||
autoImportComponentCase: "pascal"
|
|
||||||
},
|
|
||||||
// animations: 'all', // --- includes all animations
|
|
||||||
// https://v2.quasar.dev/options/animations
|
|
||||||
animations: [],
|
|
||||||
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
|
|
||||||
// sourceFiles: {
|
|
||||||
// rootComponent: 'src/App.vue',
|
|
||||||
// router: 'src/router/index',
|
|
||||||
// store: 'src/store/index',
|
|
||||||
// registerServiceWorker: 'src-pwa/register-service-worker',
|
|
||||||
// serviceWorker: 'src-pwa/custom-service-worker',
|
|
||||||
// pwaManifestFile: 'src-pwa/manifest.json',
|
|
||||||
// electronMain: 'src-electron/electron-main',
|
|
||||||
// electronPreload: 'src-electron/electron-preload'
|
|
||||||
// },
|
|
||||||
// https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
|
|
||||||
ssr: {
|
|
||||||
// ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
|
|
||||||
// will mess up SSR
|
|
||||||
// extendSSRWebserverConf (esbuildConf) {},
|
|
||||||
// extendPackageJson (json) {},
|
|
||||||
pwa: false,
|
|
||||||
// manualStoreHydration: true,
|
|
||||||
// manualPostHydrationTrigger: true,
|
|
||||||
prodPort: 3e3,
|
|
||||||
// The default port that the production server should use
|
|
||||||
// (gets superseded if process.env.PORT is specified at runtime)
|
|
||||||
middlewares: [
|
|
||||||
"render"
|
|
||||||
// keep this as last one
|
|
||||||
]
|
|
||||||
},
|
|
||||||
// https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
|
|
||||||
pwa: {
|
|
||||||
workboxMode: "generateSW",
|
|
||||||
// or 'injectManifest'
|
|
||||||
injectPwaMetaTags: true,
|
|
||||||
swFilename: "sw.js",
|
|
||||||
manifestFilename: "manifest.json",
|
|
||||||
useCredentialsForManifestTag: false
|
|
||||||
// useFilenameHashes: true,
|
|
||||||
// extendGenerateSWOptions (cfg) {}
|
|
||||||
// extendInjectManifestOptions (cfg) {},
|
|
||||||
// extendManifestJson (json) {}
|
|
||||||
// extendPWACustomSWConf (esbuildConf) {}
|
|
||||||
},
|
|
||||||
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
|
|
||||||
cordova: {
|
|
||||||
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
|
|
||||||
},
|
|
||||||
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
|
|
||||||
capacitor: {
|
|
||||||
hideSplashscreen: true
|
|
||||||
},
|
|
||||||
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
|
|
||||||
electron: {
|
|
||||||
// extendElectronMainConf (esbuildConf)
|
|
||||||
// extendElectronPreloadConf (esbuildConf)
|
|
||||||
inspectPort: 5858,
|
|
||||||
bundler: "packager",
|
|
||||||
// 'packager' or 'builder'
|
|
||||||
packager: {
|
|
||||||
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
|
|
||||||
// OS X / Mac App Store
|
|
||||||
// appBundleId: '',
|
|
||||||
// appCategoryType: '',
|
|
||||||
// osxSign: '',
|
|
||||||
// protocol: 'myapp://path',
|
|
||||||
// Windows only
|
|
||||||
// win32metadata: { ... }
|
|
||||||
},
|
|
||||||
builder: {
|
|
||||||
// https://www.electron.build/configuration/configuration
|
|
||||||
appId: "salix-frontend"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
|
|
||||||
bex: {
|
|
||||||
contentScripts: ["my-content-script"]
|
|
||||||
// extendBexScriptsConf (esbuildConf) {}
|
|
||||||
// extendBexManifestJson (json) {}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
||||||
export {
|
|
||||||
quasar_config_default as default
|
|
||||||
};
|
|
|
@ -2,7 +2,6 @@
|
||||||
import { onMounted } from 'vue';
|
import { onMounted } from 'vue';
|
||||||
import { useQuasar, Dark } from 'quasar';
|
import { useQuasar, Dark } from 'quasar';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import VnScroll from './components/common/VnScroll.vue';
|
|
||||||
|
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const { availableLocales, locale, fallbackLocale } = useI18n();
|
const { availableLocales, locale, fallbackLocale } = useI18n();
|
||||||
|
@ -39,7 +38,6 @@ quasar.iconMapFn = (iconName) => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<RouterView />
|
<RouterView />
|
||||||
<VnScroll/>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -9,30 +9,6 @@ vi.mock('src/composables/useSession', () => ({
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Mock axios
|
|
||||||
vi.mock('axios', () => ({
|
|
||||||
default: {
|
|
||||||
create: vi.fn(() => ({
|
|
||||||
interceptors: {
|
|
||||||
request: { use: vi.fn() },
|
|
||||||
response: { use: vi.fn() },
|
|
||||||
},
|
|
||||||
})),
|
|
||||||
interceptors: {
|
|
||||||
request: { use: vi.fn() },
|
|
||||||
response: { use: vi.fn() },
|
|
||||||
},
|
|
||||||
defaults: {
|
|
||||||
baseURL: '',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock('src/router', () => ({
|
|
||||||
Router: {
|
|
||||||
push: vi.fn(),
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
vi.mock('src/stores/useStateQueryStore', () => ({
|
vi.mock('src/stores/useStateQueryStore', () => ({
|
||||||
useStateQueryStore: () => ({
|
useStateQueryStore: () => ({
|
||||||
add: () => vi.fn(),
|
add: () => vi.fn(),
|
||||||
|
@ -53,7 +29,7 @@ describe('Axios boot', () => {
|
||||||
'Accept-Language': 'en-US',
|
'Accept-Language': 'en-US',
|
||||||
Authorization: 'DEFAULT_TOKEN',
|
Authorization: 'DEFAULT_TOKEN',
|
||||||
},
|
},
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -67,7 +43,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should call to the Notify plugin with a message from the response property', async () => {
|
it('should call to the Notify plugin with a message from the response property', async () => {
|
||||||
|
@ -83,7 +59,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
/* eslint-disable eslint/export */
|
|
||||||
export * from './defaults/qTable';
|
export * from './defaults/qTable';
|
||||||
export * from './defaults/qInput';
|
export * from './defaults/qInput';
|
||||||
export * from './defaults/qSelect';
|
export * from './defaults/qSelect';
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
import { boot } from 'quasar/wrappers';
|
import { boot } from 'quasar/wrappers';
|
||||||
import { date as quasarDate } from 'quasar';
|
|
||||||
const { formatDate } = quasarDate;
|
|
||||||
|
|
||||||
export default boot(() => {
|
export default boot(() => {
|
||||||
Date.vnUTC = () => {
|
Date.vnUTC = () => {
|
||||||
|
@ -27,34 +25,4 @@ export default boot(() => {
|
||||||
const date = new Date(Date.vnUTC());
|
const date = new Date(Date.vnUTC());
|
||||||
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
Date.getCurrentDateTimeFormatted = (
|
|
||||||
options = {
|
|
||||||
startOfDay: false,
|
|
||||||
endOfDay: true,
|
|
||||||
iso: true,
|
|
||||||
mask: 'DD-MM-YYYY HH:mm',
|
|
||||||
},
|
|
||||||
) => {
|
|
||||||
const date = Date.vnUTC();
|
|
||||||
if (options.startOfDay) {
|
|
||||||
date.setHours(0, 0, 0);
|
|
||||||
}
|
|
||||||
if (options.endOfDay) {
|
|
||||||
date.setHours(23, 59, 0);
|
|
||||||
}
|
|
||||||
if (options.iso) {
|
|
||||||
return date.toISOString();
|
|
||||||
}
|
|
||||||
return formatDate(date, options.mask);
|
|
||||||
};
|
|
||||||
|
|
||||||
Date.convertToISODateTime = (dateTimeStr) => {
|
|
||||||
const [datePart, timePart] = dateTimeStr.split(' ');
|
|
||||||
const [day, month, year] = datePart.split('-');
|
|
||||||
const [hours, minutes] = timePart.split(':');
|
|
||||||
|
|
||||||
const isoDate = new Date(year, month - 1, day, hours, minutes);
|
|
||||||
return isoDate.toISOString();
|
|
||||||
};
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -20,6 +20,7 @@ const postcodeFormData = reactive({
|
||||||
provinceFk: null,
|
provinceFk: null,
|
||||||
townFk: null,
|
townFk: null,
|
||||||
});
|
});
|
||||||
|
const townFilter = ref({});
|
||||||
|
|
||||||
const countriesRef = ref(false);
|
const countriesRef = ref(false);
|
||||||
const provincesOptions = ref([]);
|
const provincesOptions = ref([]);
|
||||||
|
@ -32,11 +33,11 @@ function onDataSaved(formData) {
|
||||||
newPostcode.town = town.value.name;
|
newPostcode.town = town.value.name;
|
||||||
newPostcode.townFk = town.value.id;
|
newPostcode.townFk = town.value.id;
|
||||||
const provinceObject = provincesOptions.value.find(
|
const provinceObject = provincesOptions.value.find(
|
||||||
({ id }) => id === formData.provinceFk,
|
({ id }) => id === formData.provinceFk
|
||||||
);
|
);
|
||||||
newPostcode.province = provinceObject?.name;
|
newPostcode.province = provinceObject?.name;
|
||||||
const countryObject = countriesRef.value.opts.find(
|
const countryObject = countriesRef.value.opts.find(
|
||||||
({ id }) => id === formData.countryFk,
|
({ id }) => id === formData.countryFk
|
||||||
);
|
);
|
||||||
newPostcode.country = countryObject?.name;
|
newPostcode.country = countryObject?.name;
|
||||||
emit('onDataSaved', newPostcode);
|
emit('onDataSaved', newPostcode);
|
||||||
|
@ -66,11 +67,21 @@ function setTown(newTown, data) {
|
||||||
}
|
}
|
||||||
async function onCityCreated(newTown, formData) {
|
async function onCityCreated(newTown, formData) {
|
||||||
newTown.province = provincesOptions.value.find(
|
newTown.province = provincesOptions.value.find(
|
||||||
(province) => province.id === newTown.provinceFk,
|
(province) => province.id === newTown.provinceFk
|
||||||
);
|
);
|
||||||
formData.townFk = newTown;
|
formData.townFk = newTown;
|
||||||
setTown(newTown, formData);
|
setTown(newTown, formData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function filterTowns(name) {
|
||||||
|
if (name !== '') {
|
||||||
|
townFilter.value.where = {
|
||||||
|
name: {
|
||||||
|
like: `%${name}%`,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -96,6 +107,7 @@ async function onCityCreated(newTown, formData) {
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
@update:model-value="(value) => setTown(value, data)"
|
@update:model-value="(value) => setTown(value, data)"
|
||||||
|
@filter="filterTowns"
|
||||||
:tooltip="t('Create city')"
|
:tooltip="t('Create city')"
|
||||||
v-model="data.townFk"
|
v-model="data.townFk"
|
||||||
url="Towns/location"
|
url="Towns/location"
|
||||||
|
|
|
@ -65,7 +65,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
beforeSaveFn: {
|
beforeSaveFn: {
|
||||||
type: [String, Function],
|
type: Function,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
goTo: {
|
goTo: {
|
||||||
|
@ -83,7 +83,7 @@ const isLoading = ref(false);
|
||||||
const hasChanges = ref(false);
|
const hasChanges = ref(false);
|
||||||
const originalData = ref();
|
const originalData = ref();
|
||||||
const vnPaginateRef = ref();
|
const vnPaginateRef = ref();
|
||||||
const formData = ref();
|
const formData = ref([]);
|
||||||
const saveButtonRef = ref(null);
|
const saveButtonRef = ref(null);
|
||||||
const watchChanges = ref();
|
const watchChanges = ref();
|
||||||
const formUrl = computed(() => $props.url);
|
const formUrl = computed(() => $props.url);
|
||||||
|
@ -298,10 +298,6 @@ watch(formUrl, async () => {
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<SkeletonTable
|
|
||||||
v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
|
|
||||||
:columns="$attrs.columns?.length"
|
|
||||||
/>
|
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
:url="url"
|
:url="url"
|
||||||
:limit="limit"
|
:limit="limit"
|
||||||
|
@ -320,6 +316,10 @@ watch(formUrl, async () => {
|
||||||
></slot>
|
></slot>
|
||||||
</template>
|
</template>
|
||||||
</VnPaginate>
|
</VnPaginate>
|
||||||
|
<SkeletonTable
|
||||||
|
v-if="!formData && $attrs.autoLoad"
|
||||||
|
:columns="$attrs.columns?.length"
|
||||||
|
/>
|
||||||
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
<Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
|
||||||
<QBtnGroup push style="column-gap: 10px">
|
<QBtnGroup push style="column-gap: 10px">
|
||||||
<slot name="moreBeforeActions" />
|
<slot name="moreBeforeActions" />
|
||||||
|
@ -332,7 +332,6 @@ watch(formUrl, async () => {
|
||||||
:disable="!selected?.length"
|
:disable="!selected?.length"
|
||||||
:title="t('globals.remove')"
|
:title="t('globals.remove')"
|
||||||
v-if="$props.defaultRemove"
|
v-if="$props.defaultRemove"
|
||||||
data-cy="crudModelDefaultRemoveBtn"
|
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
:label="tMobile('globals.reset')"
|
:label="tMobile('globals.reset')"
|
||||||
|
|
|
@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
|
||||||
img.onerror = () => {
|
img.onerror = () => {
|
||||||
notify(
|
notify(
|
||||||
t("This photo provider doesn't allow remote downloads"),
|
t("This photo provider doesn't allow remote downloads"),
|
||||||
'negative',
|
'negative'
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -219,7 +219,11 @@ const makeRequest = async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="rotateLeft()"
|
@click="rotateLeft()"
|
||||||
/>
|
>
|
||||||
|
<!-- <QTooltip class="no-pointer-events">
|
||||||
|
{{ t('Rotate left') }}
|
||||||
|
</QTooltip> -->
|
||||||
|
</QIcon>
|
||||||
<div>
|
<div>
|
||||||
<div ref="photoContainerRef" />
|
<div ref="photoContainerRef" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -229,7 +233,11 @@ const makeRequest = async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="rotateRight()"
|
@click="rotateRight()"
|
||||||
/>
|
>
|
||||||
|
<!-- <QTooltip class="no-pointer-events">
|
||||||
|
{{ t('Rotate right') }}
|
||||||
|
</QTooltip> -->
|
||||||
|
</QIcon>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="column">
|
<div class="column">
|
||||||
|
@ -257,6 +265,7 @@ const makeRequest = async () => {
|
||||||
class="cursor-pointer q-mr-sm"
|
class="cursor-pointer q-mr-sm"
|
||||||
@click="openInputFile()"
|
@click="openInputFile()"
|
||||||
>
|
>
|
||||||
|
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon name="info" class="cursor-pointer">
|
<QIcon name="info" class="cursor-pointer">
|
||||||
<QTooltip>{{
|
<QTooltip>{{
|
||||||
|
|
|
@ -8,6 +8,11 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
import { QCheckbox } from 'quasar';
|
import { QCheckbox } from 'quasar';
|
||||||
|
|
||||||
|
import axios from 'axios';
|
||||||
|
import useNotify from 'src/composables/useNotify.js';
|
||||||
|
|
||||||
|
const emit = defineEmits(['onDataSaved']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
rows: {
|
rows: {
|
||||||
type: Array,
|
type: Array,
|
||||||
|
@ -21,14 +26,10 @@ const $props = defineProps({
|
||||||
type: String,
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
beforeSave: {
|
|
||||||
type: Function,
|
|
||||||
default: () => {},
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const emit = defineEmits(['onDataSaved']);
|
const { notify } = useNotify();
|
||||||
|
|
||||||
const inputs = {
|
const inputs = {
|
||||||
input: markRaw(VnInput),
|
input: markRaw(VnInput),
|
||||||
|
@ -43,13 +44,24 @@ const selectedField = ref(null);
|
||||||
const closeButton = ref(null);
|
const closeButton = ref(null);
|
||||||
const isLoading = ref(false);
|
const isLoading = ref(false);
|
||||||
|
|
||||||
|
const onDataSaved = () => {
|
||||||
|
notify('globals.dataSaved', 'positive');
|
||||||
|
emit('onDataSaved');
|
||||||
|
closeForm();
|
||||||
|
};
|
||||||
|
|
||||||
const onSubmit = async () => {
|
const onSubmit = async () => {
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
$props.rows.forEach((row) => {
|
const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
|
||||||
row[selectedField.value.name] = newValue.value;
|
const payload = {
|
||||||
});
|
field: selectedField.value.field,
|
||||||
emit('onDataSaved', $props.rows);
|
newValue: newValue.value,
|
||||||
closeForm();
|
lines: rowsToEdit,
|
||||||
|
};
|
||||||
|
|
||||||
|
await axios.post($props.editUrl, payload);
|
||||||
|
onDataSaved();
|
||||||
|
isLoading.value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
const closeForm = () => {
|
const closeForm = () => {
|
||||||
|
@ -66,24 +78,21 @@ const closeForm = () => {
|
||||||
<span class="title">{{ t('Edit') }}</span>
|
<span class="title">{{ t('Edit') }}</span>
|
||||||
<span class="countLines">{{ ` ${rows.length} ` }}</span>
|
<span class="countLines">{{ ` ${rows.length} ` }}</span>
|
||||||
<span class="title">{{ t('buy(s)') }}</span>
|
<span class="title">{{ t('buy(s)') }}</span>
|
||||||
<VnRow class="q-mt-md">
|
<VnRow>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
class="editOption"
|
|
||||||
:label="t('Field to edit')"
|
:label="t('Field to edit')"
|
||||||
:options="fieldsOptions"
|
:options="fieldsOptions"
|
||||||
hide-selected
|
hide-selected
|
||||||
option-label="label"
|
option-label="label"
|
||||||
v-model="selectedField"
|
v-model="selectedField"
|
||||||
data-cy="EditFixedPriceSelectOption"
|
data-cy="field-to-edit"
|
||||||
@update:model-value="newValue = null"
|
|
||||||
:class="{ 'is-select': selectedField?.component === 'select' }"
|
|
||||||
/>
|
/>
|
||||||
<component
|
<component
|
||||||
:is="inputs[selectedField?.component || 'input']"
|
:is="inputs[selectedField?.component || 'input']"
|
||||||
v-bind="selectedField?.attrs || {}"
|
v-bind="selectedField?.attrs || {}"
|
||||||
v-model="newValue"
|
v-model="newValue"
|
||||||
:label="t('Value')"
|
:label="t('Value')"
|
||||||
data-cy="EditFixedPriceValueOption"
|
data-cy="value-to-edit"
|
||||||
style="width: 200px"
|
style="width: 200px"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
@ -131,15 +140,6 @@ const closeForm = () => {
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
.editOption .q-field__inner .q-field__control {
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
.editOption.is-select .q-field__inner .q-field__control {
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
es:
|
es:
|
||||||
Edit: Editar
|
Edit: Editar
|
|
@ -13,15 +13,17 @@ import VnConfirm from './ui/VnConfirm.vue';
|
||||||
import { tMobile } from 'src/composables/tMobile';
|
import { tMobile } from 'src/composables/tMobile';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { getDifferences, getUpdatedValues } from 'src/filters';
|
import { getDifferences, getUpdatedValues } from 'src/filters';
|
||||||
|
|
||||||
const { push } = useRouter();
|
const { push } = useRouter();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const state = useState();
|
const state = useState();
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { validate, validations } = useValidator();
|
const { validate } = useValidator();
|
||||||
const { notify } = useNotify();
|
const { notify } = useNotify();
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const myForm = ref(null);
|
const myForm = ref(null);
|
||||||
|
const attrs = useAttrs();
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
url: {
|
url: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -98,12 +100,8 @@ const $props = defineProps({
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
preventSubmit: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
|
const emit = defineEmits(['onFetch', 'onDataSaved']);
|
||||||
const modelValue = computed(
|
const modelValue = computed(
|
||||||
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
||||||
).value;
|
).value;
|
||||||
|
@ -121,7 +119,7 @@ const defaultButtons = computed(() => ({
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
icon: 'save',
|
icon: 'save',
|
||||||
label: 'globals.save',
|
label: 'globals.save',
|
||||||
click: async (evt) => submitForm(evt),
|
click: async () => await save(),
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
},
|
},
|
||||||
reset: {
|
reset: {
|
||||||
|
@ -134,13 +132,6 @@ const defaultButtons = computed(() => ({
|
||||||
...$props.defaultButtons,
|
...$props.defaultButtons,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const submitForm = async (evt) => {
|
|
||||||
const isFormValid = await myForm.value.validate();
|
|
||||||
if (isFormValid) {
|
|
||||||
await save(evt);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
nextTick(() => (componentIsRendered.value = true));
|
nextTick(() => (componentIsRendered.value = true));
|
||||||
|
|
||||||
|
@ -236,9 +227,10 @@ async function save() {
|
||||||
const method = $props.urlCreate ? 'post' : 'patch';
|
const method = $props.urlCreate ? 'post' : 'patch';
|
||||||
const url =
|
const url =
|
||||||
$props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
|
$props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
|
||||||
const response = await Promise.resolve(
|
let response;
|
||||||
$props.saveFn ? $props.saveFn(body) : axios[method](url, body),
|
|
||||||
);
|
if ($props.saveFn) response = await $props.saveFn(body);
|
||||||
|
else response = await axios[method](url, body);
|
||||||
|
|
||||||
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
|
if ($props.urlCreate) notify('globals.dataCreated', 'positive');
|
||||||
|
|
||||||
|
@ -304,7 +296,7 @@ function onBeforeSave(formData, originalData) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
async function onKeyup(evt) {
|
async function onKeyup(evt) {
|
||||||
if (evt.key === 'Enter' && !$props.preventSubmit) {
|
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
|
||||||
const input = evt.target;
|
const input = evt.target;
|
||||||
if (input.type == 'textarea' && evt.shiftKey) {
|
if (input.type == 'textarea' && evt.shiftKey) {
|
||||||
let { selectionStart, selectionEnd } = input;
|
let { selectionStart, selectionEnd } = input;
|
||||||
|
@ -315,13 +307,11 @@ async function onKeyup(evt) {
|
||||||
selectionStart = selectionEnd = selectionStart + 1;
|
selectionStart = selectionEnd = selectionStart + 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await myForm.value.submit(evt);
|
await save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
submitForm,
|
|
||||||
myForm,
|
|
||||||
save,
|
save,
|
||||||
isLoading,
|
isLoading,
|
||||||
hasChanges,
|
hasChanges,
|
||||||
|
@ -333,10 +323,9 @@ defineExpose({
|
||||||
<template>
|
<template>
|
||||||
<div class="column items-center full-width">
|
<div class="column items-center full-width">
|
||||||
<QForm
|
<QForm
|
||||||
v-on="$attrs"
|
|
||||||
ref="myForm"
|
ref="myForm"
|
||||||
v-if="formData"
|
v-if="formData"
|
||||||
@submit.prevent="save"
|
@submit.prevent
|
||||||
@keyup.prevent="onKeyup"
|
@keyup.prevent="onKeyup"
|
||||||
@reset="reset"
|
@reset="reset"
|
||||||
class="q-pa-md"
|
class="q-pa-md"
|
||||||
|
@ -350,7 +339,6 @@ defineExpose({
|
||||||
name="form"
|
name="form"
|
||||||
:data="formData"
|
:data="formData"
|
||||||
:validate="validate"
|
:validate="validate"
|
||||||
:validations="validations()"
|
|
||||||
:filter="filter"
|
:filter="filter"
|
||||||
/>
|
/>
|
||||||
<SkeletonForm v-else />
|
<SkeletonForm v-else />
|
||||||
|
@ -410,7 +398,6 @@ defineExpose({
|
||||||
</QBtnDropdown>
|
</QBtnDropdown>
|
||||||
<QBtn
|
<QBtn
|
||||||
v-else
|
v-else
|
||||||
data-cy="saveDefaultBtn"
|
|
||||||
:label="tMobile('globals.save')"
|
:label="tMobile('globals.save')"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
|
|
@ -41,12 +41,9 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
emit('onDataSaved', formData, requestResponse);
|
emit('onDataSaved', formData, requestResponse);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
|
const onClick = async (saveAndContinue) => {
|
||||||
await formModelRef.value.myForm.validate(true);
|
|
||||||
isSaveAndContinue.value = saveAndContinue;
|
isSaveAndContinue.value = saveAndContinue;
|
||||||
if (formModelRef.value) {
|
await formModelRef.value.save();
|
||||||
await formModelRef.value.submitForm();
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
@ -62,23 +59,16 @@ defineExpose({
|
||||||
ref="formModelRef"
|
ref="formModelRef"
|
||||||
:observe-form-changes="false"
|
:observe-form-changes="false"
|
||||||
:default-actions="false"
|
:default-actions="false"
|
||||||
@submit="onClick"
|
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
@on-data-saved="onDataSaved"
|
@on-data-saved="onDataSaved"
|
||||||
:prevent-submit="false"
|
|
||||||
>
|
>
|
||||||
<template #form="{ data, validate, validations }">
|
<template #form="{ data, validate }">
|
||||||
<span ref="closeButton" class="close-icon" v-close-popup>
|
<span ref="closeButton" class="close-icon" v-close-popup>
|
||||||
<QIcon name="close" size="sm" />
|
<QIcon name="close" size="sm" />
|
||||||
</span>
|
</span>
|
||||||
<h1 class="title">{{ title }}</h1>
|
<h1 class="title">{{ title }}</h1>
|
||||||
<p>{{ subtitle }}</p>
|
<p>{{ subtitle }}</p>
|
||||||
<slot
|
<slot name="form-inputs" :data="data" :validate="validate" />
|
||||||
name="form-inputs"
|
|
||||||
:data="data"
|
|
||||||
:validate="validate"
|
|
||||||
:validations="validations"
|
|
||||||
/>
|
|
||||||
<div class="q-mt-lg row justify-end">
|
<div class="q-mt-lg row justify-end">
|
||||||
<QBtn
|
<QBtn
|
||||||
:label="t('globals.cancel')"
|
:label="t('globals.cancel')"
|
||||||
|
@ -97,13 +87,12 @@ defineExpose({
|
||||||
:flat="showSaveAndContinueBtn"
|
:flat="showSaveAndContinueBtn"
|
||||||
:label="t('globals.save')"
|
:label="t('globals.save')"
|
||||||
:title="t('globals.save')"
|
:title="t('globals.save')"
|
||||||
:type="!showSaveAndContinueBtn ? 'submit' : 'button'"
|
@click="onClick(false)"
|
||||||
color="primary"
|
color="primary"
|
||||||
class="q-ml-sm"
|
class="q-ml-sm"
|
||||||
:disabled="isLoading"
|
:disabled="isLoading"
|
||||||
:loading="isLoading"
|
:loading="isLoading"
|
||||||
data-cy="FormModelPopup_save"
|
data-cy="FormModelPopup_save"
|
||||||
@click="showSaveAndContinueBtn ? onClick(false) : null"
|
|
||||||
z-max
|
z-max
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
|
@ -111,13 +100,12 @@ defineExpose({
|
||||||
:label="t('globals.isSaveAndContinue')"
|
:label="t('globals.isSaveAndContinue')"
|
||||||
:title="t('globals.isSaveAndContinue')"
|
:title="t('globals.isSaveAndContinue')"
|
||||||
color="primary"
|
color="primary"
|
||||||
:type="showSaveAndContinueBtn ? 'submit' : 'button'"
|
|
||||||
class="q-ml-sm"
|
class="q-ml-sm"
|
||||||
:disabled="isLoading"
|
:disabled="isLoading"
|
||||||
:loading="isLoading"
|
:loading="isLoading"
|
||||||
data-cy="FormModelPopup_isSaveAndContinue"
|
data-cy="FormModelPopup_isSaveAndContinue"
|
||||||
@click="showSaveAndContinueBtn ? onClick(true) : null"
|
|
||||||
z-max
|
z-max
|
||||||
|
@click="onClick(true)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -181,7 +181,7 @@ const searchModule = () => {
|
||||||
<template>
|
<template>
|
||||||
<QList padding class="column-max-width">
|
<QList padding class="column-max-width">
|
||||||
<template v-if="$props.source === 'main'">
|
<template v-if="$props.source === 'main'">
|
||||||
<template v-if="route?.matched[1]?.name === 'Dashboard'">
|
<template v-if="$route?.matched[1]?.name === 'Dashboard'">
|
||||||
<QItem class="q-pb-md">
|
<QItem class="q-pb-md">
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="search"
|
v-model="search"
|
||||||
|
@ -262,7 +262,7 @@ const searchModule = () => {
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-for="item in items" :key="item.name">
|
<template v-for="item in items" :key="item.name">
|
||||||
<template v-if="item.name === route?.matched[1]?.name">
|
<template v-if="item.name === $route?.matched[1]?.name">
|
||||||
<QItem class="header">
|
<QItem class="header">
|
||||||
<QItemSection avatar v-if="item.icon">
|
<QItemSection avatar v-if="item.icon">
|
||||||
<QIcon :name="item.icon" />
|
<QIcon :name="item.icon" />
|
||||||
|
|
|
@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
|
||||||
'no-visible': !stateQuery.isLoading().value,
|
'no-visible': !stateQuery.isLoading().value,
|
||||||
}"
|
}"
|
||||||
size="sm"
|
size="sm"
|
||||||
data-cy="navBar-spinner"
|
data-cy="loading-spinner"
|
||||||
/>
|
/>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<div id="searchbar" class="searchbar"></div>
|
<div id="searchbar" class="searchbar"></div>
|
||||||
|
|
|
@ -1,22 +1,12 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { toCurrency } from 'src/filters';
|
import { toCurrency } from 'src/filters';
|
||||||
import { getValueFromPath } from 'src/composables/getValueFromPath';
|
|
||||||
|
|
||||||
const { row, visibleProblems = null } = defineProps({
|
defineProps({ row: { type: Object, required: true } });
|
||||||
row: { type: Object, required: true },
|
|
||||||
visibleProblems: { type: Array },
|
|
||||||
});
|
|
||||||
|
|
||||||
function showProblem(problem) {
|
|
||||||
const val = getValueFromPath(row, problem);
|
|
||||||
if (!visibleProblems) return val;
|
|
||||||
return !!(visibleProblems?.includes(problem) && val);
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<span class="q-gutter-x-xs">
|
<span class="q-gutter-x-xs">
|
||||||
<router-link
|
<router-link
|
||||||
v-if="showProblem('claim.claimFk')"
|
v-if="row.claim?.claimFk"
|
||||||
:to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
|
:to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
|
||||||
class="link"
|
class="link"
|
||||||
>
|
>
|
||||||
|
@ -28,7 +18,7 @@ function showProblem(problem) {
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</router-link>
|
</router-link>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="showProblem('isDeleted')"
|
v-if="row?.isDeleted"
|
||||||
color="primary"
|
color="primary"
|
||||||
name="vn:deletedTicket"
|
name="vn:deletedTicket"
|
||||||
size="xs"
|
size="xs"
|
||||||
|
@ -39,7 +29,7 @@ function showProblem(problem) {
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="showProblem('hasRisk')"
|
v-if="row?.hasRisk"
|
||||||
name="vn:risk"
|
name="vn:risk"
|
||||||
:color="row.hasHighRisk ? 'negative' : 'primary'"
|
:color="row.hasHighRisk ? 'negative' : 'primary'"
|
||||||
size="xs"
|
size="xs"
|
||||||
|
@ -50,76 +40,51 @@ function showProblem(problem) {
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="showProblem('hasComponentLack')"
|
v-if="row?.hasComponentLack"
|
||||||
name="vn:components"
|
name="vn:components"
|
||||||
color="primary"
|
color="primary"
|
||||||
size="xs"
|
size="xs"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
|
||||||
v-if="showProblem('hasItemDelay')"
|
|
||||||
color="primary"
|
|
||||||
size="xs"
|
|
||||||
name="vn:hasItemDelay"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ $t('ticket.summary.hasItemDelay') }}
|
{{ $t('ticket.summary.hasItemDelay') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
|
||||||
v-if="showProblem('hasItemLost')"
|
|
||||||
color="primary"
|
|
||||||
size="xs"
|
|
||||||
name="vn:hasItemLost"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ $t('salesTicketsTable.hasItemLost') }}
|
{{ $t('salesTicketsTable.hasItemLost') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="showProblem('hasItemShortage')"
|
v-if="row?.hasItemShortage"
|
||||||
name="vn:unavailable"
|
name="vn:unavailable"
|
||||||
color="primary"
|
color="primary"
|
||||||
size="xs"
|
size="xs"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
|
||||||
v-if="showProblem('hasRounding')"
|
|
||||||
color="primary"
|
|
||||||
name="sync_problem"
|
|
||||||
size="xs"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
<QTooltip>
|
||||||
{{ $t('ticketList.rounding') }}
|
{{ $t('ticketList.rounding') }}
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="showProblem('hasTicketRequest')"
|
v-if="row?.hasTicketRequest"
|
||||||
name="vn:buyrequest"
|
name="vn:buyrequest"
|
||||||
color="primary"
|
color="primary"
|
||||||
size="xs"
|
size="xs"
|
||||||
>
|
>
|
||||||
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
|
||||||
v-if="showProblem('isTaxDataChecked')"
|
|
||||||
name="vn:no036"
|
|
||||||
color="primary"
|
|
||||||
size="xs"
|
|
||||||
>
|
|
||||||
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
|
<QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
|
||||||
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
|
||||||
v-if="showProblem('isTooLittle')"
|
|
||||||
name="vn:isTooLittle"
|
|
||||||
color="primary"
|
|
||||||
size="xs"
|
|
||||||
>
|
|
||||||
<QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</span>
|
</span>
|
||||||
|
|
|
@ -16,7 +16,7 @@ const $props = defineProps({
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: [String, Boolean],
|
type: String,
|
||||||
default: 'table',
|
default: 'table',
|
||||||
},
|
},
|
||||||
vertical: {
|
vertical: {
|
||||||
|
|
|
@ -19,7 +19,6 @@ import { useQuasar, date } from 'quasar';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
import { useFilterParams } from 'src/composables/useFilterParams';
|
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
import { dashIfEmpty, toDate } from 'src/filters';
|
import { dashIfEmpty, toDate } from 'src/filters';
|
||||||
import { useTableHeight } from './filters/useTableHeight';
|
|
||||||
|
|
||||||
import CrudModel from 'src/components/CrudModel.vue';
|
import CrudModel from 'src/components/CrudModel.vue';
|
||||||
import FormModelPopup from 'components/FormModelPopup.vue';
|
import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
@ -33,7 +32,6 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
|
||||||
import VnTableFilter from './VnTableFilter.vue';
|
import VnTableFilter from './VnTableFilter.vue';
|
||||||
import { getColAlign } from 'src/composables/getColAlign';
|
import { getColAlign } from 'src/composables/getColAlign';
|
||||||
import RightMenu from '../common/RightMenu.vue';
|
import RightMenu from '../common/RightMenu.vue';
|
||||||
import VnScroll from '../common/VnScroll.vue'
|
|
||||||
|
|
||||||
const arrayData = useArrayData(useAttrs()['data-key']);
|
const arrayData = useArrayData(useAttrs()['data-key']);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -66,7 +64,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
create: {
|
create: {
|
||||||
type: [Boolean, Object],
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
createAsDialog: {
|
createAsDialog: {
|
||||||
|
@ -119,7 +117,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
tableHeight: {
|
tableHeight: {
|
||||||
type: String,
|
type: String,
|
||||||
default: undefined,
|
default: '90vh',
|
||||||
},
|
},
|
||||||
footer: {
|
footer: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
@ -168,8 +166,6 @@ const tableRef = ref();
|
||||||
const params = ref(useFilterParams($attrs['data-key']).params);
|
const params = ref(useFilterParams($attrs['data-key']).params);
|
||||||
const orders = ref(useFilterParams($attrs['data-key']).orders);
|
const orders = ref(useFilterParams($attrs['data-key']).orders);
|
||||||
const app = inject('app');
|
const app = inject('app');
|
||||||
const tableHeight = useTableHeight();
|
|
||||||
const vnScrollRef = ref(null);
|
|
||||||
|
|
||||||
const editingRow = ref(null);
|
const editingRow = ref(null);
|
||||||
const editingField = ref(null);
|
const editingField = ref(null);
|
||||||
|
@ -191,17 +187,6 @@ const tableModes = [
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const onVirtualScroll = ({ to }) => {
|
|
||||||
handleScroll();
|
|
||||||
const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
|
|
||||||
if (virtualScrollContainer) {
|
|
||||||
virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
|
|
||||||
if (vnScrollRef.value) {
|
|
||||||
vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
const urlParams = route.query[$props.searchUrl];
|
const urlParams = route.query[$props.searchUrl];
|
||||||
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
|
hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
|
||||||
|
@ -242,7 +227,6 @@ watch(
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
create: createForm,
|
create: createForm,
|
||||||
showForm,
|
|
||||||
reload,
|
reload,
|
||||||
redirect: redirectFn,
|
redirect: redirectFn,
|
||||||
selected,
|
selected,
|
||||||
|
@ -340,13 +324,16 @@ function handleOnDataSaved(_) {
|
||||||
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
|
||||||
else $props.create.onDataSaved(_);
|
else $props.create.onDataSaved(_);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleScroll() {
|
function handleScroll() {
|
||||||
if ($props.crudModel.disableInfiniteScroll) return;
|
if ($props.crudModel.disableInfiniteScroll) return;
|
||||||
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
|
||||||
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
||||||
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
||||||
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
||||||
|
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
||||||
if (evt?.shiftKey && added) {
|
if (evt?.shiftKey && added) {
|
||||||
const rowIndex = selectedRows[0].$index;
|
const rowIndex = selectedRows[0].$index;
|
||||||
|
@ -679,9 +666,9 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
v-bind="table"
|
v-bind="table"
|
||||||
:class="[
|
:class="[
|
||||||
'vnTable',
|
'vnTable',
|
||||||
table ? 'selection-cell' : '',
|
table ? 'selection-cell' : '',
|
||||||
$props.footer ? 'last-row-sticky' : '',
|
$props.footer ? 'last-row-sticky' : '',
|
||||||
]"
|
]"
|
||||||
wrap-cells
|
wrap-cells
|
||||||
:columns="splittedColumns.columns"
|
:columns="splittedColumns.columns"
|
||||||
|
@ -691,9 +678,9 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
table-header-class="bg-header"
|
table-header-class="bg-header"
|
||||||
card-container-class="grid-three"
|
card-container-class="grid-three"
|
||||||
flat
|
flat
|
||||||
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
:style="isTableMode && `max-height: ${tableHeight}`"
|
||||||
:virtual-scroll="isTableMode"
|
:virtual-scroll="isTableMode"
|
||||||
@virtual-scroll="onVirtualScroll"
|
@virtual-scroll="handleScroll"
|
||||||
@row-click="(event, row) => handleRowClick(event, row)"
|
@row-click="(event, row) => handleRowClick(event, row)"
|
||||||
@update:selected="emit('update:selected', $event)"
|
@update:selected="emit('update:selected', $event)"
|
||||||
@selection="(details) => handleSelection(details, rows)"
|
@selection="(details) => handleSelection(details, rows)"
|
||||||
|
@ -751,7 +738,6 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
withFilters
|
withFilters
|
||||||
"
|
"
|
||||||
:column="col"
|
:column="col"
|
||||||
:data-cy="`column-filter-${col.name}`"
|
|
||||||
:show-title="true"
|
:show-title="true"
|
||||||
:data-key="$attrs['data-key']"
|
:data-key="$attrs['data-key']"
|
||||||
v-model="params[columnName(col)]"
|
v-model="params[columnName(col)]"
|
||||||
|
@ -1056,7 +1042,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:model="$attrs['data-key'] + 'Create'"
|
:model="$attrs['data-key'] + 'Create'"
|
||||||
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
|
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data, validations }">
|
<template #form-inputs="{ data }">
|
||||||
<slot name="alter-create" :data="data">
|
<slot name="alter-create" :data="data">
|
||||||
<div :style="createComplement?.containerStyle">
|
<div :style="createComplement?.containerStyle">
|
||||||
<div
|
<div
|
||||||
|
@ -1074,7 +1060,6 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:key="column.name"
|
:key="column.name"
|
||||||
:name="`column-create-${column.name}`"
|
:name="`column-create-${column.name}`"
|
||||||
:data="data"
|
:data="data"
|
||||||
:validations="validations"
|
|
||||||
:column-name="column.name"
|
:column-name="column.name"
|
||||||
:label="column.label"
|
:label="column.label"
|
||||||
>
|
>
|
||||||
|
@ -1098,11 +1083,6 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
<VnScroll
|
|
||||||
ref="vnScrollRef"
|
|
||||||
v-if="isTableMode"
|
|
||||||
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
|
|
||||||
/>
|
|
||||||
</template>
|
</template>
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
|
|
|
@ -30,7 +30,6 @@ function columnName(col) {
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:search-button="true"
|
:search-button="true"
|
||||||
:disable-submit-event="true"
|
:disable-submit-event="true"
|
||||||
:data-key="$attrs['data-key']"
|
|
||||||
:search-url
|
:search-url
|
||||||
>
|
>
|
||||||
<template #body="{ params, orders, searchFn }">
|
<template #body="{ params, orders, searchFn }">
|
||||||
|
|
|
@ -58,7 +58,7 @@ async function getConfig(url, filter) {
|
||||||
const response = await axios.get(url, {
|
const response = await axios.get(url, {
|
||||||
params: { filter: filter },
|
params: { filter: filter },
|
||||||
});
|
});
|
||||||
return response?.data && response?.data?.length > 0 ? response.data[0] : null;
|
return response.data && response.data.length > 0 ? response.data[0] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchViewConfigData() {
|
async function fetchViewConfigData() {
|
||||||
|
|
|
@ -11,9 +11,6 @@ describe('VnTable', () => {
|
||||||
propsData: {
|
propsData: {
|
||||||
columns: [],
|
columns: [],
|
||||||
},
|
},
|
||||||
attrs: {
|
|
||||||
'data-key': 'test',
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnVisibleColumn from '../VnVisibleColumn.vue';
|
import VnVisibleColumn from '../VnVisibleColumn.vue';
|
||||||
import { default as axios } from 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
|
|
||||||
describe('VnVisibleColumns', () => {
|
describe('VnVisibleColumns', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let vm;
|
let vm;
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
import { onMounted, nextTick, ref } from 'vue';
|
|
||||||
|
|
||||||
export function useTableHeight() {
|
|
||||||
const tableHeight = ref('90vh');
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
await nextTick();
|
|
||||||
let height = 100;
|
|
||||||
Array.from(document.querySelectorAll('[role="toolbar"]'))
|
|
||||||
.filter((element) => window.getComputedStyle(element).display !== 'none')
|
|
||||||
.forEach(() => {
|
|
||||||
height -= 10;
|
|
||||||
});
|
|
||||||
tableHeight.value = `${height}vh`;
|
|
||||||
});
|
|
||||||
|
|
||||||
return tableHeight;
|
|
||||||
}
|
|
|
@ -1,6 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
|
|
||||||
import CrudModel from 'components/CrudModel.vue';
|
import CrudModel from 'components/CrudModel.vue';
|
||||||
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
@ -11,7 +9,13 @@ describe('CrudModel', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
wrapper = createWrapper(CrudModel, {
|
wrapper = createWrapper(CrudModel, {
|
||||||
global: {
|
global: {
|
||||||
stubs: ['vnPaginate', 'vue-i18n'],
|
stubs: [
|
||||||
|
'vnPaginate',
|
||||||
|
'useState',
|
||||||
|
'arrayData',
|
||||||
|
'useStateStore',
|
||||||
|
'vue-i18n',
|
||||||
|
],
|
||||||
mocks: {
|
mocks: {
|
||||||
validate: vi.fn(),
|
validate: vi.fn(),
|
||||||
},
|
},
|
||||||
|
@ -23,7 +27,7 @@ describe('CrudModel', () => {
|
||||||
dataKey: 'crudModelKey',
|
dataKey: 'crudModelKey',
|
||||||
model: 'crudModel',
|
model: 'crudModel',
|
||||||
url: 'crudModelUrl',
|
url: 'crudModelUrl',
|
||||||
saveFn: vi.fn(),
|
saveFn: '',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
|
@ -225,7 +229,7 @@ describe('CrudModel', () => {
|
||||||
expect(vm.isLoading).toBe(false);
|
expect(vm.isLoading).toBe(false);
|
||||||
expect(vm.hasChanges).toBe(false);
|
expect(vm.hasChanges).toBe(false);
|
||||||
|
|
||||||
await wrapper.setProps({ saveFn: null });
|
await wrapper.setProps({ saveFn: '' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should use default url if there's not saveFn", async () => {
|
it("should use default url if there's not saveFn", async () => {
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
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);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -1,6 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
|
|
||||||
import FilterItemForm from 'src/components/FilterItemForm.vue';
|
import FilterItemForm from 'src/components/FilterItemForm.vue';
|
||||||
import { vi, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
@ -40,9 +38,9 @@ describe('FilterItemForm', () => {
|
||||||
{ relation: 'producer', scope: { fields: ['name'] } },
|
{ relation: 'producer', scope: { fields: ['name'] } },
|
||||||
{ relation: 'ink', scope: { fields: ['name'] } },
|
{ relation: 'ink', scope: { fields: ['name'] } },
|
||||||
],
|
],
|
||||||
where: { name: { like: '%bolas de madera%' } },
|
where: {"name":{"like":"%bolas de madera%"}},
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
|
expect(axios.get).toHaveBeenCalledWith('Items/withName', {
|
||||||
params: { filter: JSON.stringify(expectedFilter) },
|
params: { filter: JSON.stringify(expectedFilter) },
|
||||||
});
|
});
|
||||||
|
@ -81,4 +79,4 @@ describe('FilterItemForm', () => {
|
||||||
vm.selectItem({ id: 12345 });
|
vm.selectItem({ id: 12345 });
|
||||||
expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
|
expect(wrapper.emitted('itemSelected')[0]).toEqual([12345]);
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -1,7 +1,5 @@
|
||||||
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
|
|
||||||
import FormModel from 'src/components/FormModel.vue';
|
import FormModel from 'src/components/FormModel.vue';
|
||||||
|
|
||||||
describe('FormModel', () => {
|
describe('FormModel', () => {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
||||||
import { default as axios } from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import Leftmenu from 'components/LeftMenu.vue';
|
||||||
import LeftMenu from 'components/LeftMenu.vue';
|
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
import { useNavigationStore } from 'src/stores/useNavigationStore';
|
import { useNavigationStore } from 'src/stores/useNavigationStore';
|
||||||
|
|
||||||
|
@ -102,7 +101,7 @@ function mount(source = 'main') {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({
|
vi.spyOn(axios, 'get').mockResolvedValue({
|
||||||
data: [],
|
data: [],
|
||||||
});
|
});
|
||||||
const wrapper = createWrapper(LeftMenu, {
|
const wrapper = createWrapper(Leftmenu, {
|
||||||
propsData: {
|
propsData: {
|
||||||
source,
|
source,
|
||||||
},
|
},
|
||||||
|
@ -165,16 +164,16 @@ describe('getRoutes', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('LeftMenu as card', () => {
|
describe('Leftmenu as card', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
vm = mount('card').vm;
|
vm = mount('card').vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get routes for card source', () => {
|
it('should get routes for card source', async () => {
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
describe('LeftMenu as main', () => {
|
describe('Leftmenu as main', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vm = mount().vm;
|
vm = mount().vm;
|
||||||
});
|
});
|
||||||
|
@ -251,6 +250,7 @@ describe('LeftMenu as main', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get routes for main source', () => {
|
it('should get routes for main source', () => {
|
||||||
|
vm.props.source = 'main';
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
expect(navigation.getModules).toHaveBeenCalled();
|
expect(navigation.getModules).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,63 +1,65 @@
|
||||||
import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import UserPanel from 'src/components/UserPanel.vue';
|
import UserPanel from 'src/components/UserPanel.vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
|
|
||||||
|
vi.mock('src/utils/quasarLang', () => ({
|
||||||
|
default: vi.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
describe('UserPanel', () => {
|
describe('UserPanel', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let vm;
|
let vm;
|
||||||
let state;
|
let state;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
wrapper = createWrapper(UserPanel, {});
|
wrapper = createWrapper(UserPanel, {});
|
||||||
state = useState();
|
state = useState();
|
||||||
state.setUser({
|
state.setUser({
|
||||||
id: 115,
|
id: 115,
|
||||||
name: 'itmanagement',
|
name: 'itmanagement',
|
||||||
nickname: 'itManagementNick',
|
nickname: 'itManagementNick',
|
||||||
lang: 'en',
|
lang: 'en',
|
||||||
darkMode: false,
|
darkMode: false,
|
||||||
companyFk: 442,
|
companyFk: 442,
|
||||||
warehouseFk: 1,
|
warehouseFk: 1,
|
||||||
});
|
|
||||||
wrapper = wrapper.wrapper;
|
|
||||||
vm = wrapper.vm;
|
|
||||||
});
|
});
|
||||||
|
wrapper = wrapper.wrapper;
|
||||||
|
vm = wrapper.vm;
|
||||||
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch warehouses data on mounted', async () => {
|
it('should fetch warehouses data on mounted', async () => {
|
||||||
const fetchData = wrapper.findComponent({ name: 'FetchData' });
|
const fetchData = wrapper.findComponent({ name: 'FetchData' });
|
||||||
expect(fetchData.props('url')).toBe('Warehouses');
|
expect(fetchData.props('url')).toBe('Warehouses');
|
||||||
expect(fetchData.props('autoLoad')).toBe(true);
|
expect(fetchData.props('autoLoad')).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should toggle dark mode correctly and update preferences', async () => {
|
it('should toggle dark mode correctly and update preferences', async () => {
|
||||||
await vm.saveDarkMode(true);
|
await vm.saveDarkMode(true);
|
||||||
expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
|
expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
|
||||||
expect(vm.user.darkMode).toBe(true);
|
expect(vm.user.darkMode).toBe(true);
|
||||||
vm.updatePreferences();
|
await vm.updatePreferences();
|
||||||
expect(vm.darkMode).toBe(true);
|
expect(vm.darkMode).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should change user language and update preferences', async () => {
|
it('should change user language and update preferences', async () => {
|
||||||
const userLanguage = 'es';
|
const userLanguage = 'es';
|
||||||
await vm.saveLanguage(userLanguage);
|
await vm.saveLanguage(userLanguage);
|
||||||
expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
|
expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
|
||||||
expect(vm.user.lang).toBe(userLanguage);
|
expect(vm.user.lang).toBe(userLanguage);
|
||||||
vm.updatePreferences();
|
await vm.updatePreferences();
|
||||||
expect(vm.locale).toBe(userLanguage);
|
expect(vm.locale).toBe(userLanguage);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update user data', async () => {
|
it('should update user data', async () => {
|
||||||
const key = 'name';
|
const key = 'name';
|
||||||
const value = 'itboss';
|
const value = 'itboss';
|
||||||
await vm.saveUserData(key, value);
|
await vm.saveUserData(key, value);
|
||||||
expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
|
expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
|
||||||
[key]: value,
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
});
|
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
||||||
v-model="address"
|
v-model="address"
|
||||||
is-outlined
|
is-outlined
|
||||||
autofocus
|
autofocus
|
||||||
data-cy="SendEmailNotificationDialogInput"
|
data-cy="SendEmailNotifiactionDialogInput"
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
@ -8,8 +8,7 @@ const model = defineModel({ prop: 'modelValue' });
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="model"
|
v-model="model"
|
||||||
ref="inputRef"
|
ref="inputRef"
|
||||||
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
|
@keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
|
||||||
@blur="model = useAccountShortToStandard(model) ?? model"
|
|
||||||
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -26,7 +26,11 @@ const route = useRoute();
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const entityId = computed(() => props.id || route?.params?.id);
|
const entityId = computed(() => props.id || route?.params?.id);
|
||||||
let arrayData = getArrayData(entityId.value, props.url);
|
const arrayData = useArrayData(props.dataKey, {
|
||||||
|
url: props.url,
|
||||||
|
userFilter: props.filter,
|
||||||
|
oneRecord: true,
|
||||||
|
});
|
||||||
|
|
||||||
onBeforeRouteLeave(() => {
|
onBeforeRouteLeave(() => {
|
||||||
stateStore.cardDescriptorChangeValue(null);
|
stateStore.cardDescriptorChangeValue(null);
|
||||||
|
@ -57,31 +61,16 @@ onBeforeRouteUpdate(async (to, from) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
async function fetch(id, append = false) {
|
async function fetch(id, append = false) {
|
||||||
|
const regex = /\/(\d+)/;
|
||||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||||
else {
|
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
||||||
arrayData = getArrayData(id);
|
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
||||||
}
|
|
||||||
await arrayData.fetch({ append, updateRouter: false });
|
await arrayData.fetch({ append, updateRouter: false });
|
||||||
emit('onFetch', arrayData.store.data);
|
emit('onFetch', arrayData.store.data);
|
||||||
}
|
}
|
||||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||||
return Object.values(params).includes(valueToCheck);
|
return Object.values(params).includes(valueToCheck);
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatUrl(id) {
|
|
||||||
const newId = id || entityId.value;
|
|
||||||
const regex = /\/(\d+)/;
|
|
||||||
if (!regex.test(props.url)) return `${props.url}/${newId}`;
|
|
||||||
return props.url.replace(regex, `/${newId}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
function getArrayData(id, url) {
|
|
||||||
return useArrayData(props.dataKey, {
|
|
||||||
url: url ?? formatUrl(id),
|
|
||||||
userFilter: props.filter,
|
|
||||||
oneRecord: true,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<template v-if="visual">
|
<template v-if="visual">
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed } from 'vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
colors: {
|
colors: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -8,9 +6,9 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const colorArray = computed(() => JSON.parse($props.colors)?.value);
|
const colorArray = JSON.parse($props.colors)?.value;
|
||||||
const maxHeight = 30;
|
const maxHeight = 30;
|
||||||
const colorHeight = maxHeight / colorArray.value?.length;
|
const colorHeight = maxHeight / colorArray?.length;
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
|
<div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
const model = defineModel({ type: [String, Number], default: '' });
|
const model = defineModel({ type: [String, Number], required: true });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
<QDate v-model="model" :today-btn="true" :options="$attrs.options" />
|
||||||
|
|
|
@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
|
||||||
import useNotify from 'src/composables/useNotify.js';
|
|
||||||
import FetchData from 'components/FetchData.vue';
|
import FetchData from 'components/FetchData.vue';
|
||||||
import VnRow from 'components/ui/VnRow.vue';
|
import VnRow from 'components/ui/VnRow.vue';
|
||||||
import VnSelect from 'src/components/common/VnSelect.vue';
|
import VnSelect from 'src/components/common/VnSelect.vue';
|
||||||
|
@ -13,7 +12,6 @@ import FormModelPopup from 'components/FormModelPopup.vue';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { notify } = useNotify();
|
|
||||||
const emit = defineEmits(['onDataSaved']);
|
const emit = defineEmits(['onDataSaved']);
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -63,11 +61,8 @@ function onFileChange(files) {
|
||||||
|
|
||||||
function mapperDms(data) {
|
function mapperDms(data) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
let files = data.files;
|
const { files } = data;
|
||||||
if (files) {
|
if (files) formData.append(files?.name, files);
|
||||||
files = Array.isArray(files) ? files : [files];
|
|
||||||
files.forEach((file) => formData.append(file?.name, file));
|
|
||||||
}
|
|
||||||
|
|
||||||
const dms = {
|
const dms = {
|
||||||
hasFile: !!data.hasFile,
|
hasFile: !!data.hasFile,
|
||||||
|
@ -88,16 +83,11 @@ function getUrl() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
try {
|
const body = mapperDms(dms.value);
|
||||||
const body = mapperDms(dms.value);
|
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
emit('onDataSaved', body[1].params, response);
|
||||||
emit('onDataSaved', body[1].params, response);
|
delete dms.value.files;
|
||||||
notify(t('globals.dataSaved'), 'positive');
|
return response;
|
||||||
delete dms.value.files;
|
|
||||||
return response;
|
|
||||||
} catch (e) {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultData() {
|
function defaultData() {
|
||||||
|
@ -218,7 +208,7 @@ function addDefaultData(data) {
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
contentTypesInfo: Allowed file types {allowedContentTypes}
|
contentTypesInfo: Allowed file types {allowedContentTypes}
|
||||||
EntryDmsDescription: Reference {reference}
|
EntryDmsDescription: Reference {reference}
|
||||||
WorkersDescription: Working of employee id {reference}
|
WorkersDescription: Working of employee id {reference}
|
||||||
|
|
|
@ -13,12 +13,10 @@ import VnDms from 'src/components/common/VnDms.vue';
|
||||||
import VnConfirm from 'components/ui/VnConfirm.vue';
|
import VnConfirm from 'components/ui/VnConfirm.vue';
|
||||||
import VnInputDate from 'components/common/VnInputDate.vue';
|
import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
import { useSession } from 'src/composables/useSession';
|
import { useSession } from 'src/composables/useSession';
|
||||||
import useNotify from 'src/composables/useNotify.js';
|
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const { notify } = useNotify();
|
|
||||||
const rows = ref([]);
|
const rows = ref([]);
|
||||||
const dmsRef = ref();
|
const dmsRef = ref();
|
||||||
const formDialog = ref({});
|
const formDialog = ref({});
|
||||||
|
@ -90,6 +88,7 @@ const dmsFilter = {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
where: { [$props.filter]: route.params.id },
|
||||||
};
|
};
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -259,16 +258,9 @@ function deleteDms(dmsFk) {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.onOk(async () => {
|
.onOk(async () => {
|
||||||
try {
|
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
|
||||||
await axios.post(
|
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
||||||
`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
|
rows.value.splice(index, 1);
|
||||||
);
|
|
||||||
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
|
||||||
rows.value.splice(index, 1);
|
|
||||||
notify(t('globals.dataDeleted'), 'positive');
|
|
||||||
} catch (e) {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -306,9 +298,7 @@ defineExpose({
|
||||||
:data-key="$props.model"
|
:data-key="$props.model"
|
||||||
:url="$props.model"
|
:url="$props.model"
|
||||||
:user-filter="dmsFilter"
|
:user-filter="dmsFilter"
|
||||||
search-url="dmsFilter"
|
|
||||||
:order="['dmsFk DESC']"
|
:order="['dmsFk DESC']"
|
||||||
:filter="{ where: { [$props.filter]: route.params.id } }"
|
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setData"
|
@on-fetch="setData"
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,44 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
|
||||||
|
|
||||||
const { t } = useI18n();
|
|
||||||
const model = defineModel({ type: [Number, String] });
|
|
||||||
const emit = defineEmits(['updateBic']);
|
|
||||||
|
|
||||||
const getIbanCountry = (bank) => {
|
|
||||||
return bank.substr(0, 2);
|
|
||||||
};
|
|
||||||
|
|
||||||
const autofillBic = async (iban) => {
|
|
||||||
if (!iban) return;
|
|
||||||
|
|
||||||
const bankEntityId = parseInt(iban.substr(4, 4));
|
|
||||||
const ibanCountry = getIbanCountry(iban);
|
|
||||||
|
|
||||||
if (ibanCountry != 'ES') return;
|
|
||||||
|
|
||||||
const filter = { where: { id: bankEntityId } };
|
|
||||||
const params = { filter: JSON.stringify(filter) };
|
|
||||||
|
|
||||||
const { data } = await axios.get(`BankEntities`, { params });
|
|
||||||
|
|
||||||
emit('updateBic', data[0]?.id);
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<template>
|
|
||||||
<VnInput
|
|
||||||
:label="t('IBAN')"
|
|
||||||
clearable
|
|
||||||
v-model="model"
|
|
||||||
@update:model-value="autofillBic($event)"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-info">
|
|
||||||
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</VnInput>
|
|
||||||
</template>
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
|
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
|
||||||
import { date, getCssVar } from 'quasar';
|
import { date } from 'quasar';
|
||||||
import VnDate from './VnDate.vue';
|
import VnDate from './VnDate.vue';
|
||||||
import { useRequired } from 'src/composables/useRequired';
|
import { useRequired } from 'src/composables/useRequired';
|
||||||
|
|
||||||
|
@ -20,18 +20,61 @@ const $props = defineProps({
|
||||||
});
|
});
|
||||||
|
|
||||||
const vnInputDateRef = ref(null);
|
const vnInputDateRef = ref(null);
|
||||||
const errColor = getCssVar('negative');
|
|
||||||
const textColor = ref('');
|
|
||||||
|
|
||||||
const dateFormat = 'DD/MM/YYYY';
|
const dateFormat = 'DD/MM/YYYY';
|
||||||
const isPopupOpen = ref();
|
const isPopupOpen = ref();
|
||||||
const hover = ref();
|
const hover = ref();
|
||||||
|
const mask = ref();
|
||||||
|
|
||||||
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
|
||||||
|
|
||||||
|
const formattedDate = computed({
|
||||||
|
get() {
|
||||||
|
if (!model.value) return model.value;
|
||||||
|
return date.formatDate(new Date(model.value), dateFormat);
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
if (value == model.value) return;
|
||||||
|
let newDate;
|
||||||
|
if (value) {
|
||||||
|
// parse input
|
||||||
|
if (value.includes('/') && value.length >= 10) {
|
||||||
|
if (value.at(2) == '/') value = value.split('/').reverse().join('/');
|
||||||
|
value = date.formatDate(
|
||||||
|
new Date(value).toISOString(),
|
||||||
|
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const [year, month, day] = value.split('-').map((e) => parseInt(e));
|
||||||
|
newDate = new Date(year, month - 1, day);
|
||||||
|
if (model.value) {
|
||||||
|
const orgDate =
|
||||||
|
model.value instanceof Date ? model.value : new Date(model.value);
|
||||||
|
|
||||||
|
newDate.setHours(
|
||||||
|
orgDate.getHours(),
|
||||||
|
orgDate.getMinutes(),
|
||||||
|
orgDate.getSeconds(),
|
||||||
|
orgDate.getMilliseconds(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!isNaN(newDate)) model.value = newDate.toISOString();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const popupDate = computed(() =>
|
const popupDate = computed(() =>
|
||||||
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
|
model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
|
||||||
);
|
);
|
||||||
|
onMounted(() => {
|
||||||
|
// fix quasar bug
|
||||||
|
mask.value = '##/##/####';
|
||||||
|
});
|
||||||
|
watch(
|
||||||
|
() => model.value,
|
||||||
|
(val) => (formattedDate.value = val),
|
||||||
|
{ immediate: true },
|
||||||
|
);
|
||||||
|
|
||||||
const styleAttrs = computed(() => {
|
const styleAttrs = computed(() => {
|
||||||
return $props.isOutlined
|
return $props.isOutlined
|
||||||
|
@ -43,138 +86,28 @@ const styleAttrs = computed(() => {
|
||||||
: {};
|
: {};
|
||||||
});
|
});
|
||||||
|
|
||||||
const inputValue = ref('');
|
|
||||||
|
|
||||||
const validateAndCleanInput = (value) => {
|
|
||||||
inputValue.value = value.replace(/[^0-9./-]/g, '');
|
|
||||||
};
|
|
||||||
|
|
||||||
const manageDate = (date) => {
|
const manageDate = (date) => {
|
||||||
inputValue.value = date.split('/').reverse().join('/');
|
formattedDate.value = date;
|
||||||
isPopupOpen.value = false;
|
isPopupOpen.value = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
watch(
|
|
||||||
() => model.value,
|
|
||||||
(nVal) => {
|
|
||||||
if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
|
|
||||||
else inputValue.value = '';
|
|
||||||
},
|
|
||||||
{ immediate: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
const formatDate = () => {
|
|
||||||
let value = inputValue.value;
|
|
||||||
if (!value || value === model.value) {
|
|
||||||
textColor.value = '';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const regex =
|
|
||||||
/^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
|
|
||||||
if (!regex.test(value)) {
|
|
||||||
textColor.value = errColor;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
value = value.replace(/[.-]/g, '/');
|
|
||||||
const parts = value.split('/');
|
|
||||||
if (parts.length < 2) {
|
|
||||||
textColor.value = errColor;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let [day, month, year] = parts;
|
|
||||||
if (day.length === 1) day = '0' + day;
|
|
||||||
if (month.length === 1) month = '0' + month;
|
|
||||||
|
|
||||||
const currentYear = Date.vnNew().getFullYear();
|
|
||||||
if (!year) year = currentYear;
|
|
||||||
const millennium = currentYear.toString().slice(0, 1);
|
|
||||||
|
|
||||||
switch (year.length) {
|
|
||||||
case 1:
|
|
||||||
year = `${millennium}00${year}`;
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
year = `${millennium}0${year}`;
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
year = `${millennium}${year}`;
|
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
let isoCandidate = `${year}/${month}/${day}`;
|
|
||||||
isoCandidate = date.formatDate(
|
|
||||||
new Date(isoCandidate).toISOString(),
|
|
||||||
'YYYY-MM-DDTHH:mm:ss.SSSZ',
|
|
||||||
);
|
|
||||||
const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
|
|
||||||
const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
|
|
||||||
|
|
||||||
const isValidDate =
|
|
||||||
parsedDate instanceof Date &&
|
|
||||||
!isNaN(parsedDate) &&
|
|
||||||
parsedDate.getFullYear() === parseInt(year) &&
|
|
||||||
parsedDate.getMonth() === parseInt(month) - 1 &&
|
|
||||||
parsedDate.getDate() === parseInt(day);
|
|
||||||
|
|
||||||
if (!isValidDate) {
|
|
||||||
textColor.value = errColor;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (model.value) {
|
|
||||||
const original =
|
|
||||||
model.value instanceof Date ? model.value : new Date(model.value);
|
|
||||||
parsedDate.setHours(
|
|
||||||
original.getHours(),
|
|
||||||
original.getMinutes(),
|
|
||||||
original.getSeconds(),
|
|
||||||
original.getMilliseconds(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
model.value = parsedDate.toISOString();
|
|
||||||
|
|
||||||
textColor.value = '';
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleEnter = (event) => {
|
|
||||||
formatDate();
|
|
||||||
|
|
||||||
nextTick(() => {
|
|
||||||
const newEvent = new KeyboardEvent('keydown', {
|
|
||||||
key: 'Enter',
|
|
||||||
code: 'Enter',
|
|
||||||
bubbles: true,
|
|
||||||
cancelable: true,
|
|
||||||
});
|
|
||||||
vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div @mouseover="hover = true" @mouseleave="hover = false">
|
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||||
<QInput
|
<QInput
|
||||||
ref="vnInputDateRef"
|
ref="vnInputDateRef"
|
||||||
v-model="inputValue"
|
v-model="formattedDate"
|
||||||
class="vn-input-date"
|
class="vn-input-date"
|
||||||
|
:mask="mask"
|
||||||
placeholder="dd/mm/aaaa"
|
placeholder="dd/mm/aaaa"
|
||||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
:class="{ required: isRequired }"
|
:class="{ required: isRequired }"
|
||||||
:rules="mixinRules"
|
:rules="mixinRules"
|
||||||
:clearable="false"
|
:clearable="false"
|
||||||
:input-style="{ color: textColor }"
|
|
||||||
@click="isPopupOpen = !isPopupOpen"
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
@keydown="isPopupOpen = false"
|
@keydown="isPopupOpen = false"
|
||||||
@blur="formatDate"
|
|
||||||
@keydown.enter.prevent="handleEnter"
|
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
|
||||||
@update:model-value="validateAndCleanInput"
|
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
|
@ -183,12 +116,11 @@ const handleEnter = (event) => {
|
||||||
v-if="
|
v-if="
|
||||||
($attrs.clearable == undefined || $attrs.clearable) &&
|
($attrs.clearable == undefined || $attrs.clearable) &&
|
||||||
hover &&
|
hover &&
|
||||||
inputValue &&
|
model &&
|
||||||
!$attrs.disable
|
!$attrs.disable
|
||||||
"
|
"
|
||||||
@click="
|
@click="
|
||||||
vnInputDateRef.focus();
|
vnInputDateRef.focus();
|
||||||
inputValue = null;
|
|
||||||
model = null;
|
model = null;
|
||||||
isPopupOpen = false;
|
isPopupOpen = false;
|
||||||
"
|
"
|
||||||
|
|
|
@ -1,79 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { computed, useAttrs } from 'vue';
|
|
||||||
import { date } from 'quasar';
|
|
||||||
import VnDate from './VnDate.vue';
|
|
||||||
import VnTime from './VnTime.vue';
|
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
|
||||||
const model = defineModel({ type: [Date, String] });
|
|
||||||
|
|
||||||
const $props = defineProps({
|
|
||||||
isOutlined: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
showEvent: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const styleAttrs = computed(() => {
|
|
||||||
return $props.isOutlined
|
|
||||||
? {
|
|
||||||
dense: true,
|
|
||||||
outlined: true,
|
|
||||||
rounded: true,
|
|
||||||
}
|
|
||||||
: {};
|
|
||||||
});
|
|
||||||
const mask = 'DD-MM-YYYY HH:mm';
|
|
||||||
const selectedDate = computed({
|
|
||||||
get() {
|
|
||||||
if (!model.value) return JSON.stringify(new Date(model.value));
|
|
||||||
return date.formatDate(new Date(model.value), mask);
|
|
||||||
},
|
|
||||||
set(value) {
|
|
||||||
model.value = Date.convertToISODateTime(value);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const manageDate = (date) => {
|
|
||||||
selectedDate.value = date;
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div @mouseover="hover = true" @mouseleave="hover = false">
|
|
||||||
<QInput
|
|
||||||
ref="vnInputDateRef"
|
|
||||||
v-model="selectedDate"
|
|
||||||
class="vn-input-date"
|
|
||||||
placeholder="dd/mm/aaaa HH:mm"
|
|
||||||
v-bind="{ ...$attrs, ...styleAttrs }"
|
|
||||||
:clearable="false"
|
|
||||||
@click="isPopupOpen = !isPopupOpen"
|
|
||||||
@keydown="isPopupOpen = false"
|
|
||||||
hide-bottom-space
|
|
||||||
@update:model-value="manageDate"
|
|
||||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
|
|
||||||
>
|
|
||||||
<template #prepend>
|
|
||||||
<QIcon name="today" size="xs">
|
|
||||||
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
|
||||||
<VnDate :mask="mask" v-model="selectedDate" />
|
|
||||||
</QPopupProxy>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="access_time" size="xs">
|
|
||||||
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
|
||||||
<VnTime format24h :mask="mask" v-model="selectedDate" />
|
|
||||||
</QPopupProxy>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</QInput>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<i18n>
|
|
||||||
es:
|
|
||||||
Open date: Abrir fecha
|
|
||||||
</i18n>
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { watch } from 'vue';
|
import { watch } from 'vue';
|
||||||
import { toDateHourMinSec } from 'src/filters';
|
import { toDateString } from 'src/filters';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
value: { type: [String, Number, Boolean, Object], default: undefined },
|
value: { type: [String, Number, Boolean, Object], default: undefined },
|
||||||
|
@ -40,7 +40,7 @@ const updateValue = () => {
|
||||||
break;
|
break;
|
||||||
case 'object':
|
case 'object':
|
||||||
if (props.value instanceof Date) {
|
if (props.value instanceof Date) {
|
||||||
t = toDateHourMinSec(props.value);
|
t = toDateString(props.value);
|
||||||
} else {
|
} else {
|
||||||
t = props.value.toString();
|
t = props.value.toString();
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,6 +68,7 @@ const filter = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
where: { and: [{ originFk: route.params.id }] },
|
||||||
};
|
};
|
||||||
|
|
||||||
const paginate = ref();
|
const paginate = ref();
|
||||||
|
@ -218,7 +219,6 @@ function filterByRecord(modelLog) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter(params = {}) {
|
async function applyFilter(params = {}) {
|
||||||
paginate.value.arrayData.resetPagination();
|
|
||||||
paginate.value.arrayData.applyFilter({
|
paginate.value.arrayData.applyFilter({
|
||||||
filter: {},
|
filter: {},
|
||||||
params: { originFk: route.params.id, ...params },
|
params: { originFk: route.params.id, ...params },
|
||||||
|
@ -266,6 +266,13 @@ onMounted(() => {
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
stateStore.rightDrawer = false;
|
stateStore.rightDrawer = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => router.currentRoute.value.params.id,
|
||||||
|
() => {
|
||||||
|
applyFilter();
|
||||||
|
},
|
||||||
|
);
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
|
@ -273,7 +280,6 @@ onUnmounted(() => {
|
||||||
:data-key
|
:data-key
|
||||||
:url="dataKey + 's'"
|
:url="dataKey + 's'"
|
||||||
:user-filter="filter"
|
:user-filter="filter"
|
||||||
:filter="{ where: { and: [{ originFk: route.params.id }] } }"
|
|
||||||
:skeleton="false"
|
:skeleton="false"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setLogTree"
|
@on-fetch="setLogTree"
|
||||||
|
|
|
@ -10,7 +10,6 @@ import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
import FetchData from '../FetchData.vue';
|
import FetchData from '../FetchData.vue';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import { useCapitalize } from 'src/composables/useCapitalize';
|
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
import VnAvatar from '../ui/VnAvatar.vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
dataKey: {
|
dataKey: {
|
||||||
|
@ -39,7 +38,7 @@ const checkboxOptions = ref([
|
||||||
{ name: 'select', label: 'Accesses', selected: false },
|
{ name: 'select', label: 'Accesses', selected: false },
|
||||||
]);
|
]);
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
{ name: 'changedModelValue', orderBy: 'id' },
|
{ name: 'changedModelValue' },
|
||||||
{ name: 'changedModel' },
|
{ name: 'changedModel' },
|
||||||
{ name: 'userType', orderBy: false },
|
{ name: 'userType', orderBy: false },
|
||||||
{ name: 'userFk' },
|
{ name: 'userFk' },
|
||||||
|
@ -100,6 +99,7 @@ function getActions() {
|
||||||
:columns="columns"
|
:columns="columns"
|
||||||
:redirect="false"
|
:redirect="false"
|
||||||
:hiddenTags="['originFk', 'creationDate']"
|
:hiddenTags="['originFk', 'creationDate']"
|
||||||
|
:exprBuilder
|
||||||
search-url="logs"
|
search-url="logs"
|
||||||
:showTagChips="false"
|
:showTagChips="false"
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,100 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
scrollTarget: { type: [String, Object], default: 'window' }
|
|
||||||
});
|
|
||||||
|
|
||||||
const scrollPosition = ref(0);
|
|
||||||
const showButton = ref(false);
|
|
||||||
let scrollContainer = null;
|
|
||||||
|
|
||||||
const onScroll = () => {
|
|
||||||
if (!scrollContainer) return;
|
|
||||||
scrollPosition.value =
|
|
||||||
typeof props.scrollTarget === 'object'
|
|
||||||
? scrollContainer.scrollTop
|
|
||||||
: window.scrollY;
|
|
||||||
};
|
|
||||||
|
|
||||||
watch(scrollPosition, (newValue) => {
|
|
||||||
showButton.value = newValue > 0;
|
|
||||||
});
|
|
||||||
|
|
||||||
const scrollToTop = () => {
|
|
||||||
if (scrollContainer) {
|
|
||||||
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const updateScrollContainer = (container) => {
|
|
||||||
if (container) {
|
|
||||||
if (scrollContainer) {
|
|
||||||
scrollContainer.removeEventListener('scroll', onScroll);
|
|
||||||
}
|
|
||||||
scrollContainer = container;
|
|
||||||
scrollContainer.addEventListener('scroll', onScroll);
|
|
||||||
onScroll();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
defineExpose({
|
|
||||||
updateScrollContainer
|
|
||||||
});
|
|
||||||
|
|
||||||
const initScrollContainer = async () => {
|
|
||||||
await nextTick();
|
|
||||||
|
|
||||||
if (typeof props.scrollTarget === 'object') {
|
|
||||||
scrollContainer = props.scrollTarget;
|
|
||||||
} else {
|
|
||||||
scrollContainer = window;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!scrollContainer) return
|
|
||||||
scrollContainer.addEventListener('scroll', onScroll);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
initScrollContainer();
|
|
||||||
});
|
|
||||||
|
|
||||||
onUnmounted(() => {
|
|
||||||
if (scrollContainer) {
|
|
||||||
scrollContainer.removeEventListener('scroll', onScroll);
|
|
||||||
scrollContainer = null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<QIcon
|
|
||||||
v-if="showButton"
|
|
||||||
color="primary"
|
|
||||||
name="keyboard_arrow_up"
|
|
||||||
class="scroll-to-top"
|
|
||||||
@click="scrollToTop"
|
|
||||||
>
|
|
||||||
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.scroll-to-top {
|
|
||||||
position: fixed;
|
|
||||||
top: 70px;
|
|
||||||
font-size: 65px;
|
|
||||||
left: 50%;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
z-index: 1000;
|
|
||||||
transition: transform 0.2s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scroll-to-top:hover {
|
|
||||||
transform: translateX(-50%) scale(1.2);
|
|
||||||
cursor: pointer;
|
|
||||||
filter: brightness(0.8);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
|
@ -40,6 +40,10 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
keepData: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -57,6 +61,7 @@ onBeforeMount(() => {
|
||||||
if ($props.dataKey)
|
if ($props.dataKey)
|
||||||
arrayData = useArrayData($props.dataKey, {
|
arrayData = useArrayData($props.dataKey, {
|
||||||
searchUrl: 'table',
|
searchUrl: 'table',
|
||||||
|
keepData: $props.keepData,
|
||||||
...$props.arrayDataProps,
|
...$props.arrayDataProps,
|
||||||
navigate: $props.redirect,
|
navigate: $props.redirect,
|
||||||
});
|
});
|
||||||
|
|
|
@ -54,10 +54,6 @@ const $props = defineProps({
|
||||||
type: [Array],
|
type: [Array],
|
||||||
default: () => [],
|
default: () => [],
|
||||||
},
|
},
|
||||||
filterFn: {
|
|
||||||
type: Function,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
exprBuilder: {
|
exprBuilder: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -66,12 +62,16 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
|
defaultFilter: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
fields: {
|
fields: {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
type: [Object, Array, String],
|
type: [Object, Array],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
where: {
|
where: {
|
||||||
|
@ -79,7 +79,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
sortBy: {
|
sortBy: {
|
||||||
type: [String, Array],
|
type: String,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
@ -152,22 +152,10 @@ const value = computed({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
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 computedSortBy = computed(() => {
|
const computedSortBy = computed(() => {
|
||||||
return $props.sortBy || $props.optionLabel + ' ASC';
|
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||||
});
|
});
|
||||||
|
|
||||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
|
||||||
|
|
||||||
watch(options, (newValue) => {
|
watch(options, (newValue) => {
|
||||||
setOptions(newValue);
|
setOptions(newValue);
|
||||||
});
|
});
|
||||||
|
@ -186,7 +174,16 @@ onMounted(() => {
|
||||||
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
||||||
});
|
});
|
||||||
|
|
||||||
const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
|
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'],
|
||||||
|
});
|
||||||
|
|
||||||
function findKeyInOptions() {
|
function findKeyInOptions() {
|
||||||
if (!$props.options) return;
|
if (!$props.options) return;
|
||||||
return filter($props.modelValue, $props.options)?.length;
|
return filter($props.modelValue, $props.options)?.length;
|
||||||
|
@ -255,41 +252,43 @@ async function fetchFilter(val) {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function filterHandler(val, update) {
|
async function filterHandler(val, update) {
|
||||||
|
if (isLoading.value) return update();
|
||||||
|
if (!val && lastVal.value === val) {
|
||||||
|
lastVal.value = val;
|
||||||
|
return update();
|
||||||
|
}
|
||||||
|
lastVal.value = val;
|
||||||
let newOptions;
|
let newOptions;
|
||||||
|
|
||||||
if ($props.filterFn) update($props.filterFn(val));
|
if (!$props.defaultFilter) return update();
|
||||||
else if (!val && lastVal.value === val) update();
|
if (
|
||||||
else {
|
$props.url &&
|
||||||
const makeRequest =
|
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
|
||||||
($props.url && $props.limit) ||
|
) {
|
||||||
(!$props.limit && Object.keys(myOptions.value).length === 0);
|
newOptions = await fetchFilter(val);
|
||||||
newOptions = makeRequest
|
} else newOptions = filter(val, myOptionsOriginal.value);
|
||||||
? await fetchFilter(val)
|
update(
|
||||||
: filter(val, myOptionsOriginal.value);
|
() => {
|
||||||
|
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||||
|
newOptions.unshift(noOneOpt.value);
|
||||||
|
|
||||||
update(
|
myOptions.value = newOptions;
|
||||||
() => {
|
},
|
||||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
(ref) => {
|
||||||
newOptions.unshift(noOneOpt.value);
|
if (val !== '' && ref.options.length > 0) {
|
||||||
|
ref.setOptionIndex(-1);
|
||||||
myOptions.value = newOptions;
|
ref.moveOptionSelection(1, true);
|
||||||
},
|
}
|
||||||
(ref) => {
|
},
|
||||||
if (val !== '' && ref.options.length > 0) {
|
);
|
||||||
ref.setOptionIndex(-1);
|
|
||||||
ref.moveOptionSelection(1, true);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
lastVal.value = val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function nullishToTrue(value) {
|
function nullishToTrue(value) {
|
||||||
return value ?? true;
|
return value ?? true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||||
|
|
||||||
async function onScroll({ to, direction, from, index }) {
|
async function onScroll({ to, direction, from, index }) {
|
||||||
const lastIndex = myOptions.value.length - 1;
|
const lastIndex = myOptions.value.length - 1;
|
||||||
|
|
||||||
|
@ -367,8 +366,7 @@ function getCaption(opt) {
|
||||||
virtual-scroll-slice-size="options.length"
|
virtual-scroll-slice-size="options.length"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
:input-debounce="useURL ? '300' : '0'"
|
:input-debounce="useURL ? '300' : '0'"
|
||||||
:loading="someIsLoading"
|
:loading="isLoading"
|
||||||
:disable="someIsLoading"
|
|
||||||
@virtual-scroll="onScroll"
|
@virtual-scroll="onScroll"
|
||||||
@keydown="handleKeyDown"
|
@keydown="handleKeyDown"
|
||||||
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
:data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
|
||||||
|
@ -376,7 +374,7 @@ function getCaption(opt) {
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-show="isClearable && value != null && value !== ''"
|
v-show="isClearable && value"
|
||||||
name="close"
|
name="close"
|
||||||
@click="
|
@click="
|
||||||
() => {
|
() => {
|
||||||
|
@ -391,7 +389,7 @@ function getCaption(opt) {
|
||||||
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
<template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
|
||||||
<div v-if="slotName == 'append'">
|
<div v-if="slotName == 'append'">
|
||||||
<QIcon
|
<QIcon
|
||||||
v-show="isClearable && value != null && value !== ''"
|
v-show="isClearable && value"
|
||||||
name="close"
|
name="close"
|
||||||
@click.stop="
|
@click.stop="
|
||||||
() => {
|
() => {
|
||||||
|
@ -416,7 +414,7 @@ function getCaption(opt) {
|
||||||
<QItemLabel>
|
<QItemLabel>
|
||||||
{{ opt[optionLabel] }}
|
{{ opt[optionLabel] }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
<QItemLabel caption v-if="getCaption(opt) !== false">
|
<QItemLabel caption v-if="getCaption(opt)">
|
||||||
{{ `#${getCaption(opt)}` }}
|
{{ `#${getCaption(opt)}` }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
|
|
|
@ -232,7 +232,7 @@ fr:
|
||||||
pt: Portugais
|
pt: Portugais
|
||||||
pt:
|
pt:
|
||||||
Send SMS: Enviar SMS
|
Send SMS: Enviar SMS
|
||||||
CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
|
CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
|
||||||
Language: Linguagem
|
Language: Linguagem
|
||||||
Phone: Móvel
|
Phone: Móvel
|
||||||
Subject: Assunto
|
Subject: Assunto
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
|
import VnChangePassword from 'src/components/common/VnChangePassword.vue';
|
||||||
import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
import { Notify } from 'quasar';
|
import { Notify } from 'quasar';
|
||||||
|
|
|
@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
|
||||||
|
|
||||||
describe('VnDiscount', () => {
|
describe('VnDiscount', () => {
|
||||||
let vm;
|
let vm;
|
||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
vm = createWrapper(VnDiscount, {
|
vm = createWrapper(VnDiscount, {
|
||||||
props: {
|
props: {
|
||||||
|
@ -12,9 +12,7 @@ describe('VnDiscount', () => {
|
||||||
price: 100,
|
price: 100,
|
||||||
quantity: 2,
|
quantity: 2,
|
||||||
discount: 10,
|
discount: 10,
|
||||||
mana: 10,
|
}
|
||||||
promise: vi.fn(),
|
|
||||||
},
|
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -23,8 +21,8 @@ describe('VnDiscount', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('total', () => {
|
describe('total', () => {
|
||||||
it('should calculate total correctly', () => {
|
it('should calculate total correctly', () => {
|
||||||
expect(vm.total).toBe(180);
|
expect(vm.total).toBe(180);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -1,5 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
import VnDms from 'src/components/common/VnDms.vue';
|
import VnDms from 'src/components/common/VnDms.vue';
|
||||||
|
|
||||||
|
@ -41,12 +40,7 @@ describe('VnDms', () => {
|
||||||
companyFk: 2,
|
companyFk: 2,
|
||||||
dmsTypeFk: 3,
|
dmsTypeFk: 3,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description',
|
||||||
files: [
|
files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
|
||||||
{
|
|
||||||
name: 'example.txt',
|
|
||||||
content: new Blob(['file content'], { type: 'text/plain' }),
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedBody = {
|
const expectedBody = {
|
||||||
|
@ -65,7 +59,7 @@ describe('VnDms', () => {
|
||||||
url: '/test',
|
url: '/test',
|
||||||
formInitialData: { id: 1, reference: 'test' },
|
formInitialData: { id: 1, reference: 'test' },
|
||||||
model: 'Worker',
|
model: 'Worker',
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
@ -85,7 +79,7 @@ describe('VnDms', () => {
|
||||||
it('should map DMS data correctly and add file to FormData', () => {
|
it('should map DMS data correctly and add file to FormData', () => {
|
||||||
const [formData, params] = vm.mapperDms(data);
|
const [formData, params] = vm.mapperDms(data);
|
||||||
|
|
||||||
expect([formData.get('example.txt')]).toStrictEqual(data.files);
|
expect(formData.get('example.txt')).toBe(data.files);
|
||||||
expect(expectedBody).toEqual(params.params);
|
expect(expectedBody).toEqual(params.params);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -104,7 +98,7 @@ describe('VnDms', () => {
|
||||||
expect(vm.getUrl()).toBe('/test');
|
expect(vm.getUrl()).toBe('/test');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {
|
it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {
|
||||||
await wrapper.setProps({ url: null });
|
await wrapper.setProps({ url: null });
|
||||||
expect(vm.getUrl()).toBe('dms/1/updateFile');
|
expect(vm.getUrl()).toBe('dms/1/updateFile');
|
||||||
});
|
});
|
||||||
|
@ -119,9 +113,7 @@ describe('VnDms', () => {
|
||||||
describe('save', () => {
|
describe('save', () => {
|
||||||
it('should save data correctly', async () => {
|
it('should save data correctly', async () => {
|
||||||
await vm.save();
|
await vm.save();
|
||||||
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), {
|
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
|
||||||
params: expectedBody,
|
|
||||||
});
|
|
||||||
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
|
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -135,8 +127,8 @@ describe('VnDms', () => {
|
||||||
warehouseFk: 2,
|
warehouseFk: 2,
|
||||||
companyFk: 3,
|
companyFk: 3,
|
||||||
dmsTypeFk: 2,
|
dmsTypeFk: 2,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description'
|
||||||
};
|
}
|
||||||
await wrapper.setProps({ formInitialData: testData });
|
await wrapper.setProps({ formInitialData: testData });
|
||||||
vm.defaultData();
|
vm.defaultData();
|
||||||
|
|
||||||
|
@ -145,10 +137,10 @@ describe('VnDms', () => {
|
||||||
|
|
||||||
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
|
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
|
||||||
await wrapper.setProps({ formInitialData: null });
|
await wrapper.setProps({ formInitialData: null });
|
||||||
vm.route.params.id = '111';
|
vm.route.params.id= '111';
|
||||||
vm.defaultData();
|
vm.defaultData();
|
||||||
|
|
||||||
expect(vm.dms.reference).toBe('111');
|
expect(vm.dms.reference).toBe('111');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -1,6 +1,4 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
|
|
||||||
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
|
||||||
|
|
||||||
describe('VnInput', () => {
|
describe('VnInput', () => {
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
@ -10,28 +11,26 @@ describe('VnInput', () => {
|
||||||
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
|
function generateWrapper(value, isOutlined, emptyToNull, insertable) {
|
||||||
wrapper = createWrapper(VnInput, {
|
wrapper = createWrapper(VnInput, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: value,
|
modelValue: value,
|
||||||
isOutlined,
|
isOutlined, emptyToNull, insertable,
|
||||||
emptyToNull,
|
maxlength: 101
|
||||||
insertable,
|
|
||||||
maxlength: 101,
|
|
||||||
},
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
label: 'test',
|
label: 'test',
|
||||||
required: true,
|
required: true,
|
||||||
maxlength: 101,
|
maxlength: 101,
|
||||||
maxLength: 10,
|
maxLength: 10,
|
||||||
'max-length': 20,
|
'max-length':20
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
input = wrapper.find('[data-cy="test_input"]');
|
input = wrapper.find('[data-cy="test_input"]');
|
||||||
}
|
};
|
||||||
|
|
||||||
describe('value', () => {
|
describe('value', () => {
|
||||||
it('should emit update:modelValue when value changes', async () => {
|
it('should emit update:modelValue when value changes', async () => {
|
||||||
generateWrapper('12345', false, false, true);
|
generateWrapper('12345', false, false, true)
|
||||||
await input.setValue('123');
|
await input.setValue('123');
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
|
||||||
|
@ -47,36 +46,37 @@ describe('VnInput', () => {
|
||||||
describe('styleAttrs', () => {
|
describe('styleAttrs', () => {
|
||||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||||
generateWrapper('123', false, false, false);
|
generateWrapper('123', false, false, false);
|
||||||
expect(vm.styleAttrs).toEqual({});
|
expect(vm.styleAttrs).toEqual({});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set styleAttrs when isOutlined is true', async () => {
|
it('should set styleAttrs when isOutlined is true', async () => {
|
||||||
generateWrapper('123', true, false, false);
|
generateWrapper('123', true, false, false);
|
||||||
expect(vm.styleAttrs.outlined).toBe(true);
|
expect(vm.styleAttrs.outlined).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('handleKeydown', () => {
|
describe('handleKeydown', () => {
|
||||||
it('should do nothing when "Backspace" key is pressed', async () => {
|
it('should do nothing when "Backspace" key is pressed', async () => {
|
||||||
generateWrapper('12345', false, false, true);
|
generateWrapper('12345', false, false, true);
|
||||||
await input.trigger('keydown', { key: 'Backspace' });
|
await input.trigger('keydown', { key: 'Backspace' });
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
expect(wrapper.emitted('update:modelValue')).toBeUndefined();
|
||||||
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
const spyhandler = vi.spyOn(vm, 'handleInsertMode');
|
||||||
expect(spyhandler).not.toHaveBeenCalled();
|
expect(spyhandler).not.toHaveBeenCalled();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
TODO: #8399 REDMINE
|
TODO: #8399 REDMINE
|
||||||
*/
|
*/
|
||||||
it.skip('handleKeydown respects insertable behavior', async () => {
|
it.skip('handleKeydown respects insertable behavior', async () => {
|
||||||
const expectedValue = '12345';
|
const expectedValue = '12345';
|
||||||
generateWrapper('1234', false, false, true);
|
generateWrapper('1234', false, false, true);
|
||||||
vm.focus();
|
vm.focus()
|
||||||
await input.trigger('keydown', { key: '5' });
|
await input.trigger('keydown', { key: '5' });
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
expect(wrapper.emitted('update:modelValue')).toBeTruthy();
|
||||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
|
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
|
||||||
expect(vm.value).toBe(expectedValue);
|
expect(vm.value).toBe( expectedValue);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -86,6 +86,6 @@ describe('VnInput', () => {
|
||||||
const focusSpy = vi.spyOn(input.element, 'focus');
|
const focusSpy = vi.spyOn(input.element, 'focus');
|
||||||
vm.focus();
|
vm.focus();
|
||||||
expect(focusSpy).toHaveBeenCalled();
|
expect(focusSpy).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -5,71 +5,52 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
|
||||||
function generateWrapper(outlined = false, required = false) {
|
function generateWrapper(date, outlined, required) {
|
||||||
wrapper = createWrapper(VnInputDate, {
|
wrapper = createWrapper(VnInputDate, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: '2000-12-31T23:00:00.000Z',
|
modelValue: date,
|
||||||
'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
|
|
||||||
},
|
},
|
||||||
attrs: {
|
attrs: {
|
||||||
isOutlined: outlined,
|
isOutlined: outlined,
|
||||||
required: required,
|
required: required
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
}
|
};
|
||||||
|
|
||||||
describe('VnInputDate', () => {
|
describe('VnInputDate', () => {
|
||||||
describe('formattedDate', () => {
|
|
||||||
it('validateAndCleanInput should remove non-numeric characters', async () => {
|
describe('formattedDate', () => {
|
||||||
generateWrapper();
|
it('formats a valid date correctly', async () => {
|
||||||
vm.validateAndCleanInput('10a/1s2/2dd0a23');
|
generateWrapper('2023-12-25', false, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.inputValue).toBe('10/12/2023');
|
expect(vm.formattedDate).toBe('25/12/2023');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('manageDate should reverse the date', async () => {
|
it('updates the model value when a new date is set', async () => {
|
||||||
generateWrapper();
|
|
||||||
vm.manageDate('10/12/2023');
|
|
||||||
await vm.$nextTick();
|
|
||||||
expect(vm.inputValue).toBe('2023/12/10');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
|
|
||||||
const input = wrapper.find('input');
|
const input = wrapper.find('input');
|
||||||
await input.setValue('25.12/2002');
|
await input.setValue('31/12/2023');
|
||||||
await vm.$nextTick();
|
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
||||||
await vm.formatDate();
|
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
||||||
expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should format the date correctly when a valid date is entered with short year', async () => {
|
it('should not update the model value when an invalid date is set', async () => {
|
||||||
const input = wrapper.find('input');
|
const input = wrapper.find('input');
|
||||||
await input.setValue('31.12-23');
|
await input.setValue('invalid-date');
|
||||||
await vm.$nextTick();
|
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
||||||
await vm.formatDate();
|
});
|
||||||
expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should format the date correctly when a valid date is entered without year', async () => {
|
|
||||||
const input = wrapper.find('input');
|
|
||||||
await input.setValue('12.03');
|
|
||||||
await vm.$nextTick();
|
|
||||||
await vm.formatDate();
|
|
||||||
expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('styleAttrs', () => {
|
describe('styleAttrs', () => {
|
||||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||||
generateWrapper();
|
generateWrapper('2023-12-25', false, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs).toEqual({});
|
expect(vm.styleAttrs).toEqual({});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should set styleAttrs when isOutlined is true', async () => {
|
it('should set styleAttrs when isOutlined is true', async () => {
|
||||||
generateWrapper(true, false);
|
generateWrapper('2023-12-25', true, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs.outlined).toBe(true);
|
expect(vm.styleAttrs.outlined).toBe(true);
|
||||||
});
|
});
|
||||||
|
@ -77,15 +58,15 @@ describe('VnInputDate', () => {
|
||||||
|
|
||||||
describe('required', () => {
|
describe('required', () => {
|
||||||
it('should not applies required class when isRequired is false', async () => {
|
it('should not applies required class when isRequired is false', async () => {
|
||||||
generateWrapper();
|
generateWrapper('2023-12-25', false, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should applies required class when isRequired is true', async () => {
|
it('should applies required class when isRequired is true', async () => {
|
||||||
generateWrapper(false, true);
|
generateWrapper('2023-12-25', false, true);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
expect(wrapper.find('.vn-input-date').classes()).toContain('required');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -1,81 +0,0 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper.js';
|
|
||||||
import { describe, it, expect, beforeAll } from 'vitest';
|
|
||||||
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
|
|
||||||
import vnDateBoot from 'src/boot/vnDate';
|
|
||||||
|
|
||||||
let vm;
|
|
||||||
let wrapper;
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
// Initialize the vnDate boot
|
|
||||||
vnDateBoot();
|
|
||||||
});
|
|
||||||
function generateWrapper(date, outlined, showEvent) {
|
|
||||||
wrapper = createWrapper(VnInputDateTime, {
|
|
||||||
props: {
|
|
||||||
modelValue: date,
|
|
||||||
isOutlined: outlined,
|
|
||||||
showEvent: showEvent,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
wrapper = wrapper.wrapper;
|
|
||||||
vm = wrapper.vm;
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('VnInputDateTime', () => {
|
|
||||||
describe('selectedDate', () => {
|
|
||||||
it('formats a valid datetime correctly', async () => {
|
|
||||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
|
||||||
await vm.$nextTick();
|
|
||||||
expect(vm.selectedDate).toBe('25-12-2023 10:30');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('handles null date value', async () => {
|
|
||||||
generateWrapper(null, false, true);
|
|
||||||
await vm.$nextTick();
|
|
||||||
expect(vm.selectedDate).not.toBe(null);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('updates the model value when a new datetime is set', async () => {
|
|
||||||
vm.selectedDate = '31-12-2023 15:45';
|
|
||||||
await vm.$nextTick();
|
|
||||||
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('styleAttrs', () => {
|
|
||||||
it('should return empty styleAttrs when isOutlined is false', async () => {
|
|
||||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
|
||||||
await vm.$nextTick();
|
|
||||||
expect(vm.styleAttrs).toEqual({});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should set styleAttrs when isOutlined is true', async () => {
|
|
||||||
generateWrapper('2023-12-25T10:30:00', true, true);
|
|
||||||
await vm.$nextTick();
|
|
||||||
expect(vm.styleAttrs).toEqual({
|
|
||||||
dense: true,
|
|
||||||
outlined: true,
|
|
||||||
rounded: true,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('component rendering', () => {
|
|
||||||
it('should render date and time icons', async () => {
|
|
||||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
|
||||||
await vm.$nextTick();
|
|
||||||
const icons = wrapper.findAllComponents({ name: 'QIcon' });
|
|
||||||
expect(icons.length).toBe(2);
|
|
||||||
expect(icons[0].props('name')).toBe('today');
|
|
||||||
expect(icons[1].props('name')).toBe('access_time');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should render popup proxies for date and time', async () => {
|
|
||||||
generateWrapper('2023-12-25T10:30:00', false, true);
|
|
||||||
await vm.$nextTick();
|
|
||||||
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
|
|
||||||
expect(popups.length).toBe(2);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
|
||||||
const date = new Date('2023-01-01');
|
const date = new Date('2023-01-01');
|
||||||
const wrapper = buildComponent({ value: date });
|
const wrapper = buildComponent({ value: date });
|
||||||
const span = wrapper.find('span');
|
const span = wrapper.find('span');
|
||||||
expect(span.text()).toBe('01/01/2023, 01:00:00');
|
expect(span.text()).toBe('2023-01-01');
|
||||||
expect(span.classes()).toContain('json-object');
|
expect(span.classes()).toContain('json-object');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import VnLog from 'src/components/common/VnLog.vue';
|
import VnLog from 'src/components/common/VnLog.vue';
|
||||||
|
|
||||||
describe('VnLog', () => {
|
describe('VnLog', () => {
|
||||||
|
@ -90,10 +89,8 @@ describe('VnLog', () => {
|
||||||
|
|
||||||
vm = createWrapper(VnLog, {
|
vm = createWrapper(VnLog, {
|
||||||
global: {
|
global: {
|
||||||
stubs: ['FetchData', 'vue-i18n'],
|
stubs: [],
|
||||||
mocks: {
|
mocks: {},
|
||||||
fetch: vi.fn(),
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
model: 'Claim',
|
model: 'Claim',
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||||
|
|
||||||
describe('VnNotes', () => {
|
describe('VnNotes', () => {
|
||||||
|
@ -26,7 +25,7 @@ describe('VnNotes', () => {
|
||||||
) {
|
) {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||||
wrapper = createWrapper(VnNotes, {
|
wrapper = createWrapper(VnNotes, {
|
||||||
propsData: { ...defaultOptions, ...options },
|
propsData: options,
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
|
@ -159,7 +159,6 @@ async function fetch() {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
align-items: start;
|
|
||||||
.label {
|
.label {
|
||||||
color: var(--vn-label-color);
|
color: var(--vn-label-color);
|
||||||
width: 9em;
|
width: 9em;
|
||||||
|
@ -170,15 +169,9 @@ async function fetch() {
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
&.ellipsis > .value {
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: pre;
|
|
||||||
}
|
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
white-space: nowrap;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.header {
|
.header {
|
||||||
|
@ -210,21 +203,27 @@ async function fetch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-group {
|
.vn-card-group {
|
||||||
display: grid;
|
display: flex;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
flex-direction: column;
|
||||||
gap: 16px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-content {
|
.vn-card-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
overflow: hidden;
|
|
||||||
white-space: nowrap;
|
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
> div {
|
> div {
|
||||||
max-height: 70px;
|
max-height: 70px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (min-width: 1010px) {
|
||||||
|
.vn-card-group {
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
.vn-card-content {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.summaryHeader .vn-label-value {
|
.summaryHeader .vn-label-value {
|
||||||
|
|
|
@ -58,8 +58,7 @@ async function getData() {
|
||||||
store.filter = $props.filter ?? {};
|
store.filter = $props.filter ?? {};
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
try {
|
try {
|
||||||
await arrayData.fetch({ append: false, updateRouter: false });
|
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
||||||
const { data } = store;
|
|
||||||
state.set($props.dataKey, data);
|
state.set($props.dataKey, data);
|
||||||
emit('onFetch', data);
|
emit('onFetch', data);
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -89,26 +89,24 @@ function cancel() {
|
||||||
<slot name="customHTML"></slot>
|
<slot name="customHTML"></slot>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
<slot name="actions" :actions="{ confirm, cancel }">
|
<QBtn
|
||||||
<QBtn
|
:label="t('globals.cancel')"
|
||||||
:label="t('globals.cancel')"
|
color="primary"
|
||||||
color="primary"
|
:disable="isLoading"
|
||||||
:disable="isLoading"
|
flat
|
||||||
flat
|
@click="cancel()"
|
||||||
@click="cancel()"
|
data-cy="VnConfirm_cancel"
|
||||||
data-cy="VnConfirm_cancel"
|
/>
|
||||||
/>
|
<QBtn
|
||||||
<QBtn
|
:label="t('globals.confirm')"
|
||||||
:label="t('globals.confirm')"
|
:title="t('globals.confirm')"
|
||||||
:title="t('globals.confirm')"
|
color="primary"
|
||||||
color="primary"
|
:loading="isLoading"
|
||||||
:loading="isLoading"
|
@click="confirm()"
|
||||||
@click="confirm()"
|
unelevated
|
||||||
unelevated
|
autofocus
|
||||||
autofocus
|
data-cy="VnConfirm_confirm"
|
||||||
data-cy="VnConfirm_confirm"
|
/>
|
||||||
/>
|
|
||||||
</slot>
|
|
||||||
</QCardActions>
|
</QCardActions>
|
||||||
</QCard>
|
</QCard>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
|
|
@ -6,7 +6,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
import { useClipboard } from 'src/composables/useClipboard';
|
import { useClipboard } from 'src/composables/useClipboard';
|
||||||
import VnMoreOptions from './VnMoreOptions.vue';
|
import VnMoreOptions from './VnMoreOptions.vue';
|
||||||
import { getValueFromPath } from 'src/composables/getValueFromPath';
|
|
||||||
|
|
||||||
const entity = defineModel({ type: Object, default: null });
|
const entity = defineModel({ type: Object, default: null });
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -57,6 +56,18 @@ const routeName = computed(() => {
|
||||||
return `${routeName}Summary`;
|
return `${routeName}Summary`;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function getValueFromPath(path) {
|
||||||
|
if (!path) return;
|
||||||
|
const keys = path.toString().split('.');
|
||||||
|
let current = entity.value;
|
||||||
|
|
||||||
|
for (const key of keys) {
|
||||||
|
if (current[key] === undefined) return undefined;
|
||||||
|
else current = current[key];
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
function copyIdText(id) {
|
function copyIdText(id) {
|
||||||
copyText(id, {
|
copyText(id, {
|
||||||
component: {
|
component: {
|
||||||
|
@ -159,10 +170,10 @@ const toModule = computed(() => {
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<span
|
<span
|
||||||
v-if="title"
|
v-if="title"
|
||||||
:title="getValueFromPath(entity, title)"
|
:title="getValueFromPath(title)"
|
||||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
|
||||||
>
|
>
|
||||||
{{ getValueFromPath(entity, title) ?? title }}
|
{{ getValueFromPath(title) ?? title }}
|
||||||
</span>
|
</span>
|
||||||
<slot v-else name="description" :entity="entity">
|
<slot v-else name="description" :entity="entity">
|
||||||
<span
|
<span
|
||||||
|
@ -178,7 +189,7 @@ const toModule = computed(() => {
|
||||||
class="subtitle"
|
class="subtitle"
|
||||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
|
||||||
>
|
>
|
||||||
#{{ getValueFromPath(entity, subtitle) ?? entity.id }}
|
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
<QBtn
|
<QBtn
|
||||||
round
|
round
|
||||||
|
@ -241,10 +252,6 @@ const toModule = computed(() => {
|
||||||
content: ':';
|
content: ':';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.ellipsis > .value {
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
white-space: pre;
|
|
||||||
}
|
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
|
@ -212,7 +212,6 @@ const getLocale = (label) => {
|
||||||
color="primary"
|
color="primary"
|
||||||
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
style="position: fixed; z-index: 1; right: 0; bottom: 0"
|
||||||
icon="search"
|
icon="search"
|
||||||
data-cy="vnFilterPanel_search"
|
|
||||||
@click="search()"
|
@click="search()"
|
||||||
>
|
>
|
||||||
<QTooltip bottom anchor="bottom right">
|
<QTooltip bottom anchor="bottom right">
|
||||||
|
@ -230,7 +229,6 @@ const getLocale = (label) => {
|
||||||
<QItemSection top side>
|
<QItemSection top side>
|
||||||
<QBtn
|
<QBtn
|
||||||
@click="clearFilters"
|
@click="clearFilters"
|
||||||
data-cy="clearFilters"
|
|
||||||
color="primary"
|
color="primary"
|
||||||
dense
|
dense
|
||||||
flat
|
flat
|
||||||
|
@ -294,7 +292,6 @@ const getLocale = (label) => {
|
||||||
</QList>
|
</QList>
|
||||||
</QForm>
|
</QForm>
|
||||||
<QInnerLoading
|
<QInnerLoading
|
||||||
data-cy="filterPanel-spinner"
|
|
||||||
:label="t('globals.pleaseWait')"
|
:label="t('globals.pleaseWait')"
|
||||||
:showing="isLoading"
|
:showing="isLoading"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { dashIfEmpty } from 'src/filters';
|
|
||||||
|
|
||||||
defineProps({ email: { type: [String], default: null } });
|
defineProps({ email: { type: [String], default: null } });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<QBtn
|
||||||
class="q-pr-xs"
|
|
||||||
v-if="email"
|
v-if="email"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
@ -16,5 +13,4 @@ defineProps({ email: { type: [String], default: null } });
|
||||||
:href="`mailto:${email}`"
|
:href="`mailto:${email}`"
|
||||||
@click.stop
|
@click.stop
|
||||||
/>
|
/>
|
||||||
<span>{{ dashIfEmpty(email) }}</span>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { dashIfEmpty, parsePhone } from 'src/filters';
|
import { parsePhone } from 'src/filters';
|
||||||
import useOpenURL from 'src/composables/useOpenURL';
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -12,65 +12,50 @@ const props = defineProps({
|
||||||
|
|
||||||
const phone = ref(props.phoneNumber);
|
const phone = ref(props.phoneNumber);
|
||||||
const config = reactive({
|
const config = reactive({
|
||||||
|
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||||
'say-simple': {
|
'say-simple': {
|
||||||
icon: 'vn:saysimple',
|
icon: 'vn:saysimple',
|
||||||
url: null,
|
url: null,
|
||||||
channel: props.channel,
|
channel: props.channel,
|
||||||
},
|
},
|
||||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
|
||||||
});
|
});
|
||||||
|
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
||||||
const attrs = useAttrs();
|
|
||||||
const types = Object.keys(config)
|
|
||||||
.filter((key) => key in attrs)
|
|
||||||
.sort();
|
|
||||||
const activeTypes = types.length ? types : ['sip'];
|
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
if (!phone.value) return;
|
if (!phone.value) return;
|
||||||
|
let { channel } = config[type];
|
||||||
|
|
||||||
for (const type of activeTypes) {
|
if (type === 'say-simple') {
|
||||||
if (type === 'say-simple') {
|
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||||
let { channel } = config[type];
|
.data;
|
||||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
if (!channel) channel = defaultChannel;
|
||||||
.data;
|
|
||||||
if (!channel) channel = defaultChannel;
|
|
||||||
|
|
||||||
phone.value = await parsePhone(
|
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
||||||
props.phoneNumber,
|
config[
|
||||||
props.country?.toLowerCase(),
|
type
|
||||||
);
|
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||||
config[type].url =
|
|
||||||
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleClick(type) {
|
function handleClick() {
|
||||||
if (config[type].url) useOpenURL(config[type].url);
|
if (config[type].url) useOpenURL(config[type].url);
|
||||||
else if (config[type].href) window.location.href = config[type].href;
|
else if (config[type].href) window.location.href = config[type].href;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="flex items-center gap-2">
|
<QBtn
|
||||||
<template v-for="type in activeTypes">
|
v-if="phone"
|
||||||
<QBtn
|
flat
|
||||||
:key="type"
|
round
|
||||||
v-if="phone"
|
:icon="config[type].icon"
|
||||||
flat
|
size="sm"
|
||||||
round
|
color="primary"
|
||||||
:icon="config[type].icon"
|
padding="none"
|
||||||
size="sm"
|
@click.stop="handleClick"
|
||||||
color="primary"
|
>
|
||||||
padding="none"
|
<QTooltip>
|
||||||
@click.stop="() => handleClick(type)"
|
{{ capitalize(type).replace('-', '') }}
|
||||||
>
|
</QTooltip>
|
||||||
<QTooltip>
|
</QBtn>
|
||||||
{{ capitalize(type).replace('-', '') }}
|
{{ phoneNumber }}
|
||||||
</QTooltip>
|
|
||||||
</QBtn></template
|
|
||||||
>
|
|
||||||
<span>{{ dashIfEmpty(phone) }}</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -6,7 +6,6 @@ import { computed } from 'vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
label: { type: String, default: null },
|
label: { type: String, default: null },
|
||||||
tooltip: { type: String, default: null },
|
|
||||||
value: {
|
value: {
|
||||||
type: [String, Boolean, Number],
|
type: [String, Boolean, Number],
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -41,10 +40,7 @@ const val = computed(() => $props.value);
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="label || $slots.label" class="label">
|
<div v-if="label || $slots.label" class="label">
|
||||||
<slot name="label">
|
<slot name="label">
|
||||||
<QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
|
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
||||||
<span style="color: var(--vn-label-color)">
|
|
||||||
{{ label }}
|
|
||||||
</span>
|
|
||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="value" v-if="value || $slots.value">
|
<div class="value" v-if="value || $slots.value">
|
||||||
|
|
|
@ -2,9 +2,7 @@
|
||||||
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useAttrs } from 'vue';
|
|
||||||
|
|
||||||
const attrs = useAttrs();
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -69,7 +67,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: [String, Boolean],
|
type: String,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
disableInfiniteScroll: {
|
disableInfiniteScroll: {
|
||||||
|
@ -77,7 +75,7 @@ const props = defineProps({
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
mapKey: {
|
mapKey: {
|
||||||
type: [String, Boolean],
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
keyData: {
|
keyData: {
|
||||||
|
@ -117,7 +115,7 @@ onMounted(async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
arrayData.reset(['data']);
|
if (!store.keepData) arrayData.reset(['data']);
|
||||||
arrayData.resetPagination();
|
arrayData.resetPagination();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -222,7 +220,7 @@ defineExpose({
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="full-width" v-bind="attrs">
|
<div class="full-width">
|
||||||
<div
|
<div
|
||||||
v-if="!store.data && !store.data?.length && !isLoading"
|
v-if="!store.data && !store.data?.length && !isLoading"
|
||||||
class="info-row q-pa-md text-center"
|
class="info-row q-pa-md text-center"
|
||||||
|
|
|
@ -46,7 +46,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
type: [String, Array],
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
|
|
@ -0,0 +1,60 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const props = defineProps({
|
||||||
|
usesMana: {
|
||||||
|
type: Boolean,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
manaCode: {
|
||||||
|
type: String,
|
||||||
|
required: true,
|
||||||
|
},
|
||||||
|
manaVal: {
|
||||||
|
type: String,
|
||||||
|
default: 'mana',
|
||||||
|
},
|
||||||
|
manaLabel: {
|
||||||
|
type: String,
|
||||||
|
default: 'Promotion mana',
|
||||||
|
},
|
||||||
|
manaClaimVal: {
|
||||||
|
type: String,
|
||||||
|
default: 'manaClaim',
|
||||||
|
},
|
||||||
|
claimLabel: {
|
||||||
|
type: String,
|
||||||
|
default: 'Claim mana',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const manaCode = ref(props.manaCode);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="column q-gutter-y-sm q-mt-sm">
|
||||||
|
<QRadio
|
||||||
|
v-model="manaCode"
|
||||||
|
dense
|
||||||
|
:val="manaVal"
|
||||||
|
:label="t(manaLabel)"
|
||||||
|
:dark="true"
|
||||||
|
class="q-mb-sm"
|
||||||
|
/>
|
||||||
|
<QRadio
|
||||||
|
v-model="manaCode"
|
||||||
|
dense
|
||||||
|
:val="manaClaimVal"
|
||||||
|
:label="t(claimLabel)"
|
||||||
|
:dark="true"
|
||||||
|
class="q-mb-sm"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Promotion mana: Maná promoción
|
||||||
|
Claim mana: Maná reclamación
|
||||||
|
</i18n>
|
|
@ -1,7 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { default as axios } from 'axios';
|
|
||||||
|
|
||||||
import CardSummary from 'src/components/ui/CardSummary.vue';
|
import CardSummary from 'src/components/ui/CardSummary.vue';
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
|
|
||||||
|
@ -23,15 +21,10 @@ describe('CardSummary', () => {
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
wrapper = createWrapper(CardSummary, {
|
wrapper = createWrapper(CardSummary, {
|
||||||
global: {
|
|
||||||
mocks: {
|
|
||||||
validate: vi.fn(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
propsData: {
|
propsData: {
|
||||||
dataKey: 'cardSummaryKey',
|
dataKey: 'cardSummaryKey',
|
||||||
url: 'cardSummaryUrl',
|
url: 'cardSummaryUrl',
|
||||||
filter: { key: 'cardFilter' },
|
filter: 'cardFilter',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
@ -55,7 +48,7 @@ describe('CardSummary', () => {
|
||||||
|
|
||||||
it('should set correct props to the store', () => {
|
it('should set correct props to the store', () => {
|
||||||
expect(vm.store.url).toEqual('cardSummaryUrl');
|
expect(vm.store.url).toEqual('cardSummaryUrl');
|
||||||
expect(vm.store.filter).toEqual({ key: 'cardFilter' });
|
expect(vm.store.filter).toEqual('cardFilter');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should respond to prop changes and refetch data', async () => {
|
it('should respond to prop changes and refetch data', async () => {
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
|
|
||||||
describe('VnPaginate', () => {
|
describe('VnPaginate', () => {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { describe, it, expect, beforeAll, vi } from 'vitest';
|
import { describe, it, expect, beforeAll, vi } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
import parsePhone from 'src/filters/parsePhone';
|
import parsePhone from 'src/filters/parsePhone';
|
||||||
|
|
||||||
describe('parsePhone filter', () => {
|
describe('parsePhone filter', () => {
|
||||||
|
|
|
@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let applyFilterSpy;
|
let applyFilterSpy;
|
||||||
const searchText = 'Bolas de madera';
|
const searchText = 'Bolas de madera';
|
||||||
const userParams = { staticKey: 'staticValue' };
|
const userParams = {staticKey: 'staticValue'};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
wrapper = createWrapper(VnSearchbar, {
|
wrapper = createWrapper(VnSearchbar, {
|
||||||
|
@ -23,9 +23,8 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
vm.searchText = searchText;
|
vm.searchText = searchText;
|
||||||
vm.arrayData.store.userParams = userParams;
|
vm.arrayData.store.userParams = userParams;
|
||||||
applyFilterSpy = vi
|
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
|
||||||
.spyOn(vm.arrayData, 'applyFilter')
|
|
||||||
.mockImplementation(() => {});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
@ -33,9 +32,7 @@ describe('VnSearchbar', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('search resets pagination and applies filter', async () => {
|
it('search resets pagination and applies filter', async () => {
|
||||||
const resetPaginationSpy = vi
|
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
|
||||||
.spyOn(vm.arrayData, 'resetPagination')
|
|
||||||
.mockImplementation(() => {});
|
|
||||||
await vm.search();
|
await vm.search();
|
||||||
|
|
||||||
expect(resetPaginationSpy).toHaveBeenCalled();
|
expect(resetPaginationSpy).toHaveBeenCalled();
|
||||||
|
@ -51,7 +48,7 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
expect(applyFilterSpy).toHaveBeenCalledWith({
|
expect(applyFilterSpy).toHaveBeenCalledWith({
|
||||||
params: { staticKey: 'staticValue', search: searchText },
|
params: { staticKey: 'staticValue', search: searchText },
|
||||||
filter: { skip: 0 },
|
filter: {skip: 0},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -71,4 +68,4 @@ describe('VnSearchbar', () => {
|
||||||
});
|
});
|
||||||
expect(vm.to.query.searchParam).toBe(expectedQuery);
|
expect(vm.to.query.searchParam).toBe(expectedQuery);
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -1,5 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper, axios } from 'app/test/vitest/helper';
|
||||||
import VnSms from 'src/components/ui/VnSms.vue';
|
import VnSms from 'src/components/ui/VnSms.vue';
|
||||||
|
|
||||||
describe('VnSms', () => {
|
describe('VnSms', () => {
|
||||||
|
@ -11,9 +11,6 @@ describe('VnSms', () => {
|
||||||
stubs: ['VnPaginate'],
|
stubs: ['VnPaginate'],
|
||||||
mocks: {},
|
mocks: {},
|
||||||
},
|
},
|
||||||
propsData: {
|
|
||||||
url: 'SmsUrl',
|
|
||||||
},
|
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
import { downloadFile } from 'src/composables/downloadFile';
|
import { downloadFile } from 'src/composables/downloadFile';
|
||||||
import { useSession } from 'src/composables/useSession';
|
import { useSession } from 'src/composables/useSession';
|
||||||
const session = useSession();
|
const session = useSession();
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
|
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { useAcl } from 'src/composables/useAcl';
|
import { useAcl } from 'src/composables/useAcl';
|
||||||
|
|
||||||
describe('useAcl', () => {
|
describe('useAcl', () => {
|
||||||
|
|
|
@ -1,41 +1,15 @@
|
||||||
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
import { default as axios } from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import * as vueRouter from 'vue-router';
|
import * as vueRouter from 'vue-router';
|
||||||
import { setActivePinia, createPinia } from 'pinia';
|
|
||||||
import { defineComponent, h } from 'vue';
|
|
||||||
import { mount } from '@vue/test-utils';
|
|
||||||
|
|
||||||
describe('useArrayData', () => {
|
describe('useArrayData', () => {
|
||||||
const filter = '{"limit":20,"skip":0}';
|
const filter = '{"limit":20,"skip":0}';
|
||||||
const params = { supplierFk: 2 };
|
const params = { supplierFk: 2 };
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
setActivePinia(createPinia());
|
vi.spyOn(useRouter(), 'replace');
|
||||||
|
vi.spyOn(useRouter(), 'push');
|
||||||
// Mock route
|
|
||||||
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
|
|
||||||
path: 'mockSection/list',
|
|
||||||
matched: [],
|
|
||||||
query: {},
|
|
||||||
params: {},
|
|
||||||
meta: { moduleName: 'mockName' },
|
|
||||||
});
|
|
||||||
|
|
||||||
// Mock router
|
|
||||||
vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
|
|
||||||
push: vi.fn(),
|
|
||||||
replace: vi.fn(),
|
|
||||||
currentRoute: {
|
|
||||||
value: {
|
|
||||||
path: 'mockSection/list',
|
|
||||||
params: { id: 1 },
|
|
||||||
meta: { moduleName: 'mockName' },
|
|
||||||
matched: [{ path: 'mockName/:id' }],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
@ -43,83 +17,103 @@ describe('useArrayData', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch and replace url with new params', async () => {
|
it('should fetch and replace url with new params', async () => {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
||||||
|
|
||||||
const arrayData = mountArrayData('ArrayData', {
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
|
||||||
url: 'mockUrl',
|
|
||||||
searchUrl: 'params',
|
|
||||||
});
|
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
await arrayData.fetch({});
|
arrayData.fetch({});
|
||||||
|
|
||||||
|
await flushPromises();
|
||||||
const routerReplace = useRouter().replace.mock.calls[0][0];
|
const routerReplace = useRouter().replace.mock.calls[0][0];
|
||||||
|
|
||||||
expect(axios.get).toHaveBeenCalledWith('mockUrl', {
|
expect(axios.get.mock.calls[0][1].params).toEqual({
|
||||||
signal: expect.any(Object),
|
filter,
|
||||||
params: {
|
supplierFk: 2,
|
||||||
filter,
|
|
||||||
supplierFk: 2,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
expect(routerReplace.path).toEqual('mockSection/list');
|
||||||
expect(routerReplace.path).toBe('mockSection/list');
|
|
||||||
expect(JSON.parse(routerReplace.query.params)).toEqual(
|
expect(JSON.parse(routerReplace.query.params)).toEqual(
|
||||||
expect.objectContaining(params),
|
expect.objectContaining(params),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should redirect to detail when single record is returned with navigation', async () => {
|
it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
|
||||||
data: [{ id: 1 }],
|
|
||||||
});
|
|
||||||
|
|
||||||
const arrayData = mountArrayData('ArrayData', {
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
|
||||||
url: 'mockUrl',
|
|
||||||
navigate: {},
|
|
||||||
});
|
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
await arrayData.fetch({});
|
arrayData.fetch({});
|
||||||
|
|
||||||
|
await flushPromises();
|
||||||
const routerPush = useRouter().push.mock.calls[0][0];
|
const routerPush = useRouter().push.mock.calls[0][0];
|
||||||
|
|
||||||
expect(routerPush.path).toBe('mockName/1');
|
expect(axios.get.mock.calls[0][1].params).toEqual({
|
||||||
|
filter,
|
||||||
|
supplierFk: 2,
|
||||||
|
});
|
||||||
|
expect(routerPush.path).toEqual('mockName/1');
|
||||||
expect(routerPush.query).toBeUndefined();
|
expect(routerPush.query).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return one record when oneRecord is true', async () => {
|
it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
|
||||||
|
|
||||||
|
vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
|
||||||
|
matched: [],
|
||||||
|
query: {},
|
||||||
|
params: {},
|
||||||
|
meta: { moduleName: 'mockName' },
|
||||||
|
path: 'mockName/1',
|
||||||
|
});
|
||||||
|
vi.spyOn(vueRouter, 'useRouter').mockReturnValue({
|
||||||
|
push: vi.fn(),
|
||||||
|
replace: vi.fn(),
|
||||||
|
currentRoute: {
|
||||||
|
value: {
|
||||||
|
params: {
|
||||||
|
id: 1,
|
||||||
|
},
|
||||||
|
meta: { moduleName: 'mockName' },
|
||||||
|
matched: [{ path: 'mockName/:id' }],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
|
||||||
|
|
||||||
|
arrayData.store.userParams = params;
|
||||||
|
arrayData.fetch({});
|
||||||
|
|
||||||
|
await flushPromises();
|
||||||
|
const routerPush = useRouter().push.mock.calls[0][0];
|
||||||
|
|
||||||
|
expect(axios.get.mock.calls[0][1].params).toEqual({
|
||||||
|
filter,
|
||||||
|
supplierFk: 2,
|
||||||
|
});
|
||||||
|
expect(routerPush.path).toEqual('mockName/');
|
||||||
|
expect(routerPush.query.params).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return one record', async () => {
|
||||||
|
vi.spyOn(axios, 'get').mockReturnValueOnce({
|
||||||
data: [
|
data: [
|
||||||
{ id: 1, name: 'Entity 1' },
|
{ id: 1, name: 'Entity 1' },
|
||||||
{ id: 2, name: 'Entity 2' },
|
{ id: 2, name: 'Entity 2' },
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
|
||||||
const arrayData = mountArrayData('ArrayData', {
|
|
||||||
url: 'mockUrl',
|
|
||||||
oneRecord: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
await arrayData.fetch({});
|
await arrayData.fetch({});
|
||||||
|
|
||||||
expect(arrayData.store.data).toEqual({
|
expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
|
||||||
id: 1,
|
});
|
||||||
name: 'Entity 1',
|
|
||||||
});
|
it('should handle empty data gracefully if has to return one record', async () => {
|
||||||
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
||||||
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
|
||||||
|
await arrayData.fetch({});
|
||||||
|
|
||||||
|
expect(arrayData.store.data).toBeUndefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
function mountArrayData(...args) {
|
|
||||||
let arrayData;
|
|
||||||
|
|
||||||
const TestComponent = defineComponent({
|
|
||||||
setup() {
|
|
||||||
arrayData = useArrayData(...args);
|
|
||||||
return () => h('div');
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const asd = mount(TestComponent);
|
|
||||||
return arrayData;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { useRole } from 'composables/useRole';
|
import { useRole } from 'composables/useRole';
|
||||||
const role = useRole();
|
const role = useRole();
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios } from 'app/test/vitest/helper';
|
||||||
import { useSession } from 'composables/useSession';
|
import { useSession } from 'composables/useSession';
|
||||||
import { useState } from 'composables/useState';
|
import { useState } from 'composables/useState';
|
||||||
|
|
||||||
|
@ -64,84 +64,88 @@ describe('session', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('login', () => {
|
describe(
|
||||||
const expectedUser = {
|
'login',
|
||||||
id: 999,
|
() => {
|
||||||
name: `T'Challa`,
|
const expectedUser = {
|
||||||
nickname: 'Black Panther',
|
id: 999,
|
||||||
lang: 'en',
|
name: `T'Challa`,
|
||||||
userConfig: {
|
nickname: 'Black Panther',
|
||||||
darkMode: false,
|
lang: 'en',
|
||||||
},
|
userConfig: {
|
||||||
worker: { department: { departmentFk: 155 } },
|
darkMode: false,
|
||||||
};
|
|
||||||
const rolesData = [
|
|
||||||
{
|
|
||||||
role: {
|
|
||||||
name: 'salesPerson',
|
|
||||||
},
|
},
|
||||||
},
|
worker: { department: { departmentFk: 155 } },
|
||||||
{
|
};
|
||||||
role: {
|
const rolesData = [
|
||||||
name: 'admin',
|
{
|
||||||
|
role: {
|
||||||
|
name: 'salesPerson',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
{
|
||||||
];
|
role: {
|
||||||
beforeEach(() => {
|
name: 'admin',
|
||||||
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
},
|
||||||
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
},
|
||||||
return Promise.resolve({
|
];
|
||||||
data: { roles: rolesData, user: expectedUser },
|
beforeEach(() => {
|
||||||
|
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||||
|
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
||||||
|
return Promise.resolve({
|
||||||
|
data: { roles: rolesData, user: expectedUser },
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
const expectedToken = 'mySessionToken';
|
const expectedToken = 'mySessionToken';
|
||||||
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
||||||
const keepLogin = false;
|
const keepLogin = false;
|
||||||
|
|
||||||
await session.login({
|
await session.login({
|
||||||
token: expectedToken,
|
token: expectedToken,
|
||||||
tokenMultimedia: expectedTokenMultimedia,
|
tokenMultimedia: expectedTokenMultimedia,
|
||||||
keepLogin,
|
keepLogin,
|
||||||
|
});
|
||||||
|
|
||||||
|
const roles = state.getRoles();
|
||||||
|
const localToken = localStorage.getItem('token');
|
||||||
|
const sessionToken = sessionStorage.getItem('token');
|
||||||
|
|
||||||
|
expect(roles.value).toEqual(expectedRoles);
|
||||||
|
expect(localToken).toBeNull();
|
||||||
|
expect(sessionToken).toEqual(expectedToken);
|
||||||
|
|
||||||
|
await session.destroy(); // this clears token and user for any other test
|
||||||
});
|
});
|
||||||
|
|
||||||
const roles = state.getRoles();
|
it('should fetch the user roles and then set token in the localStorage', async () => {
|
||||||
const localToken = localStorage.getItem('token');
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
const sessionToken = sessionStorage.getItem('token');
|
const expectedToken = 'myLocalToken';
|
||||||
|
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
||||||
|
const keepLogin = true;
|
||||||
|
|
||||||
expect(roles.value).toEqual(expectedRoles);
|
await session.login({
|
||||||
expect(localToken).toBeNull();
|
token: expectedToken,
|
||||||
expect(sessionToken).toEqual(expectedToken);
|
tokenMultimedia: expectedTokenMultimedia,
|
||||||
|
keepLogin,
|
||||||
|
});
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
const roles = state.getRoles();
|
||||||
});
|
const localToken = localStorage.getItem('token');
|
||||||
|
const sessionToken = sessionStorage.getItem('token');
|
||||||
|
|
||||||
it('should fetch the user roles and then set token in the localStorage', async () => {
|
expect(roles.value).toEqual(expectedRoles);
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
expect(localToken).toEqual(expectedToken);
|
||||||
const expectedToken = 'myLocalToken';
|
expect(sessionToken).toBeNull();
|
||||||
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
|
||||||
const keepLogin = true;
|
|
||||||
|
|
||||||
await session.login({
|
await session.destroy(); // this clears token and user for any other test
|
||||||
token: expectedToken,
|
|
||||||
tokenMultimedia: expectedTokenMultimedia,
|
|
||||||
keepLogin,
|
|
||||||
});
|
});
|
||||||
|
},
|
||||||
const roles = state.getRoles();
|
{},
|
||||||
const localToken = localStorage.getItem('token');
|
);
|
||||||
const sessionToken = sessionStorage.getItem('token');
|
|
||||||
|
|
||||||
expect(roles.value).toEqual(expectedRoles);
|
|
||||||
expect(localToken).toEqual(expectedToken);
|
|
||||||
expect(sessionToken).toBeNull();
|
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('RenewToken', () => {
|
describe('RenewToken', () => {
|
||||||
const expectedToken = 'myToken';
|
const expectedToken = 'myToken';
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import axios from 'axios';
|
import { axios, flushPromises } from 'app/test/vitest/helper';
|
||||||
import { flushPromises } from '@vue/test-utils';
|
|
||||||
import { useTokenConfig } from 'composables/useTokenConfig';
|
import { useTokenConfig } from 'composables/useTokenConfig';
|
||||||
const tokenConfig = useTokenConfig();
|
const tokenConfig = useTokenConfig();
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
export function getValueFromPath(root, path) {
|
|
||||||
if (!root || !path) return;
|
|
||||||
const keys = path.toString().split('.');
|
|
||||||
let current = root;
|
|
||||||
|
|
||||||
for (const key of keys) {
|
|
||||||
if (current[key] === undefined) return undefined;
|
|
||||||
else current = current[key];
|
|
||||||
}
|
|
||||||
return current;
|
|
||||||
}
|
|
|
@ -1,51 +0,0 @@
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
export async function beforeSave(data, getChanges, modelOrigin) {
|
|
||||||
try {
|
|
||||||
const changes = data.updates;
|
|
||||||
if (!changes) return data;
|
|
||||||
const patchPromises = [];
|
|
||||||
|
|
||||||
for (const change of changes) {
|
|
||||||
let patchData = {};
|
|
||||||
|
|
||||||
if ('hasMinPrice' in change.data) {
|
|
||||||
patchData.hasMinPrice = change.data?.hasMinPrice;
|
|
||||||
delete change.data.hasMinPrice;
|
|
||||||
}
|
|
||||||
if ('minPrice' in change.data) {
|
|
||||||
patchData.minPrice = change.data?.minPrice;
|
|
||||||
delete change.data.minPrice;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Object.keys(patchData).length > 0) {
|
|
||||||
const promise = axios
|
|
||||||
.get(`${modelOrigin}/findOne`, {
|
|
||||||
params: {
|
|
||||||
filter: {
|
|
||||||
fields: ['itemFk'],
|
|
||||||
where: { id: change.where.id },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
.then((row) => {
|
|
||||||
return axios.patch(`Items/${row.data.itemFk}`, patchData);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
console.error('Error processing change: ', change, error);
|
|
||||||
});
|
|
||||||
|
|
||||||
patchPromises.push(promise);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await Promise.all(patchPromises);
|
|
||||||
|
|
||||||
data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
|
|
||||||
|
|
||||||
return data;
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error in beforeSave:', error);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +1,16 @@
|
||||||
import { onMounted, computed, ref } from 'vue';
|
import { onMounted, computed } from 'vue';
|
||||||
import { useRouter, useRoute } from 'vue-router';
|
import { useRouter, useRoute } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useArrayDataStore } from 'stores/useArrayDataStore';
|
import { useArrayDataStore } from 'stores/useArrayDataStore';
|
||||||
import { buildFilter } from 'filters/filterPanel';
|
import { buildFilter } from 'filters/filterPanel';
|
||||||
import { isDialogOpened } from 'src/filters';
|
import { isDialogOpened } from 'src/filters';
|
||||||
|
|
||||||
|
const arrayDataStore = useArrayDataStore();
|
||||||
|
|
||||||
export function useArrayData(key, userOptions) {
|
export function useArrayData(key, userOptions) {
|
||||||
key ??= useRoute().meta.moduleName;
|
key ??= useRoute().meta.moduleName;
|
||||||
|
|
||||||
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
||||||
const arrayDataStore = useArrayDataStore(); // Move inside function
|
|
||||||
|
|
||||||
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
||||||
|
|
||||||
|
@ -55,6 +56,7 @@ export function useArrayData(key, userOptions) {
|
||||||
'searchUrl',
|
'searchUrl',
|
||||||
'navigate',
|
'navigate',
|
||||||
'mapKey',
|
'mapKey',
|
||||||
|
'keepData',
|
||||||
'oneRecord',
|
'oneRecord',
|
||||||
];
|
];
|
||||||
if (typeof userOptions === 'object') {
|
if (typeof userOptions === 'object') {
|
||||||
|
@ -106,7 +108,7 @@ export function useArrayData(key, userOptions) {
|
||||||
store.hasMoreData = limit && response.data.length >= limit;
|
store.hasMoreData = limit && response.data.length >= limit;
|
||||||
|
|
||||||
if (!append && !isDialogOpened() && updateRouter) {
|
if (!append && !isDialogOpened() && updateRouter) {
|
||||||
if (updateStateParams(response.data)?.redirect) return;
|
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
|
||||||
}
|
}
|
||||||
store.isLoading = false;
|
store.isLoading = false;
|
||||||
canceller = null;
|
canceller = null;
|
||||||
|
@ -346,7 +348,7 @@ export function useArrayData(key, userOptions) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const totalRows = computed(() => (store.data && store.data.length) || 0);
|
const totalRows = computed(() => (store.data && store.data.length) || 0);
|
||||||
const isLoading = ref(store.isLoading || false);
|
const isLoading = computed(() => store.isLoading || false);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fetch,
|
fetch,
|
||||||
|
|
|
@ -13,7 +13,7 @@ export function useRole() {
|
||||||
name: data.user.name,
|
name: data.user.name,
|
||||||
nickname: data.user.nickname,
|
nickname: data.user.nickname,
|
||||||
lang: data.user.lang || 'es',
|
lang: data.user.lang || 'es',
|
||||||
departmentFk: data.user?.worker?.department?.departmentFk,
|
departmentFk: data.user.worker.department.departmentFk,
|
||||||
};
|
};
|
||||||
state.setUser(userData);
|
state.setUser(userData);
|
||||||
state.setRoles(roles);
|
state.setRoles(roles);
|
||||||
|
|
|
@ -60,7 +60,7 @@ export function useSession() {
|
||||||
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
|
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
|
||||||
if (isValidToken)
|
if (isValidToken)
|
||||||
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
|
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
|
||||||
destroyToken(url, storage, key),
|
destroyToken(url, storage, key)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -78,8 +78,7 @@ export function useValidator() {
|
||||||
if (min >= 0)
|
if (min >= 0)
|
||||||
if (Math.floor(value) < min) return t('inputMin', { value: min });
|
if (Math.floor(value) < min) return t('inputMin', { value: min });
|
||||||
},
|
},
|
||||||
custom: (value) =>
|
custom: (value) => validation.bindedFunction(value) || 'Invalid value',
|
||||||
eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -340,6 +340,3 @@ input::-webkit-inner-spin-button {
|
||||||
.containerShrinked {
|
.containerShrinked {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
}
|
}
|
||||||
.q-item__section--main ~ .q-item__section--side {
|
|
||||||
padding-inline: 0;
|
|
||||||
}
|
|
||||||
|
|
|
@ -18,7 +18,6 @@ $positive: #c8e484;
|
||||||
$negative: #fb5252;
|
$negative: #fb5252;
|
||||||
$info: #84d0e2;
|
$info: #84d0e2;
|
||||||
$warning: #f4b974;
|
$warning: #f4b974;
|
||||||
$neutral: #b0b0b0;
|
|
||||||
// Pendiente de cuadrar con la base de datos
|
// Pendiente de cuadrar con la base de datos
|
||||||
$success: $positive;
|
$success: $positive;
|
||||||
$alert: $negative;
|
$alert: $negative;
|
||||||
|
@ -52,6 +51,3 @@ $width-xl: 1600px;
|
||||||
.bg-alert {
|
.bg-alert {
|
||||||
background-color: $negative;
|
background-color: $negative;
|
||||||
}
|
}
|
||||||
.bg-neutral {
|
|
||||||
background-color: $neutral;
|
|
||||||
}
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ globals:
|
||||||
quantity: Quantity
|
quantity: Quantity
|
||||||
entity: Entity
|
entity: Entity
|
||||||
preview: Preview
|
preview: Preview
|
||||||
scrollToTop: Go up
|
|
||||||
user: User
|
user: User
|
||||||
details: Details
|
details: Details
|
||||||
collapseMenu: Collapse lateral menu
|
collapseMenu: Collapse lateral menu
|
||||||
|
@ -20,7 +19,6 @@ globals:
|
||||||
logOut: Log out
|
logOut: Log out
|
||||||
date: Date
|
date: Date
|
||||||
dataSaved: Data saved
|
dataSaved: Data saved
|
||||||
openDetail: Open detail
|
|
||||||
dataDeleted: Data deleted
|
dataDeleted: Data deleted
|
||||||
delete: Delete
|
delete: Delete
|
||||||
search: Search
|
search: Search
|
||||||
|
@ -162,9 +160,6 @@ globals:
|
||||||
department: Department
|
department: Department
|
||||||
noData: No data available
|
noData: No data available
|
||||||
vehicle: Vehicle
|
vehicle: Vehicle
|
||||||
selectDocumentId: Select document id
|
|
||||||
document: Document
|
|
||||||
import: Import from existing
|
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Login
|
logIn: Login
|
||||||
addressEdit: Update address
|
addressEdit: Update address
|
||||||
|
@ -346,7 +341,6 @@ globals:
|
||||||
parking: Parking
|
parking: Parking
|
||||||
vehicleList: Vehicles
|
vehicleList: Vehicles
|
||||||
vehicle: Vehicle
|
vehicle: Vehicle
|
||||||
entryPreAccount: Pre-account
|
|
||||||
unsavedPopup:
|
unsavedPopup:
|
||||||
title: Unsaved changes will be lost
|
title: Unsaved changes will be lost
|
||||||
subtitle: Are you sure exit without saving?
|
subtitle: Are you sure exit without saving?
|
||||||
|
@ -883,11 +877,6 @@ components:
|
||||||
active: Is active
|
active: Is active
|
||||||
floramondo: Is floramondo
|
floramondo: Is floramondo
|
||||||
showBadDates: Show future items
|
showBadDates: Show future items
|
||||||
name: Nombre
|
|
||||||
rate2: Grouping price
|
|
||||||
rate3: Packing price
|
|
||||||
minPrice: Min. Price
|
|
||||||
itemFk: Item id
|
|
||||||
userPanel:
|
userPanel:
|
||||||
copyToken: Token copied to clipboard
|
copyToken: Token copied to clipboard
|
||||||
settings: Settings
|
settings: Settings
|
||||||
|
|
|
@ -6,7 +6,6 @@ globals:
|
||||||
quantity: Cantidad
|
quantity: Cantidad
|
||||||
entity: Entidad
|
entity: Entidad
|
||||||
preview: Vista previa
|
preview: Vista previa
|
||||||
scrollToTop: Ir arriba
|
|
||||||
user: Usuario
|
user: Usuario
|
||||||
details: Detalles
|
details: Detalles
|
||||||
collapseMenu: Contraer menú lateral
|
collapseMenu: Contraer menú lateral
|
||||||
|
@ -21,11 +20,10 @@ globals:
|
||||||
date: Fecha
|
date: Fecha
|
||||||
dataSaved: Datos guardados
|
dataSaved: Datos guardados
|
||||||
dataDeleted: Datos eliminados
|
dataDeleted: Datos eliminados
|
||||||
dataCreated: Datos creados
|
|
||||||
openDetail: Ver detalle
|
|
||||||
delete: Eliminar
|
delete: Eliminar
|
||||||
search: Buscar
|
search: Buscar
|
||||||
changes: Cambios
|
changes: Cambios
|
||||||
|
dataCreated: Datos creados
|
||||||
add: Añadir
|
add: Añadir
|
||||||
create: Crear
|
create: Crear
|
||||||
edit: Modificar
|
edit: Modificar
|
||||||
|
@ -166,9 +164,6 @@ globals:
|
||||||
noData: Datos no disponibles
|
noData: Datos no disponibles
|
||||||
department: Departamento
|
department: Departamento
|
||||||
vehicle: Vehículo
|
vehicle: Vehículo
|
||||||
selectDocumentId: Seleccione el id de gestión documental
|
|
||||||
document: Documento
|
|
||||||
import: Importar desde existente
|
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Inicio de sesión
|
logIn: Inicio de sesión
|
||||||
addressEdit: Modificar consignatario
|
addressEdit: Modificar consignatario
|
||||||
|
@ -349,7 +344,6 @@ globals:
|
||||||
parking: Parking
|
parking: Parking
|
||||||
vehicleList: Vehículos
|
vehicleList: Vehículos
|
||||||
vehicle: Vehículo
|
vehicle: Vehículo
|
||||||
entryPreAccount: Precontabilizar
|
|
||||||
unsavedPopup:
|
unsavedPopup:
|
||||||
title: Los cambios que no haya guardado se perderán
|
title: Los cambios que no haya guardado se perderán
|
||||||
subtitle: ¿Seguro que quiere salir sin guardar?
|
subtitle: ¿Seguro que quiere salir sin guardar?
|
||||||
|
@ -967,11 +961,6 @@ components:
|
||||||
to: Hasta
|
to: Hasta
|
||||||
floramondo: Floramondo
|
floramondo: Floramondo
|
||||||
showBadDates: Ver items a futuro
|
showBadDates: Ver items a futuro
|
||||||
name: Nombre
|
|
||||||
rate2: Precio grouping
|
|
||||||
rate3: Precio packing
|
|
||||||
minPrice: Precio mínimo
|
|
||||||
itemFk: Id item
|
|
||||||
userPanel:
|
userPanel:
|
||||||
copyToken: Token copiado al portapapeles
|
copyToken: Token copiado al portapapeles
|
||||||
settings: Configuración
|
settings: Configuración
|
||||||
|
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
||||||
<QPopupProxy style="max-width: 10px">
|
<QPopupProxy style="max-width: 10px">
|
||||||
<AccountDescriptor
|
<AccountDescriptor
|
||||||
v-if="$attrs.id"
|
v-if="$attrs.id"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs.id"
|
||||||
:summary="AccountSummary"
|
:summary="AccountSummary"
|
||||||
:proxy-render="true"
|
:proxy-render="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -28,8 +28,14 @@ const entityId = computed(() => {
|
||||||
return $props.id || route.params.id;
|
return $props.id || route.params.id;
|
||||||
});
|
});
|
||||||
|
|
||||||
function stateColor(entity) {
|
const STATE_COLOR = {
|
||||||
return entity?.claimState?.classColor;
|
pending: 'warning',
|
||||||
|
incomplete: 'info',
|
||||||
|
resolved: 'positive',
|
||||||
|
canceled: 'negative',
|
||||||
|
};
|
||||||
|
function stateColor(code) {
|
||||||
|
return STATE_COLOR[code];
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
@ -51,8 +57,9 @@ onMounted(async () => {
|
||||||
<VnLv v-if="entity.claimState" :label="t('claim.state')">
|
<VnLv v-if="entity.claimState" :label="t('claim.state')">
|
||||||
<template #value>
|
<template #value>
|
||||||
<QBadge
|
<QBadge
|
||||||
:color="stateColor(entity)"
|
:color="stateColor(entity.claimState.code)"
|
||||||
style="color: var(--vn-black-text-color)"
|
text-color="black"
|
||||||
|
dense
|
||||||
>
|
>
|
||||||
{{ entity.claimState.description }}
|
{{ entity.claimState.description }}
|
||||||
</QBadge>
|
</QBadge>
|
||||||
|
|
|
@ -123,8 +123,8 @@ async function fetchMana() {
|
||||||
|
|
||||||
async function updateDiscount({ saleFk, discount, canceller }) {
|
async function updateDiscount({ saleFk, discount, canceller }) {
|
||||||
const body = { salesIds: [saleFk], newDiscount: discount };
|
const body = { salesIds: [saleFk], newDiscount: discount };
|
||||||
const ticketFk = claim.value.ticketFk;
|
const claimId = claim.value.ticketFk;
|
||||||
const query = `Tickets/${ticketFk}/updateDiscount`;
|
const query = `Tickets/${claimId}/updateDiscount`;
|
||||||
|
|
||||||
await axios.post(query, body, {
|
await axios.post(query, body, {
|
||||||
signal: canceller.signal,
|
signal: canceller.signal,
|
||||||
|
|
|
@ -23,7 +23,7 @@ const claimDms = ref([
|
||||||
]);
|
]);
|
||||||
const client = ref({});
|
const client = ref({});
|
||||||
const inputFile = ref();
|
const inputFile = ref();
|
||||||
const files = ref([]);
|
const files = ref({});
|
||||||
const spinnerRef = ref();
|
const spinnerRef = ref();
|
||||||
const claimDmsRef = ref();
|
const claimDmsRef = ref();
|
||||||
const dmsType = ref({});
|
const dmsType = ref({});
|
||||||
|
@ -255,8 +255,9 @@ function onDrag() {
|
||||||
icon="add"
|
icon="add"
|
||||||
color="primary"
|
color="primary"
|
||||||
>
|
>
|
||||||
<QFile
|
<QInput
|
||||||
ref="inputFile"
|
ref="inputFile"
|
||||||
|
type="file"
|
||||||
style="display: none"
|
style="display: none"
|
||||||
multiple
|
multiple
|
||||||
v-model="files"
|
v-model="files"
|
||||||
|
|
|
@ -108,9 +108,15 @@ const markerLabels = [
|
||||||
{ value: 5, label: t('claim.person') },
|
{ value: 5, label: t('claim.person') },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const STATE_COLOR = {
|
||||||
|
pending: 'warning',
|
||||||
|
incomplete: 'info',
|
||||||
|
resolved: 'positive',
|
||||||
|
canceled: 'negative',
|
||||||
|
};
|
||||||
|
|
||||||
function stateColor(code) {
|
function stateColor(code) {
|
||||||
const claimState = claimStates.value.find((state) => state.code === code);
|
return STATE_COLOR[code];
|
||||||
return claimState?.classColor;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const developmentColumns = ref([
|
const developmentColumns = ref([
|
||||||
|
@ -182,7 +188,7 @@ function claimUrl(section) {
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
url="ClaimStates"
|
url="ClaimStates"
|
||||||
:filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
|
:filter="{ fields: ['id', 'description'] }"
|
||||||
@on-fetch="(data) => (claimStates = data)"
|
@on-fetch="(data) => (claimStates = data)"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
|
@ -340,18 +346,17 @@ function claimUrl(section) {
|
||||||
<template #body="props">
|
<template #body="props">
|
||||||
<QTr :props="props">
|
<QTr :props="props">
|
||||||
<QTd v-for="col in props.cols" :key="col.name" :props="props">
|
<QTd v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
<template v-if="col.name === 'description'">
|
<span v-if="col.name != 'description'">{{
|
||||||
<span class="link">{{
|
t(col.value)
|
||||||
dashIfEmpty(col.field(props.row))
|
}}</span>
|
||||||
}}</span>
|
<span class="link" v-if="col.name === 'description'">{{
|
||||||
<ItemDescriptorProxy
|
t(col.value)
|
||||||
:id="props.row.sale.itemFk"
|
}}</span>
|
||||||
:sale-fk="props.row.saleFk"
|
<ItemDescriptorProxy
|
||||||
/>
|
v-if="col.name == 'description'"
|
||||||
</template>
|
:id="props.row.sale.itemFk"
|
||||||
<template v-else>
|
:sale-fk="props.row.saleFk"
|
||||||
{{ dashIfEmpty(col.field(props.row)) }}
|
></ItemDescriptorProxy>
|
||||||
</template>
|
|
||||||
</QTd>
|
</QTd>
|
||||||
</QTr>
|
</QTr>
|
||||||
</template>
|
</template>
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue