Compare commits

..

152 Commits

Author SHA1 Message Date
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
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
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
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
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 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
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 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
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 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
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 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
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
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
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
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
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 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 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
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
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
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 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
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 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 f2a20ce4bf test: refs #8006 config 2025-03-31 13:52:30 +02:00
Javier Segarra 9ef29e61bd Merge branch 'dev' into 8006_eslint_rules 2025-03-31 13:20:57 +02: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 4b1a648509 fix: refs #8006 defaults 2025-03-26 09:22:25 +01: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 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 dc35377f13 Merge branch 'dev' into 8006_eslint_rules 2025-03-25 19:59:48 +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
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
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
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
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
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
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
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
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
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
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
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
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 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
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
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
72 changed files with 1406 additions and 492 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 2' sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
} }
} }
} }
@ -183,3 +185,4 @@ pipeline {
} }
} }
} }

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

@ -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",
@ -31,22 +32,27 @@
"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",
"@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",
@ -54,7 +60,9 @@
"eslint": "^9.18.0", "eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1", "eslint-config-prettier": "^10.0.1",
"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",

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

@ -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,22 +1,12 @@
<script setup> <script setup>
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
import { getValueFromPath } from 'src/composables/getValueFromPath';
const { row, visibleProblems = null } = defineProps({ defineProps({ row: { type: Object, required: true } });
row: { type: Object, required: true },
visibleProblems: { type: Array },
});
function showProblem(problem) {
const val = getValueFromPath(row, problem);
if (!visibleProblems) return val;
return !!(visibleProblems?.includes(problem) && val);
}
</script> </script>
<template> <template>
<span class="q-gutter-x-xs"> <span class="q-gutter-x-xs">
<router-link <router-link
v-if="showProblem('claim.claimFk')" v-if="row.claim?.claimFk"
:to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }" :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
class="link" class="link"
> >
@ -28,7 +18,7 @@ function showProblem(problem) {
</QIcon> </QIcon>
</router-link> </router-link>
<QIcon <QIcon
v-if="showProblem('isDeleted')" v-if="row?.isDeleted"
color="primary" color="primary"
name="vn:deletedTicket" name="vn:deletedTicket"
size="xs" size="xs"
@ -39,7 +29,7 @@ function showProblem(problem) {
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="showProblem('hasRisk')" v-if="row?.hasRisk"
name="vn:risk" name="vn:risk"
:color="row.hasHighRisk ? 'negative' : 'primary'" :color="row.hasHighRisk ? 'negative' : 'primary'"
size="xs" size="xs"
@ -50,76 +40,51 @@ function showProblem(problem) {
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="showProblem('hasComponentLack')" v-if="row?.hasComponentLack"
name="vn:components" name="vn:components"
color="primary" color="primary"
size="xs" size="xs"
> >
<QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
v-if="showProblem('hasItemDelay')"
color="primary"
size="xs"
name="vn:hasItemDelay"
>
<QTooltip> <QTooltip>
{{ $t('ticket.summary.hasItemDelay') }} {{ $t('ticket.summary.hasItemDelay') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
v-if="showProblem('hasItemLost')"
color="primary"
size="xs"
name="vn:hasItemLost"
>
<QTooltip> <QTooltip>
{{ $t('salesTicketsTable.hasItemLost') }} {{ $t('salesTicketsTable.hasItemLost') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="showProblem('hasItemShortage')" v-if="row?.hasItemShortage"
name="vn:unavailable" name="vn:unavailable"
color="primary" color="primary"
size="xs" size="xs"
> >
<QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
v-if="showProblem('hasRounding')"
color="primary"
name="sync_problem"
size="xs"
>
<QTooltip> <QTooltip>
{{ $t('ticketList.rounding') }} {{ $t('ticketList.rounding') }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="showProblem('hasTicketRequest')" v-if="row?.hasTicketRequest"
name="vn:buyrequest" name="vn:buyrequest"
color="primary" color="primary"
size="xs" size="xs"
> >
<QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
v-if="showProblem('isTaxDataChecked')"
name="vn:no036"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
</QIcon> </QIcon>
<QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs"> <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
<QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
v-if="showProblem('isTooLittle')"
name="vn:isTooLittle"
color="primary"
size="xs"
>
<QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip> <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
</QIcon> </QIcon>
</span> </span>

View File

@ -1,9 +1,13 @@
import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest'; import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
import { createWrapper } from 'app/test/vitest/helper'; import { createWrapper } from 'app/test/vitest/helper';
import UserPanel from 'src/components/UserPanel.vue'; import UserPanel from 'src/components/UserPanel.vue';
import axios from 'axios'; import axios from 'axios';
import { useState } from 'src/composables/useState'; import { useState } from 'src/composables/useState';
vi.mock('src/utils/quasarLang', () => ({
default: vi.fn(),
}));
describe('UserPanel', () => { describe('UserPanel', () => {
let wrapper; let wrapper;
let vm; let vm;
@ -39,7 +43,7 @@ describe('UserPanel', () => {
await vm.saveDarkMode(true); await vm.saveDarkMode(true);
expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true }); expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
expect(vm.user.darkMode).toBe(true); expect(vm.user.darkMode).toBe(true);
vm.updatePreferences(); await vm.updatePreferences();
expect(vm.darkMode).toBe(true); expect(vm.darkMode).toBe(true);
}); });
@ -48,7 +52,7 @@ describe('UserPanel', () => {
await vm.saveLanguage(userLanguage); await vm.saveLanguage(userLanguage);
expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage }); expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
expect(vm.user.lang).toBe(userLanguage); expect(vm.user.lang).toBe(userLanguage);
vm.updatePreferences(); await vm.updatePreferences();
expect(vm.locale).toBe(userLanguage); expect(vm.locale).toBe(userLanguage);
}); });
@ -56,8 +60,6 @@ describe('UserPanel', () => {
const key = 'name'; const key = 'name';
const value = 'itboss'; const value = 'itboss';
await vm.saveUserData(key, value); await vm.saveUserData(key, value);
expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
[key]: value,
});
}); });
}); });

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

