From e98b25fd9b3ca3bb723679b57aff22b23902ba94 Mon Sep 17 00:00:00 2001
From: Deon Sanchez <69873175+deon-sanchez@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:10:57 -0700
Subject: [PATCH] fix: Improve dropdown component with null option filtering
 (#6830)

Improve dropdown component with null option filtering
---
 .../core/dropdownComponent/index.tsx          | 23 ++++++++++++-------
 src/frontend/src/utils/utils.ts               |  5 ++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/frontend/src/components/core/dropdownComponent/index.tsx b/src/frontend/src/components/core/dropdownComponent/index.tsx
index 1e240b2a0..2332f7d16 100644
--- a/src/frontend/src/components/core/dropdownComponent/index.tsx
+++ b/src/frontend/src/components/core/dropdownComponent/index.tsx
@@ -7,9 +7,14 @@ import { getStatusColor } from "@/utils/stringManipulation";
 import { PopoverAnchor } from "@radix-ui/react-popover";
 import Fuse from "fuse.js";
 import { cloneDeep } from "lodash";
-import { ChangeEvent, useEffect, useRef, useState } from "react";
+import { ChangeEvent, useEffect, useMemo, useRef, useState } from "react";
 import { DropDownComponent } from "../../../types/components";
-import { cn, formatName, formatPlaceholderName } from "../../../utils/utils";
+import {
+  cn,
+  filterNullOptions,
+  formatName,
+  formatPlaceholderName,
+} from "../../../utils/utils";
 import { default as ForwardedIconComponent } from "../../common/genericIconComponent";
 import ShadTooltip from "../../common/shadTooltipComponent";
 import { Button } from "../../ui/button";
@@ -43,11 +48,13 @@ export default function Dropdown({
   dialogInputs,
   ...baseInputProps
 }: BaseInputProps & DropDownComponent): JSX.Element {
+  const validOptions = useMemo(() => filterNullOptions(options), [options]);
+
   // Initialize state and refs
   const [open, setOpen] = useState(children ? true : false);
   const [openDialog, setOpenDialog] = useState(false);
   const [customValue, setCustomValue] = useState("");
-  const [filteredOptions, setFilteredOptions] = useState(options);
+  const [filteredOptions, setFilteredOptions] = useState(validOptions);
   const [refreshOptions, setRefreshOptions] = useState(false);
   const refButton = useRef<HTMLButtonElement>(null);
 
@@ -56,7 +63,7 @@ export default function Dropdown({
     ? formatPlaceholderName(name)
     : "Choose an option...";
   const { firstWord } = formatName(name);
-  const fuse = new Fuse(options, { keys: ["name", "value"] });
+  const fuse = new Fuse(validOptions, { keys: ["name", "value"] });
   const PopoverContentDropdown =
     children || editNode ? PopoverContent : PopoverContentWithoutPortal;
   const { nodeClass, nodeId, handleNodeClass, tooltip } = baseInputProps;
@@ -84,7 +91,7 @@ export default function Dropdown({
     const searchValues = fuse.search(value);
     const filtered = searchValues.map((search) => search.item);
     if (!filtered.includes(value) && combobox && value) filtered.push(value);
-    setFilteredOptions(value ? filtered : options);
+    setFilteredOptions(value ? filtered : validOptions);
     setCustomValue(value);
   };
 
@@ -133,7 +140,7 @@ export default function Dropdown({
 
   useEffect(() => {
     if (open) {
-      const filtered = cloneDeep(options);
+      const filtered = cloneDeep(validOptions);
       if (customValue === value && value && combobox) {
         filtered.push(customValue);
       }
@@ -159,7 +166,7 @@ export default function Dropdown({
         <Button
           disabled={
             disabled ||
-            (Object.keys(options).length === 0 &&
+            (Object.keys(validOptions).length === 0 &&
               !combobox &&
               !dialogInputs?.fields?.data?.node?.template)
           }
@@ -397,7 +404,7 @@ export default function Dropdown({
   );
 
   // Loading state
-  if (Object.keys(options).length === 0 && !combobox && isLoading) {
+  if (Object.keys(validOptions).length === 0 && !combobox && isLoading) {
     return (
       <div>
         <span className="text-sm italic">Loading...</span>
diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts
index fa8e6aa96..a479bbe06 100644
--- a/src/frontend/src/utils/utils.ts
+++ b/src/frontend/src/utils/utils.ts
@@ -765,3 +765,8 @@ export const isStringArray = (value: unknown): value is string[] => {
 };
 
 export const stringToBool = (str) => (str === "false" ? false : true);
+
+// Filter out null/undefined options
+export const filterNullOptions = (opts: any[]): any[] => {
+  return opts.filter((opt) => opt !== null && opt !== undefined);
+};