@@ -515,7 +515,7 @@ onMounted(async () => {
@click-date="onInputChange"
@on-moved="getMailStates"
/>
-
+
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 59049a5b3..eeece3bd8 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -28,11 +28,12 @@ const searchBarDataKeys = {
data-key="Zone"
:descriptor="ZoneDescriptor"
:search-data-key="searchBarDataKeys[routeName]"
- :search-custom-route-redirect="customRouteRedirectName"
- :search-redirect="!!customRouteRedirectName"
- :search-make-fetch="searchbarMakeFetch"
- :searchbar-label="t('list.searchZone')"
- :searchbar-info="t('list.searchInfo')"
+ :filter-panel="ZoneFilterPanel"
+ :searchbarProps="{
+ url: 'Zones',
+ label: t('list.searchZone'),
+ info: t('list.searchInfo'),
+ }"
>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 6d697967b..684b83b0f 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -226,31 +226,13 @@ export default {
},
{
path: 'recoveries',
- name: 'RecoveriesCard',
- redirect: { name: 'CustomerRecoveries' },
- children: [
- {
- path: '',
- name: 'CustomerRecoveries',
- meta: {
- title: 'recoveries',
- icon: 'vn:recovery',
- },
- component: () =>
- import('src/pages/Customer/Card/CustomerRecoveries.vue'),
- },
- {
- path: 'create',
- name: 'CustomerRecoverieCreate',
- meta: {
- title: 'recoverie-create',
- },
- component: () =>
- import(
- 'src/pages/Customer/components/CustomerRecoverieCreate.vue'
- ),
- },
- ],
+ name: 'CustomerRecoveries',
+ meta: {
+ title: 'recoveries',
+ icon: 'vn:recovery',
+ },
+ component: () =>
+ import('src/pages/Customer/Card/CustomerRecoveries.vue'),
},
{
path: 'web-access',
diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index 9a4a19c7a..9a4066f54 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -2,7 +2,7 @@ describe('WorkerLocker', () => {
const workerId = 1109;
const lockerCode = '2F';
const input = '.q-card input';
- const thirdOpt = '[role="listbox"] .q-item:nth-child(3)';
+ const thirdOpt = '[role="listbox"] .q-item:nth-child(1)';
beforeEach(() => {
cy.viewport(1280, 720);
cy.login('productionBoss');
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/test/vitest/__tests__/pages/Login/Login.spec.js
index 9b9968736..5ab4cee9e 100644
--- a/test/vitest/__tests__/pages/Login/Login.spec.js
+++ b/test/vitest/__tests__/pages/Login/Login.spec.js
@@ -25,18 +25,20 @@ describe('Login', () => {
vi.spyOn(axios, 'post').mockResolvedValueOnce({ data: { token: 'token' } });
vi.spyOn(axios, 'get').mockImplementation((url) => {
if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
- return Promise.resolve({data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }}});
+ return Promise.resolve({
+ data: {
+ roles: [],
+ user: expectedUser,
+ multimediaToken: { id: 'multimediaToken' },
+ },
+ });
});
- vi.spyOn(vm.quasar, 'notify');
expect(vm.session.getToken()).toEqual('');
await vm.onSubmit();
expect(vm.session.getToken()).toEqual('token');
- expect(vm.quasar.notify).toHaveBeenCalledWith(
- expect.objectContaining({ type: 'positive' })
- );
await vm.session.destroy();
});