Compare commits

..

915 Commits

Author SHA1 Message Date
Jose Antonio Tubau a2991281a7 Merge pull request 'refactor: refs #8413 vnInputDate component and improve date formatting logic' (!1700) from 8413-addDateYearAutofillVnInputDate into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1700
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-16 15:03:39 +00:00
Jose Antonio Tubau 66da64eb78 Merge branch 'dev' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 14:21:22 +00:00
Jose Antonio Tubau 210ff8427b Merge pull request '#8442 - createVehicleDms' (!1614) from 8422-createVehicleDms into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1614
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-16 14:20:23 +00:00
Jose Antonio Tubau 57a31e4f0b Merge branch '8413-addDateYearAutofillVnInputDate' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 16:16:16 +02:00
Jose Antonio Tubau fba386f8c4 refactor: refs #8413 remove redundant test for error color on invalid date input in VnInputDate component 2025-04-16 16:15:38 +02:00
Jose Antonio Tubau 5f0eabd626 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 15:26:33 +02:00
Jose Antonio Tubau 7bc53b131a Merge branch 'dev' into 8422-createVehicleDms 2025-04-16 15:26:31 +02:00
Jose Antonio Tubau 5053dbe1eb Merge branch 'dev' into 8413-addDateYearAutofillVnInputDate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 13:21:14 +00:00
Jose Antonio Tubau 0e66e3362f test: refs #8413 add validation for error color on invalid date input in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 15:20:45 +02:00
Jon Elias a6d2ee8ab2 Merge pull request '#8647 #8028 fix vitest warnings' (!1467) from 8647_fix_warnings into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1467
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-16 11:18:09 +00:00
Jose Antonio Tubau 290586e642 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 11:15:58 +00:00
Jose Antonio Tubau a3a6f1aa2b test: refs #8413 add data-cy attributes for form submit and stop buttons in InvoiceOutGlobalForm
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 13:14:52 +02:00
Jose Antonio Tubau 917ef597bb refactor: refs #8413 update date input test cases to use dot separators for date formatting
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 12:47:16 +02:00
Jon Elias 39228ed257 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 10:46:09 +00:00
Jon Elias fba4fbb759 Merge pull request '#7868: Added department.notificationEmail instead of user email' (!1717) from 7868-CustomerSample into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1717
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-16 10:43:23 +00:00
Jon Elias ebabbce34c Merge branch 'dev' into 7868-CustomerSample
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 10:31:45 +00:00
Jon Elias 2ef4a8c5de fix: refs #8647 fixed inputDateTime modelValue warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-16 11:42:58 +02:00
Jose Antonio Tubau eaab97072c feat: refs #8413 update input background color based on date validation in VnInputDate component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-16 10:11:23 +02:00
Jon Elias 75780f1ad2 fix: refs #8647 warning in VnInputDateTime
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:50:24 +02:00
Jon Elias 1a954cae60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-16 09:49:23 +02:00
Jon Elias 4add424471 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-16 09:43:13 +02:00
Jon Elias 4f1c49afb3 refactor: refs #8647 undo paginate changes 2025-04-16 09:43:11 +02:00
Alex Moreno 787f76b401 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-16 09:20:14 +02:00
Alex Moreno 665168dc45 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-16 09:20:09 +02:00
Javier Segarra 55a0a53915 Merge pull request '#8582 - test: e2e monitorTicket' (!1391) from e2e_monitor into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1391
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-15 21:04:47 +00:00
Javier Segarra caa5fdf587 Merge pull request 'hotfix: Ticket negative improve' (!1591) from hotfix_negative_available into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1591
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 21:04:28 +00:00
Jon Elias 7c7e492b6c feat: refs #7868 added department.notificationEmail instead of user email
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 16:25:05 +02:00
Jose Antonio Tubau b625258856 fix: refs #8413 ensure date input submits correctly in tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 16:05:03 +02:00
Jon Elias a4a9da9885 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 13:42:21 +00:00
Javier Segarra f615c5c196 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:35:38 +00:00
Jon Elias 77db8392cc Merge pull request 'Hotfix[routeSummary]: Show in table client id instead of client's name' (!1715) from Hotfix-RouteClient into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1715
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 13:22:36 +00:00
Jon Elias d8234ba141 Merge branch 'master' into Hotfix-RouteClient
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:00:44 +00:00
Jon Elias 65a3582e79 test: refs #8647 skip failling e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 14:38:39 +02:00
Pau Rovira 2eb70aadcb Merge pull request 'hotfix: make accountNumber to work on blur' (!1714) from hotfix_vnAccountNumber into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1714
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-15 12:38:24 +00:00
Jon Elias 1d573b5dee fix: show in table client id instead of client's name
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 14:37:09 +02:00
Pau Rovira d122752672 hotfix: make accountNumber to work on blur
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 11:54:26 +00:00
Javier Segarra 82b6fb6c2f fix: correct data retrieval after fetching in getData function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 13:49:21 +02:00
Jose Antonio Tubau f9f9caa493 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-15 11:40:33 +00:00
Pau Rovira 1a3e717620 Merge pull request 'feat: #8655 added button for scrolling up' (!1523) from 8655-scrollUpButton into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1523
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 11:26:06 +00:00
Javier Segarra 31acc3d0a1 Merge branch 'master' into hotfix_negative_available 2025-04-15 12:23:31 +02:00
Pau Rovira 5b3ef29294 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 09:55:59 +00:00
Javier Segarra a66849f361 fix: ensure submit is awaited
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:38:04 +02:00
Jon Elias 1b20b0de60 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 11:14:25 +02:00
Jon Elias 42b8e908fa test: refs #8647 skip intermitent failling e2e 2025-04-15 11:14:24 +02:00
Jon Elias 1ea8c0fc4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-15 11:13:26 +02:00
Guillermo Bonet 04e1f7a1b5 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:02:04 +02:00
Guillermo Bonet a7ccc68ab7 Merge branch 'master' into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:01:53 +02:00
Guillermo Bonet 917a7e8ecc fix: i18n error
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 11:01:40 +02:00
Jon Elias 4f7dcca917 Merge pull request 'fix: fixed dated when clicking an indefinetely/range event and delete when partial exclusion' (!1711) from Hotfix-ZoneExclusionDated into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1711
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 08:54:42 +00:00
Jose Antonio Tubau 005693550e Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 10:39:34 +02:00
Jose Antonio Tubau db06227b14 refactor: refs #8422 add document and import translations for DMS in global locales 2025-04-15 10:39:33 +02:00
Javier Segarra 64e30b7143 refactor: remove redundant form filling step in order creation test
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-15 10:38:00 +02:00
Jon Elias 63e7c55b7d fix: fixed dated when clicking an indefinetely/range event and delete when partial exclusion
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 10:32:12 +02:00
Jose Antonio Tubau 0e3247ceac Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 08:23:38 +00:00
Javier Segarra de359043af Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-15 07:43:11 +00:00
Jon Elias e6e43ccfc4 Merge pull request 'Hotfix[ZoneEventInclusion]: Fixed event inclusion duplicateKey' (!1710) from Hotfix-ZoneInclusionDeleteEvent into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1710
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-15 07:12:52 +00:00
Jon Elias dd74664eb6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-15 06:58:01 +00:00
Jon Elias dcf6d3cad4 Merge branch 'master' into Hotfix-ZoneInclusionDeleteEvent
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 06:49:23 +00:00
Jon Elias 0f7bb9cfe1 fix: fixed event inclusion duplicateKey because of props assignment in onMounted
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-15 08:46:31 +02:00
Alex Moreno e03e6b2305 build: init version
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 08:30:03 +02:00
Jose Antonio Tubau 76c6bd3048 refactor: refs #8422 update document ID prompt for clarity in Spanish and English locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-15 08:22:31 +02:00
Pau Rovira d171c7dd94 Merge pull request 'hotfix: fixed CustomerSamples table not loading correctly when reloading' (!1709) from hotfix_customerSamples into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1709
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-15 06:16:35 +00:00
Alex Moreno 12fdf567c4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-15 07:25:22 +02:00
Pau Rovira 01ac0f2921 Merge branch 'master' into hotfix_customerSamples
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-15 05:07:40 +00:00
Jon Elias b524a6d8eb Merge pull request 'Hotfix[ZoneEvents]: Fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event' (!1708) from Hotfix-ZoneExclusionDatedValue into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1708
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-14 14:38:09 +00:00
Jon Elias 9838342e27 Merge branch 'master' into Hotfix-ZoneExclusionDatedValue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 13:56:39 +00:00
Alex Moreno be7c63150c Merge pull request 'fix: add unremovableParams to VnFilterPanel for better filtering control' (!1705) from fix_ticketList_fromTo_unremovable into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1705
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2025-04-14 13:16:11 +00:00
Alex Moreno bbd07e71fa Merge branch 'master' into fix_ticketList_fromTo_unremovable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 12:55:50 +00:00
Jon Elias 6692b499d2 Merge branch 'Hotfix-ZoneExclusionDatedValue' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneExclusionDatedValue
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 14:34:08 +02:00
Jon Elias 78f1756edc fix: dated name 2025-04-14 14:34:07 +02:00
Pau Rovira 9919352e8c hotfix: fixed CustomerSamples table not loading correctly when reloading
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 12:32:11 +00:00
Jon Elias 690d807ef1 Merge branch 'master' into Hotfix-ZoneExclusionDatedValue
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-14 12:19:19 +00:00
Jon Elias ff6d2a71bf fix: fixed zone exclusion dated and fixed exclusion and inclusion when there was already an event
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 13:44:53 +02:00
Jose Antonio Tubau 46c0e4bc74 test: refs #8422 skip download DMS test to prevent execution during current test run
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 13:43:52 +02:00
Javier Segarra f49f694970 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 11:09:13 +00:00
Javier Segarra d399afcd89 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 10:39:54 +00:00
Jose Antonio Tubau b26be0bf6d feat: refs #8422 add testDmsAction command to handle create and delete actions with improved logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:27:15 +02:00
Jose Antonio Tubau be877fa2b8 refactor: refs #8422 add testDmsAction command for streamlined DMS operations in Cypress tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 12:07:58 +02:00
Jon Elias 239e008aba Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:24:47 +02:00
Jon Elias 38bd00e82a test: refs #8647 fix skipped tests 2025-04-14 11:24:45 +02:00
Jon Elias 7119cbbe89 Merge pull request 'Hotfix[ClientConsumption]: Fixed arrayData key' (!1706) from Hotfix-ClientConsumption into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1706
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-14 09:19:00 +00:00
Jon Elias db85936963 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-14 11:14:41 +02:00
Jon Elias 516e89d445 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:14:00 +00:00
Pau Rovira 2e8192ef7b Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 09:13:39 +00:00
Javier Segarra dea2ddcd6c test: skip test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-14 11:12:13 +02:00
Javier Segarra b162dd7672 test: remove filter by column
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 11:09:21 +02:00
Jon Elias 05311b8ffa fix: skip failing test
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-14 10:56:28 +02:00
Jon Elias 57955ec2d5 fix: refs #8647 vndms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 10:33:13 +02:00
Javier Segarra d1440c1083 Merge branch 'dev' into e2e_monitor 2025-04-14 10:16:43 +02:00
Jon Elias 180153d8f0 fix: skip failing tests
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 10:08:44 +02:00
Jon Elias 3782e7e8d7 fix: refs #8647 skip tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-14 09:49:44 +02:00
Jon Elias 535bfa4347 fix: fixed arrayData key
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 09:00:18 +02:00
Alex Moreno 6acd2e9e9f fix: add unremovableParams to VnFilterPanel for better filtering control
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-14 08:38:16 +02:00
Jon Elias 797ce5922d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-14 08:04:31 +02:00
Pau Rovira 3bcafc5734 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-14 07:19:15 +02:00
Pau Rovira 199a6c8cce Merge pull request 'fix: fixed CustomerConsumption errors when changing customer & downloading pdf' (!1666) from fix-CustomerConsumption into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1666
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-14 05:17:46 +00:00
Pau Rovira 8309e2cddf Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-14 05:13:42 +00:00
Guillermo Bonet 8e45abd041 Merge pull request 'refactor: refs #8289 Delete guessPriority method' (!1704) from 8289-routeGuessPriority into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1704
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-14 05:02:24 +00:00
Guillermo Bonet b50ad72155 refactor: refs #8289 Delete guessPriority method
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-13 09:42:08 +02:00
Guillermo Bonet c43f8f8af4 Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-13 09:37:09 +02:00
Javier Segarra 510eab8af0 feat: fix minor bugs
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-11 15:04:24 +02:00
Jose Antonio Tubau b45c97e3c1 test: refs #8422 remove 'only' from download DMS test to ensure all tests run
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 14:01:05 +02:00
Jon Elias a547188498 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 13:44:44 +02:00
Jon Elias df39cd4eca perf: refs #8647 paginate 2025-04-11 13:44:43 +02:00
Jon Elias 19481209d8 Merge pull request 'Fix[InputBic]: Fixed filter' (!1701) from Fix-AutoFillBic into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1701
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 11:38:41 +00:00
Jon Elias 88099a9f34 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-11 11:33:25 +00:00
Jon Elias 9410257822 Merge branch 'dev' into Fix-AutoFillBic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 11:33:09 +00:00
Javi Gallego b321ab3240 Merge pull request 'refactor: refs #6696 remove VnUsesMana component and update related logic in TicketEditMana and TicketSale' (!1675) from 6696-manaAfterDepartment into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1675
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 10:39:56 +00:00
Javier Segarra b32a889dfe feat: updates 2025-04-11 12:30:37 +02:00
Jose Antonio Tubau ec906daf41 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:20:03 +02:00
Jose Antonio Tubau 800e5e18d4 test: refs #8422 update download DMS test to verify file download response 2025-04-11 12:20:01 +02:00
Benjamin Esteve 190310f285 Merge pull request 'refactor: refs #8833 streamline state color handling in Claim components' (!1691) from 8833-addColumnClassColor into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1691
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-11 10:19:03 +00:00
Jon Elias 19fde32006 fix: fixed filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 12:03:24 +02:00
Javi Gallego 1125067b09 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 12:02:55 +02:00
Jose Antonio Tubau 2159ce0897 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 10:02:48 +00:00
Javi Gallego 50ab4d28c2 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 12:01:57 +02:00
Jon Elias 27691943d3 perf: refs #8647 warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 11:56:53 +02:00
Jon Elias be3c48b9f1 refactor: refs #8647 solved inject warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 11:50:39 +02:00
Benjamin Esteve 76a2c8200f Merge branch 'dev' into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 09:13:22 +00:00
Jorge Penadés ce1aa3fb1b Merge pull request 'feat: refs #6564 add agency & ticket list' (!1108) from 6564-enhanceTicketAdvance into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1108
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-11 09:11:10 +00:00
Jorge Penadés 8f141bba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:49:06 +02:00
Benjamin Esteve 5c6e97b42a feat: refs #8833 add neutral color variable and update state color handling in claim components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:44:57 +02:00
Jose Antonio Tubau 6dddad95c9 fix: refs #8422 correct spelling of 'PopUp' in checkRedirectionFromPopup command
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 10:43:49 +02:00
Jon Elias a4e4c882ee refactor: refs #8647 deleted many warnings and skipped only true failing e2e in local branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 10:17:11 +02:00
Javier Segarra 37bc464a98 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-11 10:06:21 +02:00
Javier Segarra 5fca08aaa2 test: add VnInputDateTime component tests 2025-04-11 10:05:47 +02:00
Benjamin Esteve 5225a9f57c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 09:45:18 +02:00
Jose Antonio Tubau 9a0211787a refactor: refs #8422 implement checkRedirectionFromPopup command and refactor tests for improved readability
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 09:01:47 +02:00
Jon Elias e4da145a5e refactor: refs #8647 skip front failing test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:53:43 +02:00
Jose Antonio Tubau e84107dcbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:26:15 +02:00
Jose Antonio Tubau 6dc9f3ca07 refactor: refs #8413 vnInputDate component and improve date formatting logic
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 08:15:03 +02:00
Jon Elias 2678ac5def feat: refs #8647 unskipp e2e to test which of them are really failling and fixed VnDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-11 08:01:46 +02:00
Javi Gallego 4e0450bf36 fix: rename variable for clarity in updateDiscount function
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-11 07:52:41 +02:00
Javi Gallego bf1bb002e6 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-11 07:44:18 +02:00
Jon Elias 915776c4e8 Merge pull request 'Fix[Swift/Bic]: Fixed autocomplete when entering an iban' (!1697) from Fix-CustomerBillingData into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1697
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-11 05:24:01 +00:00
Jon Elias f0a6fc00cf Merge branch 'dev' into Fix-CustomerBillingData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-11 04:11:15 +00:00
Jorge Penadés 96b57cab33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 18:22:38 +02:00
Jorge Penadés 85fa1543c1 Merge branch '8647_fix_warnings' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 18:10:45 +02:00
Jorge Penadés 7ee32158c7 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-10 18:09:47 +02:00
Jon Elias 6976569c42 Merge pull request 'Hotfix: SummaryProblems' (!1699) from Hotfix-TicketSummaryAddress into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1699
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-10 14:57:06 +00:00
Jon Elias 02b7afb9ec Merge branch 'Hotfix-TicketSummaryAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 16:13:59 +02:00
Jon Elias 3027d579cf perf: deleted !important 2025-04-10 16:13:57 +02:00
Jon Elias 9e74a4a3f8 Merge branch 'master' into Hotfix-TicketSummaryAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 13:44:53 +00:00
Jon Elias 6b6118c66c fix: fixed recommended credit not showing correctly
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-04-10 15:03:03 +02:00
Javier Segarra 31451a86ed fix: 'shippedDate' filter
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-10 14:59:52 +02:00
Jon Elias b54bb22967 perf: english translation 2025-04-10 14:59:12 +02:00
Jon Elias db1f5e3083 perf: tooltip
gitea/salix-front/pipeline/pr-master Build queued... Details
2025-04-10 14:57:46 +02:00
Jon Elias 2be108c897 fix: ticket client address
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-10 14:54:41 +02:00
Jon Elias 0e5e092450 fix: ticket address and fixed CustomerSummary height fields 2025-04-10 14:53:25 +02:00
Javier Segarra 5e0f0caa2e Merge pull request 'fix: update phone number VnTable.Card and CustomerBalance checkbox' (!1696) from hotfix_customer_minorchanges into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1696
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-04-10 11:22:38 +00:00
Jon Elias 82f4397fd4 fix: simplify @update-bic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 13:02:06 +02:00
Jon Elias bc6d11846f fix: fixed autocomplete when entering an iban
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 12:37:14 +02:00
Javier Segarra 0b6ba8fc5e Merge branch 'master' into hotfix_customer_minorchanges
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 10:26:06 +00:00
Javier Segarra 954c5a3bad fix: update phone number component handling
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-10 12:11:10 +02:00
Jon Elias d24e153033 Merge pull request '#8363: Modified ItemFixedPrice' (!1561) from 8363-RefactorItemFixedPrice into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1561
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-10 10:01:29 +00:00
Jon Elias d5b5c33bc0 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 07:57:07 +00:00
Benjamin Esteve 2f122725e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 09:56:49 +02:00
Alex Moreno c0ce2af459 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 07:40:45 +00:00
Jon Elias aefb7b7dcb feat: refs #8647 vitest fail on warning
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-10 09:34:18 +02:00
Jon Elias 7816150693 Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 08:56:06 +02:00
Jon Elias 289f5ce404 refactor: refs #8363 translations and fixed popup 2025-04-10 08:56:05 +02:00
Benjamin Esteve c633a3e283 Merge pull request 'fix(CustomerSummary): refs #8824 include insurance grade in secured credit display' (!1687) from 8824-showCreditGrade into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1687
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-10 06:54:45 +00:00
Benjamin Esteve 7325b68bd9 Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 06:45:21 +00:00
Pablo Natek 5d6af7bfdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 08:31:28 +02:00
Jon Elias b7ed24dd72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice 2025-04-10 08:17:09 +02:00
Jon Elias 15c8f4ac43 Merge pull request 'Fix: InvoiceInList E2E' (!1694) from Fix-InvoiceInListE2E into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1694
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-10 06:12:57 +00:00
Jon Elias 659050700b fix: fixed and skipped e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-10 08:08:46 +02:00
Javi Gallego 0e7da211df fix: refs #6696 standardize viewport size in Cypress tests for consistency
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-10 07:30:26 +02:00
Javier Segarra fd36bd7c7e Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 22:44:12 +02:00
Javier Segarra 80fb1eaf6a test: enhance monitor client actions and ticket tests with Cypress intercepts 2025-04-09 22:38:30 +02:00
Javier Segarra 5f2e2421a8 refactor: streamline visibility checks in monitor tests and update login role 2025-04-09 20:57:26 +02:00
Javier Segarra e7bb829bf5 test: perf clientAndActions 2025-04-09 20:35:47 +02:00
Jon Elias 6f4b618a7f fix: fixed e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 16:45:38 +02:00
Jon Elias eb4340122d fix: fixed e2e 2025-04-09 16:44:11 +02:00
Jon Elias a74e1102ed test: refs #8647 deleted all warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 15:32:53 +02:00
Javi Gallego 70d8b65fcb Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 14:05:35 +02:00
Jon Elias d31c2d55eb test: refs #8647 fix warnings arraydata and vnselect
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 14:00:52 +02:00
Jon Elias da1321ee34 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 13:04:36 +02:00
Jon Elias 3350f9d6a7 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-04-09 13:04:25 +02:00
Benjamin Esteve 2df532d739 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8833-addColumnClassColor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 12:43:05 +02:00
Jon Elias 629af07502 Merge pull request 'fix: allow description field autogrow' (!1692) from Hotfix-TicketNotesDescription into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1692
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-09 10:27:08 +00:00
Jon Elias bc6ce826ce feat: prevent default with enter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-09 12:06:22 +02:00
Alex Moreno 4351ee4976 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 09:21:20 +00:00
Alex Moreno eab1994fb8 fix(find-imports): remove the specific one if the module is there
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-09 11:21:00 +02:00
Jon Elias f3de8ecb73 fix: allow description field autogrow
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-09 11:08:51 +02:00
Javier Segarra d0f4eb9db9 feat: handle action notification 2025-04-09 10:59:43 +02:00
Benjamin Esteve d8a5945bce refactor: refs #8833 streamline state color handling in Claim components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 10:37:30 +02:00
Jon Elias 6a129c89d7 perf: refs #8363 e2e intermittence
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 09:54:15 +02:00
Javi Gallego b521aa86f3 fix(TicketSale): refs #6696 pass componentId to updateDiscount functions 2025-04-09 09:53:03 +02:00
Javi Gallego bd8747e1fd fix: refs #6696 remove viewport from various cypress test files 2025-04-09 09:52:43 +02:00
Benjamin Esteve ef8d45fd21 Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-09 07:26:52 +00:00
Jon Elias 955c4718dd Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-09 08:50:13 +02:00
Jon Elias 96b20f6711 fix: refs #8363 conflicts 2025-04-09 08:50:11 +02:00
Alex Moreno 3f01436d02 Merge pull request 'fix(VnLog): update filter to include originFk and improve sorting in VnLogFilter' (!1690) from hotFix_vnLogFilter_changeId into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1690
2025-04-09 06:44:56 +00:00
Alex Moreno c47cb05cbd fix(VnLog): update filter to include originFk and improve sorting in VnLogFilter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-09 08:23:38 +02:00
Alex Moreno ac7fab7ada Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-09 07:41:26 +02:00
Javier Segarra 4399217b4b Merge pull request 'InvoiceOut change columns order' (!1415) from minor_requested_changes_invoiceOutList into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1415
2025-04-08 13:29:12 +00:00
Javier Segarra 3edd00d500 Merge pull request 'Add `vitest ui` as devDependency' (!1688) from vitest_ui into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1688
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 13:24:42 +00:00
Javier Segarra 6f938021bf Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-08 13:10:43 +00:00
Alex Moreno 9d00668acb Merge pull request 'hotFix_vnJsonValue_showHours' (!1689) from hotFix_vnJsonValue_showHours into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1689
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-08 13:00:58 +00:00
Javier Segarra 7e56cb96ef Merge pull request '#8725 - submit_form_onClick' (!1564) from 8725_submit_form_onClick into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1564
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 12:58:50 +00:00
Javier Segarra 87925d3fad Merge branch 'dev' into vitest_ui
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 12:57:32 +00:00
Javier Segarra 36ff68900f Merge pull request 'test: #7356 Ticket e2e' (!1531) from 7356_e2e into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1531
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 12:31:23 +00:00
Alex Moreno e081543d39 Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-08 12:19:43 +00:00
Javier Segarra 77e01ed55c Merge branch 'dev' into vitest_ui
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 12:14:30 +00:00
Alex Moreno a2f8a61c20 fix(WorkerPDA): fetching available PDA data when add and remove pda
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 14:11:43 +02:00
Javier Segarra a24bc6cc4b Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 12:09:48 +00:00
Alex Moreno 9d2c0bf211 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 13:34:01 +02:00
Alex Moreno 123ec41f32 fix(WorkerCalendarFilter): fix style year and contract filter
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 13:32:31 +02:00
Javier Segarra d6362d042d Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 11:31:00 +00:00
Javier Segarra 1b695be63f feat: add vitest ui devDependency
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-08 13:30:22 +02:00
Alex Moreno d3b413fc25 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 11:19:33 +00:00
Javier Segarra e809e598f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-04-08 12:54:06 +02:00
Javier Segarra 8f5b4af7cc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_negative_available 2025-04-08 12:30:29 +02:00
Javier Segarra 1e1096a108 Merge pull request 'fix: FilterPanel when is multiline and VnTable vh on n toolbar' (!1657) from fix_itemFilter_multiLine into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1657
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 10:17:23 +00:00
Javier Segarra 9d31a75dfe Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 10:00:52 +00:00
Javier Segarra af0c30f798 test: refs #8725 add save action to form model popup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 11:57:21 +02:00
Javier Segarra 9cadb4a02b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick 2025-04-08 11:12:22 +02:00
Benjamin Esteve b4611aad4c Merge branch 'dev' into 8824-showCreditGrade
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 09:08:41 +00:00
Javi Gallego 5bd2859e5d fix: refs #6696 update login role in tests and add data attributes for component options
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-08 10:33:11 +02:00
Javier Segarra 3c6bed6d7e Merge pull request '#8446 - update_vitest_version to 2.0.0' (!1127) from update_vitest_version into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1127
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-08 08:09:34 +00:00
Javier Segarra af4a398a90 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 07:50:56 +00:00
Javier Segarra d91d5351c3 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 07:48:18 +00:00
Benjamin Esteve 0e3406a502 fix(CustomerSummary): refs #8824 include insurance grade in secured credit display
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-08 09:23:58 +02:00
Javi Gallego 4e40156c38 Merge branch 'dev' into 6696-manaAfterDepartment
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-08 09:01:48 +02:00
Alex Moreno c9957371df Merge branch 'master' into hotFix_vnJsonValue_showHours 2025-04-08 06:58:44 +00:00
Alex Moreno 15cbbab043 fix(WorkerPDA): fix translations
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 08:35:27 +02:00
Alex Moreno 2a3e8f293a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 08:28:17 +02:00
Alex Moreno ffd83e7e0f fix(WorkerPDA): use observation field
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 08:27:51 +02:00
Alex Moreno 72d9f9345c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 07:24:04 +02:00
Alex Moreno e0ba8ab742 refactor: rollback
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-08 07:22:12 +02:00
Javier Segarra 2cb151e181 fix: update pnpm-lock.yaml
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 17:43:06 +02:00
Javier Segarra 0440115d5a Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 15:35:49 +02:00
Javier Segarra 5e9fe20f08 Merge branch 'update_vitest_version' of https://gitea.verdnatura.es/verdnatura/salix-front into update_vitest_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 15:35:19 +02:00
Javier Segarra dc93d1d394 Merge branch 'dev' into update_vitest_version 2025-04-07 15:35:14 +02:00
Javier Segarra 1fc9dc1ca6 Merge branch 'dev' into fix_itemFilter_multiLine 2025-04-07 13:27:30 +00:00
Alex Moreno 562b3c88f0 Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 12:33:35 +00:00
Alex Moreno 2d129dde01 fix: enable Jenkins find changes
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 14:14:22 +02:00
Alex Moreno d142797b1f fix: update Jenkinsfile to remove unused module retrieval and modify cypressParallel.sh invocation
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 14:03:43 +02:00
Alex Moreno 2b5802a7fb fix: update cypressParallel.sh invocation to use an empty string for modules
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 14:01:51 +02:00
Alex Moreno 3549f172d6 fix: pass modules as argument to cypressParallel.sh in Jenkinsfile
gitea/salix-front/pipeline/head Build queued... Details
2025-04-07 14:01:37 +02:00
Jon Elias b782da7a8d Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 11:47:04 +00:00
Alex Moreno d6363e4b45 fix: temporal fix
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:36:43 +02:00
Alex Moreno 22f1373c84 fix: handle empty changes in getChangedModules function
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:31:52 +02:00
Jon Elias 7cc06adeef Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 11:23:45 +00:00
Jon Elias 11994b80b0 refactor: refs #8363 requested changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 13:20:00 +02:00
Alex Moreno 488d48e9e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:13:58 +02:00
Alex Moreno 642589d054 Merge pull request 'ci: refs #8698 Jenkins changeset' (!1525) from 8698_jenkins_e2e_onlyChanges into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1525
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-07 11:13:38 +00:00
Alex Moreno 3fd3fef647 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 13:12:54 +02:00
Alex Moreno 582c7c8d40 Merge branch 'dev' into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 10:47:24 +00:00
Alex Moreno 5edf3f7efe fix: skip invoice transfer test in InvoiceOut summary
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-07 12:34:48 +02:00
Javier Segarra d55ec1c738 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-07 10:28:05 +00:00
Javier Segarra e8a3dc05dd fix: customer insurance grade
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 12:25:16 +02:00
Alex Moreno 455fd72db4 fix: refs #8698 update import path resolution to read jsconfig.json using fs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 12:20:40 +02:00
Javier Segarra d4053d74d2 Merge pull request '#8006 - eslint_rules' (!1454) from 8006_eslint_rules into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1454
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-07 10:02:42 +00:00
Alex Moreno e474e21309 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:44:24 +00:00
Javier Segarra eb5a0956a7 Merge branch 'dev' into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 09:41:33 +00:00
Alex Moreno 406b25103d Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 11:07:34 +02:00
Alex Moreno e2b77ac2ed Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-07 09:06:33 +00:00
Alex Moreno 12e4435709 fix: update Cypress parallel test execution to use a single instance
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 11:06:23 +02:00
Alex Moreno 830f506f5b fix: adjust Cypress parallel test execution to run with a single instance
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-07 11:06:02 +02:00
Alex Moreno c7f25d6909 feat: refs #8698 enhance module detection in Cypress tests and resolve import paths using jsconfig
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 10:37:45 +02:00
Jose Antonio Tubau 2715502aba fix: refs #8422 ensure checkbox state toggles correctly in route extended list tests
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 09:25:16 +02:00
Alex Moreno c89fd0580f fix: refs #8698 update log message for E2E modules in Jenkinsfile
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-07 09:10:21 +02:00
Alex Moreno 4db9adb20a feat: refs #8698 log modules found during Cypress test setup
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-07 09:09:49 +02:00
Alex Moreno f9bf2e7a3e Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-07 09:07:49 +02:00
Alex Moreno c9e5e86465 Merge branch 'master' into hotFix_vnJsonValue_showHours
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-07 07:04:20 +00:00
Javier Segarra 6553a1a7fc Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-07 05:52:15 +00:00
Javier Segarra 7c4c708342 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-07 05:52:06 +00:00
Javi Gallego d637ca9785 fix: refs #6696 handle optional chaining and ensure async operations in TicketSale components 2025-04-06 13:26:33 +02:00
Pau Rovira 1f8051081e Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 11:56:56 +00:00
Javier Segarra 0a90c62369 test: changes requested
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 13:08:14 +02:00
Javier Segarra bcad2dea1b Merge branch 'dev' into e2e_monitor 2025-04-04 13:07:46 +02:00
Jose Antonio Tubau 6ddcf57b08 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 10:06:34 +00:00
Alex Moreno a3d828498b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 11:36:25 +02:00
Alex Moreno 4f821c86c1 fix: warnings
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 11:35:53 +02:00
Alex Moreno 3349aebdde fix: update date display format in VnJsonValue tests to include time
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-04-04 11:22:54 +02:00
Jon Elias 4857962955 Merge pull request 'Warmfix[CardSumary]: Use ellipsis property and fixed summary cards to flex correctly' (!1670) from Fix-SummaryCardsFlex into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1670
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-04 09:07:37 +00:00
Jon Elias 624eac7094 Merge branch 'Fix-SummaryCardsFlex' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-04 10:45:36 +02:00
Jon Elias f50f747310 fix: skip failing e2e 2025-04-04 10:45:34 +02:00
Jon Elias 0304010f62 fix: refs #8363 skip failing e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-04 10:44:56 +02:00
Jon Elias 5e999e0fb1 fix: refs #8363 ended v-model
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 10:11:39 +02:00
Jon Elias 5110a46328 Merge branch 'test' into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-04 07:52:38 +00:00
Javier Segarra bcee01280c Merge branch 'warmfix_vnLinkPhone' into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 09:51:46 +02:00
Javier Segarra 3c4c27889e fix: correct data-cy for SendEmailNotificationDialogInput 2025-04-04 09:50:37 +02:00
Javier Segarra b7625f06bd Merge branch 'warmfix_ticketList_sortByShipped' into test 2025-04-04 09:50:02 +02:00
Alex Moreno 8f3ec13ccc fix: remove unnecessary width properties from Route tables
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-04 08:58:10 +02:00
Alex Moreno a84743d890 fix: remove debug logging from updateValue function in VnJsonValue component
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-04-04 08:53:40 +02:00
Alex Moreno 103835d08b fix: update date formatting in VnJsonValue component to include hours, minutes, and seconds
gitea/salix-front/pipeline/pr-master Something is wrong with the build of this commit Details
2025-04-04 08:53:05 +02:00
Jon Elias 5eee9965bf Merge branch 'Fix-SummaryCardsFlex' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-04-04 08:51:03 +02:00
Jon Elias e5f079121d refactor: undo skip due to its fix in other PR 2025-04-04 08:51:01 +02:00
Jon Elias a5d3babf1f Merge branch 'test' into Fix-SummaryCardsFlex
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-04 06:23:39 +00:00
Jon Elias 5af6b60a4a Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 08:23:14 +02:00
Jon Elias 1185c345d8 fix: refs #8363 fixed buyer select 2025-04-04 08:23:12 +02:00
Alex Moreno dc6487475f Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-04 06:04:18 +00:00
Jon Elias f32d07ccaa fix: skip test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-04 07:44:36 +02:00
Jon Elias 1f5e4bd771 perf: use grid template instead of flex in card-group
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-04 06:58:24 +02:00
Javier Segarra 1a7a8dfc95 fix: add 'hour' translation to English locale for ticket list
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-03 20:10:05 +02:00
Javier Segarra 21c3384509 fix: use optional chaining for departmentFk in useRole composable
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-03 20:07:54 +02:00
Javier Segarra 2992ac2d0d fix: rename 'shipped' to 'shippedDate' and 'shippedHour' 2025-04-03 20:06:31 +02:00
Jose Antonio Tubau a1e21d156b refactor: refs #8422 update RouteAutonomous tests to improve readability and maintainability
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 15:06:50 +02:00
Jose Antonio Tubau 5e2a74125f Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 14:10:47 +02:00
Jose Antonio Tubau 7aeb75d4e1 refactor: refs #8422 simplify DMS creation test by using fillInForm utility
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 13:02:15 +02:00
Javier Segarra 88d8562189 Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-03 09:45:49 +00:00
Jose Antonio Tubau dab3a2ce09 Merge branch '8422-createVehicleDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 10:28:47 +02:00
Jose Antonio Tubau 070def57bb refactor: refs #8422 update vehicle DMS tests and add download verification 2025-04-03 10:28:40 +02:00
Javier Segarra cb1e1aa594 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 09:37:15 +02:00
Alex Moreno dc566b3902 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 07:02:35 +00:00
Javier Segarra 9b337062c8 Merge branch 'test' into warmfix_vnLinkPhone
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-03 05:38:38 +00:00
Alex Moreno 6ef3df2322 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-03 07:18:44 +02:00
Alex Moreno e9ef1c308e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-03 07:18:37 +02:00
Jose Antonio Tubau 5cc599a0e6 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 05:17:49 +00:00
Javier Segarra c08b3648f2 test: arrayData
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-03 01:36:30 +02:00
Javier Segarra d78460a438 test: add unit tests for useArrayDataStore and mock axios in axios.spec.js 2025-04-03 01:24:00 +02:00
Javier Segarra d406715a70 test: improve test 2025-04-03 00:56:54 +02:00
Javier Segarra fd036138e4 chore: update dependencies and configuration for vue-i18n and eslint 2025-04-03 00:40:52 +02:00
Javier Segarra e5005d08ed Merge branch 'dev' into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 22:33:45 +00:00
Javier Segarra 8523f85b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into update_vitest_version 2025-04-03 00:32:24 +02:00
Javier Segarra 7706d77f55 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 20:30:14 +00:00
Javier Segarra 2afa0765b9 refactor: remove unused fields from monitorTicket test cases
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 19:18:48 +02:00
Jon Elias 7ef02c8797 refactor: deleted unnecessary code
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 16:18:48 +02:00
Jorge Penadés 20ed8001bf Merge pull request 'test: refs #8441 enable invoice deletion test in invoiceInDescriptor.spec.js' (!1671) from 8441-warmfix-includeTest into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1671
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 14:10:26 +00:00
Jorge Penadés c700521b37 Merge pull request 'fix: refs #5835 update icon for invoice button in InvoiceInDescriptor' (!1676) from 5835-hotfix-icon into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1676
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-02 14:06:43 +00:00
Jorge Penadés b2ce75d2f6 fix: refs #5835 update icon for invoice button in InvoiceInDescriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-02 15:54:55 +02:00
Jorge Penadés a5b27b3683 Merge branch 'test' into 8441-warmfix-includeTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 13:49:36 +00:00
Javi Gallego 85f74e5ad8 refactor: refs #6696 remove VnUsesMana component and update related logic in TicketEditMana and TicketSale
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-02 15:38:39 +02:00
Jorge Penadés daa3289b58 Merge pull request 'refactor: refs #8326 conditionally render vn-card-content based on advancedSummary' (!1668) from 8326-warmfix-preventNull into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1668
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 13:26:48 +00:00
Javier Segarra 1c96090d02 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 15:25:49 +02:00
Javier Segarra 6df58d021a test: refs #7356 ticketSaleTracking 2025-04-02 15:25:27 +02:00
Jorge Penadés 8c132298bb Merge pull request 'fix: refs #5835 update ticket references to invoices in InvoiceInDescriptor and localization files' (!1674) from 5835-hotfix-changeLocale into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1674
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 13:11:10 +00:00
Jorge Penadés fa1a9da29e fix: refs #6564 update condition for displaying deleted ticket icon in TicketProblems.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 15:10:27 +02:00
Jorge Penadés 07a36b4e53 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-04-02 15:09:56 +02:00
Jorge Penadés e444828e4e Merge branch 'test' into 8326-warmfix-preventNull
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 13:01:29 +00:00
Jorge Penadés ce72c78af7 Merge branch 'test' into 8441-warmfix-includeTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 13:01:15 +00:00
Alex Moreno a472e35bcf Merge pull request 'fix: refs #8449 reset pagination in VnLog and bind all attributes in AccountDescriptorProxy' (!1673) from 8449-fixes_2 into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1673
2025-04-02 13:01:01 +00:00
Jorge Penadés 832646638b fix: refs #5835 update ticket references to invoices in InvoiceInDescriptor and localization files
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-02 14:50:17 +02:00
Jorge Penadés cf05dc0d5b Merge branch 'test' into 8441-warmfix-includeTest
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:44:13 +00:00
Jorge Penadés 5afc9ce983 Merge branch 'test' into 8326-warmfix-preventNull
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:43:56 +00:00
Alex Moreno 00ed955577 fix: refs #8449 reset pagination in VnLog and bind all attributes in AccountDescriptorProxy
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 14:39:23 +02:00
Javier Segarra a780786a2c style: select needs filled
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:27:07 +02:00
Javier Segarra 088c401723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 14:26:09 +02:00
Javier Segarra 19751ee3fb test: monitorTicket remove count rows and check checkbox 2025-04-02 14:26:05 +02:00
Jon Elias 76c07d2102 Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-02 14:25:42 +02:00
Jon Elias 0c4e88a45e refactor: refs #8363 fix create fields 2025-04-02 14:25:40 +02:00
Alex Moreno 00e1e4441c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:21:02 +02:00
Alex Moreno 6fd01a4d09 fix: remove duplicate departmentFk entries in CustomerFilter.vue
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 14:20:58 +02:00
Alex Moreno a4b710352d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head Build queued... Details
2025-04-02 14:18:19 +02:00
Alex Moreno 4821390f22 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-04-02 14:18:12 +02:00
Pablo Natek 8b24874f72 Merge pull request 'refactor: improve layout and styling in ExtraCommunity.vue' (!1669) from warmFixExtraComunityFieldsDisplay into test
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 12:18:08 +00:00
Alex Moreno 425e2adcdb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-04-02 14:17:44 +02:00
Jon Elias 8bdc71f8d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice 2025-04-02 14:12:33 +02:00
Pau Rovira 8df07a4c62 Merge branch 'dev' into fix-CustomerConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-02 11:54:15 +00:00
Pau Rovira 8d3c2f51cf fix: fixed errors on CustomerSamples
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 11:53:44 +00:00
Jose Antonio Tubau 0d056d3ed6 fix: refs #8422 router/module/route.js
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 13:52:49 +02:00
Javier Segarra 21c9abf273 test: refs #7356 fix test ticketSale
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 13:30:50 +02:00
Javier Segarra 20f3525e50 revert: refs #7356 command dataCy proposal 2025-04-02 13:23:00 +02:00
Javier Segarra 97c55aa1ec Merge branch '7356_e2e' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_e2e 2025-04-02 12:55:13 +02:00
Javier Segarra 600c16e822 Merge branch 'dev' into 7356_e2e 2025-04-02 12:54:51 +02:00
Javier Segarra d7866f9bdb build: refs #8006 disable no-void off
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-02 12:54:07 +02:00
Pablo Natek 6debb64b2b test: skip VnShortcuts and WorkerList test suites
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:52:51 +02:00
Javier Segarra 4bdd8a6494 build: refs #8006 disable no-void off 2025-04-02 12:49:49 +02:00
Javier Segarra 9989e752bc build: refs #8006 disable no-void off 2025-04-02 12:47:51 +02:00
Javier Segarra d3848a2343 build: refs #8006 disable no-void off 2025-04-02 12:46:09 +02:00
Javier Segarra 7deb9b1f16 build: refs #8006 disable no-void off 2025-04-02 12:45:27 +02:00
Javier Segarra e4196e7176 build: refs #8006 disable no-void off 2025-04-02 12:45:08 +02:00
Javier Segarra 6aceda51f5 build: refs #8006 disable no-void off 2025-04-02 12:42:39 +02:00
Javier Segarra 7a7463ebf1 build: refs #8006 disable no-void off 2025-04-02 12:42:03 +02:00
Jon Elias b5fa2bb18e fix: fixed cardSummary to use ellipsis and fixed summary cards to flex correctly
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 12:38:30 +02:00
Jorge Penadés 1e1715df1a test: refs #8441 enable invoice deletion test in invoiceInDescriptor.spec.js
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 12:37:16 +02:00
Javier Segarra 736471bcbe build: refs #8006 disable no-void off
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 12:36:34 +02:00
Alex Moreno 861bbb1574 Merge pull request 'chore: update Cypress parallel test execution to use 2 instances' (!1648) from enable-parallel-x2 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1648
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-04-02 10:36:02 +00:00
Javier Segarra 736f3e1c00 build: refs #8006 disable prefer-destructuring off
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 12:35:00 +02:00
Javier Segarra c2d56ee002 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-02 12:29:36 +02:00
Javier Segarra d29a27999a test: fix monitorTicket
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 12:29:08 +02:00
Alex Moreno 0af42130c1 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:07:19 +00:00
Pablo Natek 74033a7bdf refactor: improve layout and styling in ExtraCommunity.vue
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 11:51:03 +02:00
Javier Segarra 87e56d9ff1 fix: customer missing i18n
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-02 11:39:02 +02:00
Jorge Penadés 2e6963d505 refactor: refs #8326 conditionally render vn-card-content based on advancedSummary
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 11:38:44 +02:00
Javier Segarra e435674eda style: minor changes
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-04-02 11:34:19 +02:00
Javier Segarra 4b6696fdc9 style: add ellipsis support to CardSummary and related components
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-02 11:27:23 +02:00
Javier Segarra e150ffd9fc style: add ellipsis class to CardSummary
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-02 11:22:24 +02:00
Javier Segarra 8bc40c74f2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into warmfix_vnLinkPhone 2025-04-02 11:21:47 +02:00
Javier Segarra 61ec951011 Merge pull request 'fix_vnLinkPhone' (!1659) from fix_vnLinkPhone into dev
Reviewed-on: #1659
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 11:15:54 +02:00
Pau Rovira 36918d8434 fix: fixed CustomerConsumption errors when changing customer & downloading pdf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 09:13:59 +00:00
Javier Segarra a1490a798b fix: remove calculateTableHeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:32:42 +02:00
Javier Segarra f384dd6f04 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-04-02 10:28:40 +02:00
Javier Segarra 4caf496bd6 perf: use composable 2025-04-02 10:28:30 +02:00
Javier Segarra 6bf6ae0288 perf: rename filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-02 10:15:02 +02:00
Javier Segarra f13b168364 style: reduce height row 2025-04-02 10:13:24 +02:00
Javier Segarra c099b41e74 perf: move calc heightTable to filter 2025-04-02 10:13:12 +02:00
Javier Segarra 22b57f850c Merge pull request 'fix_vnLinkPhone' (!1659) from fix_vnLinkPhone into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1659
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-02 07:53:14 +00:00
Javier Segarra 046b6f8f28 Merge pull request 'fix: fixed CustomerTicket table order' (!1661) from hotfix-CustomerTicketOrder into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1661
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-04-02 05:47:20 +00:00
Javier Segarra d40bf0f2ca Merge branch 'dev' into 7356_e2e 2025-04-01 19:38:39 +02:00
Javier Segarra 20ccdb133c refactor: add spinner wait to monitor ticket row count
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 18:38:45 +02:00
Javier Segarra 34343188d2 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 16:17:45 +00:00
Javier Segarra 32fa5248d0 refactor: update monitor ticket tests to improve filtering logic and remove unused intercepts
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 18:11:10 +02:00
Javier Segarra da31d6db3b refactor: streamline filter panel tests with parameterized test cases
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 16:41:17 +02:00
Javier Segarra a43ade9852 Merge branch 'master' into hotfix-CustomerTicketOrder
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 13:33:57 +00:00
Alex Moreno 9be4cdccc0 Merge pull request 'refactor: remove keepData property from components and update related logic' (!1664) from warmFix_remove_keepData into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1664
2025-04-01 13:22:09 +00:00
Javier Segarra f02fa732ee feat: remove unused vnLinkPhone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 15:10:49 +02:00
Alex Moreno 0a0e4dfca7 Merge branch 'test' into warmFix_remove_keepData
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 12:59:46 +00:00
Javier Segarra 8849b9ed97 Merge branch 'dev' into fix_vnLinkPhone
gitea/salix-front/pipeline/pr-dev Build queued... Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 14:52:22 +02:00
Javier Segarra 40cfe2a5cc style: add ellipsis class to CardSummary 2025-04-01 14:52:05 +02:00
Javier Segarra 02a78c662b perf: handle VnLinkMail and VnEmail 2025-04-01 14:51:49 +02:00
Javier Segarra 588876952a fix: customerSummary 2025-04-01 14:51:24 +02:00
Alex Moreno 3c4cbf82d2 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 12:28:20 +00:00
Alex Moreno c15e4dcf32 Merge pull request 'fix: simplify data fetching logic in VnCard.vue' (!1656) from fix_vnCard_url into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1656
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:27:37 +00:00
Jon Elias da21c0aad6 Merge pull request '#7995: Added hasAcl to check only one acl' (!1654) from 7995-CreateHasAcl into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1654
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-04-01 11:24:34 +00:00
Alex Moreno 0863df25fe Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 11:07:05 +00:00
Alex Moreno c09254d204 Merge branch 'test' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 11:04:15 +00:00
Alex Moreno 06e5188146 refactor: remove keepData property from components and update related logic
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 13:02:49 +02:00
Jon Elias 26861e92b6 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 11:01:11 +00:00
Alex Moreno fb3c015f89 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 12:39:31 +02:00
Alex Moreno 590afaba93 fix: update condition for rendering QChip in VnOrder component
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 12:39:26 +02:00
Jon Elias 3ddc6dc310 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 10:13:47 +00:00
Jon Elias 6e4079de95 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 10:10:06 +00:00
Alex Moreno 79fbe2cc72 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:57:35 +00:00
Alex Moreno e6e4b49d44 Merge branch 'test' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-04-01 09:57:20 +00:00
Alex Moreno c9416b5286 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 11:56:09 +02:00
Alex Moreno da148c5435 test: skip invoice deletion test and add spinner waits in VnShortcuts
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 11:56:05 +02:00
Jon Elias 27ec560fc5 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:31:33 +00:00
Javier Segarra 49fafa2b34 Merge pull request 'hotfix_ticketSale_handle_notifications' (!1660) from hotfix_ticketSale_handle_notifications into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1660
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-04-01 09:20:32 +00:00
Alex Moreno 246e4429bd refactor: update getArrayData function to accept entityId for improved data fetching
gitea/salix-front/pipeline/pr-test This commit is unstable Details
2025-04-01 11:04:36 +02:00
Javier Segarra 98a4ac450d Merge branch 'master' into hotfix_ticketSale_handle_notifications
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 08:55:26 +00:00
Pau Rovira 35886999e4 fix: rollback
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 07:54:41 +00:00
Pau Rovira 79fdaffbc8 fix: fixed CustomerTicket table order
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 07:42:30 +00:00
Jon Elias 7fd22cce26 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 07:35:12 +00:00
Jon Elias 8c9c156817 Merge branch '7995-CreateHasAcl' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:34:39 +02:00
Jon Elias b00d89a4be perf: refs #7995 has acl function 2025-04-01 09:34:38 +02:00
Jorge Penadés e679282e57 Merge branch '7995-CreateHasAcl' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 09:22:14 +02:00
Alex Moreno 044c607405 chore: update version to 25.16.0 in package.json
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 08:32:58 +02:00
Jon Elias 9f05984e80 Merge pull request 'Hotfix[CustomerAddress]: Fixed buttons disabled when there are no changes' (!1641) from Hotfix-CustomerAddress into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1641
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 06:08:11 +00:00
Alex Moreno c4f895e060 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 05:39:06 +00:00
Alex Moreno 8e66be1874 Merge branch 'dev' into fix_vnCard_url
gitea/salix-front/pipeline/pr-test This commit is unstable Details
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 05:38:57 +00:00
Alex Moreno 40d59846fa Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 07:28:11 +02:00
Alex Moreno 68a86e9fcd Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-04-01 07:25:42 +02:00
Alex Moreno 7c5ce312cc Merge branch 'master' into Hotfix-CustomerAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-04-01 05:20:59 +00:00
Jose Antonio Tubau 1c3eee9695 Merge pull request 'test: refs #8717 add integration test for agencyModes' (!1545) from 8717-reviewAndFixAgencySection into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1545
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-04-01 05:19:05 +00:00
Jose Antonio Tubau f6360e29af Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 06:57:54 +02:00
Jose Antonio Tubau f0ef9b42c9 refactor: refs #8422 removed error-related changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 06:56:02 +02:00
Jose Antonio Tubau e9ebb3ad8a Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 04:44:23 +00:00
Javier Segarra 2f47bb10aa fix: update client actions test to expect zero table rows
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-04-01 01:19:11 +02:00
Javier Segarra 477ab36487 Merge branch 'dev' into e2e_monitor 2025-04-01 01:12:27 +02:00
Javier Segarra 7dd28393dd perf: refs #8006 rules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-04-01 00:47:02 +02:00
Javier Segarra 3c68220903 perf: refs #8006 handle rules
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-04-01 00:32:32 +02:00
Javier Segarra d81a14737c Merge pull request 'fix: remove reserved ticket functionality from TicketProblems and TicketSaleMoreActions components' (!1600) from hotfix_remove_reserved into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1600
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-31 21:50:48 +00:00
Javier Segarra 1d5509313a test: refs #8006 use write variable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 23:47:18 +02:00
Javier Segarra a1ca92a135 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 21:39:09 +00:00
Javier Segarra 61cdf2c3c7 Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-31 21:38:47 +00:00
Javier Segarra d71029c7e9 feat: dashIfEmpty
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-31 15:15:37 +02:00
Javier Segarra 19121fbeb9 fix: roadmap 2025-03-31 15:15:29 +02:00
Javier Segarra dd739b1165 fix: customer vnLinkPhone 2025-03-31 15:15:17 +02:00
Javier Segarra 0208debdbe feat: worker vnLinkPhone 2025-03-31 15:15:07 +02:00
Javier Segarra f392502673 fix: workerSummary 2025-03-31 15:02:37 +02:00
Javier Segarra a81f8fcdaf feat: add noOne
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-31 14:43:15 +02:00
Javier Segarra 5ade9fd133 fix: add trycatch to handle notifications 2025-03-31 14:43:00 +02:00
Javier Segarra f2a20ce4bf test: refs #8006 config 2025-03-31 13:52:30 +02:00
Alex Moreno 95950b7485 refactor(VnCard): use prop.url when init
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 13:27:28 +02:00
Javier Segarra 9ef29e61bd Merge branch 'dev' into 8006_eslint_rules 2025-03-31 13:20:57 +02:00
Javier Segarra 426438051c test: refs #7356 update command
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 13:20:41 +02:00
Javier Segarra 31ffdd4b61 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 13:20:02 +02:00
Alex Moreno a937b2d3ac Merge pull request '#8449 - vnLogFilter' (!1640) from 8449-vnLogFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1640
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-31 11:13:16 +00:00
Pablo Natek 767a6302e1 Merge pull request 'refactor: update TravelSummary and TravelList components for improved data fetching and summary view' (!1658) from hotFixTravelSummaryDialog into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1658
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-31 10:56:40 +00:00
Alex Moreno 2f6b98a0bf fix: refs #8449 update data-key attribute in VnTableFilter and related components
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 12:50:32 +02:00
Alex Moreno 519ae66226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_vnCard_url 2025-03-31 12:39:05 +02:00
Javier Segarra a84c2a78c8 Merge branch 'dev' into 7356_e2e 2025-03-31 12:38:57 +02:00
Javier Segarra 789b0d22cc Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 10:36:57 +00:00
Javier Segarra 50a8b97be5 Merge branch 'dev' into fix_itemFilter_multiLine
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 12:36:17 +02:00
Javier Segarra 04dcd1136a fix: remove prop printing 2025-03-31 12:35:47 +02:00
Alex Moreno 497eb3a8bb refactor(VnLog): refs #8449 clear filters when has userParams
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-31 12:35:13 +02:00
Pablo Natek c3d51259c4 Merge branch 'master' into hotFixTravelSummaryDialog
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-31 10:31:24 +00:00
Pablo Natek ba2084e906 refactor: update TravelSummary and TravelList components for improved data fetching and summary view 2025-03-31 12:30:16 +02:00
Javier Segarra 8c9a863d71 style: handle height based on number of toolbars
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 12:23:45 +02:00
Jose Antonio Tubau 1f41e3c8d1 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 10:17:23 +00:00
Javier Segarra 96bcc04d78 style: fix vnselect style with full-width 2025-03-31 11:59:08 +02:00
Alex Moreno 5066cd8179 Merge branch 'dev' of https: refs #8449//gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 11:44:02 +02:00
Alex Moreno ae5465687e Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 09:40:58 +00:00
Jon Elias 801e9687f7 Merge branch 'dev' into 7995-CreateHasAcl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 09:32:47 +00:00
Jose Antonio Tubau c205693131 Merge pull request '8440-createVehicleNotes' (!1638) from 8440-createVehicleNotes into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1638
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2025-03-31 09:01:35 +00:00
Jose Antonio Tubau 2bd0e88e3b Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 08:39:35 +00:00
Javier Segarra 8c75ec41d8 Merge pull request '#8667: Modified ClientPayment' (!1622) from 8667-FixClientNewPayment into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1622
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-31 08:17:33 +00:00
Alex Moreno cad78aedd0 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 08:11:32 +00:00
Javier Segarra ddfed3a59d Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-31 07:51:58 +00:00
Jon Elias f8cc7b95ab refactor: refs #7995 modified hasAcl function
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 09:51:40 +02:00
Alex Moreno 36f142800f refactor: simplify data fetching logic in VnCard.vue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 09:51:36 +02:00
Alex Moreno 16cb224926 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-31 06:54:24 +00:00
Pablo Natek 668745981f Merge pull request 'fix: update filter in TravelCard to include route parameter' (!1651) from hotFix_travelCard_addWhere into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1651
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-03-31 06:36:19 +00:00
Jose Antonio Tubau 2d03b3a0b7 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-31 06:34:06 +00:00
Jorge Penadés a896e4ce23 refactor: refs #6564 hide problems column in TicketAdvance.vue and update localization files
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 17:53:04 +01:00
Jorge Penadés 72a19cbba1 refactor: refs #6564 update API call
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 17:11:57 +01:00
Jorge Penadés 530dc62e00 feat: refs #6564 implement getValueFromPath utility
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 16:38:37 +01:00
Jorge Penadés bbf4234351 refactor: refs #6564 rename 'totalProblems' to 'problems' in TicketAdvance.vue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 15:11:40 +01:00
Jorge Penadés e73604d908 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 14:53:01 +01:00
Javier Segarra d60d7da33c fix: improve monitorClient.department
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-28 14:31:11 +01:00
Alex Moreno ea59cf8b0d Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 13:17:47 +00:00
Alex Moreno 17821917ea Merge branch 'master' into hotFix_travelCard_addWhere
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-28 13:17:34 +00:00
Jorge Penadés 6adf7a91cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7995-CreateHasAcl 2025-03-28 14:06:20 +01:00
Jorge Penadés 74a7b39108 Merge pull request 'refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests' (!1645) from 8718-hotfix-vnAccount into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1645
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-28 13:04:29 +00:00
Javier Segarra fe2024c26a Merge branch 'master' into 8718-hotfix-vnAccount
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-28 12:28:15 +00:00
Jose Antonio Tubau 033fe3375f Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 13:20:04 +01:00
Jose Antonio Tubau 4fbcb82234 fix: refs #8717 update AgencyCard to include filter by agency ID and correct locale key casing 2025-03-28 13:20:02 +01:00
Javier Segarra cce3a0cef8 Merge branch 'test' into warmfix_monitorClients
gitea/salix-front/pipeline/pr-test This commit is unstable Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-28 12:03:29 +01:00
Javier Segarra 50fb8a31a6 test: fix test 2025-03-28 12:03:15 +01:00
Alex Moreno e05d3140a3 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 10:55:43 +00:00
Pablo Natek 1a1a859edc Merge branch 'master' into hotFix_travelCard_addWhere
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-28 09:58:45 +00:00
Jon Elias 28c8e93a61 refactor: refs #8363 clone fixed price in same dialog as create, changed item filter and vncolor height
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-28 10:53:49 +01:00
Javier Segarra a49c8891a7 fix: params.departmentFk i18n and ticketFilter.groupedStates 2025-03-28 10:22:08 +01:00
Pau Rovira 6434a37598 feat: refs #8655 simplified code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-28 09:36:20 +01:00
Jon Elias c03a56f69f feat: refs #7995 added hasAcl to check only one acl 2025-03-28 09:28:24 +01:00
Jose Antonio Tubau dbdccc4774 refactor: refs #8422 improve error handling and notifications in DMS components 2025-03-28 08:56:26 +01:00
Javier Segarra 687bd54e64 refactor: refs #8006 update ESLint rules and disable unused rules 2025-03-28 02:27:46 +01:00
Javier Segarra 0b614f15d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8006_eslint_rules 2025-03-28 02:21:32 +01:00
Javier Segarra cf8923a2d4 refactor: streamline table interaction methods and update test cases 2025-03-28 02:20:51 +01:00
Javier Segarra 269427e08c Merge branch 'dev' into e2e_monitor 2025-03-28 01:32:52 +01:00
Javier Segarra 2a3e072b1b feat: add departmentFk to user data and filter clients by department
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-03-28 01:25:38 +01:00
Javier Segarra 4ae9b69e11 test: refs #7356 clean commands 2025-03-28 00:38:47 +01:00
Javier Segarra bdfc1fa309 test: refs #7356 clean commands 2025-03-28 00:25:27 +01:00
Javier Segarra 9492c71128 fix: refs #7356 remove bad code 2025-03-27 23:29:11 +01:00
Javier Segarra 39fcfb83a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_e2e 2025-03-27 21:41:59 +01:00
Javier Segarra dcf0b906f4 Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/head This commit is unstable Details
2025-03-27 20:22:54 +00:00
Javier Segarra cb4c740319 Merge pull request 'hotfix_ticketSale_hasChanges' (!1650) from hotfix_ticketSale_hasChanges into master
Reviewed-on: #1650
2025-03-27 20:21:25 +00:00
Javier Segarra 7bc793cfb7 Merge branch 'dev' into 8717-reviewAndFixAgencySection 2025-03-27 20:15:57 +00:00
Javier Segarra 848341f9d9 Merge branch 'dev' into 8725_submit_form_onClick 2025-03-27 19:44:05 +00:00
Javier Segarra 71755025a6 Merge branch 'master' into hotfix_remove_reserved 2025-03-27 19:42:57 +00:00
Jose Antonio Tubau 0aa4c1c527 test: refs #8717 skip RouteAutonomous test suite 2025-03-27 16:12:03 +01:00
Jose Antonio Tubau 34c18d2baa test: refs #8717 update invoice creation test to ensure save button visibility
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 15:31:55 +01:00
Jose Antonio Tubau 96ed69acd2 refactor: refs #8422 update document ID error messages and improve notifications in DMS forms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 15:10:31 +01:00
Jose Antonio Tubau f07ce9a0a1 chore: refs #8422 update localizations 2025-03-27 15:10:16 +01:00
Jon Elias c9e7411c90 Merge branch 'master' into hotfix_ticketSale_hasChanges
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 14:04:07 +00:00
Jon Elias 3fc56700e4 Merge branch 'Hotfix-CustomerAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-CustomerAddress
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 15:03:12 +01:00
Jon Elias 60899ef2d2 perf: clean payload 2025-03-27 15:03:11 +01:00
Alex Moreno c4ab00ffd2 fix: update filter in TravelCard to include route parameter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 14:56:22 +01:00
Alex Moreno 6e27edcf54 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-27 13:14:55 +00:00
Alex Moreno c9bea020fa Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 13:00:38 +00:00
Jose Antonio Tubau 1805e1e553 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 12:59:27 +00:00
Jon Elias dcd5d357ae Merge branch 'master' into Hotfix-CustomerAddress
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-27 12:37:30 +00:00
Alex Moreno 985e8663a3 Merge branch 'dev' into enable-parallel-x2
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 12:27:04 +00:00
Alex Moreno ea314073d2 chore: update Cypress parallel test execution to use 2 instances
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-27 13:26:42 +01:00
Javier Segarra 6e84341aea perf: add await
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-27 13:06:29 +01:00
Javier Segarra a91a0146fe fix: hasChanges 2025-03-27 13:03:21 +01:00
Alex Moreno 71c6741cf2 chore: update Cypress parallel test execution to use 6 instances
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-27 12:28:11 +01:00
Alex Moreno 696dbd4149 chore: update Cypress parallel test execution to use 4 instances
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-27 12:27:47 +01:00
Alex Moreno d94dafd667 chore: update Cypress parallel test execution to use 3 instances
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 11:43:00 +01:00
Alex Moreno 446b679bca chore: update Cypress parallel test execution to use 2 instances
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 10:23:55 +01:00
Javier Segarra b1bd730fbf Merge branch 'e2e_monitor' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-27 10:02:32 +01:00
Javier Segarra 92fba2e0c4 test: comments requested 2025-03-27 10:02:29 +01:00
Javier Segarra 65a089e562 fix: correct spelling of clicDescriptorAction to clickDescriptorAction in tests 2025-03-27 10:02:13 +01:00
Alex Moreno 75a20f7ca7 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-27 08:39:31 +00:00
Javier Segarra 67e0791f34 fix: update order list tests to remove only and skip modifiers
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-27 09:03:40 +01:00
Javier Segarra a624d65178 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 21:28:04 +01:00
Javier Segarra 59c08be804 test: refs #7356 add waitRequest 2025-03-26 21:27:48 +01:00
Javier Segarra 229737c75c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 20:29:08 +01:00
Jorge Penadés 36f2328656 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-26 16:11:54 +01:00
Jorge Penadés b464344cd0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8718-hotfix-vnAccount
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 16:02:08 +01:00
Jorge Penadés dd4e872fcc refactor: refs #8718 simplify VnAccountNumber component and remove obsolete tests
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 16:00:50 +01:00
Jose Antonio Tubau 09bbb89376 Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 15:48:20 +01:00
Jose Antonio Tubau 8e35b49927 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection 2025-03-26 15:48:10 +01:00
Jon Elias e353f7916a perf: clean payload
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-26 14:15:01 +01:00
Jon Elias a3b1095952 refactor: clean payload
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 13:51:03 +01:00
Jon Elias ae9cc49add refactor: manage every nullable option
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 12:32:22 +01:00
Jon Elias 3783cdeed4 fix: fixed buttons disabled when there are no changes
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-26 12:03:46 +01:00
Alex Moreno 7a273fb35f Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 10:53:48 +00:00
Alex Moreno 9918230096 fix(VnOrder): refs #8449 adjust padding for vertical alignment in table cells
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 11:50:44 +01:00
Alex Moreno 8c7dabd8fb fix(VnOrder): refs #8449 hover style
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 11:48:44 +01:00
Alex Moreno a7c23f4bbb feat(VnLogFilter): refs #8449 enable orders
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 11:45:11 +01:00
Jorge Penadés d2d38c1d3e Merge branch 'e2e_monitor' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 10:44:58 +01:00
Jorge Penadés 8be9feb41f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-03-26 10:44:39 +01:00
Javier Segarra 38d16b56a9 feat: remove FetchData 2025-03-26 10:12:13 +01:00
Jorge Penadés bed4763e88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-26 10:07:08 +01:00
Jose Antonio Tubau 1e89bdfe95 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-26 08:38:49 +00:00
Alex Moreno 4179219f15 Merge branch 'dev' into 8449-vnLogFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:23:29 +00:00
Alex Moreno f78cd7c9bf feat(VnLogFilter): refs #8449 add showTagChips prop to control visibility of tag chips
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-26 09:22:58 +01:00
Javier Segarra 4b1a648509 fix: refs #8006 defaults 2025-03-26 09:22:25 +01:00
Alex Moreno 421b68a031 test: refs #8449 refactor e2e vnLog 2025-03-26 09:16:32 +01:00
Alex Moreno c867d6da52 test: refs #8449 refactor VnLog and VnLogFilter unit test 2025-03-26 08:56:37 +01:00
Jose Antonio Tubau c5a05917c0 fix: refs #8717 enable RouteAutonomous tests and adjust notification check in RouteExtendedList
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-26 08:50:25 +01:00
Jose Antonio Tubau cb8362c0fa Merge branch '8717-reviewAndFixAgencySection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-26 08:37:03 +01:00
Jose Antonio Tubau 4d0ababbde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection 2025-03-26 08:32:24 +01:00
Alex Moreno a9fd5894b5 fix(TicketSale): refs #8449 correct router.push to /log 2025-03-26 07:57:35 +01:00
Alex Moreno 4a2b147320 feat(VnLogFilter): refs #8449 add changedModelValue filter 2025-03-26 07:38:07 +01:00
Javier Segarra 718042445f Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 22:57:28 +00:00
Javier Segarra 943e0abb2a fix: refs #8006 update ESLint configuration and correct Vue import in Vitest config
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 22:31:40 +01:00
Javier Segarra e7a501f528 test: refs #7356 remove child class
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 22:27:45 +01:00
Javier Segarra 6e7e28226a feat: refs #8006 remove eslint.config
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-25 22:20:27 +01:00
Javier Segarra 1a284acdc5 feat: refs #8006 41 problems 2025-03-25 22:19:09 +01:00
Javier Segarra eb81b9b6ee feat: refs #8006 restart 2025-03-25 21:53:06 +01:00
Javier Segarra 240d671701 revert: refs #8006 clean branch 2025-03-25 21:50:38 +01:00
Javier Segarra f9f4b16d71 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 20:28:00 +00:00
Javier Segarra 3c16d516dc Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 20:27:48 +00:00
Javier Segarra dc35377f13 Merge branch 'dev' into 8006_eslint_rules 2025-03-25 19:59:48 +01:00
Javier Segarra 5a642f4c3a fix: refs #7356 update reference value in routeAutonomous test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:46:56 +01:00
Javier Segarra ec6f6c81c0 Merge branch 'dev' into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:27:19 +01:00
Javier Segarra e42f4797b1 refactor: refs #8647 remove :data-cy in VnFilterPanel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 19:00:07 +01:00
Javier Segarra 227dec72b3 Merge branch 'dev' into 8647_fix_warnings 2025-03-25 18:58:20 +01:00
Jorge Penadés 7b1e126966 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-25 17:38:11 +01:00
Jose Antonio Tubau 5dd3b85012 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 14:56:04 +00:00
Jose Antonio Tubau 08992aabac Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 14:41:35 +00:00
Alex Moreno 42646fd570 feat(VnLogFilter): refs #8449 add userType and creationDates 2025-03-25 15:02:07 +01:00
Alex Moreno 879296203c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter 2025-03-25 14:47:48 +01:00
Jose Antonio Tubau 9a2c7c8012 fix: refs #8717 streamline field filling logic in tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 14:02:13 +01:00
Jose Antonio Tubau 6766a6136a Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 12:17:44 +00:00
Alex Moreno 4b53d9c1b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter 2025-03-25 12:57:16 +01:00
Jose Antonio Tubau fa5d0d4ee8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-25 12:42:58 +01:00
Javier Segarra b22807f884 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 09:39:48 +01:00
Javier Segarra fbe3eae670 test: refs #7356 fix ticket*.spec.js 2025-03-25 09:39:30 +01:00
Javier Segarra 30eecdee2f Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 08:18:07 +00:00
Jon Elias 93e85c536e Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 09:17:53 +01:00
Jon Elias 15bd9da3e2 refactor: refs #8363 use same dialog as create when cloning a fixedPrice 2025-03-25 09:17:52 +01:00
Jose Antonio Tubau 090c77dd91 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-25 07:13:20 +00:00
Jon Elias 25bd351c17 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-25 07:11:51 +00:00
Alex Moreno 443ac77f5d feat(VnLog): refs #8449 use VnTableFilter 2025-03-25 08:08:58 +01:00
Jon Elias 712b983340 Merge branch 'dev' of https: refs #8363//gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 16:06:02 +01:00
Javier Segarra 1be8e65fa1 revert: refs #7356 update default mapper logic to handle null values and refactor onBeforeSave function
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 15:02:18 +01:00
Jose Antonio Tubau 486f3e265f Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 13:56:30 +00:00
Jose Antonio Tubau d22afabe3f Merge branch 'dev' into 8440-createVehicleNotes 2025-03-24 13:56:10 +00:00
Javier Segarra 5ded8686e6 Merge branch 'dev' into 7356_e2e 2025-03-24 14:42:31 +01:00
Javier Segarra 2190a0c17d test: refs #7356 removing unused mapper functions and updating default mapper logic 2025-03-24 14:41:44 +01:00
Jose Antonio Tubau e0fbc7cfa7 Merge branch 'dev' into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 13:40:59 +00:00
Jon Elias bbd771e61d refactor: refs #8363 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 14:04:36 +01:00
Jon Elias 461d48c69d Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 14:03:26 +01:00
Jon Elias abdea67bf6 fix: refs #8363 conflicts 2025-03-24 14:03:25 +01:00
Javier Segarra 1e049847a7 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 12:32:34 +00:00
Javier Segarra 73740822a3 test: refs #7356 update ticket tracking components and remove unused TicketCreateTracking.vue 2025-03-24 13:18:41 +01:00
Jorge Penadés 304a039ebd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-24 12:59:47 +01:00
Javier Segarra 69629147ad Merge branch 'dev' into 7356_e2e 2025-03-24 12:35:16 +01:00
Jose Antonio Tubau ba46d8bda4 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 11:21:01 +00:00
Pau Rovira ca2e507401 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 10:49:07 +00:00
Pau Rovira f4d347eef1 Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 11:46:56 +01:00
Pau Rovira d2b414c883 fix: refs #8655 centered button for phone display 2025-03-24 11:46:54 +01:00
Jose Antonio Tubau feabf9c7be refactor: refs #8717 use markRaw for cardDescriptor in VnCard component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 11:19:26 +01:00
Javier Segarra 0404c00a05 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 11:15:36 +01:00
Javier Segarra 351f291086 test: remove timeout 2025-03-24 11:15:25 +01:00
Jose Antonio Tubau 1b86d34976 Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 10:36:10 +01:00
Jon Elias be966abf51 Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 08:56:37 +00:00
Jose Antonio Tubau c9ec649a4d Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 08:56:32 +00:00
Jorge Penadés acddcd58b8 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-24 09:56:09 +01:00
Jose Antonio Tubau fb00824ee3 refactor: refs #8717 change toModule prop type from String to Object
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:55:03 +01:00
Javier Segarra 17b784e4d1 test: rename account descriptor test and enable claim notes test
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-24 09:46:10 +01:00
Jose Antonio Tubau 1a46576572 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:34:52 +01:00
Jose Antonio Tubau e28f30d7e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 09:22:14 +01:00
Javier Segarra bc75bd9dc0 feat: update order creation test to use form data and improve readability
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-24 09:20:39 +01:00
Javier Segarra 26f2044097 test: update order creation test and remove reserved ticket tests
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-24 09:08:18 +01:00
Jose Antonio Tubau 2775e0193b Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 07:56:13 +00:00
Jose Antonio Tubau 5f48c9b887 refactor: refs #8717 eliminate warnings and add component on children routes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 08:13:06 +01:00
Javier Segarra 31e8229cd3 chore: refs #8006 update vue-i18n and related dependencies to latest versions 2025-03-24 04:08:26 +01:00
Javier Segarra 96a3f52b79 Merge branch 'dev' of https: refs #8006//gitea.verdnatura.es/verdnatura/salix-front into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-24 03:38:17 +01:00
Javier Segarra 303b9cb5a5 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:32:27 +01:00
Javier Segarra 6c4136fb58 Merge branch 'dev' of https: refs #8725//gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:31:04 +01:00
Javier Segarra aebd9ea83c fix: refs #7356 update validation logic and enhance Cypress tests for ticket components
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 03:24:10 +01:00
Javier Segarra c7218ce2cf Merge branch 'dev' into 7356_e2e 2025-03-24 01:45:02 +01:00
Javier Segarra 48689374bc Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-24 01:43:42 +01:00
Javier Segarra b26b8b6ddd test: enhance Monitor pages 2025-03-24 01:43:27 +01:00
Javier Segarra fd68071a2e feat: add custom Cypress commands for table row manipulation 2025-03-24 01:43:00 +01:00
Javier Segarra d8bea48b26 fix: restore viewport setting for API readiness in tests 2025-03-24 01:42:43 +01:00
Javier Segarra 4a5171aa6e fix: remove exclusive test flag from 'clear scopeDays' test 2025-03-24 00:18:29 +01:00
Javier Segarra d3d80149e0 Merge branch 'dev' into e2e_monitor 2025-03-24 00:11:11 +01:00
Jorge Penadés 90d556c892 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance 2025-03-21 15:53:53 +01:00
Javier Segarra c672d33b0c feat: change i18n hasObservation
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 11:41:55 +01:00
Alex Moreno 07f24cb9ae Merge branch 'master' into hotfix_remove_reserved
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 10:22:19 +00:00
Javier Segarra e3c2ae935c style: improve css
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2025-03-21 11:15:26 +01:00
Javier Segarra 69548456c3 feat: hide url 2025-03-21 11:14:13 +01:00
Javier Segarra 64fe998053 feat: add availabled item 2025-03-21 11:14:01 +01:00
Javier Segarra ae856ec0bc perf: remove comments 2025-03-21 11:13:42 +01:00
Pau Rovira 7d5f51349a Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 10:06:09 +00:00
Jon Elias b9128cde86 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-21 09:58:50 +00:00
Javier Segarra 239805515d feat: show substitution note
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 10:49:33 +01:00
Javier Segarra 56da11345b revert: remove substitutionAllowed 2025-03-21 10:49:17 +01:00
Javier Segarra 78d0f31b11 Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-21 09:35:30 +00:00
Jose Antonio Tubau 868172d208 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8717-reviewAndFixAgencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 13:49:25 +01:00
Pau Rovira 2ac3b280af Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 12:37:05 +00:00
Jose Antonio Tubau cb99c50f33 fix: refs #8422 vehicleDms tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-20 13:34:14 +01:00
Jose Antonio Tubau de9f1bca9a Merge branch 'dev' into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-20 09:25:20 +01:00
Jon Elias 2f5260a1a1 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-20 08:16:49 +00:00
Pau Rovira 70a15bff30 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-20 06:35:13 +00:00
Pau Rovira 8995d7d454 Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-20 07:34:10 +01:00
Pau Rovira 8a8ce72c4c feat: refs #8655 added hover to scroll button 2025-03-20 07:34:06 +01:00
Jose Antonio Tubau 5d356428d3 refactor: refs #8422 enhance error handling in save function and update selectors in tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-18 15:54:47 +01:00
Jon Elias 7e2e6208bc Merge branch 'dev' of https: refs #8363//gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-18 15:01:52 +01:00
Jon Elias 277373e6b5 Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-18 15:00:49 +01:00
Jon Elias 541d931d21 refactor: refs #8363 adapted fixed price e2e 2025-03-18 15:00:48 +01:00
Jose Antonio Tubau 22d912ba76 Merge branch 'dev' into 8422-createVehicleDms 2025-03-18 14:24:26 +01:00
Jose Antonio Tubau 013410e4a9 Merge branch 'dev' into 8440-createVehicleNotes 2025-03-17 15:05:39 +00:00
Jon Elias fa06a9003e Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-17 08:02:34 +00:00
Pau Rovira da8366d05b Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-17 06:58:28 +00:00
Javier Segarra 6bee0ead8c fix: refs #8647 allow searchUrl prop to accept both String and Boolean types
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 14:39:48 +01:00
Javier Segarra 74c1e53c89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-16 13:58:40 +01:00
Javier Segarra 57e80040fa test: check params from and to
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-16 12:36:22 +01:00
Javier Segarra e0def231b1 fix: remove deprecated filter
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-16 12:23:20 +01:00
Javier Segarra 23eff4937c feat: add data-cy 2025-03-16 12:22:55 +01:00
Javier Segarra cfccc74710 test: improve monitorTest 2025-03-16 12:19:26 +01:00
Javier Segarra 4c4d7c9dbe test: check url scopeDays para value 2025-03-16 11:08:18 +01:00
Javier Segarra ee4eafc639 test: validate scopeDays 2025-03-16 10:57:04 +01:00
Javier Segarra 8417411efc test: ctrl click 2025-03-16 10:44:04 +01:00
Javier Segarra 7510611c0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into e2e_monitor 2025-03-16 10:16:00 +01:00
Jose Antonio Tubau bbbe348434 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 14:04:13 +00:00
Jose Antonio Tubau 6c7ea26a41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 14:57:33 +01:00
Javier Segarra 1a0df60e06 fix: remove reserved ticket functionality from TicketProblems and TicketSaleMoreActions components
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-14 14:21:26 +01:00
Pau Rovira 55394c2a2e Merge branch '8655-scrollUpButton' of https://gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:37:23 +01:00
Pau Rovira bc69b33028 refactor: refs #8655 removed unused function 2025-03-14 13:37:20 +01:00
Pau Rovira 08b0eb3c74 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-14 12:07:24 +00:00
Pau Rovira 4db882cc03 feat: refs #8655 made VnTable to use VnScroll button
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 13:06:05 +01:00
Javier Segarra a6f7db154e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-14 12:34:59 +01:00
Jose Antonio Tubau c4cf81a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 07:30:34 +01:00
Jose Antonio Tubau ba5ea898c3 test: refs #8440 ensure delete note button is visible before clicking
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-14 07:30:26 +01:00
Jon Elias b0dd15636c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice 2025-03-13 13:16:53 +01:00
Javier Segarra fc61c13ec4 Merge branch 'dev' into e2e_monitor
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 12:04:46 +00:00
Alex Moreno ae62e40c60 Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:21:44 +00:00
Javier Segarra bb949cd00c Merge branch 'master' into hotfix_negative_available
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-13 08:01:56 +00:00
Pau Rovira 20c531bc04 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:42:20 +00:00
Jon Elias ad9dc4fe44 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 07:20:54 +00:00
Jon Elias db91a26114 refactor: refs #8363 deleted useless code
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:08:10 +01:00
Jon Elias d376c3acbf refactor: refs #8363 deleted useless test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 08:02:12 +01:00
Javier Segarra b4d21d5a52 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 22:55:59 +00:00
Javier Segarra 007c407433 Merge branch '8725_submit_form_onClick' of https://gitea.verdnatura.es/verdnatura/salix-front into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 23:53:44 +01:00
Javier Segarra e100078f4b Merge branch 'dev' into 8725_submit_form_onClick
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 22:53:20 +00:00
Javier Segarra f4c22938c7 perf: minor changes
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-12 23:47:31 +01:00
Jon Elias 9eff4aa929 refactor: refs #8363 modified fixedPrice form test name
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 16:11:41 +01:00
Jon Elias d12cd60079 refactor: refs #8363 update color when modifying an item
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 15:49:13 +01:00
Javier Segarra 23670debd1 feat: add VnInputDateTime component and enhance date handling functions
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-12 15:34:30 +01:00
Javier Segarra 311c361f11 fix: minor bugs 2025-03-12 15:34:20 +01:00
Jose Antonio Tubau 2f88e97e2e Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 12:08:34 +00:00
Javier Segarra 9b3a98e26f fix: refs #8725 submit or button 2025-03-12 11:34:37 +01:00
Javier Segarra 50e3385be4 feat: refs #8725 enable validations in formPopup 2025-03-12 11:34:18 +01:00
Jose Antonio Tubau 8674e14fe7 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 10:12:30 +00:00
Jose Antonio Tubau 632a077e6a test: refs #8440 remove only from VnNotes test suite description
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 09:57:57 +01:00
Jose Antonio Tubau e61196f8be refactor: refs #8440 update selector for delete note button in vehicle notes tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 09:29:00 +01:00
Jose Antonio Tubau a703f9dac6 Merge branch '8440-createVehicleNotes' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-12 09:02:40 +01:00
Jose Antonio Tubau 3aec5584db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes 2025-03-12 09:02:23 +01:00
Jose Antonio Tubau ca6c0cff29 refactor: refs #8422 update form input handling to select all text before typing
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:32:45 +01:00
Jose Antonio Tubau 7ab2e28dc7 fix: refs #8422 update filter structure in VnDmsList component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 08:30:14 +01:00
Jose Antonio Tubau 21196fcc3b test: refs #8422 add temporary upload folder configuration 2025-03-12 08:30:02 +01:00
Jon Elias 5eb6e7b24b Merge branch '8363-RefactorItemFixedPrice' of https://gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-11 15:59:26 +01:00
Jon Elias a38470577c feat: refs #8363 added new clone form, modified list and created new composable 2025-03-11 15:59:24 +01:00
Jose Antonio Tubau f4b72c5d75 refactor: refs #8422 add notifications for data save and delete actions
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 13:02:20 +01:00
Pau Rovira 429772ce88 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 11:34:22 +00:00
Jose Antonio Tubau ff92c03c16 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-11 11:02:14 +00:00
Javier Segarra 6778a309dd test: refs #8647 solve fail test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-11 10:52:02 +01:00
Javier Segarra 6dbaf841a4 test: refs #8647 try to solve the problem 2025-03-10 13:02:41 +01:00
Javier Segarra dcd4c327a0 fix: refs #8647 solve warning 2025-03-10 13:02:14 +01:00
Javier Segarra 04a3c48cd6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-10 12:34:34 +01:00
Javier Segarra 92a7f2c33c test: refs #8647 revert filter string
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 12:33:31 +01:00
Javier Segarra dcceee3c3a Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 12:30:26 +01:00
Javier Segarra aefffa4a42 test: refs #8647 revert saveFn string 2025-03-10 12:30:24 +01:00
Javier Segarra 4f17691d86 feat: refs #8725 remove inject dependency 2025-03-10 12:07:47 +01:00
Javier Segarra 9e037c0300 Merge branch 'dev' into 8725_submit_form_onClick 2025-03-10 10:29:53 +01:00
Javier Segarra 215e3a6da4 feat: refs #8725 ok
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 14:00:50 +01:00
Jon Elias 22c8a8f9d6 Merge branch 'dev' into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 12:38:00 +00:00
Javier Segarra 255df3acd6 fix: refs #8725 streamline form submission logic in FormModel.vue 2025-03-07 13:33:53 +01:00
Pau Rovira 48ebca9568 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 10:09:25 +00:00
Jon Elias ac12e1454a Merge branch 'dev' of https: refs #8363//gitea.verdnatura.es/verdnatura/salix-front into 8363-RefactorItemFixedPrice
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:56:08 +01:00
Jon Elias f3fa931c70 feat: refs #8363 created composable to modify minPrice and adapt e2e
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:51:43 +01:00
Pau Rovira adb78c7433 fix: refs #8655 fixed e2e tests
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 10:44:58 +01:00
Pau Rovira ff4e0103e7 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 08:31:04 +00:00
Jorge Penadés 82d9d6016f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 09:27:00 +01:00
Pau Rovira a0860522f5 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 05:46:16 +00:00
Jose Antonio Tubau cc2e9f7890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 13:49:21 +01:00
Jorge Penadés 13a904290c refactor: refs #8647 simplify filter handling logic in VnSelect component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 12:12:26 +01:00
Jorge Penadés 73b73cba62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-06 12:03:46 +01:00
Jorge Penadés 8edb9ec644 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:37:02 +01:00
Jorge Penadés de0ce51f10 Merge branch '8647_fix_warnings' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 11:18:26 +01:00
Jorge Penadés 7433c3c551 Merge branch 'dev' of https: refs #8647//gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-03-06 11:17:55 +01:00
Alex Moreno 69d99350bc fix(jenkins): refs #8698 update module detection logic to ensure execution only for changed modules
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-06 10:18:08 +01:00
Alex Moreno 76e9aab5ae fix(cypress): refs #8698 improve parallel test execution and adjust module detection logic
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-06 10:16:16 +01:00
Javier Segarra 32dac089f8 feat: refs #8725 saveAndContinue
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 10:11:56 +01:00
Alex Moreno 22a978098e refactor(cypress): refs #8698 restructure parallel test execution and cleanup scripts
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-06 10:05:35 +01:00
Javier Segarra 1f83197440 Merge branch 'dev' into 8725_submit_form_onClick 2025-03-06 10:01:49 +01:00
Javier Segarra 095f01717d perf: refs #8725 handle axios.error 2025-03-06 10:01:35 +01:00
Alex Moreno cf261828db Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-06 09:53:28 +01:00
Jon Elias 9f8c491eda refactor: refs #8363 modified ItemFixedPrice and the e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 08:07:40 +01:00
Pau Rovira cee6e0d0b1 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 06:40:59 +00:00
Pau Rovira f33f09ca6f Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 06:00:58 +00:00
Javier Segarra a01f02e31b fix: refs #8725 customerFiscalData 2025-03-05 23:24:11 +01:00
Javier Segarra 4641adbae3 feat: refs #8725 init 2025-03-05 23:20:23 +01:00
Alex Moreno eb6ed49060 Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 14:02:44 +01:00
Alex Moreno 838d5e24ce fix: refs #8698 clean up Jenkinsfile and improve error handling in find.js
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 13:59:46 +01:00
Alex Moreno 0f9f9bf21d ci: refs #8698 try git_commit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:35:38 +01:00
Alex Moreno b9f23dfb18 ci: refs #8698 try git_commit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:32:28 +01:00
Alex Moreno 4ee8c80340 fix: refs #8698 update Jenkinsfile to skip Cypress execution if no modules have changed
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:28:08 +01:00
Pau Rovira 6e9e5c7564 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 12:21:33 +00:00
Alex Moreno 27d7a732b7 refactor: refs #8698 remove commented-out code in ItemDescriptorProxy.vue and VnLog.spec.js
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-05 13:13:50 +01:00
Alex Moreno 04f1aae5a0 feat: refs #8698 add Cypress tests for Order Catalog and Supplier Balance, improve module name handling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:06:39 +01:00
Alex Moreno 83c0bfad0c fix: refs #8698 update Jenkinsfile to run Cypress tests with specified modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 13:03:44 +01:00
Alex Moreno d01951a709 fix: refs #8698 handle promise rejection in getChangedModules function
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 12:57:23 +01:00
Alex Moreno 31bfe6c44e feat: refs #8698 add module resolution and import finding utilities for Cypress tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 12:52:32 +01:00
Alex Moreno 2fd9067096 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-05 12:42:02 +01:00
Alex Moreno 92566f6e53 Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-05 12:02:56 +01:00
Pau Rovira 83b9b602a0 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-05 10:46:31 +00:00
Jose Antonio Tubau b259988f90 test: refs #8422 add test for vehicleDms
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 11:14:20 +01:00
Jose Antonio Tubau c5284e54c7 refactor: refs #8422 enhance DMS import functionality and improve localization 2025-03-05 11:13:45 +01:00
Alex Moreno f1e334f1fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-05 10:30:42 +01:00
Jose Antonio Tubau 3570556c47 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8422-createVehicleDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-05 07:42:02 +01:00
Jose Antonio Tubau 25ffdb94e6 Merge branch 'dev' of https: refs #8440//gitea.verdnatura.es/verdnatura/salix-front into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 07:19:11 +01:00
Pau Rovira 1101db707e Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-05 06:02:52 +00:00
Jose Antonio Tubau fa5c1643a4 test: refs #8717 add integration test for agencyModes
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-04 12:32:21 +01:00
Pau Rovira 640d989090 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-04 09:28:27 +00:00
Jose Antonio Tubau ae502d5fac refactor: refs #8440 remove unused 'style' attribute from computed $attrs in VnNotes component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 10:24:52 +01:00
Alex Moreno 31ff7de958 ci: refs #8698 use always lastCommit from CHANGE_TARGET
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:55:50 +01:00
Alex Moreno 5bb078540d ci: refs #8698 use always lastCommit from CHANGE_TARGET
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:54:37 +01:00
Alex Moreno 7d8f25ff7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:48:38 +01:00
Alex Moreno fcebf6f664 ci: refs #8698 move functions inside script step
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-04 09:47:04 +01:00
Alex Moreno e1b96d6a73 ci: refs #8698 move functions inside script step
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:44:57 +01:00
Jose Antonio Tubau ad96392cba test: refs #8440 enhance visibility check and typing delay for adding new vehicle notes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:01:30 +01:00
Alex Moreno d15144a98a ci: refs #8698 refactor Cypress test command to use a variable for specs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-04 09:00:29 +01:00
Jose Antonio Tubau ef0ac17d88 refactor: refs #8440 update required and deletable attribute checks to use 'in' operator for originalAttrs
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 16:01:04 +01:00
Pau Rovira a5f287d782 Merge branch 'dev' into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-03 14:05:28 +00:00
Jose Antonio Tubau 0619f21cf5 test: refs #8440 add deleteNote functionality test for VnNotes component
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 14:43:10 +01:00
Alex Moreno b51f99f5f1 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 14:21:43 +01:00
Alex Moreno 5c627dd489 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 13:49:31 +01:00
Jose Antonio Tubau 7670c24f04 test: refs #8440 add Cypress integration tests for vehicle notes functionality
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 13:28:22 +01:00
Jose Antonio Tubau 01af6e8c2d refactor: refs #8440 update required and deletable attribute checks to use originalAttrs 2025-03-03 13:28:15 +01:00
Alex Moreno d199478c1d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 13:23:35 +01:00
Alex Moreno 5e782a1465 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-03 13:22:57 +01:00
Alex Moreno 42f898531d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 13:16:33 +01:00
Pau Rovira 9bf0b4c077 Merge branch 'dev' of https: refs #8655//gitea.verdnatura.es/verdnatura/salix-front into 8655-scrollUpButton
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-03 13:12:54 +01:00
Alex Moreno 1d34fc0287 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:59:39 +01:00
Alex Moreno a6eb5dde8d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:57:37 +01:00
Alex Moreno 04543c8397 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:53:13 +01:00
Alex Moreno ee96142f2d ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 12:39:45 +01:00
Alex Moreno d5486f89a5 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 12:07:16 +01:00
Alex Moreno 15159c1937 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 11:46:05 +01:00
Alex Moreno 4789c1d3cb ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 11:33:19 +01:00
Alex Moreno ca020fff80 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 11:32:14 +01:00
Alex Moreno d302ee58c0 ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-03 11:31:01 +01:00
Alex Moreno e24600d1ad ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 11:18:19 +01:00
Alex Moreno 1fcdd120c5 Merge branch '8698_jenkins_e2e_onlyChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 11:13:17 +01:00
Alex Moreno 6ab64453ab ci: refs #8698 try lastSuccessfulBuild 2025-03-03 11:13:15 +01:00
Alex Moreno ed615d7bbd Merge branch 'dev' into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:12:45 +00:00
Alex Moreno 1a52a23712 fix: refs #8698 update Jenkinsfile to include last successful build test information
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-03 09:56:52 +01:00
Alex Moreno 0491fa58b4 Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-03-03 09:56:22 +01:00
Pau Rovira 27866e7090 fix: refs #8655 fixed button problems & added translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:49:32 +01:00
Alex Moreno d2be59ddbf fix: refs #8698 comment out unnecessary echo statements and clean up lastSuccessfulBuild logic in Jenkinsfile
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-03 09:45:25 +01:00
Alex Moreno efaa8a517b feat: refs #8698 add Cypress tests for login, logout, password recovery, and two-factor authentication
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 09:32:03 +01:00
Alex Moreno c7d26084aa fix: refs #8698 comment out commit ID echo in Jenkinsfile
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 08:59:06 +01:00
Alex Moreno 40875256ff Merge branch 'dev' of https: refs #8698//gitea.verdnatura.es/verdnatura/salix-front into 8698_jenkins_e2e_onlyChanges 2025-03-03 08:58:59 +01:00
Alex Moreno 4ee7a5c4fb ci: refs #8698 try lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-03 08:49:05 +01:00
Javier Segarra 0263af7938 test: refs #7356 init each missing e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-02 23:58:36 +01:00
Javier Segarra 97c673b5f3 test: check fields
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-01 03:13:11 +01:00
Javier Segarra e0ad4fc2f1 Merge branch 'dev' into e2e_monitor 2025-03-01 02:43:53 +01:00
Javier Segarra 644339bd13 test: vnNotes restore
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-01 02:38:05 +01:00
Javier Segarra bdda691ca9 Merge branch 'dev' into update_vitest_version 2025-03-01 02:37:35 +01:00
Javier Segarra a330efd13f Merge branch 'dev' into minor_requested_changes_invoiceOutList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-01 02:32:15 +01:00
Javier Segarra 36083b4e7a perf: refs #8006 eslintrc
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-01 02:18:04 +01:00
Javier Segarra cc55cd3822 Merge branch 'dev' into 8006_eslint_rules
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-01 02:16:28 +01:00
Javier Segarra 0ee939d568 feat: refs #8647 updates
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 19:27:09 +01:00
Javier Segarra 539fc81ffa Merge branch 'dev' into 8647_fix_warnings 2025-02-28 19:04:30 +01:00
Alex Moreno a250cc0eb5 ci: refs #8698 extract lastSuccessfulBuild
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 15:01:45 +01:00
Alex Moreno 95f9917dc2 refactor: refs #8698 update Jenkinsfile to log last successful build details and clean up commented code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 14:59:54 +01:00
Alex Moreno 28ae84a931 refactor: refs #8698 update Jenkinsfile to use last successful build's changesets for commit extraction
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:58:37 +01:00
Alex Moreno f17b773cca refactor: refs #8698 update Jenkinsfile to extract last successful build commit hash and improve logging
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:57:33 +01:00
Alex Moreno bfe302e9d4 refactor: refs #8698 update Jenkinsfile to extract last successful build commit hash and improve logging
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:55:35 +01:00
Alex Moreno 69f84e2fcd refactor: refs #8698 update Jenkinsfile to extract last successful build commit hash and improve logging
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:53:54 +01:00
Alex Moreno d755c0c8ba refactor: refs #8698 update Jenkinsfile to find last successful build and remove commented test stages
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 14:41:27 +01:00
Pau Rovira 69452e2627 feat: refs #8655 added button for scrolling up
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-28 14:25:09 +01:00
Javier Segarra 2acbe53788 feat: refs #8647 remove
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:59:06 +01:00
Javier Segarra f0b3ae3ada feat: refs #8647 remove
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:58:17 +01:00
Javier Segarra ba31e98b8a fix: refs #8647 remove comment 2025-02-28 13:58:07 +01:00
Jorge Penadés ccf7e5dfad fix: refs #8647 remove unused townFilter from CreateNewPostcodeForm component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 13:07:27 +01:00
Jorge Penadés 2dab2866e7 fix: refs #8647 remove unused filterTowns fn
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-28 13:02:46 +01:00
Jorge Penadés 30afbd84d6 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 12:43:38 +01:00
Jorge Penadés 55d51ddf22 fix: refs #8647 add filter function prop to VnSelect component and refactor bank entity filter logic 2025-02-28 12:43:35 +01:00
Javier Segarra d23b22ca55 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 10:40:55 +01:00
Javier Segarra 9961f5cda0 test: refs #8647 fix warning 2025-02-28 10:40:52 +01:00
Jorge Penadés 561db9f7c8 fix: refs #8647 add default value for summary prop in WorkerDescriptor component
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 10:26:39 +01:00
Javier Segarra 287c61f507 test: refs #8647 fix warning 2025-02-28 10:15:23 +01:00
Jorge Penadés abf2a5bb5d fix: refs #8647 set default value for id prop in InvoiceInDescriptorProxy component 2025-02-28 10:08:29 +01:00
Javier Segarra f64c2a2854 test: refs #8647 fix warning 2025-02-28 10:07:45 +01:00
Jorge Penadés c2d8c76512 fix: refs #8647 set default value for id prop in SupplierDescriptorProxy component
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-28 10:07:32 +01:00
Jorge Penadés 4518ebdc35 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 09:57:09 +01:00
Jorge Penadés 1c44aceccf fix: refs #8647 set default value for model in VnDate component 2025-02-28 09:57:06 +01:00
Javier Segarra 092e6e427f Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-28 09:42:15 +01:00
Javier Segarra a6777cc183 test: refs #8647 fix warning 2025-02-28 09:42:11 +01:00
Jorge Penadés 942004d710 Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 09:28:47 +01:00
Jorge Penadés 1edf57da7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings 2025-02-28 09:28:35 +01:00
Javier Segarra 29cd014ec8 test: refs #8647 fix warning 2025-02-28 09:26:57 +01:00
Javier Segarra 642e2c7d5c Merge branch '8647_fix_warnings' of https://gitea.verdnatura.es/verdnatura/salix-front into 8647_fix_warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 20:41:38 +01:00
Javier Segarra b08778aed7 fix: refs #8647 warnings common 2025-02-27 20:41:32 +01:00
Javier Segarra dcc4f390c6 Merge branch 'dev' into 8647_fix_warnings
gitea/salix-front/pipeline/pr-test Build queued... Details
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-27 19:16:01 +00:00
Javier Segarra cf397a38ce fix: refs #8647 some swarning
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:16:43 +01:00
Javier Segarra bc3334529b test: refs #8647 improve_warnings
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 21:54:35 +01:00
Javier Segarra cc2c5e7567 feat: refs #8647 hidde filter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-23 10:02:28 +01:00
Javier Segarra 6e279120ea Merge branch 'dev' into 8647_fix_warnings 2025-02-22 13:40:18 +01:00
Javier Segarra 2ae8dc4124 Merge branch '6321_improve_handleResults' into 8647_fix_warnings 2025-02-22 13:40:08 +01:00
Javier Segarra 07d86251cb test: refs #8647 mock keyShortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 13:50:04 +01:00
Javier Segarra d881730f27 feat: refs #8647 init 2025-02-21 13:49:39 +01:00
Javier Segarra 82b2180cba Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 10:26:38 +00:00
Javier Segarra 59ddd2377b feat: refs #8006 eslint migration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 00:35:32 +01:00
Javier Segarra 95e69ff79b fix: refs #8006 example
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-20 13:10:19 +01:00
Javier Segarra e797905764 feat: refs #8006 quasar viteConfig 2025-02-20 13:10:09 +01:00
Javier Segarra 158c0f684a feat: refs #8006 copy paste rules 2025-02-20 13:10:00 +01:00
Javier Segarra f1a57ceba1 feat: refs #6321 init 2025-02-19 14:09:00 +01:00
Javier Segarra af531958ca feat: change customersumamry title
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-17 19:18:25 +01:00
Javier Segarra fa755bf608 feat: change columns order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-17 18:50:41 +01:00
Javier Segarra a7d271bafd test: add describe for each test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 01:53:39 +01:00
Javier Segarra 55841d795f test: init e2e_monitorTicket
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 01:41:06 +01:00
Jorge Penadés 3c2c40c8e6 refactor: refs #6564 improve test structure and readability in UserPanel.spec.js
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 17:34:10 +01:00
Jorge Penadés 345dc4bfbc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-13 17:07:07 +01:00
Jose Antonio Tubau 3de0ebeccd refactor: refs #8440 remove unnecessary computed properties
gitea/salix-front/pipeline/pr-dev Build queued... Details
2025-02-12 14:52:05 +01:00
Jose Antonio Tubau 62e8b5b307 feat: refs #8440 add delete functionality to notes and update required attributes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-12 14:40:17 +01:00
Jose Antonio Tubau 8f0a4da245 feat: refs #8422 add Vehicle DMS import functionality and routing
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-11 13:58:14 +01:00
Jose Antonio Tubau b229fc0ff3 Merge branch 'dev' into 8440-createVehicleNotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-10 12:43:59 +00:00
Jose Antonio Tubau 51afa21fa4 feat: refs #8440 add VehicleNotes component and update routing
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-10 13:41:03 +01:00
Jorge Penadés 5325095297 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-07 11:39:36 +01:00
Jorge Penadés 76b914e6be feat: refs #6564 add problems column to TicketAdvance and update localization
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 10:35:08 +01:00
Jorge Penadés aa91209ab7 fix: refs #6564 align ticket advance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-04 10:05:44 +01:00
Jorge Penadés 4ba57a1ca3 Merge branch 'dev' of https: refs #6564//gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 09:55:25 +01:00
Jorge Penadés 498e8c385e feat: refs #6564 enhance ticket advance functionality with confirmation actions and improved UI interactions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 17:35:36 +01:00
Jorge Penadés fda024d6fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-03 14:17:36 +01:00
Jorge Penadés 35dac33ff9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6564-enhanceTicketAdvance
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-03 11:43:46 +01:00
Javier Segarra 5f2b71dc70 feat: updates 2025-01-23 11:33:19 +01:00
Javier Segarra ff63a8fd11 Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 23:18:55 +01:00
Javier Segarra fcb2e3cc74 feat: organize imports
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-12-23 12:47:09 +01:00
Javier Segarra 5b0479e60c Merge branch 'dev' into update_vitest_version
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 12:26:33 +01:00
Javier Segarra 099c613ccc feat: update_vitest_version to 2.0.0
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 12:23:53 +01:00
Jorge Penadés 82fa3b4648 feat: refs #6564 add 0 step
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 12:10:33 +01:00
Jorge Penadés aa3810a4c0 feat: refs #6564 add agency & ticket list
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-18 11:24:12 +01:00
359 changed files with 6706 additions and 5494 deletions

