better code: we don't really need the 'end' message at the end of the sendList
Massimo Melina committed
Jun 13, 2022 at 23:39 UTC
0079ceac87330a31fb0d83e5a74806214af739ad
3 files changed
+7
-5
admin/src/api.ts
+2
-1
@@ -139,11 +139,12 @@ export function useApiList<T=any>(cmd:string|Falsy, params: Dict={}, { addId=fal
139
return stop()
140
case 'closed':
141
flush()
142
+ setInitializing(false)
143
return stop()
144
case 'msg':
145
if (src?.readyState === src?.CLOSED)
146
return stop()
146
- if (data === 'init' || data === 'end') {
147
+ if (data === 'init') {
148
flush()
149
setInitializing(false)
150
return
frontend/src/useFetchList.ts
+4
-2
@@ -45,11 +45,13 @@ export default function useFetchList() {
45
switch (type) {
46
case 'error':
47
state.stopSearch?.()
48
- return state.error = JSON.stringify(data)
48
+ state.error = JSON.stringify(data)
49
+ return
50
case 'closed':
51
flush()
52
state.stopSearch?.()
52
- return state.loading = false
53
+ state.loading = false
54
+ return
55
case 'msg':
56
if (src?.readyState === src?.CLOSED)
57
return state.stopSearch?.()
server/src/apiMiddleware.ts
+1
-2
@@ -81,8 +81,7 @@ export function sendList<T>(addAtStart?: T[]) {
81
update(search: Partial<T>, change: Partial<T>) {
82
stream.push({ update:[{ search, change }] })
83
},
84
- end() { // notify end of additions
85
- stream.push('end')
84
+ end() {
85
stream.push(null)
86
},
87
error(msg: string | number) {