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

test: refs #8647 solve fail test
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Javier Segarra 2025-03-11 10:52:02 +01:00
parent 6dbaf841a4
commit 6778a309dd
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/composables/__tests__/useArrayData.spec.js
View File

@ -25,7 +25,7 @@ describe('useArrayData', () => {
arrayData.fetch({}); arrayData.fetch({});
await flushPromises(); await flushPromises();
const router = useRouter();
const routerReplace = useRouter().replace.mock.calls[0][0]; const routerReplace = useRouter().replace.mock.calls[0][0];
expect(axios.get.mock.calls[0][1].params).toEqual({ expect(axios.get.mock.calls[0][1].params).toEqual({

17
src/composables/useArrayData.js
View File

@ -11,14 +11,8 @@ export function useArrayData(key, userOptions) {
let route = null; let route = null;
let router = null; let router = null;
const initializeRouting = () => {
if (!route) route = useRoute();
if (!router) router = useRouter();
return { route, router };
};
// Si no hay key, intentamos obtenerla del route // Si no hay key, intentamos obtenerla del route
if (!key) { if (!key) {
const { route: initialRoute, router: initialRouter } = initializeRouting();
key = initialRoute?.meta?.moduleName; key = initialRoute?.meta?.moduleName;
route = initialRoute; route = initialRoute;
router = initialRouter; router = initialRouter;
@ -30,15 +24,20 @@ export function useArrayData(key, userOptions) {
const store = arrayDataStore.get(key); const store = arrayDataStore.get(key);
let canceller = null; let canceller = null;
const { route: initialRoute, router: initialRouter } = (() => {
if (!route) route = useRoute();
if (!router) router = useRouter();
return { route, router };
})();
onMounted(() => { onMounted(() => {
setOptions(); setOptions();
reset(['skip']); reset(['skip']);
const { route: initialRoute, router: initialRouter } = initializeRouting();
route = initialRoute; route = initialRoute;
router = initialRouter; router = initialRouter;
const searchUrl = store.searchUrl; const searchUrl = store.searchUrl;
if (route.query[searchUrl]) { const query = route.query[searchUrl];
const params = JSON.parse(query[searchUrl]); if (query) {
const params = JSON.parse(query);
const filter = const filter =
params?.filter && typeof params?.filter == 'object' params?.filter && typeof params?.filter == 'object'
? params?.filter ? params?.filter