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

bugfix/shelving-154 #168

Merged
alexm merged 28 commits from :bugfix/shelving-154 into dev 2024-02-08 17:28:05 +00:00
Conversation 3 Commits 28 Files Changed 28 +1619 -93
hyervoni commented 2024-01-30 20:40:26 +00:00
Contributor
Copy Link

Pr para terminar ajustes solicitados módulo shelvings
https://redmine.verdnatura.es/issues/6785

Pr para terminar ajustes solicitados módulo shelvings https://redmine.verdnatura.es/issues/6785
hyervoni added 21 commits 2024-01-30 20:40:27 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
4cf9548234 Fix shelving module
jsegarra requested review from alexm 2024-02-02 06:50:04 +00:00
jsegarra requested review from jsegarra 2024-02-02 06:50:04 +00:00
alexm commented 2024-02-02 07:13:51 +00:00
Member
Copy Link

/index searchbar el tooltip(i) esta en ingles
/crear valor por defecto 0
/crear falta redirección al crear

/index searchbar el tooltip(i) esta en ingles /crear valor por defecto 0 /crear falta redirección al crear
jsegarra requested changes 2024-02-02 07:20:46 +00:00
src/pages/Shelving/Card/ShelvingSearchbar.vue
@ -14,4 +15,3 @@
<style scoped lang="scss"></style>
<i18n>
es:
jsegarra commented 2024-02-02 07:20:44 +00:00
Member
Copy Link

No hay traducción para :info

No hay traducción para :info
jsegarra marked this conversation as resolved
kmartinez added 1 commit 2024-02-02 11:33:45 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
ea9a9323e7 Fix feedback
jsegarra requested changes 2024-02-05 06:37:12 +00:00
src/pages/Shelving/Card/ShelvingForm.vue
@ -77,3 +84,4 @@
:form-initial-data="defaultInitialData"
@on-data-saved="onSave"
>
<template #form="{ data, validate, filter }">
jsegarra commented 2024-02-05 06:37:09 +00:00
Member
Copy Link

El campo de prioridad no es de tipo number como si lo es en Salix.
En esta PR es posible poner prioridad igual a "1arriba abajo" y da fallo al crear. Es correcto, porque en el back, está la validación de que el campo debe ser de tipo number

El campo de prioridad no es de tipo number como si lo es en Salix. En esta PR es posible poner prioridad igual a "1arriba abajo" y da fallo al crear. Es correcto, porque en el back, está la validación de que el campo debe ser de tipo number
jsegarra marked this conversation as resolved
jsegarra commented 2024-02-05 06:39:21 +00:00
Member
Copy Link

/index searchbar el tooltip(i) esta en ingles
/crear valor por defecto 0
/crear falta redirección al crear

Esto está OK

> /index searchbar el tooltip(i) esta en ingles > /crear valor por defecto 0 > /crear falta redirección al crear Esto está OK
kmartinez added 1 commit 2024-02-06 01:00:54 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
1665dbf400 Fix shelving priority field
jsegarra approved these changes 2024-02-06 07:12:19 +00:00
Dismissed
alexm approved these changes 2024-02-06 07:20:41 +00:00
Dismissed
alexm commented 2024-02-06 07:21:38 +00:00
Member
Copy Link

Falta arreglar conflictos y podemos fusionar ✅

Falta arreglar conflictos y podemos fusionar ✅
alexm requested changes 2024-02-06 07:24:17 +00:00
alexm left a comment
Member
Copy Link

Me acabo de dar cuenta que deberia redirijir a /basi-data del nuevo carro al crear.
Y en el /summary el campo trabajador deberia tener descriptor

Me acabo de dar cuenta que deberia redirijir a /basi-data del nuevo carro al crear. Y en el /summary el campo trabajador deberia tener descriptor
kmartinez added 2 commits 2024-02-06 13:54:26 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
011e15233e Fix Shelving creation
kmartinez dismissed jsegarra’s review 2024-02-06 13:54:26 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

kmartinez dismissed alexm’s review 2024-02-06 13:54:26 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jsegarra approved these changes 2024-02-06 14:04:43 +00:00
Dismissed
alexm approved these changes 2024-02-07 06:31:14 +00:00
Dismissed
alexm left a comment
Member
Copy Link

Faltaria arrelgar conflictos

Faltaria arrelgar conflictos
kmartinez added 1 commit 2024-02-08 01:39:09 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
kmartinez dismissed jsegarra’s review 2024-02-08 01:39:09 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

kmartinez dismissed alexm’s review 2024-02-08 01:39:09 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jsegarra approved these changes 2024-02-08 06:07:10 +00:00
Dismissed
alexm approved these changes 2024-02-08 06:11:02 +00:00
Dismissed
alexm left a comment
Member
Copy Link

