Compare commits
No commits in common. "dev" and "hotfix_vnselect_scroll" have entirely different histories.
dev
...
hotfix_vns
|
@ -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"]
|
|
||||||
}
|
|
|
@ -26,7 +26,7 @@ if (branchName) {
|
||||||
const splitedMsg = msg.split(':');
|
const splitedMsg = msg.split(':');
|
||||||
|
|
||||||
if (splitedMsg.length > 1) {
|
if (splitedMsg.length > 1) {
|
||||||
const finalMsg = `${splitedMsg[0]}: ${referenceTag}${splitedMsg.slice(1).join(':')}`;
|
const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
|
||||||
writeFileSync(msgPath, finalMsg);
|
writeFileSync(msgPath, finalMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 ${env.COMPOSE_TAG}", 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 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
import { defineConfig } from 'cypress';
|
import { defineConfig } from 'cypress';
|
||||||
|
|
||||||
let urlHost;
|
let urlHost, reporter, reporterOptions, timeouts;
|
||||||
let reporter;
|
|
||||||
let reporterOptions;
|
|
||||||
let timeouts;
|
|
||||||
|
|
||||||
if (process.env.CI) {
|
if (process.env.CI) {
|
||||||
urlHost = 'front';
|
urlHost = 'front';
|
||||||
|
@ -47,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',
|
|
||||||
],
|
|
||||||
};
|
|
|
@ -1,4 +1,4 @@
|
||||||
<!doctype html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title><%= productName %></title>
|
<title><%= productName %></title>
|
||||||
|
@ -12,12 +12,7 @@
|
||||||
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
|
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<link
|
<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" />
|
||||||
rel="icon"
|
|
||||||
type="image/png"
|
|
||||||
sizes="128x128"
|
|
||||||
href="icons/favicon-128x128.png"
|
|
||||||
/>
|
|
||||||
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
|
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
|
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
|
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
|
||||||
|
|
25
package.json
25
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.18.0",
|
"version": "25.14.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": {
|
||||||
|
|
4012
pnpm-lock.yaml
4012
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
@ -1,3 +1,4 @@
|
||||||
|
/* eslint-disable */
|
||||||
// https://github.com/michael-ciniawsky/postcss-load-config
|
// https://github.com/michael-ciniawsky/postcss-load-config
|
||||||
|
|
||||||
import autoprefixer from 'autoprefixer';
|
import autoprefixer from 'autoprefixer';
|
||||||
|
|
|
@ -13,7 +13,7 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
|
const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
|
||||||
|
|
||||||
export default configure((/* ctx */) => {
|
export default configure(function (/* ctx */) {
|
||||||
return {
|
return {
|
||||||
eslint: {
|
eslint: {
|
||||||
// fix: true,
|
// fix: true,
|
||||||
|
@ -53,7 +53,7 @@ export default configure((/* 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((/* 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
|
|
||||||
};
|
|
|
@ -1,6 +1,8 @@
|
||||||
{
|
{
|
||||||
"@quasar/testing-unit-vitest": {
|
"@quasar/testing-unit-vitest": {
|
||||||
"options": ["scripts"]
|
"options": [
|
||||||
|
"scripts"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"@quasar/qcalendar": {}
|
"@quasar/qcalendar": {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -11,8 +11,8 @@ export default function (component, key, value) {
|
||||||
};
|
};
|
||||||
break;
|
break;
|
||||||
case 'undefined':
|
case 'undefined':
|
||||||
throw new Error(`unknown prop: ${key}`);
|
throw new Error('unknown prop: ' + key);
|
||||||
default:
|
default:
|
||||||
throw new Error(`unhandled type: ${typeof prop}`);
|
throw new Error('unhandled type: ' + typeof prop);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ export default {
|
||||||
const keyBindingMap = routes
|
const keyBindingMap = routes
|
||||||
.filter((route) => route.meta.keyBinding)
|
.filter((route) => route.meta.keyBinding)
|
||||||
.reduce((map, route) => {
|
.reduce((map, route) => {
|
||||||
map[`Key${route.meta.keyBinding.toUpperCase()}`] = route.path;
|
map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
|
||||||
return map;
|
return map;
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
|
|
|
@ -24,9 +24,12 @@ export default boot(({ app }) => {
|
||||||
switch (response?.status) {
|
switch (response?.status) {
|
||||||
case 422:
|
case 422:
|
||||||
if (error.name == 'ValidationError')
|
if (error.name == 'ValidationError')
|
||||||
message += ` "${responseError.details.context}.${Object.keys(
|
message +=
|
||||||
responseError.details.codes,
|
' "' +
|
||||||
).join(',')}"`;
|
responseError.details.context +
|
||||||
|
'.' +
|
||||||
|
Object.keys(responseError.details.codes).join(',') +
|
||||||
|
'"';
|
||||||
break;
|
break;
|
||||||
case 500:
|
case 500:
|
||||||
message = 'errors.statusInternalServerError';
|
message = 'errors.statusInternalServerError';
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -25,7 +25,7 @@ const autonomiesRef = ref([]);
|
||||||
|
|
||||||
const onDataSaved = (dataSaved, requestResponse) => {
|
const onDataSaved = (dataSaved, requestResponse) => {
|
||||||
requestResponse.autonomy = autonomiesRef.value.opts.find(
|
requestResponse.autonomy = autonomiesRef.value.opts.find(
|
||||||
(autonomy) => autonomy.id == requestResponse.autonomyFk,
|
(autonomy) => autonomy.id == requestResponse.autonomyFk
|
||||||
);
|
);
|
||||||
emit('onDataSaved', dataSaved, requestResponse);
|
emit('onDataSaved', dataSaved, requestResponse);
|
||||||
};
|
};
|
||||||
|
|
|
@ -65,7 +65,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
beforeSaveFn: {
|
beforeSaveFn: {
|
||||||
type: [String, Function],
|
type: Function,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
goTo: {
|
goTo: {
|
||||||
|
@ -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')"
|
||||||
|
@ -347,16 +346,8 @@ watch(formUrl, async () => {
|
||||||
<QBtnDropdown
|
<QBtnDropdown
|
||||||
v-if="$props.goTo && $props.defaultSave"
|
v-if="$props.goTo && $props.defaultSave"
|
||||||
@click="onSubmitAndGo"
|
@click="onSubmitAndGo"
|
||||||
:label="
|
:label="tMobile('globals.saveAndContinue')"
|
||||||
tMobile('globals.saveAndContinue') +
|
:title="t('globals.saveAndContinue')"
|
||||||
' ' +
|
|
||||||
t('globals.' + $props.goTo.split('/').pop())
|
|
||||||
"
|
|
||||||
:title="
|
|
||||||
t('globals.saveAndContinue') +
|
|
||||||
' ' +
|
|
||||||
t('globals.' + $props.goTo.split('/').pop())
|
|
||||||
"
|
|
||||||
:disable="!hasChanges"
|
:disable="!hasChanges"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
|
|
@ -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
|
|
@ -1,154 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { ref, computed } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
import { date } from 'quasar';
|
|
||||||
import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
|
|
||||||
import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
|
|
||||||
import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
|
|
||||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
|
||||||
import useWeekdaysOrder from 'src/composables/getWeekdays';
|
|
||||||
|
|
||||||
const formatDate = (dateToFormat, format = 'YYYY-MM-DD') =>
|
|
||||||
date.formatDate(dateToFormat, format);
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
year: {
|
|
||||||
type: Number,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
month: {
|
|
||||||
type: Number,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
monthDate: {
|
|
||||||
type: Object,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
daysMap: {
|
|
||||||
type: Object,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const emit = defineEmits(['onDateSelected']);
|
|
||||||
|
|
||||||
const { locale } = useI18n();
|
|
||||||
const weekdayStore = useWeekdayStore();
|
|
||||||
const weekDays = useWeekdaysOrder();
|
|
||||||
const calendarRef = ref(null);
|
|
||||||
const today = ref(formatDate(Date.vnNew()));
|
|
||||||
const todayTimestamp = computed(() => {
|
|
||||||
const date = Date.vnNew();
|
|
||||||
date.setHours(0, 0, 0, 0);
|
|
||||||
return date.getTime();
|
|
||||||
});
|
|
||||||
const _monthDate = computed(() => formatDate(props.monthDate));
|
|
||||||
|
|
||||||
const calendarHeaderTitle = computed(() => {
|
|
||||||
return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
|
|
||||||
});
|
|
||||||
|
|
||||||
const isToday = (timestamp) => {
|
|
||||||
const { year, month, day } = timestamp;
|
|
||||||
return todayTimestamp.value === new Date(year, month - 1, day).getTime();
|
|
||||||
};
|
|
||||||
|
|
||||||
const getEventByTimestamp = ({ year, month, day }) => {
|
|
||||||
const stamp = new Date(year, month - 1, day).getTime();
|
|
||||||
return props.daysMap?.[stamp] || null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleDateClick = (timestamp) => {
|
|
||||||
const event = getEventByTimestamp(timestamp);
|
|
||||||
const { year, month, day } = timestamp;
|
|
||||||
const date = new Date(year, month - 1, day);
|
|
||||||
emit('onDateSelected', {
|
|
||||||
date,
|
|
||||||
isNewMode: !event,
|
|
||||||
event: event?.[0] || null,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const getEventAttrs = (timestamp) => {
|
|
||||||
return {
|
|
||||||
class: '--event',
|
|
||||||
label: timestamp.day,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
defineExpose({ getEventByTimestamp, handleDateClick });
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<QCalendarMonthWrapper
|
|
||||||
style="height: 290px; width: 290px"
|
|
||||||
transparent-background
|
|
||||||
view-customization="workerCalendar"
|
|
||||||
>
|
|
||||||
<template #header>
|
|
||||||
<span class="full-width text-center text-body1 q-py-sm">{{
|
|
||||||
calendarHeaderTitle
|
|
||||||
}}</span>
|
|
||||||
</template>
|
|
||||||
<template #calendar>
|
|
||||||
<QCalendarMonth
|
|
||||||
ref="calendarRef"
|
|
||||||
:model-value="_monthDate"
|
|
||||||
show-work-weeks
|
|
||||||
no-outside-days
|
|
||||||
no-active-date
|
|
||||||
:weekdays="weekDays"
|
|
||||||
short-weekday-label
|
|
||||||
:locale="locale"
|
|
||||||
:now="today"
|
|
||||||
@click-date="handleDateClick($event.scope.timestamp)"
|
|
||||||
mini-mode
|
|
||||||
>
|
|
||||||
<template #day="{ scope: { timestamp } }">
|
|
||||||
<slot
|
|
||||||
name="day"
|
|
||||||
:timestamp="timestamp"
|
|
||||||
:getEventAttrs="getEventAttrs"
|
|
||||||
>
|
|
||||||
<QBtn
|
|
||||||
v-if="getEventByTimestamp(timestamp)"
|
|
||||||
v-bind="{ ...getEventAttrs(timestamp) }"
|
|
||||||
@click="handleDateClick(timestamp)"
|
|
||||||
rounded
|
|
||||||
dense
|
|
||||||
flat
|
|
||||||
class="calendar-event"
|
|
||||||
:class="{ '--today': isToday(timestamp) }"
|
|
||||||
/>
|
|
||||||
</slot>
|
|
||||||
</template>
|
|
||||||
</QCalendarMonth>
|
|
||||||
</template>
|
|
||||||
</QCalendarMonthWrapper>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
.calendar-event {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
font-size: 13px;
|
|
||||||
line-height: 1.715em;
|
|
||||||
cursor: pointer;
|
|
||||||
color: white;
|
|
||||||
|
|
||||||
&.--today {
|
|
||||||
border: 2px solid $info;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.--event {
|
|
||||||
background-color: $positive;
|
|
||||||
color: black;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
opacity: 0.8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
|
@ -1,126 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
|
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
|
||||||
import { useWeekdayStore } from 'src/stores/useWeekdayStore';
|
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
|
||||||
|
|
||||||
const props = defineProps({
|
|
||||||
dataKey: {
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
calendarComponent: {
|
|
||||||
type: Object,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
additionalProps: {
|
|
||||||
type: Object,
|
|
||||||
default: () => ({}),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
|
||||||
const weekdayStore = useWeekdayStore();
|
|
||||||
const nMonths = ref(4);
|
|
||||||
const _date = ref(Date.vnNew());
|
|
||||||
const firstDay = ref(Date.vnNew());
|
|
||||||
const lastDay = ref(Date.vnNew());
|
|
||||||
const months = ref([]);
|
|
||||||
const arrayData = useArrayData(props.dataKey);
|
|
||||||
onMounted(async () => {
|
|
||||||
const initialDate = Date.vnNew();
|
|
||||||
initialDate.setDate(1);
|
|
||||||
initialDate.setHours(0, 0, 0, 0);
|
|
||||||
date.value = initialDate;
|
|
||||||
await nextTick();
|
|
||||||
stateStore.rightDrawer = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
onUnmounted(() => arrayData.destroy());
|
|
||||||
|
|
||||||
const emit = defineEmits([
|
|
||||||
'update:firstDay',
|
|
||||||
'update:lastDay',
|
|
||||||
'update:events',
|
|
||||||
'onDateSelected',
|
|
||||||
]);
|
|
||||||
|
|
||||||
const date = computed({
|
|
||||||
get: () => _date.value,
|
|
||||||
set: (value) => {
|
|
||||||
if (!(value instanceof Date)) return;
|
|
||||||
_date.value = value;
|
|
||||||
const stamp = value.getTime();
|
|
||||||
|
|
||||||
firstDay.value = new Date(stamp);
|
|
||||||
firstDay.value.setDate(1);
|
|
||||||
|
|
||||||
lastDay.value = new Date(stamp);
|
|
||||||
lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
|
|
||||||
lastDay.value.setDate(0);
|
|
||||||
|
|
||||||
months.value = [];
|
|
||||||
for (let i = 0; i < nMonths.value; i++) {
|
|
||||||
const monthDate = new Date(stamp);
|
|
||||||
monthDate.setMonth(value.getMonth() + i);
|
|
||||||
months.value.push(monthDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
emit('update:firstDay', firstDay.value);
|
|
||||||
emit('update:lastDay', lastDay.value);
|
|
||||||
emit('refresh-events');
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const headerTitle = computed(() => {
|
|
||||||
if (!months.value?.length) return '';
|
|
||||||
const getMonthName = (date) =>
|
|
||||||
`${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
|
|
||||||
return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
|
|
||||||
});
|
|
||||||
|
|
||||||
const step = (direction) => {
|
|
||||||
const newDate = new Date(date.value);
|
|
||||||
newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
|
|
||||||
date.value = newDate;
|
|
||||||
};
|
|
||||||
|
|
||||||
defineExpose({
|
|
||||||
firstDay,
|
|
||||||
lastDay,
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<QCard style="height: max-content">
|
|
||||||
<div class="calendars-header">
|
|
||||||
<QBtn
|
|
||||||
icon="arrow_left"
|
|
||||||
size="sm"
|
|
||||||
flat
|
|
||||||
class="full-height"
|
|
||||||
@click="step(-1)"
|
|
||||||
/>
|
|
||||||
<span>{{ headerTitle }}</span>
|
|
||||||
<QBtn
|
|
||||||
icon="arrow_right"
|
|
||||||
size="sm"
|
|
||||||
flat
|
|
||||||
class="full-height"
|
|
||||||
@click="step(1)"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="calendars-container">
|
|
||||||
<component
|
|
||||||
:is="calendarComponent"
|
|
||||||
v-for="(month, index) in months"
|
|
||||||
:key="index"
|
|
||||||
:month="month.getMonth() + 1"
|
|
||||||
:year="month.getFullYear()"
|
|
||||||
:month-date="month"
|
|
||||||
v-bind="additionalProps"
|
|
||||||
@on-date-selected="(data) => emit('onDateSelected', data)"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</QCard>
|
|
||||||
</template>
|
|
|
@ -156,9 +156,6 @@ const selectTravel = ({ id }) => {
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.warehouseOutFk"
|
v-model="travelFilterParams.warehouseOutFk"
|
||||||
:where="{
|
|
||||||
isOrigin: true,
|
|
||||||
}"
|
|
||||||
/>
|
/>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('globals.warehouseIn')"
|
:label="t('globals.warehouseIn')"
|
||||||
|
@ -167,9 +164,6 @@ const selectTravel = ({ id }) => {
|
||||||
option-label="name"
|
option-label="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
v-model="travelFilterParams.warehouseInFk"
|
v-model="travelFilterParams.warehouseInFk"
|
||||||
:where="{
|
|
||||||
isDestiny: true,
|
|
||||||
}"
|
|
||||||
/>
|
/>
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('globals.shipped')"
|
:label="t('globals.shipped')"
|
||||||
|
|
|
@ -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: false,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
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 />
|
||||||
|
@ -380,16 +368,8 @@ defineExpose({
|
||||||
data-cy="saveAndContinueDefaultBtn"
|
data-cy="saveAndContinueDefaultBtn"
|
||||||
v-if="$props.goTo"
|
v-if="$props.goTo"
|
||||||
@click="saveAndGo"
|
@click="saveAndGo"
|
||||||
:label="
|
:label="tMobile('globals.saveAndContinue')"
|
||||||
tMobile('globals.saveAndContinue') +
|
:title="t('globals.saveAndContinue')"
|
||||||
' ' +
|
|
||||||
t('globals.' + $props.goTo.split('/').pop())
|
|
||||||
"
|
|
||||||
:title="
|
|
||||||
t('globals.saveAndContinue') +
|
|
||||||
' ' +
|
|
||||||
t('globals.' + $props.goTo.split('/').pop())
|
|
||||||
"
|
|
||||||
:disable="!hasChanges"
|
:disable="!hasChanges"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
@ -418,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>
|
||||||
|
|
|
@ -26,7 +26,7 @@ async function redirect() {
|
||||||
|
|
||||||
if (route?.params?.id)
|
if (route?.params?.id)
|
||||||
return (window.location.href = await getUrl(
|
return (window.location.href = await getUrl(
|
||||||
`${section}/${route.params.id}/summary`,
|
`${section}/${route.params.id}/summary`
|
||||||
));
|
));
|
||||||
return (window.location.href = await getUrl(section + '/index'));
|
return (window.location.href = await getUrl(section + '/index'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ const refund = async () => {
|
||||||
(data) => (
|
(data) => (
|
||||||
(rectificativeTypeOptions = data),
|
(rectificativeTypeOptions = data),
|
||||||
(invoiceParams.cplusRectificationTypeFk = data.filter(
|
(invoiceParams.cplusRectificationTypeFk = data.filter(
|
||||||
(type) => type.description == 'I – Por diferencias',
|
(type) => type.description == 'I – Por diferencias'
|
||||||
)[0].id)
|
)[0].id)
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
@ -68,7 +68,7 @@ const refund = async () => {
|
||||||
(data) => (
|
(data) => (
|
||||||
(siiTypeInvoiceOutsOptions = data),
|
(siiTypeInvoiceOutsOptions = data),
|
||||||
(invoiceParams.siiTypeInvoiceOutFk = data.filter(
|
(invoiceParams.siiTypeInvoiceOutFk = data.filter(
|
||||||
(type) => type.code == 'R4',
|
(type) => type.code == 'R4'
|
||||||
)[0].id)
|
)[0].id)
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
|
|
@ -40,9 +40,6 @@ const onDataSaved = (data) => {
|
||||||
url="Warehouses"
|
url="Warehouses"
|
||||||
@on-fetch="(data) => (warehousesOptions = data)"
|
@on-fetch="(data) => (warehousesOptions = data)"
|
||||||
auto-load
|
auto-load
|
||||||
:where="{
|
|
||||||
isInventory: true,
|
|
||||||
}"
|
|
||||||
/>
|
/>
|
||||||
<FormModelPopup
|
<FormModelPopup
|
||||||
url-create="Items/regularize"
|
url-create="Items/regularize"
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -52,7 +52,7 @@ watch(
|
||||||
} else filter.value.where = {};
|
} else filter.value.where = {};
|
||||||
await provincesFetchDataRef.value.fetch({});
|
await provincesFetchDataRef.value.fetch({});
|
||||||
emit('onProvinceFetched', provincesOptions.value);
|
emit('onProvinceFetched', provincesOptions.value);
|
||||||
},
|
}
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { markRaw, computed, onBeforeMount } from 'vue';
|
import { markRaw, computed } from 'vue';
|
||||||
import { QToggle } from 'quasar';
|
import { QCheckbox, QToggle } from 'quasar';
|
||||||
import { useArrayData } from 'composables/useArrayData';
|
import { useArrayData } from 'composables/useArrayData';
|
||||||
import VnSelect from 'components/common/VnSelect.vue';
|
import VnSelect from 'components/common/VnSelect.vue';
|
||||||
import VnInput from 'components/common/VnInput.vue';
|
import VnInput from 'components/common/VnInput.vue';
|
||||||
|
@ -150,16 +150,6 @@ const showFilter = computed(
|
||||||
const onTabPressed = async () => {
|
const onTabPressed = async () => {
|
||||||
if (model.value) enterEvent['keyup.enter']();
|
if (model.value) enterEvent['keyup.enter']();
|
||||||
};
|
};
|
||||||
|
|
||||||
onBeforeMount(() => {
|
|
||||||
const columnFilter = $props.column?.columnFilter;
|
|
||||||
const component = columnFilter?.component;
|
|
||||||
const defaultComponent = components[component];
|
|
||||||
const events = { update: updateEvent, enter: enterEvent };
|
|
||||||
|
|
||||||
if (!columnFilter || defaultComponent) return;
|
|
||||||
$props.column.columnFilter.event = events[columnFilter.event];
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
<div v-if="showFilter" class="full-width" style="overflow: hidden">
|
||||||
|
|
|
@ -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,9 +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';
|
|
||||||
import VnCheckboxMenu from '../common/VnCheckboxMenu.vue';
|
|
||||||
import VnCheckbox from '../common/VnCheckbox.vue';
|
|
||||||
|
|
||||||
const arrayData = useArrayData(useAttrs()['data-key']);
|
const arrayData = useArrayData(useAttrs()['data-key']);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -68,7 +64,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
create: {
|
create: {
|
||||||
type: [Boolean, Object],
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
createAsDialog: {
|
createAsDialog: {
|
||||||
|
@ -115,17 +111,13 @@ const $props = defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({}),
|
default: () => ({}),
|
||||||
},
|
},
|
||||||
multiCheck: {
|
|
||||||
type: Object,
|
|
||||||
default: () => ({}),
|
|
||||||
},
|
|
||||||
crudModel: {
|
crudModel: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({}),
|
default: () => ({}),
|
||||||
},
|
},
|
||||||
tableHeight: {
|
tableHeight: {
|
||||||
type: String,
|
type: String,
|
||||||
default: undefined,
|
default: '90vh',
|
||||||
},
|
},
|
||||||
footer: {
|
footer: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
@ -163,7 +155,6 @@ const CARD_MODE = 'card';
|
||||||
const TABLE_MODE = 'table';
|
const TABLE_MODE = 'table';
|
||||||
const mode = ref(CARD_MODE);
|
const mode = ref(CARD_MODE);
|
||||||
const selected = ref([]);
|
const selected = ref([]);
|
||||||
const selectAll = ref(false);
|
|
||||||
const hasParams = ref(false);
|
const hasParams = ref(false);
|
||||||
const CrudModelRef = ref({});
|
const CrudModelRef = ref({});
|
||||||
const showForm = ref(false);
|
const showForm = ref(false);
|
||||||
|
@ -175,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);
|
||||||
|
@ -198,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;
|
||||||
|
@ -249,7 +227,6 @@ watch(
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
create: createForm,
|
create: createForm,
|
||||||
showForm,
|
|
||||||
reload,
|
reload,
|
||||||
redirect: redirectFn,
|
redirect: redirectFn,
|
||||||
selected,
|
selected,
|
||||||
|
@ -333,7 +310,6 @@ function stopEventPropagation(event) {
|
||||||
|
|
||||||
function reload(params) {
|
function reload(params) {
|
||||||
selected.value = [];
|
selected.value = [];
|
||||||
selectAll.value = false;
|
|
||||||
CrudModelRef.value.reload(params);
|
CrudModelRef.value.reload(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -348,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 tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
|
||||||
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
const { scrollHeight, scrollTop, clientHeight } = tMiddle;
|
||||||
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
|
||||||
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
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;
|
||||||
|
@ -646,17 +625,6 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
};
|
};
|
||||||
return () => {};
|
return () => {};
|
||||||
});
|
});
|
||||||
const handleHeaderSelection = (evt, data) => {
|
|
||||||
if (evt === 'updateSelected' && selectAll.value) {
|
|
||||||
selected.value = tableRef.value.rows;
|
|
||||||
} else if (evt === 'selectAll') {
|
|
||||||
selected.value = data;
|
|
||||||
} else {
|
|
||||||
selected.value = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
emit('update:selected', selected.value);
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<RightMenu v-if="$props.rightSearch" :overlay="overlay">
|
<RightMenu v-if="$props.rightSearch" :overlay="overlay">
|
||||||
|
@ -682,13 +650,7 @@ const handleHeaderSelection = (evt, data) => {
|
||||||
:class="$attrs['class'] ?? 'q-px-md'"
|
:class="$attrs['class'] ?? 'q-px-md'"
|
||||||
:limit="$attrs['limit'] ?? 100"
|
:limit="$attrs['limit'] ?? 100"
|
||||||
ref="CrudModelRef"
|
ref="CrudModelRef"
|
||||||
@on-fetch="
|
@on-fetch="(...args) => emit('onFetch', ...args)"
|
||||||
(...args) => {
|
|
||||||
selectAll = false;
|
|
||||||
selected = [];
|
|
||||||
emit('onFetch', ...args);
|
|
||||||
}
|
|
||||||
"
|
|
||||||
:search-url="searchUrl"
|
:search-url="searchUrl"
|
||||||
:disable-infinite-scroll="isTableMode"
|
:disable-infinite-scroll="isTableMode"
|
||||||
:before-save-fn="removeTextValue"
|
:before-save-fn="removeTextValue"
|
||||||
|
@ -716,35 +678,15 @@ const handleHeaderSelection = (evt, data) => {
|
||||||
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)"
|
||||||
:hide-selected-banner="true"
|
:hide-selected-banner="true"
|
||||||
:data-cy
|
:data-cy
|
||||||
>
|
>
|
||||||
<template #header-selection>
|
|
||||||
<div class="flex items-center no-wrap" style="display: flex">
|
|
||||||
<VnCheckbox
|
|
||||||
v-model="selectAll"
|
|
||||||
@click="handleHeaderSelection('updateSelected', $event)"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<VnCheckboxMenu
|
|
||||||
v-if="selectAll && $props.multiCheck.expand"
|
|
||||||
:searchUrl="searchUrl"
|
|
||||||
v-model="selectAll"
|
|
||||||
:url="$attrs['url']"
|
|
||||||
@update:selected="
|
|
||||||
handleHeaderSelection('updateSelected', $event)
|
|
||||||
"
|
|
||||||
@select:all="handleHeaderSelection('selectAll', $event)"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template #top-left v-if="!$props.withoutHeader">
|
<template #top-left v-if="!$props.withoutHeader">
|
||||||
<slot name="top-left"> </slot>
|
<slot name="top-left"> </slot>
|
||||||
</template>
|
</template>
|
||||||
|
@ -796,7 +738,6 @@ const handleHeaderSelection = (evt, data) => {
|
||||||
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)]"
|
||||||
|
@ -1101,7 +1042,7 @@ const handleHeaderSelection = (evt, data) => {
|
||||||
: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
|
||||||
|
@ -1119,7 +1060,6 @@ const handleHeaderSelection = (evt, data) => {
|
||||||
: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"
|
||||||
>
|
>
|
||||||
|
@ -1143,11 +1083,6 @@ const handleHeaderSelection = (evt, data) => {
|
||||||
</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;
|
||||||
|
|
|
@ -6,7 +6,7 @@ export default function (initialFooter, data) {
|
||||||
});
|
});
|
||||||
return acc;
|
return acc;
|
||||||
},
|
},
|
||||||
{ ...initialFooter },
|
{ ...initialFooter }
|
||||||
);
|
);
|
||||||
return footer;
|
return footer;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 () => {
|
||||||
|
@ -241,7 +245,7 @@ describe('CrudModel', () => {
|
||||||
|
|
||||||
await vm.saveChanges(data);
|
await vm.saveChanges(data);
|
||||||
|
|
||||||
expect(postMock).toHaveBeenCalledWith(`${vm.url}/crud`, data);
|
expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
|
||||||
expect(vm.isLoading).toBe(false);
|
expect(vm.isLoading).toBe(false);
|
||||||
expect(vm.hasChanges).toBe(false);
|
expect(vm.hasChanges).toBe(false);
|
||||||
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
|
expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
|
||||||
|
|
|
@ -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,7 +38,7 @@ 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', {
|
||||||
|
|
|
@ -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,
|
||||||
},
|
},
|
||||||
|
@ -142,14 +141,14 @@ describe('getRoutes', () => {
|
||||||
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
|
const fn = (props) => getRoutes(props, getMethodA, getMethodB);
|
||||||
|
|
||||||
it('should call getMethodB when source is card', () => {
|
it('should call getMethodB when source is card', () => {
|
||||||
const props = { source: 'methodB' };
|
let props = { source: 'methodB' };
|
||||||
fn(props);
|
fn(props);
|
||||||
|
|
||||||
expect(getMethodB).toHaveBeenCalled();
|
expect(getMethodB).toHaveBeenCalled();
|
||||||
expect(getMethodA).not.toHaveBeenCalled();
|
expect(getMethodA).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
it('should call getMethodA when source is main', () => {
|
it('should call getMethodA when source is main', () => {
|
||||||
const props = { source: 'methodA' };
|
let props = { source: 'methodA' };
|
||||||
fn(props);
|
fn(props);
|
||||||
|
|
||||||
expect(getMethodA).toHaveBeenCalled();
|
expect(getMethodA).toHaveBeenCalled();
|
||||||
|
@ -157,7 +156,7 @@ describe('getRoutes', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should call getMethodA when source is not exists or undefined', () => {
|
it('should call getMethodA when source is not exists or undefined', () => {
|
||||||
const props = { source: 'methodC' };
|
let props = { source: 'methodC' };
|
||||||
expect(() => fn(props)).toThrowError('Method not defined');
|
expect(() => fn(props)).toThrowError('Method not defined');
|
||||||
|
|
||||||
expect(getMethodA).not.toHaveBeenCalled();
|
expect(getMethodA).not.toHaveBeenCalled();
|
||||||
|
@ -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,9 +1,13 @@
|
||||||
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;
|
||||||
|
@ -39,7 +43,7 @@ describe('UserPanel', () => {
|
||||||
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);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -48,7 +52,7 @@ describe('UserPanel', () => {
|
||||||
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);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -56,8 +60,6 @@ describe('UserPanel', () => {
|
||||||
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,
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -1,93 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { ref } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
|
|
||||||
import VnInput from 'src/components/common/VnInput.vue';
|
|
||||||
import FetchData from '../FetchData.vue';
|
|
||||||
import VnSelectDialog from './VnSelectDialog.vue';
|
|
||||||
|
|
||||||
import CreateBankEntityForm from '../CreateBankEntityForm.vue';
|
|
||||||
|
|
||||||
const $props = defineProps({
|
|
||||||
iban: {
|
|
||||||
type: String,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
bankEntityFk: {
|
|
||||||
type: Number,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
disableElement: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const filter = {
|
|
||||||
fields: ['id', 'bic', 'name'],
|
|
||||||
order: 'bic ASC',
|
|
||||||
};
|
|
||||||
const { t } = useI18n();
|
|
||||||
const emit = defineEmits(['updateBic']);
|
|
||||||
const iban = ref($props.iban);
|
|
||||||
const bankEntityFk = ref($props.bankEntityFk);
|
|
||||||
const bankEntities = ref([]);
|
|
||||||
|
|
||||||
const autofillBic = async (bic) => {
|
|
||||||
if (!bic) return;
|
|
||||||
const bankEntityId = parseInt(bic.substr(4, 4));
|
|
||||||
const ibanCountry = bic.substr(0, 2);
|
|
||||||
if (ibanCountry != 'ES') return;
|
|
||||||
|
|
||||||
const existBank = bankEntities.value.find((b) => b.id === bankEntityId);
|
|
||||||
bankEntityFk.value = existBank ? bankEntityId : null;
|
|
||||||
emit('updateBic', { iban: iban.value, bankEntityFk: bankEntityFk.value });
|
|
||||||
};
|
|
||||||
|
|
||||||
const getBankEntities = (data) => {
|
|
||||||
bankEntityFk.value = data.id;
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
<template>
|
|
||||||
<FetchData
|
|
||||||
url="BankEntities"
|
|
||||||
:filter="filter"
|
|
||||||
auto-load
|
|
||||||
@on-fetch="(data) => (bankEntities = data)"
|
|
||||||
/>
|
|
||||||
<VnInput
|
|
||||||
:label="t('IBAN')"
|
|
||||||
clearable
|
|
||||||
v-model="iban"
|
|
||||||
@update:model-value="autofillBic($event)"
|
|
||||||
:disable="disableElement"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-info">
|
|
||||||
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</VnInput>
|
|
||||||
<VnSelectDialog
|
|
||||||
:label="t('Swift / BIC')"
|
|
||||||
:acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
|
|
||||||
:options="bankEntities"
|
|
||||||
hide-selected
|
|
||||||
option-label="name"
|
|
||||||
option-value="id"
|
|
||||||
v-model="bankEntityFk"
|
|
||||||
@update:model-value="$emit('updateBic', { iban, bankEntityFk })"
|
|
||||||
:disable="disableElement"
|
|
||||||
>
|
|
||||||
<template #form>
|
|
||||||
<CreateBankEntityForm @on-data-saved="getBankEntities($event)" />
|
|
||||||
</template>
|
|
||||||
<template #option="scope">
|
|
||||||
<QItem v-bind="scope.itemProps">
|
|
||||||
<QItemSection v-if="scope.opt">
|
|
||||||
<QItemLabel>{{ scope.opt.bic }} </QItemLabel>
|
|
||||||
<QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
</template>
|
|
||||||
</VnSelectDialog>
|
|
||||||
</template>
|
|
|
@ -15,7 +15,7 @@ let root = ref(null);
|
||||||
|
|
||||||
watchEffect(() => {
|
watchEffect(() => {
|
||||||
matched.value = currentRoute.value.matched.filter(
|
matched.value = currentRoute.value.matched.filter(
|
||||||
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon,
|
(matched) => !!matched?.meta?.title || !!matched?.meta?.icon
|
||||||
);
|
);
|
||||||
breadcrumbs.value.length = 0;
|
breadcrumbs.value.length = 0;
|
||||||
if (!matched.value[0]) return;
|
if (!matched.value[0]) return;
|
||||||
|
|
|
@ -1,104 +0,0 @@
|
||||||
<script setup>
|
|
||||||
import { ref } from 'vue';
|
|
||||||
import VnCheckbox from './VnCheckbox.vue';
|
|
||||||
import axios from 'axios';
|
|
||||||
import { toRaw } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
|
||||||
import { useRoute } from 'vue-router';
|
|
||||||
const route = useRoute();
|
|
||||||
const { t } = useI18n();
|
|
||||||
const model = defineModel({ type: [Boolean] });
|
|
||||||
const props = defineProps({
|
|
||||||
url: {
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
searchUrl: {
|
|
||||||
type: [String, Boolean],
|
|
||||||
default: 'table',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const menuRef = ref(null);
|
|
||||||
const errorMessage = ref(null);
|
|
||||||
const rows = ref(0);
|
|
||||||
const onClick = async () => {
|
|
||||||
errorMessage.value = null;
|
|
||||||
|
|
||||||
const { filter } = JSON.parse(route.query[props.searchUrl]);
|
|
||||||
filter.limit = 0;
|
|
||||||
const params = {
|
|
||||||
params: { filter: JSON.stringify(filter) },
|
|
||||||
};
|
|
||||||
try {
|
|
||||||
const { data } = axios.get(props.url, params);
|
|
||||||
rows.value = data;
|
|
||||||
} catch (error) {
|
|
||||||
const response = error.response;
|
|
||||||
if (response.data.error.name === 'UserError') {
|
|
||||||
errorMessage.value = t('tooManyResults');
|
|
||||||
} else {
|
|
||||||
errorMessage.value = response.data.error.message;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
defineEmits(['update:selected', 'select:all']);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<QIcon
|
|
||||||
style="margin-left: -10px"
|
|
||||||
data-cy="btnMultiCheck"
|
|
||||||
name="expand_more"
|
|
||||||
@click="onClick"
|
|
||||||
class="cursor-pointer"
|
|
||||||
color="primary"
|
|
||||||
size="xs"
|
|
||||||
>
|
|
||||||
<QMenu
|
|
||||||
fit
|
|
||||||
anchor="bottom start"
|
|
||||||
self="top left"
|
|
||||||
ref="menuRef"
|
|
||||||
data-cy="menuMultiCheck"
|
|
||||||
>
|
|
||||||
<QList separator>
|
|
||||||
<QItem
|
|
||||||
data-cy="selectAll"
|
|
||||||
v-ripple
|
|
||||||
clickable
|
|
||||||
@click="
|
|
||||||
$refs.menuRef.hide();
|
|
||||||
$emit('select:all', toRaw(rows));
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<QItemSection>
|
|
||||||
<QItemLabel>
|
|
||||||
<span v-text="t('Select all')" />
|
|
||||||
</QItemLabel>
|
|
||||||
<QItemLabel overline caption>
|
|
||||||
<span
|
|
||||||
v-if="errorMessage"
|
|
||||||
class="text-negative"
|
|
||||||
v-text="errorMessage"
|
|
||||||
/>
|
|
||||||
<span
|
|
||||||
v-else
|
|
||||||
v-text="t('records', { rows: rows.length ?? 0 })"
|
|
||||||
/>
|
|
||||||
</QItemLabel>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
<slot name="more-options"></slot>
|
|
||||||
</QList>
|
|
||||||
</QMenu>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
<i18n lang="yml">
|
|
||||||
en:
|
|
||||||
tooManyResults: Too many results. Please narrow down your search.
|
|
||||||
records: '{rows} records'
|
|
||||||
es:
|
|
||||||
Select all: Seleccionar todo
|
|
||||||
tooManyResults: Demasiados registros. Restringe la búsqueda.
|
|
||||||
records: '{rows} registros'
|
|
||||||
</i18n>
|
|
|
@ -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);
|
||||||
notify(t('globals.dataSaved'), 'positive');
|
|
||||||
delete dms.value.files;
|
delete dms.value.files;
|
||||||
return response;
|
return response;
|
||||||
} catch (e) {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultData() {
|
function defaultData() {
|
||||||
|
|
|
@ -14,12 +14,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({});
|
||||||
|
@ -92,6 +90,7 @@ const dmsFilter = {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
where: { [$props.filter]: route.params.id },
|
||||||
};
|
};
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -256,16 +255,9 @@ function deleteDms(dmsFk) {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.onOk(async () => {
|
.onOk(async () => {
|
||||||
try {
|
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
|
||||||
await axios.post(
|
|
||||||
`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
|
|
||||||
);
|
|
||||||
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
||||||
rows.value.splice(index, 1);
|
rows.value.splice(index, 1);
|
||||||
notify(t('globals.dataDeleted'), 'positive');
|
|
||||||
} catch (e) {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -303,9 +295,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,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;
|
||||||
"
|
"
|
||||||
|
|
|
@ -5,7 +5,7 @@ import VnDate from './VnDate.vue';
|
||||||
import VnTime from './VnTime.vue';
|
import VnTime from './VnTime.vue';
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
const $attrs = useAttrs();
|
||||||
const model = defineModel({ type: [Date, String] });
|
const model = defineModel({ type: [Date] });
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
isOutlined: {
|
isOutlined: {
|
||||||
|
@ -29,7 +29,7 @@ const styleAttrs = computed(() => {
|
||||||
const mask = 'DD-MM-YYYY HH:mm';
|
const mask = 'DD-MM-YYYY HH:mm';
|
||||||
const selectedDate = computed({
|
const selectedDate = computed({
|
||||||
get() {
|
get() {
|
||||||
if (!model.value) return JSON.stringify(new Date(model.value));
|
if (!model.value) return new Date(model.value);
|
||||||
return date.formatDate(new Date(model.value), mask);
|
return date.formatDate(new Date(model.value), mask);
|
||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
|
|
|
@ -21,7 +21,7 @@ watch(
|
||||||
(newValue) => {
|
(newValue) => {
|
||||||
if (!modelValue.value) return;
|
if (!modelValue.value) return;
|
||||||
modelValue.value = formatLocation(newValue) ?? null;
|
modelValue.value = formatLocation(newValue) ?? null;
|
||||||
},
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const mixinRules = [requiredFieldRule];
|
const mixinRules = [requiredFieldRule];
|
||||||
|
@ -45,7 +45,7 @@ const formatLocation = (obj, properties = locationProperties) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const filteredParts = parts.filter(
|
const filteredParts = parts.filter(
|
||||||
(part) => part !== null && part !== undefined && part !== '',
|
(part) => part !== null && part !== undefined && part !== ''
|
||||||
);
|
);
|
||||||
|
|
||||||
return filteredParts.join(', ');
|
return filteredParts.join(', ');
|
||||||
|
|
|
@ -1,98 +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>
|
|
|
@ -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: {
|
||||||
|
@ -166,8 +166,6 @@ 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);
|
||||||
});
|
});
|
||||||
|
@ -257,18 +255,21 @@ 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)
|
|
||||||
: filter(val, myOptionsOriginal.value);
|
|
||||||
|
|
||||||
update(
|
update(
|
||||||
() => {
|
() => {
|
||||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||||
|
@ -285,13 +286,12 @@ async function filterHandler(val, update) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
|
@ -379,7 +379,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="
|
||||||
() => {
|
() => {
|
||||||
|
@ -394,7 +394,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="
|
||||||
() => {
|
() => {
|
||||||
|
@ -419,7 +419,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>
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
|
||||||
import VnBankDetailsForm from 'components/common/VnBankDetailsForm.vue';
|
|
||||||
import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
|
|
||||||
|
|
||||||
describe('VnBankDetail Component', () => {
|
|
||||||
let vm;
|
|
||||||
let wrapper;
|
|
||||||
const bankEntities = [
|
|
||||||
{ id: 2100, bic: 'CAIXESBBXXX', name: 'CaixaBank' },
|
|
||||||
{ id: 1234, bic: 'TESTBIC', name: 'Test Bank' },
|
|
||||||
];
|
|
||||||
const correctIban = 'ES6621000418401234567891';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
wrapper = createWrapper(VnBankDetailsForm, {
|
|
||||||
$props: {
|
|
||||||
iban: null,
|
|
||||||
bankEntityFk: null,
|
|
||||||
disableElement: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
vm = wrapper.vm;
|
|
||||||
wrapper = wrapper.wrapper;
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should update bankEntityFk when IBAN exists in bankEntities', async () => {
|
|
||||||
vm.bankEntities = bankEntities;
|
|
||||||
|
|
||||||
await vm.autofillBic(correctIban);
|
|
||||||
expect(vm.bankEntityFk).toBe(2100);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should set bankEntityFk to null when IBAN bank code is not found', async () => {
|
|
||||||
vm.bankEntities = bankEntities;
|
|
||||||
|
|
||||||
await vm.autofillBic('ES1234567891324567891234');
|
|
||||||
expect(vm.bankEntityFk).toBe(null);
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -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';
|
||||||
|
@ -35,7 +34,7 @@ describe('VnSmsDialog', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: 'You must enter a new password',
|
message: 'You must enter a new password',
|
||||||
type: 'negative',
|
type: 'negative',
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -47,7 +46,7 @@ describe('VnSmsDialog', () => {
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
message: `Passwords don't match`,
|
message: `Passwords don't match`,
|
||||||
type: 'negative',
|
type: 'negative',
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -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();
|
||||||
|
|
||||||
|
|
|
@ -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';
|
||||||
|
|
||||||
|
@ -25,9 +23,6 @@ describe('VnDmsList', () => {
|
||||||
deleteModel: 'WorkerDms',
|
deleteModel: 'WorkerDms',
|
||||||
downloadModel: 'WorkerDms',
|
downloadModel: 'WorkerDms',
|
||||||
},
|
},
|
||||||
global: {
|
|
||||||
stubs: ['VnUserLink'],
|
|
||||||
},
|
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -11,27 +12,25 @@ describe('VnInput', () => {
|
||||||
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']);
|
||||||
|
@ -63,6 +62,7 @@ describe('VnInput', () => {
|
||||||
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();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -71,7 +71,7 @@ describe('VnInput', () => {
|
||||||
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();
|
||||||
|
|
|
@ -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', () => {
|
describe('formattedDate', () => {
|
||||||
it('validateAndCleanInput should remove non-numeric characters', async () => {
|
it('formats a valid date correctly', async () => {
|
||||||
generateWrapper();
|
generateWrapper('2023-12-25', false, false);
|
||||||
vm.validateAndCleanInput('10a/1s2/2dd0a23');
|
|
||||||
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,13 +58,13 @@ 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');
|
||||||
});
|
});
|
||||||
|
|
|
@ -33,7 +33,7 @@ describe('VnInputDateTime', () => {
|
||||||
it('handles null date value', async () => {
|
it('handles null date value', async () => {
|
||||||
generateWrapper(null, false, true);
|
generateWrapper(null, false, true);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.selectedDate).not.toBe(null);
|
expect(vm.selectedDate).toBeInstanceOf(Date);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('updates the model value when a new datetime is set', async () => {
|
it('updates the model value when a new datetime is set', async () => {
|
||||||
|
|
|
@ -6,8 +6,8 @@ function buildComponent(data) {
|
||||||
return createWrapper(VnLocation, {
|
return createWrapper(VnLocation, {
|
||||||
global: {
|
global: {
|
||||||
props: {
|
props: {
|
||||||
location: data,
|
location: data
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ describe('formatLocation', () => {
|
||||||
postcode: '46680',
|
postcode: '46680',
|
||||||
city: 'Algemesi',
|
city: 'Algemesi',
|
||||||
province: { name: 'Valencia' },
|
province: { name: 'Valencia' },
|
||||||
country: { name: 'Spain' },
|
country: { name: 'Spain' }
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -47,12 +47,7 @@ describe('formatLocation', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return the country', () => {
|
it('should return the country', () => {
|
||||||
const location = {
|
const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
|
||||||
...locationBase,
|
|
||||||
postcode: undefined,
|
|
||||||
city: undefined,
|
|
||||||
province: undefined,
|
|
||||||
};
|
|
||||||
const vm = buildComponent(location);
|
const vm = buildComponent(location);
|
||||||
expect(vm.formatLocation(location)).toEqual('Spain');
|
expect(vm.formatLocation(location)).toEqual('Spain');
|
||||||
});
|
});
|
||||||
|
@ -66,7 +61,7 @@ describe('showLabel', () => {
|
||||||
code: '46680',
|
code: '46680',
|
||||||
town: 'Algemesi',
|
town: 'Algemesi',
|
||||||
province: 'Valencia',
|
province: 'Valencia',
|
||||||
country: 'Spain',
|
country: 'Spain'
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -89,12 +84,7 @@ describe('showLabel', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should show the label with country', () => {
|
it('should show the label with country', () => {
|
||||||
const location = {
|
const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
|
||||||
...locationBase,
|
|
||||||
code: undefined,
|
|
||||||
town: undefined,
|
|
||||||
province: undefined,
|
|
||||||
};
|
|
||||||
const vm = buildComponent(location);
|
const vm = buildComponent(location);
|
||||||
expect(vm.showLabel(location)).toEqual('Spain');
|
expect(vm.showLabel(location)).toEqual('Spain');
|
||||||
});
|
});
|
||||||
|
|
|
@ -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', 'VnUserLink'],
|
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;
|
||||||
|
|
|
@ -2,14 +2,13 @@ import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnSmsDialog from 'components/common/VnSmsDialog.vue';
|
import VnSmsDialog from 'components/common/VnSmsDialog.vue';
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
||||||
describe('VnSmsDialog', () => {
|
describe('VnSmsDialog', () => {
|
||||||
let vm;
|
let vm;
|
||||||
const orderId = 1;
|
const orderId = 1;
|
||||||
const shipped = new Date();
|
const shipped = new Date();
|
||||||
const phone = '012345678';
|
const phone = '012345678';
|
||||||
const promise = (response) => {
|
const promise = (response) => {return response;};
|
||||||
return response;
|
|
||||||
};
|
|
||||||
const template = 'minAmount';
|
const template = 'minAmount';
|
||||||
const locale = 'en';
|
const locale = 'en';
|
||||||
|
|
||||||
|
@ -18,13 +17,13 @@ describe('VnSmsDialog', () => {
|
||||||
propsData: {
|
propsData: {
|
||||||
data: {
|
data: {
|
||||||
orderId,
|
orderId,
|
||||||
shipped,
|
shipped
|
||||||
},
|
},
|
||||||
template,
|
template,
|
||||||
locale,
|
locale,
|
||||||
phone,
|
phone,
|
||||||
promise,
|
promise
|
||||||
},
|
}
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -36,9 +35,7 @@ describe('VnSmsDialog', () => {
|
||||||
it('should update the message value with the correct template and parameters', () => {
|
it('should update the message value with the correct template and parameters', () => {
|
||||||
vm.updateMessage();
|
vm.updateMessage();
|
||||||
|
|
||||||
expect(vm.message).toEqual(
|
expect(vm.message).toEqual(`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`);
|
||||||
`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`,
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -50,7 +47,7 @@ describe('VnSmsDialog', () => {
|
||||||
orderId,
|
orderId,
|
||||||
shipped,
|
shipped,
|
||||||
destination: phone,
|
destination: phone,
|
||||||
message: vm.message,
|
message: vm.message
|
||||||
};
|
};
|
||||||
await vm.send();
|
await vm.send();
|
||||||
|
|
||||||
|
|
|
@ -132,7 +132,8 @@ const card = toRef(props, 'item');
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
|
white-space: nowrap;
|
||||||
|
width: 192px;
|
||||||
p {
|
p {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ const token = getTokenMultimedia();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const src = computed(
|
const src = computed(
|
||||||
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`,
|
() => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`
|
||||||
);
|
);
|
||||||
const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
|
const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
|
||||||
const showLetter = ref(false);
|
const showLetter = ref(false);
|
||||||
|
|
|
@ -89,7 +89,6 @@ 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"
|
||||||
|
@ -108,7 +107,6 @@ function cancel() {
|
||||||
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
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -13,7 +13,7 @@ const src = computed({
|
||||||
get() {
|
get() {
|
||||||
return new URL(
|
return new URL(
|
||||||
`../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
|
`../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
|
||||||
import.meta.url,
|
import.meta.url
|
||||||
).href;
|
).href;
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { ref, reactive, useAttrs, computed, onMounted, nextTick } from 'vue';
|
import { ref, reactive, useAttrs, computed } from 'vue';
|
||||||
import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
|
import { onBeforeRouteLeave } from 'vue-router';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useQuasar } from 'quasar';
|
import { useQuasar } from 'quasar';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
|
||||||
import { tMobile } from 'src/composables/tMobile';
|
|
||||||
import { toDateHourMin } from 'src/filters';
|
import { toDateHourMin } from 'src/filters';
|
||||||
|
|
||||||
import VnPaginate from 'components/ui/VnPaginate.vue';
|
import VnPaginate from 'components/ui/VnPaginate.vue';
|
||||||
|
@ -34,24 +33,18 @@ const $props = defineProps({
|
||||||
addNote: { type: Boolean, default: false },
|
addNote: { type: Boolean, default: false },
|
||||||
selectType: { type: Boolean, default: false },
|
selectType: { type: Boolean, default: false },
|
||||||
justInput: { type: Boolean, default: false },
|
justInput: { type: Boolean, default: false },
|
||||||
goTo: { type: String, default: '' },
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const quasar = useQuasar();
|
const quasar = useQuasar();
|
||||||
const stateStore = useStateStore();
|
|
||||||
const router = useRouter();
|
|
||||||
const route = useRoute();
|
|
||||||
const componentIsRendered = ref(false);
|
|
||||||
const newNote = reactive({ text: null, observationTypeFk: null });
|
const newNote = reactive({ text: null, observationTypeFk: null });
|
||||||
const observationTypes = ref([]);
|
const observationTypes = ref([]);
|
||||||
const vnPaginateRef = ref();
|
const vnPaginateRef = ref();
|
||||||
|
|
||||||
const defaultObservationType = computed(
|
const defaultObservationType = computed(() =>
|
||||||
() => observationTypes.value.find((ot) => ot.code === 'salesPerson')?.id,
|
observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
|
||||||
);
|
);
|
||||||
|
|
||||||
let savedNote = false;
|
|
||||||
let originalText;
|
let originalText;
|
||||||
|
|
||||||
function handleClick(e) {
|
function handleClick(e) {
|
||||||
|
@ -75,7 +68,6 @@ async function insert() {
|
||||||
};
|
};
|
||||||
await axios.post($props.url, newBody);
|
await axios.post($props.url, newBody);
|
||||||
await vnPaginateRef.value.fetch();
|
await vnPaginateRef.value.fetch();
|
||||||
savedNote = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmAndUpdate() {
|
function confirmAndUpdate() {
|
||||||
|
@ -137,44 +129,8 @@ const handleObservationTypes = (data) => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
nextTick(() => (componentIsRendered.value = true));
|
|
||||||
});
|
|
||||||
|
|
||||||
async function saveAndGo() {
|
|
||||||
savedNote = false;
|
|
||||||
await insert();
|
|
||||||
await savedNote;
|
|
||||||
router.push({ path: $props.goTo });
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<Teleport
|
|
||||||
to="#st-actions"
|
|
||||||
v-if="
|
|
||||||
stateStore?.isSubToolbarShown() &&
|
|
||||||
componentIsRendered &&
|
|
||||||
$props.goTo &&
|
|
||||||
!route.path.includes('summary')
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<QBtn
|
|
||||||
:label="
|
|
||||||
tMobile('globals.saveAndContinue') +
|
|
||||||
' ' +
|
|
||||||
t('globals.' + $props.goTo.split('/').pop())
|
|
||||||
"
|
|
||||||
:title="
|
|
||||||
t('globals.saveAndContinue') +
|
|
||||||
' ' +
|
|
||||||
t('globals.' + $props.goTo.split('/').pop())
|
|
||||||
"
|
|
||||||
color="primary"
|
|
||||||
icon="save"
|
|
||||||
@click="saveAndGo"
|
|
||||||
data-cy="saveContinueNoteButton"
|
|
||||||
/>
|
|
||||||
</Teleport>
|
|
||||||
<FetchData
|
<FetchData
|
||||||
v-if="selectType"
|
v-if="selectType"
|
||||||
url="ObservationTypes"
|
url="ObservationTypes"
|
||||||
|
@ -220,7 +176,7 @@ async function saveAndGo() {
|
||||||
:required="'required' in originalAttrs"
|
:required="'required' in originalAttrs"
|
||||||
clearable
|
clearable
|
||||||
>
|
>
|
||||||
<template #append v-if="!$props.goTo">
|
<template #append>
|
||||||
<QBtn
|
<QBtn
|
||||||
:title="t('Save (Enter)')"
|
:title="t('Save (Enter)')"
|
||||||
icon="save"
|
icon="save"
|
||||||
|
@ -249,7 +205,9 @@ async function saveAndGo() {
|
||||||
class="show"
|
class="show"
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:search-url="false"
|
:search-url="false"
|
||||||
@on-fetch="newNote.text = ''"
|
@on-fetch="
|
||||||
|
newNote.text = '';
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<template #body="{ rows }">
|
<template #body="{ rows }">
|
||||||
<TransitionGroup name="list" tag="div" class="column items-center full-width">
|
<TransitionGroup name="list" tag="div" class="column items-center full-width">
|
||||||
|
|
|
@ -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: {
|
||||||
|
@ -146,14 +144,14 @@ const addFilter = async (filter, params) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
async function fetch(params) {
|
async function fetch(params) {
|
||||||
arrayData.setOptions(params);
|
useArrayData(props.dataKey, params);
|
||||||
arrayData.resetPagination();
|
arrayData.resetPagination();
|
||||||
await arrayData.fetch({ append: false });
|
await arrayData.fetch({ append: false });
|
||||||
return emitStoreData();
|
return emitStoreData();
|
||||||
}
|
}
|
||||||
|
|
||||||
async function update(params) {
|
async function update(params) {
|
||||||
arrayData.setOptions(params);
|
useArrayData(props.dataKey, params);
|
||||||
const { limit, skip } = store;
|
const { limit, skip } = store;
|
||||||
store.limit = limit + skip;
|
store.limit = limit + skip;
|
||||||
store.skip = 0;
|
store.skip = 0;
|
||||||
|
|
|
@ -46,7 +46,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
type: [String, Array],
|
type: String,
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
|
|
@ -87,7 +87,7 @@ function formatNumber(number) {
|
||||||
<QItemLabel caption>{{
|
<QItemLabel caption>{{
|
||||||
date.formatDate(
|
date.formatDate(
|
||||||
row.sms.created,
|
row.sms.created,
|
||||||
'YYYY-MM-DD HH:mm:ss',
|
'YYYY-MM-DD HH:mm:ss'
|
||||||
)
|
)
|
||||||
}}</QItemLabel>
|
}}</QItemLabel>
|
||||||
<QItemLabel class="row center">
|
<QItemLabel class="row center">
|
||||||
|
|
|
@ -37,7 +37,8 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
|
||||||
class="justify-end sticky"
|
class="justify-end sticky"
|
||||||
>
|
>
|
||||||
<slot name="st-data">
|
<slot name="st-data">
|
||||||
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }"></div>
|
<div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
|
||||||
|
</div>
|
||||||
</slot>
|
</slot>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<slot name="st-actions">
|
<slot name="st-actions">
|
||||||
|
|
|
@ -1,38 +1,18 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import AccountDescriptorProxy from 'src/pages/Account/Card/AccountDescriptorProxy.vue';
|
|
||||||
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
|
||||||
import { ref, onMounted } from 'vue';
|
|
||||||
import axios from 'axios';
|
defineProps({
|
||||||
const $props = defineProps({
|
|
||||||
name: { type: String, default: null },
|
name: { type: String, default: null },
|
||||||
tag: { type: String, default: null },
|
tag: { type: String, default: null },
|
||||||
workerId: { type: Number, default: null },
|
workerId: { type: Number, default: null },
|
||||||
defaultName: { type: Boolean, default: false },
|
defaultName: { type: Boolean, default: false },
|
||||||
});
|
});
|
||||||
const isWorker = ref(false);
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
try {
|
|
||||||
const {
|
|
||||||
data: { exists },
|
|
||||||
} = await axios(`/Workers/${$props.workerId}/exists`);
|
|
||||||
isWorker.value = exists;
|
|
||||||
} catch (error) {
|
|
||||||
if (error.status === 403) return;
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<slot name="link">
|
<slot name="link">
|
||||||
<span :class="{ link: workerId }">
|
<span :class="{ link: workerId }">
|
||||||
{{ defaultName ? (name ?? $t('globals.system')) : name }}
|
{{ defaultName ? name ?? $t('globals.system') : name }}
|
||||||
</span>
|
</span>
|
||||||
</slot>
|
</slot>
|
||||||
<WorkerDescriptorProxy
|
<WorkerDescriptorProxy v-if="workerId" :id="workerId" />
|
||||||
v-if="isWorker"
|
|
||||||
:id="workerId"
|
|
||||||
@on-fetch="(data) => (isWorker = data?.workerId !== undefined)"
|
|
||||||
/>
|
|
||||||
<AccountDescriptorProxy v-else :id="workerId" />
|
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -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', () => {
|
||||||
|
|
|
@ -12,12 +12,12 @@ function generateWrapper(storage = 'images') {
|
||||||
id: 123,
|
id: 123,
|
||||||
zoomResolution: '400x400',
|
zoomResolution: '400x400',
|
||||||
storage,
|
storage,
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
vm.timeStamp = 'timestamp';
|
vm.timeStamp = 'timestamp';
|
||||||
}
|
};
|
||||||
|
|
||||||
vi.mock('src/composables/useSession', () => ({
|
vi.mock('src/composables/useSession', () => ({
|
||||||
useSession: () => ({
|
useSession: () => ({
|
||||||
|
@ -31,6 +31,7 @@ vi.mock('src/composables/useRole', () => ({
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
describe('VnImg', () => {
|
describe('VnImg', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
isEmployeeMock.mockReset();
|
isEmployeeMock.mockReset();
|
||||||
|
@ -62,9 +63,7 @@ describe('VnImg', () => {
|
||||||
generateWrapper();
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
const url = vm.getUrl();
|
const url = vm.getUrl();
|
||||||
expect(url).toBe(
|
expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token×tamp');
|
||||||
'/api/images/catalog/200x200/123/download?access_token=token×tamp',
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
|
it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
|
||||||
|
@ -72,9 +71,7 @@ describe('VnImg', () => {
|
||||||
generateWrapper();
|
generateWrapper();
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
const url = vm.getUrl(true);
|
const url = vm.getUrl(true);
|
||||||
expect(url).toBe(
|
expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token×tamp');
|
||||||
'/api/images/catalog/400x400/123/download?access_token=token×tamp',
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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', () => {
|
||||||
|
|
|
@ -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();
|
||||||
|
|
|
@ -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', () => {
|
||||||
|
@ -53,26 +51,26 @@ describe('useAcl', () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([
|
||||||
{ model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
|
{ model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
|
||||||
]),
|
])
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return false if no roles matched', async () => {
|
it('should return false if no roles matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }]),
|
acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('*', () => {
|
describe('*', () => {
|
||||||
it('should return true if an acl matched', async () => {
|
it('should return true if an acl matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }]),
|
acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return false if no acls matched', async () => {
|
it('should return false if no acls matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }]),
|
acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -80,15 +78,13 @@ describe('useAcl', () => {
|
||||||
describe('$authenticated', () => {
|
describe('$authenticated', () => {
|
||||||
it('should return false if no acls matched', async () => {
|
it('should return false if no acls matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }]),
|
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return true if an acl matched', async () => {
|
it('should return true if an acl matched', async () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
|
||||||
{ model: 'Url', props: 'getByUser', accessType: 'READ' },
|
|
||||||
]),
|
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -98,7 +94,7 @@ describe('useAcl', () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([
|
||||||
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' },
|
{ model: 'TpvTransaction', props: 'start', accessType: 'READ' },
|
||||||
]),
|
])
|
||||||
).toBeFalsy();
|
).toBeFalsy();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -106,7 +102,7 @@ describe('useAcl', () => {
|
||||||
expect(
|
expect(
|
||||||
acl.hasAny([
|
acl.hasAny([
|
||||||
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
|
{ model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
|
||||||
]),
|
])
|
||||||
).toBeTruthy();
|
).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -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),
|
|
||||||
params: {
|
|
||||||
filter,
|
filter,
|
||||||
supplierFk: 2,
|
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',
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function mountArrayData(...args) {
|
it('should handle empty data gracefully if has to return one record', async () => {
|
||||||
let arrayData;
|
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
||||||
|
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
|
||||||
|
await arrayData.fetch({});
|
||||||
|
|
||||||
const TestComponent = defineComponent({
|
expect(arrayData.store.data).toBeUndefined();
|
||||||
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,7 +64,9 @@ describe('session', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('login', () => {
|
describe(
|
||||||
|
'login',
|
||||||
|
() => {
|
||||||
const expectedUser = {
|
const expectedUser = {
|
||||||
id: 999,
|
id: 999,
|
||||||
name: `T'Challa`,
|
name: `T'Challa`,
|
||||||
|
@ -141,7 +143,9 @@ describe('session', () => {
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
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();
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile',
|
||||||
|
|
||||||
export async function downloadDocuware(url, params) {
|
export async function downloadDocuware(url, params) {
|
||||||
const appUrl = await getAppUrl();
|
const appUrl = await getAppUrl();
|
||||||
const response = await axios.get(`${appUrl}/api/${url}`, {
|
const response = await axios.get(`${appUrl}/api/` + url, {
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
params,
|
params,
|
||||||
});
|
});
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue