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

#4074 useAcls #584

Merged
jorgep merged 30 commits from 4074-useAcls into dev 2024-09-10 11:50:45 +00:00
Conversation 0 Commits 30 Files Changed 32 +164 -186
jorgep commented 2024-08-01 12:16:16 +00:00
Member
Copy Link
No description provided.
jorgep added 3 commits 2024-08-01 12:16:17 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
dcc2f4dfde chore: refs #4074 admit several acls
jorgep added 1 commit 2024-08-01 12:46:08 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
27034d1dc2 chore: refs #4074 admit several acls
jorgep added 1 commit 2024-08-01 14:08:44 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
fb496d7fc6 chore: refs #4074 admit several acls
jorgep added 1 commit 2024-08-01 14:10:29 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
db18e8c937 fix: refs #4074 workerCard data-key
jorgep added 2 commits 2024-08-01 14:39:25 +00:00
jorgep added 3 commits 2024-08-02 10:04:23 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
51fec90607 feat: refs #4074 useAcl in vnSelectDialog
jorgep added 1 commit 2024-09-06 11:29:48 +00:00
jorgep added 1 commit 2024-09-06 12:23:10 +00:00
jorgep added 1 commit 2024-09-06 13:37:38 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
3693ba0c99 feat: refs #4074 drop useless code
jorgep added 1 commit 2024-09-06 13:52:09 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
d0131dd552 fix: refs #4074 drop wrong acl
jorgep added 1 commit 2024-09-06 15:01:27 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
b87e7ce750 refactor: refs #4074 use VnTitle
jorgep added 1 commit 2024-09-09 08:04:00 +00:00
jorgep added 1 commit 2024-09-09 09:47:44 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router
jorgep added 1 commit 2024-09-09 09:54:03 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
803ce3b909 refactor: refs #4074 rollback
jorgep added 1 commit 2024-09-09 10:28:17 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
6438f36eca refactor: refs #4074 accept array
jorgep added 1 commit 2024-09-09 10:56:42 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
381b236a18 refactor: refs #4074 use acl & drop useless roles
jorgep added 1 commit 2024-09-09 11:59:32 +00:00
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
jorgep added 1 commit 2024-09-09 12:09:34 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
bd00f86d74 chore: refs #4074 fix tests
jorgep changed title from WIP #4074 useAcls to #4074 useAcls 2024-09-09 12:10:43 +00:00
jorgep reviewed 2024-09-09 14:13:26 +00:00
src/router/modules/invoiceIn.js Outdated
@ -80,7 +80,6 @@ export default {
meta: {
title: 'basicData',
icon: 'vn:settings',
roles: ['salesPerson'],
jorgep commented 2024-09-09 14:13:26 +00:00
Author
Member
Copy Link

No tiene sentido, solo puede entrar en InvoiceIn administrative.

No tiene sentido, solo puede entrar en InvoiceIn administrative.
jorgep reviewed 2024-09-09 14:13:54 +00:00
src/router/modules/shelving.js Outdated
@ -76,7 +76,6 @@ export default {
meta: {
title: 'basicData',
icon: 'vn:settings',
roles: ['salesPerson'],
jorgep commented 2024-09-09 14:13:54 +00:00
Author
Member
Copy Link

No tiene sentido. Cualquier employee puede editarlo o verlo.

No tiene sentido. Cualquier employee puede editarlo o verlo.
jorgep reviewed 2024-09-09 14:23:53 +00:00
src/components/common/VnSelectDialog.vue
@ -26,3 +32,4 @@
const isAllowedToCreate = computed(() => {
if ($props.acls.length) return acl.hasAny($props.acls);
return role.hasAny($props.rolesAllowedToCreate);
jorgep commented 2024-09-09 14:23:53 +00:00
Author
Member
Copy Link

Mantenemos retrocompatibilidad.

Mantenemos retrocompatibilidad.
jorgep reviewed 2024-09-09 14:26:38 +00:00
jorgep added 1 commit 2024-09-09 14:44:48 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
26c7dfde35 chore: refs #4074 fix tests
jorgep added 1 commit 2024-09-09 15:01:41 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
04aa96b798 chore: refs #4074 fix tests
jorgep added 1 commit 2024-09-09 15:10:39 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f8cbb0a762 chore: refs #4074 fix tests
jorgep reviewed 2024-09-09 15:16:31 +00:00
test/cypress/integration/outLogin/login.spec.js Outdated
@ -53,8 +53,8 @@ describe('Login', () => {
});
it(`should get redirected to dashboard since employee can't create tickets`, () => {
cy.visit('/#/ticket/create', { failOnStatusCode: false });
jorgep commented 2024-09-09 15:16:31 +00:00
Author
Member
Copy Link

Habían puesto que solo podía el role developer. Esto en Salix no estaba.

Habían puesto que solo podía el role developer. Esto en Salix no estaba.
jorgep added 1 commit 2024-09-09 15:20:20 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
f3471fe5ab fix: refs #4074 await to watch
jorgep requested review from jsegarra 2024-09-09 15:21:07 +00:00
jorgep added the
CR / Tests passed
 label 2024-09-09 15:21:11 +00:00
jsegarra reviewed 2024-09-09 17:41:28 +00:00
src/pages/Item/Card/ItemSummary.vue
@ -9,3 +9,2 @@
import VnUserLink from 'src/components/ui/VnUserLink.vue';
import { useRole } from 'src/composables/useRole';
import VnTitle from 'src/components/common/VnTitle.vue';
jsegarra commented 2024-09-09 17:41:28 +00:00
Member
Copy Link

Porque se modifica este componente reemplazando por VnTitle??

Porque se modifica este componente reemplazando <component /> por VnTitle??
jorgep commented 2024-09-10 06:58:12 +00:00
Author
Member
Copy Link

Porque es un summary, los summary gastan VnTitle. Si te fijas, gasta un router-link o un span con la clase link...

Porque es un summary, los summary gastan VnTitle. Si te fijas, gasta un router-link o un span con la clase link...
jsegarra requested changes 2024-09-09 17:47:21 +00:00
Dismissed
src/pages/Item/Card/ItemSummary.vue
@ -10,3 +10,2 @@
import { useRole } from 'src/composables/useRole';
import VnTitle from 'src/components/common/VnTitle.vue';
jsegarra commented 2024-09-09 17:42:23 +00:00
Member
Copy Link

Porque no se hace con el archivo siguiente, crear una funcion llamada getUrl??

Porque no se hace con el archivo siguiente, crear una funcion llamada getUrl??
jorgep commented 2024-09-10 07:10:34 +00:00
Author
Member
Copy Link

No veo la necesidad, pero te lo cambio.

No veo la necesidad, pero te lo cambio.
jorgep marked this conversation as resolved
src/pages/Worker/Card/WorkerTimeControl.vue
@ -67,3 +67,3 @@
const worker = computed(() => arrayData.store?.data);
const isHr = computed(() => hasAny(['hr']));
const isHr = computed(() => useRole().hasAny(['hr']));
jsegarra commented 2024-09-09 17:46:52 +00:00
Member
Copy Link

duda: en router(index hemos rremplazado userole por useAcl, aqui proque no?

duda: en router(index hemos rremplazado userole por useAcl, aqui proque no?
jorgep commented 2024-09-10 07:12:19 +00:00
Author
Member
Copy Link

En este caso en concreto, no lo he tocado porque lo abordaré en otra tarea, ya que tengo que cambiar permisos y añadir otro acl. En el redmite está indicado.

En este caso en concreto, no lo he tocado porque lo abordaré en otra tarea, ya que tengo que cambiar permisos y añadir otro acl. En el redmite está indicado.
test/cypress/integration/outLogin/login.spec.js
@ -55,3 +55,2 @@
it(`should get redirected to dashboard since employee can't create tickets`, () => {
cy.visit('/#/ticket/create', { failOnStatusCode: false });
cy.url().should('contain', '/#/login?redirect=/ticket/create');
cy.visit('/#/account/ldap', { failOnStatusCode: false });
jsegarra commented 2024-09-09 17:43:49 +00:00
Member
Copy Link

Hermos cambiado la URL pero no hemos cambiado el it del test...

Hermos cambiado la URL pero no hemos cambiado el it del test...
jorgep marked this conversation as resolved
test/vitest/__tests__/composables/useAcl.spec.js
@ -48,40 +48,62 @@ describe('useAcl', () => {
jsegarra commented 2024-09-09 17:44:27 +00:00
Member
Copy Link

Test maravilloso 🤌

Test maravilloso 🤌
jorgep added 1 commit 2024-09-10 06:59:08 +00:00
jorgep added 1 commit 2024-09-10 07:19:01 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
3fafb15eb8 refactor: refs #4074 use fn
jorgep requested review from jsegarra 2024-09-10 07:19:04 +00:00
jsegarra approved these changes 2024-09-10 09:47:13 +00:00
jorgep added 1 commit 2024-09-10 11:45:17 +00:00
gitea/salix-front/pipeline/pr-dev This commit looks good Details
05c91e2a29 Merge branch 'dev' into 4074-useAcls
jorgep merged commit a8d4457365 into dev 2024-09-10 11:50:45 +00:00
jorgep deleted branch 4074-useAcls 2024-09-10 11:50:45 +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#584
No description provided.
Delete Branch "4074-useAcls"

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?