View File

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

View File

@ -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',
],
},
],
};

3
.eslintrc.json Normal file
View File

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

5
Jenkinsfile vendored
View File

@ -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 {
} }
} }
} }

View File

@ -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,

87
eslint.config.js Normal file
View File

@ -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',
],
};

View File

@ -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": {

File diff suppressed because it is too large Load Diff

View File

@ -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/**'),

View File

@ -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
};

View File

@ -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">

View File

@ -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));
}); });
}); });
}); });

View File

@ -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';

View File

@ -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();
};
}); });

View File

@ -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"

View File

@ -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')"

View File

@ -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>{{

View File

@ -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"

View File

@ -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>

View File

@ -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" />

View File

@ -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>

View File

@ -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>

View File

@ -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: {

View File

@ -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'"
> >

View File

@ -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:

View File

@ -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 {

View File

@ -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() {

View File

@ -11,6 +11,9 @@ describe('VnTable', () => {
propsData: { propsData: {
columns: [], columns: [],
}, },
attrs: {
'data-key': 'test',
},
}); });
vm = wrapper.vm; vm = wrapper.vm;

View File

@ -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;

View File

@ -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;
}

View File

@ -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 () => {

View File

@ -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);
});
});
});

View File

@ -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', {

View File

@ -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', () => {

View File

@ -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();
}); });

View File

@ -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,
});
});
}); });

View File

@ -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">

View File

@ -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>

View File

@ -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">

View File

@ -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` }">

View File

@ -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" />

View File

@ -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() {

View File

@ -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"
> >

View File

@ -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>

View File

@ -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;
" "

View File

@ -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>

View File

@ -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();
} }

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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,
}); });

View File

@ -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;

View File

@ -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

View File

@ -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';

View File

@ -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;
}); });

View File

@ -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');

View File

@ -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';

View File

@ -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);
}); });
}); });

View File

@ -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');
}); });

View File

@ -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);
});
});
});

View File

@ -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');
}); });

View File

@ -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'),
]);
});
}); });

View File

@ -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']);
});
});

View File

@ -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();
});
});
}); });

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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">

View File

@ -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">

View File

@ -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"

View File

@ -46,7 +46,7 @@ const props = defineProps({
default: null, default: null,
}, },
order: { order: {
type: String, type: [String, Array],
default: '', default: '',
}, },
limit: { limit: {

View File

@ -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>

View File

@ -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 () => {

View File

@ -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', () => {

View File

@ -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', () => {

View File

@ -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 },
}); });
}); });

View File

@ -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;
}); });

View File

@ -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();

View File

@ -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', () => {

View File

@ -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;
}

View File

@ -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');

View File

@ -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,
); );
}); });
}); });

View File

@ -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();

View File

@ -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;
}

View File

@ -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;
}
}

View File

@ -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,
}; };
} }

View File

@ -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 };

View File

@ -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('%', '');
} }

View File

@ -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);

View File

@ -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 {

View File

@ -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',
}; };
}; };

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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