Parece que falla este test:

⎯⎯⎯⎯⎯⎯⎯ Failed Tests 1 ⎯⎯⎯⎯⎯⎯⎯



 FAIL  test/vitest/__tests__/components/Leftmenu.spec.js > Leftmenu > should return a proper formated object with two child items

AssertionError: expected [ Array(2) ] to deeply equal ArrayContaining{ …(3) }

 ❯ test/vitest/__tests__/components/Leftmenu.spec.js:90:40

     88|         ];

     89|         const firstMenuItem = vm.items[0];

     90|         expect(firstMenuItem.children).toEqual(expect.arrayContaining(…

       |                                        ^

     91|     });

     92| });



  - Expected  - 0

  + Received  + 16



  - ArrayContaining {

  -   $$typeof: Symbol.for(jest.asymmetricMatcher),

  -   inverse: false,

  -   sample: [

  -     {

  -       icon: 'view_list',

  -       name: 'CustomerList',

  -       title: 'customer.pageTitles.list',

  -     },

  -     {

  -       icon: 'vn:addperson',

  -       name: 'CustomerCreate',

  -       title: 'customer.pageTitles.createCustomer',

  -     },

  -   ],

  - }

  + [

  +   {

  +     children: null,

  +     icon: 'view_list',

  +     name: 'CustomerList',

  +     title: 'customer.pageTitles.list',

  +   },

  +   {

  +     children: null,

  +     icon: 'vn:addperson',

  +     name: 'CustomerCreate',

  +     title: 'customer.pageTitles.createCustomer',

  +   },

  + ]

⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/1]⎯



 Test Files  1 failed | 23 passed (24)

      Tests  1 failed | 67 passed (68)

   Start at  02:40:00

   Duration  8.19s (transform 7.90s, setup 427ms, collect 65.74s, tests 1.96s, environment 5.81s, prepare 3.39s)

Los podeis lanzar en local con npm run test:unit

Parece que falla este test: ``` ⎯⎯⎯⎯⎯⎯⎯ Failed Tests 1 ⎯⎯⎯⎯⎯⎯⎯ FAIL test/vitest/__tests__/components/Leftmenu.spec.js > Leftmenu > should return a proper formated object with two child items AssertionError: expected [ Array(2) ] to deeply equal ArrayContaining{ …(3) } ❯ test/vitest/__tests__/components/Leftmenu.spec.js:90:40 88| ]; 89| const firstMenuItem = vm.items[0]; 90| expect(firstMenuItem.children).toEqual(expect.arrayContaining(… | ^ 91| }); 92| }); - Expected - 0 + Received + 16 - ArrayContaining { - $$typeof: Symbol.for(jest.asymmetricMatcher), - inverse: false, - sample: [ - { - icon: 'view_list', - name: 'CustomerList', - title: 'customer.pageTitles.list', - }, - { - icon: 'vn:addperson', - name: 'CustomerCreate', - title: 'customer.pageTitles.createCustomer', - }, - ], - } + [ + { + children: null, + icon: 'view_list', + name: 'CustomerList', + title: 'customer.pageTitles.list', + }, + { + children: null, + icon: 'vn:addperson', + name: 'CustomerCreate', + title: 'customer.pageTitles.createCustomer', + }, + ] ⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/1]⎯ Test Files 1 failed | 23 passed (24) Tests 1 failed | 67 passed (68) Start at 02:40:00 Duration 8.19s (transform 7.90s, setup 427ms, collect 65.74s, tests 1.96s, environment 5.81s, prepare 3.39s) ``` Los podeis lanzar en local con `npm run test:unit`
kmartinez added 1 commit 2024-02-08 11:33:30 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
a0ba4ac017 Fix LeftMenu Unit test
kmartinez dismissed jsegarra’s review 2024-02-08 11:33:30 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

kmartinez dismissed alexm’s review 2024-02-08 11:33:30 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jsegarra approved these changes 2024-02-08 11:42:45 +00:00
Dismissed
alexm approved these changes 2024-02-08 12:24:06 +00:00
Dismissed
kmartinez added 1 commit 2024-02-08 13:23:23 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
4e42a6ab74 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/pages/Route/RouteList.vue
kmartinez dismissed jsegarra’s review 2024-02-08 13:23:24 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

kmartinez dismissed alexm’s review 2024-02-08 13:23:24 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

alexm approved these changes 2024-02-08 17:27:45 +00:00
alexm merged commit 54e7e9c1e3 into dev 2024-02-08 17:28:05 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jsegarra
alexm
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
4 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#168
No description provided.
Delete Branch ":bugfix/shelving-154"

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?