From 281881b39186ca13e19c9291e860a10ae93bc2f2 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Tue, 8 Oct 2024 20:47:05 -0400 Subject: [PATCH] Add debug trace --- app/assets/composables/sprunjer.ts | 2 ++ dist/sprunjer.cjs | 2 +- dist/sprunjer.js | 52 ++++++++++++++++-------------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/assets/composables/sprunjer.ts b/app/assets/composables/sprunjer.ts index 974eb1fe..a0996308 100644 --- a/app/assets/composables/sprunjer.ts +++ b/app/assets/composables/sprunjer.ts @@ -37,6 +37,8 @@ const useSprunjer = ( const sorts = ref(defaultSorts) const filters = ref(defaultFilters) + console.log("SPRUNJER DEBUG SORT", sorts, defaultSorts); + // Raw data const data = ref({}) diff --git a/dist/sprunjer.cjs b/dist/sprunjer.cjs index bf50e012..82ecba2e 100644 --- a/dist/sprunjer.cjs +++ b/dist/sprunjer.cjs @@ -1 +1 @@ -"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),x=require("./axios-tuVKNgv9.cjs"),b=(c,v={},f={},d=10,p=0)=>{const o=e.ref(d),r=e.ref(p),a=e.ref(v),l=e.ref(f),t=e.ref({}),s=e.ref(!1);async function i(){s.value=!0,x.axios.get(e.toValue(c),{params:{size:o.value,page:r.value,sorts:a.value,filters:l.value}}).then(u=>{t.value=u.data,s.value=!1}).catch(u=>{console.error(u)})}const m=e.computed(()=>Math.max(Math.ceil((t.value.count_filtered??0)/o.value)-1,0)),g=e.computed(()=>t.value.count??0),h=e.computed(()=>Math.min(r.value*o.value+1,t.value.count??0)),w=e.computed(()=>Math.min((r.value+1)*o.value,t.value.count??0)),M=e.computed(()=>t.value.count_filtered??0),S=e.computed(()=>t.value.rows??[]);function y(){console.log("Not yet implemented")}function j(u){let n;a.value[u]==="asc"?n="desc":a.value[u]==="desc"?n=null:n="asc",a.value[u]=n}return e.watchEffect(()=>{i()}),{dataUrl:c,size:o,page:r,sorts:a,filters:l,data:t,fetch:i,loading:s,downloadCsv:y,totalPages:m,countFiltered:M,count:g,rows:S,first:h,last:w,toggleSort:j}};exports.useSprunjer=b; +"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("vue"),x=require("./axios-tuVKNgv9.cjs"),E=(c,l={},f={},d=10,p=0)=>{const n=e.ref(d),a=e.ref(p),u=e.ref(l),i=e.ref(f);console.log("SPRUNJER DEBUG SORT",u,l);const t=e.ref({}),s=e.ref(!1);async function v(){s.value=!0,x.axios.get(e.toValue(c),{params:{size:n.value,page:a.value,sorts:u.value,filters:i.value}}).then(o=>{t.value=o.data,s.value=!1}).catch(o=>{console.error(o)})}const g=e.computed(()=>Math.max(Math.ceil((t.value.count_filtered??0)/n.value)-1,0)),m=e.computed(()=>t.value.count??0),h=e.computed(()=>Math.min(a.value*n.value+1,t.value.count??0)),S=e.computed(()=>Math.min((a.value+1)*n.value,t.value.count??0)),w=e.computed(()=>t.value.count_filtered??0),M=e.computed(()=>t.value.rows??[]);function y(){console.log("Not yet implemented")}function j(o){let r;u.value[o]==="asc"?r="desc":u.value[o]==="desc"?r=null:r="asc",u.value[o]=r}return e.watchEffect(()=>{v()}),{dataUrl:c,size:n,page:a,sorts:u,filters:i,data:t,fetch:v,loading:s,downloadCsv:y,totalPages:g,countFiltered:w,count:m,rows:M,first:h,last:S,toggleSort:j}};exports.useSprunjer=E; diff --git a/dist/sprunjer.js b/dist/sprunjer.js index 7f5654ee..cd38cbcc 100644 --- a/dist/sprunjer.js +++ b/dist/sprunjer.js @@ -1,14 +1,16 @@ -import { ref as a, computed as o, watchEffect as _, toValue as j } from "vue"; -import { a as C } from "./axios-CXDYiOMX.js"; -const N = (c, f = {}, d = {}, m = 10, p = 0) => { - const n = a(m), u = a(p), s = a(f), v = a(d), e = a({}), r = a(!1); - async function i() { - r.value = !0, C.get(j(c), { +import { ref as a, computed as n, watchEffect as y, toValue as z } from "vue"; +import { a as N } from "./axios-CXDYiOMX.js"; +const _ = (c, v = {}, d = {}, g = 10, m = 0) => { + const l = a(g), s = a(m), o = a(v), i = a(d); + console.log("SPRUNJER DEBUG SORT", o, v); + const e = a({}), r = a(!1); + async function f() { + r.value = !0, N.get(z(c), { params: { - size: n.value, - page: u.value, - sorts: s.value, - filters: v.value + size: l.value, + page: s.value, + sorts: o.value, + filters: i.value } }).then((t) => { e.value = t.data, r.value = !1; @@ -16,35 +18,35 @@ const N = (c, f = {}, d = {}, m = 10, p = 0) => { console.error(t); }); } - const g = o(() => Math.max(Math.ceil((e.value.count_filtered ?? 0) / n.value) - 1, 0)), h = o(() => e.value.count ?? 0), w = o(() => Math.min(u.value * n.value + 1, e.value.count ?? 0)), M = o(() => Math.min((u.value + 1) * n.value, e.value.count ?? 0)), x = o(() => e.value.count_filtered ?? 0), y = o(() => e.value.rows ?? []); - function z() { + const p = n(() => Math.max(Math.ceil((e.value.count_filtered ?? 0) / l.value) - 1, 0)), h = n(() => e.value.count ?? 0), w = n(() => Math.min(s.value * l.value + 1, e.value.count ?? 0)), M = n(() => Math.min((s.value + 1) * l.value, e.value.count ?? 0)), x = n(() => e.value.count_filtered ?? 0), E = n(() => e.value.rows ?? []); + function R() { console.log("Not yet implemented"); } function S(t) { - let l; - s.value[t] === "asc" ? l = "desc" : s.value[t] === "desc" ? l = null : l = "asc", s.value[t] = l; + let u; + o.value[t] === "asc" ? u = "desc" : o.value[t] === "desc" ? u = null : u = "asc", o.value[t] = u; } - return _(() => { - i(); + return y(() => { + f(); }), { dataUrl: c, - size: n, - page: u, - sorts: s, - filters: v, + size: l, + page: s, + sorts: o, + filters: i, data: e, - fetch: i, + fetch: f, loading: r, - downloadCsv: z, - totalPages: g, + downloadCsv: R, + totalPages: p, countFiltered: x, count: h, - rows: y, + rows: E, first: w, last: M, toggleSort: S }; }; export { - N as useSprunjer + _ as useSprunjer };