Compare commits
915 Commits
8667-FixCl
...
dev
Author | SHA1 | Date |
---|---|---|
|
a2991281a7 | |
|
66da64eb78 | |
|
210ff8427b | |
|
57a31e4f0b | |
|
fba386f8c4 | |
|
5f0eabd626 | |
|
7bc53b131a | |
|
5053dbe1eb | |
|
0e66e3362f | |
|
a6d2ee8ab2 | |
|
290586e642 | |
|
a3a6f1aa2b | |
|
917ef597bb | |
|
39228ed257 | |
|
fba4fbb759 | |
|
ebabbce34c | |
|
2ef4a8c5de | |
|
eaab97072c | |
|
75780f1ad2 | |
|
1a954cae60 | |
|
4add424471 | |
|
4f1c49afb3 | |
|
787f76b401 | |
|
665168dc45 | |
|
55a0a53915 | |
|
caa5fdf587 | |
|
7c7e492b6c | |
|
b625258856 | |
|
a4a9da9885 | |
|
f615c5c196 | |
|
77db8392cc | |
|
d8234ba141 | |
|
65a3582e79 | |
|
2eb70aadcb | |
|
1d573b5dee | |
|
d122752672 | |
|
82b6fb6c2f | |
|
f9f9caa493 | |
|
1a3e717620 | |
|
31acc3d0a1 | |
|
5b3ef29294 | |
|
a66849f361 | |
|
1b20b0de60 | |
|
42b8e908fa | |
|
1ea8c0fc4b | |
|
04e1f7a1b5 | |
|
a7ccc68ab7 | |
|
917a7e8ecc | |
|
4f7dcca917 | |
|
005693550e | |
|
db06227b14 | |
|
64e30b7143 | |
|
63e7c55b7d | |
|
0e3247ceac | |
|
de359043af | |
|
e6e43ccfc4 | |
|
dd74664eb6 | |
|
dcf6d3cad4 | |
|
0f7bb9cfe1 | |
|
e03e6b2305 | |
|
76c6bd3048 | |
|
d171c7dd94 | |
|
12fdf567c4 | |
|
01ac0f2921 | |
|
b524a6d8eb | |
|
9838342e27 | |
|
be7c63150c | |
|
bbd07e71fa | |
|
6692b499d2 | |
|
78f1756edc | |
|
9919352e8c | |
|
690d807ef1 | |
|
ff6d2a71bf | |
|
46c0e4bc74 | |
|
f49f694970 | |
|
d399afcd89 | |
|
b26be0bf6d | |
|
be877fa2b8 | |
|
239e008aba | |
|
38bd00e82a | |
|
7119cbbe89 | |
|
db85936963 | |
|
516e89d445 | |
|
2e8192ef7b | |
|
dea2ddcd6c | |
|
b162dd7672 | |
|
05311b8ffa | |
|
57955ec2d5 | |
|
d1440c1083 | |
|
180153d8f0 | |
|
3782e7e8d7 | |
|
535bfa4347 | |
|
6acd2e9e9f | |
|
797ce5922d | |
|
3bcafc5734 | |
|
199a6c8cce | |
|
8309e2cddf | |
|
8e45abd041 | |
|
b50ad72155 | |
|
c43f8f8af4 | |
|
510eab8af0 | |
|
b45c97e3c1 | |
|
a547188498 | |
|
df39cd4eca | |
|
19481209d8 | |
|
88099a9f34 | |
|
9410257822 | |
|
b321ab3240 | |
|
b32a889dfe | |
|
ec906daf41 | |
|
800e5e18d4 | |
|
190310f285 | |
|
19fde32006 | |
|
1125067b09 | |
|
2159ce0897 | |
|
50ab4d28c2 | |
|
27691943d3 | |
|
be3c48b9f1 | |
|
76a2c8200f | |
|
ce1aa3fb1b | |
|
8f141bba51 | |
|
5c6e97b42a | |
|
6dddad95c9 | |
|
a4e4c882ee | |
|
37bc464a98 | |
|
5fca08aaa2 | |
|
5225a9f57c | |
|
9a0211787a | |
|
e4da145a5e | |
|
e84107dcbb | |
|
6dc9f3ca07 | |
|
2678ac5def | |
|
4e0450bf36 | |
|
bf1bb002e6 | |
|
915776c4e8 | |
|
f0a6fc00cf | |
|
96b57cab33 | |
|
85fa1543c1 | |
|
7ee32158c7 | |
|
6976569c42 | |
|
02b7afb9ec | |
|
3027d579cf | |
|
9e74a4a3f8 | |
|
6b6118c66c | |
|
31451a86ed | |
|
b54bb22967 | |
|
db1f5e3083 | |
|
2be108c897 | |
|
0e5e092450 | |
|
5e0f0caa2e | |
|
82f4397fd4 | |
|
bc6d11846f | |
|
0b6ba8fc5e | |
|
954c5a3bad | |
|
d24e153033 | |
|
d5b5c33bc0 | |
|
2f122725e1 | |
|
c0ce2af459 | |
|
aefb7b7dcb | |
|
7816150693 | |
|
289f5ce404 | |
|
c633a3e283 | |
|
7325b68bd9 | |
|
5d6af7bfdf | |
|
b7ed24dd72 | |
|
15c8f4ac43 | |
|
659050700b | |
|
0e7da211df | |
|
fd36bd7c7e | |
|
80fb1eaf6a | |
|
5f2e2421a8 | |
|
e7bb829bf5 | |
|
6f4b618a7f | |
|
eb4340122d | |
|
a74e1102ed | |
|
70d8b65fcb | |
|
d31c2d55eb | |
|
da1321ee34 | |
|
3350f9d6a7 | |
|
2df532d739 | |
|
629af07502 | |
|
bc6ce826ce | |
|
4351ee4976 | |
|
eab1994fb8 | |
|
f3de8ecb73 | |
|
d0f4eb9db9 | |
|
d8a5945bce | |
|
6a129c89d7 | |
|
b521aa86f3 | |
|
bd8747e1fd | |
|
ef8d45fd21 | |
|
955c4718dd | |
|
96b20f6711 | |
|
3f01436d02 | |
|
c47cb05cbd | |
|
ac7fab7ada | |
|
4399217b4b | |
|
3edd00d500 | |
|
6f938021bf | |
|
9d00668acb | |
|
7e56cb96ef | |
|
87925d3fad | |
|
36ff68900f | |
|
e081543d39 | |
|
77e01ed55c | |
|
a2f8a61c20 | |
|
a24bc6cc4b | |
|
9d2c0bf211 | |
|
123ec41f32 | |
|
d6362d042d | |
|
1b695be63f | |
|
d3b413fc25 | |
|
e809e598f7 | |
|
8f5b4af7cc | |
|
1e1096a108 | |
|
9d31a75dfe | |
|
af0c30f798 | |
|
9cadb4a02b | |
|
b4611aad4c | |
|
5bd2859e5d | |
|
3c6bed6d7e | |
|
af4a398a90 | |
|
d91d5351c3 | |
|
0e3406a502 | |
|
4e40156c38 | |
|
c9957371df | |
|
15cbbab043 | |
|
2a3e8f293a | |
|
ffd83e7e0f | |
|
72d9f9345c | |
|
e0ba8ab742 | |
|
2cb151e181 | |
|
0440115d5a | |
|
5e9fe20f08 | |
|
dc93d1d394 | |
|
1fc9dc1ca6 | |
|
562b3c88f0 | |
|
2d129dde01 | |
|
d142797b1f | |
|
2b5802a7fb | |
|
3549f172d6 | |
|
b782da7a8d | |
|
d6363e4b45 | |
|
22f1373c84 | |
|
7cc06adeef | |
|
11994b80b0 | |
|
488d48e9e9 | |
|
642589d054 | |
|
3fd3fef647 | |
|
582c7c8d40 | |
|
5edf3f7efe | |
|
d55ec1c738 | |
|
e8a3dc05dd | |
|
455fd72db4 | |
|
d4053d74d2 | |
|
e474e21309 | |
|
eb5a0956a7 | |
|
406b25103d | |
|
e2b77ac2ed | |
|
12e4435709 | |
|
830f506f5b | |
|
c7f25d6909 | |
|
2715502aba | |
|
c89fd0580f | |
|
4db9adb20a | |
|
f9bf2e7a3e | |
|
c9e5e86465 | |
|
6553a1a7fc | |
|
7c4c708342 | |
|
d637ca9785 | |
|
1f8051081e | |
|
0a90c62369 | |
|
bcad2dea1b | |
|
6ddcf57b08 | |
|
a3d828498b | |
|
4f821c86c1 | |
|
3349aebdde | |
|
4857962955 | |
|
624eac7094 | |
|
f50f747310 | |
|
0304010f62 | |
|
5e999e0fb1 | |
|
5110a46328 | |
|
bcee01280c | |
|
3c4c27889e | |
|
b7625f06bd | |
|
8f3ec13ccc | |
|
a84743d890 | |
|
103835d08b | |
|
5eee9965bf | |
|
e5f079121d | |
|
a5d3babf1f | |
|
5af6b60a4a | |
|
1185c345d8 | |
|
dc6487475f | |
|
f32d07ccaa | |
|
1f5e4bd771 | |
|
1a7a8dfc95 | |
|
21c3384509 | |
|
2992ac2d0d | |
|
a1e21d156b | |
|
5e2a74125f | |
|
7aeb75d4e1 | |
|
88d8562189 | |
|
dab3a2ce09 | |
|
070def57bb | |
|
cb1e1aa594 | |
|
dc566b3902 | |
|
9b337062c8 | |
|
6ef3df2322 | |
|
e9ef1c308e | |
|
5cc599a0e6 | |
|
c08b3648f2 | |
|
d78460a438 | |
|
d406715a70 | |
|
fd036138e4 | |
|
e5005d08ed | |
|
8523f85b4e | |
|
7706d77f55 | |
|
2afa0765b9 | |
|
7ef02c8797 | |
|
20ed8001bf | |
|
c700521b37 | |
|
b2ce75d2f6 | |
|
a5b27b3683 | |
|
85f74e5ad8 | |
|
daa3289b58 | |
|
1c96090d02 | |
|
6df58d021a | |
|
8c132298bb | |
|
fa1a9da29e | |
|
07a36b4e53 | |
|
e444828e4e | |
|
ce72c78af7 | |
|
a472e35bcf | |
|
832646638b | |
|
cf05dc0d5b | |
|
5afc9ce983 | |
|
00ed955577 | |
|
a780786a2c | |
|
088c401723 | |
|
19751ee3fb | |
|
76c07d2102 | |
|
0c4e88a45e | |
|
00e1e4441c | |
|
6fd01a4d09 | |
|
a4b710352d | |
|
4821390f22 | |
|
8b24874f72 | |
|
425e2adcdb | |
|
8bdc71f8d7 | |
|
8df07a4c62 | |
|
8d3c2f51cf | |
|
0d056d3ed6 | |
|
21c9abf273 | |
|
20f3525e50 | |
|
97c55aa1ec | |
|
600c16e822 | |
|
d7866f9bdb | |
|
6debb64b2b | |
|
4bdd8a6494 | |
|
9989e752bc | |
|
d3848a2343 | |
|
7deb9b1f16 | |
|
e4196e7176 | |
|
6aceda51f5 | |
|
7a7463ebf1 | |
|
b5fa2bb18e | |
|
1e1715df1a | |
|
736471bcbe | |
|
861bbb1574 | |
|
736f3e1c00 | |
|
c2d56ee002 | |
|
d29a27999a | |
|
0af42130c1 | |
|
74033a7bdf | |
|
87e56d9ff1 | |
|
2e6963d505 | |
|
e435674eda | |
|
4b6696fdc9 | |
|
e150ffd9fc | |
|
8bc40c74f2 | |
|
61ec951011 | |
|
36918d8434 | |
|
a1490a798b | |
|
f384dd6f04 | |
|
4caf496bd6 | |
|
6bf6ae0288 | |
|
f13b168364 | |
|
c099b41e74 | |
|
22b57f850c | |
|
046b6f8f28 | |
|
d40bf0f2ca | |
|
20ccdb133c | |
|
34343188d2 | |
|
32fa5248d0 | |
|
da31d6db3b | |
|
a43ade9852 | |
|
9be4cdccc0 | |
|
f02fa732ee | |
|
0a0e4dfca7 | |
|
8849b9ed97 | |
|
40cfe2a5cc | |
|
02a78c662b | |
|
588876952a | |
|
3c4cbf82d2 | |
|
c15e4dcf32 | |
|
da21c0aad6 | |
|
0863df25fe | |
|
c09254d204 | |
|
06e5188146 | |
|
26861e92b6 | |
|
fb3c015f89 | |
|
590afaba93 | |
|
3ddc6dc310 | |
|
6e4079de95 | |
|
79fbe2cc72 | |
|
e6e4b49d44 | |
|
c9416b5286 | |
|
da148c5435 | |
|
27ec560fc5 | |
|
49fafa2b34 | |
|
246e4429bd | |
|
98a4ac450d | |
|
35886999e4 | |
|
79fdaffbc8 | |
|
7fd22cce26 | |
|
8c9c156817 | |
|
b00d89a4be | |
|
e679282e57 | |
|
044c607405 | |
|
9f05984e80 | |
|
c4f895e060 | |
|
8e66be1874 | |
|
40d59846fa | |
|
68a86e9fcd | |
|
7c5ce312cc | |
|
1c3eee9695 | |
|
f6360e29af | |
|
f0ef9b42c9 | |
|
e9ebb3ad8a | |
|
2f47bb10aa | |
|
477ab36487 | |
|
7dd28393dd | |
|
3c68220903 | |
|
d81a14737c | |
|
1d5509313a | |
|
a1ca92a135 | |
|
61cdf2c3c7 | |
|
d71029c7e9 | |
|
19121fbeb9 | |
|
dd739b1165 | |
|
0208debdbe | |
|
f392502673 | |
|
a81f8fcdaf | |
|
5ade9fd133 | |
|
f2a20ce4bf | |
|
95950b7485 | |
|
9ef29e61bd | |
|
426438051c | |
|
31ffdd4b61 | |
|
a937b2d3ac | |
|
767a6302e1 | |
|
2f6b98a0bf | |
|
519ae66226 | |
|
a84c2a78c8 | |
|
789b0d22cc | |
|
50a8b97be5 | |
|
04dcd1136a | |
|
497eb3a8bb | |
|
c3d51259c4 | |
|
ba2084e906 | |
|
8c9a863d71 | |
|
1f41e3c8d1 | |
|
96bcc04d78 | |
|
5066cd8179 | |
|
ae5465687e | |
|
801e9687f7 | |
|
c205693131 | |
|
2bd0e88e3b | |
|
8c75ec41d8 | |
|
cad78aedd0 | |
|
ddfed3a59d | |
|
f8cc7b95ab | |
|
36f142800f | |
|
16cb224926 | |
|
668745981f | |
|
2d03b3a0b7 | |
|
a896e4ce23 | |
|
72a19cbba1 | |
|
530dc62e00 | |
|
bbf4234351 | |
|
e73604d908 | |
|
d60d7da33c | |
|
ea59cf8b0d | |
|
17821917ea | |
|
6adf7a91cf | |
|
74a7b39108 | |
|
fe2024c26a | |
|
033fe3375f | |
|
4fbcb82234 | |
|
cce3a0cef8 | |
|
50fb8a31a6 | |
|
e05d3140a3 | |
|
1a1a859edc | |
|
28c8e93a61 | |
|
a49c8891a7 | |
|
6434a37598 | |
|
c03a56f69f | |
|
dbdccc4774 | |
|
687bd54e64 | |
|
0b614f15d8 | |
|
cf8923a2d4 | |
|
269427e08c | |
|
2a3e072b1b | |
|
4ae9b69e11 | |
|
bdfc1fa309 | |
|
9492c71128 | |
|
39fcfb83a6 | |
|
dcf0b906f4 | |
|
cb4c740319 | |
|
7bc793cfb7 | |
|
848341f9d9 | |
|
71755025a6 | |
|
0aa4c1c527 | |
|
34c18d2baa | |
|
96ed69acd2 | |
|
f07ce9a0a1 | |
|
c9e7411c90 | |
|
3fc56700e4 | |
|
60899ef2d2 | |
|
c4ab00ffd2 | |
|
6e27edcf54 | |
|
c9bea020fa | |
|
1805e1e553 | |
|
dcd5d357ae | |
|
985e8663a3 | |
|
ea314073d2 | |
|
6e84341aea | |
|
a91a0146fe | |
|
71c6741cf2 | |
|
696dbd4149 | |
|
d94dafd667 | |
|
446b679bca | |
|
b1bd730fbf | |
|
92fba2e0c4 | |
|
65a089e562 | |
|
75a20f7ca7 | |
|
67e0791f34 | |
|
a624d65178 | |
|
59c08be804 | |
|
229737c75c | |
|
36f2328656 | |
|
b464344cd0 | |
|
dd4e872fcc | |
|
09bbb89376 | |
|
8e35b49927 | |
|
e353f7916a | |
|
a3b1095952 | |
|
ae9cc49add | |
|
3783cdeed4 | |
|
7a273fb35f | |
|
9918230096 | |
|
8c7dabd8fb | |
|
a7c23f4bbb | |
|
d2d38c1d3e | |
|
8be9feb41f | |
|
38d16b56a9 | |
|
bed4763e88 | |
|
1e89bdfe95 | |
|
4179219f15 | |
|
f78cd7c9bf | |
|
4b1a648509 | |
|
421b68a031 | |
|
c867d6da52 | |
|
c5a05917c0 | |
|
cb8362c0fa | |
|
4d0ababbde | |
|
a9fd5894b5 | |
|
4a2b147320 | |
|
718042445f | |
|
943e0abb2a | |
|
e7a501f528 | |
|
6e7e28226a | |
|
1a284acdc5 | |
|
eb81b9b6ee | |
|
240d671701 | |
|
f9f4b16d71 | |
|
3c16d516dc | |
|
dc35377f13 | |
|
5a642f4c3a | |
|
ec6f6c81c0 | |
|
e42f4797b1 | |
|
227dec72b3 | |
|
7b1e126966 | |
|
5dd3b85012 | |
|
08992aabac | |
|
42646fd570 | |
|
879296203c | |
|
9a2c7c8012 | |
|
6766a6136a | |
|
4b53d9c1b3 | |
|
fa5d0d4ee8 | |
|
b22807f884 | |
|
fbe3eae670 | |
|
30eecdee2f | |
|
93e85c536e | |
|
15bd9da3e2 | |
|
090c77dd91 | |
|
25bd351c17 | |
|
443ac77f5d | |
|
712b983340 | |
|
1be8e65fa1 | |
|
486f3e265f | |
|
d22afabe3f | |
|
5ded8686e6 | |
|
2190a0c17d | |
|
e0fbc7cfa7 | |
|
bbd771e61d | |
|
461d48c69d | |
|
abdea67bf6 | |
|
1e049847a7 | |
|
73740822a3 | |
|
304a039ebd | |
|
69629147ad | |
|
ba46d8bda4 | |
|
ca2e507401 | |
|
f4d347eef1 | |
|
d2b414c883 | |
|
feabf9c7be | |
|
0404c00a05 | |
|
351f291086 | |
|
1b86d34976 | |
|
be966abf51 | |
|
c9ec649a4d | |
|
acddcd58b8 | |
|
fb00824ee3 | |
|
17b784e4d1 | |
|
1a46576572 | |
|
e28f30d7e9 | |
|
bc75bd9dc0 | |
|
26f2044097 | |
|
2775e0193b | |
|
5f48c9b887 | |
|
31e8229cd3 | |
|
96a3f52b79 | |
|
303b9cb5a5 | |
|
6c4136fb58 | |
|
aebd9ea83c | |
|
c7218ce2cf | |
|
48689374bc | |
|
b26b8b6ddd | |
|
fd68071a2e | |
|
d8bea48b26 | |
|
4a5171aa6e | |
|
d3d80149e0 | |
|
90d556c892 | |
|
c672d33b0c | |
|
07f24cb9ae | |
|
e3c2ae935c | |
|
69548456c3 | |
|
64fe998053 | |
|
ae856ec0bc | |
|
7d5f51349a | |
|
b9128cde86 | |
|
239805515d | |
|
56da11345b | |
|
78d0f31b11 | |
|
868172d208 | |
|
2ac3b280af | |
|
cb99c50f33 | |
|
de9f1bca9a | |
|
2f5260a1a1 | |
|
70a15bff30 | |
|
8995d7d454 | |
|
8a8ce72c4c | |
|
5d356428d3 | |
|
7e2e6208bc | |
|
277373e6b5 | |
|
541d931d21 | |
|
22d912ba76 | |
|
013410e4a9 | |
|
fa06a9003e | |
|
da8366d05b | |
|
6bee0ead8c | |
|
74c1e53c89 | |
|
57e80040fa | |
|
e0def231b1 | |
|
23eff4937c | |
|
cfccc74710 | |
|
4c4d7c9dbe | |
|
ee4eafc639 | |
|
8417411efc | |
|
7510611c0b | |
|
bbbe348434 | |
|
6c7ea26a41 | |
|
1a0df60e06 | |
|
55394c2a2e | |
|
bc69b33028 | |
|
08b0eb3c74 | |
|
4db882cc03 | |
|
a6f7db154e | |
|
c4cf81a802 | |
|
ba5ea898c3 | |
|
b0dd15636c | |
|
fc61c13ec4 | |
|
ae62e40c60 | |
|
bb949cd00c | |
|
20c531bc04 | |
|
ad9dc4fe44 | |
|
db91a26114 | |
|
d376c3acbf | |
|
b4d21d5a52 | |
|
007c407433 | |
|
e100078f4b | |
|
f4c22938c7 | |
|
9eff4aa929 | |
|
d12cd60079 | |
|
23670debd1 | |
|
311c361f11 | |
|
2f88e97e2e | |
|
9b3a98e26f | |
|
50e3385be4 | |
|
8674e14fe7 | |
|
632a077e6a | |
|
e61196f8be | |
|
a703f9dac6 | |
|
3aec5584db | |
|
ca6c0cff29 | |
|
7ab2e28dc7 | |
|
21196fcc3b | |
|
5eb6e7b24b | |
|
a38470577c | |
|
f4b72c5d75 | |
|
429772ce88 | |
|
ff92c03c16 | |
|
6778a309dd | |
|
6dbaf841a4 | |
|
dcd4c327a0 | |
|
04a3c48cd6 | |
|
92a7f2c33c | |
|
dcceee3c3a | |
|
aefffa4a42 | |
|
4f17691d86 | |
|
9e037c0300 | |
|
215e3a6da4 | |
|
22c8a8f9d6 | |
|
255df3acd6 | |
|
48ebca9568 | |
|
ac12e1454a | |
|
f3fa931c70 | |
|
adb78c7433 | |
|
ff4e0103e7 | |
|
82d9d6016f | |
|
a0860522f5 | |
|
cc2e9f7890 | |
|
13a904290c | |
|
73b73cba62 | |
|
8edb9ec644 | |
|
de0ce51f10 | |
|
7433c3c551 | |
|
69d99350bc | |
|
76e9aab5ae | |
|
32dac089f8 | |
|
22a978098e | |
|
1f83197440 | |
|
095f01717d | |
|
cf261828db | |
|
9f8c491eda | |
|
cee6e0d0b1 | |
|
f33f09ca6f | |
|
a01f02e31b | |
|
4641adbae3 | |
|
eb6ed49060 | |
|
838d5e24ce | |
|
0f9f9bf21d | |
|
b9f23dfb18 | |
|
4ee8c80340 | |
|
6e9e5c7564 | |
|
27d7a732b7 | |
|
04f1aae5a0 | |
|
83c0bfad0c | |
|
d01951a709 | |
|
31bfe6c44e | |
|
2fd9067096 | |
|
92566f6e53 | |
|
83b9b602a0 | |
|
b259988f90 | |
|
c5284e54c7 | |
|
f1e334f1fc | |
|
3570556c47 | |
|
25ffdb94e6 | |
|
1101db707e | |
|
fa5c1643a4 | |
|
640d989090 | |
|
ae502d5fac | |
|
31ff7de958 | |
|
5bb078540d | |
|
7d8f25ff7d | |
|
fcebf6f664 | |
|
e1b96d6a73 | |
|
ad96392cba | |
|
d15144a98a | |
|
ef0ac17d88 | |
|
a5f287d782 | |
|
0619f21cf5 | |
|
b51f99f5f1 | |
|
5c627dd489 | |
|
7670c24f04 | |
|
01af6e8c2d | |
|
d199478c1d | |
|
5e782a1465 | |
|
42f898531d | |
|
9bf0b4c077 | |
|
1d34fc0287 | |
|
a6eb5dde8d | |
|
04543c8397 | |
|
ee96142f2d | |
|
d5486f89a5 | |
|
15159c1937 | |
|
4789c1d3cb | |
|
ca020fff80 | |
|
d302ee58c0 | |
|
e24600d1ad | |
|
1fcdd120c5 | |
|
6ab64453ab | |
|
ed615d7bbd | |
|
1a52a23712 | |
|
0491fa58b4 | |
|
27866e7090 | |
|
d2be59ddbf | |
|
efaa8a517b | |
|
c7d26084aa | |
|
40875256ff | |
|
4ee7a5c4fb | |
|
0263af7938 | |
|
97c673b5f3 | |
|
e0ad4fc2f1 | |
|
644339bd13 | |
|
bdda691ca9 | |
|
a330efd13f | |
|
36083b4e7a | |
|
cc55cd3822 | |
|
0ee939d568 | |
|
539fc81ffa | |
|
a250cc0eb5 | |
|
95f9917dc2 | |
|
28ae84a931 | |
|
f17b773cca | |
|
bfe302e9d4 | |
|
69f84e2fcd | |
|
d755c0c8ba | |
|
69452e2627 | |
|
2acbe53788 | |
|
f0b3ae3ada | |
|
ba31e98b8a | |
|
ccf7e5dfad | |
|
2dab2866e7 | |
|
30afbd84d6 | |
|
55d51ddf22 | |
|
d23b22ca55 | |
|
9961f5cda0 | |
|
561db9f7c8 | |
|
287c61f507 | |
|
abf2a5bb5d | |
|
f64c2a2854 | |
|
c2d8c76512 | |
|
4518ebdc35 | |
|
1c44aceccf | |
|
092e6e427f | |
|
a6777cc183 | |
|
942004d710 | |
|
1edf57da7e | |
|
29cd014ec8 | |
|
642e2c7d5c | |
|
b08778aed7 | |
|
dcc4f390c6 | |
|
cf397a38ce | |
|
bc3334529b | |
|
cc2c5e7567 | |
|
6e279120ea | |
|
2ae8dc4124 | |
|
07d86251cb | |
|
d881730f27 | |
|
82b2180cba | |
|
59ddd2377b | |
|
95e69ff79b | |
|
e797905764 | |
|
158c0f684a | |
|
f1a57ceba1 | |
|
af531958ca | |
|
fa755bf608 | |
|
a7d271bafd | |
|
55841d795f | |
|
3c2c40c8e6 | |
|
345dc4bfbc | |
|
3de0ebeccd | |
|
62e8b5b307 | |
|
8f0a4da245 | |
|
b229fc0ff3 | |
|
51afa21fa4 | |
|
5325095297 | |
|
76b914e6be | |
|
aa91209ab7 | |
|
4ba57a1ca3 | |
|
498e8c385e | |
|
fda024d6fe | |
|
35dac33ff9 | |
|
5f2b71dc70 | |
|
ff63a8fd11 | |
|
fcb2e3cc74 | |
|
5b0479e60c | |
|
099c613ccc | |
|
82fa3b4648 | |
|
aa3810a4c0 |
|
@ -1,6 +0,0 @@
|
||||||
/dist
|
|
||||||
/src-capacitor
|
|
||||||
/src-cordova
|
|
||||||
/.quasar
|
|
||||||
/node_modules
|
|
||||||
.eslintrc.js
|
|
75
.eslintrc.js
75
.eslintrc.js
|
@ -1,75 +0,0 @@
|
||||||
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',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"extends": ["plugin:cypress/recommended"]
|
||||||
|
}
|
|
@ -125,8 +125,10 @@ pipeline {
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
||||||
|
|
||||||
|
def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
|
||||||
|
echo "E2E MODULES: ${modules}"
|
||||||
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
|
||||||
sh 'sh test/cypress/cypressParallel.sh 1'
|
sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -183,3 +185,4 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,7 @@ 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,
|
||||||
|
|
|
@ -0,0 +1,87 @@
|
||||||
|
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',
|
||||||
|
],
|
||||||
|
};
|
25
package.json
25
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "salix-front",
|
"name": "salix-front",
|
||||||
"version": "25.14.0",
|
"version": "25.18.0",
|
||||||
"description": "Salix frontend",
|
"description": "Salix frontend",
|
||||||
"productName": "Salix",
|
"productName": "Salix",
|
||||||
"author": "Verdnatura",
|
"author": "Verdnatura",
|
||||||
|
@ -9,7 +9,8 @@
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"resetDatabase": "cd ../salix && gulp docker",
|
"resetDatabase": "cd ../salix && gulp docker",
|
||||||
"lint": "eslint --ext .js,.vue ./",
|
"lint": "eslint \"**/*.{vue,js}\" ",
|
||||||
|
"lint:fix": "eslint \"**/*.{vue,js}\" --fix ",
|
||||||
"format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
|
"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",
|
||||||
|
@ -17,6 +18,8 @@
|
||||||
"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",
|
||||||
|
@ -26,43 +29,53 @@
|
||||||
"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.3.0",
|
"vue-i18n": "^9.4.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",
|
||||||
"@intlify/unplugin-vue-i18n": "^0.8.2",
|
"@eslint/eslintrc": "^3.2.0",
|
||||||
|
"@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",
|
||||||
"vitepress": "^1.6.3",
|
"vitest": "^3.0.3",
|
||||||
"vitest": "^0.34.0",
|
|
||||||
"xunit-viewer": "^10.6.1"
|
"xunit-viewer": "^10.6.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|
4016
pnpm-lock.yaml
4016
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
@ -53,7 +53,7 @@ export default configure(function (/* ctx */) {
|
||||||
build: {
|
build: {
|
||||||
target: {
|
target: {
|
||||||
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
browser: ['es2022', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
|
||||||
node: 'node18',
|
node: 'node20',
|
||||||
},
|
},
|
||||||
|
|
||||||
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
vueRouterMode: 'hash', // available values: 'hash', 'history'
|
||||||
|
@ -92,6 +92,7 @@ export default configure(function (/* ctx */) {
|
||||||
vitePlugins: [
|
vitePlugins: [
|
||||||
[
|
[
|
||||||
VueI18nPlugin({
|
VueI18nPlugin({
|
||||||
|
strictMessage: false,
|
||||||
runtimeOnly: false,
|
runtimeOnly: false,
|
||||||
include: [
|
include: [
|
||||||
path.resolve(__dirname, './src/i18n/locale/**'),
|
path.resolve(__dirname, './src/i18n/locale/**'),
|
||||||
|
|
|
@ -0,0 +1,227 @@
|
||||||
|
/* eslint-disable */
|
||||||
|
/**
|
||||||
|
* THIS FILE IS GENERATED AUTOMATICALLY.
|
||||||
|
* 1. DO NOT edit this file directly as it won't do anything.
|
||||||
|
* 2. EDIT the original quasar.config file INSTEAD.
|
||||||
|
* 3. DO NOT git commit this file. It should be ignored.
|
||||||
|
*
|
||||||
|
* This file is still here because there was an error in
|
||||||
|
* the original quasar.config file and this allows you to
|
||||||
|
* investigate the Node.js stack error.
|
||||||
|
*
|
||||||
|
* After you fix the original file, this file will be
|
||||||
|
* deleted automatically.
|
||||||
|
**/
|
||||||
|
|
||||||
|
|
||||||
|
// quasar.config.js
|
||||||
|
import { configure } from "quasar/wrappers";
|
||||||
|
import VueI18nPlugin from "@intlify/unplugin-vue-i18n/vite";
|
||||||
|
import path from "path";
|
||||||
|
var __quasar_inject_dirname__ = "/home/jsegarra/Projects/salix-front";
|
||||||
|
var target = `http://${process.env.CI ? "back" : "localhost"}:3000`;
|
||||||
|
var quasar_config_default = configure(function() {
|
||||||
|
return {
|
||||||
|
eslint: {
|
||||||
|
// fix: true,
|
||||||
|
// include = [],
|
||||||
|
// exclude = [],
|
||||||
|
// rawOptions = {},
|
||||||
|
warnings: true,
|
||||||
|
errors: true
|
||||||
|
},
|
||||||
|
// https://v2.quasar.dev/quasar-cli/prefetch-feature
|
||||||
|
// preFetch: true,
|
||||||
|
// app boot file (/src/boot)
|
||||||
|
// --> boot files are part of "main.js"
|
||||||
|
// https://v2.quasar.dev/quasar-cli/boot-files
|
||||||
|
boot: ["i18n", "axios", "vnDate", "validations", "quasar", "quasar.defaults"],
|
||||||
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
|
||||||
|
css: ["app.scss"],
|
||||||
|
// https://github.com/quasarframework/quasar/tree/dev/extras
|
||||||
|
extras: [
|
||||||
|
// 'ionicons-v4',
|
||||||
|
// 'mdi-v5',
|
||||||
|
// 'fontawesome-v6',
|
||||||
|
// 'eva-icons',
|
||||||
|
// 'themify',
|
||||||
|
// 'line-awesome',
|
||||||
|
// 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
|
||||||
|
"roboto-font",
|
||||||
|
"material-icons-outlined",
|
||||||
|
"material-symbols-outlined"
|
||||||
|
],
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
|
||||||
|
build: {
|
||||||
|
target: {
|
||||||
|
browser: ["es2022", "edge88", "firefox78", "chrome87", "safari13.1"],
|
||||||
|
node: "node20"
|
||||||
|
},
|
||||||
|
vueRouterMode: "hash",
|
||||||
|
// available values: 'hash', 'history'
|
||||||
|
// vueRouterBase,
|
||||||
|
// vueDevtools,
|
||||||
|
// vueOptionsAPI: false,
|
||||||
|
// rebuildCache: true, // rebuilds Vite/linter/etc cache on startup
|
||||||
|
// publicPath: '/',
|
||||||
|
// analyze: true,
|
||||||
|
// env: {},
|
||||||
|
rawDefine: {
|
||||||
|
"process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
|
||||||
|
},
|
||||||
|
// ignorePublicFolder: true,
|
||||||
|
// minify: false,
|
||||||
|
// polyfillModulePreload: true,
|
||||||
|
// distDir
|
||||||
|
extendViteConf(viteConf) {
|
||||||
|
delete viteConf.build.polyfillModulePreload;
|
||||||
|
viteConf.build.modulePreload = {
|
||||||
|
polyfill: false
|
||||||
|
};
|
||||||
|
},
|
||||||
|
// viteVuePluginOptions: {},
|
||||||
|
alias: {
|
||||||
|
composables: path.join(__quasar_inject_dirname__, "./src/composables"),
|
||||||
|
filters: path.join(__quasar_inject_dirname__, "./src/filters")
|
||||||
|
},
|
||||||
|
vitePlugins: [
|
||||||
|
[
|
||||||
|
VueI18nPlugin({
|
||||||
|
strictMessage: false,
|
||||||
|
runtimeOnly: false,
|
||||||
|
include: [
|
||||||
|
path.resolve(__quasar_inject_dirname__, "./src/i18n/locale/**"),
|
||||||
|
path.resolve(__quasar_inject_dirname__, "./src/pages/**/locale/**")
|
||||||
|
]
|
||||||
|
})
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
|
||||||
|
devServer: {
|
||||||
|
server: {
|
||||||
|
type: "http"
|
||||||
|
},
|
||||||
|
proxy: {
|
||||||
|
"/api": {
|
||||||
|
target,
|
||||||
|
logLevel: "debug",
|
||||||
|
changeOrigin: true,
|
||||||
|
secure: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
open: false,
|
||||||
|
allowedHosts: [
|
||||||
|
"front",
|
||||||
|
// Agrega este nombre de host
|
||||||
|
"localhost"
|
||||||
|
// Opcional, para pruebas locales
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
|
||||||
|
framework: {
|
||||||
|
config: {
|
||||||
|
config: {
|
||||||
|
dark: "auto"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
lang: "en-GB",
|
||||||
|
// iconSet: 'material-icons', // Quasar icon set
|
||||||
|
// lang: 'en-US', // Quasar language pack
|
||||||
|
// For special cases outside of where the auto-import strategy can have an impact
|
||||||
|
// (like functional components as one of the examples),
|
||||||
|
// you can manually specify Quasar components/directives to be available everywhere:
|
||||||
|
//
|
||||||
|
// components: [],
|
||||||
|
// directives: [],
|
||||||
|
// Quasar plugins
|
||||||
|
plugins: ["Notify", "Dialog"],
|
||||||
|
all: "auto",
|
||||||
|
autoImportComponentCase: "pascal"
|
||||||
|
},
|
||||||
|
// animations: 'all', // --- includes all animations
|
||||||
|
// https://v2.quasar.dev/options/animations
|
||||||
|
animations: [],
|
||||||
|
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#property-sourcefiles
|
||||||
|
// sourceFiles: {
|
||||||
|
// rootComponent: 'src/App.vue',
|
||||||
|
// router: 'src/router/index',
|
||||||
|
// store: 'src/store/index',
|
||||||
|
// registerServiceWorker: 'src-pwa/register-service-worker',
|
||||||
|
// serviceWorker: 'src-pwa/custom-service-worker',
|
||||||
|
// pwaManifestFile: 'src-pwa/manifest.json',
|
||||||
|
// electronMain: 'src-electron/electron-main',
|
||||||
|
// electronPreload: 'src-electron/electron-preload'
|
||||||
|
// },
|
||||||
|
// https://v2.quasar.dev/quasar-cli/developing-ssr/configuring-ssr
|
||||||
|
ssr: {
|
||||||
|
// ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name!
|
||||||
|
// will mess up SSR
|
||||||
|
// extendSSRWebserverConf (esbuildConf) {},
|
||||||
|
// extendPackageJson (json) {},
|
||||||
|
pwa: false,
|
||||||
|
// manualStoreHydration: true,
|
||||||
|
// manualPostHydrationTrigger: true,
|
||||||
|
prodPort: 3e3,
|
||||||
|
// The default port that the production server should use
|
||||||
|
// (gets superseded if process.env.PORT is specified at runtime)
|
||||||
|
middlewares: [
|
||||||
|
"render"
|
||||||
|
// keep this as last one
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
|
||||||
|
pwa: {
|
||||||
|
workboxMode: "generateSW",
|
||||||
|
// or 'injectManifest'
|
||||||
|
injectPwaMetaTags: true,
|
||||||
|
swFilename: "sw.js",
|
||||||
|
manifestFilename: "manifest.json",
|
||||||
|
useCredentialsForManifestTag: false
|
||||||
|
// useFilenameHashes: true,
|
||||||
|
// extendGenerateSWOptions (cfg) {}
|
||||||
|
// extendInjectManifestOptions (cfg) {},
|
||||||
|
// extendManifestJson (json) {}
|
||||||
|
// extendPWACustomSWConf (esbuildConf) {}
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
|
||||||
|
cordova: {
|
||||||
|
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
|
||||||
|
capacitor: {
|
||||||
|
hideSplashscreen: true
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
|
||||||
|
electron: {
|
||||||
|
// extendElectronMainConf (esbuildConf)
|
||||||
|
// extendElectronPreloadConf (esbuildConf)
|
||||||
|
inspectPort: 5858,
|
||||||
|
bundler: "packager",
|
||||||
|
// 'packager' or 'builder'
|
||||||
|
packager: {
|
||||||
|
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
|
||||||
|
// OS X / Mac App Store
|
||||||
|
// appBundleId: '',
|
||||||
|
// appCategoryType: '',
|
||||||
|
// osxSign: '',
|
||||||
|
// protocol: 'myapp://path',
|
||||||
|
// Windows only
|
||||||
|
// win32metadata: { ... }
|
||||||
|
},
|
||||||
|
builder: {
|
||||||
|
// https://www.electron.build/configuration/configuration
|
||||||
|
appId: "salix-frontend"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
|
||||||
|
bex: {
|
||||||
|
contentScripts: ["my-content-script"]
|
||||||
|
// extendBexScriptsConf (esbuildConf) {}
|
||||||
|
// extendBexManifestJson (json) {}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
export {
|
||||||
|
quasar_config_default as default
|
||||||
|
};
|
|
@ -2,6 +2,7 @@
|
||||||
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();
|
||||||
|
@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<RouterView />
|
<RouterView />
|
||||||
|
<VnScroll/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -9,6 +9,30 @@ 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(),
|
||||||
|
@ -29,7 +53,7 @@ describe('Axios boot', () => {
|
||||||
'Accept-Language': 'en-US',
|
'Accept-Language': 'en-US',
|
||||||
Authorization: 'DEFAULT_TOKEN',
|
Authorization: 'DEFAULT_TOKEN',
|
||||||
},
|
},
|
||||||
})
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -43,7 +67,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
await 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 () => {
|
||||||
|
@ -59,7 +83,7 @@ describe('Axios boot', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = onResponseError(error);
|
const result = onResponseError(error);
|
||||||
expect(result).rejects.toEqual(expect.objectContaining(error));
|
await expect(result).rejects.toEqual(expect.objectContaining(error));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* eslint-disable eslint/export */
|
||||||
export * from './defaults/qTable';
|
export * from './defaults/qTable';
|
||||||
export * from './defaults/qInput';
|
export * from './defaults/qInput';
|
||||||
export * from './defaults/qSelect';
|
export * from './defaults/qSelect';
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
import { boot } from 'quasar/wrappers';
|
import { boot } from 'quasar/wrappers';
|
||||||
|
import { date as quasarDate } from 'quasar';
|
||||||
|
const { formatDate } = quasarDate;
|
||||||
|
|
||||||
export default boot(() => {
|
export default boot(() => {
|
||||||
Date.vnUTC = () => {
|
Date.vnUTC = () => {
|
||||||
|
@ -25,4 +27,34 @@ export default boot(() => {
|
||||||
const date = new Date(Date.vnUTC());
|
const date = new Date(Date.vnUTC());
|
||||||
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
return new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Date.getCurrentDateTimeFormatted = (
|
||||||
|
options = {
|
||||||
|
startOfDay: false,
|
||||||
|
endOfDay: true,
|
||||||
|
iso: true,
|
||||||
|
mask: 'DD-MM-YYYY HH:mm',
|
||||||
|
},
|
||||||
|
) => {
|
||||||
|
const date = Date.vnUTC();
|
||||||
|
if (options.startOfDay) {
|
||||||
|
date.setHours(0, 0, 0);
|
||||||
|
}
|
||||||
|
if (options.endOfDay) {
|
||||||
|
date.setHours(23, 59, 0);
|
||||||
|
}
|
||||||
|
if (options.iso) {
|
||||||
|
return date.toISOString();
|
||||||
|
}
|
||||||
|
return formatDate(date, options.mask);
|
||||||
|
};
|
||||||
|
|
||||||
|
Date.convertToISODateTime = (dateTimeStr) => {
|
||||||
|
const [datePart, timePart] = dateTimeStr.split(' ');
|
||||||
|
const [day, month, year] = datePart.split('-');
|
||||||
|
const [hours, minutes] = timePart.split(':');
|
||||||
|
|
||||||
|
const isoDate = new Date(year, month - 1, day, hours, minutes);
|
||||||
|
return isoDate.toISOString();
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -20,7 +20,6 @@ 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([]);
|
||||||
|
@ -33,11 +32,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);
|
||||||
|
@ -67,21 +66,11 @@ 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>
|
||||||
|
@ -107,7 +96,6 @@ async function filterTowns(name) {
|
||||||
<VnSelectDialog
|
<VnSelectDialog
|
||||||
:label="t('City')"
|
:label="t('City')"
|
||||||
@update:model-value="(value) => setTown(value, data)"
|
@update:model-value="(value) => setTown(value, data)"
|
||||||
@filter="filterTowns"
|
|
||||||
:tooltip="t('Create city')"
|
:tooltip="t('Create city')"
|
||||||
v-model="data.townFk"
|
v-model="data.townFk"
|
||||||
url="Towns/location"
|
url="Towns/location"
|
||||||
|
|
|
@ -65,7 +65,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
beforeSaveFn: {
|
beforeSaveFn: {
|
||||||
type: Function,
|
type: [String, Function],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
goTo: {
|
goTo: {
|
||||||
|
@ -332,6 +332,7 @@ watch(formUrl, async () => {
|
||||||
:disable="!selected?.length"
|
:disable="!selected?.length"
|
||||||
:title="t('globals.remove')"
|
:title="t('globals.remove')"
|
||||||
v-if="$props.defaultRemove"
|
v-if="$props.defaultRemove"
|
||||||
|
data-cy="crudModelDefaultRemoveBtn"
|
||||||
/>
|
/>
|
||||||
<QBtn
|
<QBtn
|
||||||
:label="tMobile('globals.reset')"
|
:label="tMobile('globals.reset')"
|
||||||
|
|
|
@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
|
||||||
img.onerror = () => {
|
img.onerror = () => {
|
||||||
notify(
|
notify(
|
||||||
t("This photo provider doesn't allow remote downloads"),
|
t("This photo provider doesn't allow remote downloads"),
|
||||||
'negative'
|
'negative',
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -219,11 +219,7 @@ const makeRequest = async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="rotateLeft()"
|
@click="rotateLeft()"
|
||||||
>
|
/>
|
||||||
<!-- <QTooltip class="no-pointer-events">
|
|
||||||
{{ t('Rotate left') }}
|
|
||||||
</QTooltip> -->
|
|
||||||
</QIcon>
|
|
||||||
<div>
|
<div>
|
||||||
<div ref="photoContainerRef" />
|
<div ref="photoContainerRef" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -233,11 +229,7 @@ const makeRequest = async () => {
|
||||||
color="primary"
|
color="primary"
|
||||||
class="cursor-pointer"
|
class="cursor-pointer"
|
||||||
@click="rotateRight()"
|
@click="rotateRight()"
|
||||||
>
|
/>
|
||||||
<!-- <QTooltip class="no-pointer-events">
|
|
||||||
{{ t('Rotate right') }}
|
|
||||||
</QTooltip> -->
|
|
||||||
</QIcon>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="column">
|
<div class="column">
|
||||||
|
@ -265,7 +257,6 @@ const makeRequest = async () => {
|
||||||
class="cursor-pointer q-mr-sm"
|
class="cursor-pointer q-mr-sm"
|
||||||
@click="openInputFile()"
|
@click="openInputFile()"
|
||||||
>
|
>
|
||||||
<!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
|
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon name="info" class="cursor-pointer">
|
<QIcon name="info" class="cursor-pointer">
|
||||||
<QTooltip>{{
|
<QTooltip>{{
|
||||||
|
|
|
@ -13,17 +13,15 @@ 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 } = useValidator();
|
const { validate, validations } = 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,
|
||||||
|
@ -100,8 +98,12 @@ const $props = defineProps({
|
||||||
type: Function,
|
type: Function,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
preventSubmit: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const emit = defineEmits(['onFetch', 'onDataSaved']);
|
const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
|
||||||
const modelValue = computed(
|
const modelValue = computed(
|
||||||
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
() => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
|
||||||
).value;
|
).value;
|
||||||
|
@ -119,7 +121,7 @@ const defaultButtons = computed(() => ({
|
||||||
color: 'primary',
|
color: 'primary',
|
||||||
icon: 'save',
|
icon: 'save',
|
||||||
label: 'globals.save',
|
label: 'globals.save',
|
||||||
click: async () => await save(),
|
click: async (evt) => submitForm(evt),
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
},
|
},
|
||||||
reset: {
|
reset: {
|
||||||
|
@ -132,6 +134,13 @@ 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));
|
||||||
|
|
||||||
|
@ -227,10 +236,9 @@ 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;
|
||||||
let response;
|
const response = await Promise.resolve(
|
||||||
|
$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');
|
||||||
|
|
||||||
|
@ -296,7 +304,7 @@ function onBeforeSave(formData, originalData) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
async function onKeyup(evt) {
|
async function onKeyup(evt) {
|
||||||
if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
|
if (evt.key === 'Enter' && !$props.preventSubmit) {
|
||||||
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;
|
||||||
|
@ -307,11 +315,13 @@ async function onKeyup(evt) {
|
||||||
selectionStart = selectionEnd = selectionStart + 1;
|
selectionStart = selectionEnd = selectionStart + 1;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await save();
|
await myForm.value.submit(evt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
submitForm,
|
||||||
|
myForm,
|
||||||
save,
|
save,
|
||||||
isLoading,
|
isLoading,
|
||||||
hasChanges,
|
hasChanges,
|
||||||
|
@ -323,9 +333,10 @@ 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
|
@submit.prevent="save"
|
||||||
@keyup.prevent="onKeyup"
|
@keyup.prevent="onKeyup"
|
||||||
@reset="reset"
|
@reset="reset"
|
||||||
class="q-pa-md"
|
class="q-pa-md"
|
||||||
|
@ -339,6 +350,7 @@ 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 />
|
||||||
|
@ -398,6 +410,7 @@ 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,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
|
||||||
emit('onDataSaved', formData, requestResponse);
|
emit('onDataSaved', formData, requestResponse);
|
||||||
};
|
};
|
||||||
|
|
||||||
const onClick = async (saveAndContinue) => {
|
const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
|
||||||
|
await formModelRef.value.myForm.validate(true);
|
||||||
isSaveAndContinue.value = saveAndContinue;
|
isSaveAndContinue.value = saveAndContinue;
|
||||||
await formModelRef.value.save();
|
if (formModelRef.value) {
|
||||||
|
await formModelRef.value.submitForm();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
@ -59,16 +62,23 @@ 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 }">
|
<template #form="{ data, validate, validations }">
|
||||||
<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 name="form-inputs" :data="data" :validate="validate" />
|
<slot
|
||||||
|
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')"
|
||||||
|
@ -87,12 +97,13 @@ defineExpose({
|
||||||
:flat="showSaveAndContinueBtn"
|
:flat="showSaveAndContinueBtn"
|
||||||
:label="t('globals.save')"
|
:label="t('globals.save')"
|
||||||
:title="t('globals.save')"
|
:title="t('globals.save')"
|
||||||
@click="onClick(false)"
|
:type="!showSaveAndContinueBtn ? 'submit' : 'button'"
|
||||||
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
|
||||||
|
@ -100,12 +111,13 @@ 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="loading-spinner"
|
data-cy="navBar-spinner"
|
||||||
/>
|
/>
|
||||||
<QSpace />
|
<QSpace />
|
||||||
<div id="searchbar" class="searchbar"></div>
|
<div id="searchbar" class="searchbar"></div>
|
||||||
|
|
|
@ -1,12 +1,22 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { toCurrency } from 'src/filters';
|
import { toCurrency } from 'src/filters';
|
||||||
|
import { getValueFromPath } from 'src/composables/getValueFromPath';
|
||||||
|
|
||||||
defineProps({ row: { type: Object, required: true } });
|
const { row, visibleProblems = null } = defineProps({
|
||||||
|
row: { type: Object, required: true },
|
||||||
|
visibleProblems: { type: Array },
|
||||||
|
});
|
||||||
|
|
||||||
|
function showProblem(problem) {
|
||||||
|
const val = getValueFromPath(row, problem);
|
||||||
|
if (!visibleProblems) return val;
|
||||||
|
return !!(visibleProblems?.includes(problem) && val);
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<span class="q-gutter-x-xs">
|
<span class="q-gutter-x-xs">
|
||||||
<router-link
|
<router-link
|
||||||
v-if="row.claim?.claimFk"
|
v-if="showProblem('claim.claimFk')"
|
||||||
:to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
|
:to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
|
||||||
class="link"
|
class="link"
|
||||||
>
|
>
|
||||||
|
@ -18,18 +28,7 @@ defineProps({ row: { type: Object, required: true } });
|
||||||
</QIcon>
|
</QIcon>
|
||||||
</router-link>
|
</router-link>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="row?.reserved"
|
v-if="showProblem('isDeleted')"
|
||||||
color="primary"
|
|
||||||
name="vn:reserva"
|
|
||||||
size="xs"
|
|
||||||
data-cy="ticketSaleReservedIcon"
|
|
||||||
>
|
|
||||||
<QTooltip>
|
|
||||||
{{ t('ticketSale.reserved') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
<QIcon
|
|
||||||
v-if="row?.isDeleted"
|
|
||||||
color="primary"
|
color="primary"
|
||||||
name="vn:deletedTicket"
|
name="vn:deletedTicket"
|
||||||
size="xs"
|
size="xs"
|
||||||
|
@ -40,7 +39,7 @@ defineProps({ row: { type: Object, required: true } });
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="row?.hasRisk"
|
v-if="showProblem('hasRisk')"
|
||||||
name="vn:risk"
|
name="vn:risk"
|
||||||
:color="row.hasHighRisk ? 'negative' : 'primary'"
|
:color="row.hasHighRisk ? 'negative' : 'primary'"
|
||||||
size="xs"
|
size="xs"
|
||||||
|
@ -51,51 +50,76 @@ defineProps({ row: { type: Object, required: true } });
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon
|
<QIcon
|
||||||
v-if="row?.hasComponentLack"
|
v-if="showProblem('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 v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
|
<QIcon
|
||||||
|
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 v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
|
<QIcon
|
||||||
|
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="row?.hasItemShortage"
|
v-if="showProblem('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 v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
|
<QIcon
|
||||||
|
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="row?.hasTicketRequest"
|
v-if="showProblem('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 v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
|
<QIcon
|
||||||
|
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="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
|
<QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
|
||||||
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
|
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
|
||||||
</QIcon>
|
</QIcon>
|
||||||
<QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
|
<QIcon
|
||||||
|
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>
|
||||||
|
|
|
@ -55,6 +55,8 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const label = $props.showLabel && $props.column.label ? $props.column.label : '';
|
||||||
|
|
||||||
const defaultSelect = {
|
const defaultSelect = {
|
||||||
attrs: {
|
attrs: {
|
||||||
row: $props.row,
|
row: $props.row,
|
||||||
|
@ -62,7 +64,7 @@ const defaultSelect = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -74,7 +76,7 @@ const defaultComponents = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
number: {
|
number: {
|
||||||
|
@ -84,7 +86,7 @@ const defaultComponents = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
date: {
|
date: {
|
||||||
|
@ -96,7 +98,7 @@ const defaultComponents = {
|
||||||
class: 'fit',
|
class: 'fit',
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
time: {
|
time: {
|
||||||
|
@ -105,7 +107,7 @@ const defaultComponents = {
|
||||||
disable: !$props.isEditable,
|
disable: !$props.isEditable,
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
checkbox: {
|
checkbox: {
|
||||||
|
@ -125,7 +127,7 @@ const defaultComponents = {
|
||||||
return defaultAttrs;
|
return defaultAttrs;
|
||||||
},
|
},
|
||||||
forceAttrs: {
|
forceAttrs: {
|
||||||
label: $props.showLabel && $props.column.label,
|
label,
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
},
|
},
|
||||||
events: {
|
events: {
|
||||||
|
|
|
@ -16,7 +16,7 @@ const $props = defineProps({
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: 'table',
|
default: 'table',
|
||||||
},
|
},
|
||||||
vertical: {
|
vertical: {
|
||||||
|
@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
|
||||||
:style="textAlignToFlex(align)"
|
:style="textAlignToFlex(align)"
|
||||||
>
|
>
|
||||||
<span :title="label">{{ label }}</span>
|
<span :title="label">{{ label }}</span>
|
||||||
<div v-if="name && model?.index">
|
<div v-if="name && (model?.index || vertical)">
|
||||||
<QChip
|
<QChip
|
||||||
:label="!vertical ? model?.index : ''"
|
:label="!vertical ? model?.index : ''"
|
||||||
:icon="
|
:icon="
|
||||||
|
@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
|
||||||
:size="vertical ? '' : 'sm'"
|
:size="vertical ? '' : 'sm'"
|
||||||
:class="[
|
:class="[
|
||||||
model?.index ? 'color-vn-text' : 'bg-transparent',
|
model?.index ? 'color-vn-text' : 'bg-transparent',
|
||||||
vertical ? 'q-px-none' : '',
|
vertical ? 'q-mx-none q-py-lg' : '',
|
||||||
]"
|
]"
|
||||||
class="no-box-shadow"
|
class="no-box-shadow"
|
||||||
:clickable="true"
|
:clickable="true"
|
||||||
style="min-width: 40px; max-height: 30px"
|
style="min-width: 40px; max-height: 30px"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="column flex-center"
|
class="column justify-center text-center"
|
||||||
v-if="vertical"
|
v-if="vertical"
|
||||||
:style="!model?.index && 'color: #5d5d5d'"
|
:style="!model?.index && 'color: #5d5d5d'"
|
||||||
>
|
>
|
||||||
|
|
|
@ -19,6 +19,7 @@ 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';
|
||||||
|
@ -32,6 +33,7 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
|
||||||
import VnTableFilter from './VnTableFilter.vue';
|
import VnTableFilter from './VnTableFilter.vue';
|
||||||
import { getColAlign } from 'src/composables/getColAlign';
|
import { getColAlign } from 'src/composables/getColAlign';
|
||||||
import RightMenu from '../common/RightMenu.vue';
|
import RightMenu from '../common/RightMenu.vue';
|
||||||
|
import VnScroll from '../common/VnScroll.vue'
|
||||||
|
|
||||||
const arrayData = useArrayData(useAttrs()['data-key']);
|
const arrayData = useArrayData(useAttrs()['data-key']);
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -64,7 +66,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
create: {
|
create: {
|
||||||
type: Object,
|
type: [Boolean, Object],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
createAsDialog: {
|
createAsDialog: {
|
||||||
|
@ -117,7 +119,7 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
tableHeight: {
|
tableHeight: {
|
||||||
type: String,
|
type: String,
|
||||||
default: '90vh',
|
default: undefined,
|
||||||
},
|
},
|
||||||
footer: {
|
footer: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
@ -166,6 +168,8 @@ 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);
|
||||||
|
@ -187,6 +191,17 @@ 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;
|
||||||
|
@ -227,6 +242,7 @@ watch(
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
create: createForm,
|
create: createForm,
|
||||||
|
showForm,
|
||||||
reload,
|
reload,
|
||||||
redirect: redirectFn,
|
redirect: redirectFn,
|
||||||
selected,
|
selected,
|
||||||
|
@ -324,16 +340,13 @@ 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;
|
||||||
|
@ -666,9 +679,9 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
ref="tableRef"
|
ref="tableRef"
|
||||||
v-bind="table"
|
v-bind="table"
|
||||||
:class="[
|
:class="[
|
||||||
'vnTable',
|
'vnTable',
|
||||||
table ? 'selection-cell' : '',
|
table ? 'selection-cell' : '',
|
||||||
$props.footer ? 'last-row-sticky' : '',
|
$props.footer ? 'last-row-sticky' : '',
|
||||||
]"
|
]"
|
||||||
wrap-cells
|
wrap-cells
|
||||||
:columns="splittedColumns.columns"
|
:columns="splittedColumns.columns"
|
||||||
|
@ -678,9 +691,9 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
table-header-class="bg-header"
|
table-header-class="bg-header"
|
||||||
card-container-class="grid-three"
|
card-container-class="grid-three"
|
||||||
flat
|
flat
|
||||||
:style="isTableMode && `max-height: ${tableHeight}`"
|
:style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
|
||||||
:virtual-scroll="isTableMode"
|
:virtual-scroll="isTableMode"
|
||||||
@virtual-scroll="handleScroll"
|
@virtual-scroll="onVirtualScroll"
|
||||||
@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)"
|
||||||
|
@ -738,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
withFilters
|
withFilters
|
||||||
"
|
"
|
||||||
:column="col"
|
:column="col"
|
||||||
|
:data-cy="`column-filter-${col.name}`"
|
||||||
:show-title="true"
|
:show-title="true"
|
||||||
:data-key="$attrs['data-key']"
|
:data-key="$attrs['data-key']"
|
||||||
v-model="params[columnName(col)]"
|
v-model="params[columnName(col)]"
|
||||||
|
@ -1042,7 +1056,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:model="$attrs['data-key'] + 'Create'"
|
:model="$attrs['data-key'] + 'Create'"
|
||||||
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
|
@on-data-saved="(_, res) => createForm.onDataSaved(res)"
|
||||||
>
|
>
|
||||||
<template #form-inputs="{ data }">
|
<template #form-inputs="{ data, validations }">
|
||||||
<slot name="alter-create" :data="data">
|
<slot name="alter-create" :data="data">
|
||||||
<div :style="createComplement?.containerStyle">
|
<div :style="createComplement?.containerStyle">
|
||||||
<div
|
<div
|
||||||
|
@ -1060,6 +1074,7 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
:key="column.name"
|
:key="column.name"
|
||||||
:name="`column-create-${column.name}`"
|
:name="`column-create-${column.name}`"
|
||||||
:data="data"
|
:data="data"
|
||||||
|
:validations="validations"
|
||||||
:column-name="column.name"
|
:column-name="column.name"
|
||||||
:label="column.label"
|
:label="column.label"
|
||||||
>
|
>
|
||||||
|
@ -1083,6 +1098,11 @@ const rowCtrlClickFunction = computed(() => {
|
||||||
</template>
|
</template>
|
||||||
</FormModelPopup>
|
</FormModelPopup>
|
||||||
</QDialog>
|
</QDialog>
|
||||||
|
<VnScroll
|
||||||
|
ref="vnScrollRef"
|
||||||
|
v-if="isTableMode"
|
||||||
|
:scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
en:
|
||||||
|
|
|
@ -26,7 +26,13 @@ function columnName(col) {
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
|
<VnFilterPanel
|
||||||
|
v-bind="$attrs"
|
||||||
|
:search-button="true"
|
||||||
|
:disable-submit-event="true"
|
||||||
|
:data-key="$attrs['data-key']"
|
||||||
|
:search-url
|
||||||
|
>
|
||||||
<template #body="{ params, orders, searchFn }">
|
<template #body="{ params, orders, searchFn }">
|
||||||
<div
|
<div
|
||||||
class="container"
|
class="container"
|
||||||
|
@ -34,13 +40,20 @@ function columnName(col) {
|
||||||
:key="col.id"
|
:key="col.id"
|
||||||
>
|
>
|
||||||
<div class="filter">
|
<div class="filter">
|
||||||
<VnFilter
|
<slot
|
||||||
ref="tableFilterRef"
|
:name="`filter-${col.name}`"
|
||||||
:column="col"
|
:params="params"
|
||||||
:data-key="$attrs['data-key']"
|
:column-name="columnName(col)"
|
||||||
v-model="params[columnName(col)]"
|
:search-fn
|
||||||
:search-url="searchUrl"
|
>
|
||||||
/>
|
<VnFilter
|
||||||
|
ref="tableFilterRef"
|
||||||
|
:column="col"
|
||||||
|
:data-key="$attrs['data-key']"
|
||||||
|
v-model="params[columnName(col)]"
|
||||||
|
:search-url="searchUrl"
|
||||||
|
/>
|
||||||
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="order">
|
<div class="order">
|
||||||
<VnTableOrder
|
<VnTableOrder
|
||||||
|
@ -77,13 +90,13 @@ function columnName(col) {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 45px;
|
min-height: 45px;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter {
|
.filter {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
height: 40px;
|
min-height: 40px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.order {
|
.order {
|
||||||
|
|
|
@ -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,6 +11,9 @@ describe('VnTable', () => {
|
||||||
propsData: {
|
propsData: {
|
||||||
columns: [],
|
columns: [],
|
||||||
},
|
},
|
||||||
|
attrs: {
|
||||||
|
'data-key': 'test',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
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 { axios } from 'app/test/vitest/helper';
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
describe('VnVisibleColumns', () => {
|
describe('VnVisibleColumns', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let vm;
|
let vm;
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
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,4 +1,6 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } 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';
|
||||||
|
|
||||||
|
@ -9,13 +11,7 @@ describe('CrudModel', () => {
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
wrapper = createWrapper(CrudModel, {
|
wrapper = createWrapper(CrudModel, {
|
||||||
global: {
|
global: {
|
||||||
stubs: [
|
stubs: ['vnPaginate', 'vue-i18n'],
|
||||||
'vnPaginate',
|
|
||||||
'useState',
|
|
||||||
'arrayData',
|
|
||||||
'useStateStore',
|
|
||||||
'vue-i18n',
|
|
||||||
],
|
|
||||||
mocks: {
|
mocks: {
|
||||||
validate: vi.fn(),
|
validate: vi.fn(),
|
||||||
},
|
},
|
||||||
|
@ -27,7 +23,7 @@ describe('CrudModel', () => {
|
||||||
dataKey: 'crudModelKey',
|
dataKey: 'crudModelKey',
|
||||||
model: 'crudModel',
|
model: 'crudModel',
|
||||||
url: 'crudModelUrl',
|
url: 'crudModelUrl',
|
||||||
saveFn: '',
|
saveFn: vi.fn(),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
|
@ -229,7 +225,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: '' });
|
await wrapper.setProps({ saveFn: null });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should use default url if there's not saveFn", async () => {
|
it("should use default url if there's not saveFn", async () => {
|
||||||
|
|
|
@ -1,56 +0,0 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
|
||||||
import EditForm from 'components/EditTableCellValueForm.vue';
|
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
|
||||||
|
|
||||||
const fieldA = 'fieldA';
|
|
||||||
const fieldB = 'fieldB';
|
|
||||||
|
|
||||||
describe('EditForm', () => {
|
|
||||||
let vm;
|
|
||||||
const mockRows = [
|
|
||||||
{ id: 1, itemFk: 101 },
|
|
||||||
{ id: 2, itemFk: 102 },
|
|
||||||
];
|
|
||||||
const mockFieldsOptions = [
|
|
||||||
{ label: 'Field A', field: fieldA, component: 'input', attrs: {} },
|
|
||||||
{ label: 'Field B', field: fieldB, component: 'date', attrs: {} },
|
|
||||||
];
|
|
||||||
const editUrl = '/api/edit';
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
|
|
||||||
vm = createWrapper(EditForm, {
|
|
||||||
props: {
|
|
||||||
rows: mockRows,
|
|
||||||
fieldsOptions: mockFieldsOptions,
|
|
||||||
editUrl,
|
|
||||||
},
|
|
||||||
}).vm;
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('onSubmit()', () => {
|
|
||||||
it('should call axios.post with the correct parameters in the payload', async () => {
|
|
||||||
const selectedField = { field: fieldA, component: 'input', attrs: {} };
|
|
||||||
const newValue = 'Test Value';
|
|
||||||
|
|
||||||
vm.selectedField = selectedField;
|
|
||||||
vm.newValue = newValue;
|
|
||||||
|
|
||||||
await vm.onSubmit();
|
|
||||||
|
|
||||||
const payload = axios.post.mock.calls[0][1];
|
|
||||||
|
|
||||||
expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
|
|
||||||
expect(payload.field).toEqual(fieldA);
|
|
||||||
expect(payload.newValue).toEqual(newValue);
|
|
||||||
|
|
||||||
expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
|
|
||||||
|
|
||||||
expect(vm.isLoading).toEqual(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
|
@ -1,4 +1,6 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } 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';
|
||||||
|
|
||||||
|
@ -38,7 +40,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,5 +1,7 @@
|
||||||
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } 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,6 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { default as axios } from 'axios';
|
||||||
import Leftmenu from 'components/LeftMenu.vue';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
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';
|
||||||
|
|
||||||
|
@ -101,7 +102,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,
|
||||||
},
|
},
|
||||||
|
@ -164,16 +165,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', async () => {
|
it('should get routes for card source', () => {
|
||||||
vm.getRoutes();
|
vm.getRoutes();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
describe('Leftmenu as main', () => {
|
describe('LeftMenu as main', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
vm = mount().vm;
|
vm = mount().vm;
|
||||||
});
|
});
|
||||||
|
@ -250,7 +251,6 @@ 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,65 +1,63 @@
|
||||||
import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import UserPanel from 'src/components/UserPanel.vue';
|
import UserPanel from 'src/components/UserPanel.vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useState } from 'src/composables/useState';
|
import { useState } from 'src/composables/useState';
|
||||||
|
|
||||||
vi.mock('src/utils/quasarLang', () => ({
|
|
||||||
default: vi.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
describe('UserPanel', () => {
|
describe('UserPanel', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let vm;
|
let vm;
|
||||||
let state;
|
let state;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
wrapper = createWrapper(UserPanel, {});
|
wrapper = createWrapper(UserPanel, {});
|
||||||
state = useState();
|
state = useState();
|
||||||
state.setUser({
|
state.setUser({
|
||||||
id: 115,
|
id: 115,
|
||||||
name: 'itmanagement',
|
name: 'itmanagement',
|
||||||
nickname: 'itManagementNick',
|
nickname: 'itManagementNick',
|
||||||
lang: 'en',
|
lang: 'en',
|
||||||
darkMode: false,
|
darkMode: false,
|
||||||
companyFk: 442,
|
companyFk: 442,
|
||||||
warehouseFk: 1,
|
warehouseFk: 1,
|
||||||
|
});
|
||||||
|
wrapper = wrapper.wrapper;
|
||||||
|
vm = wrapper.vm;
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
|
||||||
vm = wrapper.vm;
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
vi.clearAllMocks();
|
vi.clearAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch warehouses data on mounted', async () => {
|
it('should fetch warehouses data on mounted', async () => {
|
||||||
const fetchData = wrapper.findComponent({ name: 'FetchData' });
|
const fetchData = wrapper.findComponent({ name: 'FetchData' });
|
||||||
expect(fetchData.props('url')).toBe('Warehouses');
|
expect(fetchData.props('url')).toBe('Warehouses');
|
||||||
expect(fetchData.props('autoLoad')).toBe(true);
|
expect(fetchData.props('autoLoad')).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should toggle dark mode correctly and update preferences', async () => {
|
it('should toggle dark mode correctly and update preferences', async () => {
|
||||||
await vm.saveDarkMode(true);
|
await vm.saveDarkMode(true);
|
||||||
expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
|
expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
|
||||||
expect(vm.user.darkMode).toBe(true);
|
expect(vm.user.darkMode).toBe(true);
|
||||||
await vm.updatePreferences();
|
vm.updatePreferences();
|
||||||
expect(vm.darkMode).toBe(true);
|
expect(vm.darkMode).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should change user language and update preferences', async () => {
|
it('should change user language and update preferences', async () => {
|
||||||
const userLanguage = 'es';
|
const userLanguage = 'es';
|
||||||
await vm.saveLanguage(userLanguage);
|
await vm.saveLanguage(userLanguage);
|
||||||
expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
|
expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
|
||||||
expect(vm.user.lang).toBe(userLanguage);
|
expect(vm.user.lang).toBe(userLanguage);
|
||||||
await vm.updatePreferences();
|
vm.updatePreferences();
|
||||||
expect(vm.locale).toBe(userLanguage);
|
expect(vm.locale).toBe(userLanguage);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should update user data', async () => {
|
it('should update user data', async () => {
|
||||||
const key = 'name';
|
const key = 'name';
|
||||||
const value = 'itboss';
|
const value = 'itboss';
|
||||||
await vm.saveUserData(key, value);
|
await vm.saveUserData(key, value);
|
||||||
expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
|
expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
|
||||||
});
|
[key]: value,
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
|
@ -60,7 +60,7 @@ async function confirm() {
|
||||||
v-model="address"
|
v-model="address"
|
||||||
is-outlined
|
is-outlined
|
||||||
autofocus
|
autofocus
|
||||||
data-cy="SendEmailNotifiactionDialogInput"
|
data-cy="SendEmailNotificationDialogInput"
|
||||||
/>
|
/>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardActions align="right">
|
<QCardActions align="right">
|
||||||
|
|
|
@ -1,35 +1,15 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { nextTick, ref } from 'vue';
|
|
||||||
import VnInput from './VnInput.vue';
|
import VnInput from './VnInput.vue';
|
||||||
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
|
||||||
|
|
||||||
const $props = defineProps({
|
|
||||||
insertable: {
|
|
||||||
type: Boolean,
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
|
|
||||||
const model = defineModel({ prop: 'modelValue' });
|
const model = defineModel({ prop: 'modelValue' });
|
||||||
const inputRef = ref(false);
|
|
||||||
|
|
||||||
function setCursorPosition(pos) {
|
|
||||||
const input = inputRef.value.vnInputRef.$el.querySelector('input');
|
|
||||||
input.focus();
|
|
||||||
input.setSelectionRange(pos, pos);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleUpdateModel(val) {
|
|
||||||
model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
|
|
||||||
await nextTick(() => setCursorPosition(0));
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnInput
|
<VnInput
|
||||||
v-model="model"
|
v-model="model"
|
||||||
ref="inputRef"
|
ref="inputRef"
|
||||||
:insertable
|
@keydown.tab="$refs.inputRef.vnInputRef.blur()"
|
||||||
@update:model-value="handleUpdateModel"
|
@blur="model = useAccountShortToStandard(model) ?? model"
|
||||||
|
@input="model = $event.target.value.replace(/[^\d.]/g, '')"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeMount, computed } from 'vue';
|
import { onBeforeMount, computed, markRaw } from 'vue';
|
||||||
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
|
||||||
import { useArrayData } from 'src/composables/useArrayData';
|
import { useArrayData } from 'src/composables/useArrayData';
|
||||||
import { useStateStore } from 'stores/useStateStore';
|
import { useStateStore } from 'stores/useStateStore';
|
||||||
|
@ -26,18 +26,14 @@ const route = useRoute();
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const entityId = computed(() => props.id || route?.params?.id);
|
const entityId = computed(() => props.id || route?.params?.id);
|
||||||
const arrayData = useArrayData(props.dataKey, {
|
let arrayData = getArrayData(entityId.value, props.url);
|
||||||
url: props.url,
|
|
||||||
userFilter: props.filter,
|
|
||||||
oneRecord: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
onBeforeRouteLeave(() => {
|
onBeforeRouteLeave(() => {
|
||||||
stateStore.cardDescriptorChangeValue(null);
|
stateStore.cardDescriptorChangeValue(null);
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
stateStore.cardDescriptorChangeValue(props.descriptor);
|
stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
|
||||||
|
|
||||||
const route = router.currentRoute.value;
|
const route = router.currentRoute.value;
|
||||||
try {
|
try {
|
||||||
|
@ -61,16 +57,31 @@ onBeforeRouteUpdate(async (to, from) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
async function fetch(id, append = false) {
|
async function fetch(id, append = false) {
|
||||||
const regex = /\/(\d+)/;
|
|
||||||
if (props.idInWhere) arrayData.store.filter.where = { id };
|
if (props.idInWhere) arrayData.store.filter.where = { id };
|
||||||
else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
|
else {
|
||||||
else arrayData.store.url = props.url.replace(regex, `/${id}`);
|
arrayData = getArrayData(id);
|
||||||
|
}
|
||||||
await arrayData.fetch({ append, updateRouter: false });
|
await arrayData.fetch({ append, updateRouter: false });
|
||||||
emit('onFetch', arrayData.store.data);
|
emit('onFetch', arrayData.store.data);
|
||||||
}
|
}
|
||||||
function hasRouteParam(params, valueToCheck = ':addressId') {
|
function hasRouteParam(params, valueToCheck = ':addressId') {
|
||||||
return Object.values(params).includes(valueToCheck);
|
return Object.values(params).includes(valueToCheck);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatUrl(id) {
|
||||||
|
const newId = id || entityId.value;
|
||||||
|
const regex = /\/(\d+)/;
|
||||||
|
if (!regex.test(props.url)) return `${props.url}/${newId}`;
|
||||||
|
return props.url.replace(regex, `/${newId}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getArrayData(id, url) {
|
||||||
|
return useArrayData(props.dataKey, {
|
||||||
|
url: url ?? formatUrl(id),
|
||||||
|
userFilter: props.filter,
|
||||||
|
oneRecord: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<template v-if="visual">
|
<template v-if="visual">
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { computed } from 'vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
colors: {
|
colors: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -6,9 +8,9 @@ const $props = defineProps({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const colorArray = JSON.parse($props.colors)?.value;
|
const colorArray = computed(() => JSON.parse($props.colors)?.value);
|
||||||
const maxHeight = 30;
|
const maxHeight = 30;
|
||||||
const colorHeight = maxHeight / colorArray?.length;
|
const colorHeight = maxHeight / colorArray.value?.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], required: true });
|
const model = defineModel({ type: [String, Number], default: '' });
|
||||||
</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,6 +4,7 @@ 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';
|
||||||
|
@ -12,6 +13,7 @@ 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({
|
||||||
|
@ -61,8 +63,11 @@ function onFileChange(files) {
|
||||||
|
|
||||||
function mapperDms(data) {
|
function mapperDms(data) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
const { files } = data;
|
let files = data.files;
|
||||||
if (files) formData.append(files?.name, files);
|
if (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,
|
||||||
|
@ -83,11 +88,16 @@ function getUrl() {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
const body = mapperDms(dms.value);
|
try {
|
||||||
const response = await axios.post(getUrl(), body[0], body[1]);
|
const body = mapperDms(dms.value);
|
||||||
emit('onDataSaved', body[1].params, response);
|
const response = await axios.post(getUrl(), body[0], body[1]);
|
||||||
delete dms.value.files;
|
emit('onDataSaved', body[1].params, response);
|
||||||
return response;
|
notify(t('globals.dataSaved'), 'positive');
|
||||||
|
delete dms.value.files;
|
||||||
|
return response;
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultData() {
|
function defaultData() {
|
||||||
|
|
|
@ -13,10 +13,12 @@ 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({});
|
||||||
|
@ -88,7 +90,6 @@ const dmsFilter = {
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
where: { [$props.filter]: route.params.id },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const columns = computed(() => [
|
const columns = computed(() => [
|
||||||
|
@ -258,9 +259,16 @@ function deleteDms(dmsFk) {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.onOk(async () => {
|
.onOk(async () => {
|
||||||
await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
|
try {
|
||||||
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
await axios.post(
|
||||||
rows.value.splice(index, 1);
|
`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
|
||||||
|
);
|
||||||
|
const index = rows.value.findIndex((row) => row.id == dmsFk);
|
||||||
|
rows.value.splice(index, 1);
|
||||||
|
notify(t('globals.dataDeleted'), 'positive');
|
||||||
|
} catch (e) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -298,7 +306,9 @@ 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"
|
||||||
>
|
>
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
<script setup>
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
import VnInput from 'src/components/common/VnInput.vue';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
const model = defineModel({ type: [Number, String] });
|
||||||
|
const emit = defineEmits(['updateBic']);
|
||||||
|
|
||||||
|
const getIbanCountry = (bank) => {
|
||||||
|
return bank.substr(0, 2);
|
||||||
|
};
|
||||||
|
|
||||||
|
const autofillBic = async (iban) => {
|
||||||
|
if (!iban) return;
|
||||||
|
|
||||||
|
const bankEntityId = parseInt(iban.substr(4, 4));
|
||||||
|
const ibanCountry = getIbanCountry(iban);
|
||||||
|
|
||||||
|
if (ibanCountry != 'ES') return;
|
||||||
|
|
||||||
|
const filter = { where: { id: bankEntityId } };
|
||||||
|
const params = { filter: JSON.stringify(filter) };
|
||||||
|
|
||||||
|
const { data } = await axios.get(`BankEntities`, { params });
|
||||||
|
|
||||||
|
emit('updateBic', data[0]?.id);
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
<template>
|
||||||
|
<VnInput
|
||||||
|
:label="t('IBAN')"
|
||||||
|
clearable
|
||||||
|
v-model="model"
|
||||||
|
@update:model-value="autofillBic($event)"
|
||||||
|
>
|
||||||
|
<template #append>
|
||||||
|
<QIcon name="info" class="cursor-info">
|
||||||
|
<QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
</VnInput>
|
||||||
|
</template>
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { onMounted, watch, computed, ref, useAttrs } from 'vue';
|
import { nextTick, watch, computed, ref, useAttrs } from 'vue';
|
||||||
import { date } from 'quasar';
|
import { date, getCssVar } 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,61 +20,18 @@ 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
|
||||||
|
@ -86,28 +43,139 @@ const styleAttrs = computed(() => {
|
||||||
: {};
|
: {};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const inputValue = ref('');
|
||||||
|
|
||||||
|
const validateAndCleanInput = (value) => {
|
||||||
|
inputValue.value = value.replace(/[^0-9./-]/g, '');
|
||||||
|
};
|
||||||
|
|
||||||
const manageDate = (date) => {
|
const manageDate = (date) => {
|
||||||
formattedDate.value = date;
|
inputValue.value = date.split('/').reverse().join('/');
|
||||||
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">
|
||||||
|
{{ console.log($q) }}
|
||||||
<QInput
|
<QInput
|
||||||
ref="vnInputDateRef"
|
ref="vnInputDateRef"
|
||||||
v-model="formattedDate"
|
v-model="inputValue"
|
||||||
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
|
||||||
|
@ -116,11 +184,12 @@ const manageDate = (date) => {
|
||||||
v-if="
|
v-if="
|
||||||
($attrs.clearable == undefined || $attrs.clearable) &&
|
($attrs.clearable == undefined || $attrs.clearable) &&
|
||||||
hover &&
|
hover &&
|
||||||
model &&
|
inputValue &&
|
||||||
!$attrs.disable
|
!$attrs.disable
|
||||||
"
|
"
|
||||||
@click="
|
@click="
|
||||||
vnInputDateRef.focus();
|
vnInputDateRef.focus();
|
||||||
|
inputValue = null;
|
||||||
model = null;
|
model = null;
|
||||||
isPopupOpen = false;
|
isPopupOpen = false;
|
||||||
"
|
"
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
<script setup>
|
||||||
|
import { computed, useAttrs } from 'vue';
|
||||||
|
import { date } from 'quasar';
|
||||||
|
import VnDate from './VnDate.vue';
|
||||||
|
import VnTime from './VnTime.vue';
|
||||||
|
|
||||||
|
const $attrs = useAttrs();
|
||||||
|
const model = defineModel({ type: [Date, String] });
|
||||||
|
|
||||||
|
const $props = defineProps({
|
||||||
|
isOutlined: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
showEvent: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const styleAttrs = computed(() => {
|
||||||
|
return $props.isOutlined
|
||||||
|
? {
|
||||||
|
dense: true,
|
||||||
|
outlined: true,
|
||||||
|
rounded: true,
|
||||||
|
}
|
||||||
|
: {};
|
||||||
|
});
|
||||||
|
const mask = 'DD-MM-YYYY HH:mm';
|
||||||
|
const selectedDate = computed({
|
||||||
|
get() {
|
||||||
|
if (!model.value) return JSON.stringify(new Date(model.value));
|
||||||
|
return date.formatDate(new Date(model.value), mask);
|
||||||
|
},
|
||||||
|
set(value) {
|
||||||
|
model.value = Date.convertToISODateTime(value);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const manageDate = (date) => {
|
||||||
|
selectedDate.value = date;
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div @mouseover="hover = true" @mouseleave="hover = false">
|
||||||
|
<QInput
|
||||||
|
ref="vnInputDateRef"
|
||||||
|
v-model="selectedDate"
|
||||||
|
class="vn-input-date"
|
||||||
|
placeholder="dd/mm/aaaa HH:mm"
|
||||||
|
v-bind="{ ...$attrs, ...styleAttrs }"
|
||||||
|
:clearable="false"
|
||||||
|
@click="isPopupOpen = !isPopupOpen"
|
||||||
|
@keydown="isPopupOpen = false"
|
||||||
|
hide-bottom-space
|
||||||
|
@update:model-value="manageDate"
|
||||||
|
:data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
|
||||||
|
>
|
||||||
|
<template #prepend>
|
||||||
|
<QIcon name="today" size="xs">
|
||||||
|
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
||||||
|
<VnDate :mask="mask" v-model="selectedDate" />
|
||||||
|
</QPopupProxy>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
<template #append>
|
||||||
|
<QIcon name="access_time" size="xs">
|
||||||
|
<QPopupProxy cover transition-show="scale" transition-hide="scale">
|
||||||
|
<VnTime format24h :mask="mask" v-model="selectedDate" />
|
||||||
|
</QPopupProxy>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
</QInput>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<i18n>
|
||||||
|
es:
|
||||||
|
Open date: Abrir fecha
|
||||||
|
</i18n>
|
|
@ -1,6 +1,6 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { watch } from 'vue';
|
import { watch } from 'vue';
|
||||||
import { toDateString } from 'src/filters';
|
import { toDateHourMinSec } from 'src/filters';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
value: { type: [String, Number, Boolean, Object], default: undefined },
|
value: { type: [String, Number, Boolean, Object], default: undefined },
|
||||||
|
@ -40,7 +40,7 @@ const updateValue = () => {
|
||||||
break;
|
break;
|
||||||
case 'object':
|
case 'object':
|
||||||
if (props.value instanceof Date) {
|
if (props.value instanceof Date) {
|
||||||
t = toDateString(props.value);
|
t = toDateHourMinSec(props.value);
|
||||||
} else {
|
} else {
|
||||||
t = props.value.toString();
|
t = props.value.toString();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onUnmounted, watch } from 'vue';
|
import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
@ -11,11 +11,11 @@ import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
import { useValidator } from 'src/composables/useValidator';
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
import VnAvatar from '../ui/VnAvatar.vue';
|
import VnAvatar from '../ui/VnAvatar.vue';
|
||||||
import VnLogValue from './VnLogValue.vue';
|
import VnLogValue from './VnLogValue.vue';
|
||||||
import FetchData from '../FetchData.vue';
|
|
||||||
import VnSelect from './VnSelect.vue';
|
|
||||||
import VnUserLink from '../ui/VnUserLink.vue';
|
import VnUserLink from '../ui/VnUserLink.vue';
|
||||||
import VnPaginate from '../ui/VnPaginate.vue';
|
import VnPaginate from '../ui/VnPaginate.vue';
|
||||||
|
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||||
import RightMenu from './RightMenu.vue';
|
import RightMenu from './RightMenu.vue';
|
||||||
|
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
|
|
||||||
const stateStore = useStateStore();
|
const stateStore = useStateStore();
|
||||||
const validationsStore = useValidator();
|
const validationsStore = useValidator();
|
||||||
|
@ -68,43 +68,11 @@ const filter = {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
where: { and: [{ originFk: route.params.id }] },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const paginate = ref();
|
const paginate = ref();
|
||||||
const actions = ref();
|
const dataKey = computed(() => `${props.model}Log`);
|
||||||
const changeInput = ref();
|
const userParams = ref(useFilterParams(dataKey.value).params);
|
||||||
const searchInput = ref();
|
|
||||||
const userRadio = ref();
|
|
||||||
const userSelect = ref();
|
|
||||||
const dateFrom = ref();
|
|
||||||
const dateFromDialog = ref(false);
|
|
||||||
const dateTo = ref();
|
|
||||||
const dateToDialog = ref(false);
|
|
||||||
const selectedFilters = ref({});
|
|
||||||
const userTypes = [
|
|
||||||
{ label: 'All', value: undefined },
|
|
||||||
{ label: 'User', value: { neq: null } },
|
|
||||||
{ label: 'System', value: null },
|
|
||||||
];
|
|
||||||
const checkboxOptions = ref({
|
|
||||||
insert: {
|
|
||||||
label: 'Creates',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
update: {
|
|
||||||
label: 'Edits',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
delete: {
|
|
||||||
label: 'Deletes',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
select: {
|
|
||||||
label: 'Accesses',
|
|
||||||
selected: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
let validations = models;
|
let validations = models;
|
||||||
let pointRecord = ref(null);
|
let pointRecord = ref(null);
|
||||||
|
@ -246,169 +214,73 @@ async function setLogTree(data) {
|
||||||
function filterByRecord(modelLog) {
|
function filterByRecord(modelLog) {
|
||||||
byRecord.value = true;
|
byRecord.value = true;
|
||||||
const { id, model } = modelLog;
|
const { id, model } = modelLog;
|
||||||
|
applyFilter({ changedModelId: id, changedModel: model });
|
||||||
searchInput.value = id;
|
|
||||||
selectedFilters.value.changedModelId = id;
|
|
||||||
selectedFilters.value.changedModel = model;
|
|
||||||
applyFilter();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function applyFilter() {
|
async function applyFilter(params = {}) {
|
||||||
filter.where = { and: [] };
|
paginate.value.arrayData.resetPagination();
|
||||||
if (
|
paginate.value.arrayData.applyFilter({
|
||||||
!selectedFilters.value.changedModel ||
|
filter: {},
|
||||||
(!selectedFilters.value.changedModelValue &&
|
params: { originFk: route.params.id, ...params },
|
||||||
!selectedFilters.value.changedModelId)
|
});
|
||||||
)
|
|
||||||
byRecord.value = false;
|
|
||||||
|
|
||||||
if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
|
|
||||||
|
|
||||||
if (Object.keys(selectedFilters.value).length) {
|
|
||||||
filter.where.and.push(selectedFilters.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
paginate.value.fetch({ filter });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function setDate(type) {
|
function exprBuilder(param, value) {
|
||||||
let from = dateFrom.value
|
switch (param) {
|
||||||
? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
case 'changedModelValue':
|
||||||
: undefined;
|
return { [param]: { like: `%${value}%` } };
|
||||||
from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
|
case 'change':
|
||||||
|
if (value)
|
||||||
let to = dateTo.value
|
|
||||||
? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
|
|
||||||
: date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
|
|
||||||
to = date.adjustDate(
|
|
||||||
to,
|
|
||||||
{ hour: 21, minute: 59, second: 59, millisecond: 999 },
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
case 'from':
|
|
||||||
return { between: [from, to] };
|
|
||||||
case 'to': {
|
|
||||||
if (dateFrom.value) {
|
|
||||||
return {
|
return {
|
||||||
between: [from, to],
|
or: [
|
||||||
|
{ oldJson: { like: `%${value}%` } },
|
||||||
|
{ newJson: { like: `%${value}%` } },
|
||||||
|
{ description: { like: `%${value}%` } },
|
||||||
|
],
|
||||||
};
|
};
|
||||||
}
|
break;
|
||||||
return { lte: to };
|
case 'action':
|
||||||
}
|
if (value?.length) return { [param]: { inq: value } };
|
||||||
|
break;
|
||||||
|
case 'from':
|
||||||
|
return { creationDate: { gte: value } };
|
||||||
|
case 'to':
|
||||||
|
return { creationDate: { lte: value } };
|
||||||
|
case 'userType':
|
||||||
|
if (value === 'User') return { userFk: { neq: null } };
|
||||||
|
if (value === 'System') return { userFk: null };
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return { [param]: value };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectFilter(type, dateType) {
|
|
||||||
const filter = {};
|
|
||||||
const actions = { inq: [] };
|
|
||||||
let reload = true;
|
|
||||||
|
|
||||||
if (type === 'search') {
|
|
||||||
if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
|
|
||||||
selectedFilters.value.changedModelId = searchInput.value.trim();
|
|
||||||
} else if (!searchInput.value) {
|
|
||||||
selectedFilters.value.changedModelId = undefined;
|
|
||||||
selectedFilters.value.changedModelValue = undefined;
|
|
||||||
} else {
|
|
||||||
selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (type === 'action' && selectedFilters.value.changedModel === null) {
|
|
||||||
selectedFilters.value.changedModel = undefined;
|
|
||||||
}
|
|
||||||
if (type === 'userRadio') {
|
|
||||||
selectedFilters.value.userFk = userRadio.value;
|
|
||||||
}
|
|
||||||
if (type === 'change') {
|
|
||||||
if (changeInput.value)
|
|
||||||
selectedFilters.value.or = [
|
|
||||||
{ oldJson: { like: `%${changeInput.value}%` } },
|
|
||||||
{ newJson: { like: `%${changeInput.value}%` } },
|
|
||||||
{ description: { like: `%${changeInput.value}%` } },
|
|
||||||
];
|
|
||||||
else selectedFilters.value.or = undefined;
|
|
||||||
}
|
|
||||||
if (type === 'userSelect') {
|
|
||||||
selectedFilters.value.userFk =
|
|
||||||
userSelect.value !== null ? userSelect.value : undefined;
|
|
||||||
}
|
|
||||||
if (type === 'date') {
|
|
||||||
if (!dateFrom.value && !dateTo.value) {
|
|
||||||
selectedFilters.value.creationDate = undefined;
|
|
||||||
} else if (dateType === 'to') {
|
|
||||||
selectedFilters.value.creationDate = setDate('to');
|
|
||||||
} else if (dateType === 'from') {
|
|
||||||
selectedFilters.value.creationDate = setDate('from');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Object.keys(checkboxOptions.value).forEach((key) => {
|
|
||||||
if (checkboxOptions.value[key].selected) actions.inq.push(key);
|
|
||||||
});
|
|
||||||
selectedFilters.value.action = actions.inq.length ? actions : undefined;
|
|
||||||
|
|
||||||
Object.keys(selectedFilters.value).forEach((key) => {
|
|
||||||
if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
|
|
||||||
});
|
|
||||||
|
|
||||||
if (reload) applyFilter(filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function clearFilter() {
|
async function clearFilter() {
|
||||||
selectedFilters.value = {};
|
|
||||||
byRecord.value = false;
|
byRecord.value = false;
|
||||||
userSelect.value = undefined;
|
|
||||||
searchInput.value = undefined;
|
|
||||||
changeInput.value = undefined;
|
|
||||||
dateFrom.value = undefined;
|
|
||||||
dateTo.value = undefined;
|
|
||||||
userRadio.value = undefined;
|
|
||||||
Object.keys(checkboxOptions.value).forEach(
|
|
||||||
(opt) => (checkboxOptions.value[opt].selected = false),
|
|
||||||
);
|
|
||||||
await applyFilter();
|
await applyFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
stateStore.rightDrawerChangeValue(true);
|
||||||
|
});
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
stateStore.rightDrawer = false;
|
stateStore.rightDrawer = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(
|
|
||||||
() => router.currentRoute.value.params.id,
|
|
||||||
() => {
|
|
||||||
applyFilter();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
|
||||||
:url="`${props.model}Logs/${route.params.id}/models`"
|
|
||||||
:filter="{ order: ['changedModel'] }"
|
|
||||||
@on-fetch="
|
|
||||||
(data) =>
|
|
||||||
(actions = data.map((item) => {
|
|
||||||
const changedModel = item.changedModel;
|
|
||||||
return {
|
|
||||||
locale: useCapitalize(
|
|
||||||
validations[changedModel]?.locale?.name ?? changedModel,
|
|
||||||
),
|
|
||||||
value: changedModel,
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
"
|
|
||||||
auto-load
|
|
||||||
/>
|
|
||||||
<VnPaginate
|
<VnPaginate
|
||||||
ref="paginate"
|
ref="paginate"
|
||||||
:data-key="`${model}Log`"
|
:data-key
|
||||||
:url="`${model}Logs`"
|
:url="dataKey + 's'"
|
||||||
:user-filter="filter"
|
:user-filter="filter"
|
||||||
|
:filter="{ where: { and: [{ originFk: route.params.id }] } }"
|
||||||
:skeleton="false"
|
:skeleton="false"
|
||||||
auto-load
|
auto-load
|
||||||
@on-fetch="setLogTree"
|
@on-fetch="setLogTree"
|
||||||
|
@on-change="setLogTree"
|
||||||
search-url="logs"
|
search-url="logs"
|
||||||
|
:exprBuilder
|
||||||
|
:order="['creationDate DESC', 'id DESC']"
|
||||||
>
|
>
|
||||||
<template #body>
|
<template #body>
|
||||||
<div
|
<div
|
||||||
|
@ -467,6 +339,7 @@ watch(
|
||||||
backgroundColor: useColor(modelLog.model),
|
backgroundColor: useColor(modelLog.model),
|
||||||
}"
|
}"
|
||||||
:title="`${modelLog.model} #${modelLog.id}`"
|
:title="`${modelLog.model} #${modelLog.id}`"
|
||||||
|
data-cy="vnLog-model-chip"
|
||||||
>
|
>
|
||||||
{{ t(modelLog.modelI18n) }}
|
{{ t(modelLog.modelI18n) }}
|
||||||
</QChip>
|
</QChip>
|
||||||
|
@ -580,6 +453,7 @@ watch(
|
||||||
}`,
|
}`,
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
|
data-cy="vnLog-action-icon"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
@ -697,181 +571,12 @@ watch(
|
||||||
</VnPaginate>
|
</VnPaginate>
|
||||||
<RightMenu>
|
<RightMenu>
|
||||||
<template #right-panel>
|
<template #right-panel>
|
||||||
<QList dense>
|
<VnLogFilter :data-key />
|
||||||
<QSeparator />
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
:label="t('globals.search')"
|
|
||||||
v-model="searchInput"
|
|
||||||
class="full-width"
|
|
||||||
clearable
|
|
||||||
filled
|
|
||||||
clear-icon="close"
|
|
||||||
@keyup.enter="() => selectFilter('search')"
|
|
||||||
@focusout="() => selectFilter('search')"
|
|
||||||
@clear="() => selectFilter('search')"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-pointer">
|
|
||||||
<QTooltip>{{ t('tooltips.search') }}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</QInput>
|
|
||||||
</QItem>
|
|
||||||
<QItem>
|
|
||||||
<VnSelect
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.entity')"
|
|
||||||
v-model="selectedFilters.changedModel"
|
|
||||||
option-label="locale"
|
|
||||||
option-value="value"
|
|
||||||
filled
|
|
||||||
:options="actions"
|
|
||||||
@update:model-value="selectFilter('action')"
|
|
||||||
hide-selected
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QOptionGroup
|
|
||||||
size="sm"
|
|
||||||
v-model="userRadio"
|
|
||||||
:options="userTypes"
|
|
||||||
color="primary"
|
|
||||||
@update:model-value="selectFilter('userRadio')"
|
|
||||||
right-label
|
|
||||||
>
|
|
||||||
<template #label="{ label }">
|
|
||||||
{{ t(`Users.${label}`) }}
|
|
||||||
</template>
|
|
||||||
</QOptionGroup>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QItemSection v-if="userRadio !== null">
|
|
||||||
<VnSelect
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.user')"
|
|
||||||
v-model="userSelect"
|
|
||||||
filled
|
|
||||||
:url="`${model}Logs/${route.params.id}/editors`"
|
|
||||||
:fields="['id', 'nickname', 'name', 'image']"
|
|
||||||
sort-by="nickname"
|
|
||||||
@update:model-value="selectFilter('userSelect')"
|
|
||||||
hide-selected
|
|
||||||
>
|
|
||||||
<template #option="{ opt, itemProps }">
|
|
||||||
<QItem
|
|
||||||
v-bind="itemProps"
|
|
||||||
class="q-pa-xs row items-center"
|
|
||||||
>
|
|
||||||
<QItemSection class="col-3 items-center">
|
|
||||||
<VnAvatar :worker-id="opt.id" />
|
|
||||||
</QItemSection>
|
|
||||||
<QItemSection class="col-9 justify-center">
|
|
||||||
<span>{{ opt.name }}</span>
|
|
||||||
<span class="text-grey">{{ opt.nickname }}</span>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
</template>
|
|
||||||
</VnSelect>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
:label="t('globals.changes')"
|
|
||||||
v-model="changeInput"
|
|
||||||
class="full-width"
|
|
||||||
filled
|
|
||||||
clearable
|
|
||||||
clear-icon="close"
|
|
||||||
@keyup.enter="selectFilter('change')"
|
|
||||||
@focusout="selectFilter('change')"
|
|
||||||
@clear="selectFilter('change')"
|
|
||||||
>
|
|
||||||
<template #append>
|
|
||||||
<QIcon name="info" class="cursor-pointer">
|
|
||||||
<QTooltip max-width="250px">{{
|
|
||||||
t('tooltips.changes')
|
|
||||||
}}</QTooltip>
|
|
||||||
</QIcon>
|
|
||||||
</template>
|
|
||||||
</QInput>
|
|
||||||
</QItem>
|
|
||||||
<QItem
|
|
||||||
:class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
|
|
||||||
v-for="(checkboxOption, index) in checkboxOptions"
|
|
||||||
:key="index"
|
|
||||||
>
|
|
||||||
<QCheckbox
|
|
||||||
size="sm"
|
|
||||||
v-model="checkboxOption.selected"
|
|
||||||
:label="t(`actions.${checkboxOption.label}`)"
|
|
||||||
@update:model-value="selectFilter"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.date')"
|
|
||||||
@click="dateFromDialog = true"
|
|
||||||
@focus="(evt) => evt.target.blur()"
|
|
||||||
@clear="selectFilter('date', 'to')"
|
|
||||||
v-model="dateFrom"
|
|
||||||
clearable
|
|
||||||
filled
|
|
||||||
clear-icon="close"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
<QItem class="q-mt-sm">
|
|
||||||
<QInput
|
|
||||||
class="full-width"
|
|
||||||
:label="t('globals.to')"
|
|
||||||
@click="dateToDialog = true"
|
|
||||||
@focus="(evt) => evt.target.blur()"
|
|
||||||
@clear="selectFilter('date', 'from')"
|
|
||||||
v-model="dateTo"
|
|
||||||
clearable
|
|
||||||
filled
|
|
||||||
clear-icon="close"
|
|
||||||
/>
|
|
||||||
</QItem>
|
|
||||||
</QList>
|
|
||||||
</template>
|
</template>
|
||||||
</RightMenu>
|
</RightMenu>
|
||||||
<QDialog v-model="dateFromDialog">
|
|
||||||
<QDate
|
|
||||||
:years-in-month-view="false"
|
|
||||||
v-model="dateFrom"
|
|
||||||
dense
|
|
||||||
flat
|
|
||||||
minimal
|
|
||||||
filled
|
|
||||||
@update:model-value="
|
|
||||||
(value) => {
|
|
||||||
dateFromDialog = false;
|
|
||||||
dateFrom = date.formatDate(value, 'DD-MM-YYYY');
|
|
||||||
selectFilter('date', 'from');
|
|
||||||
}
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</QDialog>
|
|
||||||
<QDialog v-model="dateToDialog">
|
|
||||||
<QDate
|
|
||||||
v-model="dateTo"
|
|
||||||
dense
|
|
||||||
flat
|
|
||||||
minimal
|
|
||||||
@update:model-value="
|
|
||||||
(value) => {
|
|
||||||
dateToDialog = false;
|
|
||||||
dateTo = date.formatDate(value, 'DD-MM-YYYY');
|
|
||||||
selectFilter('date', 'to');
|
|
||||||
}
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
</QDialog>
|
|
||||||
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
<QPageSticky position="bottom-right" :offset="[25, 25]">
|
||||||
<QBtn
|
<QBtn
|
||||||
v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
|
v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
|
||||||
color="primary"
|
color="primary"
|
||||||
icon="filter_alt_off"
|
icon="filter_alt_off"
|
||||||
size="md"
|
size="md"
|
||||||
|
|
|
@ -1,77 +1,249 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from 'vue';
|
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
import FetchData from 'components/FetchData.vue';
|
import VnTableFilter from '../VnTable/VnTableFilter.vue';
|
||||||
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
|
import VnSelect from './VnSelect.vue';
|
||||||
|
import { useRoute } from 'vue-router';
|
||||||
|
import VnInput from './VnInput.vue';
|
||||||
|
import { ref, computed, watch } from 'vue';
|
||||||
|
import VnInputDate from './VnInputDate.vue';
|
||||||
|
import { useFilterParams } from 'src/composables/useFilterParams';
|
||||||
|
import FetchData from '../FetchData.vue';
|
||||||
|
import { useValidator } from 'src/composables/useValidator';
|
||||||
|
import { useCapitalize } from 'src/composables/useCapitalize';
|
||||||
|
import VnAvatar from '../ui/VnAvatar.vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const $props = defineProps({
|
||||||
const props = defineProps({
|
|
||||||
dataKey: {
|
dataKey: {
|
||||||
type: String,
|
type: String,
|
||||||
required: true,
|
default: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const workers = ref();
|
const { t } = useI18n();
|
||||||
|
const route = useRoute();
|
||||||
|
const validationsStore = useValidator();
|
||||||
|
const { models } = validationsStore;
|
||||||
|
const entities = ref([]);
|
||||||
|
const editors = ref([]);
|
||||||
|
const userParams = ref(useFilterParams($props.dataKey).params);
|
||||||
|
let validations = models;
|
||||||
|
const userTypes = [
|
||||||
|
{ value: 'All', label: t(`Users.All`) },
|
||||||
|
{ value: 'User', label: t(`Users.User`) },
|
||||||
|
{ value: 'System', label: t(`Users.System`) },
|
||||||
|
];
|
||||||
|
const checkboxOptions = ref([
|
||||||
|
{ name: 'insert', label: 'Creates', selected: false },
|
||||||
|
{ name: 'update', label: 'Edits', selected: false },
|
||||||
|
{ name: 'delete', label: 'Deletes', selected: false },
|
||||||
|
{ name: 'select', label: 'Accesses', selected: false },
|
||||||
|
]);
|
||||||
|
const columns = computed(() => [
|
||||||
|
{ name: 'changedModelValue', orderBy: 'id' },
|
||||||
|
{ name: 'changedModel' },
|
||||||
|
{ name: 'userType', orderBy: false },
|
||||||
|
{ name: 'userFk' },
|
||||||
|
{ name: 'change', orderBy: false },
|
||||||
|
{ name: 'action' },
|
||||||
|
{ name: 'from', orderBy: 'creationDate' },
|
||||||
|
{ name: 'to', orderBy: 'creationDate' },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const userParamsWatcher = watch(
|
||||||
|
() => userParams.value,
|
||||||
|
(params) => {
|
||||||
|
if (params.action) {
|
||||||
|
params.action.forEach((option) => {
|
||||||
|
checkboxOptions.value.find((o) => o.name === option).selected = true;
|
||||||
|
});
|
||||||
|
userParamsWatcher();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
function getActions() {
|
||||||
|
const actions = checkboxOptions.value
|
||||||
|
.filter((option) => option.selected)
|
||||||
|
?.map((o) => o.name);
|
||||||
|
return actions.length ? actions : null;
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<FetchData
|
<FetchData
|
||||||
url="Workers/activeWithInheritedRole"
|
:url="`${dataKey}s/${route.params.id}/models`"
|
||||||
:filter="{ where: { role: 'salesPerson' } }"
|
:filter="{ order: ['changedModel'] }"
|
||||||
@on-fetch="(data) => (workers = data)"
|
@on-fetch="
|
||||||
|
(data) =>
|
||||||
|
(entities = data.map((item) => {
|
||||||
|
const changedModel = item.changedModel;
|
||||||
|
return {
|
||||||
|
locale: useCapitalize(
|
||||||
|
validations[changedModel]?.locale?.name ?? changedModel,
|
||||||
|
),
|
||||||
|
value: changedModel,
|
||||||
|
};
|
||||||
|
}))
|
||||||
|
"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<VnFilterPanel :data-key="props.dataKey" :search-button="true">
|
<FetchData
|
||||||
<template #tags="{ tag, formatFn }">
|
:url="`${dataKey}s/${route.params.id}/editors`"
|
||||||
<div class="q-gutter-x-xs">
|
:filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
|
||||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
sort-by="nickname"
|
||||||
<span>{{ formatFn(tag.value) }}</span>
|
@on-fetch="(data) => (editors = data)"
|
||||||
|
auto-load
|
||||||
|
/>
|
||||||
|
<VnTableFilter
|
||||||
|
v-if="dataKey"
|
||||||
|
:data-key
|
||||||
|
:columns="columns"
|
||||||
|
:redirect="false"
|
||||||
|
:hiddenTags="['originFk', 'creationDate']"
|
||||||
|
search-url="logs"
|
||||||
|
:showTagChips="false"
|
||||||
|
>
|
||||||
|
<template #filter-changedModelValue="{ params, columnName, searchFn }">
|
||||||
|
<VnInput
|
||||||
|
:label="t('globals.search')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
@keyup.enter="searchFn"
|
||||||
|
@blur="searchFn"
|
||||||
|
@remove="searchFn"
|
||||||
|
:info="t('tooltips.search')"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
data-cy="vnLog-search"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-changedModel="{ params, columnName, searchFn }">
|
||||||
|
<VnSelect
|
||||||
|
:label="t('globals.entity')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
option-label="locale"
|
||||||
|
option-value="value"
|
||||||
|
:options="entities"
|
||||||
|
@update:model-value="() => searchFn()"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
data-cy="vnLog-entity"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-userType="{ params, columnName, searchFn }">
|
||||||
|
<QOptionGroup
|
||||||
|
class="text-left"
|
||||||
|
size="sm"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
:options="userTypes"
|
||||||
|
color="primary"
|
||||||
|
@update:model-value="
|
||||||
|
() => {
|
||||||
|
params.userFk = null;
|
||||||
|
searchFn();
|
||||||
|
}
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-userFk="{ params, columnName, searchFn }">
|
||||||
|
<VnSelect
|
||||||
|
:label="t('globals.user')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
:options="editors"
|
||||||
|
@update:modelValue="() => searchFn()"
|
||||||
|
:disable="params.userType === 'System'"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
>
|
||||||
|
<template #option="{ opt, itemProps }">
|
||||||
|
<QItem v-bind="itemProps" class="q-pa-xs row items-center">
|
||||||
|
<QItemSection class="col-3 items-center">
|
||||||
|
<VnAvatar :worker-id="opt.id" />
|
||||||
|
</QItemSection>
|
||||||
|
<QItemSection class="col-9 justify-center">
|
||||||
|
<span>{{ opt.name }}</span>
|
||||||
|
<span class="text-grey">{{ opt.nickname }}</span>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
|
</template>
|
||||||
|
</VnSelect>
|
||||||
|
</template>
|
||||||
|
<template #filter-change="{ params, columnName, searchFn }">
|
||||||
|
<VnInput
|
||||||
|
:label="t('globals.changes')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
@keyup.enter="searchFn"
|
||||||
|
@blur="searchFn"
|
||||||
|
@remove="searchFn"
|
||||||
|
:info="t('tooltips.changes')"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<template #filter-action="{ searchFn }">
|
||||||
|
<div class="column">
|
||||||
|
<QCheckbox
|
||||||
|
v-for="checkboxOption in checkboxOptions"
|
||||||
|
:key="checkboxOption"
|
||||||
|
size="sm"
|
||||||
|
v-model="checkboxOption.selected"
|
||||||
|
:label="t(`actions.${checkboxOption.label}`)"
|
||||||
|
@update:model-value="
|
||||||
|
() => searchFn(undefined, 'action', getActions())
|
||||||
|
"
|
||||||
|
data-cy="vnLog-checkbox"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #body="{ params, searchFn }">
|
<template #filter-from="{ params, columnName, searchFn }">
|
||||||
<QDate
|
<VnInputDate
|
||||||
v-model="params.created"
|
:label="t('globals.from')"
|
||||||
@update:model-value="searchFn()"
|
v-model="params[columnName]"
|
||||||
dense
|
dense
|
||||||
flat
|
filled
|
||||||
minimal
|
@update:modelValue="() => searchFn()"
|
||||||
>
|
/>
|
||||||
</QDate>
|
|
||||||
<QSeparator />
|
|
||||||
<QItem>
|
|
||||||
<QItemSection v-if="!workers">
|
|
||||||
<QSkeleton type="QInput" class="full-width" />
|
|
||||||
</QItemSection>
|
|
||||||
<QItemSection v-if="workers">
|
|
||||||
<QSelect
|
|
||||||
:label="t('User')"
|
|
||||||
v-model="params.userFk"
|
|
||||||
@update:model-value="searchFn()"
|
|
||||||
:options="workers"
|
|
||||||
option-value="id"
|
|
||||||
option-label="name"
|
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
use-input
|
|
||||||
:input-debounce="0"
|
|
||||||
/>
|
|
||||||
</QItemSection>
|
|
||||||
</QItem>
|
|
||||||
</template>
|
</template>
|
||||||
</VnFilterPanel>
|
<template #filter-to="{ params, columnName, searchFn }">
|
||||||
|
<VnInputDate
|
||||||
|
:label="t('globals.to')"
|
||||||
|
v-model="params[columnName]"
|
||||||
|
dense
|
||||||
|
filled
|
||||||
|
@update:modelValue="() => searchFn()"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</VnTableFilter>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
en:
|
|
||||||
params:
|
|
||||||
search: Contains
|
|
||||||
userFk: User
|
|
||||||
created: Created
|
|
||||||
es:
|
es:
|
||||||
|
tooltips:
|
||||||
|
search: Buscar por identificador o concepto
|
||||||
|
changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
|
||||||
|
actions:
|
||||||
|
Creates: Crea
|
||||||
|
Edits: Modifica
|
||||||
|
Deletes: Elimina
|
||||||
|
Accesses: Accede
|
||||||
|
Users:
|
||||||
|
User: Usuario
|
||||||
|
All: Todo
|
||||||
|
System: Sistema
|
||||||
params:
|
params:
|
||||||
search: Contiene
|
changedModel: Entity
|
||||||
userFk: Usuario
|
|
||||||
created: Creada
|
en:
|
||||||
User: Usuario
|
tooltips:
|
||||||
|
search: Search by identifier or concept
|
||||||
|
changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
|
||||||
|
actions:
|
||||||
|
Creates: Creates
|
||||||
|
Edits: Edits
|
||||||
|
Deletes: Deletes
|
||||||
|
Accesses: Accesses
|
||||||
|
Users:
|
||||||
|
User: User
|
||||||
|
All: All
|
||||||
|
System: System
|
||||||
|
params:
|
||||||
|
changedModel: Entidad
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -0,0 +1,100 @@
|
||||||
|
<script setup>
|
||||||
|
import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
scrollTarget: { type: [String, Object], default: 'window' }
|
||||||
|
});
|
||||||
|
|
||||||
|
const scrollPosition = ref(0);
|
||||||
|
const showButton = ref(false);
|
||||||
|
let scrollContainer = null;
|
||||||
|
|
||||||
|
const onScroll = () => {
|
||||||
|
if (!scrollContainer) return;
|
||||||
|
scrollPosition.value =
|
||||||
|
typeof props.scrollTarget === 'object'
|
||||||
|
? scrollContainer.scrollTop
|
||||||
|
: window.scrollY;
|
||||||
|
};
|
||||||
|
|
||||||
|
watch(scrollPosition, (newValue) => {
|
||||||
|
showButton.value = newValue > 0;
|
||||||
|
});
|
||||||
|
|
||||||
|
const scrollToTop = () => {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateScrollContainer = (container) => {
|
||||||
|
if (container) {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.removeEventListener('scroll', onScroll);
|
||||||
|
}
|
||||||
|
scrollContainer = container;
|
||||||
|
scrollContainer.addEventListener('scroll', onScroll);
|
||||||
|
onScroll();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
updateScrollContainer
|
||||||
|
});
|
||||||
|
|
||||||
|
const initScrollContainer = async () => {
|
||||||
|
await nextTick();
|
||||||
|
|
||||||
|
if (typeof props.scrollTarget === 'object') {
|
||||||
|
scrollContainer = props.scrollTarget;
|
||||||
|
} else {
|
||||||
|
scrollContainer = window;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!scrollContainer) return
|
||||||
|
scrollContainer.addEventListener('scroll', onScroll);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
initScrollContainer();
|
||||||
|
});
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.removeEventListener('scroll', onScroll);
|
||||||
|
scrollContainer = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<QIcon
|
||||||
|
v-if="showButton"
|
||||||
|
color="primary"
|
||||||
|
name="keyboard_arrow_up"
|
||||||
|
class="scroll-to-top"
|
||||||
|
@click="scrollToTop"
|
||||||
|
>
|
||||||
|
<QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.scroll-to-top {
|
||||||
|
position: fixed;
|
||||||
|
top: 70px;
|
||||||
|
font-size: 65px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 1000;
|
||||||
|
transition: transform 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.scroll-to-top:hover {
|
||||||
|
transform: translateX(-50%) scale(1.2);
|
||||||
|
cursor: pointer;
|
||||||
|
filter: brightness(0.8);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
|
@ -40,10 +40,6 @@ const $props = defineProps({
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: true,
|
||||||
},
|
},
|
||||||
keepData: {
|
|
||||||
type: Boolean,
|
|
||||||
default: true,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
|
@ -61,7 +57,6 @@ onBeforeMount(() => {
|
||||||
if ($props.dataKey)
|
if ($props.dataKey)
|
||||||
arrayData = useArrayData($props.dataKey, {
|
arrayData = useArrayData($props.dataKey, {
|
||||||
searchUrl: 'table',
|
searchUrl: 'table',
|
||||||
keepData: $props.keepData,
|
|
||||||
...$props.arrayDataProps,
|
...$props.arrayDataProps,
|
||||||
navigate: $props.redirect,
|
navigate: $props.redirect,
|
||||||
});
|
});
|
||||||
|
|
|
@ -54,6 +54,10 @@ const $props = defineProps({
|
||||||
type: [Array],
|
type: [Array],
|
||||||
default: () => [],
|
default: () => [],
|
||||||
},
|
},
|
||||||
|
filterFn: {
|
||||||
|
type: Function,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
exprBuilder: {
|
exprBuilder: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -62,16 +66,12 @@ 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],
|
type: [Object, Array, String],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
where: {
|
where: {
|
||||||
|
@ -79,7 +79,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
sortBy: {
|
sortBy: {
|
||||||
type: String,
|
type: [String, Array],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
@ -152,10 +152,22 @@ const value = computed({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const arrayDataKey =
|
||||||
|
$props.dataKey ??
|
||||||
|
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
|
||||||
|
|
||||||
|
const arrayData = useArrayData(arrayDataKey, {
|
||||||
|
url: $props.url,
|
||||||
|
searchUrl: false,
|
||||||
|
mapKey: $attrs['map-key'],
|
||||||
|
});
|
||||||
|
|
||||||
const computedSortBy = computed(() => {
|
const computedSortBy = computed(() => {
|
||||||
return $props.sortBy || $props.optionLabel + ' ASC';
|
return $props.sortBy || $props.optionLabel + ' ASC';
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
||||||
|
|
||||||
watch(options, (newValue) => {
|
watch(options, (newValue) => {
|
||||||
setOptions(newValue);
|
setOptions(newValue);
|
||||||
});
|
});
|
||||||
|
@ -174,16 +186,6 @@ onMounted(() => {
|
||||||
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
|
||||||
});
|
});
|
||||||
|
|
||||||
const arrayDataKey =
|
|
||||||
$props.dataKey ??
|
|
||||||
($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
|
|
||||||
|
|
||||||
const arrayData = useArrayData(arrayDataKey, {
|
|
||||||
url: $props.url,
|
|
||||||
searchUrl: false,
|
|
||||||
mapKey: $attrs['map-key'],
|
|
||||||
});
|
|
||||||
|
|
||||||
function findKeyInOptions() {
|
function findKeyInOptions() {
|
||||||
if (!$props.options) return;
|
if (!$props.options) return;
|
||||||
return filter($props.modelValue, $props.options)?.length;
|
return filter($props.modelValue, $props.options)?.length;
|
||||||
|
@ -252,43 +254,41 @@ 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.defaultFilter) return update();
|
if ($props.filterFn) update($props.filterFn(val));
|
||||||
if (
|
else if (!val && lastVal.value === val) update();
|
||||||
$props.url &&
|
else {
|
||||||
($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
|
const makeRequest =
|
||||||
) {
|
($props.url && $props.limit) ||
|
||||||
newOptions = await fetchFilter(val);
|
(!$props.limit && Object.keys(myOptions.value).length === 0);
|
||||||
} else newOptions = filter(val, myOptionsOriginal.value);
|
newOptions = makeRequest
|
||||||
update(
|
? await fetchFilter(val)
|
||||||
() => {
|
: filter(val, myOptionsOriginal.value);
|
||||||
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
|
||||||
newOptions.unshift(noOneOpt.value);
|
|
||||||
|
|
||||||
myOptions.value = newOptions;
|
update(
|
||||||
},
|
() => {
|
||||||
(ref) => {
|
if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
|
||||||
if (val !== '' && ref.options.length > 0) {
|
newOptions.unshift(noOneOpt.value);
|
||||||
ref.setOptionIndex(-1);
|
|
||||||
ref.moveOptionSelection(1, true);
|
myOptions.value = newOptions;
|
||||||
}
|
},
|
||||||
},
|
(ref) => {
|
||||||
);
|
if (val !== '' && ref.options.length > 0) {
|
||||||
|
ref.setOptionIndex(-1);
|
||||||
|
ref.moveOptionSelection(1, true);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
lastVal.value = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
function nullishToTrue(value) {
|
function nullishToTrue(value) {
|
||||||
return value ?? true;
|
return value ?? true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
|
|
||||||
|
|
||||||
async function onScroll({ to, direction, from, index }) {
|
async function onScroll({ to, direction, from, index }) {
|
||||||
const lastIndex = myOptions.value.length - 1;
|
const lastIndex = myOptions.value.length - 1;
|
||||||
|
|
||||||
|
|
|
@ -232,7 +232,7 @@ fr:
|
||||||
pt: Portugais
|
pt: Portugais
|
||||||
pt:
|
pt:
|
||||||
Send SMS: Enviar SMS
|
Send SMS: Enviar SMS
|
||||||
CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
|
CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
|
||||||
Language: Linguagem
|
Language: Linguagem
|
||||||
Phone: Móvel
|
Phone: Móvel
|
||||||
Subject: Assunto
|
Subject: Assunto
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
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';
|
||||||
|
|
|
@ -12,7 +12,9 @@ describe('VnDiscount', () => {
|
||||||
price: 100,
|
price: 100,
|
||||||
quantity: 2,
|
quantity: 2,
|
||||||
discount: 10,
|
discount: 10,
|
||||||
}
|
mana: 10,
|
||||||
|
promise: vi.fn(),
|
||||||
|
},
|
||||||
}).vm;
|
}).vm;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } 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';
|
||||||
|
|
||||||
|
@ -40,7 +41,12 @@ describe('VnDms', () => {
|
||||||
companyFk: 2,
|
companyFk: 2,
|
||||||
dmsTypeFk: 3,
|
dmsTypeFk: 3,
|
||||||
description: 'This is a test description',
|
description: 'This is a test description',
|
||||||
files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
|
files: [
|
||||||
|
{
|
||||||
|
name: 'example.txt',
|
||||||
|
content: new Blob(['file content'], { type: 'text/plain' }),
|
||||||
|
},
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedBody = {
|
const expectedBody = {
|
||||||
|
@ -59,7 +65,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;
|
||||||
|
@ -79,7 +85,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')).toBe(data.files);
|
expect([formData.get('example.txt')]).toStrictEqual(data.files);
|
||||||
expect(expectedBody).toEqual(params.params);
|
expect(expectedBody).toEqual(params.params);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -113,7 +119,9 @@ 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), { params: expectedBody });
|
expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), {
|
||||||
|
params: expectedBody,
|
||||||
|
});
|
||||||
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
|
expect(wrapper.emitted('onDataSaved')).toBeTruthy();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -127,8 +135,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();
|
||||||
|
|
||||||
|
@ -137,7 +145,7 @@ describe('VnDms', () => {
|
||||||
|
|
||||||
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
|
it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
|
||||||
await wrapper.setProps({ formInitialData: null });
|
await wrapper.setProps({ formInitialData: null });
|
||||||
vm.route.params.id= '111';
|
vm.route.params.id = '111';
|
||||||
vm.defaultData();
|
vm.defaultData();
|
||||||
|
|
||||||
expect(vm.dms.reference).toBe('111');
|
expect(vm.dms.reference).toBe('111');
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import { default as axios } from 'axios';
|
||||||
|
|
||||||
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
import VnDmsList from 'src/components/common/VnDmsList.vue';
|
||||||
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ 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;
|
||||||
|
@ -12,25 +11,27 @@ describe('VnInput', () => {
|
||||||
wrapper = createWrapper(VnInput, {
|
wrapper = createWrapper(VnInput, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: value,
|
modelValue: value,
|
||||||
isOutlined, emptyToNull, insertable,
|
isOutlined,
|
||||||
maxlength: 101
|
emptyToNull,
|
||||||
|
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']);
|
||||||
|
@ -62,7 +63,6 @@ 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,12 +71,12 @@ 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();
|
||||||
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
|
expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
|
||||||
expect(vm.value).toBe( expectedValue);
|
expect(vm.value).toBe(expectedValue);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
|
||||||
let vm;
|
let vm;
|
||||||
let wrapper;
|
let wrapper;
|
||||||
|
|
||||||
function generateWrapper(date, outlined, required) {
|
function generateWrapper(outlined = false, required = false) {
|
||||||
wrapper = createWrapper(VnInputDate, {
|
wrapper = createWrapper(VnInputDate, {
|
||||||
props: {
|
props: {
|
||||||
modelValue: date,
|
modelValue: '2000-12-31T23:00:00.000Z',
|
||||||
|
'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('formats a valid date correctly', async () => {
|
it('validateAndCleanInput should remove non-numeric characters', async () => {
|
||||||
generateWrapper('2023-12-25', false, false);
|
generateWrapper();
|
||||||
|
vm.validateAndCleanInput('10a/1s2/2dd0a23');
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.formattedDate).toBe('25/12/2023');
|
expect(vm.inputValue).toBe('10/12/2023');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('updates the model value when a new date is set', async () => {
|
it('manageDate should reverse the date', async () => {
|
||||||
const input = wrapper.find('input');
|
generateWrapper();
|
||||||
await input.setValue('31/12/2023');
|
vm.manageDate('10/12/2023');
|
||||||
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
await vm.$nextTick();
|
||||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
expect(vm.inputValue).toBe('2023/12/10');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not update the model value when an invalid date is set', async () => {
|
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('invalid-date');
|
await input.setValue('25.12/2002');
|
||||||
expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
|
await vm.$nextTick();
|
||||||
|
await vm.formatDate();
|
||||||
|
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 () => {
|
||||||
|
const input = wrapper.find('input');
|
||||||
|
await input.setValue('31.12-23');
|
||||||
|
await vm.$nextTick();
|
||||||
|
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('2023-12-25', false, false);
|
generateWrapper();
|
||||||
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('2023-12-25', true, false);
|
generateWrapper(true, false);
|
||||||
await vm.$nextTick();
|
await vm.$nextTick();
|
||||||
expect(vm.styleAttrs.outlined).toBe(true);
|
expect(vm.styleAttrs.outlined).toBe(true);
|
||||||
});
|
});
|
||||||
|
@ -58,13 +77,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('2023-12-25', false, false);
|
generateWrapper();
|
||||||
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('2023-12-25', false, true);
|
generateWrapper(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');
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,81 @@
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper.js';
|
||||||
|
import { describe, it, expect, beforeAll } from 'vitest';
|
||||||
|
import VnInputDateTime from 'components/common/VnInputDateTime.vue';
|
||||||
|
import vnDateBoot from 'src/boot/vnDate';
|
||||||
|
|
||||||
|
let vm;
|
||||||
|
let wrapper;
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
// Initialize the vnDate boot
|
||||||
|
vnDateBoot();
|
||||||
|
});
|
||||||
|
function generateWrapper(date, outlined, showEvent) {
|
||||||
|
wrapper = createWrapper(VnInputDateTime, {
|
||||||
|
props: {
|
||||||
|
modelValue: date,
|
||||||
|
isOutlined: outlined,
|
||||||
|
showEvent: showEvent,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
wrapper = wrapper.wrapper;
|
||||||
|
vm = wrapper.vm;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('VnInputDateTime', () => {
|
||||||
|
describe('selectedDate', () => {
|
||||||
|
it('formats a valid datetime correctly', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.selectedDate).toBe('25-12-2023 10:30');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('handles null date value', async () => {
|
||||||
|
generateWrapper(null, false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.selectedDate).not.toBe(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('updates the model value when a new datetime is set', async () => {
|
||||||
|
vm.selectedDate = '31-12-2023 15:45';
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('styleAttrs', () => {
|
||||||
|
it('should return empty styleAttrs when isOutlined is false', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.styleAttrs).toEqual({});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set styleAttrs when isOutlined is true', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', true, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
expect(vm.styleAttrs).toEqual({
|
||||||
|
dense: true,
|
||||||
|
outlined: true,
|
||||||
|
rounded: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('component rendering', () => {
|
||||||
|
it('should render date and time icons', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
const icons = wrapper.findAllComponents({ name: 'QIcon' });
|
||||||
|
expect(icons.length).toBe(2);
|
||||||
|
expect(icons[0].props('name')).toBe('today');
|
||||||
|
expect(icons[1].props('name')).toBe('access_time');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should render popup proxies for date and time', async () => {
|
||||||
|
generateWrapper('2023-12-25T10:30:00', false, true);
|
||||||
|
await vm.$nextTick();
|
||||||
|
const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
|
||||||
|
expect(popups.length).toBe(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
|
@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
|
||||||
const date = new Date('2023-01-01');
|
const date = new Date('2023-01-01');
|
||||||
const wrapper = buildComponent({ value: date });
|
const wrapper = buildComponent({ value: date });
|
||||||
const span = wrapper.find('span');
|
const span = wrapper.find('span');
|
||||||
expect(span.text()).toBe('2023-01-01');
|
expect(span.text()).toBe('01/01/2023, 01:00:00');
|
||||||
expect(span.classes()).toContain('json-object');
|
expect(span.classes()).toContain('json-object');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
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', () => {
|
||||||
|
@ -89,8 +90,10 @@ describe('VnLog', () => {
|
||||||
|
|
||||||
vm = createWrapper(VnLog, {
|
vm = createWrapper(VnLog, {
|
||||||
global: {
|
global: {
|
||||||
stubs: [],
|
stubs: ['FetchData', 'vue-i18n'],
|
||||||
mocks: {},
|
mocks: {
|
||||||
|
fetch: vi.fn(),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
propsData: {
|
propsData: {
|
||||||
model: 'Claim',
|
model: 'Claim',
|
||||||
|
@ -108,27 +111,4 @@ describe('VnLog', () => {
|
||||||
expect(vm.logTree[0].originFk).toEqual(1);
|
expect(vm.logTree[0].originFk).toEqual(1);
|
||||||
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
|
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should correctly set the selectedFilters when filtering', () => {
|
|
||||||
vm.searchInput = '1';
|
|
||||||
vm.userSelect = '21';
|
|
||||||
vm.checkboxOptions.insert.selected = true;
|
|
||||||
vm.checkboxOptions.update.selected = true;
|
|
||||||
|
|
||||||
vm.selectFilter('search');
|
|
||||||
vm.selectFilter('userSelect');
|
|
||||||
|
|
||||||
expect(vm.selectedFilters.changedModelId).toEqual('1');
|
|
||||||
expect(vm.selectedFilters.userFk).toEqual('21');
|
|
||||||
expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should correctly set the date from', () => {
|
|
||||||
vm.dateFrom = '18-09-2023';
|
|
||||||
vm.selectFilter('date', 'from');
|
|
||||||
expect(vm.selectedFilters.creationDate.between).toEqual([
|
|
||||||
new Date('2023-09-18T00:00:00.000Z'),
|
|
||||||
new Date('2023-09-18T21:59:59.999Z'),
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
|
import VnLogFilter from 'src/components/common/VnLogFilter.vue';
|
||||||
|
|
||||||
|
describe('VnLogFilter', () => {
|
||||||
|
let vm;
|
||||||
|
beforeAll(async () => {
|
||||||
|
vm = createWrapper(VnLogFilter, {
|
||||||
|
props: {
|
||||||
|
dataKey: 'ClaimLog',
|
||||||
|
},
|
||||||
|
}).vm;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should getActions selected', async () => {
|
||||||
|
vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
|
||||||
|
vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
|
||||||
|
|
||||||
|
const actions = vm.getActions();
|
||||||
|
|
||||||
|
expect(actions.length).toEqual(2);
|
||||||
|
expect(actions).toEqual(['insert', 'update']);
|
||||||
|
});
|
||||||
|
});
|
|
@ -1,16 +1,7 @@
|
||||||
import {
|
import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
|
||||||
describe,
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
it,
|
import { default as axios } from 'axios';
|
||||||
expect,
|
|
||||||
vi,
|
|
||||||
beforeAll,
|
|
||||||
afterEach,
|
|
||||||
beforeEach,
|
|
||||||
afterAll,
|
|
||||||
} from 'vitest';
|
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
|
||||||
import VnNotes from 'src/components/ui/VnNotes.vue';
|
import VnNotes from 'src/components/ui/VnNotes.vue';
|
||||||
import vnDate from 'src/boot/vnDate';
|
|
||||||
|
|
||||||
describe('VnNotes', () => {
|
describe('VnNotes', () => {
|
||||||
let vm;
|
let vm;
|
||||||
|
@ -18,6 +9,7 @@ describe('VnNotes', () => {
|
||||||
let spyFetch;
|
let spyFetch;
|
||||||
let postMock;
|
let postMock;
|
||||||
let patchMock;
|
let patchMock;
|
||||||
|
let deleteMock;
|
||||||
let expectedInsertBody;
|
let expectedInsertBody;
|
||||||
let expectedUpdateBody;
|
let expectedUpdateBody;
|
||||||
const defaultOptions = {
|
const defaultOptions = {
|
||||||
|
@ -34,7 +26,7 @@ describe('VnNotes', () => {
|
||||||
) {
|
) {
|
||||||
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
|
||||||
wrapper = createWrapper(VnNotes, {
|
wrapper = createWrapper(VnNotes, {
|
||||||
propsData: options,
|
propsData: { ...defaultOptions, ...options },
|
||||||
});
|
});
|
||||||
wrapper = wrapper.wrapper;
|
wrapper = wrapper.wrapper;
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
@ -57,6 +49,7 @@ describe('VnNotes', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
postMock = vi.spyOn(axios, 'post');
|
postMock = vi.spyOn(axios, 'post');
|
||||||
patchMock = vi.spyOn(axios, 'patch');
|
patchMock = vi.spyOn(axios, 'patch');
|
||||||
|
deleteMock = vi.spyOn(axios, 'delete');
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
@ -153,4 +146,16 @@ describe('VnNotes', () => {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('delete', () => {
|
||||||
|
it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
|
||||||
|
generateWrapper();
|
||||||
|
createSpyFetch();
|
||||||
|
|
||||||
|
await vm.deleteNote({ id: 1 });
|
||||||
|
|
||||||
|
expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
|
||||||
|
expect(spyFetch).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -159,6 +159,7 @@ async function fetch() {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
|
align-items: start;
|
||||||
.label {
|
.label {
|
||||||
color: var(--vn-label-color);
|
color: var(--vn-label-color);
|
||||||
width: 9em;
|
width: 9em;
|
||||||
|
@ -169,9 +170,15 @@ async function fetch() {
|
||||||
flex-grow: 0;
|
flex-grow: 0;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
&.ellipsis > .value {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.header {
|
.header {
|
||||||
|
@ -203,27 +210,21 @@ async function fetch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-group {
|
.vn-card-group {
|
||||||
display: flex;
|
display: grid;
|
||||||
flex-direction: column;
|
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||||
|
gap: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vn-card-content {
|
.vn-card-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
> div {
|
> div {
|
||||||
max-height: 70px;
|
max-height: 70px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 1010px) {
|
|
||||||
.vn-card-group {
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
.vn-card-content {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.summaryHeader .vn-label-value {
|
.summaryHeader .vn-label-value {
|
||||||
|
|
|
@ -44,7 +44,8 @@ onBeforeMount(async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
// It enables to load data only once if the module is the same as the dataKey
|
// It enables to load data only once if the module is the same as the dataKey
|
||||||
if (!isSameDataKey.value || !route.params.id) await getData();
|
if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
|
||||||
|
await getData();
|
||||||
watch(
|
watch(
|
||||||
() => [$props.url, $props.filter],
|
() => [$props.url, $props.filter],
|
||||||
async () => {
|
async () => {
|
||||||
|
@ -58,7 +59,8 @@ async function getData() {
|
||||||
store.filter = $props.filter ?? {};
|
store.filter = $props.filter ?? {};
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
try {
|
try {
|
||||||
const { data } = await arrayData.fetch({ append: false, updateRouter: false });
|
await arrayData.fetch({ append: false, updateRouter: false });
|
||||||
|
const { data } = store;
|
||||||
state.set($props.dataKey, data);
|
state.set($props.dataKey, data);
|
||||||
emit('onFetch', data);
|
emit('onFetch', data);
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -6,6 +6,7 @@ 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({
|
||||||
|
@ -30,7 +31,7 @@ const $props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
toModule: {
|
toModule: {
|
||||||
type: String,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -56,18 +57,6 @@ 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: {
|
||||||
|
@ -170,10 +159,10 @@ const toModule = computed(() => {
|
||||||
<div class="title">
|
<div class="title">
|
||||||
<span
|
<span
|
||||||
v-if="title"
|
v-if="title"
|
||||||
:title="getValueFromPath(title)"
|
:title="getValueFromPath(entity, title)"
|
||||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
|
||||||
>
|
>
|
||||||
{{ getValueFromPath(title) ?? title }}
|
{{ getValueFromPath(entity, title) ?? title }}
|
||||||
</span>
|
</span>
|
||||||
<slot v-else name="description" :entity="entity">
|
<slot v-else name="description" :entity="entity">
|
||||||
<span
|
<span
|
||||||
|
@ -189,7 +178,7 @@ const toModule = computed(() => {
|
||||||
class="subtitle"
|
class="subtitle"
|
||||||
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
|
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
|
||||||
>
|
>
|
||||||
#{{ getValueFromPath(subtitle) ?? entity.id }}
|
#{{ getValueFromPath(entity, subtitle) ?? entity.id }}
|
||||||
</QItemLabel>
|
</QItemLabel>
|
||||||
<QBtn
|
<QBtn
|
||||||
round
|
round
|
||||||
|
@ -252,6 +241,10 @@ const toModule = computed(() => {
|
||||||
content: ':';
|
content: ':';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
&.ellipsis > .value {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
.value {
|
.value {
|
||||||
color: var(--vn-text-color);
|
color: var(--vn-text-color);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|
|
@ -61,6 +61,10 @@ const $props = defineProps({
|
||||||
type: Object,
|
type: Object,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
|
showTagChips: {
|
||||||
|
type: Boolean,
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
|
@ -88,13 +92,14 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
|
||||||
defineExpose({ search, params: userParams, remove });
|
defineExpose({ search, params: userParams, remove });
|
||||||
|
|
||||||
const isLoading = ref(false);
|
const isLoading = ref(false);
|
||||||
async function search(evt) {
|
async function search(evt, name, value) {
|
||||||
try {
|
try {
|
||||||
if (evt && $props.disableSubmitEvent) return;
|
if (evt && $props.disableSubmitEvent) return;
|
||||||
|
|
||||||
store.filter.where = {};
|
store.filter.where = {};
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
const filter = { ...userParams.value, ...$props.modelValue };
|
const filter = { ...userParams.value, ...$props.modelValue };
|
||||||
|
if (name) filter[name] = value;
|
||||||
store.userParamsChanged = true;
|
store.userParamsChanged = true;
|
||||||
await arrayData.addFilter({
|
await arrayData.addFilter({
|
||||||
params: filter,
|
params: filter,
|
||||||
|
@ -207,6 +212,7 @@ 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">
|
||||||
|
@ -214,7 +220,7 @@ const getLocale = (label) => {
|
||||||
</QTooltip>
|
</QTooltip>
|
||||||
</QBtn>
|
</QBtn>
|
||||||
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
|
<QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
|
||||||
<QList dense>
|
<QList dense v-if="showTagChips">
|
||||||
<QItem class="q-mt-xs">
|
<QItem class="q-mt-xs">
|
||||||
<QItemSection top>
|
<QItemSection top>
|
||||||
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
|
<QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">
|
||||||
|
@ -224,6 +230,7 @@ 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
|
||||||
|
@ -287,6 +294,7 @@ const getLocale = (label) => {
|
||||||
</QList>
|
</QList>
|
||||||
</QForm>
|
</QForm>
|
||||||
<QInnerLoading
|
<QInnerLoading
|
||||||
|
data-cy="filterPanel-spinner"
|
||||||
:label="t('globals.pleaseWait')"
|
:label="t('globals.pleaseWait')"
|
||||||
:showing="isLoading"
|
:showing="isLoading"
|
||||||
color="primary"
|
color="primary"
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import { dashIfEmpty } from 'src/filters';
|
||||||
|
|
||||||
defineProps({ email: { type: [String], default: null } });
|
defineProps({ email: { type: [String], default: null } });
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<QBtn
|
||||||
|
class="q-pr-xs"
|
||||||
v-if="email"
|
v-if="email"
|
||||||
flat
|
flat
|
||||||
round
|
round
|
||||||
|
@ -13,4 +16,5 @@ defineProps({ email: { type: [String], default: null } });
|
||||||
:href="`mailto:${email}`"
|
:href="`mailto:${email}`"
|
||||||
@click.stop
|
@click.stop
|
||||||
/>
|
/>
|
||||||
|
<span>{{ dashIfEmpty(email) }}</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { parsePhone } from 'src/filters';
|
import { dashIfEmpty, parsePhone } from 'src/filters';
|
||||||
import useOpenURL from 'src/composables/useOpenURL';
|
import useOpenURL from 'src/composables/useOpenURL';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -12,50 +12,65 @@ const props = defineProps({
|
||||||
|
|
||||||
const phone = ref(props.phoneNumber);
|
const phone = ref(props.phoneNumber);
|
||||||
const config = reactive({
|
const config = reactive({
|
||||||
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
|
||||||
'say-simple': {
|
'say-simple': {
|
||||||
icon: 'vn:saysimple',
|
icon: 'vn:saysimple',
|
||||||
url: null,
|
url: null,
|
||||||
channel: props.channel,
|
channel: props.channel,
|
||||||
},
|
},
|
||||||
|
sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
|
||||||
});
|
});
|
||||||
const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
|
|
||||||
|
const attrs = useAttrs();
|
||||||
|
const types = Object.keys(config)
|
||||||
|
.filter((key) => key in attrs)
|
||||||
|
.sort();
|
||||||
|
const activeTypes = types.length ? types : ['sip'];
|
||||||
|
|
||||||
onBeforeMount(async () => {
|
onBeforeMount(async () => {
|
||||||
if (!phone.value) return;
|
if (!phone.value) return;
|
||||||
let { channel } = config[type];
|
|
||||||
|
|
||||||
if (type === 'say-simple') {
|
for (const type of activeTypes) {
|
||||||
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
if (type === 'say-simple') {
|
||||||
.data;
|
let { channel } = config[type];
|
||||||
if (!channel) channel = defaultChannel;
|
const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
|
||||||
|
.data;
|
||||||
|
if (!channel) channel = defaultChannel;
|
||||||
|
|
||||||
phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
|
phone.value = await parsePhone(
|
||||||
config[
|
props.phoneNumber,
|
||||||
type
|
props.country?.toLowerCase(),
|
||||||
].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
);
|
||||||
|
config[type].url =
|
||||||
|
`${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function handleClick() {
|
function handleClick(type) {
|
||||||
if (config[type].url) useOpenURL(config[type].url);
|
if (config[type].url) useOpenURL(config[type].url);
|
||||||
else if (config[type].href) window.location.href = config[type].href;
|
else if (config[type].href) window.location.href = config[type].href;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<QBtn
|
<div class="flex items-center gap-2">
|
||||||
v-if="phone"
|
<template v-for="type in activeTypes">
|
||||||
flat
|
<QBtn
|
||||||
round
|
:key="type"
|
||||||
:icon="config[type].icon"
|
v-if="phone"
|
||||||
size="sm"
|
flat
|
||||||
color="primary"
|
round
|
||||||
padding="none"
|
:icon="config[type].icon"
|
||||||
@click.stop="handleClick"
|
size="sm"
|
||||||
>
|
color="primary"
|
||||||
<QTooltip>
|
padding="none"
|
||||||
{{ capitalize(type).replace('-', '') }}
|
@click.stop="() => handleClick(type)"
|
||||||
</QTooltip>
|
>
|
||||||
</QBtn>
|
<QTooltip>
|
||||||
{{ phoneNumber }}
|
{{ capitalize(type).replace('-', '') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QBtn></template
|
||||||
|
>
|
||||||
|
<span>{{ dashIfEmpty(phone) }}</span>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -6,6 +6,7 @@ import { computed } from 'vue';
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
label: { type: String, default: null },
|
label: { type: String, default: null },
|
||||||
|
tooltip: { type: String, default: null },
|
||||||
value: {
|
value: {
|
||||||
type: [String, Boolean, Number],
|
type: [String, Boolean, Number],
|
||||||
default: null,
|
default: null,
|
||||||
|
@ -40,7 +41,10 @@ const val = computed(() => $props.value);
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="label || $slots.label" class="label">
|
<div v-if="label || $slots.label" class="label">
|
||||||
<slot name="label">
|
<slot name="label">
|
||||||
<span style="color: var(--vn-label-color)">{{ label }}</span>
|
<QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
|
||||||
|
<span style="color: var(--vn-label-color)">
|
||||||
|
{{ label }}
|
||||||
|
</span>
|
||||||
</slot>
|
</slot>
|
||||||
</div>
|
</div>
|
||||||
<div class="value" v-if="value || $slots.value">
|
<div class="value" v-if="value || $slots.value">
|
||||||
|
|
|
@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
|
||||||
|
|
||||||
const emit = defineEmits(['onFetch']);
|
const emit = defineEmits(['onFetch']);
|
||||||
|
|
||||||
const $attrs = useAttrs();
|
const originalAttrs = useAttrs();
|
||||||
|
const $attrs = computed(() => {
|
||||||
const isRequired = computed(() => {
|
const { required, deletable, ...rest } = originalAttrs;
|
||||||
return Object.keys($attrs).includes('required');
|
return rest;
|
||||||
});
|
});
|
||||||
|
|
||||||
const $props = defineProps({
|
const $props = defineProps({
|
||||||
|
@ -53,6 +53,11 @@ function handleClick(e) {
|
||||||
else insert();
|
else insert();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function deleteNote(e) {
|
||||||
|
await axios.delete(`${$props.url}/${e.id}`);
|
||||||
|
await vnPaginateRef.value.fetch();
|
||||||
|
}
|
||||||
|
|
||||||
async function insert() {
|
async function insert() {
|
||||||
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
|
if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
|
||||||
|
|
||||||
|
@ -157,7 +162,7 @@ const handleObservationTypes = (data) => {
|
||||||
v-model="newNote.observationTypeFk"
|
v-model="newNote.observationTypeFk"
|
||||||
option-label="description"
|
option-label="description"
|
||||||
style="flex: 0.15"
|
style="flex: 0.15"
|
||||||
:required="isRequired"
|
:required="'required' in originalAttrs"
|
||||||
@keyup.enter.stop="insert"
|
@keyup.enter.stop="insert"
|
||||||
/>
|
/>
|
||||||
<VnInput
|
<VnInput
|
||||||
|
@ -165,11 +170,10 @@ const handleObservationTypes = (data) => {
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
|
:label="$props.justInput && newNote.text ? '' : t('Add note here...')"
|
||||||
filled
|
filled
|
||||||
size="lg"
|
|
||||||
autogrow
|
autogrow
|
||||||
autofocus
|
autofocus
|
||||||
@keyup.enter.stop="handleClick"
|
@keyup.enter.stop="handleClick"
|
||||||
:required="isRequired"
|
:required="'required' in originalAttrs"
|
||||||
clearable
|
clearable
|
||||||
>
|
>
|
||||||
<template #append>
|
<template #append>
|
||||||
|
@ -239,6 +243,21 @@ const handleObservationTypes = (data) => {
|
||||||
</QBadge>
|
</QBadge>
|
||||||
</div>
|
</div>
|
||||||
<span v-text="toDateHourMin(note.created)" />
|
<span v-text="toDateHourMin(note.created)" />
|
||||||
|
<div>
|
||||||
|
<QIcon
|
||||||
|
v-if="'deletable' in originalAttrs"
|
||||||
|
name="delete"
|
||||||
|
size="sm"
|
||||||
|
class="cursor-pointer"
|
||||||
|
color="primary"
|
||||||
|
@click="deleteNote(note)"
|
||||||
|
data-cy="notesRemoveNoteBtn"
|
||||||
|
>
|
||||||
|
<QTooltip>
|
||||||
|
{{ t('ticketNotes.removeNote') }}
|
||||||
|
</QTooltip>
|
||||||
|
</QIcon>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</QCardSection>
|
</QCardSection>
|
||||||
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
<QCardSection class="q-pa-xs q-my-none q-py-none">
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
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({
|
||||||
|
@ -67,7 +69,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
searchUrl: {
|
searchUrl: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
disableInfiniteScroll: {
|
disableInfiniteScroll: {
|
||||||
|
@ -75,7 +77,7 @@ const props = defineProps({
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
mapKey: {
|
mapKey: {
|
||||||
type: String,
|
type: [String, Boolean],
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
keyData: {
|
keyData: {
|
||||||
|
@ -115,7 +117,7 @@ onMounted(async () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
if (!store.keepData) arrayData.reset(['data']);
|
arrayData.reset(['data']);
|
||||||
arrayData.resetPagination();
|
arrayData.resetPagination();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -215,11 +217,12 @@ defineExpose({
|
||||||
paginate,
|
paginate,
|
||||||
userParams: arrayData.store.userParams,
|
userParams: arrayData.store.userParams,
|
||||||
currentFilter: arrayData.store.currentFilter,
|
currentFilter: arrayData.store.currentFilter,
|
||||||
|
arrayData,
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="full-width">
|
<div class="full-width" v-bind="attrs">
|
||||||
<div
|
<div
|
||||||
v-if="!store.data && !store.data?.length && !isLoading"
|
v-if="!store.data && !store.data?.length && !isLoading"
|
||||||
class="info-row q-pa-md text-center"
|
class="info-row q-pa-md text-center"
|
||||||
|
|
|
@ -46,7 +46,7 @@ const props = defineProps({
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
order: {
|
order: {
|
||||||
type: String,
|
type: [String, Array],
|
||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
limit: {
|
limit: {
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
<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,5 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } 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';
|
||||||
|
|
||||||
|
@ -21,10 +23,15 @@ 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: 'cardFilter',
|
filter: { key: 'cardFilter' },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
vm = wrapper.vm;
|
vm = wrapper.vm;
|
||||||
|
@ -48,7 +55,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('cardFilter');
|
expect(vm.store.filter).toEqual({ key: 'cardFilter' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should respond to prop changes and refetch data', async () => {
|
it('should respond to prop changes and refetch data', async () => {
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { createWrapper } from 'app/test/vitest/helper';
|
||||||
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
import VnPaginate from 'src/components/ui/VnPaginate.vue';
|
||||||
|
|
||||||
describe('VnPaginate', () => {
|
describe('VnPaginate', () => {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { describe, it, expect, beforeAll, vi } from 'vitest';
|
import { describe, it, expect, beforeAll, vi } from 'vitest';
|
||||||
import { axios } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
import parsePhone from 'src/filters/parsePhone';
|
import parsePhone from 'src/filters/parsePhone';
|
||||||
|
|
||||||
describe('parsePhone filter', () => {
|
describe('parsePhone filter', () => {
|
||||||
|
|
|
@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
|
||||||
let wrapper;
|
let wrapper;
|
||||||
let applyFilterSpy;
|
let applyFilterSpy;
|
||||||
const searchText = 'Bolas de madera';
|
const searchText = 'Bolas de madera';
|
||||||
const userParams = {staticKey: 'staticValue'};
|
const userParams = { staticKey: 'staticValue' };
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
wrapper = createWrapper(VnSearchbar, {
|
wrapper = createWrapper(VnSearchbar, {
|
||||||
|
@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
vm.searchText = searchText;
|
vm.searchText = searchText;
|
||||||
vm.arrayData.store.userParams = userParams;
|
vm.arrayData.store.userParams = userParams;
|
||||||
applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
|
applyFilterSpy = vi
|
||||||
|
.spyOn(vm.arrayData, 'applyFilter')
|
||||||
|
.mockImplementation(() => {});
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('search resets pagination and applies filter', async () => {
|
it('search resets pagination and applies filter', async () => {
|
||||||
const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
|
const resetPaginationSpy = vi
|
||||||
|
.spyOn(vm.arrayData, 'resetPagination')
|
||||||
|
.mockImplementation(() => {});
|
||||||
await vm.search();
|
await vm.search();
|
||||||
|
|
||||||
expect(resetPaginationSpy).toHaveBeenCalled();
|
expect(resetPaginationSpy).toHaveBeenCalled();
|
||||||
|
@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
|
||||||
|
|
||||||
expect(applyFilterSpy).toHaveBeenCalledWith({
|
expect(applyFilterSpy).toHaveBeenCalledWith({
|
||||||
params: { staticKey: 'staticValue', search: searchText },
|
params: { staticKey: 'staticValue', search: searchText },
|
||||||
filter: {skip: 0},
|
filter: { skip: 0 },
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
|
||||||
import { createWrapper, axios } from 'app/test/vitest/helper';
|
import { createWrapper } 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,6 +11,9 @@ 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 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
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,5 +1,7 @@
|
||||||
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { useAcl } from 'src/composables/useAcl';
|
import { useAcl } from 'src/composables/useAcl';
|
||||||
|
|
||||||
describe('useAcl', () => {
|
describe('useAcl', () => {
|
||||||
|
|
|
@ -1,15 +1,41 @@
|
||||||
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import { default as axios } from 'axios';
|
||||||
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(() => {
|
||||||
vi.spyOn(useRouter(), 'replace');
|
setActivePinia(createPinia());
|
||||||
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(() => {
|
||||||
|
@ -17,103 +43,83 @@ 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').mockReturnValueOnce({ data: [] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
|
url: 'mockUrl',
|
||||||
|
searchUrl: 'params',
|
||||||
|
});
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
arrayData.fetch({});
|
await arrayData.fetch({});
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
const routerReplace = useRouter().replace.mock.calls[0][0];
|
const routerReplace = useRouter().replace.mock.calls[0][0];
|
||||||
|
|
||||||
expect(axios.get.mock.calls[0][1].params).toEqual({
|
expect(axios.get).toHaveBeenCalledWith('mockUrl', {
|
||||||
filter,
|
signal: expect.any(Object),
|
||||||
supplierFk: 2,
|
params: {
|
||||||
|
filter,
|
||||||
|
supplierFk: 2,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
expect(routerReplace.path).toEqual('mockSection/list');
|
|
||||||
|
expect(routerReplace.path).toBe('mockSection/list');
|
||||||
expect(JSON.parse(routerReplace.query.params)).toEqual(
|
expect(JSON.parse(routerReplace.query.params)).toEqual(
|
||||||
expect.objectContaining(params),
|
expect.objectContaining(params),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
|
it('should redirect to detail when single record is returned with navigation', async () => {
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||||
|
data: [{ id: 1 }],
|
||||||
|
});
|
||||||
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
|
const arrayData = mountArrayData('ArrayData', {
|
||||||
|
url: 'mockUrl',
|
||||||
|
navigate: {},
|
||||||
|
});
|
||||||
|
|
||||||
arrayData.store.userParams = params;
|
arrayData.store.userParams = params;
|
||||||
arrayData.fetch({});
|
await arrayData.fetch({});
|
||||||
|
|
||||||
await flushPromises();
|
|
||||||
const routerPush = useRouter().push.mock.calls[0][0];
|
const routerPush = useRouter().push.mock.calls[0][0];
|
||||||
|
|
||||||
expect(axios.get.mock.calls[0][1].params).toEqual({
|
expect(routerPush.path).toBe('mockName/1');
|
||||||
filter,
|
|
||||||
supplierFk: 2,
|
|
||||||
});
|
|
||||||
expect(routerPush.path).toEqual('mockName/1');
|
|
||||||
expect(routerPush.query).toBeUndefined();
|
expect(routerPush.query).toBeUndefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
|
it('should return one record when oneRecord is true', async () => {
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||||
|
|
||||||
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({ id: 1, name: 'Entity 1' });
|
expect(arrayData.store.data).toEqual({
|
||||||
});
|
id: 1,
|
||||||
|
name: 'Entity 1',
|
||||||
it('should handle empty data gracefully if has to return one record', async () => {
|
});
|
||||||
vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
|
|
||||||
const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
|
|
||||||
await arrayData.fetch({});
|
|
||||||
|
|
||||||
expect(arrayData.store.data).toBeUndefined();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function mountArrayData(...args) {
|
||||||
|
let arrayData;
|
||||||
|
|
||||||
|
const TestComponent = defineComponent({
|
||||||
|
setup() {
|
||||||
|
arrayData = useArrayData(...args);
|
||||||
|
return () => h('div');
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const asd = mount(TestComponent);
|
||||||
|
return arrayData;
|
||||||
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { useRole } from 'composables/useRole';
|
import { useRole } from 'composables/useRole';
|
||||||
const role = useRole();
|
const role = useRole();
|
||||||
|
|
||||||
|
@ -23,18 +24,19 @@ describe('useRole', () => {
|
||||||
name: `T'Challa`,
|
name: `T'Challa`,
|
||||||
nickname: 'Black Panther',
|
nickname: 'Black Panther',
|
||||||
lang: 'en',
|
lang: 'en',
|
||||||
|
worker: { department: { departmentFk: 155 } },
|
||||||
};
|
};
|
||||||
const expectedUser = {
|
const expectedUser = {
|
||||||
id: 999,
|
id: 999,
|
||||||
name: `T'Challa`,
|
name: `T'Challa`,
|
||||||
nickname: 'Black Panther',
|
nickname: 'Black Panther',
|
||||||
lang: 'en',
|
lang: 'en',
|
||||||
|
departmentFk: 155,
|
||||||
};
|
};
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
vi.spyOn(axios, 'get')
|
vi.spyOn(axios, 'get').mockResolvedValueOnce({
|
||||||
.mockResolvedValueOnce({
|
|
||||||
data: { roles: rolesData, user: fetchedUser },
|
data: { roles: rolesData, user: fetchedUser },
|
||||||
})
|
});
|
||||||
|
|
||||||
vi.spyOn(role.state, 'setUser');
|
vi.spyOn(role.state, 'setUser');
|
||||||
vi.spyOn(role.state, 'setRoles');
|
vi.spyOn(role.state, 'setRoles');
|
||||||
|
|
|
@ -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 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
import { useSession } from 'composables/useSession';
|
import { useSession } from 'composables/useSession';
|
||||||
import { useState } from 'composables/useState';
|
import { useState } from 'composables/useState';
|
||||||
|
|
||||||
|
@ -64,87 +64,84 @@ describe('session', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe(
|
describe('login', () => {
|
||||||
'login',
|
const expectedUser = {
|
||||||
() => {
|
id: 999,
|
||||||
const expectedUser = {
|
name: `T'Challa`,
|
||||||
id: 999,
|
nickname: 'Black Panther',
|
||||||
name: `T'Challa`,
|
lang: 'en',
|
||||||
nickname: 'Black Panther',
|
userConfig: {
|
||||||
lang: 'en',
|
darkMode: false,
|
||||||
userConfig: {
|
},
|
||||||
darkMode: false,
|
worker: { department: { departmentFk: 155 } },
|
||||||
|
};
|
||||||
|
const rolesData = [
|
||||||
|
{
|
||||||
|
role: {
|
||||||
|
name: 'salesPerson',
|
||||||
},
|
},
|
||||||
};
|
},
|
||||||
const rolesData = [
|
{
|
||||||
{
|
role: {
|
||||||
role: {
|
name: 'admin',
|
||||||
name: 'salesPerson',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
},
|
||||||
role: {
|
];
|
||||||
name: 'admin',
|
beforeEach(() => {
|
||||||
},
|
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
||||||
},
|
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
||||||
];
|
return Promise.resolve({
|
||||||
beforeEach(() => {
|
data: { roles: rolesData, user: expectedUser },
|
||||||
vi.spyOn(axios, 'get').mockImplementation((url) => {
|
|
||||||
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
|
|
||||||
return Promise.resolve({
|
|
||||||
data: { roles: rolesData, user: expectedUser },
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
it('should fetch the user roles and then set token in the sessionStorage', async () => {
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
const expectedToken = 'mySessionToken';
|
const expectedToken = 'mySessionToken';
|
||||||
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
const expectedTokenMultimedia = 'mySessionTokenMultimedia';
|
||||||
const keepLogin = false;
|
const keepLogin = false;
|
||||||
|
|
||||||
await session.login({
|
await session.login({
|
||||||
token: expectedToken,
|
token: expectedToken,
|
||||||
tokenMultimedia: expectedTokenMultimedia,
|
tokenMultimedia: expectedTokenMultimedia,
|
||||||
keepLogin,
|
keepLogin,
|
||||||
});
|
|
||||||
|
|
||||||
const roles = state.getRoles();
|
|
||||||
const localToken = localStorage.getItem('token');
|
|
||||||
const sessionToken = sessionStorage.getItem('token');
|
|
||||||
|
|
||||||
expect(roles.value).toEqual(expectedRoles);
|
|
||||||
expect(localToken).toBeNull();
|
|
||||||
expect(sessionToken).toEqual(expectedToken);
|
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch the user roles and then set token in the localStorage', async () => {
|
const roles = state.getRoles();
|
||||||
const expectedRoles = ['salesPerson', 'admin'];
|
const localToken = localStorage.getItem('token');
|
||||||
const expectedToken = 'myLocalToken';
|
const sessionToken = sessionStorage.getItem('token');
|
||||||
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
|
||||||
const keepLogin = true;
|
|
||||||
|
|
||||||
await session.login({
|
expect(roles.value).toEqual(expectedRoles);
|
||||||
token: expectedToken,
|
expect(localToken).toBeNull();
|
||||||
tokenMultimedia: expectedTokenMultimedia,
|
expect(sessionToken).toEqual(expectedToken);
|
||||||
keepLogin,
|
|
||||||
});
|
|
||||||
|
|
||||||
const roles = state.getRoles();
|
await session.destroy(); // this clears token and user for any other test
|
||||||
const localToken = localStorage.getItem('token');
|
});
|
||||||
const sessionToken = sessionStorage.getItem('token');
|
|
||||||
|
|
||||||
expect(roles.value).toEqual(expectedRoles);
|
it('should fetch the user roles and then set token in the localStorage', async () => {
|
||||||
expect(localToken).toEqual(expectedToken);
|
const expectedRoles = ['salesPerson', 'admin'];
|
||||||
expect(sessionToken).toBeNull();
|
const expectedToken = 'myLocalToken';
|
||||||
|
const expectedTokenMultimedia = 'myLocalTokenMultimedia';
|
||||||
|
const keepLogin = true;
|
||||||
|
|
||||||
await session.destroy(); // this clears token and user for any other test
|
await session.login({
|
||||||
|
token: expectedToken,
|
||||||
|
tokenMultimedia: expectedTokenMultimedia,
|
||||||
|
keepLogin,
|
||||||
});
|
});
|
||||||
},
|
|
||||||
{}
|
const roles = state.getRoles();
|
||||||
);
|
const localToken = localStorage.getItem('token');
|
||||||
|
const sessionToken = sessionStorage.getItem('token');
|
||||||
|
|
||||||
|
expect(roles.value).toEqual(expectedRoles);
|
||||||
|
expect(localToken).toEqual(expectedToken);
|
||||||
|
expect(sessionToken).toBeNull();
|
||||||
|
|
||||||
|
await session.destroy(); // this clears token and user for any other test
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe('RenewToken', () => {
|
describe('RenewToken', () => {
|
||||||
const expectedToken = 'myToken';
|
const expectedToken = 'myToken';
|
||||||
|
@ -175,7 +172,7 @@ describe('session', () => {
|
||||||
await session.checkValidity();
|
await session.checkValidity();
|
||||||
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
|
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
|
||||||
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
|
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
|
||||||
expectedTokenMultimedia
|
expectedTokenMultimedia,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
it('Should renewToken', async () => {
|
it('Should renewToken', async () => {
|
||||||
|
@ -204,7 +201,7 @@ describe('session', () => {
|
||||||
await session.checkValidity();
|
await session.checkValidity();
|
||||||
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
|
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
|
||||||
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
|
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
|
||||||
expectedTokenMultimedia
|
expectedTokenMultimedia,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { vi, describe, expect, it } from 'vitest';
|
import { vi, describe, expect, it } from 'vitest';
|
||||||
import { axios, flushPromises } from 'app/test/vitest/helper';
|
import axios from 'axios';
|
||||||
|
import { flushPromises } from '@vue/test-utils';
|
||||||
import { useTokenConfig } from 'composables/useTokenConfig';
|
import { useTokenConfig } from 'composables/useTokenConfig';
|
||||||
const tokenConfig = useTokenConfig();
|
const tokenConfig = useTokenConfig();
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
export function getValueFromPath(root, path) {
|
||||||
|
if (!root || !path) return;
|
||||||
|
const keys = path.toString().split('.');
|
||||||
|
let current = root;
|
||||||
|
|
||||||
|
for (const key of keys) {
|
||||||
|
if (current[key] === undefined) return undefined;
|
||||||
|
else current = current[key];
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
|
@ -0,0 +1,51 @@
|
||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
export async function beforeSave(data, getChanges, modelOrigin) {
|
||||||
|
try {
|
||||||
|
const changes = data.updates;
|
||||||
|
if (!changes) return data;
|
||||||
|
const patchPromises = [];
|
||||||
|
|
||||||
|
for (const change of changes) {
|
||||||
|
let patchData = {};
|
||||||
|
|
||||||
|
if ('hasMinPrice' in change.data) {
|
||||||
|
patchData.hasMinPrice = change.data?.hasMinPrice;
|
||||||
|
delete change.data.hasMinPrice;
|
||||||
|
}
|
||||||
|
if ('minPrice' in change.data) {
|
||||||
|
patchData.minPrice = change.data?.minPrice;
|
||||||
|
delete change.data.minPrice;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Object.keys(patchData).length > 0) {
|
||||||
|
const promise = axios
|
||||||
|
.get(`${modelOrigin}/findOne`, {
|
||||||
|
params: {
|
||||||
|
filter: {
|
||||||
|
fields: ['itemFk'],
|
||||||
|
where: { id: change.where.id },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then((row) => {
|
||||||
|
return axios.patch(`Items/${row.data.itemFk}`, patchData);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error('Error processing change: ', change, error);
|
||||||
|
});
|
||||||
|
|
||||||
|
patchPromises.push(promise);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await Promise.all(patchPromises);
|
||||||
|
|
||||||
|
data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error in beforeSave:', error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
|
@ -30,9 +30,16 @@ export function useAcl() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasAcl(model, prop, accessType) {
|
||||||
|
const modelAcl = state.getAcls().value[model];
|
||||||
|
const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
|
||||||
|
return !!(propAcl?.[accessType] || propAcl?.['*']);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fetch,
|
fetch,
|
||||||
hasAny,
|
hasAny,
|
||||||
state,
|
state,
|
||||||
|
hasAcl,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,12 +5,11 @@ import { useArrayDataStore } from 'stores/useArrayDataStore';
|
||||||
import { buildFilter } from 'filters/filterPanel';
|
import { buildFilter } from 'filters/filterPanel';
|
||||||
import { isDialogOpened } from 'src/filters';
|
import { isDialogOpened } from 'src/filters';
|
||||||
|
|
||||||
const arrayDataStore = useArrayDataStore();
|
|
||||||
|
|
||||||
export function useArrayData(key, userOptions) {
|
export function useArrayData(key, userOptions) {
|
||||||
key ??= useRoute().meta.moduleName;
|
key ??= useRoute().meta.moduleName;
|
||||||
|
|
||||||
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
if (!key) throw new Error('ArrayData: A key is required to use this composable');
|
||||||
|
const arrayDataStore = useArrayDataStore(); // Move inside function
|
||||||
|
|
||||||
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
if (!arrayDataStore.get(key)) arrayDataStore.set(key);
|
||||||
|
|
||||||
|
@ -56,7 +55,6 @@ export function useArrayData(key, userOptions) {
|
||||||
'searchUrl',
|
'searchUrl',
|
||||||
'navigate',
|
'navigate',
|
||||||
'mapKey',
|
'mapKey',
|
||||||
'keepData',
|
|
||||||
'oneRecord',
|
'oneRecord',
|
||||||
];
|
];
|
||||||
if (typeof userOptions === 'object') {
|
if (typeof userOptions === 'object') {
|
||||||
|
@ -108,7 +106,7 @@ export function useArrayData(key, userOptions) {
|
||||||
store.hasMoreData = limit && response.data.length >= limit;
|
store.hasMoreData = limit && response.data.length >= limit;
|
||||||
|
|
||||||
if (!append && !isDialogOpened() && updateRouter) {
|
if (!append && !isDialogOpened() && updateRouter) {
|
||||||
if (updateStateParams(response.data)?.redirect && !store.keepData) return;
|
if (updateStateParams(response.data)?.redirect) return;
|
||||||
}
|
}
|
||||||
store.isLoading = false;
|
store.isLoading = false;
|
||||||
canceller = null;
|
canceller = null;
|
||||||
|
@ -189,7 +187,7 @@ export function useArrayData(key, userOptions) {
|
||||||
|
|
||||||
store.order = order;
|
store.order = order;
|
||||||
resetPagination();
|
resetPagination();
|
||||||
fetch({});
|
await fetch({});
|
||||||
index++;
|
index++;
|
||||||
|
|
||||||
return { index, order };
|
return { index, order };
|
||||||
|
|
|
@ -14,7 +14,7 @@ export function useFilterParams(key) {
|
||||||
watch(
|
watch(
|
||||||
() => arrayData.value.store?.currentFilter,
|
() => arrayData.value.store?.currentFilter,
|
||||||
(val, oldValue) => (val || oldValue) && setUserParams(val),
|
(val, oldValue) => (val || oldValue) && setUserParams(val),
|
||||||
{ immediate: true, deep: true }
|
{ immediate: true, deep: true },
|
||||||
);
|
);
|
||||||
|
|
||||||
function parseOrder(urlOrders) {
|
function parseOrder(urlOrders) {
|
||||||
|
@ -54,7 +54,7 @@ export function useFilterParams(key) {
|
||||||
Object.assign(params, item);
|
Object.assign(params, item);
|
||||||
});
|
});
|
||||||
delete params[key];
|
delete params[key];
|
||||||
} else if (value && typeof value === 'object') {
|
} else if (value && typeof value === 'object' && !Array.isArray(value)) {
|
||||||
const param = Object.values(value)[0];
|
const param = Object.values(value)[0];
|
||||||
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
|
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ export function useRole() {
|
||||||
name: data.user.name,
|
name: data.user.name,
|
||||||
nickname: data.user.nickname,
|
nickname: data.user.nickname,
|
||||||
lang: data.user.lang || 'es',
|
lang: data.user.lang || 'es',
|
||||||
|
departmentFk: data.user?.worker?.department?.departmentFk,
|
||||||
};
|
};
|
||||||
state.setUser(userData);
|
state.setUser(userData);
|
||||||
state.setRoles(roles);
|
state.setRoles(roles);
|
||||||
|
|
|
@ -60,7 +60,7 @@ export function useSession() {
|
||||||
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
|
const { data: isValidToken } = await axios.get('VnUsers/validateToken');
|
||||||
if (isValidToken)
|
if (isValidToken)
|
||||||
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
|
destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
|
||||||
destroyToken(url, storage, key)
|
destroyToken(url, storage, key),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
@ -78,7 +78,8 @@ export function useValidator() {
|
||||||
if (min >= 0)
|
if (min >= 0)
|
||||||
if (Math.floor(value) < min) return t('inputMin', { value: min });
|
if (Math.floor(value) < min) return t('inputMin', { value: min });
|
||||||
},
|
},
|
||||||
custom: (value) => validation.bindedFunction(value) || 'Invalid value',
|
custom: (value) =>
|
||||||
|
eval(`(${validation.bindedFunction})`)(value) || 'Invalid value',
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -340,3 +340,6 @@ input::-webkit-inner-spin-button {
|
||||||
.containerShrinked {
|
.containerShrinked {
|
||||||
width: 70%;
|
width: 70%;
|
||||||
}
|
}
|
||||||
|
.q-item__section--main ~ .q-item__section--side {
|
||||||
|
padding-inline: 0;
|
||||||
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@ $positive: #c8e484;
|
||||||
$negative: #fb5252;
|
$negative: #fb5252;
|
||||||
$info: #84d0e2;
|
$info: #84d0e2;
|
||||||
$warning: #f4b974;
|
$warning: #f4b974;
|
||||||
|
$neutral: #b0b0b0;
|
||||||
// Pendiente de cuadrar con la base de datos
|
// Pendiente de cuadrar con la base de datos
|
||||||
$success: $positive;
|
$success: $positive;
|
||||||
$alert: $negative;
|
$alert: $negative;
|
||||||
|
@ -51,3 +52,6 @@ $width-xl: 1600px;
|
||||||
.bg-alert {
|
.bg-alert {
|
||||||
background-color: $negative;
|
background-color: $negative;
|
||||||
}
|
}
|
||||||
|
.bg-neutral {
|
||||||
|
background-color: $neutral;
|
||||||
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ globals:
|
||||||
quantity: Quantity
|
quantity: Quantity
|
||||||
entity: Entity
|
entity: Entity
|
||||||
preview: Preview
|
preview: Preview
|
||||||
|
scrollToTop: Go up
|
||||||
user: User
|
user: User
|
||||||
details: Details
|
details: Details
|
||||||
collapseMenu: Collapse lateral menu
|
collapseMenu: Collapse lateral menu
|
||||||
|
@ -19,6 +20,7 @@ globals:
|
||||||
logOut: Log out
|
logOut: Log out
|
||||||
date: Date
|
date: Date
|
||||||
dataSaved: Data saved
|
dataSaved: Data saved
|
||||||
|
openDetail: Open detail
|
||||||
dataDeleted: Data deleted
|
dataDeleted: Data deleted
|
||||||
delete: Delete
|
delete: Delete
|
||||||
search: Search
|
search: Search
|
||||||
|
@ -160,6 +162,9 @@ globals:
|
||||||
department: Department
|
department: Department
|
||||||
noData: No data available
|
noData: No data available
|
||||||
vehicle: Vehicle
|
vehicle: Vehicle
|
||||||
|
selectDocumentId: Select document id
|
||||||
|
document: Document
|
||||||
|
import: Import from existing
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Login
|
logIn: Login
|
||||||
addressEdit: Update address
|
addressEdit: Update address
|
||||||
|
@ -370,6 +375,11 @@ globals:
|
||||||
countryCodeFk: Country
|
countryCodeFk: Country
|
||||||
companyFk: Company
|
companyFk: Company
|
||||||
nickname: Alias
|
nickname: Alias
|
||||||
|
changedModel: Entity
|
||||||
|
changedModelValue: Search
|
||||||
|
changedModelId: Entity id
|
||||||
|
userFk: User
|
||||||
|
action: Action
|
||||||
model: Model
|
model: Model
|
||||||
fuel: Fuel
|
fuel: Fuel
|
||||||
active: Active
|
active: Active
|
||||||
|
@ -872,6 +882,11 @@ components:
|
||||||
active: Is active
|
active: Is active
|
||||||
floramondo: Is floramondo
|
floramondo: Is floramondo
|
||||||
showBadDates: Show future items
|
showBadDates: Show future items
|
||||||
|
name: Nombre
|
||||||
|
rate2: Grouping price
|
||||||
|
rate3: Packing price
|
||||||
|
minPrice: Min. Price
|
||||||
|
itemFk: Item id
|
||||||
userPanel:
|
userPanel:
|
||||||
copyToken: Token copied to clipboard
|
copyToken: Token copied to clipboard
|
||||||
settings: Settings
|
settings: Settings
|
||||||
|
|
|
@ -6,6 +6,7 @@ globals:
|
||||||
quantity: Cantidad
|
quantity: Cantidad
|
||||||
entity: Entidad
|
entity: Entidad
|
||||||
preview: Vista previa
|
preview: Vista previa
|
||||||
|
scrollToTop: Ir arriba
|
||||||
user: Usuario
|
user: Usuario
|
||||||
details: Detalles
|
details: Detalles
|
||||||
collapseMenu: Contraer menú lateral
|
collapseMenu: Contraer menú lateral
|
||||||
|
@ -20,10 +21,11 @@ globals:
|
||||||
date: Fecha
|
date: Fecha
|
||||||
dataSaved: Datos guardados
|
dataSaved: Datos guardados
|
||||||
dataDeleted: Datos eliminados
|
dataDeleted: Datos eliminados
|
||||||
|
dataCreated: Datos creados
|
||||||
|
openDetail: Ver detalle
|
||||||
delete: Eliminar
|
delete: Eliminar
|
||||||
search: Buscar
|
search: Buscar
|
||||||
changes: Cambios
|
changes: Cambios
|
||||||
dataCreated: Datos creados
|
|
||||||
add: Añadir
|
add: Añadir
|
||||||
create: Crear
|
create: Crear
|
||||||
edit: Modificar
|
edit: Modificar
|
||||||
|
@ -164,6 +166,9 @@ globals:
|
||||||
noData: Datos no disponibles
|
noData: Datos no disponibles
|
||||||
department: Departamento
|
department: Departamento
|
||||||
vehicle: Vehículo
|
vehicle: Vehículo
|
||||||
|
selectDocumentId: Seleccione el id de gestión documental
|
||||||
|
document: Documento
|
||||||
|
import: Importar desde existente
|
||||||
pageTitles:
|
pageTitles:
|
||||||
logIn: Inicio de sesión
|
logIn: Inicio de sesión
|
||||||
addressEdit: Modificar consignatario
|
addressEdit: Modificar consignatario
|
||||||
|
@ -371,6 +376,11 @@ globals:
|
||||||
countryCodeFk: País
|
countryCodeFk: País
|
||||||
companyFk: Empresa
|
companyFk: Empresa
|
||||||
nickname: Alias
|
nickname: Alias
|
||||||
|
changedModel: Entidad
|
||||||
|
changedModelValue: Buscar
|
||||||
|
changedModelId: Id de entidad
|
||||||
|
userFk: Usuario
|
||||||
|
action: Acción
|
||||||
errors:
|
errors:
|
||||||
statusUnauthorized: Acceso denegado
|
statusUnauthorized: Acceso denegado
|
||||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||||
|
@ -956,6 +966,11 @@ components:
|
||||||
to: Hasta
|
to: Hasta
|
||||||
floramondo: Floramondo
|
floramondo: Floramondo
|
||||||
showBadDates: Ver items a futuro
|
showBadDates: Ver items a futuro
|
||||||
|
name: Nombre
|
||||||
|
rate2: Precio grouping
|
||||||
|
rate3: Precio packing
|
||||||
|
minPrice: Precio mínimo
|
||||||
|
itemFk: Id item
|
||||||
userPanel:
|
userPanel:
|
||||||
copyToken: Token copiado al portapapeles
|
copyToken: Token copiado al portapapeles
|
||||||
settings: Configuración
|
settings: Configuración
|
||||||
|
|
|
@ -100,12 +100,8 @@ const onChangePass = (oldPass) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
hasitManagementAccess.value = useAcl().hasAny([
|
hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
|
||||||
{ model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
|
hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
|
||||||
]);
|
|
||||||
hasSysadminAccess.value = useAcl().hasAny([
|
|
||||||
{ model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
|
|
||||||
]);
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
|
@ -227,7 +223,7 @@ onMounted(() => {
|
||||||
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
<QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
<QItem
|
<QItem
|
||||||
v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
|
v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
|
||||||
v-ripple
|
v-ripple
|
||||||
clickable
|
clickable
|
||||||
@click="showSyncDialog = true"
|
@click="showSyncDialog = true"
|
||||||
|
|
|
@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
|
||||||
<QPopupProxy style="max-width: 10px">
|
<QPopupProxy style="max-width: 10px">
|
||||||
<AccountDescriptor
|
<AccountDescriptor
|
||||||
v-if="$attrs.id"
|
v-if="$attrs.id"
|
||||||
v-bind="$attrs.id"
|
v-bind="$attrs"
|
||||||
:summary="AccountSummary"
|
:summary="AccountSummary"
|
||||||
:proxy-render="true"
|
:proxy-render="true"
|
||||||
/>
|
/>
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue