-
{{ t(`params.${tag.label}`) }}:
-
{{ formatFn(tag.value) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.name }}
+ {{ opt.nickname }}
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+ filled
+ @update:modelValue="() => searchFn()"
+ />
-
+
+
+
+
-
-en:
- params:
- search: Contains
- userFk: User
- created: Created
es:
+ tooltips:
+ search: Buscar por identificador o concepto
+ changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
+ actions:
+ Creates: Crea
+ Edits: Modifica
+ Deletes: Elimina
+ Accesses: Accede
+ Users:
+ User: Usuario
+ All: Todo
+ System: Sistema
params:
- search: Contiene
- userFk: Usuario
- created: Creada
- User: Usuario
+ changedModel: Entity
+
+en:
+ tooltips:
+ search: Search by identifier or concept
+ changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
+ actions:
+ Creates: Creates
+ Edits: Edits
+ Deletes: Deletes
+ Accesses: Accesses
+ Users:
+ User: User
+ All: All
+ System: System
+ params:
+ changedModel: Entidad
diff --git a/src/components/common/__tests__/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js
index 53d2732a0..7f33578df 100644
--- a/src/components/common/__tests__/VnLog.spec.js
+++ b/src/components/common/__tests__/VnLog.spec.js
@@ -108,27 +108,4 @@ describe('VnLog', () => {
expect(vm.logTree[0].originFk).toEqual(1);
expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
});
-
- it('should correctly set the selectedFilters when filtering', () => {
- vm.searchInput = '1';
- vm.userSelect = '21';
- vm.checkboxOptions.insert.selected = true;
- vm.checkboxOptions.update.selected = true;
-
- vm.selectFilter('search');
- vm.selectFilter('userSelect');
-
- expect(vm.selectedFilters.changedModelId).toEqual('1');
- expect(vm.selectedFilters.userFk).toEqual('21');
- expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
- });
-
- it('should correctly set the date from', () => {
- vm.dateFrom = '18-09-2023';
- vm.selectFilter('date', 'from');
- expect(vm.selectedFilters.creationDate.between).toEqual([
- new Date('2023-09-18T00:00:00.000Z'),
- new Date('2023-09-18T21:59:59.999Z'),
- ]);
- });
});
diff --git a/src/components/common/__tests__/VnLogFilter.spec.js b/src/components/common/__tests__/VnLogFilter.spec.js
new file mode 100644
index 000000000..a28fa85b1
--- /dev/null
+++ b/src/components/common/__tests__/VnLogFilter.spec.js
@@ -0,0 +1,28 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnLogFilter from 'src/components/common/VnLogFilter.vue';
+
+describe('VnLogFilter', () => {
+ let vm;
+ beforeAll(async () => {
+ vm = createWrapper(VnLogFilter, {
+ props: {
+ dataKey: 'ClaimLog',
+ },
+ }).vm;
+ });
+
+ afterEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it('should getActions selected', async () => {
+ vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
+ vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
+
+ const actions = vm.getActions();
+
+ expect(actions.length).toEqual(2);
+ expect(actions).toEqual(['insert', 'update']);
+ });
+});
diff --git a/src/components/ui/VnDescriptor.vue b/src/components/ui/VnDescriptor.vue
index 47da98d74..878adcadc 100644
--- a/src/components/ui/VnDescriptor.vue
+++ b/src/components/ui/VnDescriptor.vue
@@ -30,7 +30,7 @@ const $props = defineProps({
default: null,
},
toModule: {
- type: String,
+ type: Object,
default: null,
},
});
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 85cc8cde2..dc9e4e776 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -61,6 +61,10 @@ const $props = defineProps({
type: Object,
default: null,
},
+ showTagChips: {
+ type: Boolean,
+ default: true,
+ },
});
const emit = defineEmits([
@@ -88,13 +92,14 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
defineExpose({ search, params: userParams, remove });
const isLoading = ref(false);
-async function search(evt) {
+async function search(evt, name, value) {
try {
if (evt && $props.disableSubmitEvent) return;
store.filter.where = {};
isLoading.value = true;
const filter = { ...userParams.value, ...$props.modelValue };
+ if (name) filter[name] = value;
store.userParamsChanged = true;
await arrayData.addFilter({
params: filter,
@@ -214,7 +219,7 @@ const getLocale = (label) => {
-
+
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index b067381f6..7facb7916 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -215,6 +215,7 @@ defineExpose({
paginate,
userParams: arrayData.store.userParams,
currentFilter: arrayData.store.currentFilter,
+ arrayData,
});
diff --git a/src/composables/__tests__/useRole.spec.js b/src/composables/__tests__/useRole.spec.js
index d0bca5342..54d983a13 100644
--- a/src/composables/__tests__/useRole.spec.js
+++ b/src/composables/__tests__/useRole.spec.js
@@ -23,18 +23,19 @@ describe('useRole', () => {
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
+ worker: { department: { departmentFk: 155 } },
};
const expectedUser = {
id: 999,
name: `T'Challa`,
nickname: 'Black Panther',
lang: 'en',
+ departmentFk: 155,
};
const expectedRoles = ['salesPerson', 'admin'];
- vi.spyOn(axios, 'get')
- .mockResolvedValueOnce({
+ vi.spyOn(axios, 'get').mockResolvedValueOnce({
data: { roles: rolesData, user: fetchedUser },
- })
+ });
vi.spyOn(role.state, 'setUser');
vi.spyOn(role.state, 'setRoles');
diff --git a/src/composables/__tests__/useSession.spec.js b/src/composables/__tests__/useSession.spec.js
index 789b149ec..cae33f893 100644
--- a/src/composables/__tests__/useSession.spec.js
+++ b/src/composables/__tests__/useSession.spec.js
@@ -75,6 +75,7 @@ describe('session', () => {
userConfig: {
darkMode: false,
},
+ worker: { department: { departmentFk: 155 } },
};
const rolesData = [
{
@@ -143,7 +144,7 @@ describe('session', () => {
await session.destroy(); // this clears token and user for any other test
});
},
- {}
+ {},
);
describe('RenewToken', () => {
@@ -175,7 +176,7 @@ describe('session', () => {
await session.checkValidity();
expect(sessionStorage.getItem('token')).toEqual(expectedToken);
expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
- expectedTokenMultimedia
+ expectedTokenMultimedia,
);
});
it('Should renewToken', async () => {
@@ -204,7 +205,7 @@ describe('session', () => {
await session.checkValidity();
expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
- expectedTokenMultimedia
+ expectedTokenMultimedia,
);
});
});
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index d1c1b01b8..363580148 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -189,7 +189,7 @@ export function useArrayData(key, userOptions) {
store.order = order;
resetPagination();
- fetch({});
+ await fetch({});
index++;
return { index, order };
diff --git a/src/composables/useFilterParams.js b/src/composables/useFilterParams.js
index 07dcdf99b..7c3f3bdeb 100644
--- a/src/composables/useFilterParams.js
+++ b/src/composables/useFilterParams.js
@@ -14,7 +14,7 @@ export function useFilterParams(key) {
watch(
() => arrayData.value.store?.currentFilter,
(val, oldValue) => (val || oldValue) && setUserParams(val),
- { immediate: true, deep: true }
+ { immediate: true, deep: true },
);
function parseOrder(urlOrders) {
@@ -54,7 +54,7 @@ export function useFilterParams(key) {
Object.assign(params, item);
});
delete params[key];
- } else if (value && typeof value === 'object') {
+ } else if (value && typeof value === 'object' && !Array.isArray(value)) {
const param = Object.values(value)[0];
if (typeof param == 'string') params[key] = param.replaceAll('%', '');
}
diff --git a/src/composables/useRole.js b/src/composables/useRole.js
index ff54b409c..e700b1f2e 100644
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@@ -13,6 +13,7 @@ export function useRole() {
name: data.user.name,
nickname: data.user.nickname,
lang: data.user.lang || 'es',
+ departmentFk: data.user.worker.department.departmentFk,
};
state.setUser(userData);
state.setRoles(roles);
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 76fc31a5b..7bcf90793 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -370,6 +370,11 @@ globals:
countryCodeFk: Country
companyFk: Company
nickname: Alias
+ changedModel: Entity
+ changedModelValue: Search
+ changedModelId: Entity id
+ userFk: User
+ action: Action
model: Model
fuel: Fuel
active: Active
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 75fac881c..b2512193d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -371,6 +371,11 @@ globals:
countryCodeFk: País
companyFk: Empresa
nickname: Alias
+ changedModel: Entidad
+ changedModelValue: Buscar
+ changedModelId: Id de entidad
+ userFk: Usuario
+ action: Acción
errors:
statusUnauthorized: Acceso denegado
statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index 51460f7e4..45eb89382 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -115,6 +115,7 @@ const props = defineProps({
en:
params:
+ departmentFk: Department
search: Contains
clientFk: Customer
clientName: Customer
@@ -127,6 +128,7 @@ en:
zoneFk: Zone
es:
params:
+ departmentFk: Departamento
search: Contiene
clientFk: Cliente
clientName: Cliente
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 55a7f565e..107a08144 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -156,6 +156,7 @@ en:
email: Email
isToBeMailed: Mailed
isEqualizated: Equailized
+ departmentFk: Department
businessTypeFk: Business type
sageTaxTypeFk: Sage Tax Type
sageTransactionTypeFk: Sage Tax Type
@@ -166,6 +167,7 @@ en:
postcode: Postcode
es:
params:
+ departmentFk: Departamento
search: Contiene
fi: NIF
isActive: Activo
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 64e3baeb5..f7d4163d1 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -192,8 +192,10 @@ en:
date: L. O. Date
credit: Credit I.
defaulterSinced: From
+ departmentFk: Department
es:
params:
+ departmentFk: Departamento
clientFk: Cliente
countryFk: País
paymentMethod: F. Pago
diff --git a/src/pages/Monitor/MonitorClients.vue b/src/pages/Monitor/MonitorClients.vue
index c814d623e..2ba5f4c0b 100644
--- a/src/pages/Monitor/MonitorClients.vue
+++ b/src/pages/Monitor/MonitorClients.vue
@@ -9,12 +9,14 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
import VnRow from 'src/components/ui/VnRow.vue';
import { dateRange } from 'src/filters';
import useOpenURL from 'src/composables/useOpenURL';
+import { useState } from 'src/composables/useState';
const { t } = useI18n();
const dates = dateRange(Date.vnNew());
const from = ref(dates[0]);
const to = ref(dates[1]);
+const state = useState();
const filter = computed(() => {
const obj = {};
const formatFrom = setHours(from.value, 'from');
@@ -24,16 +26,18 @@ const filter = computed(() => {
if (!formatFrom && formatTo) stamp = { lte: formatTo };
else if (formatFrom && !formatTo) stamp = { gte: formatFrom };
else if (formatFrom && formatTo) stamp = { between: [formatFrom, formatTo] };
-
- return Object.assign(obj, { where: { 'v.stamp': stamp } });
+ return Object.assign(obj, {
+ where: {
+ 'v.stamp': stamp,
+ 'c.departmentFk': state.getUser().value.departmentFk,
+ },
+ });
});
function exprBuilder(param, value) {
switch (param) {
case 'clientFk':
return { [`c.id`]: value };
- case 'departmentFk':
- return { [`c.${param}`]: value };
}
}
@@ -66,9 +70,13 @@ const columns = computed(() => [
align: 'left',
name: 'departmentFk',
label: t('customer.summary.team'),
- component: 'select',
- attrs: {
- url: 'Departments',
+ columnFilter: {
+ component: 'select',
+ attrs: {
+ url: 'Departments',
+ },
+ alias: 'c',
+ inWhere: true,
},
columnField: {
component: null,
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index 609a1215a..5f91153ac 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -130,8 +130,10 @@ en:
myTeam: My Team
isConfirmed: Order Confirmed
showEmpty: Show Empty
+ departmentFk: Department
es:
params:
+ departmentFk: Departamento
search: Búsqueda
clientFk: Cliente
agencyModeFk: Agencia
diff --git a/src/pages/Route/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
index c21298470..9fd3fe5e5 100644
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
import VnCard from 'src/components/common/VnCard.vue';
-
+
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index c981b86a5..bdb3d12c4 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -213,7 +213,7 @@ function exprBuilder(param, value) {
}"
>
-
+
{
const resetChanges = async () => {
arrayData.fetch({ append: false });
- tableRef.value.reload();
+ tableRef.value.CrudModelRef.hasChanges = false;
+ await tableRef.value.reload();
+
selectedRows.value = [];
};
const changeQuantity = async (sale) => {
@@ -377,10 +379,12 @@ const newOrderFromTicket = async () => {
const goToLog = (saleId) => {
router.push({
name: 'TicketLog',
- params: {
- originId: route.params.id,
- changedModel: 'Sale',
- changedModelId: saleId,
+ query: {
+ logs: JSON.stringify({
+ originFk: route.params.id,
+ changedModel: 'Sale',
+ changedModelId: saleId,
+ }),
},
});
};
@@ -390,7 +394,7 @@ const changeTicketState = async (val) => {
const params = { ticketFk: route.params.id, code: val };
await axios.post('Tickets/state', params);
notify('globals.dataSaved', 'positive');
- await resetChanges();
+ resetChanges();
};
const removeSelectedSales = () => {
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 864bfd03f..37441b44f 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -60,6 +60,7 @@ const isClaimable = computed(() => {
}
return false;
});
+
const sendSms = async (params) => {
await axios.post(`Tickets/${ticket.value.id}/sendSms`, params);
notify(t('SMS sent'), 'positive');
@@ -228,18 +229,6 @@ const createRefund = async (withWarehouse) => {
{{ t('Add claim') }}
-
-
- {{ t('Mark as reserved') }}
-
-
{{ t('Refund') }}
@@ -285,8 +274,6 @@ es:
Recalculate price: Recalcular precio
Update discount: Actualizar descuento
Add claim: Crear reclamación
- Mark as reserved: Marcar como reservado
- Unmark as reserved: Desmarcar como reservado
Refund: Abono
with warehouse: con almacén
without warehouse: sin almacén
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index b763ef970..d84d1c082 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -22,16 +22,6 @@ const states = ref([]);
const agencies = ref([]);
const warehouses = ref([]);
const groupedStates = ref([]);
-
-const getGroupedStates = (data) => {
- for (const state of data) {
- groupedStates.value.push({
- id: state.id,
- name: t(`${state.code}`),
- code: state.code,
- });
- }
-};
@@ -39,12 +29,11 @@ const getGroupedStates = (data) => {
{
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 479b47fb9..d452f5287 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -8,6 +8,6 @@ import filter from './TravelFilter.js';
data-key="Travel"
url="Travels"
:descriptor="TravelDescriptor"
- :filter="filter"
+ :filter="{ ...filter, where: { id: $route.params.id } }"
/>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index dc3f6f8c0..22e2cff86 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -410,18 +410,18 @@ onMounted(async () => {
-
-
+
+
import('src/pages/Route/RouteList.vue'),
},
routeCard,
],
@@ -286,6 +287,7 @@ export default {
title: 'list',
icon: 'view_list',
},
+ component: () => import('src/pages/Route/RouteRoadmap.vue'),
},
roadmapCard,
],
@@ -316,6 +318,8 @@ export default {
title: 'list',
icon: 'view_list',
},
+ component: () =>
+ import('src/pages/Route/Agency/AgencyList.vue'),
},
agencyCard,
],
@@ -337,6 +341,8 @@ export default {
title: 'vehicleList',
icon: 'directions_car',
},
+ component: () =>
+ import('src/pages/Route/Vehicle/VehicleList.vue'),
},
vehicleCard,
],
diff --git a/test/cypress/integration/account/accountDescriptorMenu.spec.js b/test/cypress/integration/account/accountDescriptorMenu.spec.js
index 67a7d8ef6..04fc57040 100644
--- a/test/cypress/integration/account/accountDescriptorMenu.spec.js
+++ b/test/cypress/integration/account/accountDescriptorMenu.spec.js
@@ -1,4 +1,4 @@
-describe('ClaimNotes', () => {
+describe('Account descriptor', () => {
const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
const url = '/#/account/1/summary';
@@ -7,6 +7,9 @@ describe('ClaimNotes', () => {
cy.visit(url);
cy.dataCy('descriptor-more-opts').click();
cy.get(descriptorOptions)
+ .should('exist')
+ .should('be.visible')
+
.find('.q-item')
.its('length')
.then((count) => {
diff --git a/test/cypress/integration/order/orderList.spec.js b/test/cypress/integration/order/orderList.spec.js
index 34cd2bffc..ee011ea05 100644
--- a/test/cypress/integration/order/orderList.spec.js
+++ b/test/cypress/integration/order/orderList.spec.js
@@ -30,9 +30,11 @@ describe('OrderList', () => {
cy.url().should('include', `/order`);
});
- it.skip('filter list and create order', () => {
+ it('filter list and create order', () => {
cy.dataCy('Customer ID_input').type('1101{enter}');
+ cy.intercept('GET', /\/api\/Clients/).as('clientFilter');
cy.dataCy('vnTableCreateBtn').click();
+ cy.wait('@clientFilter');
cy.dataCy('landedDate').find('input').type('06/01/2001');
cy.selectOption(agencyCreateSelect, 1);
diff --git a/test/cypress/integration/route/agency/agencyModes.spec.js b/test/cypress/integration/route/agency/agencyModes.spec.js
new file mode 100644
index 000000000..3f5784997
--- /dev/null
+++ b/test/cypress/integration/route/agency/agencyModes.spec.js
@@ -0,0 +1,15 @@
+describe('Agency modes', () => {
+ const name = 'inhouse pickup';
+
+ beforeEach(() => {
+ cy.viewport(1920, 1080);
+ cy.login('developer');
+ cy.visit(`/#/route/agency/1/modes`);
+ });
+
+ it('should display the agency modes page', () => {
+ cy.get('.flex > .title').should('have.text', name);
+ cy.get('.flex > .q-chip > .q-chip__content').should('have.text', 'ID: 1');
+ cy.get('.list-items > :nth-child(1) > .value').should('have.text', name);
+ });
+});
diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index 08fd7d7ea..d77584c04 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -49,12 +49,12 @@ describe.skip('RouteAutonomous', () => {
cy.get(selectors.firstRowCheckbox).click();
cy.get(selectors.createInvoiceBtn).click();
cy.dataCy(selectors.reference).type(data.reference);
+ cy.dataCy('attachFile').click();
cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
force: true,
});
- cy.dataCy(selectors.saveFormBtn).click();
+ cy.dataCy(selectors.saveFormBtn).should('be.visible').click();
cy.checkNotification(dataSaved);
- cy.typeSearchbar('{enter}');
});
it('Should display the total price of the selected rows', () => {
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index a183c08cb..e6c873d5e 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -53,17 +53,20 @@ describe('Route extended list', () => {
function fillField(selector, type, value) {
switch (type) {
case 'select':
- cy.get(selector).should('be.visible').click();
- cy.dataCy('null_select').clear().type(value);
+ cy.get(selector).should('be.visible').click().clear().type(value);
cy.get('.q-item').contains(value).click();
break;
case 'input':
- cy.get(selector).should('be.visible').click();
- cy.dataCy('null_input').clear().type(`${value}`);
+ cy.get(selector)
+ .should('be.visible')
+ .click()
+ .type(`{selectall}{backspace}${value}`);
break;
case 'date':
- cy.get(selector).should('be.visible').click();
- cy.dataCy('null_inputDate').clear().type(`${value}`);
+ cy.get(selector)
+ .should('be.visible')
+ .click()
+ .type(`{selectall}{backspace}${value}`);
break;
case 'checkbox':
cy.get(selector).should('be.visible').click().click();
@@ -103,8 +106,8 @@ describe('Route extended list', () => {
cy.fillInForm(data);
cy.dataCy(selectors.saveFormBtn).click();
- cy.checkNotification(dataCreated);
cy.url().should('include', '/summary');
+ cy.checkNotification(dataCreated);
});
it('Should reset changed values when click reset button', () => {
@@ -140,7 +143,7 @@ describe('Route extended list', () => {
const downloadsFolder = Cypress.config('downloadsFolder');
cy.get(selectors.lastRowSelectCheckBox).click();
cy.get(selectors.downloadBtn).click();
- cy.wait(5000);
+ cy.wait(3000);
const fileName = 'download.zip';
cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
@@ -177,7 +180,7 @@ describe('Route extended list', () => {
const [month, day, year] = value.split('/');
value = `${day}/${month}/${year}`;
}
- cy.validateContent(selector, value);
+ cy.get(selector).should('contain', value);
});
});
diff --git a/test/cypress/integration/vnComponent/VnAccountNumber.spec.js b/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
deleted file mode 100644
index 053902f35..000000000
--- a/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
+++ /dev/null
@@ -1,37 +0,0 @@
-describe('VnAccountNumber', () => {
- const accountInput = 'input[data-cy="supplierFiscalDataAccount_input"]';
- beforeEach(() => {
- cy.login('developer');
- cy.viewport(1920, 1080);
- cy.visit('/#/supplier/1/fiscal-data');
- });
-
- describe('VnInput handleInsertMode()', () => {
- it('should replace character at cursor position in insert mode', () => {
- cy.get(accountInput).type('{selectall}4100000001');
- cy.get(accountInput).type('{movetostart}');
- cy.get(accountInput).type('999');
- cy.get(accountInput).should('have.value', '9990000001');
- });
-
- it('should replace character at cursor position in insert mode', () => {
- cy.get(accountInput).clear();
- cy.get(accountInput).type('4100000001');
- cy.get(accountInput).type('{movetostart}');
- cy.get(accountInput).type('999');
- cy.get(accountInput).should('have.value', '9990000001');
- });
-
- it('should respect maxlength prop', () => {
- cy.get(accountInput).clear();
- cy.get(accountInput).type('123456789012345');
- cy.get(accountInput).should('have.value', '1234567890');
- });
- });
-
- it('should convert short account number to standard format', () => {
- cy.get(accountInput).clear();
- cy.get(accountInput).type('123.');
- cy.get(accountInput).should('have.value', '1230000000');
- });
-});
diff --git a/test/cypress/integration/vnComponent/VnLog.spec.js b/test/cypress/integration/vnComponent/VnLog.spec.js
index 8ca32b681..57faeac85 100644
--- a/test/cypress/integration/vnComponent/VnLog.spec.js
+++ b/test/cypress/integration/vnComponent/VnLog.spec.js
@@ -1,26 +1,23 @@
///
describe('VnLog', () => {
- const chips = [
- ':nth-child(1) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
- ':nth-child(2) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
- ];
beforeEach(() => {
cy.login('developer');
cy.visit(`/#/claim/${1}/log`);
- cy.openRightMenu();
});
it('should filter by insert actions', () => {
- cy.checkOption(':nth-child(7) > .q-checkbox');
- cy.get('.q-page').click();
- cy.validateContent(chips[0], 'Document');
- cy.validateContent(chips[1], 'Beginning');
+ cy.get('[data-cy="vnLog-checkbox"]').eq(0).click();
+ cy.get('[data-cy="vnLog-action-icon"]').each(($el) => {
+ cy.wrap($el).should('have.attr', 'title', 'Creates');
+ });
});
it('should filter by entity', () => {
- cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
- cy.get('.q-page').click();
- cy.validateContent(chips[0], 'Beginning');
+ const entity = 'Document';
+ cy.selectOption('[data-cy="vnLog-entity"]', entity);
+ cy.get('[data-cy="vnLog-model-chip"]').each(($el) => {
+ cy.wrap($el).should('have.text', entity);
+ });
});
it('should show claimDescriptor', () => {