verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity

feat(VnSelect): order data equal salix #918

Merged
alexm merged 3 commits from warmFix_order_equalSalix into dev 2024-11-13 06:48:56 +00:00
Conversation 1 Commits 3 Files Changed 2 +57
alexm commented 2024-11-12 13:38:01 +00:00
Member
Copy Link

Me lo habían pedido para el desplegable de tipo en el filtro de catálogo (ejemplo: http://localhost:9000/#/order/16/catalog)
Y he visto que Salix si ordenaba pero lilium no y he visto esto: b926f8f8ad/front/core/components/array-model/array-model.js (L67)

Lo he añadido a VnSelect en principio no debería ir mal pq es tal cual lo que había en salix

Me lo habían pedido para el desplegable de tipo en el filtro de catálogo (ejemplo: http://localhost:9000/#/order/16/catalog) Y he visto que Salix si ordenaba pero lilium no y he visto esto: https://gitea.verdnatura.es/verdnatura/salix/src/commit/b926f8f8ad2bfb29fb8ace738847ca285b40dfdd/front/core/components/array-model/array-model.js#L67 Lo he añadido a VnSelect en principio no debería ir mal pq es tal cual lo que había en salix
alexm added 1 commit 2024-11-12 13:38:01 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
3f15c3cce0 feat(VnSelect): order data equal salix
alexm requested review from jsegarra 2024-11-12 13:38:37 +00:00
alexm commented 2024-11-12 13:39:22 +00:00
Author
Member
Copy Link

image

![image](/attachments/138ec72b-ecc6-49e0-8209-5f0f5ae8bc1a)
image.png
81 KiB
jsegarra requested changes 2024-11-12 13:45:37 +00:00
Dismissed
src/utils/dataByOrder.js
@ -0,0 +12,4 @@
}
return data.sort((a, b) => sortFunc(a, b, orderComp));
} else if (typeof order === 'function') return data.sort(data);
jsegarra commented 2024-11-12 13:41:51 +00:00
Member
Copy Link

Para ayudar en la legibilidad, mover esta linea a antes del segundo if

Para ayudar en la legibilidad, mover esta linea a antes del segundo if
alexm marked this conversation as resolved
src/utils/dataByOrder.js
@ -0,0 +17,4 @@
}
function sortFunc(a, b, order) {
for (let i of order) {
jsegarra commented 2024-11-12 13:42:16 +00:00
Member
Copy Link

let {field, way} ??

let {field, way} ??
alexm marked this conversation as resolved
alexm added 1 commit 2024-11-13 06:21:48 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
8269037faa chore: perf
alexm added 1 commit 2024-11-13 06:22:01 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2ae9d68fec Merge branch 'dev' into warmFix_order_equalSalix
alexm requested review from jsegarra 2024-11-13 06:22:02 +00:00
jsegarra approved these changes 2024-11-13 06:22:53 +00:00
alexm merged commit 1f8ead608c into dev 2024-11-13 06:48:56 +00:00
alexm deleted branch warmFix_order_equalSalix 2024-11-13 06:48:56 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jsegarra
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#918
No description provided.
Delete Branch "warmFix_order_equalSalix"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?