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

Merge branch 'dev' into 6076-2FA
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2023-08-10 06:58:52 +00:00
parent 87d6304218 a9851e3781
commit 2ead25c69b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/LeftMenu.vue
View File

@ -1,6 +1,6 @@
<script setup> <script setup>
import axios from 'axios'; import axios from 'axios';
import { onMounted, ref, computed } from 'vue'; import { onMounted, ref } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { QSeparator, useQuasar } from 'quasar'; import { QSeparator, useQuasar } from 'quasar';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
@ -107,13 +107,13 @@ async function togglePinned(item, event) {
message: t('globals.dataSaved'), message: t('globals.dataSaved'),
type: 'positive', type: 'positive',
}); });
} };
</script> </script>
<template> <template>
<QList padding class="column-max-width"> <QList padding class="column-max-width">
<template v-if="$props.source === 'main'"> <template v-if="$props.source === 'main'">
<template v-if="this.$route.matched[1].name === 'Dashboard'"> <template v-if="this.$route?.matched[1]?.name === 'Dashboard'">
<QItem class="header"> <QItem class="header">
<QItemSection avatar> <QItemSection avatar>
<QIcon name="view_module" /> <QIcon name="view_module" />
@ -156,7 +156,7 @@ async function togglePinned(item, event) {
</template> </template>
<template v-for="item in items" :key="item.name"> <template v-for="item in items" :key="item.name">
<template v-if="item.name === this.$route.matched[1].name"> <template v-if="item.name === this.$route?.matched[1]?.name">
<QItem class="header"> <QItem class="header">
<QItemSection avatar v-if="item.icon"> <QItemSection avatar v-if="item.icon">
<QIcon :name="item.icon" /> <QIcon :name="item.icon" />

2
test/vitest/__tests__/components/Leftmenu.spec.js
View File

@ -45,7 +45,7 @@ vi.mock('src/router/modules', () => ({
], ],
})); }));
describe.skip('Leftmenu', () => { describe('Leftmenu', () => {
let vm; let vm;
let navigation; let navigation;
beforeAll(() => { beforeAll(() => {