From e428da4a290a523923c7a0d887162eb2b793b49d Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 13 Aug 2024 10:05:07 +0200 Subject: [PATCH 1/3] feat: refs #7323 add my account" btn & fix models log selectable --- src/components/UserPanel.vue | 12 ++++++++++++ src/components/common/VnLog.vue | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue index 15d88d615..2f191691a 100644 --- a/src/components/UserPanel.vue +++ b/src/components/UserPanel.vue @@ -159,6 +159,14 @@ const isEmployee = computed(() => useRole().isEmployee()); size="xxl" color="transparent" /> +
{{ user.nickname }}
@@ -262,3 +270,7 @@ const isEmployee = computed(() => useRole().isEmployee()); } } + +es: + My account: Mi cuenta + diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 72d3516c5..07bca4095 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -14,6 +14,7 @@ import VnJsonValue from '../common/VnJsonValue.vue'; import FetchData from '../FetchData.vue'; import VnSelect from './VnSelect.vue'; import VnUserLink from '../ui/VnUserLink.vue'; +import item from 'src/router/modules/item'; const stateStore = useStateStore(); const validationsStore = useValidator(); @@ -407,9 +408,12 @@ watch( @on-fetch=" (data) => (actions = data.map((item) => { + const changedModel = item.changedModel; return { - locale: useCapitalize(validations[item.changedModel].locale.name), - value: item.changedModel, + locale: useCapitalize( + validations[changedModel]?.locale?.name ?? changedModel + ), + value: changedModel, }; })) " From 81c70c95114de64c2c016d50e7b8c4620a0c36d5 Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 13 Aug 2024 10:06:58 +0200 Subject: [PATCH 2/3] chore: refs #7323 remove unused import --- src/components/common/VnLog.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 07bca4095..2163d54d4 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -14,7 +14,6 @@ import VnJsonValue from '../common/VnJsonValue.vue'; import FetchData from '../FetchData.vue'; import VnSelect from './VnSelect.vue'; import VnUserLink from '../ui/VnUserLink.vue'; -import item from 'src/router/modules/item'; const stateStore = useStateStore(); const validationsStore = useValidator(); From d276436bb3d3e1a318b7c4a7d6ecec711d76b18e Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 13 Aug 2024 10:42:15 +0200 Subject: [PATCH 3/3] chore: refs #7323 fix test --- test/cypress/integration/logout.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cypress/integration/logout.spec.js b/test/cypress/integration/logout.spec.js index af705223b..423189908 100644 --- a/test/cypress/integration/logout.spec.js +++ b/test/cypress/integration/logout.spec.js @@ -8,7 +8,7 @@ describe('Logout', () => { describe('by user', () => { it('should logout', () => { cy.get('#user').click(); - cy.get('.block').click(); + cy.get('#logout').click(); }); }); describe('not user', () => {