@flowselections/floriday-verkoop-module 1.0.137 → 1.0.139
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 +32 -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.d.ts.map +1 -1
- package/dist-lib/components/verkoop/SalesOrderDetailView.js +7 -2
- 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 +7 -0
- package/dist-lib/lib/create-order.functions.d.ts.map +1 -1
- package/dist-lib/lib/create-order.functions.js +87 -30
- package/dist-lib/lib/floriday-public.functions.d.ts +1 -1
- package/dist-lib/lib/module-version.d.ts +1 -1
- package/dist-lib/lib/module-version.js +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.d.ts +2 -0
- package/dist-lib/lib/order-price-lock.check.d.ts.map +1 -0
- package/dist-lib/lib/order-price-lock.check.js +43 -0
- package/dist-lib/lib/order-price-lock.d.ts +29 -0
- package/dist-lib/lib/order-price-lock.d.ts.map +1 -0
- package/dist-lib/lib/order-price-lock.js +60 -0
- package/dist-lib/lib/order-price-lock.server.d.ts +2 -0
- package/dist-lib/lib/order-price-lock.server.d.ts.map +1 -0
- package/dist-lib/lib/order-price-lock.server.js +31 -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 +83 -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/own-transport.d.ts +11 -0
- package/dist-lib/lib/own-transport.d.ts.map +1 -0
- package/dist-lib/lib/own-transport.js +10 -0
- 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/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 +6 -1
- package/dist-lib/lib/salesorders-list.server.d.ts.map +1 -1
- package/dist-lib/lib/salesorders-list.server.js +84 -18
- 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
|
@@ -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.139",
|
|
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",
|