From 52b7521d77df43f179d204df20690002a955ffd0 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Mon, 15 May 2023 22:09:53 -0500 Subject: [PATCH] fix(gui): handle partial extras file without totally crashing --- gui/src/components/tab/Models.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/src/components/tab/Models.tsx b/gui/src/components/tab/Models.tsx index 0ec2b52f..daa868d7 100644 --- a/gui/src/components/tab/Models.tsx +++ b/gui/src/components/tab/Models.tsx @@ -30,7 +30,7 @@ const { useContext, useEffect } = React; // eslint-disable-next-line @typescript-eslint/unbound-method const { kebabCase } = _; -function mergeModelLists(local: Array, server: Array) { +function mergeModelLists(local: Array, server: Array = []) { const localNames = new Set(local.map((it) => it.name)); const merged = [...local]; @@ -43,7 +43,7 @@ function mergeModelLists(local: Array return merged; } -function mergeModels(local: ExtrasFile, server: ExtrasFile): ExtrasFile { +function mergeModels(local: ExtrasFile, server: Partial): ExtrasFile { const merged: ExtrasFile = { ...server, correction: mergeModelLists(local.correction, server.correction),