feature/ysCha #23

Closed
ysCha wants to merge 259 commits from feature/ysCha into main
Showing only changes of commit b8f05a6ff0 - Show all commits

View File

@ -217,7 +217,7 @@ const Trestle = forwardRef((props, ref) => {
}
}
const isComplete = () => {
const isComplete = async () => {
const newAddedRoofs = roofs.map((roof, i) => {
if (i === selectedRoof?.index) {
return {
@ -263,11 +263,15 @@ const Trestle = forwardRef((props, ref) => {
console.log('newAddedRoofs', newAddedRoofs)
if (result) {
const updatePromises = [
new Promise((resolve) => {
setRoofs(newAddedRoofs)
resolve()
}),
new Promise((resolve) => {
setModuleSelectionData({
...moduleSelectionData,
roofConstructions: newAddedRoofs.map((roof, index) => {
return {
roofConstructions: newAddedRoofs.map((roof, index) => ({
roofIndex: roof.index,
addRoof: {
...moduleSelectionData.roofConstructions[index]?.addRoof,
@ -284,12 +288,13 @@ const Trestle = forwardRef((props, ref) => {
trestleDetail: {
...roof.trestleDetail,
},
}
}),
})),
})
resolve()
}),
new Promise((resolve) => {
trestleTrigger({
roofConstruction: newAddedRoofs.map((roof) => {
return {
roofConstruction: newAddedRoofs.map((roof) => ({
roofIndex: roof.index,
addRoof: {
...roof,
@ -305,9 +310,13 @@ const Trestle = forwardRef((props, ref) => {
setupSnowCover: roof.snowGdYn === 'Y',
selectedIndex: roof.index,
},
}
}),
})),
})
resolve()
}),
]
await Promise.all(updatePromises)
}
return result