@ -219,6 +219,7 @@ function filterByRecord(modelLog) {
} }
async function applyFilter(params = {}) { async function applyFilter(params = {}) {
paginate.value.arrayData.resetPagination();
paginate.value.arrayData.applyFilter({ paginate.value.arrayData.applyFilter({
filter: {}, filter: {},
params: { originFk: route.params.id, ...params }, params: { originFk: route.params.id, ...params },

View File

@ -10,6 +10,7 @@ import { useFilterParams } from 'src/composables/useFilterParams';
import FetchData from '../FetchData.vue'; import FetchData from '../FetchData.vue';
import { useValidator } from 'src/composables/useValidator'; import { useValidator } from 'src/composables/useValidator';
import { useCapitalize } from 'src/composables/useCapitalize'; import { useCapitalize } from 'src/composables/useCapitalize';
import VnAvatar from '../ui/VnAvatar.vue';
const $props = defineProps({ const $props = defineProps({
dataKey: { dataKey: {
@ -99,7 +100,6 @@ function getActions() {
:columns="columns" :columns="columns"
:redirect="false" :redirect="false"
:hiddenTags="['originFk', 'creationDate']" :hiddenTags="['originFk', 'creationDate']"
:exprBuilder
search-url="logs" search-url="logs"
:showTagChips="false" :showTagChips="false"
> >

View File

@ -177,6 +177,8 @@ async function fetch() {
.value { .value {
color: var(--vn-text-color); color: var(--vn-text-color);
overflow: hidden; overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
} }
} }
.header { .header {
@ -208,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

@ -6,7 +6,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { useClipboard } from 'src/composables/useClipboard'; import { useClipboard } from 'src/composables/useClipboard';
import VnMoreOptions from './VnMoreOptions.vue'; import VnMoreOptions from './VnMoreOptions.vue';
import { getValueFromPath } from 'src/composables/getValueFromPath';
const entity = defineModel({ type: Object, default: null }); const entity = defineModel({ type: Object, default: null });
const $props = defineProps({ const $props = defineProps({
@ -57,6 +56,18 @@ const routeName = computed(() => {
return `${routeName}Summary`; return `${routeName}Summary`;
}); });
function getValueFromPath(path) {
if (!path) return;
const keys = path.toString().split('.');
let current = entity.value;
for (const key of keys) {
if (current[key] === undefined) return undefined;
else current = current[key];
}
return current;
}
function copyIdText(id) { function copyIdText(id) {
copyText(id, { copyText(id, {
component: { component: {
@ -159,10 +170,10 @@ const toModule = computed(() => {
<div class="title"> <div class="title">
<span <span
v-if="title" v-if="title"
:title="getValueFromPath(entity, title)" :title="getValueFromPath(title)"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`" :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
> >
{{ getValueFromPath(entity, title) ?? title }} {{ getValueFromPath(title) ?? title }}
</span> </span>
<slot v-else name="description" :entity="entity"> <slot v-else name="description" :entity="entity">
<span <span
@ -178,7 +189,7 @@ const toModule = computed(() => {
class="subtitle" class="subtitle"
:data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`" :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
> >
#{{ getValueFromPath(entity, subtitle) ?? entity.id }} #{{ getValueFromPath(subtitle) ?? entity.id }}
</QItemLabel> </QItemLabel>
<QBtn <QBtn
round round
@ -241,6 +252,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

@ -1,11 +0,0 @@
export function getValueFromPath(root, path) {
if (!root || !path) return;
const keys = path.toString().split('.');
let current = root;
for (const key of keys) {
if (current[key] === undefined) return undefined;
else current = current[key];
}
return current;
}

View File

@ -13,7 +13,7 @@ export function useRole() {
name: data.user.name, name: data.user.name,
nickname: data.user.nickname, nickname: data.user.nickname,
lang: data.user.lang || 'es', lang: data.user.lang || 'es',
departmentFk: data.user.worker.department.departmentFk, departmentFk: data.user?.worker?.department?.departmentFk,
}; };
state.setUser(userData); state.setUser(userData);
state.setRoles(roles); state.setRoles(roles);

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

View File

@ -3,7 +3,13 @@ import { computed, ref } from 'vue';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters'; import {
toCurrency,
toPercentage,
toDate,
dashOrCurrency,
dashIfEmpty,
} from 'src/filters';
import CardSummary from 'components/ui/CardSummary.vue'; import CardSummary from 'components/ui/CardSummary.vue';
import VnLv from 'src/components/ui/VnLv.vue'; import VnLv from 'src/components/ui/VnLv.vue';
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue'; import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@ -84,27 +90,28 @@ const sumRisk = ({ clientRisks }) => {
<VnLv :label="t('customer.summary.customerId')" :value="entity.id" /> <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
<VnLv :label="t('globals.name')" :value="entity.name" /> <VnLv :label="t('globals.name')" :value="entity.name" />
<VnLv :label="t('customer.summary.contact')" :value="entity.contact" /> <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
<VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')"> <VnLv :value="entity.phone">
<template #value> <template #label>
{{ t('customer.extendedList.tableVisibleColumns.phone') }}
<VnLinkPhone :phone-number="entity.phone" /> <VnLinkPhone :phone-number="entity.phone" />
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('customer.summary.mobile')"> <VnLv :value="entity.mobile">
<template #value> <template #label>
{{ t('customer.summary.mobile') }}
<VnLinkPhone :phone-number="entity.mobile" />
<VnLinkPhone <VnLinkPhone
sip
say-simple say-simple
:phone-number="entity.mobile" :phone-number="entity.mobile"
:channel="entity.country?.saySimpleCountry?.channel" :channel="entity.country?.saySimpleCountry?.channel"
class="q-ml-xs"
/> />
</template> </template>
</VnLv> </VnLv>
<VnLv <VnLv :value="entity.email" copy
:label="t('globals.params.email')" ><template #label>
:value="entity.email" {{ t('globals.params.email') }}
class="ellipsis" <VnLinkMail email="entity.email"></VnLinkMail> </template
copy
><template #value> <VnLinkMail :email="entity.email" /> </template
></VnLv> ></VnLv>
<VnLv :label="t('globals.department')"> <VnLv :label="t('globals.department')">
<template #value> <template #value>
@ -286,10 +293,14 @@ const sumRisk = ({ clientRisks }) => {
<VnLv <VnLv
v-if="entity.creditInsurance" v-if="entity.creditInsurance"
:label="t('customer.summary.securedCredit')" :label="t('customer.summary.securedCredit')"
:value="toCurrency(entity.creditInsurance)"
:info="t('customer.summary.securedCreditInfo')" :info="t('customer.summary.securedCreditInfo')"
/> >
<template #value>
{{ toCurrency(entity.creditInsurance) }}({{
dashIfEmpty(entity.classifications[0]?.insurances[0]?.grade)
}})
</template></VnLv
>
<VnLv <VnLv
:label="t('customer.summary.balance')" :label="t('customer.summary.balance')"
:value="toCurrency(sumRisk(entity)) || toCurrency(0)" :value="toCurrency(sumRisk(entity)) || toCurrency(0)"

View File

@ -70,8 +70,8 @@ onMounted(async () => {
:url="`#/entry/${entityId}/basic-data`" :url="`#/entry/${entityId}/basic-data`"
:text="t('globals.summary.basicData')" :text="t('globals.summary.basicData')"
/> />
<div class="card-group"> <div class="vn-card-group">
<div class="card-content"> <div class="vn-card-content">
<VnLv <VnLv
:label="t('entry.summary.commission')" :label="t('entry.summary.commission')"
:value="entry?.commission" :value="entry?.commission"
@ -93,7 +93,7 @@ onMounted(async () => {
:value="entry?.invoiceNumber" :value="entry?.invoiceNumber"
/> />
</div> </div>
<div class="card-content"> <div class="vn-card-content">
<VnCheckbox <VnCheckbox
:label="t('entry.list.tableVisibleColumns.isOrdered')" :label="t('entry.list.tableVisibleColumns.isOrdered')"
v-model="entry.isOrdered" v-model="entry.isOrdered"
@ -130,8 +130,8 @@ onMounted(async () => {
:url="`#/travel/${entry.travel.id}/summary`" :url="`#/travel/${entry.travel.id}/summary`"
:text="t('Travel')" :text="t('Travel')"
/> />
<div class="card-group"> <div class="vn-card-group">
<div class="card-content"> <div class="vn-card-content">
<VnLv :label="t('entry.summary.travelReference')"> <VnLv :label="t('entry.summary.travelReference')">
<template #value> <template #value>
<span class="link"> <span class="link">
@ -161,7 +161,7 @@ onMounted(async () => {
:value="entry.travel.warehouseIn?.name" :value="entry.travel.warehouseIn?.name"
/> />
</div> </div>
<div class="card-content"> <div class="vn-card-content">
<VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" /> <VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
<VnCheckbox <VnCheckbox
:label="t('entry.summary.travelDelivered')" :label="t('entry.summary.travelDelivered')"
@ -193,31 +193,6 @@ onMounted(async () => {
</template> </template>
</CardSummary> </CardSummary>
</template> </template>
<style lang="scss" scoped>
.card-group {
display: flex;
flex-direction: column;
}
.card-content {
display: flex;
flex-direction: column;
text-overflow: ellipsis;
> div {
max-height: 24px;
}
}
@media (min-width: 1010px) {
.card-group {
flex-direction: row;
}
.card-content {
flex: 1;
margin-right: 16px;
}
}
</style>
<i18n> <i18n>
es: es:
Travel: Envío Travel: Envío

View File

@ -22,7 +22,7 @@ const routes = reactive({
getSupplier: (id) => { getSupplier: (id) => {
return { name: 'SupplierCard', params: { id } }; return { name: 'SupplierCard', params: { id } };
}, },
getTickets: (id) => { getInvoices: (id) => {
return { return {
name: 'InvoiceInList', name: 'InvoiceInList',
query: { query: {
@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
</QBtn> </QBtn>
<QBtn <QBtn
size="md" size="md"
icon="vn:ticket" icon="vn:invoice-in"
color="primary" color="primary"
:to="routes.getTickets(entity.supplierFk)" :to="routes.getInvoices(entity.supplierFk)"
> >
<QTooltip>{{ t('globals.ticketList') }}</QTooltip> <QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
</QBtn> </QBtn>
<QBtn <QBtn
v-if=" v-if="

View File

@ -15,6 +15,7 @@ invoiceIn:
amount: Amount amount: Amount
descriptor: descriptor:
ticketList: Ticket list ticketList: Ticket list
invoices: Supplier invoices
descriptorMenu: descriptorMenu:
book: Book book: Book
unbook: Unbook unbook: Unbook

View File

@ -14,7 +14,7 @@ invoiceIn:
awb: AWB awb: AWB
amount: Importe amount: Importe
descriptor: descriptor:
ticketList: Listado de tickets invoices: Facturas de proveedor
descriptorMenu: descriptorMenu:
book: Contabilizar book: Contabilizar
unbook: Descontabilizar unbook: Descontabilizar

View File

@ -198,7 +198,7 @@ const getLocale = (label) => {
<QItemSection> <QItemSection>
<VnSelect <VnSelect
dense dense
rounded filled
:label="t('globals.params.packing')" :label="t('globals.params.packing')"
v-model="params.packing" v-model="params.packing"
url="ItemPackingTypes" url="ItemPackingTypes"

View File

@ -46,7 +46,6 @@ const columns = computed(() => [
}, },
isId: true, isId: true,
columnFilter: false, columnFilter: false,
width: '25px',
}, },
{ {
name: 'workerFk', name: 'workerFk',
@ -142,7 +141,6 @@ const columns = computed(() => [
label: 'm3', label: 'm3',
cardVisible: true, cardVisible: true,
columnClass: 'shrink', columnClass: 'shrink',
width: '50px',
}, },
{ {
name: 'started', name: 'started',
@ -150,7 +148,6 @@ const columns = computed(() => [
component: 'time', component: 'time',
columnFilter: false, columnFilter: false,
format: ({ started }) => toHour(started), format: ({ started }) => toHour(started),
width: '50px',
}, },
{ {
name: 'finished', name: 'finished',
@ -158,7 +155,6 @@ const columns = computed(() => [
component: 'time', component: 'time',
columnFilter: false, columnFilter: false,
format: ({ finished }) => toHour(finished), format: ({ finished }) => toHour(finished),
width: '50px',
}, },
{ {
align: 'right', align: 'right',

View File

@ -46,7 +46,6 @@ const columns = computed(() => [
condition: () => true, condition: () => true,
}, },
columnFilter: false, columnFilter: false,
width: '25px',
}, },
{ {
align: 'left', align: 'left',
@ -57,7 +56,6 @@ const columns = computed(() => [
cardVisible: true, cardVisible: true,
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef), format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
columnFilter: false, columnFilter: false,
width: '100px',
}, },
{ {
label: t('globals.agency'), label: t('globals.agency'),
@ -100,7 +98,6 @@ const columns = computed(() => [
cardVisible: true, cardVisible: true,
columnFilter: false, columnFilter: false,
format: ({ started }) => toHour(started), format: ({ started }) => toHour(started),
width: '50px',
}, },
{ {
align: 'center', align: 'center',
@ -109,7 +106,6 @@ const columns = computed(() => [
cardVisible: true, cardVisible: true,
columnFilter: false, columnFilter: false,
format: ({ finished }) => toHour(finished), format: ({ finished }) => toHour(finished),
width: '50px',
}, },
{ {
align: 'left', align: 'left',

View File

@ -46,7 +46,7 @@ async function getClaims() {
originalTicket.value = data[0]?.originalTicketFk; originalTicket.value = data[0]?.originalTicketFk;
} }
async function getProblems() { async function getProblems() {
const { data } = await axios.get(`Tickets/getTicketProblems`, {params: { ids: [entityId.value] }}); const { data } = await axios.get(`Tickets/${entityId.value}/getTicketProblems`);
if (!data) return; if (!data) return;
problems.value = data[0]; problems.value = data[0];
} }

View File

@ -14,8 +14,6 @@ import { useState } from 'src/composables/useState';
import { toDateFormat } from 'src/filters/date.js'; import { toDateFormat } from 'src/filters/date.js';
import axios from 'axios'; import axios from 'axios';
import VnTable from 'src/components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
import { QTable } from 'quasar';
import TicketProblems from 'src/components/TicketProblems.vue';
const state = useState(); const state = useState();
const { t } = useI18n(); const { t } = useI18n();
@ -29,16 +27,6 @@ const selectedTickets = ref([]);
const vnTableRef = ref({}); const vnTableRef = ref({});
const originElRef = ref(null); const originElRef = ref(null);
const destinationElRef = ref(null); const destinationElRef = ref(null);
const actions = {
advance: {
title: t('advanceTickets.advanceTickets'),
cb: moveTicketsAdvance,
},
advanceWithoutNegative: {
title: t('advanceTickets.advanceTicketsWithoutNegatives'),
cb: splitTickets,
},
};
let today = Date.vnNew().toISOString(); let today = Date.vnNew().toISOString();
const tomorrow = new Date(today); const tomorrow = new Date(today);
tomorrow.setDate(tomorrow.getDate() + 1); tomorrow.setDate(tomorrow.getDate() + 1);
@ -90,15 +78,6 @@ const ticketColumns = computed(() => [
headerClass: 'horizontal-separator', headerClass: 'horizontal-separator',
hidden: true, hidden: true,
}, },
{
label: t('globals.agency'),
name: 'agency',
field: 'agency',
align: 'left',
sortable: true,
headerClass: 'horizontal-separator',
columnFilter: false,
},
{ {
label: t('advanceTickets.preparation'), label: t('advanceTickets.preparation'),
name: 'preparation', name: 'preparation',
@ -106,6 +85,7 @@ const ticketColumns = computed(() => [
align: 'left', align: 'left',
sortable: true, sortable: true,
headerClass: 'horizontal-separator', headerClass: 'horizontal-separator',
columnFilter: false,
}, },
{ {
align: 'left', align: 'left',
@ -128,19 +108,12 @@ const ticketColumns = computed(() => [
headerClass: 'horizontal-separator', headerClass: 'horizontal-separator',
format: (row) => toCurrency(row.totalWithVat), format: (row) => toCurrency(row.totalWithVat),
}, },
{
align: 'left',
label: '',
name: 'problems',
headerClass: 'vertical-separator horizontal-separator',
columnClass: 'vertical-separator',
hidden: true,
},
{ {
align: 'left', align: 'left',
label: t('advanceTickets.futureId'), label: t('advanceTickets.futureId'),
name: 'futureId', name: 'futureId',
headerClass: 'horizontal-separator', headerClass: 'vertical-separator horizontal-separator',
columnClass: 'vertical-separator',
}, },
{ {
align: 'left', align: 'left',
@ -269,7 +242,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
return { query, params }; return { query, params };
}; };
async function moveTicketsAdvance() { const moveTicketsAdvance = async () => {
let ticketsToMove = []; let ticketsToMove = [];
for (const ticket of selectedTickets.value) { for (const ticket of selectedTickets.value) {
if (!ticket.id) { if (!ticket.id) {
@ -294,7 +267,7 @@ async function moveTicketsAdvance() {
vnTableRef.value.reload(); vnTableRef.value.reload();
selectedTickets.value = []; selectedTickets.value = [];
if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive'); if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
} };
const progressLength = ref(0); const progressLength = ref(0);
const progressPercentage = computed(() => { const progressPercentage = computed(() => {
@ -317,7 +290,7 @@ const progressAdd = () => {
} }
}; };
async function splitTickets() { const splitTickets = async () => {
try { try {
showProgressDialog.value = true; showProgressDialog.value = true;
for (const ticket of selectedTickets.value) { for (const ticket of selectedTickets.value) {
@ -337,7 +310,7 @@ async function splitTickets() {
} finally { } finally {
vnTableRef.value.reload(); vnTableRef.value.reload();
} }
} };
const resetProgressData = () => { const resetProgressData = () => {
if (cancelProgress.value) cancelProgress.value = false; if (cancelProgress.value) cancelProgress.value = false;
@ -353,32 +326,6 @@ const handleCloseProgressDialog = () => {
const handleCancelProgress = () => (cancelProgress.value = true); const handleCancelProgress = () => (cancelProgress.value = true);
const confirmAction = (action) => {
openConfirmationModal(actions[action].title, false, actions[action].cb, null, {
component: QTable,
props: {
columns: [
{
align: 'left',
label: t('advanceTickets.destination'),
name: 'id',
field: (row) => row.id,
},
{
align: 'left',
label: t('advanceTickets.origin'),
name: 'futureId',
field: (row) => row.futureId,
},
],
rows: selectedTickets.value,
class: 'full-width',
dense: true,
flat: true,
},
});
};
watch( watch(
() => vnTableRef.value.tableRef?.$el, () => vnTableRef.value.tableRef?.$el,
($el) => { ($el) => {
@ -452,7 +399,15 @@ watch(
color="primary" color="primary"
class="q-mr-sm" class="q-mr-sm"
:disable="!selectedTickets.length" :disable="!selectedTickets.length"
@click.stop="confirmAction('advance')" @click.stop="
openConfirmationModal(
t('advanceTickets.advanceTicketTitle'),
t(`advanceTickets.advanceTitleSubtitle`, {
selectedTickets: selectedTickets.length,
}),
moveTicketsAdvance,
)
"
> >
<QTooltip> <QTooltip>
{{ t('advanceTickets.advanceTickets') }} {{ t('advanceTickets.advanceTickets') }}
@ -462,7 +417,15 @@ watch(
icon="alt_route" icon="alt_route"
color="primary" color="primary"
:disable="!selectedTickets.length" :disable="!selectedTickets.length"
@click.stop="confirmAction('advanceWithoutNegative')" @click.stop="
openConfirmationModal(
t('advanceTickets.advanceWithoutNegativeTitle'),
t(`advanceTickets.advanceWithoutNegativeSubtitle`, {
selectedTickets: selectedTickets.length,
}),
splitTickets,
)
"
> >
<QTooltip> <QTooltip>
{{ t('advanceTickets.advanceTicketsWithoutNegatives') }} {{ t('advanceTickets.advanceTicketsWithoutNegatives') }}
@ -491,7 +454,7 @@ watch(
}" }"
v-model:selected="selectedTickets" v-model:selected="selectedTickets"
:pagination="{ rowsPerPage: 0 }" :pagination="{ rowsPerPage: 0 }"
:no-data-label="$t('globals.noResults')" :no-data-label="t('globals.noResults')"
:right-search="false" :right-search="false"
:order="['futureTotalWithVat ASC']" :order="['futureTotalWithVat ASC']"
auto-load auto-load
@ -559,9 +522,6 @@ watch(
{{ toCurrency(row.totalWithVat || 0) }} {{ toCurrency(row.totalWithVat || 0) }}
</QBadge> </QBadge>
</template> </template>
<template #column-problems="{ row }">
<TicketProblems :row="row.problems" :visible-problems="['hasRisk']" />
</template>
<template #column-futureId="{ row }"> <template #column-futureId="{ row }">
<QBtn flat class="link" dense> <QBtn flat class="link" dense>
{{ row.futureId }} {{ row.futureId }}

View File

@ -10,7 +10,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
import axios from 'axios'; import axios from 'axios';
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import VnInputNumber from 'src/components/common/VnInputNumber.vue'; import VnInputNumber from 'src/components/common/VnInputNumber.vue';
import VnCheckbox from 'src/components/common/VnCheckbox.vue';
const { t, te } = useI18n(); const { t, te } = useI18n();
const props = defineProps({ const props = defineProps({
dataKey: { dataKey: {
@ -122,20 +122,18 @@ onMounted(async () => await getItemPackingTypes());
<QItemSection> <QItemSection>
<VnInputNumber <VnInputNumber
v-model="params.scopeDays" v-model="params.scopeDays"
:label="t('globals.daysOnward')" :label="t('Days onward')"
filled filled
:step="0"
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnCheckbox <QCheckbox
:label="t('params.isFullMovable')" :label="t('params.isFullMovable')"
v-model="params.isFullMovable" v-model="params.isFullMovable"
toggle-indeterminate toggle-indeterminate
@update:model-value="searchFn()" @update:model-value="searchFn()"
dense
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
@ -168,12 +166,11 @@ onMounted(async () => await getItemPackingTypes());
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnCheckbox <QCheckbox
toggle-indeterminate toggle-indeterminate
:label="t('params.onlyWithDestination')" label="only with destination"
v-model="params.onlyWithDestination" v-model="params.onlyWithDestination"
@update:model-value="searchFn()" @update:model-value="searchFn()"
dense
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>
@ -197,8 +194,8 @@ es:
Vertical: Vertical Vertical: Vertical
iptInfo: Encajado iptInfo: Encajado
params: params:
dateFuture: F. origen dateFuture: fecha origen
dateToAdvance: F. destino dateToAdvance: Fecha destino
futureIpt: IPT Origen futureIpt: IPT Origen
ipt: IPT destino ipt: IPT destino
isFullMovable: 100% movible isFullMovable: 100% movible

View File

@ -113,7 +113,7 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'shipped', name: 'shippedDate',
cardVisible: true, cardVisible: true,
label: t('ticketList.shipped'), label: t('ticketList.shipped'),
columnFilter: { columnFilter: {
@ -123,7 +123,7 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'shipped', name: 'shippedHour',
component: 'time', component: 'time',
columnFilter: false, columnFilter: false,
label: t('ticketList.hour'), label: t('ticketList.hour'),

View File

@ -205,6 +205,7 @@ ticketList:
toLines: Go to lines toLines: Go to lines
addressNickname: Address nickname addressNickname: Address nickname
ref: Reference ref: Reference
hour: Hour
rounding: Rounding rounding: Rounding
noVerifiedData: No verified data noVerifiedData: No verified data
purchaseRequest: Purchase request purchaseRequest: Purchase request

View File

@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
<template #body="{ entity }"> <template #body="{ entity }">
<VnLv :label="t('globals.user')" :value="entity.user?.name" /> <VnLv :label="t('globals.user')" :value="entity.user?.name" />
<VnLv <VnLv
class="ellipsis-text" class="ellipsis"
:label="t('globals.params.email')" :label="t('globals.params.email')"
:value="entity.user?.emailUser?.email" :value="entity.user?.emailUser?.email"
copy copy

View File

@ -91,7 +91,7 @@ onBeforeMount(async () => {
</template> </template>
</VnLv> </VnLv>
</div> </div>
<div class="vn-card-content"> <div class="vn-card-content" v-if="advancedSummary">
<VnLv <VnLv
:label="t('worker.summary.fiDueDate')" :label="t('worker.summary.fiDueDate')"
:value="toDate(advancedSummary.fiDueDate)" :value="toDate(advancedSummary.fiDueDate)"
@ -132,6 +132,7 @@ onBeforeMount(async () => {
<VnTitle :text="t('worker.summary.userData')" /> <VnTitle :text="t('worker.summary.userData')" />
<VnLv :label="t('globals.name')" :value="worker?.user?.nickname" /> <VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
<VnLv <VnLv
class="ellipsis"
:label="t('globals.params.email')" :label="t('globals.params.email')"
:value="worker.user?.emailUser?.email" :value="worker.user?.emailUser?.email"
copy copy

View File

@ -75,13 +75,13 @@ onMounted(async () => {
<template #body="{ entity: zone }"> <template #body="{ entity: zone }">
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" /> <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
<div class="card-group"> <div class="vn-card-group">
<div class="card-content"> <div class="vn-card-content">
<VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" /> <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
<VnLv :label="t('list.price')" :value="toCurrency(zone.price)" /> <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
<VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" /> <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
</div> </div>
<div class="card-content"> <div class="vn-card-content">
<VnLv <VnLv
:label="t('summary.closeHour')" :label="t('summary.closeHour')"
:value="toTimeFormat(zone.hour)" :value="toTimeFormat(zone.hour)"
@ -98,7 +98,7 @@ onMounted(async () => {
</div> </div>
</div> </div>
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-max">
<VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" /> <VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
<QTable <QTable
:columns="columns" :columns="columns"
@ -109,15 +109,3 @@ onMounted(async () => {
</template> </template>
</CardSummary> </CardSummary>
</template> </template>
<style lang="scss" scoped>
.card-group {
display: flex;
flex-direction: column;
}
.card-content {
display: flex;
flex-direction: column;
}
</style>

View File

@ -1,15 +0,0 @@
#!/bin/bash
find 'test/cypress/integration' \
-mindepth 1 \
-maxdepth 1 \
-type d | \
xargs -P "$1" -I {} sh -c '
echo "🔷 {}" &&
xvfb-run -a cypress run \
--headless \
--spec "{}" \
--quiet \
> /dev/null
'
wait

View File

@ -0,0 +1,20 @@
#!/bin/bash
echo $2
if [ -z "$2" ]; then
TEST_DIRS=$(find 'test/cypress/integration' -mindepth 1 -maxdepth 1 -type d)
else
TEST_DIRS=$2
fi
echo $TEST_DIRS x$1
echo "$TEST_DIRS" | xargs -P "$1" -I {} sh -c '
echo "🔷 {}" &&
xvfb-run -a cypress run \
--headless \
--spec "{}" \
--quiet \
> /dev/null
'
wait

View File

@ -0,0 +1,52 @@
import fs from 'fs';
import { parse } from 'es-module-lexer';
import { parse as vueParse } from '@vue/compiler-sfc';
import glob from 'fast-glob';
import { resolveImportPath, toRelative } from './resolve-import-path.js';
const ROUTER_MODULES = 'src/router/modules/';
const files = await glob(['src/**/*.{vue,js,ts}'], { absolute: true });
const vueFiles = new Map();
export async function findImports(targetFile, visited = new Set(), identation = '') {
if (visited.has(targetFile)) return []; // Avoid infinite loops
visited.add(targetFile);
const usageFiles = files
.filter((file) => {
let content = fs.readFileSync(file, 'utf8');
if (file.endsWith('.vue')) {
if (vueFiles.has(file)) {
content = vueFiles.get(file);
} else {
const { descriptor } = vueParse(content);
content = descriptor?.scriptSetup?.content ?? '';
vueFiles.set(file, content);
}
}
if (!content.trim()) return false;
return parse(content)[0].some((imp) => {
if (!imp?.n) return false;
return resolveImportPath(imp.n, targetFile) === targetFile;
});
})
.map((file) => toRelative(file));
let fullTree = [...usageFiles];
for (const file of usageFiles) {
if (file.startsWith(ROUTER_MODULES)) {
continue;
}
fullTree = [
...fullTree,
...(await findImports(file, visited, identation + ' ')),
];
}
return getUniques(fullTree); // Remove duplicates
}
function getUniques(array) {
return Array.from(new Set(array));
}

View File

@ -0,0 +1,36 @@
import { execSync } from 'child_process';
import { findImports } from './find-imports.js';
import { getModules } from './get-modules.js';
const E2E_PATH = 'test/cypress/integration';
const FINDED_PATHS = ['src', E2E_PATH];
function getGitDiff(options) {
const TARGET_BRANCH = options[2] || 'dev';
const diff = execSync(`git diff --name-only origin/${TARGET_BRANCH}`, {
encoding: 'utf-8',
});
return diff.split('\n');
}
async function getChangedModules() {
let changedModules = new Set();
const changes = getGitDiff(process.argv);
for (const change of changes) {
if (!change) continue;
if (!FINDED_PATHS.some((prefix) => change.startsWith(prefix))) return '';
const changedArray = [
...changedModules,
...new Set(getModules(await findImports(change))),
];
if (change.startsWith(E2E_PATH)) changedArray.push(change);
changedModules = new Set(changedArray);
}
return [...changedModules].join('\n');
}
getChangedModules()
.then((modules) => console.log(modules)) // is return
.catch((e) => {
console.error(e);
process.exit(1);
});

View File

@ -0,0 +1,13 @@
export function getModules(files) {
const CYPRESS_PREFIX = 'test/cypress/integration/';
const CYPRESS_SUFIX = '/**/*.spec.js';
const modules = [];
for (const file of files) {
if (file.startsWith('src/page')) {
modules.push(
CYPRESS_PREFIX + file.split('/')[2].toLowerCase() + CYPRESS_SUFIX,
);
}
}
return modules;
}

View File

@ -0,0 +1,34 @@
import fs from 'fs';
import path from 'path';
const rootDir = process.cwd();
const config = JSON.parse(fs.readFileSync('jsconfig.json', 'utf-8'));
const { paths, baseUrl } = config.compilerOptions;
function resolveImportPath(importPath, fileBase) {
if (!importPath) return null;
importPath = jsConfigPaths(importPath);
const fileDir = path.dirname(fileBase);
if (importPath.startsWith('.') || importPath.startsWith('/')) {
return path.relative(rootDir, path.resolve(fileDir, importPath));
}
return importPath;
}
function toRelative(file) {
return path.relative(rootDir, file);
}
function jsConfigPaths(importPath) {
for (const [aliasPattern, [target]] of Object.entries(paths)) {
const alias = aliasPattern.replace('/*', '');
const targetBase = target.replace('/*', '');
if (importPath.startsWith(alias)) {
const rest = importPath.slice(alias.length);
return path.resolve(baseUrl, targetBase + rest);
}
}
return importPath;
}
export { resolveImportPath, toRelative };

View File

@ -35,6 +35,8 @@ docker build -f ./docs/Dockerfile.dev -t lilium-dev .
# END IMAGES # END IMAGES
docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d docker-compose -p e2e --project-directory . -f test/cypress/docker-compose.yml up -d
files=$(node test/cypress/docker/find/find.js)
echo $files
docker run -it --rm \ docker run -it --rm \
-v "$(pwd)":/app \ -v "$(pwd)":/app \
@ -42,6 +44,6 @@ docker run -it --rm \
-e CI \ -e CI \
-e TZ \ -e TZ \
lilium-dev \ lilium-dev \
bash -c 'sh test/cypress/cypressParallel.sh 2' bash -c "sh test/cypress/docker/cypressParallel.sh 2 '$files'"
cleanup cleanup

View File

@ -13,7 +13,7 @@ describe('InvoiceInDescriptor', () => {
cy.validateCheckbox(checkbox, false); cy.validateCheckbox(checkbox, false);
}); });
it.skip('should delete the invoice properly', () => { it('should delete the invoice properly', () => {
cy.visit('/#/invoice-in/2/summary'); cy.visit('/#/invoice-in/2/summary');
cy.selectDescriptorOption(2); cy.selectDescriptorOption(2);
cy.clickConfirm(); cy.clickConfirm();
@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => {
cy.visit('/#/invoice-in/6/summary'); cy.visit('/#/invoice-in/6/summary');
cy.selectDescriptorOption(5); cy.selectDescriptorOption(5);
cy.dataCy('SendEmailNotifiactionDialogInput_input').type( cy.dataCy('SendEmailNotificationDialogInput_input').type(
'{selectall}jorgito@gmail.mx', '{selectall}jorgito@gmail.mx',
); );
cy.clickConfirm(); cy.clickConfirm();

View File

@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => {
}); });
}); });
it('should transfer the invoice ', () => { it.skip('should transfer the invoice ', () => {
cy.typeSearchbar('T1111111{enter}'); cy.typeSearchbar('T1111111{enter}');
cy.dataCy('descriptor-more-opts').click(); cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(1)).click(); cy.get(selectMenuOption(1)).click();
@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click(); cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click(); cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click(); cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible'); cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
cy.get(confirmSend).click(); cy.get(confirmSend).click();
cy.checkNotification('Notification sent'); cy.checkNotification('Notification sent');
}); });
@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => {
cy.dataCy('descriptor-more-opts').click(); cy.dataCy('descriptor-more-opts').click();
cy.get(selectMenuOption(3)).click(); cy.get(selectMenuOption(3)).click();
cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click(); cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible'); cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
cy.get(confirmSend).click(); cy.get(confirmSend).click();
cy.checkNotification('Notification sent'); cy.checkNotification('Notification sent');
}); });

View File

@ -5,12 +5,11 @@ import jsconfigPaths from 'vite-jsconfig-paths';
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'; import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
import path from 'path'; import path from 'path';
let reporters, let reporters, outputFile;
outputFile;
if (process.env.CI) { if (process.env.CI) {
reporters = ['junit', 'default']; reporters = ['junit', 'default'];
outputFile = {junit: './junit/vitest.xml'}; outputFile = { junit: './junit/vitest.xml' };
} else { } else {
reporters = 'default'; reporters = 'default';
} }
@ -28,6 +27,9 @@ export default defineConfig({
'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}', 'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
], ],
}, },
server: {
hmr: { overlay: false },
},
plugins: [ plugins: [
vue({ vue({
template: { template: {
@ -39,8 +41,11 @@ export default defineConfig({
sassVariables: 'src/quasar-variables.scss', sassVariables: 'src/quasar-variables.scss',
}), }),
VueI18nPlugin({ VueI18nPlugin({
strictMessage: false,
runtimeOnly: false,
include: [ include: [
path.resolve(__dirname, 'src/i18n/**'), path.resolve(__dirname, 'src/i18n/locale/**'),
path.resolve(__dirname, 'src/pages/**/locale/**'), path.resolve(__dirname, 'src/pages/**/locale/**'),
], ],
}), }),