@flowselections/floriday-verkoop-module 1.0.138 → 1.0.140
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-lib/components/verkoop/EditLocalOrderDialog.d.ts.map +1 -1
- package/dist-lib/components/verkoop/EditLocalOrderDialog.js +24 -22
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts +2 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.d.ts.map +1 -0
- package/dist-lib/components/verkoop/FloridaySyncSettings.js +48 -0
- package/dist-lib/components/verkoop/OrderKarindelingCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderKarindelingCard.js +32 -5
- package/dist-lib/components/verkoop/OrderShipmentsCard.d.ts.map +1 -1
- package/dist-lib/components/verkoop/OrderShipmentsCard.js +2 -3
- package/dist-lib/components/verkoop/SalesOrderDetailPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailPage.js +12 -2
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts +3 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersFilters.js +13 -51
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts +17 -3
- package/dist-lib/components/verkoop/SalesOrdersTable.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrdersTable.js +168 -116
- package/dist-lib/components/verkoop/VerkoopOrdersPage.d.ts.map +1 -1
- package/dist-lib/components/verkoop/VerkoopOrdersPage.js +203 -89
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts +9 -0
- package/dist-lib/components/verkoop/v3/CustomerName.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/CustomerName.js +16 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts +15 -0
- package/dist-lib/components/verkoop/v3/HoverTip.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/HoverTip.js +24 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/KpiTile.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/KpiTile.js +8 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts +7 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/OrderProgress.js +127 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts +13 -0
- package/dist-lib/components/verkoop/v3/RowMenu.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/RowMenu.js +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts +17 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/SourceIcon.js +45 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts +2 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.d.ts.map +1 -0
- package/dist-lib/components/verkoop/v3/floriday-logo.js +2 -0
- package/dist-lib/index.d.ts.map +1 -1
- package/dist-lib/index.js +2 -0
- package/dist-lib/integrations/supabase/types.d.ts +431 -0
- package/dist-lib/integrations/supabase/types.d.ts.map +1 -1
- package/dist-lib/lib/buffer-carts.check.d.ts +2 -0
- package/dist-lib/lib/buffer-carts.check.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.check.js +23 -0
- package/dist-lib/lib/buffer-carts.d.ts +35 -0
- package/dist-lib/lib/buffer-carts.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts +12 -0
- package/dist-lib/lib/buffer-carts.functions.d.ts.map +1 -0
- package/dist-lib/lib/buffer-carts.functions.js +18 -0
- package/dist-lib/lib/buffer-carts.js +41 -0
- package/dist-lib/lib/create-order.functions.d.ts +1 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +8 -1
- package/dist-lib/lib/floriday-public.functions.d.ts +1 -1
- package/dist-lib/lib/motion.d.ts +13 -0
- package/dist-lib/lib/motion.d.ts.map +1 -0
- package/dist-lib/lib/motion.js +36 -0
- package/dist-lib/lib/order-price-lock.check.js +21 -5
- package/dist-lib/lib/order-price-lock.d.ts +14 -6
- package/dist-lib/lib/order-price-lock.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.js +40 -8
- package/dist-lib/lib/order-price-lock.server.d.ts.map +1 -1
- package/dist-lib/lib/order-price-lock.server.js +10 -0
- package/dist-lib/lib/order-progress.check.d.ts +2 -0
- package/dist-lib/lib/order-progress.check.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.check.js +90 -0
- package/dist-lib/lib/order-progress.d.ts +154 -0
- package/dist-lib/lib/order-progress.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.js +171 -0
- package/dist-lib/lib/order-progress.server.d.ts +41 -0
- package/dist-lib/lib/order-progress.server.d.ts.map +1 -0
- package/dist-lib/lib/order-progress.server.js +136 -0
- package/dist-lib/lib/order-status.js +2 -2
- package/dist-lib/lib/period-range.check.d.ts +2 -0
- package/dist-lib/lib/period-range.check.d.ts.map +1 -0
- package/dist-lib/lib/period-range.check.js +63 -0
- package/dist-lib/lib/period-range.d.ts +66 -0
- package/dist-lib/lib/period-range.d.ts.map +1 -0
- package/dist-lib/lib/period-range.js +213 -0
- package/dist-lib/lib/plan-coverage.d.ts +17 -0
- package/dist-lib/lib/plan-coverage.d.ts.map +1 -1
- package/dist-lib/lib/plan-coverage.js +24 -0
- package/dist-lib/lib/reference-cache.check.d.ts +2 -0
- package/dist-lib/lib/reference-cache.check.d.ts.map +1 -0
- package/dist-lib/lib/reference-cache.check.js +31 -0
- package/dist-lib/lib/reference-cache.server.d.ts +17 -0
- package/dist-lib/lib/reference-cache.server.d.ts.map +1 -0
- package/dist-lib/lib/reference-cache.server.js +65 -0
- package/dist-lib/lib/salesorders-list.functions.d.ts +4 -2
- package/dist-lib/lib/salesorders-list.functions.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.functions.js +5 -1
- package/dist-lib/lib/salesorders-list.server.d.ts +7 -2
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +228 -119
- package/dist-lib/lib/salesorders-mapping.d.ts +18 -0
- package/dist-lib/lib/salesorders-mapping.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-mapping.js +19 -58
- package/dist-lib/lib/session-error.check.d.ts +2 -0
- package/dist-lib/lib/session-error.check.d.ts.map +1 -0
- package/dist-lib/lib/session-error.check.js +17 -0
- package/dist-lib/lib/session-error.d.ts +2 -0
- package/dist-lib/lib/session-error.d.ts.map +1 -0
- package/dist-lib/lib/session-error.js +10 -0
- package/dist-lib/lib/useBufferCarts.d.ts +6 -0
- package/dist-lib/lib/useBufferCarts.d.ts.map +1 -0
- package/dist-lib/lib/useBufferCarts.js +15 -0
- package/dist-lib/lib/useSalesOrdersQuery.d.ts +11 -2
- package/dist-lib/lib/useSalesOrdersQuery.d.ts.map +1 -1
- package/dist-lib/lib/useSalesOrdersQuery.js +75 -52
- package/package.json +3 -3
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { monthRangeAms, periodRange, weekRange } from "./period-range.js";
|
|
1
2
|
// Client-safe mapping: jsonb cache row -> SalesOrderDTO used by the UI.
|
|
2
3
|
import { cratePackageName, loadCarrierName } from "./load-carrier-labels.js";
|
|
3
4
|
import { orderStageLabel } from "./order-status.js";
|
|
@@ -184,74 +185,34 @@ export function computeTotals(orders) {
|
|
|
184
185
|
return { revenue, avgPrice, fustCount, karCount, orderCount: orders.length };
|
|
185
186
|
}
|
|
186
187
|
// ISO-8601 weekbereik (maandag 00:00 t/m maandag erop 00:00, UTC).
|
|
188
|
+
/** ISO-week als halfopen [ma 00:00, volgende ma 00:00) in Europe/Amsterdam. */
|
|
187
189
|
export function isoWeekRange(week, year) {
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
const jan4Dow = (jan4.getUTCDay() + 6) % 7; // ma=0..zo=6
|
|
191
|
-
const week1Monday = new Date(jan4);
|
|
192
|
-
week1Monday.setUTCDate(jan4.getUTCDate() - jan4Dow);
|
|
193
|
-
const start = new Date(week1Monday);
|
|
194
|
-
start.setUTCDate(week1Monday.getUTCDate() + (week - 1) * 7);
|
|
195
|
-
const end = new Date(start);
|
|
196
|
-
end.setUTCDate(start.getUTCDate() + 7);
|
|
197
|
-
return { start, end };
|
|
190
|
+
const r = weekRange(week, year);
|
|
191
|
+
return { start: new Date(r.since), end: new Date(r.until) };
|
|
198
192
|
}
|
|
193
|
+
/** Maand als halfopen interval in Europe/Amsterdam. */
|
|
199
194
|
export function monthRange(month, year) {
|
|
200
|
-
const
|
|
201
|
-
|
|
202
|
-
return { start, end };
|
|
203
|
-
}
|
|
204
|
-
function ymdToUtc(ymd) {
|
|
205
|
-
const [y, m, d] = ymd.split("-").map(Number);
|
|
206
|
-
return new Date(Date.UTC(y, (m ?? 1) - 1, d ?? 1));
|
|
207
|
-
}
|
|
208
|
-
function startOfTodayUtc() {
|
|
209
|
-
const now = new Date();
|
|
210
|
-
return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
|
|
195
|
+
const r = monthRangeAms(month, year);
|
|
196
|
+
return { start: new Date(r.since), end: new Date(r.until) };
|
|
211
197
|
}
|
|
212
198
|
export function applyFilters(orders, f) {
|
|
213
199
|
const dateField = f.dateField ?? "ordered";
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
const end = new Date(start);
|
|
224
|
-
end.setUTCDate(start.getUTCDate() + 1);
|
|
225
|
-
rangeStartIso = start.toISOString();
|
|
226
|
-
rangeEndIso = end.toISOString();
|
|
227
|
-
}
|
|
228
|
-
else if (f.period === "last7" || f.period === "last30") {
|
|
229
|
-
const days = f.period === "last7" ? 7 : 30;
|
|
230
|
-
const end = startOfTodayUtc();
|
|
231
|
-
end.setUTCDate(end.getUTCDate() + 1);
|
|
232
|
-
const start = new Date(end);
|
|
233
|
-
start.setUTCDate(end.getUTCDate() - days);
|
|
234
|
-
rangeStartIso = start.toISOString();
|
|
235
|
-
rangeEndIso = end.toISOString();
|
|
236
|
-
}
|
|
237
|
-
else if (f.period === "custom" && f.customFrom && f.customTo) {
|
|
238
|
-
const start = ymdToUtc(f.customFrom);
|
|
239
|
-
const end = ymdToUtc(f.customTo);
|
|
240
|
-
end.setUTCDate(end.getUTCDate() + 1);
|
|
241
|
-
rangeStartIso = start.toISOString();
|
|
242
|
-
rangeEndIso = end.toISOString();
|
|
243
|
-
}
|
|
244
|
-
else if (f.week && f.year) {
|
|
245
|
-
const { start, end } = isoWeekRange(f.week, f.year);
|
|
246
|
-
rangeStartIso = start.toISOString();
|
|
247
|
-
rangeEndIso = end.toISOString();
|
|
248
|
-
}
|
|
200
|
+
// Halfopen [start, eind) in Europe/Amsterdam (period-range.ts).
|
|
201
|
+
const range = periodRange(f);
|
|
202
|
+
const rangeStartMs = range ? new Date(range.since).getTime() : null;
|
|
203
|
+
const rangeEndMs = range ? new Date(range.until).getTime() : null;
|
|
204
|
+
/** Tijdstip van een datum of datum-tijd; een losse datum telt als 12:00 Amsterdam. */
|
|
205
|
+
const msOf = (v) => {
|
|
206
|
+
const t = /^\d{4}-\d{2}-\d{2}$/.test(v) ? new Date(`${v}T12:00:00Z`).getTime() : new Date(v).getTime();
|
|
207
|
+
return Number.isNaN(t) ? null : t;
|
|
208
|
+
};
|
|
249
209
|
return orders.filter((o) => {
|
|
250
210
|
const refDate = dateField === "delivery" ? o.deliveryAt : o.orderedAt;
|
|
251
|
-
if (
|
|
211
|
+
if (rangeStartMs != null && rangeEndMs != null) {
|
|
252
212
|
if (!refDate)
|
|
253
213
|
return false;
|
|
254
|
-
|
|
214
|
+
const ms = msOf(refDate);
|
|
215
|
+
if (ms == null || ms < rangeStartMs || ms >= rangeEndMs)
|
|
255
216
|
return false;
|
|
256
217
|
}
|
|
257
218
|
if (f.from && refDate < f.from)
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-error.check.d.ts","sourceRoot":"","sources":["../../src/lib/session-error.check.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { isSessionError } from "./session-error.js";
|
|
2
|
+
const cases = [
|
|
3
|
+
[new Error("Ongeldig token: Auth session missing!"), true],
|
|
4
|
+
[{ status: 401, message: "x" }, true],
|
|
5
|
+
[new Error("Sessie nog niet beschikbaar"), true],
|
|
6
|
+
[new Error("statement timeout"), false],
|
|
7
|
+
[null, false],
|
|
8
|
+
];
|
|
9
|
+
let failed = 0;
|
|
10
|
+
for (const [e, want] of cases)
|
|
11
|
+
if (isSessionError(e) !== want) {
|
|
12
|
+
failed++;
|
|
13
|
+
console.error("FOUT", e, want);
|
|
14
|
+
}
|
|
15
|
+
if (failed)
|
|
16
|
+
process.exit(1);
|
|
17
|
+
console.log("Alle sessiecontroles geslaagd");
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-error.d.ts","sourceRoot":"","sources":["../../src/lib/session-error.ts"],"names":[],"mappings":"AACA,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAMpD"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
// Herkent een verlopen of afgesloten inlogsessie in een foutmelding van de server.
|
|
2
|
+
export function isSessionError(err) {
|
|
3
|
+
const e = err;
|
|
4
|
+
if (!e)
|
|
5
|
+
return false;
|
|
6
|
+
if (e.status === 401)
|
|
7
|
+
return true;
|
|
8
|
+
const msg = typeof e.message === "string" ? e.message : String(err ?? "");
|
|
9
|
+
return /auth session missing|ongeldig token|sessie nog niet beschikbaar|geen authorization header|unauthorized|jwt expired/i.test(msg);
|
|
10
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/** Buffertelling van de Engine; null zolang onbekend of bij een oudere Engine. */
|
|
2
|
+
export declare function useBufferCarts(bufferId: string | null | undefined): import("@tanstack/react-query").UseQueryResult<{
|
|
3
|
+
carts: import("./buffer-carts.js").BufferCarts | null;
|
|
4
|
+
error: string | null;
|
|
5
|
+
}, Error>;
|
|
6
|
+
//# sourceMappingURL=useBufferCarts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useBufferCarts.d.ts","sourceRoot":"","sources":["../../src/lib/useBufferCarts.ts"],"names":[],"mappings":"AAMA,kFAAkF;AAClF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;;;UASjE"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { useServerFn } from "@tanstack/react-start";
|
|
3
|
+
import { getBufferCarts } from "./buffer-carts.functions.js";
|
|
4
|
+
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
5
|
+
/** Buffertelling van de Engine; null zolang onbekend of bij een oudere Engine. */
|
|
6
|
+
export function useBufferCarts(bufferId) {
|
|
7
|
+
const fetchFn = useServerFn(getBufferCarts);
|
|
8
|
+
const enabled = !!bufferId && UUID_RE.test(bufferId);
|
|
9
|
+
return useQuery({
|
|
10
|
+
queryKey: ["buffer-carts", bufferId],
|
|
11
|
+
enabled,
|
|
12
|
+
staleTime: 30000,
|
|
13
|
+
queryFn: () => fetchFn({ data: { bufferId: bufferId } }),
|
|
14
|
+
});
|
|
15
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type SalesOrderDTO, type SalesOrderFilters, type SalesOrdersTotals } from "./salesorders-mapping.js";
|
|
2
2
|
import type { OrderStage } from "./order-status.js";
|
|
3
|
-
|
|
3
|
+
import type { ProgressFeatures } from "./order-progress.js";
|
|
4
|
+
export type StatusTab = "all" | OrderStage | "backlog" | "not_reported" | "invoiced" | "problem";
|
|
4
5
|
export interface SalesOrdersPage {
|
|
5
6
|
orders: SalesOrderDTO[];
|
|
6
7
|
totalCount: number;
|
|
@@ -10,12 +11,15 @@ export interface SalesOrdersPage {
|
|
|
10
11
|
environment: "staging" | "live";
|
|
11
12
|
warnings: string[];
|
|
12
13
|
truncated: boolean;
|
|
14
|
+
features?: ProgressFeatures;
|
|
13
15
|
}
|
|
14
16
|
export interface SalesOrdersQueryOptions {
|
|
15
17
|
tab?: StatusTab;
|
|
16
18
|
page?: number;
|
|
17
19
|
pageSize?: number;
|
|
18
20
|
enabled?: boolean;
|
|
21
|
+
/** Automatisch verversen (ms), alleen bij zichtbaar tabblad. */
|
|
22
|
+
autoRefreshMs?: number;
|
|
19
23
|
}
|
|
20
24
|
/**
|
|
21
25
|
* Bepaal het serverside periode-venster op basis van de UI-filters.
|
|
@@ -24,7 +28,12 @@ export interface SalesOrdersQueryOptions {
|
|
|
24
28
|
export declare function derivePeriodWindow(filters?: SalesOrderFilters): {
|
|
25
29
|
since?: string;
|
|
26
30
|
until?: string;
|
|
31
|
+
sinceDate?: string;
|
|
32
|
+
untilDate?: string;
|
|
27
33
|
dateField: "ordered" | "delivery";
|
|
28
34
|
};
|
|
29
|
-
export declare function useSalesOrdersQuery(filters?: SalesOrderFilters, options?: SalesOrdersQueryOptions): import("@tanstack/react-query").UseQueryResult<SalesOrdersPage, Error
|
|
35
|
+
export declare function useSalesOrdersQuery(filters?: SalesOrderFilters, options?: SalesOrdersQueryOptions): import("@tanstack/react-query").UseQueryResult<SalesOrdersPage, Error> & {
|
|
36
|
+
stale: boolean;
|
|
37
|
+
lastSuccessAt: number | null;
|
|
38
|
+
};
|
|
30
39
|
//# sourceMappingURL=useSalesOrdersQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSalesOrdersQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrdersQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useSalesOrdersQuery.d.ts","sourceRoot":"","sources":["../../src/lib/useSalesOrdersQuery.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,UAAU,GAAG,SAAS,CAAC;AAEjG,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,WAAW,EAAE,SAAS,GAAG,MAAM,CAAC;IAChC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;CACnC,CAOA;AAED,wBAAgB,mBAAmB,CACjC,OAAO,CAAC,EAAE,iBAAiB,EAC3B,OAAO,CAAC,EAAE,uBAAuB;;;EA+HlC"}
|
|
@@ -2,61 +2,27 @@
|
|
|
2
2
|
// `listSalesOrders`. De browser ontvangt alleen de rijen van de zichtbare
|
|
3
3
|
// pagina plus totalen/tellingen, zodat de lijst snel blijft bij tienduizenden
|
|
4
4
|
// orders.
|
|
5
|
-
import { useEffect, useRef } from "react";
|
|
5
|
+
import { useEffect, useRef, useState } from "react";
|
|
6
6
|
import { useQuery, useQueryClient, keepPreviousData } from "@tanstack/react-query";
|
|
7
7
|
import { useServerFn } from "@tanstack/react-start";
|
|
8
8
|
import { supabase } from "../integrations/supabase/client.js";
|
|
9
9
|
import { listSalesOrders } from "./salesorders-list.functions.js";
|
|
10
|
-
import {
|
|
10
|
+
import { supabase as coreSupabase } from "@flowselections/core";
|
|
11
|
+
import { isSessionError } from "./session-error.js";
|
|
12
|
+
import { periodRange } from "./period-range.js";
|
|
11
13
|
/**
|
|
12
14
|
* Bepaal het serverside periode-venster op basis van de UI-filters.
|
|
13
15
|
* Zonder (volledige) periodefilters wordt geen venster toegepast.
|
|
14
16
|
*/
|
|
15
17
|
export function derivePeriodWindow(filters) {
|
|
16
|
-
const dateField = filters?.dateField ?? "
|
|
18
|
+
const dateField = filters?.dateField ?? "delivery";
|
|
17
19
|
if (!filters)
|
|
18
20
|
return { dateField };
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const now = new Date();
|
|
25
|
-
return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
|
|
26
|
-
};
|
|
27
|
-
let start = null;
|
|
28
|
-
let end = null;
|
|
29
|
-
if (filters.period === "month" && filters.month !== undefined && filters.monthYear !== undefined) {
|
|
30
|
-
const r = monthRange(filters.month, filters.monthYear);
|
|
31
|
-
start = r.start;
|
|
32
|
-
end = r.end;
|
|
33
|
-
}
|
|
34
|
-
else if (filters.period === "day" && filters.day) {
|
|
35
|
-
start = ymdToUtc(filters.day);
|
|
36
|
-
end = new Date(start);
|
|
37
|
-
end.setUTCDate(start.getUTCDate() + 1);
|
|
38
|
-
}
|
|
39
|
-
else if (filters.period === "last7" || filters.period === "last30") {
|
|
40
|
-
const days = filters.period === "last7" ? 7 : 30;
|
|
41
|
-
end = startOfTodayUtc();
|
|
42
|
-
end.setUTCDate(end.getUTCDate() + 1);
|
|
43
|
-
start = new Date(end);
|
|
44
|
-
start.setUTCDate(end.getUTCDate() - days);
|
|
45
|
-
}
|
|
46
|
-
else if (filters.period === "custom" && filters.customFrom && filters.customTo) {
|
|
47
|
-
start = ymdToUtc(filters.customFrom);
|
|
48
|
-
end = ymdToUtc(filters.customTo);
|
|
49
|
-
end.setUTCDate(end.getUTCDate() + 1);
|
|
50
|
-
}
|
|
51
|
-
else if (filters.week && filters.year) {
|
|
52
|
-
const r = isoWeekRange(filters.week, filters.year);
|
|
53
|
-
start = r.start;
|
|
54
|
-
end = r.end;
|
|
55
|
-
}
|
|
56
|
-
if (start && end) {
|
|
57
|
-
return { since: start.toISOString(), until: end.toISOString(), dateField };
|
|
58
|
-
}
|
|
59
|
-
return { dateField };
|
|
21
|
+
// Halfopen [start, eind) in Europe/Amsterdam (zie period-range.ts).
|
|
22
|
+
const r = periodRange(filters);
|
|
23
|
+
if (!r)
|
|
24
|
+
return { dateField };
|
|
25
|
+
return { since: r.since, until: r.until, sinceDate: r.startDate, untilDate: r.endDate, dateField };
|
|
60
26
|
}
|
|
61
27
|
export function useSalesOrdersQuery(filters, options) {
|
|
62
28
|
const fetchList = useServerFn(listSalesOrders);
|
|
@@ -71,6 +37,8 @@ export function useSalesOrdersQuery(filters, options) {
|
|
|
71
37
|
const params = {
|
|
72
38
|
since: window.since,
|
|
73
39
|
until: window.until,
|
|
40
|
+
sinceDate: window.sinceDate,
|
|
41
|
+
untilDate: window.untilDate,
|
|
74
42
|
dateField: window.dateField,
|
|
75
43
|
search: filters?.search,
|
|
76
44
|
status: filters?.status,
|
|
@@ -80,31 +48,84 @@ export function useSalesOrdersQuery(filters, options) {
|
|
|
80
48
|
};
|
|
81
49
|
// Realtime-seintje op referentiedata: volgende opvraging leegt de servercache.
|
|
82
50
|
const refreshRef = useRef(false);
|
|
51
|
+
const hasDataRef = useRef(false);
|
|
83
52
|
const query = useQuery({
|
|
84
53
|
queryKey: ["floriday", "salesorders-list", params],
|
|
85
|
-
queryFn: async () => {
|
|
54
|
+
queryFn: async ({ signal }) => {
|
|
86
55
|
const refreshReference = refreshRef.current;
|
|
87
56
|
refreshRef.current = false;
|
|
88
|
-
|
|
57
|
+
// signal: een nieuw verzoek breekt het lopende af (nooit twee tegelijk).
|
|
58
|
+
const call = () => fetchList({ data: { ...params, refreshReference }, signal });
|
|
59
|
+
let res;
|
|
60
|
+
try {
|
|
61
|
+
res = await call();
|
|
62
|
+
}
|
|
63
|
+
catch (err) {
|
|
64
|
+
// Verlopen sessie: één keer stil vernieuwen en opnieuw proberen.
|
|
65
|
+
if (!isSessionError(err))
|
|
66
|
+
throw err;
|
|
67
|
+
const { error: refreshError } = await coreSupabase.auth.refreshSession().catch((e) => ({ error: e }));
|
|
68
|
+
if (refreshError)
|
|
69
|
+
throw err;
|
|
70
|
+
res = await call();
|
|
71
|
+
}
|
|
89
72
|
const { rows, ...rest } = res;
|
|
90
73
|
return { orders: rows, ...rest };
|
|
91
74
|
},
|
|
92
75
|
placeholderData: keepPreviousData,
|
|
93
|
-
|
|
76
|
+
// Eerste keer laden: een paar snelle pogingen. Achtergrondverversing:
|
|
77
|
+
// geen directe herhaling; zie de oplopende wachttijd hieronder.
|
|
78
|
+
retry: (count, err) => count < 3 && !hasDataRef.current && !isSessionError(err),
|
|
94
79
|
retryDelay: (i) => Math.min(1000 * 2 ** i, 4000),
|
|
95
80
|
staleTime: 30000,
|
|
96
|
-
|
|
81
|
+
// Verborgen tabblad: niet verversen; bij terugkomen één keer.
|
|
82
|
+
refetchOnWindowFocus: "always",
|
|
83
|
+
// Elke 60 s verversen, alleen zolang het tabblad zichtbaar is.
|
|
84
|
+
refetchInterval: options?.autoRefreshMs ?? false,
|
|
85
|
+
refetchIntervalInBackground: false,
|
|
97
86
|
enabled,
|
|
98
87
|
});
|
|
88
|
+
hasDataRef.current = query.data !== undefined;
|
|
89
|
+
// Mislukte achtergrondverversing: laatste gegevens blijven staan; nieuwe
|
|
90
|
+
// poging na 5 s, 15 s en daarna elke 60 s. Succes zet de teller terug.
|
|
91
|
+
const [failCount, setFailCount] = useState(0);
|
|
92
|
+
const [lastSuccessAt, setLastSuccessAt] = useState(null);
|
|
93
|
+
useEffect(() => {
|
|
94
|
+
if (query.isSuccess && !query.isPlaceholderData && query.dataUpdatedAt) {
|
|
95
|
+
setFailCount(0);
|
|
96
|
+
setLastSuccessAt(query.dataUpdatedAt);
|
|
97
|
+
}
|
|
98
|
+
}, [query.dataUpdatedAt, query.isSuccess, query.isPlaceholderData]);
|
|
99
|
+
useEffect(() => {
|
|
100
|
+
if (!query.errorUpdatedAt || query.data === undefined)
|
|
101
|
+
return;
|
|
102
|
+
setFailCount((n) => n + 1);
|
|
103
|
+
}, [query.errorUpdatedAt]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
104
|
+
useEffect(() => {
|
|
105
|
+
if (!failCount || !query.isError || query.data === undefined)
|
|
106
|
+
return;
|
|
107
|
+
const delays = [5000, 15000, 60000];
|
|
108
|
+
const t = setTimeout(() => {
|
|
109
|
+
if (typeof document !== "undefined" && document.visibilityState === "hidden")
|
|
110
|
+
return;
|
|
111
|
+
void query.refetch();
|
|
112
|
+
}, delays[Math.min(failCount - 1, delays.length - 1)]);
|
|
113
|
+
return () => clearTimeout(t);
|
|
114
|
+
}, [failCount, query.isError]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
99
115
|
// Realtime: lijst verversen zodra de cache of lokale orders wijzigen.
|
|
116
|
+
// Seintjes bundelen (1 s); invalidate breekt een lopend verzoek af.
|
|
100
117
|
useEffect(() => {
|
|
101
118
|
let timer = null;
|
|
119
|
+
// Verborgen tabblad: overslaan; bij terugkomen ververst de lijst één keer.
|
|
120
|
+
const run = () => {
|
|
121
|
+
if (typeof document !== "undefined" && document.visibilityState === "hidden")
|
|
122
|
+
return;
|
|
123
|
+
queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] }, { cancelRefetch: true });
|
|
124
|
+
};
|
|
102
125
|
const invalidate = () => {
|
|
103
126
|
if (timer)
|
|
104
127
|
clearTimeout(timer);
|
|
105
|
-
timer = setTimeout(
|
|
106
|
-
queryClient.invalidateQueries({ queryKey: ["floriday", "salesorders-list"] });
|
|
107
|
-
}, 750);
|
|
128
|
+
timer = setTimeout(run, 1000);
|
|
108
129
|
};
|
|
109
130
|
const invalidateRef = () => {
|
|
110
131
|
refreshRef.current = true;
|
|
@@ -125,5 +146,7 @@ export function useSalesOrdersQuery(filters, options) {
|
|
|
125
146
|
supabase.removeChannel(channel);
|
|
126
147
|
};
|
|
127
148
|
}, [enabled, queryClient]);
|
|
128
|
-
|
|
149
|
+
/** Mislukte achtergrondverversing terwijl er nog oude gegevens staan. */
|
|
150
|
+
const stale = query.isError && query.data !== undefined;
|
|
151
|
+
return Object.assign(query, { stale, lastSuccessAt });
|
|
129
152
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@flowselections/floriday-verkoop-module",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.140",
|
|
4
4
|
"private": false,
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"type": "module",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"lint": "eslint ."
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@flowselections/core": "1.0.
|
|
38
|
+
"@flowselections/core": "1.0.34",
|
|
39
39
|
"@tanstack/react-query": "^5.0.0",
|
|
40
40
|
"@tanstack/react-router": "^1.0.0",
|
|
41
41
|
"@tanstack/react-start": "^1.0.0",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@cloudflare/vite-plugin": "^1.25.5",
|
|
55
55
|
"@eslint/js": "^9.32.0",
|
|
56
|
-
"@flowselections/core": "1.0.
|
|
56
|
+
"@flowselections/core": "1.0.34",
|
|
57
57
|
"@lovable.dev/vite-tanstack-config": "2.26.5",
|
|
58
58
|
"@rsbuild/core": "^1.0.0",
|
|
59
59
|
"@tailwindcss/vite": "^4.2.1",
|