fix: e.current.name is undefined

coaidev · Jan 14, 2024 · c77fd94 · c77fd94
1 parent fea7442
commit c77fd94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/app/src/components/SelectGroup.tsx b/app/src/components/SelectGroup.tsx
@@ -105,13 +105,13 @@ function SelectGroupMobile(props: SelectGroupProps) {
   return (
     <div className={`mb-2 w-full`}>
       <Select
-        value={props.current.name || ""}
+        value={props.current?.name || ""}
         onValueChange={(value: string) => {
           props.onChange?.(value);
         }}
       >
         <SelectTrigger className="select-group mobile">
-          <SelectValue placeholder={props.current.value} />
+          <SelectValue placeholder={props.current?.value || ""} />
         </SelectTrigger>
         <SelectContent
           className={`${props.className} ${props.classNameMobile}`}

diff --git a/app/src/components/home/ModelFinder.tsx b/app/src/components/home/ModelFinder.tsx
@@ -70,6 +70,11 @@ function ModelFinder(props: ModelSelectorProps) {
       ? supportModels.filter((model) => list.includes(model.id))
       : supportModels.filter((model) => model.default);
 
+    if (raw.length === 0) raw.push({
+      name: "default",
+      id: "default",
+    } as Model);
+
     return [
       ...raw.map((model: Model): SelectItemProps => filterModel(model, level)),
       {
@@ -80,6 +85,11 @@ function ModelFinder(props: ModelSelectorProps) {
     ];
   }, [supportModels, level, student, sync]);
 
+  const current = useMemo((): SelectItemProps => {
+    const raw = models.find((item) => item.name === model);
+    return raw || models[0];
+  }, [models, model]);
+
   useEffect(() => {
     setInterval(() => {
       if (supportModels.length === 0) return;
@@ -89,7 +99,7 @@ function ModelFinder(props: ModelSelectorProps) {
 
   return (
     <SelectGroup
-      current={models.find((item) => item.name === model) as SelectItemProps}
+      current={current}
       list={models}
       maxElements={3}
       side={props.side}