chore: refactor, update tests

h2oai · Aug 7, 2023 · f46dcde · f46dcde
1 parent f8a95b5
commit f46dcde
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/ui/src/dropdown.test.tsx b/ui/src/dropdown.test.tsx
@@ -717,14 +717,15 @@ describe('Dropdown.tsx', () => {
               { name: 'E', label: 'Choice E' },
               { name: 'F', label: 'Choice F' },
             ],
-            { getByTestId, getByText, rerender } = render(<XDropdown model={{ ...dialogProps, choices }} />)
+            { getByTestId, getByText, queryByText, rerender } = render(<XDropdown model={{ ...dialogProps, choices }} />)
 
           fireEvent.click(getByTestId(name))
           expect(getByText('Choice A')).toBeInTheDocument()
 
           rerender(<XDropdown model={{ ...dialogProps, choices: updatedChoices }} />)
           fireEvent.click(getByTestId(name))
 
+          expect(queryByText('Choice A')).not.toBeInTheDocument()
           expect(getByText('Choice D')).toBeInTheDocument()
           expect(getByText('Choice E')).toBeInTheDocument()
           expect(getByText('Choice F')).toBeInTheDocument()
@@ -834,14 +835,15 @@ describe('Dropdown.tsx', () => {
               { name: 'E', label: 'Choice E' },
               { name: 'F', label: 'Choice F' },
             ],
-            { getByTestId, getByText, rerender } = render(<XDropdown model={{ ...dialogProps, choices, values: ['A'] }} />)
+            { getByTestId, getByText, queryByText, rerender } = render(<XDropdown model={{ ...dialogProps, choices, values: ['A'] }} />)
 
           fireEvent.click(getByTestId(name))
           expect(getByText('Choice A')).toBeInTheDocument()
 
           rerender(<XDropdown model={{ ...dialogProps, choices: updatedChoices, values: ['D'] }} />)
           fireEvent.click(getByTestId(name))
 
+          expect(queryByText('Choice A')).not.toBeInTheDocument()
           expect(getByText('Choice D')).toBeInTheDocument()
           expect(getByText('Choice E')).toBeInTheDocument()
           expect(getByText('Choice F')).toBeInTheDocument()

diff --git a/ui/src/dropdown.tsx b/ui/src/dropdown.tsx
@@ -206,14 +206,9 @@ const
       }
 
     React.useEffect(() => {
-      if (model.value !== undefined) {
-        wave.args[name] = model.value ?? null
-        setItems(items => items.map(i => ({ ...i, checked: model.value === i.name })))
-      }
-    }, [name, model.value, setItems])
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    React.useEffect(() => setItems(choicesToItems(choices, model.value)), [choices])
+      wave.args[name] = model.value ?? null
+      setItems(choicesToItems(choices, model.value))
+    }, [name, model.value, choices, setItems])
 
     return (
       <>
@@ -277,14 +272,9 @@ const
       }
 
     React.useEffect(() => {
-      if (values) {
-        wave.args[name] = values
-        setItems(items => items.map(i => ({ ...i, checked: values.includes(i.name) })))
-      }
-    }, [name, values, setItems])
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    React.useEffect(() => setItems(choicesToItems(choices, values)), [choices])
+      wave.args[name] = values
+      setItems(choicesToItems(choices, values))
+    }, [name, values, choices, setItems])
 
     return (
       <>