+
- {{ t(`${module.name}.pageTitles.${module.title}`) }}
+ {{ t(item.title) }}
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 6c061284d..c6264f07f 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
});
function updatePreferences() {
- if (user.value.darkMode) {
+ if (user.value.darkMode !== null) {
darkMode.value = user.value.darkMode;
}
if (user.value.lang) {
diff --git a/src/components/__tests__/Leftmenu.spec.js b/src/components/__tests__/Leftmenu.spec.js
index 9d0212c77..472e3394b 100644
--- a/src/components/__tests__/Leftmenu.spec.js
+++ b/src/components/__tests__/Leftmenu.spec.js
@@ -2,97 +2,103 @@ import { jest, describe, expect, it, beforeAll } from '@jest/globals';
import { createWrapper } from 'app/tests/jest/jestHelpers';
import Leftmenu from '../LeftMenu.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { useNavigationStore } from 'src/stores/useNavigationStore';
+
const mockPush = jest.fn();
jest.mock('vue-router', () => ({
useRouter: () => ({
push: mockPush,
- currentRoute: { value: 'myCurrentRoute' }
+ currentRoute: { value: 'myCurrentRoute' },
+ }),
+ useRoute: () => ({
+ matched: [],
}),
}));
-jest.mock('src/router/routes', () => ([
+jest.mock('src/router/modules', () => [
{
- path: '/',
- name: 'Main',
+ path: '/customer',
+ name: 'Customer',
+ meta: {
+ title: 'customers',
+ icon: 'vn:client',
+ },
+ menus: {
+ main: ['CustomerList', 'CustomerCreate'],
+ card: ['CustomerBasicData'],
+ },
children: [
{
- path: '/dashboard',
- name: 'Dashboard',
- meta: { title: 'dashboard', icon: 'dashboard' }
- },
- {
- path: '/customer',
- name: 'Customer',
- meta: {
- title: 'customers',
- icon: 'vn:client'
- },
+ path: '',
+ name: 'CustomerMain',
children: [
{
- path: '',
- name: 'CustomerMain',
- children: [
- {
- path: 'list',
- name: 'CustomerList',
- meta: {
- title: 'list',
- icon: 'view_list',
- }
- },
- {
- path: 'create',
- name: 'CustomerCreate',
- meta: {
- title: 'createCustomer',
- icon: 'vn:addperson',
- }
- },
- ]
- }
- ]
- }
+ path: 'list',
+ name: 'CustomerList',
+ meta: {
+ title: 'list',
+ icon: 'view_list',
+ },
+ },
+ {
+ path: 'create',
+ name: 'CustomerCreate',
+ meta: {
+ title: 'createCustomer',
+ icon: 'vn:addperson',
+ },
+ },
+ ],
+ },
],
},
-]));
+]);
describe('Leftmenu', () => {
let vm;
- beforeAll(() => {
- vm = createWrapper(Leftmenu).vm;
- });
+ let navigation;
+ beforeAll(async () => {
+ vm = createWrapper(Leftmenu, {
+ propsData: {
+ source: 'main',
+ },
+ global: {
+ plugins: [createTestingPinia({ stubActions: false })],
+ },
+ }).vm;
- it('should return the proper formated object without the children property', async () => {
- const expectedMenuItem = {
- stateName: 'Dashboard',
- name: 'dashboard',
- roles: [],
- icon: 'dashboard',
- title: 'dashboard'
- }
-
- const firstMenuItem = vm.navigation.modules.value[0];
- expect(firstMenuItem.children).toBeUndefined();
- expect(firstMenuItem).toEqual(expect.objectContaining(expectedMenuItem));
+ navigation = useNavigationStore();
+ navigation.modules = ['customer']; // I should mock to have just one module but isn´t working
+ navigation.fetchPinned = jest.fn().mockReturnValue(Promise.resolve(true));
+ navigation.getModules = jest.fn().mockReturnValue({
+ value: [
+ {
+ name: 'customer',
+ title: 'customer.pageTitles.customers',
+ icon: 'vn:customer',
+ module: 'customer',
+ },
+ ],
+ });
});
it('should return a proper formated object with two child items', async () => {
- const expectedMenuItem = [{
- name: 'CustomerList',
- title: 'list',
- icon: 'view_list',
- stateName: 'CustomerList'
- },
- {
- name: 'CustomerCreate',
- title: 'createCustomer',
- icon: 'vn:addperson',
- stateName: 'CustomerCreate'
- }];
+ const expectedMenuItem = [
+ {
+ name: 'CustomerList',
+ title: 'customer.pageTitles.list',
+ icon: 'view_list',
+ },
+ {
+ name: 'CustomerCreate',
+ title: 'customer.pageTitles.createCustomer',
+ icon: 'vn:addperson',
+ },
+ ];
- const secondMenuItem = vm.navigation.modules.value[1];
- expect(secondMenuItem.children).toEqual(expect.arrayContaining(expectedMenuItem));
- expect(secondMenuItem.children.length).toEqual(2)
+ const firstMenuItem = vm.items[0];
+ expect(firstMenuItem.children).toEqual(expect.arrayContaining(expectedMenuItem));
});
});
diff --git a/src/composables/__tests__/useNavigation.spec.js b/src/composables/__tests__/useNavigation.spec.js.kk
similarity index 100%
rename from src/composables/__tests__/useNavigation.spec.js
rename to src/composables/__tests__/useNavigation.spec.js.kk
diff --git a/src/composables/useNavigation.js b/src/composables/useNavigation.js
deleted file mode 100644
index a5c58ec09..000000000
--- a/src/composables/useNavigation.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import routes from 'src/router/routes';
-import { ref } from 'vue';
-import axios from 'axios';
-
-const favorites = ref([]);
-const modules = ref([]);
-
-const mainRoute = routes.find((route) => route.path === '/');
-const moduleRoutes = (mainRoute && mainRoute.children) || [];
-
-for (const route of moduleRoutes) {
- const module = {
- stateName: route.name,
- name: route.name.toLowerCase(),
- roles: [],
- };
-
- if (route.meta) {
- Object.assign(module, route.meta);
- }
-
- if (route.children && route.children.length) {
- const [moduleMain] = route.children;
- const routes = moduleMain.children;
-
- module.children = routes.map((route) => {
- const submodule = {
- stateName: route.name,
- name: route.name,
- };
-
- Object.assign(submodule, route.meta);
-
- return submodule;
- });
- }
- modules.value.push(module);
-}
-
-export function useNavigation() {
- const salixModules = {
- customer: 'Clients',
- claim: 'Claims',
- entry: 'Entries',
- invoiceIn: 'Invoices In',
- invoiceOut: 'Invoices Out',
- item: 'Items',
- monitor: 'Monitors',
- order: 'Orders',
- route: 'Routes',
- supplier: 'Suppliers',
- ticket: 'Tickets',
- travel: 'Travels',
- user: 'Users',
- worker: 'Workers',
- zone: 'Zones',
- };
-
- async function fetchFavorites() {
- const response = await axios.get('StarredModules/getStarredModules');
-
- const filteredModules = modules.value.filter((module) => {
- return response.data.find((element) => element.moduleFk == salixModules[module.name]);
- });
-
- return (favorites.value = filteredModules);
- }
-
- async function toggleFavorite(moduleName, event) {
- if (event.defaultPrevented) return;
- event.preventDefault();
- event.stopPropagation();
-
- const params = { moduleName: salixModules[moduleName] };
- const query = 'StarredModules/toggleStarredModule';
- await axios.post(query, params);
-
- updateFavorites(moduleName);
- }
-
- function updateFavorites(name) {
- if (!favorites.value.find((module) => module.name == name)) {
- const newStarreModule = modules.value.find((module) => module.name == name);
- favorites.value.push(newStarreModule);
- } else {
- const moduleToRemove = favorites.value.find((module) => module.name == name);
- favorites.value.splice(favorites.value.indexOf(moduleToRemove), 1);
- }
- }
-
- return { modules, favorites, toggleFavorite, fetchFavorites, updateFavorites };
-}
\ No newline at end of file
diff --git a/src/composables/useRole.js b/src/composables/useRole.js
index eb2eebd28..b8da153d3 100644
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@@ -6,7 +6,7 @@ export function useRole() {
async function fetch() {
const { data } = await axios.get('Accounts/acl');
- const roles = data.roles.map(userRoles => userRoles.role.name);
+ const roles = data.roles.map((userRoles) => userRoles.role.name);
const userData = {
id: data.user.id,
@@ -14,7 +14,7 @@ export function useRole() {
nickname: data.user.nickname,
lang: data.user.lang || 'es',
darkMode: data.user.userConfig.darkMode,
- }
+ };
state.setUser(userData);
state.setRoles(roles);
}
@@ -32,6 +32,6 @@ export function useRole() {
return {
fetch,
hasAny,
- state
+ state,
};
-}
\ No newline at end of file
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index c08f897c4..5fa3bd9c3 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -2,10 +2,12 @@ import toLowerCase from './toLowerCase';
import toDate from './toDate';
import toCurrency from './toCurrency';
import toPercentage from './toPercentage';
+import toLowerCamel from './toLowerCamel';
import dashIfEmpty from './dashIfEmpty';
export {
toLowerCase,
+ toLowerCamel,
toDate,
toCurrency,
toPercentage,
diff --git a/src/filters/toLowerCamel.js b/src/filters/toLowerCamel.js
new file mode 100644
index 000000000..ebfe28bc2
--- /dev/null
+++ b/src/filters/toLowerCamel.js
@@ -0,0 +1,5 @@
+export default function toLowerCamel(value) {
+ if (!value) return;
+ if (typeof (value) !== 'string') return value;
+ return value.charAt(0).toLowerCase() + value.slice(1);
+}
\ No newline at end of file
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index fe73aa9ae..119d7362d 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -9,7 +9,7 @@ export default {
backToDashboard: 'Return to dashboard',
notifications: 'Notifications',
userPanel: 'User panel',
- favoriteModules: 'Favorite modules',
+ pinnedModules: 'Pinned modules',
darkMode: 'Dark mode',
logOut: 'Log out',
dataSaved: 'Data saved',
@@ -355,5 +355,9 @@ export default {
summary: 'Summary',
moreOptions: 'More options',
},
+ leftMenu: {
+ addToPinned: 'Add to pinned',
+ removeFromPinned: 'Remove from pinned',
+ },
},
};
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index f212e2d45..89b52e237 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -9,7 +9,7 @@ export default {
backToDashboard: 'Volver al tablón',
notifications: 'Notificaciones',
userPanel: 'Panel de usuario',
- favoriteModules: 'Módulos favoritos',
+ pinnedModules: 'Módulos fijados',
darkMode: 'Modo oscuro',
logOut: 'Cerrar sesión',
dataSaved: 'Datos guardados',
@@ -354,5 +354,9 @@ export default {
summary: 'Resumen',
moreOptions: 'Más opciones',
},
+ leftMenu: {
+ addToPinned: 'Añadir a fijados',
+ removeFromPinned: 'Eliminar de fijados',
+ },
},
};
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 32dd3f24e..cf8f7687c 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,9 +1,8 @@
@@ -11,20 +10,7 @@ const state = useState();
-
-
-
-
-
- {{ t('claim.pageTitles.basicData') }}
-
-
-
-
-
- {{ t('claim.pageTitles.rma') }}
-
-
+
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index e78602aae..73a436a69 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,40 +1,16 @@
-
-
-
-
-
- {{ t('customer.pageTitles.basicData') }}
-
-
-
+
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index d84a53ab9..107e3fd3b 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -1,12 +1,19 @@
@@ -17,35 +24,24 @@ const modules = useNavigation();
-
-
-
-
{{ t('globals.favoriteModules') }}
+
+
{{ t('globals.pinnedModules') }}
-
+
- {{ t(`${module.name}.pageTitles.${module.title}`) }}
+ {{ t(item.title) }}
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 27bb5439c..092931bb2 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -29,7 +29,6 @@ function fetch() {
axios.get(`InvoiceOuts/${id}/summary`).then(({ data }) => {
invoiceOut.value = data.invoiceOut;
tax.value = data.invoiceOut.taxesBreakdown;
- console.log('tax', tax);
});
axios.get(`InvoiceOuts/${id}/getTickets`).then(({ data }) => {
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue
index 0e5b3127a..d04841307 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummaryDialog.vue
@@ -19,3 +19,11 @@ const { dialogRef, onDialogHide } = useDialogPluginComponent();
+
+
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index b5645c8cf..71df0dfce 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,24 +1,16 @@
-
-
-
-
-
- {{ t('ticket.pageTitles.boxing') }}
-
-
+
diff --git a/src/router/index.js b/src/router/index.js
index d3ea402fa..8fe77f2c9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,11 +1,11 @@
import { route } from 'quasar/wrappers';
import { createRouter, createMemoryHistory, createWebHistory, createWebHashHistory } from 'vue-router';
-// import { Notify } from 'quasar';
import routes from './routes';
import { i18n } from 'src/boot/i18n';
import { useState } from 'src/composables/useState';
import { useSession } from 'src/composables/useSession';
import { useRole } from 'src/composables/useRole';
+import { toLowerCamel } from 'src/filters';
const state = useState();
const session = useSession();
@@ -25,8 +25,8 @@ export default route(function (/* { store, ssrContext } */) {
const createHistory = process.env.SERVER
? createMemoryHistory
: process.env.VUE_ROUTER_MODE === 'history'
- ? createWebHistory
- : createWebHashHistory;
+ ? createWebHistory
+ : createWebHashHistory;
const Router = createRouter({
scrollBehavior: () => ({ left: 0, top: 0 }),
@@ -46,26 +46,14 @@ export default route(function (/* { store, ssrContext } */) {
}
if (isLoggedIn()) {
- // try {
const stateRoles = state.getRoles().value;
if (stateRoles.length === 0) {
await role.fetch();
}
- // } catch (error) {
- // Notify.create({
- // message: t('errors.statusUnauthorized'),
- // type: 'negative',
- // });
-
- // session.destroy();
- // return next({ path: '/login' });
- // }
-
const matches = to.matched;
- const hasRequiredRoles = matches.every(route => {
+ const hasRequiredRoles = matches.every((route) => {
const meta = route.meta;
- if (meta && meta.roles)
- return role.hasAny(meta.roles)
+ if (meta && meta.roles) return role.hasAny(meta.roles);
return true;
});
@@ -85,7 +73,7 @@ export default route(function (/* { store, ssrContext } */) {
if (matches && matches.length > 1) {
const module = matches[1];
const moduleTitle = module.meta && module.meta.title;
- moduleName = module.name.toLowerCase();
+ moduleName = toLowerCamel(module.name);
if (moduleTitle) {
title = t(`${moduleName}.pageTitles.${moduleTitle}`);
}
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 641629c9c..1c1cfb50e 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -5,10 +5,14 @@ export default {
path: '/claim',
meta: {
title: 'claims',
- icon: 'vn:claims'
+ icon: 'vn:claims',
},
component: RouterView,
redirect: { name: 'ClaimMain' },
+ menus: {
+ main: ['ClaimList', 'ClaimRmaList'],
+ card: ['ClaimBasicData', 'ClaimRma'],
+ },
children: [
{
name: 'ClaimMain',
@@ -31,11 +35,11 @@ export default {
meta: {
title: 'rmaList',
icon: 'vn:barcode',
- roles: ['claimManager']
+ roles: ['claimManager'],
},
component: () => import('src/pages/Claim/ClaimRmaList.vue'),
- }
- ]
+ },
+ ],
},
{
name: 'ClaimCard',
@@ -47,7 +51,8 @@ export default {
name: 'ClaimSummary',
path: 'summary',
meta: {
- title: 'summary'
+ title: 'summary',
+ icon: 'launch',
},
component: () => import('src/pages/Claim/Card/ClaimSummary.vue'),
},
@@ -56,7 +61,8 @@ export default {
path: 'basic-data',
meta: {
title: 'basicData',
- roles: ['salesPerson']
+ icon: 'vn:settings',
+ roles: ['salesPerson'],
},
component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
},
@@ -65,11 +71,12 @@ export default {
path: 'rma',
meta: {
title: 'rma',
- roles: ['claimManager']
+ icon: 'vn:barcode',
+ roles: ['claimManager'],
},
- component: () => import('src/pages/Claim/Card/ClaimRma.vue')
- }
- ]
+ component: () => import('src/pages/Claim/Card/ClaimRma.vue'),
+ },
+ ],
},
- ]
-};
\ No newline at end of file
+ ],
+};
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 32cd3446c..1c2d421b6 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -5,10 +5,14 @@ export default {
name: 'Customer',
meta: {
title: 'customers',
- icon: 'vn:client'
+ icon: 'vn:client',
},
component: RouterView,
redirect: { name: 'CustomerMain' },
+ menus: {
+ main: ['CustomerList', 'CustomerCreate'],
+ card: ['CustomerBasicData'],
+ },
children: [
{
path: '',
@@ -35,7 +39,7 @@ export default {
},
component: () => import('src/pages/Customer/CustomerCreate.vue'),
},
- ]
+ ],
},
{
name: 'CustomerCard',
@@ -47,7 +51,8 @@ export default {
name: 'CustomerSummary',
path: 'summary',
meta: {
- title: 'summary'
+ title: 'summary',
+ icon: 'launch',
},
component: () => import('src/pages/Customer/Card/CustomerSummary.vue'),
},
@@ -55,11 +60,12 @@ export default {
path: 'basic-data',
name: 'CustomerBasicData',
meta: {
- title: 'basicData'
+ title: 'basicData',
+ icon: 'vn:settings',
},
component: () => import('src/pages/Customer/Card/CustomerBasicData.vue'),
- }
- ]
+ },
+ ],
},
- ]
-};
\ No newline at end of file
+ ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
new file mode 100644
index 000000000..dcb3fa5c2
--- /dev/null
+++ b/src/router/modules/index.js
@@ -0,0 +1,11 @@
+import Customer from './customer';
+import Ticket from './ticket';
+import Claim from './claim';
+import InvoiceOut from './invoiceOut';
+
+export default [
+ Customer,
+ Ticket,
+ Claim,
+ InvoiceOut
+]
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 9df12584f..a9236b713 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -9,6 +9,9 @@ export default {
},
component: RouterView,
redirect: { name: 'InvoiceOutMain' },
+ menus: {
+ main: ['InvoiceOutList']
+ },
children: [
{
path: '',
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index b9ce8dcf8..4f06a1808 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -5,10 +5,14 @@ export default {
path: '/ticket',
meta: {
title: 'tickets',
- icon: 'vn:ticket'
+ icon: 'vn:ticket',
},
component: RouterView,
redirect: { name: 'TicketMain' },
+ menus: {
+ main: ['TicketList'],
+ card: ['TicketBoxing'],
+ },
children: [
{
name: 'TicketMain',
@@ -35,8 +39,7 @@ export default {
},
component: () => import('src/pages/Ticket/TicketList.vue'),
},
-
- ]
+ ],
},
{
name: 'TicketCard',
@@ -48,7 +51,8 @@ export default {
name: 'TicketSummary',
path: 'summary',
meta: {
- title: 'summary'
+ title: 'summary',
+ icon: 'launch',
},
component: () => import('src/pages/Ticket/Card/TicketSummary.vue'),
},
@@ -56,7 +60,8 @@ export default {
name: 'TicketBasicData',
path: 'basic-data',
meta: {
- title: 'basicData'
+ title: 'basicData',
+ icon: 'vn:settings',
},
component: () => import('src/pages/Ticket/Card/TicketBasicData.vue'),
},
@@ -64,11 +69,12 @@ export default {
path: 'boxing',
name: 'TicketBoxing',
meta: {
- title: 'boxing'
+ title: 'boxing',
+ icon: 'vn:package',
},
component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
- }
- ]
+ },
+ ],
},
- ]
+ ],
};
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
new file mode 100644
index 000000000..6d1a74326
--- /dev/null
+++ b/src/stores/useNavigationStore.js
@@ -0,0 +1,85 @@
+import axios from 'axios';
+import { ref } from 'vue';
+import { defineStore } from 'pinia';
+import { toLowerCamel } from 'src/filters';
+import { useRole } from 'src/composables/useRole';
+import routes from 'src/router/modules';
+
+export const useNavigationStore = defineStore('navigationStore', () => {
+ const modules = ['customer', 'claim', 'ticket', 'invoiceOut'];
+ const pinnedModules = ref([]);
+ const role = useRole();
+
+ function getModules() {
+ const modulesRoutes = ref([]);
+ for (const module of modules) {
+ const moduleDef = routes.find((route) => toLowerCamel(route.name) === module);
+ if (!moduleDef) continue;
+
+ const item = addMenuItem(module, moduleDef, modulesRoutes.value);
+ if (!item) continue;
+
+ item.module = module;
+ item.isPinned = false;
+
+ if (pinnedModules.value.includes(module)) {
+ item.isPinned = true;
+ }
+ }
+
+ return modulesRoutes;
+ }
+
+ function getPinnedModules() {
+ const modules = getModules();
+
+ return modules && modules.value.filter((item) => item.isPinned);
+ }
+
+ function addMenuItem(module, route, parent) {
+ const { meta } = route;
+
+ if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
+
+ const item = {
+ name: route.name,
+ };
+
+ if (meta) {
+ item.title = `${module}.pageTitles.${meta.title}`;
+ item.icon = meta.icon;
+ }
+
+ parent.push(item);
+
+ return item;
+ }
+
+ async function fetchPinned() {
+ if (pinnedModules.value.length) return;
+
+ const response = await axios.get('StarredModules/getStarredModules');
+ pinnedModules.value = response.data.map((row) => row.moduleFk);
+ }
+
+ function togglePinned(module) {
+ if (pinnedModules.value.includes(module)) {
+ const index = pinnedModules.value.indexOf(module);
+ pinnedModules.value.splice(index, 1);
+
+ return;
+ }
+
+ pinnedModules.value.push(module);
+ }
+
+ return {
+ modules,
+ pinnedModules,
+ getModules,
+ getPinnedModules,
+ fetchPinned,
+ togglePinned,
+ addMenuItem,
+ };
+});
diff --git a/tests/jest/jestHelpers.js b/tests/jest/jestHelpers.js
index 85134dcb0..c095d44b4 100644
--- a/tests/jest/jestHelpers.js
+++ b/tests/jest/jestHelpers.js
@@ -1,25 +1,27 @@
import { mount, flushPromises } from '@vue/test-utils';
import { installQuasarPlugin } from '@quasar/quasar-app-extension-testing-unit-jest';
import { i18n } from 'src/boot/i18n';
-import { Notify } from 'quasar';
+import { Notify, Dialog } from 'quasar';
import axios from 'axios';
-// Specify here Quasar config you'll need to test your component
installQuasarPlugin({
plugins: {
- Notify
- }
+ Notify,
+ Dialog,
+ },
});
export function createWrapper(component, options) {
- const mountOptions = {
- global: {
- plugins: [i18n]
- }
- };
+ const mountOptions = {};
- if (options instanceof Object)
- Object.assign(mountOptions, options)
+ if (options instanceof Object) Object.assign(mountOptions, options);
+
+ if (mountOptions.global && mountOptions.global.plugins) {
+ mountOptions.global.plugins.push(i18n);
+ } else {
+ if (!mountOptions.global) mountOptions.global = {};
+ mountOptions.global.plugins = [i18n];
+ }
const wrapper = mount(component, mountOptions);
const vm = wrapper.vm;
@@ -27,7 +29,4 @@ export function createWrapper(component, options) {
return { vm, wrapper };
}
-export {
- axios,
- flushPromises
-}
+export { axios, flushPromises };