wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 7366-fixTravels

This commit is contained in:
Carlos Satorres 2024-07-05 10:27:45 +00:00
parent dc923ed36c 90da150d63
commit ae7bb14382
5 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/VnCard.vue
View File

@ -39,7 +39,7 @@ const arrayData = useArrayData(props.dataKey, {
onBeforeMount(async () => { onBeforeMount(async () => {
if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id }; if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false, updateRouter: false });
}); });
if (props.baseUrl) { if (props.baseUrl) {

12
src/composables/useArrayData.js
View File

@ -85,8 +85,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
} }
Object.assign(filter, store.userFilter, exprFilter); Object.assign(filter, store.userFilter, exprFilter);
Object.assign(store.filter, filter); let where;
const params = { filter: store.filter }; if (filter?.where || store.filter?.where)
where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
Object.assign(filter, store.filter);
filter.where = where;
const params = { filter };
Object.assign(params, userParams); Object.assign(params, userParams);
params.filter.skip = store.skip; params.filter.skip = store.skip;
@ -148,7 +152,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
} }
async function addFilter({ filter, params }) { async function addFilter({ filter, params }) {
if (filter) store.userFilter = Object.assign(store.userFilter, filter); if (filter) store.filter = filter;
let userParams = { ...store.userParams, ...params }; let userParams = { ...store.userParams, ...params };
userParams = sanitizerParams(userParams, store?.exprBuilder); userParams = sanitizerParams(userParams, store?.exprBuilder);
@ -161,7 +165,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
} }
async function addFilterWhere(where) { async function addFilterWhere(where) {
const storedFilter = { ...store.userFilter }; const storedFilter = { ...store.filter };
if (!storedFilter?.where) storedFilter.where = {}; if (!storedFilter?.where) storedFilter.where = {};
where = { ...storedFilter.where, ...where }; where = { ...storedFilter.where, ...where };
await addFilter({ filter: { where } }); await addFilter({ filter: { where } });

2
test/cypress/integration/entry/entryDms.spec.js
View File

@ -1,4 +1,4 @@
describe('WagonTypeCreate', () => { describe('EntryDms', () => {
const entryId = 1; const entryId = 1;
beforeEach(() => { beforeEach(() => {

38
test/cypress/integration/entry/myEntry.spec.js
View File

@ -1,20 +1,20 @@
describe('WagonTypeCreate', () => { // describe('WagonTypeCreate', () => {
beforeEach(() => { // beforeEach(() => {
cy.viewport(1920, 1080); // cy.viewport(1920, 1080);
cy.login('customer'); // cy.login('customer');
cy.visit(`/#/entry/my`, { // cy.visit(`/#/entry/my`, {
onBeforeLoad(win) { // onBeforeLoad(win) {
cy.stub(win, 'open'); // cy.stub(win, 'open');
}, // },
}); // });
cy.waitForElement('.q-page', 6000); // cy.waitForElement('.q-page', 6000);
}); // });
it('should create edit and remove new dms', () => { // it('should create edit and remove new dms', () => {
cy.get( // cy.get(
'[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon' // '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
).click(); // ).click();
cy.get('.q-card__actions > .q-btn').click(); // cy.get('.q-card__actions > .q-btn').click();
cy.window().its('open').should('be.called'); // cy.window().its('open').should('be.called');
}); // });
}); // });

2
test/cypress/support/commands.js
View File

@ -239,5 +239,5 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
}); });
Cypress.Commands.add('openActionsDescriptor', () => { Cypress.Commands.add('openActionsDescriptor', () => {
cy.get('.descriptor > .header > .q-btn').click(); cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
}); });