From 65c51606bd301064865a7653a6fcb90f462af7ee Mon Sep 17 00:00:00 2001 From: Joshua Sigona Date: Mon, 2 Aug 2021 19:28:11 +0900 Subject: [PATCH] Move dependency map resolution to after all promises are settled. --- src/App.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.js b/src/App.js index 724e359..33f857b 100644 --- a/src/App.js +++ b/src/App.js @@ -474,6 +474,7 @@ function TableEditor(p) { useEffect(()=>{ if (update) { setLoading(true) + var dependency_map = {} axios.get(BACKEND_URL+p.path) .then((data)=>{ var cols = data.data.fields @@ -481,7 +482,6 @@ function TableEditor(p) { setFields(cols.filter((col,i)=>col.name!=="id"&&!(i===0&&col.name==="name"))) - var dependency_map = {} var promise_list = [] cols.filter((col)=>col.name!=="id"&&col.name.includes("_id")).forEach((col)=>{ @@ -490,11 +490,11 @@ function TableEditor(p) { dependency_map[col.name]=data.data.rows.reverse() })) }) - setDependencies(dependency_map) setData(rows) return Promise.allSettled(promise_list) }) .then(()=>{ + setDependencies(dependency_map) setLoading(false) }) setUpdate(false)